8000 fix: formatting & tests · f-elix/postgres-meta@3036ea1 · GitHub
[go: up one dir, main page]
Skip to content

Commit 3036ea1

Browse files
soedirgosoedirgo
committed
fix: formatting & tests
1 parent 22db4fc commit 3036ea1

File tree

2 files changed

+55
-10
lines changed

2 files changed

+55
-10
lines changed

‎src/server/templates/typescript.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -466,17 +466,17 @@ export type Enums<
466466
: never
467467
468468
export type CompositeTypes<
469-
PublicCompositeTypeNameOrOptions extends
470-
| keyof PublicSchema['CompositeTypes']
471-
| { schema: keyof Database },
472-
CompositeTypeName extends PublicCompositeTypeNameOrOptions extends { schema: keyof Database }
473-
? keyof Database[PublicCompositeTypeNameOrOptions['schema']]['CompositeTypes']
474-
: never = never
469+
PublicCompositeTypeNameOrOptions extends
470+
| keyof PublicSchema['CompositeTypes']
471+
| { schema: keyof Database },
472+
CompositeTypeName extends PublicCompositeTypeNameOrOptions extends { schema: keyof Database }
473+
? keyof Database[PublicCompositeTypeNameOrOptions['schema']]['CompositeTypes']
474+
: never = never
475475
> = PublicCompositeTypeNameOrOptions extends { schema: keyof Database }
476-
? Database[PublicCompositeTypeNameOrOptions['schema']]['CompositeTypes'][CompositeTypeName]
477-
: PublicCompositeTypeNameOrOptions extends keyof PublicSchema['CompositeTypes']
478-
? PublicSchema['CompositeTypes'][PublicCompositeTypeNameOrOptions]
479-
: never;
476+
? Database[PublicCompositeTypeNameOrOptions['schema']]['CompositeTypes'][CompositeTypeName]
477+
: PublicCompositeTypeNameOrOptions extends keyof PublicSchema['CompositeTypes']
478+
? PublicSchema['CompositeTypes'][PublicCompositeTypeNameOrOptions]
479+
: never;
480480
`
481481

482482
output = await prettier.format(output, {

‎test/server/typegen.ts

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -509,6 +509,21 @@ test('typegen: typescript', async () => {
509509
: PublicEnumNameOrOptions extends keyof PublicSchema["Enums"]
510510
? PublicSchema["Enums"][PublicEnumNameOrOptions]
511511
: never
512+
513+
export type CompositeTypes<
514+
PublicCompositeTypeNameOrOptions extends
515+
| keyof PublicSchema["CompositeTypes"]
516+
| { schema: keyof Database },
517+
CompositeTypeName extends PublicCompositeTypeNameOrOptions extends {
518+
schema: keyof Database
519+
}
520+
? keyof Database[PublicCompositeTypeNameOrOptions["schema"]]["CompositeTypes"]
521+
: never = never,
522+
> = PublicCompositeTypeNameOrOptions extends { schema: keyof Database }
523+
? Database[PublicCompositeTypeNameOrOptions["schema"]]["CompositeTypes"][CompositeTypeName]
524+
: PublicCompositeTypeNameOrOptions extends keyof PublicSchema["CompositeTypes"]
525+
? PublicSchema["CompositeTypes"][PublicCompositeTypeNameOrOptions]
526+
: never
512527
"
513528
`)
514529
})
@@ -1038,6 +1053,21 @@ test('typegen w/ one-to-one relationships', async () => {
10381053
: PublicEnumNameOrOptions extends keyof PublicSchema["Enums"]
10391054
? PublicSchema["Enums"][PublicEnumNameOrOptions]
10401055
: never
1056+
1057+
export type CompositeTypes<
1058+
PublicCompositeTypeNameOrOptions extends
1059+
| keyof PublicSchema["CompositeTypes"]
1060+
| { schema: keyof Database },
1061+
CompositeTypeName extends PublicCompositeTypeNameOrOptions extends {
1062+
schema: keyof Database
1063+
}
1064+
? keyof Database[PublicCompositeTypeNameOrOptions["schema"]]["CompositeTypes"]
1065+
: never = never,
1066+
> = PublicCompositeTypeNameOrOptions extends { schema: keyof Database }
1067+
? Database[PublicCompositeTypeNameOrOptions["schema"]]["CompositeTypes"][CompositeTypeName]
1068+
: PublicCompositeTypeNameOrOptions extends keyof PublicSchema["CompositeTypes"]
1069+
? PublicSchema["CompositeTypes"][PublicCompositeTypeNameOrOptions]
1070+
: never
10411071
"
10421072
`)
10431073
})
@@ -1567,6 +1597,21 @@ test('typegen: typescript w/ one-to-one relationships', async () => {
15671597
: PublicEnumNameOrOptions extends keyof PublicSchema["Enums"]
15681598
? PublicSchema["Enums"][PublicEnumNameOrOptions]
15691599
: never
1600+
1601+
export type CompositeTypes<
1602+
PublicCompositeTypeNameOrOptions extends
1603+
| keyof PublicSchema["CompositeTypes"]
1604+
| { schema: keyof Database },
1605+
CompositeTypeName extends PublicCompositeTypeNameOrOptions extends {
1606+
schema: keyof Database
1607+
}
1608+
? keyof Database[PublicCompositeTypeNameOrOptions["schema"]]["CompositeTypes"]
1609+
: never = never,
1610+
> = PublicCompositeTypeNameOrOptions extends { schema: keyof Database }
1611+
? Database[PublicCompositeTypeNameOrOptions["schema"]]["CompositeTypes"][CompositeTypeName]
1612+
: PublicCompositeTypeNameOrOptions extends keyof PublicSchema["CompositeTypes"]
1613+
? PublicSchema["CompositeTypes"][PublicCompositeTypeNameOrOptions]
1614+
: never
15701615
"
15711616
`)
15721617
})

0 commit comments

Comments
 (0)
0