prostgles-server 3.0.87 → 3.0.89

package/lib/DboBuilder/insert.js

@@ -10,7 +10,7 @@ async function insert(rowOrRows, param2, param3_unused, tableRules, localParams)
     try {
         const { onConflictDoNothing, fixIssues = false } = param2 || {};
         const { testRule = false, returnQuery = false } = localParams || {};
-        let { returning } = param2 || {};
+        const { returning } = param2 || {};
         const finalDBtx = localParams?.tx?.dbTX || this.dbTX;
         if (tableRules?.[ACTION]?.postValidate) {
             if (!finalDBtx) {
@@ -72,19 +72,19 @@ async function insert(rowOrRows, param2, param3_unused, tableRules, localParams)
             rowOrRows = {}; //throw "Provide data in param1";
         /** TODO: use WITH inserted as (query) SELECT jsonb_agg(inserted.*) as validateReturn, userReturning */
         const originalReturning = await this.prepareReturning(returning, this.parseFieldFilter(returningFields));
-        let fullReturning = await this.prepareReturning(returning, this.parseFieldFilter("*"));
+        const fullReturning = await this.prepareReturning(returning, this.parseFieldFilter("*"));
         /** Used for postValidate. Add any missing computed returning from original query */
         fullReturning.concat(originalReturning.filter(s => !fullReturning.some(f => f.alias === s.alias)));
         const finalSelect = tableRules?.[ACTION]?.postValidate ? fullReturning : originalReturning;
-        let returningSelect = this.makeReturnQuery(finalSelect);
+        const returningSelect = this.makeReturnQuery(finalSelect);
         const makeQuery = async (_row, isOne = false) => {
-            let row = { ..._row };
+            const row = { ..._row };
             if (!(0, prostgles_types_1.isObject)(row)) {
                 console.trace(row);
                 throw "\ninvalid insert data provided -> " + JSON.stringify(row);
             }
             const { data, allowedCols } = this.validateNewData({ row, forcedData, allowedFields: fields, tableRules, fixIssues });
-            let _data = { ...data };
+            const _data = { ...data };
             let insertQ = "";
             if (!Array.isArray(_data) && !(0, prostgles_types_1.getKeys)(_data).length || Array.isArray(_data) && !_data.length) {
                 await tableRules?.[ACTION]?.validate?.(_data, this.dbTX || this.dboBuilder.dbo);
@@ -107,7 +107,7 @@ async function insert(rowOrRows, param2, param3_unused, tableRules, localParams)
             return insertResult;
         }
         if (Array.isArray(data)) {
-            let queries = await Promise.all(data.map(async (p) => {
+            const queries = await Promise.all(data.map(async (p) => {
                 const q = await makeQuery(p);
                 return q;
             }));
@@ -163,13 +163,12 @@ async function insert(rowOrRows, param2, param3_unused, tableRules, localParams)
     }
 }
 exports.insert = insert;
-;
-const removeBuffers = (o) => {
-    if ((0, DboBuilder_1.isPlainObject)(o)) {
-        return JSON.stringify((0, prostgles_types_1.getKeys)(o).reduce((a, k) => {
-            const value = o[k];
-            return { ...a, [k]: Buffer.isBuffer(value) ? `Buffer[${value.byteLength}][...REMOVED]` : value
-            };
-        }, {}));
-    }
-};
+// const removeBuffers = (o: any) => {
+//   if(isPlainObject(o)){
+//     return JSON.stringify(getKeys(o).reduce((a, k) => {
+//       const value = o[k]
+//       return { ...a, [k]: Buffer.isBuffer(value)? `Buffer[${value.byteLength}][...REMOVED]` : value 
+//     }
+//   }, {}));
+//   }
+// }

package/lib/DboBuilder/insert.ts

@@ -14,7 +14,7 @@ export async function insert(this: TableHandler, rowOrRows: (AnyObject | AnyObje
     const { onConflictDoNothing, fixIssues = false } = param2 || {};
     const { testRule = false, returnQuery = false } = localParams || {};
 
-    let { returning } = param2 || {};
+    const { returning } = param2 || {};
     const finalDBtx = localParams?.tx?.dbTX || this.dbTX;
     if(tableRules?.[ACTION]?.postValidate ){
       if(!finalDBtx){
@@ -83,16 +83,16 @@ export async function insert(this: TableHandler, rowOrRows: (AnyObject | AnyObje
 
     /** TODO: use WITH inserted as (query) SELECT jsonb_agg(inserted.*) as validateReturn, userReturning */
     const originalReturning = await this.prepareReturning(returning, this.parseFieldFilter(returningFields))
-    let fullReturning = await this.prepareReturning(returning, this.parseFieldFilter("*"));
+    const fullReturning = await this.prepareReturning(returning, this.parseFieldFilter("*"));
 
     /** Used for postValidate. Add any missing computed returning from original query */
     fullReturning.concat(originalReturning.filter(s => !fullReturning.some(f => f.alias === s.alias)));
 
     const finalSelect = tableRules?.[ACTION]?.postValidate? fullReturning : originalReturning;
-    let returningSelect = this.makeReturnQuery(finalSelect);
+    const returningSelect = this.makeReturnQuery(finalSelect);
     
     const makeQuery = async (_row: AnyObject | undefined, isOne = false) => {
-      let row = { ..._row };
+      const row = { ..._row };
 
       if (!isObject(row)) {
         console.trace(row)
@@ -100,7 +100,7 @@ export async function insert(this: TableHandler, rowOrRows: (AnyObject | AnyObje
       }
 
       const { data, allowedCols } = this.validateNewData({ row, forcedData, allowedFields: fields, tableRules, fixIssues });
-      let _data = { ...data };
+      const _data = { ...data };
 
       let insertQ = "";
       if (!Array.isArray(_data) && !getKeys(_data).length || Array.isArray(_data) && !_data.length) {
@@ -126,7 +126,7 @@ export async function insert(this: TableHandler, rowOrRows: (AnyObject | AnyObje
     }
 
     if (Array.isArray(data)) {
-      let queries = await Promise.all(data.map(async p => {
+      const queries = await Promise.all(data.map(async p => {
         const q = await makeQuery(p);
         return q;
       }));
@@ -182,15 +182,15 @@ export async function insert(this: TableHandler, rowOrRows: (AnyObject | AnyObje
     // ${JSON.stringify(param2 || {}, null, 2)}
     throw parseError(e, `dbo.${this.name}.${ACTION}()`)
   }
-};
-
-
-const removeBuffers = (o: any) => {
-  if(isPlainObject(o)){
-    return JSON.stringify(getKeys(o).reduce((a, k) => {
-      const value = o[k]
-      return { ...a, [k]: Buffer.isBuffer(value)? `Buffer[${value.byteLength}][...REMOVED]` : value 
-    }
-  }, {}));
-  }
-}
+} 
+
+
+// const removeBuffers = (o: any) => {
+//   if(isPlainObject(o)){
+//     return JSON.stringify(getKeys(o).reduce((a, k) => {
+//       const value = o[k]
+//       return { ...a, [k]: Buffer.isBuffer(value)? `Buffer[${value.byteLength}][...REMOVED]` : value 
+//     }
+//   }, {}));
+//   }
+// }

package/lib/DboBuilder/insertDataParse.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"insertDataParse.d.ts","sourceRoot":"","sources":["insertDataParse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAW,YAAY,EAAgD,MAAM,iBAAiB,CAAC;AACjH,OAAO,EAAE,WAAW,EAAiB,MAAM,eAAe,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAG9C;;GAEG;AACH,wBAAsB,eAAe,CACnC,IAAI,EAAE,YAAY,EAClB,IAAI,EAAE,CAAC,SAAS,GAAG,SAAS,EAAE,CAAC,EAC/B,MAAM,CAAC,EAAE,YAAY,EACrB,aAAa,CAAC,EAAE,SAAS,EACzB,UAAU,CAAC,EAAE,SAAS,EACtB,YAAY,CAAC,EAAE,WAAW,GACzB,OAAO,CAAC;IACT,IAAI,CAAC,EAAE,SAAS,GAAG,SAAS,EAAE,CAAC;IAC/B,YAAY,CAAC,EAAE,SAAS,GAAG,SAAS,EAAE,CAAC;CACxC,CAAC,CAoQD"}
+{"version":3,"file":"insertDataParse.d.ts","sourceRoot":"","sources":["insertDataParse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAW,YAAY,EAAgD,MAAM,iBAAiB,CAAC;AACjH,OAAO,EAAE,WAAW,EAAiB,MAAM,eAAe,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAG9C;;GAEG;AACH,wBAAsB,eAAe,CACnC,IAAI,EAAE,YAAY,EAClB,IAAI,EAAE,CAAC,SAAS,GAAG,SAAS,EAAE,CAAC,EAC/B,MAAM,CAAC,EAAE,YAAY,EACrB,aAAa,CAAC,EAAE,SAAS,EACzB,UAAU,CAAC,EAAE,SAAS,EACtB,YAAY,CAAC,EAAE,WAAW,GACzB,OAAO,CAAC;IACT,IAAI,CAAC,EAAE,SAAS,GAAG,SAAS,EAAE,CAAC;IAC/B,YAAY,CAAC,EAAE,SAAS,GAAG,SAAS,EAAE,CAAC;CACxC,CAAC,CAmQD"}

package/lib/DboBuilder/insertDataParse.js

@@ -72,9 +72,8 @@ async function insertDataParse(data, param2, param3_unused, tableRules, _localPa
             insertResult: await this.dboBuilder.getTX((dbTX, _t) => dbTX[this.name].insert(data, param2, param3_unused, tableRules, { tx: { dbTX, t: _t }, ...localParams }))
         };
     }
-    // if(!dbTX && this.t) dbTX = this.d;
     const preValidate = tableRules?.insert?.preValidate, validate = tableRules?.insert?.validate;
-    let _data = await Promise.all((isMultiInsert ? data : [data]).map(async (row) => {
+    const _data = await Promise.all((isMultiInsert ? data : [data]).map(async (row) => {
         if (preValidate) {
             row = await preValidate(row, this.dbTX || this.dboBuilder.dbo);
         }
@@ -90,7 +89,7 @@ async function insertDataParse(data, param2, param3_unused, tableRules, _localPa
             const _this = this.t ? this : dbTX[this.name];
             const omitedKeys = extraKeys.concat(colInserts.map(c => c.col));
             // let rootData = isMultiInsert? data.map(d => omitKeys(d, omitedKeys)) : omitKeys(data, omitedKeys);
-            let rootData = (0, PubSubManager_1.omitKeys)(row, omitedKeys);
+            const rootData = (0, PubSubManager_1.omitKeys)(row, omitedKeys);
             let insertedChildren;
             let targetTableRules;
             /** Insert referenced first and then populate root data with referenced keys */
@@ -146,7 +145,7 @@ async function insertDataParse(data, param2, param3_unused, tableRules, _localPa
                         throw `Target table ${tbl2} does not reference any columns from the root table ${this.name}. Cannot do nested insert`;
                     // console.log(childDataItems, JSON.stringify(colsRefT1, null, 2))
                     insertedChildren = await childInsert(childDataItems.map((d) => {
-                        let result = { ...d };
+                        const result = { ...d };
                         colsRefT1.map(col => {
                             result[col.references[0].cols[0]] = fullRootResult[col.references[0].fcols[0]];
                         });
@@ -173,7 +172,7 @@ async function insertDataParse(data, param2, param3_unused, tableRules, _localPa
                     insertedChildren = await childInsert(childDataItems, targetTable);
                     /* Insert in key_lookup table */
                     await Promise.all(insertedChildren.map(async (t3Child) => {
-                        let tbl2Row = {};
+                        const tbl2Row = {};
                         colsRefT3.map(col => {
                             tbl2Row[col.name] = t3Child[col.references[0].fcols[0]];
                         });
@@ -192,9 +191,9 @@ async function insertDataParse(data, param2, param3_unused, tableRules, _localPa
                 if (targetTableRules && insertedChildren?.length && returning) {
                     const targetTableHandler = dbTX[targetTable];
                     const targetReturning = await targetTableHandler.prepareReturning("*", targetTableHandler.parseFieldFilter(targetTableRules?.insert?.returningFields));
-                    let clientTargetInserts = insertedChildren.map(d => {
-                        let _d = { ...d };
-                        let res = {};
+                    const clientTargetInserts = insertedChildren.map(d => {
+                        const _d = { ...d };
+                        const res = {};
                         targetReturning.map(r => {
                             res[r.alias] = _d[r.alias];
                         });
@@ -207,11 +206,11 @@ async function insertDataParse(data, param2, param3_unused, tableRules, _localPa
         }
         return row;
     }));
-    let result = isMultiInsert ? _data : _data[0];
+    const result = isMultiInsert ? _data : _data[0];
     // if(validate && !isNestedInsert){
     //     result = isMultiInsert? await Promise.all(_data.map(async d => await validate({ ...d }))) : await validate({ ..._data[0] });
     // }
-    let res = isNestedInsert ?
+    const res = isNestedInsert ?
         { insertResult: result } :
         { data: result };
     return res;

package/lib/DboBuilder/insertDataParse.ts

@@ -9,11 +9,11 @@ import { uploadFile } from "./uploadFile";
  * Used for doing referenced inserts within a single transaction
  */
 export async function insertDataParse(
-  this: TableHandler, 
-  data: (AnyObject | AnyObject[]), 
-  param2?: InsertParams, 
-  param3_unused?: undefined, 
-  tableRules?: TableRule, 
+  this: TableHandler,
+  data: (AnyObject | AnyObject[]),
+  param2?: InsertParams,
+  param3_unused?: undefined,
+  tableRules?: TableRule,
   _localParams?: LocalParams
 ): Promise<{
   data?: AnyObject | AnyObject[];
@@ -25,12 +25,12 @@ export async function insertDataParse(
   const isMultiInsert = Array.isArray(data);
   const getExtraKeys = (d: AnyObject) => getKeys(d).filter(k => {
     /* If media then use file insert columns */
-    if(this.is_media){
+    if (this.is_media) {
       return !this.column_names.concat(MEDIA_COL_NAMES).includes(k)
-    } else if(!this.columns.find(c => c.name === k)){
-      if(!isObject(d[k]) && !Array.isArray(d[k])){
+    } else if (!this.columns.find(c => c.name === k)) {
+      if (!isObject(d[k]) && !Array.isArray(d[k])) {
         throw new Error("Invalid/Dissalowed field in data: " + k)
-      } else if(!this.dboBuilder.dbo[k]){
+      } else if (!this.dboBuilder.dbo[k]) {
         throw new Error("Invalid/Dissalowed nested insert table name in data: " + k)
       }
       return true;
@@ -41,29 +41,29 @@ export async function insertDataParse(
   const getColumnInserts = (d: AnyObject) => getKeys(d)
     .filter(k => d[k] && isObject(d[k]))
     .map(k => {
-      const insertedCol = this.columns.find(c => 
-        c.name === k && 
+      const insertedCol = this.columns.find(c =>
+        c.name === k &&
         ALLOWED_COL_TYPES.includes(c.udt_name)
       );
       const referencesMultipleTables = insertedCol?.references?.length !== 1;
       const referencesMultipleColumns = insertedCol?.references?.some(refs => refs.fcols.length !== 1);
-      if(insertedCol && (
-          referencesMultipleTables ||
-          referencesMultipleColumns ||
-          this.columns.some(c => 
-              // c.name !== insertedCol.name && // a bit reduntant: Cannot have one col reference two columns
-              c.references?.some(({ ftable, fcols }) => 
-                insertedCol.references?.some(inserted => 
-                  ftable === inserted.ftable && // same ftable
-                  fcols[0] !== inserted.fcols[0] // different fcols
-                )
-              )
+      if (insertedCol && (
+        referencesMultipleTables ||
+        referencesMultipleColumns ||
+        this.columns.some(c =>
+          // c.name !== insertedCol.name && // a bit reduntant: Cannot have one col reference two columns
+          c.references?.some(({ ftable, fcols }) =>
+            insertedCol.references?.some(inserted =>
+              ftable === inserted.ftable && // same ftable
+              fcols[0] !== inserted.fcols[0] // different fcols
+            )
           )
         )
-      ){
+      )
+      ) {
         throw "A reference column insert is not possible for multiple column relationships ";
       }
-      if(insertedCol){
+      if (insertedCol) {
         return {
           tableName: insertedCol.references![0].ftable!,
           col: insertedCol.name,
@@ -73,7 +73,7 @@ export async function insertDataParse(
       return undefined;
     }).filter(isDefined);
 
-  
+
   /**
    * True when: nested table data is provided within
    *    [nestedTable] property key
@@ -102,12 +102,11 @@ export async function insertDataParse(
       )
     }
   }
-  // if(!dbTX && this.t) dbTX = this.d;
 
   const preValidate = tableRules?.insert?.preValidate,
     validate = tableRules?.insert?.validate;
 
-  let _data = await Promise.all((isMultiInsert? data : [data]).map(async row => {
+  const _data = await Promise.all((isMultiInsert ? data : [data]).map(async row => {
     if (preValidate) {
       row = await preValidate(row, this.dbTX || this.dboBuilder.dbo);
     }
@@ -128,14 +127,14 @@ export async function insertDataParse(
       const omitedKeys = extraKeys.concat(colInserts.map(c => c.col));
 
       // let rootData = isMultiInsert? data.map(d => omitKeys(d, omitedKeys)) : omitKeys(data, omitedKeys);
-      let rootData: AnyObject = omitKeys(row, omitedKeys);
+      const rootData: AnyObject = omitKeys(row, omitedKeys);
 
       let insertedChildren: AnyObject[];
       let targetTableRules: TableRule;
 
       /** Insert referenced first and then populate root data with referenced keys */
-      if(colInserts.length){
-        for await(const colInsert of colInserts){
+      if (colInserts.length) {
+        for await (const colInsert of colInserts) {
           const newLocalParams: LocalParams = {
             ...(localParams ?? {}),
             nestedInsert: {
@@ -146,10 +145,10 @@ export async function insertDataParse(
             }
           }
           const colRows = await referencedInsert(_this, dbTX, newLocalParams, colInsert.tableName, row[colInsert.col]);
-          if(!Array.isArray(colRows) || colRows.length !== 1 || [null, undefined].includes(colRows[0][colInsert.fcol])){
+          if (!Array.isArray(colRows) || colRows.length !== 1 || [null, undefined].includes(colRows[0][colInsert.fcol])) {
             throw new Error("Could not do nested column insert: Unexpected return " + JSON.stringify(colRows))
           }
-          
+
           const foreignKey = colRows[0][colInsert.fcol];
           rootData[colInsert.col] = foreignKey;
         }
@@ -195,7 +194,7 @@ export async function insertDataParse(
           // console.log(childDataItems, JSON.stringify(colsRefT1, null, 2))
           insertedChildren = await childInsert(
             childDataItems.map((d: AnyObject) => {
-              let result = { ...d };
+              const result = { ...d };
               colsRefT1.map(col => {
                 result[col.references![0].cols[0]] = fullRootResult[col.references![0].fcols[0]]
               })
@@ -219,7 +218,7 @@ export async function insertDataParse(
           if (!cols2 || !(
             cols2.filter(c => c.references?.[0].ftable === fileTable).length === 1 &&
             cols2.filter(c => c.references?.[0].ftable === _this.name).length === 1
-          )){
+          )) {
             console.log({ tbl1, tbl2, tbl3, name: _this.name, tthisName: this.name })
             throw "Second joining table (" + tbl2 + ")  not of expected format. Must contain exactly one reference column for each table (file table and target table)  ";
           }
@@ -228,7 +227,7 @@ export async function insertDataParse(
 
           /* Insert in key_lookup table */
           await Promise.all(insertedChildren.map(async t3Child => {
-            let tbl2Row: AnyObject = {};
+            const tbl2Row: AnyObject = {};
 
             colsRefT3.map(col => {
               tbl2Row[col.name] = t3Child[col.references![0].fcols[0]];
@@ -250,9 +249,9 @@ export async function insertDataParse(
         if (targetTableRules && insertedChildren?.length && returning) {
           const targetTableHandler = dbTX![targetTable] as TableHandler;
           const targetReturning = await targetTableHandler.prepareReturning("*", targetTableHandler.parseFieldFilter(targetTableRules?.insert?.returningFields));
-          let clientTargetInserts = insertedChildren.map(d => {
-            let _d = { ...d };
-            let res: AnyObject = {};
+          const clientTargetInserts = insertedChildren.map(d => {
+            const _d = { ...d };
+            const res: AnyObject = {};
             targetReturning.map(r => {
               res[r.alias] = _d[r.alias]
             });
@@ -269,11 +268,11 @@ export async function insertDataParse(
     return row;
   }));
 
-  let result = isMultiInsert ? _data : _data[0];
+  const result = isMultiInsert ? _data : _data[0];
   // if(validate && !isNestedInsert){
   //     result = isMultiInsert? await Promise.all(_data.map(async d => await validate({ ...d }))) : await validate({ ..._data[0] });
   // }
-  let res = isNestedInsert ?
+  const res = isNestedInsert ?
     { insertResult: result } :
     { data: result };
 
@@ -296,7 +295,7 @@ const getJoinPath = async (tableHandler: TableHandler, targetTable: string): Pro
   const jp = tableHandler.dboBuilder.joinPaths.find(jp => jp.t1 === tableHandler.name && jp.t2 === targetTable);
   if (!jp) {
     console.trace(tableHandler.dboBuilder.joinPaths)
-    const pref = tableHandler.dboBuilder.prostgles.opts.joins !== "inferred"? "Joins are not inferred! " : ""
+    const pref = tableHandler.dboBuilder.prostgles.opts.joins !== "inferred" ? "Joins are not inferred! " : ""
     throw new Error(`${pref}Could not find a single join path for the nested data ( sourceTable: ${tableHandler.name} targetTable: ${targetTable} ) `);
   }
   return jp;
@@ -307,7 +306,7 @@ const referencedInsert = async (tableHandler: TableHandler, dbTX: TableHandlers
 
   const thisInfo = await tableHandler.getInfo();
   await getJoinPath(tableHandler, targetTable);
-  
+
   if (!targetData || !dbTX?.[targetTable] || !("insert" in dbTX[targetTable])) throw new Error("childInsertErr: Table handler missing for referenced table: " + targetTable);
 
   const childRules = await canInsert(tableHandler, targetTable, localParams);
@@ -326,5 +325,5 @@ const referencedInsert = async (tableHandler: TableHandler, dbTX: TableHandlers
         })
       )
   );
-    
+
 }

package/lib/DboBuilder/parseUpdateRules.js

@@ -87,7 +87,7 @@ async function parseUpdateRules(filter, newData, params, tableRules, localParams
                 try {
                     const { data, allowedCols } = this.validateNewData({ row: forcedData, forcedData: undefined, allowedFields: "*", tableRules, fixIssues: false });
                     const updateQ = await this.colSet.getUpdateQuery(data, allowedCols, this.dbTX || this.dboBuilder.dbo, validate ? ((row) => validate({ update: row, filter: {} }, this.dbTX || this.dboBuilder.dbo)) : undefined); //pgp.helpers.update(data, columnSet)
-                    let query = updateQ + " WHERE FALSE ";
+                    const query = updateQ + " WHERE FALSE ";
                     await this.db.any("EXPLAIN " + query);
                 }
                 catch (e) {
@@ -98,7 +98,7 @@ async function parseUpdateRules(filter, newData, params, tableRules, localParams
         }
     }
     /* Update all allowed fields (fields) except the forcedFilter (so that the user cannot change the forced filter values) */
-    let _fields = this.parseFieldFilter(fields);
+    const _fields = this.parseFieldFilter(fields);
     /**
      * A forced filter must be basic
      */

package/lib/DboBuilder/parseUpdateRules.ts

@@ -127,7 +127,7 @@ export async function parseUpdateRules(
             this.dbTX || this.dboBuilder.dbo,
             validate ? ((row) => validate!({ update: row, filter: {} }, this.dbTX || this.dboBuilder.dbo)) : undefined
           ) //pgp.helpers.update(data, columnSet)
-          let query = updateQ + " WHERE FALSE ";
+          const query = updateQ + " WHERE FALSE ";
           await this.db.any("EXPLAIN " + query);
         } catch (e) {
           throw " issue with forcedData: \nVALUE: " + JSON.stringify(forcedData, null, 2) + "\nERROR: " + e;
@@ -139,7 +139,7 @@ export async function parseUpdateRules(
   }
 
   /* Update all allowed fields (fields) except the forcedFilter (so that the user cannot change the forced filter values) */
-  let _fields = this.parseFieldFilter(fields);
+  const _fields = this.parseFieldFilter(fields);
 
   /**
    * A forced filter must be basic

package/lib/DboBuilder/runSQL.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runSQL.d.ts","sourceRoot":"","sources":["runSQL.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuC,UAAU,EAAa,MAAM,iBAAiB,CAAC;AAC7F,OAAO,EAAE,UAAU,EAAE,WAAW,EAAyB,MAAM,eAAe,CAAC;AAC/E,OAAO,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAK7C,wBAAsB,MAAM,CAAC,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,UAAU,GAAG,SAAS,EAAE,WAAW,CAAC,EAAE,WAAW,gBAuHpI;AAED,eAAO,MAAM,SAAS,cAAqB,SAAS,gBAAgB,WAAW,KAAG,QAAQ,OAAO,CAOhG,CAAA;AAED,eAAO,MAAM,eAAe,cAAmB,QAAQ,OAAO,CAE7D,CAAA"}
+{"version":3,"file":"runSQL.d.ts","sourceRoot":"","sources":["runSQL.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,UAAU,EAAa,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,UAAU,EAAE,WAAW,EAAyB,MAAM,eAAe,CAAC;AAC/E,OAAO,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAK7C,wBAAsB,MAAM,CAAC,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,UAAU,GAAG,SAAS,EAAE,WAAW,CAAC,EAAE,WAAW,gBAuHpI;AAED,eAAO,MAAM,SAAS,cAAqB,SAAS,gBAAgB,WAAW,KAAG,QAAQ,OAAO,CAOhG,CAAA;AAED,eAAO,MAAM,eAAe,cAAmB,QAAQ,OAAO,CAE7D,CAAA"}

package/lib/DboBuilder/runSQL.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.canCreateTables = exports.canRunSQL = exports.runSQL = void 0;
 const DboBuilder_1 = require("../DboBuilder");
 const PubSubManager_1 = require("../PubSubManager/PubSubManager");
-const { ParameterizedQuery: PQ } = require('pg-promise');
+const pg_promise_1 = require("pg-promise");
 async function runSQL(query, params, options, localParams) {
     if (query?.replace(/\s\s+/g, ' ').toLowerCase().includes("create extension pg_stat_statements")) {
         const { shared_preload_libraries } = await this.db.oneOrNone('SHOW shared_preload_libraries');
@@ -54,9 +54,9 @@ async function runSQL(query, params, options, localParams) {
     else if (db) {
         let finalQuery = query + "";
         if (returnType === "arrayMode" && !["listen ", "notify "].find(c => query.toLowerCase().trim().startsWith(c))) {
-            finalQuery = new PQ({ text: hasParams ? DboBuilder_1.pgp.as.format(query, params) : query, rowMode: "array" });
+            finalQuery = (new pg_promise_1.ParameterizedQuery({ text: hasParams ? DboBuilder_1.pgp.as.format(query, params) : query, rowMode: "array" }));
         }
-        let _qres = await db.result(finalQuery, hasParams ? params : undefined);
+        const _qres = await db.result(finalQuery, hasParams ? params : undefined);
         const { fields, rows, command } = _qres;
         /**
          * Fallback for watchSchema in case not superuser and cannot add db event listener
@@ -94,7 +94,7 @@ async function runSQL(query, params, options, localParams) {
             return rows.map(r => Object.values(r[0]));
         }
         else {
-            let qres = {
+            const qres = {
                 duration: 0,
                 ..._qres,
                 fields: fields?.map(f => {
@@ -122,7 +122,7 @@ const canRunSQL = async (prostgles, localParams) => {
         return true;
     const { socket } = localParams;
     const publishParams = await prostgles.publishParser.getPublishParams({ socket });
-    let res = await prostgles.opts.publishRawSQL?.(publishParams);
+    const res = await prostgles.opts.publishRawSQL?.(publishParams);
     return Boolean(res && typeof res === "boolean" || res === "*");
 };
 exports.canRunSQL = canRunSQL;

package/lib/DboBuilder/runSQL.ts

@@ -1,8 +1,8 @@
-import { PG_COLUMN_UDT_DATA_TYPE, SQLHandler, SQLOptions, SQLResult } from "prostgles-types";
+import { AnyObject, SQLOptions, SQLResult } from "prostgles-types";
 import { DboBuilder, LocalParams, pgp, postgresToTsType } from "../DboBuilder";
 import { DB, Prostgles } from "../Prostgles";
 import { PubSubManager } from "../PubSubManager/PubSubManager";
-const { ParameterizedQuery: PQ } = require('pg-promise');
+import { ParameterizedQuery as PQ } from 'pg-promise';
 
 
 export async function runSQL(this: DboBuilder, query: string, params: any, options: SQLOptions | undefined, localParams?: LocalParams) {
@@ -56,10 +56,10 @@ export async function runSQL(this: DboBuilder, query: string, params: any, optio
 
     let finalQuery = query + "";
     if (returnType === "arrayMode" && !["listen ", "notify "].find(c => query.toLowerCase().trim().startsWith(c))) {
-      finalQuery = new PQ({ text: hasParams ? pgp.as.format(query, params) : query, rowMode: "array" });
+      finalQuery = (new PQ({ text: hasParams ? pgp.as.format(query, params) : query, rowMode: "array" })) as any;
     }
 
-    let _qres = await db.result(finalQuery, hasParams ? params : undefined)
+    const _qres = await db.result<AnyObject>(finalQuery, hasParams ? params : undefined)
     const { fields, rows, command } = _qres;
 
     /**
@@ -100,7 +100,7 @@ export async function runSQL(this: DboBuilder, query: string, params: any, optio
 
     } else {
 
-      let qres: SQLResult<typeof returnType> = {
+      const qres: SQLResult<typeof returnType> = {
         duration: 0,
         ..._qres,
         fields: fields?.map(f => {
@@ -131,7 +131,7 @@ export const canRunSQL = async (prostgles: Prostgles, localParams?: LocalParams)
 
   const { socket } = localParams;
   const publishParams = await prostgles.publishParser!.getPublishParams({ socket });
-  let res = await prostgles.opts.publishRawSQL?.(publishParams);
+  const res = await prostgles.opts.publishRawSQL?.(publishParams);
   return Boolean(res && typeof res === "boolean" || res === "*");
 }
 

package/lib/DboBuilder/subscribe.d.ts

@@ -2,7 +2,7 @@ import { AnyObject, SubscribeParams } from "prostgles-types";
 import { Filter, LocalParams } from "../DboBuilder";
 import { TableRule } from "../PublishParser";
 import { ViewHandler } from "./ViewHandler";
-export declare type LocalFunc = (items: AnyObject[]) => any;
+export type LocalFunc = (items: AnyObject[]) => any;
 declare function subscribe(this: ViewHandler, filter: Filter, params: SubscribeParams, localFunc: LocalFunc): Promise<{
     unsubscribe: () => any;
 }>;

package/lib/DboBuilder/subscribe.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"subscribe.d.ts","sourceRoot":"","sources":["subscribe.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAU,eAAe,EAAE,MAAM,iBAAiB,CAAC;AACrE,OAAO,EAAE,MAAM,EAAE,WAAW,EAAoC,MAAM,eAAe,CAAC;AACtF,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,oBAAY,SAAS,GAAG,CAAC,KAAK,EAAE,SAAS,EAAE,KAAK,GAAG,CAAC;AAEpD,iBAAe,SAAS,CAAC,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC;IAAE,WAAW,EAAE,MAAM,GAAG,CAAA;CAAE,CAAC,CAAA;AAC/I,iBAAe,SAAS,CAAC,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,SAAS,EAAE,SAAS,EAAE,WAAW,EAAE,SAAS,GAAG,SAAS,EAAE,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;AA4NzL,OAAO,EAAE,SAAS,EAAE,CAAA"}
+{"version":3,"file":"subscribe.d.ts","sourceRoot":"","sources":["subscribe.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAU,eAAe,EAAE,MAAM,iBAAiB,CAAC;AACrE,OAAO,EAAE,MAAM,EAAE,WAAW,EAAoC,MAAM,eAAe,CAAC;AACtF,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,MAAM,MAAM,SAAS,GAAG,CAAC,KAAK,EAAE,SAAS,EAAE,KAAK,GAAG,CAAC;AAEpD,iBAAe,SAAS,CAAC,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC;IAAE,WAAW,EAAE,MAAM,GAAG,CAAA;CAAE,CAAC,CAAA;AAC/I,iBAAe,SAAS,CAAC,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,SAAS,EAAE,SAAS,EAAE,WAAW,EAAE,SAAS,GAAG,SAAS,EAAE,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;AA4NzL,OAAO,EAAE,SAAS,EAAE,CAAA"}

package/lib/DboBuilder/subscribe.js

@@ -55,7 +55,7 @@ async function subscribe(filter, params, localFunc, table_rules, localParams) {
                         relatedTables: []
                     };
                     viewOptions.relatedTables = await Promise.all(tableIds.map(async (tableID) => {
-                        const table = this.dboBuilder.USER_TABLES?.find(t => t.relid === +tableID);
+                        const table = this.dboBuilder.USER_TABLES.find(t => t.relid === +tableID);
                         let tableCols = tableColumns.filter(tc => tc.tableID.toString() === tableID);
                         /** If table has primary keys and they are all in this view then use only primary keys */
                         if (table?.pkey_columns?.every(pkey => tableCols.some(c => c.columnName === pkey))) {
@@ -101,7 +101,7 @@ async function subscribe(filter, params, localFunc, table_rules, localParams) {
                             }
                         }
                         return {
-                            tableName: tableName,
+                            tableName,
                             tableNameEscaped: JSON.stringify(tableName),
                             condition: "TRUE"
                         };
@@ -159,7 +159,7 @@ async function subscribe(filter, params, localFunc, table_rules, localParams) {
                 const pubSubManager = await this.dboBuilder.getPubSubManager();
                 pubSubManager.removeLocalSub(this.name, condition, localFunc);
             };
-            let res = Object.freeze({ unsubscribe });
+            const res = Object.freeze({ unsubscribe });
             return res;
         }
     }

package/lib/DboBuilder/subscribe.ts

@@ -75,7 +75,7 @@ async function subscribe(this: ViewHandler, filter: Filter, params: SubscribePar
               relatedTables: []
             }
             viewOptions.relatedTables = await Promise.all(tableIds.map(async tableID => {
-              const table = this.dboBuilder.USER_TABLES?.find(t => t.relid === +tableID)!;
+              const table = this.dboBuilder.USER_TABLES!.find(t => t.relid === +tableID)!;
               let tableCols = tableColumns.filter(tc => tc.tableID!.toString() === tableID);
 
               /** If table has primary keys and they are all in this view then use only primary keys */
@@ -128,7 +128,7 @@ async function subscribe(this: ViewHandler, filter: Filter, params: SubscribePar
               }
 
               return {
-                tableName: tableName,
+                tableName,
                 tableNameEscaped: JSON.stringify(tableName),// [table.schemaname, table.relname].map(v => JSON.stringify(v)).join("."),
                 condition: "TRUE"
               }
@@ -193,7 +193,7 @@ async function subscribe(this: ViewHandler, filter: Filter, params: SubscribePar
         const pubSubManager = await this.dboBuilder.getPubSubManager();
         pubSubManager.removeLocalSub(this.name, condition, localFunc)
       };
-      let res: { unsubscribe: () => any } = Object.freeze({ unsubscribe })
+      const res: { unsubscribe: () => any } = Object.freeze({ unsubscribe })
       return res;
     }
   } catch (e) {