@andymic/pigeon 2.0.0 → 2.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@andymic/pigeon",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "author": "Andreas Michael <ateasm03@gmail.com>",
   "description": "Pigeon is a TypeScript-based tool for generating TypeScript classes and methods from PostgreSQL database schemas.",
   "keywords": [
@@ -35,5 +35,5 @@
     "pg": "^8.16.0",
     "prompt-sync": "^4.2.0"
   },
-  "gitHead": "85641ef9cc7fe7b42c78f7470608793f192b880a"
+  "gitHead": "565fcc64621e0c076f77933662e6f82969ef62e6"
 }

package/src/index.js

@@ -272,19 +272,21 @@ export function runGeneration(dir, db, tables, enums) {
     }
     for (const table of tables) {
         let ts = "";
-        let hasForeign = false;
+        const imports = [];
         for (const column of table.columns) {
             if (column.isForeign && column.foreignColumn && column.foreignTable && column.foreignSchema) {
-                hasForeign = true;
                 if ((table.schema === column.foreignSchema) && (table.name === column.foreignTable))
                     continue;
+                if (imports.includes(column.foreignSchema + "/" + column.foreignTable))
+                    continue;
                 ts += "import {get" + nameBeautifier(column.foreignTable).replaceAll(" ", "") + "} from \".";
                 if (table.schema !== column.foreignSchema)
                     ts += "./" + column.foreignSchema;
                 ts += "/" + column.foreignTable + ".js\";\n";
+                imports.push(column.foreignSchema + "/" + column.foreignTable);
             }
         }
-        if (hasForeign)
+        if (imports.length !== 0)
             ts += "\n";
         ts += "import query from \"./index.js\";\n\n";
         if (enums) {
@@ -326,9 +328,9 @@ export function runGeneration(dir, db, tables, enums) {
             else if ((column.defaultValue !== null && column.defaultValue.includes("nextval")) || (column.isIdentity && column.identityGeneration === "ALWAYS"))
                 autoGenerated.push(column);
         }
-        ts += createAdd(table.schema, table.name, required, optional, autoGenerated, hasForeign);
+        ts += createAdd(table.schema, table.name, required, optional, autoGenerated, imports.length !== 0);
         ts += "\n\n";
-        ts += createUpdate(table.schema, table.name, table.columns, autoGenerated, hasForeign);
+        ts += createUpdate(table.schema, table.name, table.columns, autoGenerated, imports.length !== 0);
         ts += "\n\n";
         ts += createDelete(table.schema, table.name, table.columns);
         fs.writeFileSync(path.join(dir, table.schema, table.name + ".ts"), ts);
@@ -506,9 +508,9 @@ function createAdd(tableSchema, tableName, required, optional, autoGenerated, ha
     const functionName = "add" + singularize(nameBeautifier(tableName).replaceAll(" ", ""));
     const dataType = "Omit<" + className + ", '" + autoGenerated.concat(optional).map((column) => {
         return column.name;
-    }).join("\' | \'") + "'> & Partial<Pick<" + className + ", '" + optional.map((column) => {
+    }).join("\' | \'") + "'>" + (optional.length > 0 ? " & Partial<Pick<" + className + ", '" + optional.map((column) => {
         return column.name;
-    }).join("\' | \'") + "'>>";
+    }).join("\' | \'") + "'>>" : "");
     const editableColumns = required.concat(optional);
     text += "/**\n";
     text += " * Adds a new " + singularize(nameBeautifier(tableName)) + " object to the database.\n";
@@ -547,7 +549,7 @@ function createAdd(tableSchema, tableName, required, optional, autoGenerated, ha
         text += " not existing in their table, or if other pre-insertion validation fails.\n";
     }
     text += " */\n";
-    text += "export async function " + functionName + "( " + paramName + ": " + dataType.replaceAll("'", "\"") + "): Promise<" + className + "> {\n";
+    text += "export async function " + functionName + "(" + paramName + ": " + dataType.replaceAll("'", "\"") + "): Promise<" + className + "> {\n";
     if (hasForeign) {
         for (const column of editableColumns) {
             if (column.isForeign && column.foreignColumn && column.foreignTable && column.foreignSchema) {
@@ -606,9 +608,9 @@ function createUpdate(tableSchema, tableName, columns, autoGenerated, hasForeign
     const className = singularize(nameBeautifier(tableName)).replaceAll(" ", "");
     const functionName = "update" + nameBeautifier(tableName).replaceAll(" ", "");
     const criteriaType = "Partial<" + className + ">";
-    const updatesType = "Partial<Omit<" + className + ", '" + autoGenerated.map((column) => {
+    const updatesType = "Partial<" + (autoGenerated.length !== 0 ? "Omit<" + className + ", '" + autoGenerated.map((column) => {
         return column.name;
-    }).join("' | '") + "'>>";
+    }).join("' | '") + "'>" : className) + ">";
     text += "/**\n";
     text += " * Updates existing " + className + " objects in the database based on the specified criteria.\n";
     text += " *\n";