Skip to content

Commit 0a2baea

Browse files
committed
chore: reorder generated typescript exports
1 parent e9cd3fd commit 0a2baea

File tree

2 files changed

+47
-47
lines changed

2 files changed

+47
-47
lines changed

src/server/templates/typescript.ts

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -391,26 +391,6 @@ export type Database = {
391391
})}
392392
}
393393
394-
export const Constants = {
395-
${schemas
396-
.sort(({ name: a }, { name: b }) => a.localeCompare(b))
397-
.map((schema) => {
398-
const schemaEnums = types
399-
.filter((type) => type.schema === schema.name && type.enums.length > 0)
400-
.sort(({ name: a }, { name: b }) => a.localeCompare(b))
401-
return `${JSON.stringify(schema.name)}: {
402-
Enums: {
403-
${schemaEnums.map(
404-
(enum_) =>
405-
`${JSON.stringify(enum_.name)}: [${enum_.enums
406-
.map((variant) => JSON.stringify(variant))
407-
.join(', ')}]`
408-
)}
409-
}
410-
}`
411-
})}
412-
} as const
413-
414394
type DefaultSchema = Database[Extract<keyof Database, ${JSON.stringify(GENERATE_TYPES_DEFAULT_SCHEMA)}>]
415395
416396
export type Tables<
@@ -515,6 +495,26 @@ export type CompositeTypes<
515495
: PublicCompositeTypeNameOrOptions extends keyof DefaultSchema["CompositeTypes"]
516496
? DefaultSchema["CompositeTypes"][PublicCompositeTypeNameOrOptions]
517497
: never
498+
499+
export const Constants = {
500+
${schemas
501+
.sort(({ name: a }, { name: b }) => a.localeCompare(b))
502+
.map((schema) => {
503+
const schemaEnums = types
504+
.filter((type) => type.schema === schema.name && type.enums.length > 0)
505+
.sort(({ name: a }, { name: b }) => a.localeCompare(b))
506+
return `${JSON.stringify(schema.name)}: {
507+
Enums: {
508+
${schemaEnums.map(
509+
(enum_) =>
510+
`${JSON.stringify(enum_.name)}: [${enum_.enums
511+
.map((variant) => JSON.stringify(variant))
512+
.join(', ')}]`
513+
)}
514+
}
515+
}`
516+
})}
517+
} as const
518518
`
519519

520520
output = await prettier.format(output, {

test/server/typegen.ts

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -431,15 +431,6 @@ test('typegen: typescript', async () => {
431431
}
432432
}
433433
434-
export const Constants = {
435-
public: {
436-
Enums: {
437-
meme_status: ["new", "old", "retired"],
438-
user_status: ["ACTIVE", "INACTIVE"],
439-
},
440-
},
441-
} as const
442-
443434
type DefaultSchema = Database[Extract<keyof Database, "public">]
444435
445436
export type Tables<
@@ -544,6 +535,15 @@ test('typegen: typescript', async () => {
544535
: PublicCompositeTypeNameOrOptions extends keyof DefaultSchema["CompositeTypes"]
545536
? DefaultSchema["CompositeTypes"][PublicCompositeTypeNameOrOptions]
546537
: never
538+
539+
export const Constants = {
540+
public: {
541+
Enums: {
542+
meme_status: ["new", "old", "retired"],
543+
user_status: ["ACTIVE", "INACTIVE"],
544+
},
545+
},
546+
} as const
547547
"
548548
`)
549549
})
@@ -995,15 +995,6 @@ test('typegen w/ one-to-one relationships', async () => {
995995
}
996996
}
997997
998-
export const Constants = {
999-
public: {
1000-
Enums: {
1001-
meme_status: ["new", "old", "retired"],
1002-
user_status: ["ACTIVE", "INACTIVE"],
1003-
},
1004-
},
1005-
} as const
1006-
1007998
type DefaultSchema = Database[Extract<keyof Database, "public">]
1008999
10091000
export type Tables<
@@ -1108,6 +1099,15 @@ test('typegen w/ one-to-one relationships', async () => {
11081099
: PublicCompositeTypeNameOrOptions extends keyof DefaultSchema["CompositeTypes"]
11091100
? DefaultSchema["CompositeTypes"][PublicCompositeTypeNameOrOptions]
11101101
: never
1102+
1103+
export const Constants = {
1104+
public: {
1105+
Enums: {
1106+
meme_status: ["new", "old", "retired"],
1107+
user_status: ["ACTIVE", "INACTIVE"],
1108+
},
1109+
},
1110+
} as const
11111111
"
11121112
`)
11131113
})
@@ -1559,15 +1559,6 @@ test('typegen: typescript w/ one-to-one relationships', async () => {
15591559
}
15601560
}
15611561
1562-
export const Constants = {
1563-
public: {
1564-
Enums: {
1565-
meme_status: ["new", "old", "retired"],
1566-
user_status: ["ACTIVE", "INACTIVE"],
1567-
},
1568-
},
1569-
} as const
1570-
15711562
type DefaultSchema = Database[Extract<keyof Database, "public">]
15721563
15731564
export type Tables<
@@ -1672,6 +1663,15 @@ test('typegen: typescript w/ one-to-one relationships', async () => {
16721663
: PublicCompositeTypeNameOrOptions extends keyof DefaultSchema["CompositeTypes"]
16731664
? DefaultSchema["CompositeTypes"][PublicCompositeTypeNameOrOptions]
16741665
: never
1666+
1667+
export const Constants = {
1668+
public: {
1669+
Enums: {
1670+
meme_status: ["new", "old", "retired"],
1671+
user_status: ["ACTIVE", "INACTIVE"],
1672+
},
1673+
},
1674+
} as const
16751675
"
16761676
`)
16771677
})

0 commit comments

Comments
 (0)