prostgles-server 3.0.154 → 4.0.1

package/lib/DboBuilder/ViewHandler.ts

@@ -77,7 +77,7 @@ class ColSet {
        * Add conversion functions for PostGIS data
        */
       let escapedVal = "";
-      if (["geometry", "geography"].includes(col.udt_name) && row[key] && isPlainObject(row[key])) {
+      if (["geometry", "geography"].includes(col.udt_name) && isObject(row[key])) {
 
         const basicFunc = (args: any[]) => {
           return args.map(arg => asValue(arg)).join(", ")
@@ -86,13 +86,14 @@ class ColSet {
         type ConvertionFunc =  { name: string; getQuery: (args: any[]) => string; }
         const convertionFuncs: ConvertionFunc[] = [
           ...[
-          "ST_GeomFromText", 
-          "ST_Point",
-          "ST_MakePoint",
-          "ST_MakePointM",
-          "ST_PointFromText",
-          "ST_GeomFromEWKT",
-          "ST_GeomFromGeoJSON"].map(name => ({
+            "ST_GeomFromText", 
+            "ST_Point",
+            "ST_MakePoint",
+            "ST_MakePointM",
+            "ST_PointFromText",
+            "ST_GeomFromEWKT",
+            "ST_GeomFromGeoJSON"
+          ].map(name => ({
             name, 
             getQuery: () => `${name}(${basicFunc(funcArgs)})`
           })),
@@ -103,7 +104,7 @@ class ColSet {
         ];
 
         const dataKeys = Object.keys(row[key]);
-        const funcName = dataKeys[0];
+        const funcName = dataKeys[0]!;
         const func = convertionFuncs.find(f => f.name === funcName); 
         const funcArgs = row[key]?.[funcName]
         if (dataKeys.length !== 1 || !func || !Array.isArray(funcArgs)) {
@@ -287,10 +288,10 @@ export class ViewHandler {
       return on.map(cond => Object.keys(cond).map(lKey => `${leftTable}.${lKey} = ${rightTable}.${cond[lKey]}`).join("\nAND ")).join(" OR ")
     }
 
-    let toOne = true;
+    // let toOne = true;
     const query = this.joins.map(({ tables, on, type }, i) => {
         if (type.split("-")[1] === "many") {
-          toOne = false;
+          // toOne = false;
         }
         const tl = `tl${startAlias + i}`,
           tr = `tr${startAlias + i}`;
@@ -347,7 +348,7 @@ export class ViewHandler {
 
     /* Make the join chain info excluding root table */
     paths = (path || jp.path).slice(1).map((t2, i, arr) => {
-      const t1 = i === 0 ? source : arr[i - 1];
+      const t1 = i === 0 ? source : arr[i - 1]!;
 
       this.joins ??= this.dboBuilder.joins;
 
@@ -359,8 +360,8 @@ export class ViewHandler {
 
       jo.on.map(cond => {
         const condArr: [string, string][] = [];
-        Object.keys(cond).map(leftKey => {
-          const rightKey = cond[leftKey];
+        getKeys(cond).map(leftKey => {
+          const rightKey = cond[leftKey]!;
 
           /* Left table is joining on keys */
           if (jo.tables[0] === t1) {
@@ -857,7 +858,7 @@ export class ViewHandler {
     const isNotExists = ["$notExists", "$notExistsJoined"].includes(eConfig.existType);
 
     const { f2, tables, isJoined } = eConfig;
-    const t2 = tables[tables.length - 1];
+    const t2 = tables.at(-1)!;
 
     tables.forEach(t => {
       if (!this.dboBuilder.dbo[t]) throw { stack: ["prepareExistCondition()"], message: `Invalid or dissallowed table: ${t}` };
@@ -874,7 +875,7 @@ export class ViewHandler {
       let joinPaths: JoinInfo["paths"] = [];
       let expectOne = true;
       tables.map((t2, depth) => {
-        const t1 = depth ? tables[depth - 1] : thisTable;
+        const t1 = (depth ? tables[depth - 1] : thisTable)!;
         let exactPaths: string[] | undefined = [t1, t2];
 
         if (!depth && eConfig.shortestJoin) exactPaths = undefined;
@@ -889,9 +890,10 @@ export class ViewHandler {
       function makeJoin(joinInfo: JoinInfo, ji: number) {
         const { paths } = joinInfo;
         const jp = paths[ji];
+        if(!jp) throw "jp undef";
 
         // let prevTable = ji? paths[ji - 1].table : jp.source;
-        const table = paths[ji].table;
+        const table = jp.table;
         const tableAlias = asName(ji < paths.length - 1 ? `jd${ji}` : table);
         const prevTableAlias = asName(ji ? `jd${ji - 1}` : thisTable);
 
@@ -1024,8 +1026,8 @@ export class ViewHandler {
       if (_orderBy && !_orderBy.find(v => typeof v !== "string")) {
         /* [string] */
         _ob = _orderBy.map(key => ({ key, asc: true }));
-      } else if (_orderBy.find(v => isPlainObject(v) && Object.keys(v).length)) {
-        _ob = _orderBy.map(v => parseOrderObj(v, true)[0]);
+      } else if (_orderBy.find(v => isObject(v) && !isEmpty(v))) {
+        _ob = _orderBy.map(v => parseOrderObj(v, true)[0]!);
       } else return throwErr();
     } else return throwErr();
 
@@ -1090,7 +1092,7 @@ export class ViewHandler {
     /* If no limit then set as the lesser of (100, maxLimit) */
     // } else 
     if (_limit !== null && !Number.isInteger(_limit) && p.select.maxLimit !== null) {
-      _limit = [100, p.select.maxLimit].filter(Number.isInteger).sort((a, b) => a - b)[0];
+      _limit = [100, p.select.maxLimit].filter(Number.isInteger).sort((a, b) => a - b)[0]!;
     } else {
 
       /* If a limit higher than maxLimit specified throw error */

package/lib/DboBuilder/getCondition.js

@@ -21,7 +21,7 @@ async function getCondition(params) {
     const ERR = "Invalid exists filter. \nExpecting somethibng like: \n | { $exists: { tableName.tableName2: Filter } } \n  | { $exists: { \"**.tableName3\": Filter } }\n | { path: string[]; filter: AnyObject }";
     const SP_WILDCARD = "**";
     const exists = (0, prostgles_types_1.getKeys)(filter)
-        .filter(k => prostgles_types_1.EXISTS_KEYS.includes(k) && Object.keys(filter[k] ?? {}).length)
+        .filter((k) => prostgles_types_1.EXISTS_KEYS.includes(k) && !!Object.keys(filter[k] ?? {}).length)
         .map(key => {
         const isJoined = key.toLowerCase().includes("join");
         const filterValue = filter[key];

package/lib/DboBuilder/getCondition.ts

@@ -35,7 +35,7 @@ export async function getCondition(
   const ERR = "Invalid exists filter. \nExpecting somethibng like: \n | { $exists: { tableName.tableName2: Filter } } \n  | { $exists: { \"**.tableName3\": Filter } }\n | { path: string[]; filter: AnyObject }"
   const SP_WILDCARD = "**";
   const exists: ExistsFilterConfig[] = getKeys(filter)
-    .filter(k => EXISTS_KEYS.includes(k as EXISTS_KEY) && Object.keys(filter[k] ?? {}).length)
+    .filter((k ): k is typeof EXISTS_KEYS[number] => EXISTS_KEYS.includes(k as EXISTS_KEY) && !!Object.keys(filter[k] ?? {}).length)
     .map(key => {
 
       const isJoined = key.toLowerCase().includes("join");
@@ -49,7 +49,7 @@ export async function getCondition(
       const dataKeys = Object.keys(filterValue);
       const isDetailed = dataKeys.length === 2 && dataKeys.every(key => ["path", "filter"].includes(key));
 
-      const firstKey = dataKeys[0];
+      const firstKey = dataKeys[0]!;
 
       /**
        * Prevent some errors with table names that contain "."

package/lib/DboBuilder/insert.js

@@ -37,7 +37,7 @@ async function insert(rowOrRows, param2, param3_unused, tableRules, localParams)
                     const keys = Object.keys(forcedData);
                     if (keys.length) {
                         const dataCols = keys.filter(k => this.column_names.includes(k));
-                        const nestedInsertCols = keys.filter(k => !this.column_names.includes(k) && this.dboBuilder.dbo[k].insert);
+                        const nestedInsertCols = keys.filter(k => !this.column_names.includes(k) && this.dboBuilder.dbo[k]?.insert);
                         if (nestedInsertCols.length) {
                             throw `Nested insert not supported for forcedData rule: ${nestedInsertCols}`;
                         }

package/lib/DboBuilder/insert.ts

@@ -45,7 +45,7 @@ export async function insert(this: TableHandler, rowOrRows: (AnyObject | AnyObje
           const keys = Object.keys(forcedData);
           if (keys.length) {
             const dataCols = keys.filter(k => this.column_names.includes(k));
-            const nestedInsertCols = keys.filter(k => !this.column_names.includes(k) && this.dboBuilder.dbo[k].insert);
+            const nestedInsertCols = keys.filter(k => !this.column_names.includes(k) && this.dboBuilder.dbo[k]?.insert);
             if(nestedInsertCols.length){
               throw `Nested insert not supported for forcedData rule: ${nestedInsertCols}`;
             }

package/lib/DboBuilder/insertDataParse.js

@@ -164,8 +164,8 @@ async function insertDataParse(data, param2, param3_unused, tableRules, _localPa
                         throw "Only media allowed to have nested inserts more than 2 tables apart";
                     }
                     /* We expect tbl2 to have only 2 columns (media_id and foreign_id) */
-                    if (!cols2 || !(cols2.filter(c => c.references?.[0].ftable === fileTable).length === 1 &&
-                        cols2.filter(c => c.references?.[0].ftable === _this.name).length === 1)) {
+                    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)  ";
                     }
@@ -235,8 +235,9 @@ const getJoinPath = async (tableHandler, targetTable) => {
 const referencedInsert = async (tableHandler, dbTX, localParams, targetTable, targetData) => {
     const thisInfo = await tableHandler.getInfo();
     await getJoinPath(tableHandler, targetTable);
-    if (!targetData || !dbTX?.[targetTable] || !("insert" in dbTX[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);
     if (thisInfo.has_media === "one" && thisInfo.media_table_name === targetTable && Array.isArray(targetData) && targetData.length > 1) {
         throw "Constraint check fail: Cannot insert more than one record into " + JSON.stringify(targetTable);

package/lib/DboBuilder/insertDataParse.ts

@@ -65,9 +65,9 @@ export async function insertDataParse(
       }
       if (insertedCol) {
         return {
-          tableName: insertedCol.references![0].ftable!,
+          tableName: insertedCol.references![0]!.ftable!,
           col: insertedCol.name,
-          fcol: insertedCol.references![0].fcols[0]!
+          fcol: insertedCol.references![0]!.fcols[0]!
         }
       }
       return undefined;
@@ -145,11 +145,11 @@ 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];
+          const foreignKey = colRows[0]![colInsert.fcol];
           rootData[colInsert.col] = foreignKey;
         }
       }
@@ -179,8 +179,8 @@ export async function insertDataParse(
         const [tbl1, tbl2, tbl3] = path;
         targetTableRules = await canInsert(this, targetTable, localParams);   //  tbl3
 
-        const cols2 = this.dboBuilder.dbo[tbl2].columns || [];
-        if (!this.dboBuilder.dbo[tbl2]) throw "Invalid/disallowed table: " + tbl2;
+        const cols2 = this.dboBuilder.dbo[tbl2!]!.columns || [];
+        if (!this.dboBuilder.dbo[tbl2!]) throw "Invalid/disallowed table: " + tbl2;
         const colsRefT1 = cols2?.filter(c => c.references?.some(rc => rc.cols.length === 1 && rc.ftable === tbl1));
 
 
@@ -196,7 +196,7 @@ export async function insertDataParse(
             childDataItems.map((d: AnyObject) => {
               const result = { ...d };
               colsRefT1.map(col => {
-                result[col.references![0].cols[0]] = fullRootResult[col.references![0].fcols[0]]
+                result[col.references![0]!.cols[0]!] = fullRootResult[col.references![0]!.fcols[0]!]
               })
               return result;
             }),
@@ -216,8 +216,8 @@ export async function insertDataParse(
 
           /* We expect tbl2 to have only 2 columns (media_id and foreign_id) */
           if (!cols2 || !(
-            cols2.filter(c => c.references?.[0].ftable === fileTable).length === 1 &&
-            cols2.filter(c => c.references?.[0].ftable === _this.name).length === 1
+            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)  ";
@@ -230,14 +230,14 @@ export async function insertDataParse(
             const tbl2Row: AnyObject = {};
 
             colsRefT3.map(col => {
-              tbl2Row[col.name] = t3Child[col.references![0].fcols[0]];
+              tbl2Row[col.name] = t3Child[col.references![0]!.fcols[0]!];
             })
             colsRefT1.map(col => {
-              tbl2Row[col.name] = fullRootResult[col.references![0].fcols[0]];
+              tbl2Row[col.name] = fullRootResult[col.references![0]!.fcols[0]!];
             })
             // console.log({ rootResult, tbl2Row, t3Child, colsRefT3, colsRefT1, t: this.t?.ctx?.start });
 
-            await childInsert(tbl2Row, tbl2);//.then(() => {});
+            await childInsert(tbl2Row, tbl2!);//.then(() => {});
           }));
 
         } else {
@@ -307,7 +307,9 @@ 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);
+  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);
 

package/lib/DboBuilder/subscribe.d.ts

@@ -1,4 +1,4 @@
-import { AnyObject, SubscribeParams } from "prostgles-types";
+import { AnyObject, SubscribeParams, SubscriptionChannels } from "prostgles-types";
 import { Filter, LocalParams } from "../DboBuilder";
 import { TableRule } from "../PublishParser";
 import { ViewHandler } from "./ViewHandler";
@@ -6,6 +6,6 @@ export type LocalFunc = (items: AnyObject[]) => any;
 declare function subscribe(this: ViewHandler, filter: Filter, params: SubscribeParams, localFunc: LocalFunc): Promise<{
     unsubscribe: () => any;
 }>;
-declare function subscribe(this: ViewHandler, filter: Filter, params: SubscribeParams, localFunc: undefined, table_rules: TableRule | undefined, localParams: LocalParams): Promise<string>;
+declare function subscribe(this: ViewHandler, filter: Filter, params: SubscribeParams, localFunc: undefined, table_rules: TableRule | undefined, localParams: LocalParams): Promise<SubscriptionChannels>;
 export { subscribe };
 //# sourceMappingURL=subscribe.d.ts.map

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,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAC7D,OAAO,EAAE,MAAM,EAAE,WAAW,EAAc,MAAM,eAAe,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAG5C,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;AAsFzL,OAAO,EAAE,SAAS,EAAE,CAAA"}
+{"version":3,"file":"subscribe.d.ts","sourceRoot":"","sources":["subscribe.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AACnF,OAAO,EAAE,MAAM,EAAE,WAAW,EAAc,MAAM,eAAe,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAG5C,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,oBAAoB,CAAC,CAAA;AAqFvM,OAAO,EAAE,SAAS,EAAE,CAAA"}

package/lib/DboBuilder/subscribe.js

@@ -42,24 +42,23 @@ async function subscribe(filter, params, localFunc, table_rules, localParams) {
             throttle,
             last_throttled: 0,
         };
+        const pubSubManager = await this.dboBuilder.getPubSubManager();
         if (!localFunc) {
             const { socket } = localParams ?? {};
-            const pubSubManager = await this.dboBuilder.getPubSubManager();
             return pubSubManager.addSub({
                 ...commonSubOpts,
                 socket,
                 func: undefined,
                 socket_id: socket?.id,
-            }).then(channelName => ({ channelName }));
+            });
         }
         else {
-            const pubSubManager = await this.dboBuilder.getPubSubManager();
             pubSubManager.addSub({
                 ...commonSubOpts,
                 socket: undefined,
                 func: localFunc,
                 socket_id: undefined,
-            }).then(channelName => ({ channelName }));
+            });
             const unsubscribe = async () => {
                 const pubSubManager = await this.dboBuilder.getPubSubManager();
                 pubSubManager.removeLocalSub(this.name, condition, localFunc);

package/lib/DboBuilder/subscribe.ts

@@ -1,4 +1,4 @@
-import { AnyObject, SubscribeParams } from "prostgles-types";
+import { AnyObject, SubscribeParams, SubscriptionChannels } from "prostgles-types";
 import { Filter, LocalParams, parseError } from "../DboBuilder";
 import { TableRule } from "../PublishParser";
 import { omitKeys } from "../PubSubManager/PubSubManager"; 
@@ -8,8 +8,8 @@ import { getSubscribeRelatedTables } from "./getSubscribeRelatedTables";
 export type LocalFunc = (items: AnyObject[]) => any;
 
 async function subscribe(this: ViewHandler, filter: Filter, params: SubscribeParams, localFunc: LocalFunc): Promise<{ unsubscribe: () => any }> 
-async function subscribe(this: ViewHandler, filter: Filter, params: SubscribeParams, localFunc: undefined, table_rules: TableRule | undefined, localParams: LocalParams): Promise<string>
-async function subscribe(this: ViewHandler, filter: Filter, params: SubscribeParams, localFunc?: LocalFunc, table_rules?: TableRule, localParams?: LocalParams): Promise<{ unsubscribe: () => any } | string> 
+async function subscribe(this: ViewHandler, filter: Filter, params: SubscribeParams, localFunc: undefined, table_rules: TableRule | undefined, localParams: LocalParams): Promise<SubscriptionChannels>
+async function subscribe(this: ViewHandler, filter: Filter, params: SubscribeParams, localFunc?: LocalFunc, table_rules?: TableRule, localParams?: LocalParams): Promise<{ unsubscribe: () => any } | SubscriptionChannels> 
 {
  
   try {
@@ -60,27 +60,26 @@ async function subscribe(this: ViewHandler, filter: Filter, params: SubscribePar
       last_throttled: 0,
     } as const;
 
+    const pubSubManager = await this.dboBuilder.getPubSubManager();
     if (!localFunc) {    
 
       const { socket } = localParams ?? {};
-      const pubSubManager = await this.dboBuilder.getPubSubManager();
       return pubSubManager.addSub({
         ...commonSubOpts,
         socket, 
         func: undefined,
         socket_id: socket?.id, 
-      }).then(channelName => ({ channelName })) as any;
-      
+      });
+
     } else {
 
-      const pubSubManager = await this.dboBuilder.getPubSubManager();
       pubSubManager.addSub({ 
         ...commonSubOpts,
         socket: undefined,  
         func: localFunc, 
         socket_id: undefined, 
-      }).then(channelName => ({ channelName }));
-
+      });
+      
       const unsubscribe = async () => {
         const pubSubManager = await this.dboBuilder.getPubSubManager();
         pubSubManager.removeLocalSub(this.name, condition, localFunc)

package/lib/DboBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DboBuilder.d.ts","sourceRoot":"","sources":["DboBuilder.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"DboBuilder.d.ts","sourceRoot":"","sources":["DboBuilder.ts"],"names":[],"mappings":"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"}

package/lib/DboBuilder.js

@@ -73,12 +73,12 @@ function canBeUsedAsIsInTypescript(str) {
     if (!str)
         return false;
     const isAlphaNumericOrUnderline = str.match(/^[a-z0-9_]+$/i);
-    const startsWithCharOrUnderscore = str[0].match(/^[a-z_]+$/i);
+    const startsWithCharOrUnderscore = str[0]?.match(/^[a-z_]+$/i);
     return Boolean(isAlphaNumericOrUnderline && startsWithCharOrUnderscore);
 }
 function escapeTSNames(str, capitalize = false) {
     let res = str;
-    res = (capitalize ? str[0].toUpperCase() : str[0]) + str.slice(1);
+    res = (capitalize ? str[0]?.toUpperCase() : str[0]) + str.slice(1);
     if (canBeUsedAsIsInTypescript(res))
         return res;
     return JSON.stringify(res);
@@ -103,8 +103,9 @@ function makeErrorFromPGError(err, localParams, view, allowedKeys) {
         if (constraint) {
             const cols = view.columns.filter(c => (!allowedKeys || allowedKeys.includes(c.name)) &&
                 constraint.conkey.includes(c.ordinal_position));
-            if (cols.length) {
-                errObject.column = cols[0].name;
+            const [firstCol] = cols;
+            if (firstCol) {
+                errObject.column = firstCol.name;
                 errObject.columns = cols.map(c => c.name);
             }
         }

package/lib/DboBuilder.ts

@@ -7,7 +7,7 @@
 import * as Bluebird from "bluebird"; 
 
 import * as pgPromise from 'pg-promise';
-import { canRunSQL, runSQL } from "./DboBuilder/runSQL";
+import { runSQL } from "./DboBuilder/runSQL";
 import pg = require('pg-promise/typescript/pg-subset');
 import {
   ColumnInfo, SQLOptions,
@@ -17,10 +17,9 @@ import {
   TableInfo as TInfo,
   SQLHandler,
   AnyObject,
-  SQLResult,
-  Select,
+  SQLResult, 
   JoinMaker,
-  isObject, isDefined, getKeys, ProstglesError, _PG_geometric, EXISTS_KEY
+  isObject, getKeys, ProstglesError, _PG_geometric, EXISTS_KEY
 } from "prostgles-types";
 
 export type SortItem = {
@@ -207,13 +206,13 @@ function snakify(str: string, capitalize = false): string {
 function canBeUsedAsIsInTypescript(str: string): boolean {
   if (!str) return false;
   const isAlphaNumericOrUnderline = str.match(/^[a-z0-9_]+$/i);
-  const startsWithCharOrUnderscore = str[0].match(/^[a-z_]+$/i);
+  const startsWithCharOrUnderscore = str[0]?.match(/^[a-z_]+$/i);
   return Boolean(isAlphaNumericOrUnderline && startsWithCharOrUnderscore);
 }
 
 export function escapeTSNames(str: string, capitalize = false): string {
   let res = str;
-  res = (capitalize ? str[0].toUpperCase() : str[0]) + str.slice(1);
+  res = (capitalize ? str[0]?.toUpperCase() : str[0]) + str.slice(1);
   if (canBeUsedAsIsInTypescript(res)) return res;
   return JSON.stringify(res);
 }
@@ -227,11 +226,6 @@ export type Aggregation = {
 
 export type Filter = AnyObject | { $and: Filter[] } | { $or: Filter[] };
 
-type SelectFunc = {
-  alias: string;
-  getQuery: (alias: string, tableAlias?: string) => string;
-}
-
 export type JoinInfo = {
   expectOne?: boolean,
   paths: {
@@ -355,8 +349,9 @@ export function makeErrorFromPGError(err: any, localParams?: LocalParams, view?:
         (!allowedKeys || allowedKeys.includes(c.name)) &&
         constraint.conkey.includes(c.ordinal_position)
       );
-      if (cols.length) {
-        errObject.column = cols[0].name;
+      const [firstCol] = cols;
+      if (firstCol) {
+        errObject.column = firstCol.name;
         errObject.columns = cols.map(c => c.name);
       }
     }
@@ -590,16 +585,16 @@ export class DboBuilder {
       this.joinGraph = {};
       this.joins.forEach(({ tables }) => {
         const _t = tables.slice().sort(),
-          t1 = _t[0],
-          t2 = _t[1];
+          t1 = _t[0]!,
+          t2 = _t[1]!;
 
         if (t1 === t2) return;
 
         this.joinGraph![t1] ??= {};
-        this.joinGraph![t1][t2] = 1;
+        this.joinGraph![t1]![t2] = 1;
 
         this.joinGraph![t2] ??= {};
-        this.joinGraph![t2][t1] = 1;
+        this.joinGraph![t2]![t1] = 1;
       });
       const tables = Array.from(new Set(this.joins.flatMap(t => t.tables)));
       this.joinPaths = [];
@@ -734,9 +729,8 @@ export class DboBuilder {
         dbTX.sql = this.runSQL;
       }
       getKeys(dbTX).map(k => {
-        dbTX[k].dbTX = dbTX;
-      });
-
+        dbTX[k]!.dbTX = dbTX;
+      }); 
       dbTX.sql = (q, args, opts, localP) => this.runSQL(q, args, opts, { tx: { dbTX, t }, ...(localP ?? {}) })
 
       return cb(dbTX, t);
@@ -1315,7 +1309,7 @@ async function getInferredJoins2(schema: TableSchema[]): Promise<Join[]> {
     tov.columns.map(col => {
       if (col.references) {
         col.references.forEach(r => {
-          const joinCols = r.cols.map((c, i) => ({ col1: c, col2: r.fcols[i] }));
+          const joinCols = r.cols.map((c, i) => ({ col1: c, col2: r.fcols[i]! }));
           let type: Join["type"] = "one-many";
           const ftablePkeys = schema.find(_tov => _tov.name === r.ftable)?.columns.filter(fcol => fcol.is_pkey);
           if (ftablePkeys?.length && ftablePkeys.every(fkey => r.fcols.includes(fkey.name))) {

package/lib/FileManager.js

@@ -613,7 +613,7 @@ const getFileTypeFromFilename = (fileName) => {
     const nameParts = fileName.split(".");
     if (nameParts.length < 2)
         return undefined;
-    const nameExt = nameParts[nameParts.length - 1].toLowerCase(), mime = (0, prostgles_types_1.getKeys)(prostgles_types_1.CONTENT_TYPE_TO_EXT).find(k => prostgles_types_1.CONTENT_TYPE_TO_EXT[k].includes(nameExt));
+    const nameExt = nameParts.at(-1).toLowerCase(), mime = (0, prostgles_types_1.getKeys)(prostgles_types_1.CONTENT_TYPE_TO_EXT).find(k => prostgles_types_1.CONTENT_TYPE_TO_EXT[k].includes(nameExt));
     if (!mime)
         return undefined;
     return {

package/lib/FileManager.ts

@@ -202,7 +202,7 @@ export default class FileManager {
       const tableConfig = config.referencedTables?.[tableName];
 
       if(tableConfig && isObject(tableConfig) && tableConfig.referenceColumns[colName]){
-        const colConfig = tableConfig.referenceColumns[colName];
+        const colConfig = tableConfig.referenceColumns[colName]!;
         if(colConfig.maxFileSizeMB){
           const actualBufferSize = Buffer.byteLength(buffer);
           if((actualBufferSize/1e6) > colConfig.maxFileSizeMB){
@@ -551,7 +551,7 @@ export default class FileManager {
       if(!this.dbo[refTable]) throw `Referenced table (${refTable}) from fileTable.referencedTables prostgles init config does not exist`;
       const cols = await (this.dbo[refTable] as TableHandler).getColumns();
 
-      const tableConfig = referencedTables[refTable];
+      const tableConfig = referencedTables[refTable]!;
       if(typeof tableConfig !== "string"){
         
         for await (const colName of getKeys(tableConfig.referenceColumns)){
@@ -595,7 +595,7 @@ export default class FileManager {
           console.error(`Could not make link table for ${refTable}. ${pKeyFields} must have exactly one primary key column. Current pkeys: ${pKeyFields.map(f => f.name)}`);
         }
   
-        const pkField = pKeyFields[0];
+        const pkField = pKeyFields[0]!;
         const refType = referencedTables[refTable];
   
         if(!this.dbo[lookupTableName]){
@@ -612,7 +612,7 @@ export default class FileManager {
           console.log(`Created ${action}`);
   
         } else {
-          const cols = await this.dbo[lookupTableName].getColumns!();
+          const cols = await this.dbo[lookupTableName]!.getColumns!();
           const badCols = cols.filter(c => !c.references);
           await Promise.all(badCols.map(async badCol => {
             console.error(
@@ -741,7 +741,7 @@ export const getFileTypeFromFilename = (fileName: string): { mime: ALLOWED_CONTE
 
   if(nameParts.length < 2) return undefined;
 
-  const nameExt = nameParts[nameParts.length - 1].toLowerCase(),
+  const nameExt = nameParts.at(-1)!.toLowerCase(),
     mime = getKeys(CONTENT_TYPE_TO_EXT).find(k => (CONTENT_TYPE_TO_EXT[k] as readonly string[]).includes(nameExt));
 
   if(!mime) return undefined;

package/lib/Filtering.ts

@@ -41,7 +41,7 @@ export const parseFilterItem = (args: ParseFilterItemArgs): string => {
     .join(" AND ")
   }
 
-  const fKey: string = fKeys[0];
+  const fKey: string = fKeys[0]!;
 
   /* Exists filter */
   if(EXISTS_KEYS.find(k => k in _f)){

package/lib/JSONBValidation/validation.ts

@@ -17,7 +17,7 @@ export function validate<T>(obj: T, key: keyof T, rawFieldType: JSONB.FieldType)
   if ("type" in fieldType && fieldType.type) {
     if (typeof fieldType.type !== "string") {
       getKeys(fieldType.type).forEach(subKey => {
-        validate(val, subKey as any, (fieldType.type as JSONB.ObjectType["type"])[subKey])
+        validate(val, subKey as any, (fieldType.type as JSONB.ObjectType["type"])[subKey]!)
       });
     }
     err += fieldType.type;
@@ -35,7 +35,7 @@ export function validate<T>(obj: T, key: keyof T, rawFieldType: JSONB.FieldType)
 
 export function validateSchema<S extends JSONB.ObjectType["type"]>(schema: S, obj: JSONB.GetObjectType<S>, objName?: string, optional = false) {
   if ((!schema || isEmpty(schema)) && !optional) throw new Error(`Expecting ${objName} to be defined`);
-  getKeys(schema).forEach(k => validate(obj as any, k, schema[k]));
+  getKeys(schema).forEach(k => validate(obj as any, k, schema[k]!));
 }
 
 
@@ -67,7 +67,7 @@ export function getJSONBSchemaTSTypes(schema: JSONB.JSONBSchema, colOpts: ColOpt
       const { type } = fieldType;
       const spacing = isOneOf ? " " : "  ";
       let objDef = ` {${spacing}` + getKeys(type).map(k => {
-        const fieldType = getFieldTypeObj(type[k]);
+        const fieldType = getFieldTypeObj(type[k]!);
         return `${spacing}${k}${fieldType.optional ? "?" : ""}: ` + addSemicolonIfMissing(getFieldType(fieldType, true, undefined, depth + 1));
       }).join(" ") + `${spacing}}`;
       if(!isOneOf){