Skip to content

Commit 7cc7ccc

Browse files
soedirgosoedirgo
committed
chore: update some namings
1 parent 7cf3c78 commit 7cc7ccc

File tree

3 files changed

+212
-176
lines changed

3 files changed

+212
-176
lines changed

‎src/server/constants.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,15 @@ export const GENERATE_TYPES = process.env.PG_META_GENERATE_TYPES
4040
export const GENERATE_TYPES_INCLUDED_SCHEMAS = GENERATE_TYPES
4141
? (process.env.PG_META_GENERATE_TYPES_INCLUDED_SCHEMAS?.split(',') ?? [])
4242
: []
43+
export const GENERATE_TYPES_DEFAULT_SCHEMA =
44+
process.env.PG_META_GENERATE_TYPES_DEFAULT_SCHEMA || 'public'
4345
export const GENERATE_TYPES_DETECT_ONE_TO_ONE_RELATIONSHIPS =
4446
process.env.PG_META_GENERATE_TYPES_DETECT_ONE_TO_ONE_RELATIONSHIPS === 'true'
4547
export const GENERATE_TYPES_SWIFT_ACCESS_CONTROL = process.env
4648
.PG_META_GENERATE_TYPES_SWIFT_ACCESS_CONTROL
4749
? (process.env.PG_META_GENERATE_TYPES_SWIFT_ACCESS_CONTROL as AccessControl)
4850
: 'internal'
51+
4952
export const DEFAULT_POOL_CONFIG: PoolConfig = {
5053
max: 1,
5154
connectionTimeoutMillis: PG_CONN_TIMEOUT_SECS * 1000,
@@ -54,5 +57,3 @@ export const DEFAULT_POOL_CONFIG: PoolConfig = {
5457
}
5558

5659
export const PG_META_REQ_HEADER = process.env.PG_META_REQ_HEADER || 'request-id'
57-
58-
export const DEFAULT_SCHEMA = process.env.PG_META_GENERATE_TYPES_DEFAULT_SCHEMA

‎src/server/templates/typescript.ts‎

Lines changed: 65 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import type {
88
PostgresView,
99
} from '../../lib/index.js'
1010
import type { GeneratorMetadata } from '../../lib/generators.js'
11-
import { DEFAULT_SCHEMA } from '../constants.js'
11+
import { GENERATE_TYPES_DEFAULT_SCHEMA } from '../constants.js'
1212

1313
export const apply = async ({
1414
schemas,
@@ -391,99 +391,110 @@ export type Database = {
391391
})}
392392
}
393393
394-
type DefaultSchema = Database[Extract<keyof Database, ${JSON.stringify(DEFAULT_SCHEMA) || '"public"'}>]
395-
394+
type DefaultSchema = Database[Extract<keyof Database, ${JSON.stringify(GENERATE_TYPES_DEFAULT_SCHEMA)}>]
396395
397396
export type Tables<
398-
PublicTableNameOrOptions extends
397+
DefaultSchemaTableNameOrOptions extends
399398
| keyof (DefaultSchema["Tables"] & DefaultSchema["Views"])
400399
| { schema: keyof Database },
401-
TableName extends PublicTableNameOrOptions extends { schema: keyof Database }
402-
? keyof (Database[PublicTableNameOrOptions["schema"]]["Tables"] &
403-
Database[PublicTableNameOrOptions["schema"]]["Views"])
404-
: never = never
405-
> = PublicTableNameOrOptions extends { schema: keyof Database }
406-
? (Database[PublicTableNameOrOptions["schema"]]["Tables"] &
407-
Database[PublicTableNameOrOptions["schema"]]["Views"])[TableName] extends {
400+
TableName extends DefaultSchemaTableNameOrOptions extends {
401+
schema: keyof Database
402+
}
403+
? keyof (Database[DefaultSchemaTableNameOrOptions["schema"]]["Tables"] &
404+
Database[DefaultSchemaTableNameOrOptions["schema"]]["Views"])
405+
: never = never,
406+
> = DefaultSchemaTableNameOrOptions extends { schema: keyof Database }
407+
? (Database[DefaultSchemaTableNameOrOptions["schema"]]["Tables"] &
408+
Database[DefaultSchemaTableNameOrOptions["schema"]]["Views"])[TableName] extends {
408409
Row: infer R
409410
}
410411
? R
411412
: never
412-
: PublicTableNameOrOptions extends keyof (DefaultSchema["Tables"] & DefaultSchema["Views"])
413-
? (DefaultSchema["Tables"] & DefaultSchema["Views"])[PublicTableNameOrOptions] extends {
413+
: DefaultSchemaTableNameOrOptions extends keyof (DefaultSchema["Tables"] &
414+
DefaultSchema["Views"])
415+
? (DefaultSchema["Tables"] &
416+
DefaultSchema["Views"])[DefaultSchemaTableNameOrOptions] extends {
414417
Row: infer R
415418
}
416419
? R
417420
: never
418421
: never
419422
420423
export type TablesInsert<
421-
PublicTableNameOrOptions extends
424+
DefaultSchemaTableNameOrOptions extends
422425
| keyof DefaultSchema["Tables"]
423426
| { schema: keyof Database },
424-
TableName extends PublicTableNameOrOptions extends { schema: keyof Database }
425-
? keyof Database[PublicTableNameOrOptions["schema"]]["Tables"]
426-
: never = never
427-
> = PublicTableNameOrOptions extends { schema: keyof Database }
428-
? Database[PublicTableNameOrOptions["schema"]]["Tables"][TableName] extends {
427+
TableName extends DefaultSchemaTableNameOrOptions extends {
428+
schema: keyof Database
429+
}
430+
? keyof Database[DefaultSchemaTableNameOrOptions["schema"]]["Tables"]
431+
: never = never,
432+
> = DefaultSchemaTableNameOrOptions extends { schema: keyof Database }
433+
? Database[DefaultSchemaTableNameOrOptions["schema"]]["Tables"][TableName] extends {
429434
Insert: infer I
430435
}
431436
? I
432437
: never
433-
: PublicTableNameOrOptions extends keyof DefaultSchema["Tables"]
434-
? DefaultSchema["Tables"][PublicTableNameOrOptions] extends {
435-
Insert: infer I
436-
}
437-
? I
438+
: DefaultSchemaTableNameOrOptions extends keyof DefaultSchema["Tables"]
439+
? DefaultSchema["Tables"][DefaultSchemaTableNameOrOptions] extends {
440+
Insert: infer I
441+
}
442+
? I
443+
: never
438444
: never
439-
: never
440445
441446
export type TablesUpdate<
442-
PublicTableNameOrOptions extends
447+
DefaultSchemaTableNameOrOptions extends
443448
| keyof DefaultSchema["Tables"]
444449
| { schema: keyof Database },
445-
TableName extends PublicTableNameOrOptions extends { schema: keyof Database }
446-
? keyof Database[PublicTableNameOrOptions["schema"]]["Tables"]
447-
: never = never
448-
> = PublicTableNameOrOptions extends { schema: keyof Database }
449-
? Database[PublicTableNameOrOptions["schema"]]["Tables"][TableName] extends {
450+
TableName extends DefaultSchemaTableNameOrOptions extends {
451+
schema: keyof Database
452+
}
453+
? keyof Database[DefaultSchemaTableNameOrOptions["schema"]]["Tables"]
454+
: never = never,
455+
> = DefaultSchemaTableNameOrOptions extends { schema: keyof Database }
456+
? Database[DefaultSchemaTableNameOrOptions["schema"]]["Tables"][TableName] extends {
450457
Update: infer U
451458
}
452459
? U
453460
: never
454-
: PublicTableNameOrOptions extends keyof DefaultSchema["Tables"]
455-
? DefaultSchema["Tables"][PublicTableNameOrOptions] extends {
456-
Update: infer U
457-
}
458-
? U
461+
: DefaultSchemaTableNameOrOptions extends keyof DefaultSchema["Tables"]
462+
? DefaultSchema["Tables"][DefaultSchemaTableNameOrOptions] extends {
463+
Update: infer U
464+
}
465+
? U
466+
: never
459467
: never
460-
: never
461468
462469
export type Enums<
463-
PublicEnumNameOrOptions extends
470+
DefaultSchemaEnumNameOrOptions extends
464471
| keyof DefaultSchema["Enums"]
465472
| { schema: keyof Database },
466-
EnumName extends PublicEnumNameOrOptions extends { schema: keyof Database }
467-
? keyof Database[PublicEnumNameOrOptions["schema"]]["Enums"]
468-
: never = never
469-
> = PublicEnumNameOrOptions extends { schema: keyof Database }
470-
? Database[PublicEnumNameOrOptions["schema"]]["Enums"][EnumName]
471-
: PublicEnumNameOrOptions extends keyof DefaultSchema["Enums"]
472-
? DefaultSchema["Enums"][PublicEnumNameOrOptions]
473-
: never
473+
EnumName extends DefaultSchemaEnumNameOrOptions extends {
474+
schema: keyof Database
475+
}
476+
? keyof Database[DefaultSchemaEnumNameOrOptions["schema"]]["Enums"]
477+
: never = never,
478+
> = DefaultSchemaEnumNameOrOptions extends { schema: keyof Database }
479+
? Database[DefaultSchemaEnumNameOrOptions["schema"]]["Enums"][EnumName]
480+
: DefaultSchemaEnumNameOrOptions extends keyof DefaultSchema["Enums"]
481+
? DefaultSchema["Enums"][DefaultSchemaEnumNameOrOptions]
482+
: never
474483
475484
export type CompositeTypes<
476485
PublicCompositeTypeNameOrOptions extends
477-
| keyof DefaultSchema['CompositeTypes']
486+
| keyof DefaultSchema["CompositeTypes"]
478487
| { schema: keyof Database },
479-
CompositeTypeName extends PublicCompositeTypeNameOrOptions extends { schema: keyof Database }
480-
? keyof Database[PublicCompositeTypeNameOrOptions['schema']]['CompositeTypes']
481-
: never = never
488+
CompositeTypeName extends PublicCompositeTypeNameOrOptions extends {
489+
schema: keyof Database
490+
}
491+
? keyof Database[PublicCompositeTypeNameOrOptions["schema"]]["CompositeTypes"]
492+
: never = never,
482493
> = PublicCompositeTypeNameOrOptions extends { schema: keyof Database }
483-
? Database[PublicCompositeTypeNameOrOptions['schema']]['CompositeTypes'][CompositeTypeName]
484-
: PublicCompositeTypeNameOrOptions extends keyof DefaultSchema['CompositeTypes']
485-
? DefaultSchema['CompositeTypes'][PublicCompositeTypeNameOrOptions]
486-
: never;
494+
? Database[PublicCompositeTypeNameOrOptions["schema"]]["CompositeTypes"][CompositeTypeName]
495+
: PublicCompositeTypeNameOrOptions extends keyof DefaultSchema["CompositeTypes"]
496+
? DefaultSchema["CompositeTypes"][PublicCompositeTypeNameOrOptions]
497+
: never
487498
`
488499

489500
output = await prettier.format(output, {

0 commit comments

Comments
 (0)