prostgles-server 3.0.70 → 3.0.72

package/lib/DboBuilder.js

@@ -26,7 +26,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.canEXECUTE = exports.prepareSort = exports.postgresToTsType = exports.isPlainObject = exports.DboBuilder = exports.parseError = exports.EXISTS_KEYS = exports.makeErr = exports.escapeTSNames = exports.pgp = void 0;
 const Bluebird = __importStar(require("bluebird"));
@@ -137,65 +136,58 @@ const Prostgles_1 = require("./Prostgles");
 const DBSchemaBuilder_1 = require("./DBSchemaBuilder");
 const TableHandler_1 = require("./DboBuilder/TableHandler");
 class DboBuilder {
-    constructor(prostgles) {
-        this.schema = "public";
-        this.getPubSubManager = async () => {
-            if (!this._pubSubManager) {
-                let onSchemaChange;
-                const { yes, canExecute, isSuperUs } = await PubSubManager_1.PubSubManager.canCreate(this.db);
-                if (!exports.canEXECUTE)
-                    throw "PubSubManager based subscriptions not possible: Cannot run EXECUTE statements on this connection";
-                if (this.prostgles.opts.watchSchema && this.prostgles.opts.watchSchemaType === "DDL_trigger") {
-                    if (!isSuperUs) {
-                        console.warn(`watchSchemaType "${this.prostgles.opts.watchSchemaType}" cannot be used because db user is not a superuser. Will fallback to watchSchemaType "prostgles_queries" `);
-                    }
-                    else {
-                        onSchemaChange = (event) => {
-                            this.prostgles.onSchemaChange(event);
-                        };
-                    }
+    tablesOrViews; //TableSchema           TableOrViewInfo
+    /**
+     * Used in obtaining column names for error messages
+     */
+    constraints;
+    db;
+    schema = "public";
+    // dbo: DBHandlerServer | DBHandlerServerTX;
+    dbo;
+    _pubSubManager;
+    /**
+     * Used for db.sql field type details
+     */
+    DATA_TYPES;
+    USER_TABLES;
+    USER_TABLE_COLUMNS;
+    getPubSubManager = async () => {
+        if (!this._pubSubManager) {
+            let onSchemaChange;
+            const { yes, canExecute, isSuperUs } = await PubSubManager_1.PubSubManager.canCreate(this.db);
+            if (!exports.canEXECUTE)
+                throw "PubSubManager based subscriptions not possible: Cannot run EXECUTE statements on this connection";
+            if (this.prostgles.opts.watchSchema && this.prostgles.opts.watchSchemaType === "DDL_trigger") {
+                if (!isSuperUs) {
+                    console.warn(`watchSchemaType "${this.prostgles.opts.watchSchemaType}" cannot be used because db user is not a superuser. Will fallback to watchSchemaType "prostgles_queries" `);
                 }
-                this._pubSubManager = await PubSubManager_1.PubSubManager.create({
-                    dboBuilder: this,
-                    onSchemaChange
-                });
-            }
-            if (!this._pubSubManager) {
-                console.trace("Could not create this._pubSubManager");
-                throw "Could not create this._pubSubManager";
-            }
-            return this._pubSubManager;
-        };
-        this.joinPaths = [];
-        this.init = async () => {
-            /* If watchSchema then PubSubManager must be created (if possible) */
-            await this.build();
-            if (this.prostgles.opts.watchSchema &&
-                (this.prostgles.opts.watchSchemaType === "DDL_trigger" || !this.prostgles.opts.watchSchemaType) &&
-                this.prostgles.isSuperUser) {
-                await this.getPubSubManager();
-            }
-            return this;
-        };
-        this.runSQL = async (query, params, options, localParams) => {
-            return runSQL_1.runSQL.bind(this)(query, params, options, localParams);
-        };
-        this.getTX = (cb) => {
-            return this.db.tx((t) => {
-                let dbTX = {};
-                this.tablesOrViews?.map(tov => {
-                    dbTX[tov.name] = new (tov.is_view ? ViewHandler_1.ViewHandler : TableHandler_1.TableHandler)(this.db, tov, this, t, dbTX, this.joinPaths);
-                });
-                if (!dbTX.sql) {
-                    dbTX.sql = this.runSQL;
+                else {
+                    onSchemaChange = (event) => {
+                        this.prostgles.onSchemaChange(event);
+                    };
                 }
-                (0, prostgles_types_1.getKeys)(dbTX).map(k => {
-                    dbTX[k].dbTX = dbTX;
-                });
-                dbTX.sql = (q, args, opts, localP) => this.runSQL(q, args, opts, { tx: { dbTX, t }, ...(localP ?? {}) });
-                return cb(dbTX, t);
+            }
+            this._pubSubManager = await PubSubManager_1.PubSubManager.create({
+                dboBuilder: this,
+                onSchemaChange
             });
-        };
+        }
+        if (!this._pubSubManager) {
+            console.trace("Could not create this._pubSubManager");
+            throw "Could not create this._pubSubManager";
+        }
+        return this._pubSubManager;
+    };
+    pojoDefinitions;
+    // dboDefinition?: string;
+    tsTypesDefinition;
+    joinGraph;
+    joinPaths = [];
+    prostgles;
+    publishParser;
+    onSchemaChange;
+    constructor(prostgles) {
         this.prostgles = prostgles;
         if (!this.prostgles.db)
             throw "db missing";
@@ -203,9 +195,24 @@ class DboBuilder {
         this.schema = this.prostgles.opts.schema || "public";
         this.dbo = {};
     }
+    init = async () => {
+        /* If watchSchema then PubSubManager must be created (if possible) */
+        await this.build();
+        if (this.prostgles.opts.watchSchema &&
+            (this.prostgles.opts.watchSchemaType === "DDL_trigger" || !this.prostgles.opts.watchSchemaType) &&
+            this.prostgles.isSuperUser) {
+            await this.getPubSubManager();
+        }
+        return this;
+    };
+    static create = async (prostgles) => {
+        let res = new DboBuilder(prostgles);
+        return await res.init();
+    };
     destroy() {
         this._pubSubManager?.destroy();
     }
+    _joins;
     get joins() {
         return (0, utils_1.clone)(this._joins ?? []).filter(j => j.tables[0] !== j.tables[1]);
         ;
@@ -275,13 +282,12 @@ class DboBuilder {
             // Make joins graph
             this.joinGraph = {};
             this.joins.forEach(({ tables }) => {
-                var _b, _c;
                 let _t = tables.slice().sort(), t1 = _t[0], t2 = _t[1];
                 if (t1 === t2)
                     return;
-                (_b = this.joinGraph)[t1] ?? (_b[t1] = {});
+                this.joinGraph[t1] ??= {};
                 this.joinGraph[t1][t2] = 1;
-                (_c = this.joinGraph)[t2] ?? (_c[t2] = {});
+                this.joinGraph[t2] ??= {};
                 this.joinGraph[t2][t1] = 1;
             });
             const tables = Array.from(new Set(this.joins.flatMap(t => t.tables)));
@@ -316,6 +322,9 @@ class DboBuilder {
         }
         return this.joinPaths;
     }
+    runSQL = async (query, params, options, localParams) => {
+        return runSQL_1.runSQL.bind(this)(query, params, options, localParams);
+    };
     async build() {
         this.tablesOrViews = await getTablesForSchemaPostgresSQL(this.db);
         this.constraints = await getConstraints(this.db);
@@ -378,13 +387,24 @@ class DboBuilder {
         ].join("\n");
         return this.dbo;
     }
+    getTX = (cb) => {
+        return this.db.tx((t) => {
+            let dbTX = {};
+            this.tablesOrViews?.map(tov => {
+                dbTX[tov.name] = new (tov.is_view ? ViewHandler_1.ViewHandler : TableHandler_1.TableHandler)(this.db, tov, this, t, dbTX, this.joinPaths);
+            });
+            if (!dbTX.sql) {
+                dbTX.sql = this.runSQL;
+            }
+            (0, prostgles_types_1.getKeys)(dbTX).map(k => {
+                dbTX[k].dbTX = dbTX;
+            });
+            dbTX.sql = (q, args, opts, localP) => this.runSQL(q, args, opts, { tx: { dbTX, t }, ...(localP ?? {}) });
+            return cb(dbTX, t);
+        });
+    };
 }
 exports.DboBuilder = DboBuilder;
-_a = DboBuilder;
-DboBuilder.create = async (prostgles) => {
-    let res = new DboBuilder(prostgles);
-    return await res.init();
-};
 async function getConstraints(db, schema = "public") {
     return db.any(`
         SELECT rel.relname, con.conkey, con.conname, con.contype