@andymic/pigeon 1.4.0 → 1.4.2

package/README.md

@@ -20,12 +20,15 @@ Install with [npm](https://www.npmjs.com):
       --force   overwrites already existing files
       --output  [path:String] output directory for the generated files.
       --config  [path:String] path to .pigeon.json config file.
+      --pgAdmin [path:String] path to the pgAdmin ERD file.
+      --offline (only with pgAdmin) does not contact the database
  
     Examples
       $ pigeon --init
       $ pigeon --output C:/Users/User/Documents/Project
-      $ pigeon --output ./generatedFiles
+      $ pigeon --output ./generatedFiles --force
       $ pigeon --config ./customPigeonConfig.json
+      $ pigeon --pgAdmin C:/Users/User/Documents/Project/ERD.json --offline
       
     Exit Status
       Pigeon returns the following codes:
@@ -48,6 +51,14 @@ const result = await runPigeon('output/directory', 'localhost', 5432, 'database'
 console.log(result.message);
 ```
 
+### pgAdmin ERD
+
+Pigeon supports generating code from pgAdmin ERD files. To do that the necessary `--pgAdmin` flag needs to point to the
+ERD file.
+
+The `--offline` flag prevents any contact with the database. A side effect of that is that the enum labels cannot be
+populated.
+
 ## Configuration
 
 Pigeon requires a configuration file `.pigeon.json` to connect to your PostgreSQL database. You can generate this file

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@andymic/pigeon",
-  "version": "1.4.0",
+  "version": "1.4.2",
   "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.15.6",
     "prompt-sync": "^4.2.0"
   },
-  "gitHead": "ec33791a735792a340bfa41c1f66e9a08534ffa6"
+  "gitHead": "04b72fd9eb0dde3a4005146b38d899b9655f0d83"
 }

package/src/cli.js

@@ -103,6 +103,7 @@ export async function run(flags) {
         const generationResult = runGeneration(flags.output, database, tableProcessing(tables), enums);
         if (generationResult instanceof PigeonError)
             return generationResult;
+        return;
     }
     if (flags.guided) {
         const params = guided();

package/src/index.js

@@ -2,6 +2,7 @@ import { arrayMaker, consoleMessage, getCombinations, getType, nameBeautifier, q
 import prompt from "prompt-sync";
 import fs from "node:fs";
 import * as path from "node:path";
+import { jsTypes } from "./maps.js";
 export class PigeonError {
     exitCode;
     message;
@@ -395,15 +396,28 @@ function createClass(tableName, columns, primaryKey, foreignKeys) {
         text += "\t */\n";
         text += "\t" + column.column_name + ": " + dataType;
         if (column.column_default !== null) {
-            if (!column.column_default.includes("nextval")) {
+            let columnDefault = column.column_default.split("::")[0];
+            let type = column.column_default.split("::")[1];
+            if (!columnDefault.includes("nextval")) {
                 if (dataType === "Date") {
-                    if (column.column_default)
+                    if (columnDefault.toLowerCase() === "now()")
                         text += " = new Date()";
                     else
-                        text += " = new Date(" + column.column_default.replace(" ", "T") + ")";
+                        text += " = new Date(" + columnDefault.replace(" ", "T") + ")";
                 }
                 else if (dataType === "number" || dataType === "boolean")
-                    text += " = " + column.column_default;
+                    text += " = " + columnDefault;
+                else if (type) {
+                    if (jsTypes.get(type) === "string")
+                        text += " = \"" + columnDefault + "\"";
+                    else {
+                        const jsType = jsTypes.get(type);
+                        if (jsType)
+                            text += " = " + columnDefault + " as " + jsType;
+                        else
+                            text += " = " + columnDefault + " as " + nameBeautifier(type).replaceAll(" ", "");
+                    }
+                }
                 else
                     text += " = \"" + column.column_default + "\"";
             }