Fix repositories not using type wrappers

lorefnon · Apr 26, 2024 · 4be5c99 · 4be5c99
1 parent 9abe9f2
commit 4be5c99
Show file tree

Hide file tree

Showing 16 changed files with 72 additions and 66 deletions.
diff --git a/docs/classes/Generator.html b/docs/classes/Generator.html
diff --git a/docs/interfaces/CommonCustomTypesOptions.html b/docs/interfaces/CommonCustomTypesOptions.html
diff --git a/docs/interfaces/CommonOptions.html b/docs/interfaces/CommonOptions.html
diff --git a/docs/interfaces/CommonPrimaryKeyOptions.html b/docs/interfaces/CommonPrimaryKeyOptions.html
diff --git a/docs/interfaces/CommonTypeAdapterOptions.html b/docs/interfaces/CommonTypeAdapterOptions.html
diff --git a/docs/interfaces/ExportOptions.html b/docs/interfaces/ExportOptions.html
diff --git a/docs/interfaces/FieldMapping.html b/docs/interfaces/FieldMapping.html
diff --git a/docs/interfaces/GeneratedField.html b/docs/interfaces/GeneratedField.html
diff --git a/docs/interfaces/GeneratedFieldType.html b/docs/interfaces/GeneratedFieldType.html
diff --git a/docs/interfaces/GeneratorOpts.html b/docs/interfaces/GeneratorOpts.html
diff --git a/docs/interfaces/ImportedItem.html b/docs/interfaces/ImportedItem.html
diff --git a/docs/interfaces/TableInclusion.html b/docs/interfaces/TableInclusion.html
diff --git a/docs/types/StrOrRegExp.html b/docs/types/StrOrRegExp.html
diff --git a/docs/variables/fieldMappings.html b/docs/variables/fieldMappings.html
diff --git a/src/generator.ts b/src/generator.ts
@@ -770,9 +770,12 @@ export class Generator {
     tableName: string,
     tableKind: TableKind,
     mapperClassName: string,
-    imports: ImportTmplInput[]
+    imports: ImportTmplInput[],
+
   ) {
-    const rowTypes = this.opts.export?.rowTypes
+    const isExported = this.opts.export?.rowTypes;
+    const hasRepo = this.opts.export?.crudRepository;
+    const rowTypes = (isExported || hasRepo)
       ? ({} as any)
       : false;
     if (rowTypes !== false) {
@@ -781,17 +784,20 @@ export class Generator {
         `SelectedRow<${mapperClassName}>`,
         imports
       );
+      rowTypes.selected.isExported = isExported;
       if (tableKind !== "View") {
         rowTypes.insertable = this.getWrappedTypeInput(
           this.getInsertableRowTypeName(tableName),
           `InsertableRow<${mapperClassName}>`,
           imports
         );
+        rowTypes.insertable.isExported = isExported;
         rowTypes.updatable = this.getWrappedTypeInput(
           this.getUpdatableRowTypeName(tableName),
           `UpdatableRow<${mapperClassName}>`,
           imports
         );
+        rowTypes.updatable.isExported = isExported;
       }
     }
     return rowTypes

diff --git a/src/template.ts.hbs b/src/template.ts.hbs
@@ -162,7 +162,7 @@ export class {{repo.className}} {
     {{/if}}
     {{#if repo.methods.insertOne}}
 
-    {{repo.methods.insertOne}}(row: InsertableRow<{{className}}>, conn = this.getConnection()) {
+    {{repo.methods.insertOne}}(row: {{rowTypes.insertable.name}}, conn = this.getConnection()) {
         return this.insert(conn)
             .set(row)
             .returning(this.tableCols)
@@ -171,7 +171,7 @@ export class {{repo.className}} {
     {{/if}}
     {{#if repo.methods.insertMany}}
 
-    {{repo.methods.insertMany}}(rows: InsertableRow<{{className}}>[], conn = this.getConnection()) {
+    {{repo.methods.insertMany}}(rows: {{rowTypes.insertable.name}}[], conn = this.getConnection()) {
         return this.insert(conn)
             .values(rows)
             .returning(this.tableCols)
@@ -186,7 +186,7 @@ export class {{repo.className}} {
     {{/if}}
     {{#if repo.methods.updateOne}}
 
-    {{repo.methods.updateOne}}({{pkField.name}}: {{className}}Pk, update: UpdatableRow<{{className}}>, conn = this.getConnection()) {
+    {{repo.methods.updateOne}}({{pkField.name}}: {{className}}Pk, update: {{rowTypes.updatable.name}}, conn = this.getConnection()) {
         return this.update(conn)
             .set(update)
             .where(this.table.{{pkField.name}}.equals({{pkField.name}}))
@@ -196,7 +196,7 @@ export class {{repo.className}} {
     {{/if}}
     {{#if repo.methods.updateMany}}
 
-    {{repo.methods.updateMany}}({{pkField.name}}List: {{className}}Pk[], update: UpdatableRow<{{className}}>, conn = this.getConnection()) {
+    {{repo.methods.updateMany}}({{pkField.name}}List: {{className}}Pk[], update: {{rowTypes.updatable.name}}, conn = this.getConnection()) {
         return this.update(conn)
             .set(update)
             .where(this.table.{{pkField.name}}.in({{pkField.name}}List))