prostgles-server 3.0.70 → 3.0.72

package/lib/PubSubManager/initPubSubManager.js

@@ -8,7 +8,7 @@ async function initPubSubManager() {
     if (!this.canContinue())
         return undefined;
     try {
-        const schema_version = 6;
+        const schema_version = 10;
         const initQuery = `
               BEGIN; --  ISOLATION LEVEL SERIALIZABLE;-- TRANSACTION ISOLATION LEVEL SERIALIZABLE;
 
@@ -149,49 +149,65 @@ async function initPubSubManager() {
                           DECLARE err_text    TEXT;
                           DECLARE err_detail  TEXT;
                           DECLARE err_hint    TEXT;
-                          
+                                  
+                          DECLARE view_def_query TEXT := '';   
+
                           BEGIN
 
                               -- PERFORM pg_notify('debug', concat_ws(' ', 'TABLE', TG_TABLE_NAME, TG_OP));
 
                               SELECT string_agg(
-                                concat_ws(
-                                  E' UNION \n ',
-                                  CASE WHEN (TG_OP = 'DELETE' OR TG_OP = 'UPDATE') THEN (p1 || ' old_table ' || p2) END,
-                                  CASE WHEN (TG_OP = 'INSERT' OR TG_OP = 'UPDATE') THEN (p1 || ' new_table ' || p2) END 
+                                format(
+                                  $c$ 
+                                    SELECT CASE WHEN EXISTS( 
+                                      SELECT 1 FROM %I WHERE %s 
+                                    ) THEN %s::text END AS t_ids 
+                                  $c$, 
+                                  table_name, 
+                                  condition, 
+                                  id 
                                 ),
-                                E' UNION \n '::text
-                              )
+                                E' UNION \n ' 
+                              ) 
                               INTO unions
-                              FROM (
-                                  SELECT 
-                                      CASE WHEN related_view_name IS NOT NULL 
-                                        /* E' is used to ensure line breaks are not escaped */
-                                        THEN format(E'WITH %I AS (\n %s \n) ', related_view_name, related_view_def)
-                                      ELSE 
-                                        '' 
-                                      END ||
-                                      $z$ 
-                                        SELECT CASE WHEN EXISTS( SELECT 1 FROM 
-                                      $z$ AS p1,
-                                      format( 
-                                        $c$ 
-                                          as %I WHERE %s ) THEN %s::text END AS t_ids 
-                                        $c$, 
-                                        table_name, condition, id 
-                                      ) AS p2
-                                  FROM prostgles.v_triggers
-                                  WHERE table_name = TG_TABLE_NAME
-                              ) t; 
+                              FROM prostgles.v_triggers
+                              WHERE table_name = TG_TABLE_NAME;
+ 
 
+                              /* unions = 'old_table union new_table' or any one of the tables */
                               IF unions IS NOT NULL THEN
-                                  query = format(
-                                      $s$
-                                        SELECT ARRAY_AGG(DISTINCT t.t_ids)
-                                        FROM ( %s ) t
-                                      $s$, 
-                                      unions
-                                  );
+
+                                  SELECT  
+                                    format(
+                                      E'WITH %I AS (\n %s \n) ', 
+                                      TG_TABLE_NAME, 
+                                      concat_ws(
+                                        E' UNION ALL \n ',
+                                        CASE WHEN (TG_OP = 'DELETE' OR TG_OP = 'UPDATE') THEN ' SELECT * FROM old_table ' END,
+                                        CASE WHEN (TG_OP = 'INSERT' OR TG_OP = 'UPDATE') THEN ' SELECT * FROM new_table ' END 
+                                      )
+                                    ) 
+                                    || 
+                                    COALESCE((
+                                      SELECT ', ' || string_agg(format(E' %I AS ( \n %s \n ) ', related_view_name, related_view_def), ', ')
+                                      FROM (
+                                        SELECT DISTINCT related_view_name, related_view_def 
+                                        FROM prostgles.v_triggers
+                                        WHERE table_name = TG_TABLE_NAME
+                                        AND related_view_name IS NOT NULL
+                                        AND related_view_def  IS NOT NULL
+                                      ) t
+                                    ), '')
+                                    || 
+                                    format(
+                                      $c$
+                                          SELECT ARRAY_AGG(DISTINCT t.t_ids)
+                                          FROM ( 
+                                            %s 
+                                          ) t
+                                      $c$, unions
+                                    )
+                                  INTO query; 
 
                                   BEGIN
                                     EXECUTE query INTO t_ids;
@@ -232,7 +248,7 @@ async function initPubSubManager() {
                                               COALESCE(TG_TABLE_NAME, 'MISSING'), 
                                               COALESCE(TG_OP, 'MISSING'), 
                                               CASE WHEN has_errors 
-                                                THEN concat_ws('; ', 'error', err_text, err_detail, err_hint ) 
+                                                THEN concat_ws('; ', 'error', err_text, err_detail, err_hint, 'query: ' || query ) 
                                                 ELSE COALESCE(nrw.cids, '') 
                                               END
                                               ${this.dboBuilder.prostgles.opts.DEBUG_MODE ? (", (select json_agg(t)::TEXT FROM (SELECT * from old_table) t), query") : ""}

package/lib/PubSubManager/initPubSubManager.ts

@@ -1,12 +1,12 @@
 import { PostgresNotifListenManager } from "../PostgresNotifListenManager";
 import { asValue, log, PubSubManager } from "./PubSubManager";
-const REALTIME_TRIGGER_CHECK_QUERY = "prostgles-server internal query used to manage realtime triggers" as const;
+const REALTIME_TRIGGER_CHECK_QUERY = "prostgles-server internal query used to manage realtime triggers" as const; 
 
 export async function initPubSubManager(this: PubSubManager): Promise<PubSubManager | undefined> {
   if (!this.canContinue()) return undefined;
 
   try {
-    const schema_version = 6;
+    const schema_version = 10;
 
     const initQuery = `
               BEGIN; --  ISOLATION LEVEL SERIALIZABLE;-- TRANSACTION ISOLATION LEVEL SERIALIZABLE;
@@ -148,49 +148,65 @@ export async function initPubSubManager(this: PubSubManager): Promise<PubSubMana
                           DECLARE err_text    TEXT;
                           DECLARE err_detail  TEXT;
                           DECLARE err_hint    TEXT;
-                          
+                                  
+                          DECLARE view_def_query TEXT := '';   
+
                           BEGIN
 
                               -- PERFORM pg_notify('debug', concat_ws(' ', 'TABLE', TG_TABLE_NAME, TG_OP));
 
                               SELECT string_agg(
-                                concat_ws(
-                                  E' UNION \n ',
-                                  CASE WHEN (TG_OP = 'DELETE' OR TG_OP = 'UPDATE') THEN (p1 || ' old_table ' || p2) END,
-                                  CASE WHEN (TG_OP = 'INSERT' OR TG_OP = 'UPDATE') THEN (p1 || ' new_table ' || p2) END 
+                                format(
+                                  $c$ 
+                                    SELECT CASE WHEN EXISTS( 
+                                      SELECT 1 FROM %I WHERE %s 
+                                    ) THEN %s::text END AS t_ids 
+                                  $c$, 
+                                  table_name, 
+                                  condition, 
+                                  id 
                                 ),
-                                E' UNION \n '::text
-                              )
+                                E' UNION \n ' 
+                              ) 
                               INTO unions
-                              FROM (
-                                  SELECT 
-                                      CASE WHEN related_view_name IS NOT NULL 
-                                        /* E' is used to ensure line breaks are not escaped */
-                                        THEN format(E'WITH %I AS (\n %s \n) ', related_view_name, related_view_def)
-                                      ELSE 
-                                        '' 
-                                      END ||
-                                      $z$ 
-                                        SELECT CASE WHEN EXISTS( SELECT 1 FROM 
-                                      $z$ AS p1,
-                                      format( 
-                                        $c$ 
-                                          as %I WHERE %s ) THEN %s::text END AS t_ids 
-                                        $c$, 
-                                        table_name, condition, id 
-                                      ) AS p2
-                                  FROM prostgles.v_triggers
-                                  WHERE table_name = TG_TABLE_NAME
-                              ) t; 
+                              FROM prostgles.v_triggers
+                              WHERE table_name = TG_TABLE_NAME;
+ 
 
+                              /* unions = 'old_table union new_table' or any one of the tables */
                               IF unions IS NOT NULL THEN
-                                  query = format(
-                                      $s$
-                                        SELECT ARRAY_AGG(DISTINCT t.t_ids)
-                                        FROM ( %s ) t
-                                      $s$, 
-                                      unions
-                                  );
+
+                                  SELECT  
+                                    format(
+                                      E'WITH %I AS (\n %s \n) ', 
+                                      TG_TABLE_NAME, 
+                                      concat_ws(
+                                        E' UNION ALL \n ',
+                                        CASE WHEN (TG_OP = 'DELETE' OR TG_OP = 'UPDATE') THEN ' SELECT * FROM old_table ' END,
+                                        CASE WHEN (TG_OP = 'INSERT' OR TG_OP = 'UPDATE') THEN ' SELECT * FROM new_table ' END 
+                                      )
+                                    ) 
+                                    || 
+                                    COALESCE((
+                                      SELECT ', ' || string_agg(format(E' %I AS ( \n %s \n ) ', related_view_name, related_view_def), ', ')
+                                      FROM (
+                                        SELECT DISTINCT related_view_name, related_view_def 
+                                        FROM prostgles.v_triggers
+                                        WHERE table_name = TG_TABLE_NAME
+                                        AND related_view_name IS NOT NULL
+                                        AND related_view_def  IS NOT NULL
+                                      ) t
+                                    ), '')
+                                    || 
+                                    format(
+                                      $c$
+                                          SELECT ARRAY_AGG(DISTINCT t.t_ids)
+                                          FROM ( 
+                                            %s 
+                                          ) t
+                                      $c$, unions
+                                    )
+                                  INTO query; 
 
                                   BEGIN
                                     EXECUTE query INTO t_ids;
@@ -231,7 +247,7 @@ export async function initPubSubManager(this: PubSubManager): Promise<PubSubMana
                                               COALESCE(TG_TABLE_NAME, 'MISSING'), 
                                               COALESCE(TG_OP, 'MISSING'), 
                                               CASE WHEN has_errors 
-                                                THEN concat_ws('; ', 'error', err_text, err_detail, err_hint ) 
+                                                THEN concat_ws('; ', 'error', err_text, err_detail, err_hint, 'query: ' || query ) 
                                                 ELSE COALESCE(nrw.cids, '') 
                                               END
                                               ${this.dboBuilder.prostgles.opts.DEBUG_MODE? (", (select json_agg(t)::TEXT FROM (SELECT * from old_table) t), query") : ""}

package/lib/PublishParser.js

@@ -80,6 +80,12 @@ const RULE_TO_METHODS = [
 ];
 const PubSubManager_1 = require("./PubSubManager/PubSubManager");
 class PublishParser {
+    publish;
+    publishMethods;
+    publishRawSQL;
+    dbo;
+    db;
+    prostgles;
     constructor(publish, publishMethods, publishRawSQL, dbo, db, prostgles) {
         this.publish = publish;
         this.publishMethods = publishMethods;
@@ -289,7 +295,6 @@ class PublishParser {
                 MY_RULES.map(r => {
                     /** THIS IS A MESS -> some methods cannot be dissallowed (unsync, unsubscribe...) */
                     r.methods.forEach(method => {
-                        var _a;
                         const isAllowed = tableRules[r.rule] && tableRules[method] === undefined;
                         if (isAllowed) {
                             if (method === "updateBatch" && !tableRules.update) {
@@ -297,7 +302,7 @@ class PublishParser {
                             else if (method === "upsert" && (!tableRules.update || !tableRules.insert)) {
                             }
                             else {
-                                (_a = res)[method] ?? (_a[method] = true);
+                                res[method] ??= true;
                             }
                         }
                     });

package/lib/SchemaWatch.js

@@ -4,8 +4,9 @@ exports.SchemaWatch = void 0;
 const prostgles_types_1 = require("prostgles-types");
 const DboBuilder_1 = require("./DboBuilder");
 class SchemaWatch {
+    schema_checkIntervalMillis;
+    loaded = false;
     constructor({ watchSchema, watchSchemaType, tsGeneratedTypesDir, currDbuilder, onSchemaChanged }) {
-        this.loaded = false;
         if (!watchSchema)
             return;
         if (watchSchema === "hotReloadMode" && !tsGeneratedTypesDir) {

package/lib/TableConfig.js

@@ -23,97 +23,7 @@ exports.parseI18N = parseI18N;
  * Will be run between initSQL and fileTable
  */
 class TableConfigurator {
-    constructor(prostgles) {
-        this.getColumnConfig = (tableName, colName) => {
-            const tconf = this.config?.[tableName];
-            if (tconf && "columns" in tconf) {
-                return tconf.columns?.[colName];
-            }
-            return undefined;
-        };
-        this.getTableInfo = (params) => {
-            const tconf = this.config?.[params.tableName];
-            return {
-                label: (0, exports.parseI18N)({ config: tconf?.info?.label, lang: params.lang, defaultLang: "en", defaultValue: params.tableName })
-            };
-        };
-        this.getColInfo = (params) => {
-            const colConf = this.getColumnConfig(params.table, params.col);
-            let result = undefined;
-            if (colConf) {
-                if ((0, prostgles_types_1.isObject)(colConf)) {
-                    result = {
-                        ...(result ?? {}),
-                        ...("info" in colConf && colConf?.info),
-                        ...("jsonbSchema" in colConf && colConf.jsonbSchema && { jsonSchema: (0, validation_1.getJSONBSchemaAsJSONSchema)(params.table, params.col, colConf) })
-                    };
-                    /**
-                     * Get labels from TableConfig if specified
-                     */
-                    if (colConf.label) {
-                        const { lang } = params;
-                        const lbl = colConf?.label;
-                        if (["string", "object"].includes(typeof lbl)) {
-                            if (typeof lbl === "string") {
-                                result ?? (result = {});
-                                result.label = lbl;
-                            }
-                            else if (lang && (lbl?.[lang] || lbl?.en)) {
-                                result ?? (result = {});
-                                result.label = (lbl?.[lang]) || lbl?.en;
-                            }
-                        }
-                    }
-                }
-            }
-            return result;
-        };
-        this.checkColVal = (params) => {
-            const conf = this.getColInfo(params);
-            if (conf) {
-                const { value } = params;
-                const { min, max } = conf;
-                if (min !== undefined && value !== undefined && value < min)
-                    throw `${params.col} must be less than ${min}`;
-                if (max !== undefined && value !== undefined && value > max)
-                    throw `${params.col} must be greater than ${max}`;
-            }
-        };
-        this.getJoinInfo = (sourceTable, targetTable) => {
-            if (this.config &&
-                sourceTable in this.config &&
-                this.config[sourceTable] &&
-                "columns" in this.config[sourceTable]) {
-                const td = this.config[sourceTable];
-                if ("columns" in td && td.columns?.[targetTable]) {
-                    const cd = td.columns[targetTable];
-                    if ((0, prostgles_types_1.isObject)(cd) && "joinDef" in cd) {
-                        if (!cd.joinDef)
-                            throw "cd.joinDef missing";
-                        const { joinDef } = cd;
-                        const res = {
-                            expectOne: false,
-                            paths: joinDef.map(({ sourceTable, targetTable: table, on }) => ({
-                                source: sourceTable,
-                                target: targetTable,
-                                table,
-                                on
-                            })),
-                        };
-                        return res;
-                    }
-                }
-            }
-            return undefined;
-        };
-        this.log = (...args) => {
-            if (this.prostgles.opts.DEBUG_MODE) {
-                console.log("TableConfig: \n", ...args);
-            }
-        };
-        this.config = prostgles.opts.tableConfig;
-        this.prostgles = prostgles;
-    }
+    config;
     get dbo() {
         if (!this.prostgles.dbo)
             throw "this.prostgles.dbo missing";
@@ -126,6 +36,94 @@ class TableConfigurator {
         return this.prostgles.db;
     }
     ;
+    // sidKeyName: string;
+    prostgles;
+    constructor(prostgles) {
+        this.config = prostgles.opts.tableConfig;
+        this.prostgles = prostgles;
+    }
+    getColumnConfig = (tableName, colName) => {
+        const tconf = this.config?.[tableName];
+        if (tconf && "columns" in tconf) {
+            return tconf.columns?.[colName];
+        }
+        return undefined;
+    };
+    getTableInfo = (params) => {
+        const tconf = this.config?.[params.tableName];
+        return {
+            label: (0, exports.parseI18N)({ config: tconf?.info?.label, lang: params.lang, defaultLang: "en", defaultValue: params.tableName })
+        };
+    };
+    getColInfo = (params) => {
+        const colConf = this.getColumnConfig(params.table, params.col);
+        let result = undefined;
+        if (colConf) {
+            if ((0, prostgles_types_1.isObject)(colConf)) {
+                result = {
+                    ...(result ?? {}),
+                    ...("info" in colConf && colConf?.info),
+                    ...("jsonbSchema" in colConf && colConf.jsonbSchema && { jsonSchema: (0, validation_1.getJSONBSchemaAsJSONSchema)(params.table, params.col, colConf) })
+                };
+                /**
+                 * Get labels from TableConfig if specified
+                 */
+                if (colConf.label) {
+                    const { lang } = params;
+                    const lbl = colConf?.label;
+                    if (["string", "object"].includes(typeof lbl)) {
+                        if (typeof lbl === "string") {
+                            result ??= {};
+                            result.label = lbl;
+                        }
+                        else if (lang && (lbl?.[lang] || lbl?.en)) {
+                            result ??= {};
+                            result.label = (lbl?.[lang]) || lbl?.en;
+                        }
+                    }
+                }
+            }
+        }
+        return result;
+    };
+    checkColVal = (params) => {
+        const conf = this.getColInfo(params);
+        if (conf) {
+            const { value } = params;
+            const { min, max } = conf;
+            if (min !== undefined && value !== undefined && value < min)
+                throw `${params.col} must be less than ${min}`;
+            if (max !== undefined && value !== undefined && value > max)
+                throw `${params.col} must be greater than ${max}`;
+        }
+    };
+    getJoinInfo = (sourceTable, targetTable) => {
+        if (this.config &&
+            sourceTable in this.config &&
+            this.config[sourceTable] &&
+            "columns" in this.config[sourceTable]) {
+            const td = this.config[sourceTable];
+            if ("columns" in td && td.columns?.[targetTable]) {
+                const cd = td.columns[targetTable];
+                if ((0, prostgles_types_1.isObject)(cd) && "joinDef" in cd) {
+                    if (!cd.joinDef)
+                        throw "cd.joinDef missing";
+                    const { joinDef } = cd;
+                    const res = {
+                        expectOne: false,
+                        paths: joinDef.map(({ sourceTable, targetTable: table, on }) => ({
+                            source: sourceTable,
+                            target: targetTable,
+                            table,
+                            on
+                        })),
+                    };
+                    return res;
+                }
+            }
+        }
+        return undefined;
+    };
     async init() {
         let queries = [];
         if (!this.config || !this.prostgles.pgp)
@@ -372,6 +370,11 @@ class TableConfigurator {
             });
         }
     }
+    log = (...args) => {
+        if (this.prostgles.opts.DEBUG_MODE) {
+            console.log("TableConfig: \n", ...args);
+        }
+    };
 }
 exports.default = TableConfigurator;
 async function columnExists(args) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prostgles-server",
-  "version": "3.0.70",
+  "version": "3.0.72",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -39,7 +39,7 @@
     "file-type": "^17.1.4",
     "g": "^2.0.1",
     "pg-promise": "^10.11.1",
-    "prostgles-types": "^3.0.17",
+    "prostgles-types": "^3.0.18",
     "sharp": "^0.31.0",
     "typescript": "^4.9.5"
   },

package/tests/client/PID.txt

@@ -1 +1 @@
-174896
+263626

package/tests/client/tsconfig.json

@@ -1,8 +1,8 @@
 {
 	"files": ["./index.ts"],
 	"compilerOptions": {
-		"target": "es2020",
-		"lib": [ "es2020", "DOM" ],
+		"target": "es2022",
+		"lib": [ "es2022", "DOM" ],
     // "outDir": "dist",
 		"esModuleInterop" : true,
 		"module": "commonjs",

package/tests/server/package-lock.json

@@ -21,7 +21,7 @@
     },
     "../..": {
       "name": "prostgles-server",
-      "version": "3.0.69",
+      "version": "3.0.71",
       "license": "MIT",
       "dependencies": {
         "@aws-sdk/client-s3": "^3.121.0",
@@ -32,7 +32,7 @@
         "file-type": "^17.1.4",
         "g": "^2.0.1",
         "pg-promise": "^10.11.1",
-        "prostgles-types": "^3.0.17",
+        "prostgles-types": "^3.0.18",
         "sharp": "^0.31.0",
         "typescript": "^4.9.5"
       },
@@ -1512,7 +1512,7 @@
         "file-type": "^17.1.4",
         "g": "^2.0.1",
         "pg-promise": "^10.11.1",
-        "prostgles-types": "^3.0.17",
+        "prostgles-types": "^3.0.18",
         "sharp": "^0.31.0",
         "typescript": "^4.9.5"
       }

package/tests/server/tsconfig.json

@@ -1,8 +1,8 @@
 {
 	"files": ["./index.ts"],
 	"compilerOptions": {
-		"target": "es2020",
-		"lib": [ "es2020" ],
+		"target": "es2022",
+		"lib": [ "es2022" ],
 		"esModuleInterop" : true,
 		"allowSyntheticDefaultImports": true,
     "resolveJsonModule": true,