diff --git a/src/lib/file-generators/generated/[schema_name]/index.ts b/src/lib/file-generators/generated/[schema_name]/index.ts index 20e2c08..6cea161 100644 --- a/src/lib/file-generators/generated/[schema_name]/index.ts +++ b/src/lib/file-generators/generated/[schema_name]/index.ts @@ -16,7 +16,7 @@ export const createSchemaGeneratedTypeIndexFile = ( config: Config, ): SourceFile => { const { project, schema } = args - const { output_dir } = config + const { output_dir, main_schema } = config const pascal_schema_name = pascalCase(schema.name) @@ -80,7 +80,7 @@ export const createSchemaGeneratedTypeIndexFile = ( name: 'KnexSchemaTypeMap', properties: tables.map((table) => ({ name: - schema.name === 'seam' + schema.name === main_schema ? table.name : `"${schema.name}.${table.name}"`, type: table.is_affected_by_pgtui_bugs diff --git a/src/lib/file-generators/generated/knex.ts b/src/lib/file-generators/generated/knex.ts index 6b4180a..63ec830 100644 --- a/src/lib/file-generators/generated/knex.ts +++ b/src/lib/file-generators/generated/knex.ts @@ -16,7 +16,7 @@ export const createKnexIndexFile = ( config: Config, ): SourceFile => { const { project, schemas } = args - const { output_dir } = config + const { output_dir, main_schema } = config const statements: StatementedNodeStructure['statements'] = [] const module_interface_statements: StatementedNodeStructure['statements'] = [] @@ -35,12 +35,30 @@ export const createKnexIndexFile = ( ], }) + if (schema.name === main_schema) { + statements.push({ + kind: StructureKind.TypeAlias, + name: `Prefixed${pascalCase(schema.name)}TypeMap`, + type: `{ [K in keyof ${pascalCase(schema.name)}TypeMap as \`${schema.name}.\${K}\`]: ${pascalCase(schema.name)}TypeMap[K] }`, + isExported: false, + }) + } + module_interface_statements.push({ kind: StructureKind.Interface, name: 'Tables', extends: [`${pascalCase(schema.name)}TypeMap`], properties: [], }) + + if (schema.name === main_schema) { + module_interface_statements.push({ + kind: StructureKind.Interface, + name: 'Tables', + extends: [`Prefixed${pascalCase(schema.name)}TypeMap`], + properties: [], + }) + } } // Create the module declaration