prostgles-server 3.0.87 → 3.0.89

package/lib/TableConfig.d.ts

@@ -1,13 +1,13 @@
 import { AnyObject, TableInfo, ALLOWED_EXTENSION, ALLOWED_CONTENT_TYPE } from "prostgles-types";
 import { JoinInfo } from "./DboBuilder";
 import { DB, DBHandlerServer, Prostgles } from "./Prostgles";
-import { OneOf, ValidationSchema } from "./validation";
-declare type ColExtraInfo = {
+import { JSONB } from "./JSONBValidation/validation";
+type ColExtraInfo = {
     min?: string | number;
     max?: string | number;
     hint?: string;
 };
-export declare type I18N_Config<LANG_IDS> = {
+export type I18N_Config<LANG_IDS> = {
     [lang_id in keyof LANG_IDS]: string;
 };
 export declare const parseI18N: <LANG_IDS, Def extends string>(params: {
@@ -16,7 +16,7 @@ export declare const parseI18N: <LANG_IDS, Def extends string>(params: {
     defaultLang: string | keyof LANG_IDS;
     defaultValue: Def;
 }) => string | Def;
-declare type BaseTableDefinition<LANG_IDS = AnyObject> = {
+type BaseTableDefinition<LANG_IDS = AnyObject> = {
     info?: {
         label?: string | I18N_Config<LANG_IDS>;
     };
@@ -54,7 +54,7 @@ declare type BaseTableDefinition<LANG_IDS = AnyObject> = {
         };
     };
 };
-declare type LookupTableDefinition<LANG_IDS> = {
+type LookupTableDefinition<LANG_IDS> = {
     isLookupTable: {
         values: {
             [id_value: string]: {} | {
@@ -63,7 +63,7 @@ declare type LookupTableDefinition<LANG_IDS> = {
         };
     };
 };
-export declare type BaseColumn<LANG_IDS> = {
+export type BaseColumn<LANG_IDS> = {
     /**
      * Will add these values to .getColumns() result
      */
@@ -72,17 +72,17 @@ export declare type BaseColumn<LANG_IDS> = {
         [lang_id in keyof LANG_IDS]: string;
     }>;
 };
-declare type SQLDefColumn = {
+type SQLDefColumn = {
     /**
      * Raw sql statement used in creating/adding column
      */
     sqlDefinition?: string;
 };
-declare type BaseColumnTypes = {
+type BaseColumnTypes = {
     defaultValue?: any;
     nullable?: boolean;
 };
-declare type TextColumn = BaseColumnTypes & {
+type TextColumn = BaseColumnTypes & {
     isText: true;
     /**
      * Value will be trimmed before update/insert
@@ -93,14 +93,18 @@ declare type TextColumn = BaseColumnTypes & {
      */
     lowerCased?: boolean;
 };
-export declare type JSONBColumnDef = BaseColumnTypes & {
-    jsonbSchema: ValidationSchema | Omit<OneOf, "optional">;
-};
+export type JSONBColumnDef = (BaseColumnTypes & {}) & ({
+    jsonbSchema: JSONB.JSONBSchema;
+    jsonbSchemaType?: undefined;
+} | {
+    jsonbSchema?: undefined;
+    jsonbSchemaType: JSONB.ObjectSchema;
+});
 /**
  * Allows referencing media to this table.
  * Requires this table to have a primary key AND a valid fileTable config
  */
-declare type MediaColumn = ({
+type MediaColumn = ({
     name: string;
     label?: string;
     files: "one" | "many";
@@ -112,7 +116,7 @@ declare type MediaColumn = ({
 } | {
     allowedExtensions?: Record<Partial<ALLOWED_EXTENSION>, 1>;
 }));
-declare type ReferencedColumn = {
+type ReferencedColumn = {
     /**
      * Will create a lookup table that this column will reference
      */
@@ -124,7 +128,7 @@ declare type ReferencedColumn = {
         columnName?: string;
     };
 };
-declare type JoinDef = {
+type JoinDef = {
     sourceTable: string;
     targetTable: string;
     on: JoinInfo["paths"][number]["on"];
@@ -132,19 +136,19 @@ declare type JoinDef = {
 /**
  * Used in specifying a join path to a table. This column name can then be used in select
  */
-declare type NamedJoinColumn = {
+type NamedJoinColumn = {
     label?: string;
     joinDef: JoinDef[];
 };
-declare type Enum<T extends string | number = any> = {
+type Enum<T extends string | number = any> = {
     enum: T[] | readonly T[];
     nullable?: boolean;
     defaultValue?: T;
 };
-export declare type ColumnConfig<LANG_IDS = {
+export type ColumnConfig<LANG_IDS = {
     en: 1;
 }> = string | StrictUnion<NamedJoinColumn | MediaColumn | (BaseColumn<LANG_IDS> & (SQLDefColumn | ReferencedColumn | TextColumn | JSONBColumnDef | Enum))>;
-export declare type ColumnConfigs<LANG_IDS = {
+export type ColumnConfigs<LANG_IDS = {
     en: 1;
 }> = {
     sql: string | BaseColumn<LANG_IDS> & SQLDefColumn;
@@ -155,10 +159,10 @@ export declare type ColumnConfigs<LANG_IDS = {
     jsonb: BaseColumn<LANG_IDS> & JSONBColumnDef;
     enum: BaseColumn<LANG_IDS> & Enum;
 };
-declare type UnionKeys<T> = T extends T ? keyof T : never;
-declare type StrictUnionHelper<T, TAll> = T extends any ? T & Partial<Record<Exclude<UnionKeys<TAll>, keyof T>, never>> : never;
-declare type StrictUnion<T> = StrictUnionHelper<T, T>;
-declare type TableDefinition<LANG_IDS> = {
+type UnionKeys<T> = T extends T ? keyof T : never;
+type StrictUnionHelper<T, TAll> = T extends any ? T & Partial<Record<Exclude<UnionKeys<TAll>, keyof T>, never>> : never;
+export type StrictUnion<T> = StrictUnionHelper<T, T>;
+type TableDefinition<LANG_IDS> = {
     columns?: {
         [column_name: string]: ColumnConfig<LANG_IDS>;
     };
@@ -212,7 +216,7 @@ declare type TableDefinition<LANG_IDS> = {
 /**
  * Helper utility to create lookup tables for TEXT columns
  */
-export declare type TableConfig<LANG_IDS = {
+export type TableConfig<LANG_IDS = {
     en: 1;
 }> = {
     [table_name: string]: BaseTableDefinition<LANG_IDS> & (TableDefinition<LANG_IDS> | LookupTableDefinition<LANG_IDS>);

package/lib/TableConfig.d.ts.map

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

package/lib/TableConfig.js

@@ -4,7 +4,8 @@ exports.parseI18N = void 0;
 const prostgles_types_1 = require("prostgles-types");
 const DboBuilder_1 = require("./DboBuilder");
 const PubSubManager_1 = require("./PubSubManager/PubSubManager");
-const validation_1 = require("./validation");
+const validation_1 = require("./JSONBValidation/validation");
+const validate_jsonb_schema_sql_1 = require("./JSONBValidation/validate_jsonb_schema_sql");
 const parseI18N = (params) => {
     const { config, lang, defaultLang, defaultValue } = params;
     if (config) {
@@ -29,13 +30,11 @@ class TableConfigurator {
             throw "this.prostgles.dbo missing";
         return this.prostgles.dbo;
     }
-    ;
     get db() {
         if (!this.prostgles.db)
             throw "this.prostgles.db missing";
         return this.prostgles.db;
     }
-    ;
     // sidKeyName: string;
     prostgles;
     constructor(prostgles) {
@@ -63,7 +62,7 @@ class TableConfigurator {
                 result = {
                     ...(result ?? {}),
                     ...("info" in colConf && colConf?.info),
-                    ...("jsonbSchema" in colConf && colConf.jsonbSchema && { jsonSchema: (0, validation_1.getJSONBSchemaAsJSONSchema)(params.table, params.col, colConf) })
+                    ...((colConf?.jsonbSchema || colConf?.jsonbSchemaType) && { jsonSchema: (0, validation_1.getJSONBSchemaAsJSONSchema)(params.table, params.col, colConf) })
                 };
                 /**
                  * Get labels from TableConfig if specified
@@ -184,6 +183,10 @@ class TableConfigurator {
                         const { nullable, defaultValue } = colConf;
                         return `${pgType} ${!nullable ? " NOT NULL " : ""} ${defaultValue ? ` DEFAULT ${(0, PubSubManager_1.asValue)(defaultValue)} ` : ""}`;
                     };
+                    const jsonbSchema = (0, prostgles_types_1.isObject)(colConf) ? (("jsonbSchema" in colConf && colConf.jsonbSchema) ? { jsonbSchema: colConf.jsonbSchema, jsonbSchemaType: undefined } :
+                        ("jsonbSchemaType" in colConf && colConf.jsonbSchemaType) ? { jsonbSchema: undefined, jsonbSchemaType: colConf.jsonbSchemaType } :
+                            undefined) :
+                        undefined;
                     if ((0, prostgles_types_1.isObject)(colConf) && "references" in colConf && colConf.references) {
                         const { tableName: lookupTable, columnName: lookupCol = "id" } = colConf.references;
                         return ` ${colNameEsc} ${getColTypeDef(colConf.references, "TEXT")} REFERENCES ${lookupTable} (${lookupCol}) `;
@@ -192,7 +195,8 @@ class TableConfigurator {
                         return ` ${colNameEsc} ${typeof colConf === "string" ? colConf : colConf.sqlDefinition} `;
                     }
                     else if ((0, prostgles_types_1.isObject)(colConf) && "isText" in colConf && colConf.isText) {
-                        let checks = "", cArr = [];
+                        let checks = "";
+                        const cArr = [];
                         if (colConf.lowerCased) {
                             cArr.push(`${colNameEsc} = LOWER(${colNameEsc})`);
                         }
@@ -204,20 +208,22 @@ class TableConfigurator {
                         }
                         return ` ${colNameEsc} ${getColTypeDef(colConf, "TEXT")} ${checks}`;
                     }
-                    else if ("jsonbSchema" in colConf && colConf.jsonbSchema) {
+                    else if (jsonbSchema) {
+                        const jsonbSchemaStr = (0, PubSubManager_1.asValue)({
+                            ...(0, prostgles_types_1.pickKeys)(colConf, ["enum", "nullable", "info"]),
+                            ...(jsonbSchema.jsonbSchemaType ? { type: jsonbSchema.jsonbSchemaType } : jsonbSchema.jsonbSchema)
+                        }) + "::TEXT";
                         /** Validate default value against jsonbSchema  */
+                        const q = `SELECT ${validate_jsonb_schema_sql_1.VALIDATE_SCHEMA_FUNCNAME}(${jsonbSchemaStr}, ${(0, PubSubManager_1.asValue)(colConf.defaultValue) + "::JSONB"}, ARRAY[${(0, PubSubManager_1.asValue)(name)}]) as v`;
                         if (colConf.defaultValue) {
-                            const checkStatement = (0, validation_1.getPGCheckConstraint)({ schema: colConf.jsonbSchema, escapedFieldName: (0, PubSubManager_1.asValue)(colConf.defaultValue) + "::JSONB", nullable: !!colConf.nullable }, 0);
-                            const q = `SELECT ${checkStatement} as v`;
                             this.log(q);
                             this.dbo.sql(q, {}, { returnType: "row" }).then(row => {
                                 if (!row?.v) {
-                                    console.error(`Default value (${colConf.defaultValue}) for ${tableName}.${name} does not satisfy the jsonb constraint check: ${checkStatement}`);
+                                    console.error(`Default value (${colConf.defaultValue}) for ${tableName}.${name} does not satisfy the jsonb constraint check: ${q}`);
                                 }
                             });
                         }
-                        const checkStatement = (0, validation_1.getPGCheckConstraint)({ schema: colConf.jsonbSchema, escapedFieldName: colNameEsc, nullable: !!colConf.nullable }, 0);
-                        return ` ${colNameEsc} ${getColTypeDef(colConf, "JSONB")} CHECK(${checkStatement})`;
+                        return ` ${colNameEsc} ${getColTypeDef(colConf, "JSONB")} CHECK(${validate_jsonb_schema_sql_1.VALIDATE_SCHEMA_FUNCNAME}(${jsonbSchemaStr}, ${colNameEsc}, ARRAY[${(0, PubSubManager_1.asValue)(name)}]))`;
                     }
                     else if ("enum" in colConf) {
                         if (!colConf.enum?.length)
@@ -233,10 +239,25 @@ class TableConfigurator {
                 const colCreateLines = [];
                 const tableHandler = this.dbo[tableName];
                 if (tableConf.columns) {
+                    const hasJSONBValidation = (0, prostgles_types_1.getKeys)(tableConf.columns).some(c => {
+                        const cConf = tableConf.columns?.[c];
+                        return cConf && (0, prostgles_types_1.isObject)(cConf) && (cConf.jsonbSchema || cConf.jsonbSchemaType);
+                    });
+                    /** Must install validation function */
+                    if (hasJSONBValidation) {
+                        try {
+                            const fileContent = `CREATE SCHEMA IF NOT EXISTS prostgles;\n ${validate_jsonb_schema_sql_1.validate_jsonb_schema_sql}`;
+                            await this.db.any(fileContent);
+                        }
+                        catch (err) {
+                            console.error("Could not install the jsonb validation function due to error: ", err);
+                            throw err;
+                        }
+                    }
                     (0, prostgles_types_1.getKeys)(tableConf.columns).filter(c => {
                         const colDef = tableConf.columns[c];
                         return typeof colDef === "string" || !("joinDef" in colDef);
-                    }).map(colName => {
+                    }).forEach(colName => {
                         const colConf = tableConf.columns[colName];
                         /* Add columns to create statement */
                         if (!tableHandler) {

package/lib/TableConfig.ts

@@ -1,8 +1,9 @@
-import { getKeys, asName as _asName, AnyObject, TableInfo,  ALLOWED_EXTENSION, ALLOWED_CONTENT_TYPE, isObject } from "prostgles-types";
+import { getKeys, asName as _asName, AnyObject, TableInfo,  ALLOWED_EXTENSION, ALLOWED_CONTENT_TYPE, isObject, pickKeys } from "prostgles-types";
 import { isPlainObject, JoinInfo } from "./DboBuilder";
-import { DB, DBHandlerServer, Joins, Prostgles } from "./Prostgles";
+import { DB, DBHandlerServer, Prostgles } from "./Prostgles";
 import { asValue } from "./PubSubManager/PubSubManager";
-import { getJSONBSchemaAsJSONSchema, getPGCheckConstraint, OneOf, ValidationSchema } from "./validation";
+import { getJSONBSchemaAsJSONSchema, JSONB } from "./JSONBValidation/validation"; 
+import { validate_jsonb_schema_sql, VALIDATE_SCHEMA_FUNCNAME } from "./JSONBValidation/validate_jsonb_schema_sql";
 
 type ColExtraInfo = {
   min?: string | number;
@@ -117,14 +118,18 @@ type TextColumn = BaseColumnTypes & {
   lowerCased?: boolean;
 }
 
-export type JSONBColumnDef = BaseColumnTypes & {
-  jsonbSchema: ValidationSchema | Omit<OneOf, "optional">;
-
+export type JSONBColumnDef = (BaseColumnTypes & {
   /**
    * If the new schema CHECK fails old rows the update old rows using this function
    */
   // onMigrationFail?: <T>(failedRow: T) => AnyObject | Promise<AnyObject>;
-}
+}) & ({
+  jsonbSchema: JSONB.JSONBSchema;
+  jsonbSchemaType?: undefined;
+} | {
+  jsonbSchema?: undefined;
+  jsonbSchemaType: JSONB.ObjectSchema;
+})
 
 /**
  * Allows referencing media to this table.
@@ -199,7 +204,7 @@ export type ColumnConfigs<LANG_IDS = { en: 1 }> = {
 
 type UnionKeys<T> = T extends T ? keyof T : never;
 type StrictUnionHelper<T, TAll> = T extends any ? T & Partial<Record<Exclude<UnionKeys<TAll>, keyof T>, never>> : never;
-type StrictUnion<T> = StrictUnionHelper<T, T>
+export type StrictUnion<T> = StrictUnionHelper<T, T>
 
 type TableDefinition<LANG_IDS> = {
   columns?: {
@@ -278,11 +283,11 @@ export default class TableConfigurator<LANG_IDS = { en: 1 }> {
   get dbo(): DBHandlerServer {
     if (!this.prostgles.dbo) throw "this.prostgles.dbo missing"
     return this.prostgles.dbo
-  };
+  } 
   get db(): DB {
     if (!this.prostgles.db) throw "this.prostgles.db missing"
     return this.prostgles.db
-  };
+  } 
   // sidKeyName: string;
   prostgles: Prostgles
 
@@ -317,7 +322,7 @@ export default class TableConfigurator<LANG_IDS = { en: 1 }> {
         result = {
           ...(result ?? {}),
           ...("info" in colConf && colConf?.info),
-          ...("jsonbSchema" in colConf && colConf.jsonbSchema && { jsonSchema: getJSONBSchemaAsJSONSchema(params.table, params.col, colConf) })
+          ...((colConf?.jsonbSchema || colConf?.jsonbSchemaType) && { jsonSchema: getJSONBSchemaAsJSONSchema(params.table, params.col, colConf) })
         }
 
         /**
@@ -452,6 +457,15 @@ export default class TableConfigurator<LANG_IDS = { en: 1 }> {
             const { nullable, defaultValue } = colConf;
             return `${pgType} ${!nullable ? " NOT NULL " : ""} ${defaultValue ? ` DEFAULT ${asValue(defaultValue)} ` : ""}`
           }
+
+          const jsonbSchema = 
+            isObject(colConf)? (
+              ("jsonbSchema" in colConf && colConf.jsonbSchema)? { jsonbSchema: colConf.jsonbSchema, jsonbSchemaType: undefined } :
+              ("jsonbSchemaType" in colConf && colConf.jsonbSchemaType)? { jsonbSchema: undefined, jsonbSchemaType: colConf.jsonbSchemaType } : 
+              undefined
+            ) : 
+            undefined;
+
           if (isObject(colConf) && "references" in colConf && colConf.references) {
 
             const { tableName: lookupTable, columnName: lookupCol = "id" } = colConf.references;
@@ -462,7 +476,8 @@ export default class TableConfigurator<LANG_IDS = { en: 1 }> {
             return ` ${colNameEsc} ${typeof colConf === "string"? colConf : colConf.sqlDefinition} `;
 
           } else if (isObject(colConf) && "isText" in colConf && colConf.isText) {
-            let checks = "", cArr = [];
+            let checks = ""; 
+            const cArr = [];
             if (colConf.lowerCased) {
               cArr.push(`${colNameEsc} = LOWER(${colNameEsc})`)
             }
@@ -474,21 +489,24 @@ export default class TableConfigurator<LANG_IDS = { en: 1 }> {
             }
             return ` ${colNameEsc} ${getColTypeDef(colConf, "TEXT")} ${checks}`;
 
-          } else if ("jsonbSchema" in colConf && colConf.jsonbSchema) {
+          } else if (jsonbSchema) {
+
+            const jsonbSchemaStr = asValue({
+              ...pickKeys(colConf, ["enum", "nullable", "info"]), 
+              ...(jsonbSchema.jsonbSchemaType? { type: jsonbSchema.jsonbSchemaType } : jsonbSchema.jsonbSchema)
+            }) + "::TEXT";
 
             /** Validate default value against jsonbSchema  */
-            if(colConf.defaultValue){
-              const checkStatement = getPGCheckConstraint({ schema: colConf.jsonbSchema, escapedFieldName: asValue(colConf.defaultValue)+"::JSONB", nullable: !!colConf.nullable }, 0)
-              const q = `SELECT ${checkStatement} as v`
+            const q = `SELECT ${VALIDATE_SCHEMA_FUNCNAME}(${jsonbSchemaStr}, ${asValue(colConf.defaultValue)+"::JSONB"}, ARRAY[${asValue(name)}]) as v`
+            if(colConf.defaultValue){ 
               this.log(q)
               this.dbo.sql!(q, {}, { returnType: "row" }).then(row => {
                 if(!row?.v) {
-                  console.error(`Default value (${colConf.defaultValue}) for ${tableName}.${name} does not satisfy the jsonb constraint check: ${checkStatement}`);
+                  console.error(`Default value (${colConf.defaultValue}) for ${tableName}.${name} does not satisfy the jsonb constraint check: ${q}`);
                 }
               })
             }
-            const checkStatement = getPGCheckConstraint({ schema: colConf.jsonbSchema, escapedFieldName: colNameEsc, nullable: !!colConf.nullable }, 0)
-            return ` ${colNameEsc} ${getColTypeDef(colConf, "JSONB")} CHECK(${checkStatement})`;
+            return ` ${colNameEsc} ${getColTypeDef(colConf, "JSONB")} CHECK(${VALIDATE_SCHEMA_FUNCNAME}(${jsonbSchemaStr}, ${colNameEsc}, ARRAY[${asValue(name)}]))`;
 
           } else if("enum" in colConf) {
             if(!colConf.enum?.length) throw new Error("colConf.enum Must not be empty");
@@ -504,10 +522,27 @@ export default class TableConfigurator<LANG_IDS = { en: 1 }> {
         const colCreateLines: string[] = [];
         const tableHandler = this.dbo[tableName];
         if (tableConf.columns) {
+          const hasJSONBValidation = getKeys(tableConf.columns).some(c => {
+            const cConf = tableConf.columns?.[c];
+            return cConf && isObject(cConf) && (cConf.jsonbSchema || cConf.jsonbSchemaType)
+          });
+
+          /** Must install validation function */
+          if(hasJSONBValidation){
+            try {
+              
+              const fileContent = `CREATE SCHEMA IF NOT EXISTS prostgles;\n ${validate_jsonb_schema_sql}`;
+              await this.db.any(fileContent);
+            } catch(err: any){
+              console.error("Could not install the jsonb validation function due to error: ", err);
+              throw err;
+            }
+          }
+
           getKeys(tableConf.columns).filter(c => {
             const colDef = tableConf.columns![c];
             return typeof colDef === "string" || !("joinDef" in colDef)
-          }).map(colName => {
+          }).forEach(colName => {
             const colConf = tableConf.columns![colName];
 
             /* Add columns to create statement */
@@ -516,7 +551,6 @@ export default class TableConfigurator<LANG_IDS = { en: 1 }> {
 
             } else if (tableHandler && !tableHandler.columns?.find(c => colName === c.name)) {
 
-
               queries.push(`
                 ALTER TABLE ${asName(tableName)} 
                 ADD COLUMN ${getColDef(colName, colConf)};

package/lib/index.js

@@ -1,7 +1,7 @@
 "use strict";
 const Prostgles_1 = require("./Prostgles");
 function prostgles(params) {
-    let prgl = new Prostgles_1.Prostgles(params);
+    const prgl = new Prostgles_1.Prostgles(params);
     return prgl.init(params.onReady);
 }
 module.exports = prostgles;

package/lib/index.ts

@@ -3,7 +3,7 @@ import { Prostgles, ProstglesInitOptions, InitResult } from "./Prostgles";
 
 function prostgles<S = void, SUser extends SessionUser = SessionUser>(params: ProstglesInitOptions<S, SUser>){
 
-    let prgl = new Prostgles(params as any);
+    const prgl = new Prostgles(params as any);
     return prgl.init(params.onReady as any);
 }
 export = prostgles;

package/lib/shortestPath.d.ts

@@ -1,4 +1,4 @@
-export declare type Graph = {
+export type Graph = {
     [key: string]: {
         [key: string]: number;
     };

package/lib/shortestPath.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shortestPath.d.ts","sourceRoot":"","sources":["shortestPath.ts"],"names":[],"mappings":"AAcA,oBAAY,KAAK,GAAG;IACnB,CAAC,GAAG,EAAE,MAAM,GAAG;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAA;CACxC,CAAC;AAEF,eAAO,MAAM,gBAAgB,UAAW,KAAK,aAAa,MAAM,WAAW,MAAM,KAAG;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,EAAE,CAAA;CAgErH,CAAC"}
+{"version":3,"file":"shortestPath.d.ts","sourceRoot":"","sources":["shortestPath.ts"],"names":[],"mappings":"AAcA,MAAM,MAAM,KAAK,GAAG;IACnB,CAAC,GAAG,EAAE,MAAM,GAAG;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAA;CACxC,CAAC;AAEF,eAAO,MAAM,gBAAgB,UAAW,KAAK,aAAa,MAAM,WAAW,MAAM,KAAG;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,EAAE,CAAA;CAgErH,CAAC"}

package/lib/shortestPath.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.findShortestPath = void 0;
 const shortestDistanceNode = (distances, visited) => {
     let shortest = null;
-    for (let node in distances) {
-        let currentIsShortest = shortest === null || distances[node] < distances[shortest];
+    for (const node in distances) {
+        const currentIsShortest = shortest === null || distances[node] < distances[shortest];
         if (currentIsShortest && !visited.includes(node)) {
             shortest = node;
         }
@@ -17,28 +17,28 @@ const findShortestPath = (graph, startNode, endNode) => {
     distances[endNode] = "Infinity";
     distances = Object.assign(distances, graph[startNode]);
     // track paths
-    let parents = { endNode: null };
-    for (let child in graph[startNode]) {
+    const parents = { endNode: null };
+    for (const child in graph[startNode]) {
         parents[child] = startNode;
     }
     // track nodes that have already been visited
-    let visited = [];
+    const visited = [];
     // find the nearest node
     let node = shortestDistanceNode(distances, visited);
     // for that node
     while (node) {
         // find its distance from the start node & its child nodes
-        let distance = distances[node];
-        let children = graph[node];
+        const distance = distances[node];
+        const children = graph[node];
         // for each of those child nodes
-        for (let child in children) {
+        for (const child in children) {
             // make sure each child node is not the start node
             if (String(child) === String(startNode)) {
                 continue;
             }
             else {
                 // save the distance from the start node to the child node
-                let newdistance = distance + children[child];
+                const newdistance = distance + children[child];
                 // if there's no recorded distance from the start node to the child node in the distances object
                 // or if the recorded distance is shorter than the previously stored distance from the start node to the child node
                 // save the distance to the object
@@ -56,7 +56,7 @@ const findShortestPath = (graph, startNode, endNode) => {
     }
     // using the stored paths from start node to end node
     // record the shortest path
-    let shortestPath = [endNode];
+    const shortestPath = [endNode];
     let parent = parents[endNode];
     while (parent) {
         shortestPath.push(parent);
@@ -64,7 +64,7 @@ const findShortestPath = (graph, startNode, endNode) => {
     }
     shortestPath.reverse();
     // return the shortest path from start node to end node & its distance
-    let results = {
+    const results = {
         distance: distances[endNode],
         path: shortestPath,
     };

package/lib/shortestPath.ts

@@ -3,8 +3,8 @@ import { AnyObject } from "prostgles-types";
 const shortestDistanceNode = (distances: AnyObject, visited: AnyObject) => {
 	let shortest = null;
 
-	for (let node in distances) {
-		let currentIsShortest =
+	for (const node in distances) {
+		const currentIsShortest =
 			shortest === null || distances[node] < distances[shortest];
 		if (currentIsShortest && !visited.includes(node)) {
 			shortest = node;
@@ -23,13 +23,13 @@ export const findShortestPath = (graph: Graph, startNode: string, endNode: strin
 	distances = Object.assign(distances, graph[startNode]);
 
 	// track paths
-	let parents: AnyObject = { endNode: null };
-	for (let child in graph[startNode]) {
+	const parents: AnyObject = { endNode: null };
+	for (const child in graph[startNode]) {
 		parents[child] = startNode;
 	}
 
 	// track nodes that have already been visited
-	let visited: AnyObject = [];
+	const visited: AnyObject = [];
 
 	// find the nearest node
 	let node = shortestDistanceNode(distances, visited);
@@ -37,16 +37,16 @@ export const findShortestPath = (graph: Graph, startNode: string, endNode: strin
 	// for that node
 	while (node) {
 		// find its distance from the start node & its child nodes
-		let distance = distances[node];
-		let children = graph[node];
+		const distance = distances[node];
+		const children = graph[node];
 		// for each of those child nodes
-		for (let child in children) {
+		for (const child in children) {
 			// make sure each child node is not the start node
 			if (String(child) === String(startNode)) {
 				continue;
 			} else {
 				// save the distance from the start node to the child node
-				let newdistance = distance + children[child];
+				const newdistance = distance + children[child];
 				// if there's no recorded distance from the start node to the child node in the distances object
 				// or if the recorded distance is shorter than the previously stored distance from the start node to the child node
 				// save the distance to the object
@@ -65,7 +65,7 @@ export const findShortestPath = (graph: Graph, startNode: string, endNode: strin
 
 	// using the stored paths from start node to end node
 	// record the shortest path
-	let shortestPath = [endNode];
+	const shortestPath = [endNode];
 	let parent = parents[endNode];
 	while (parent) {
 		shortestPath.push(parent);
@@ -74,7 +74,7 @@ export const findShortestPath = (graph: Graph, startNode: string, endNode: strin
 	shortestPath.reverse();
 
 	// return the shortest path from start node to end node & its distance
-	let results = {
+	const results = {
 		distance: distances[endNode],
 		path: shortestPath,
 	};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prostgles-server",
-  "version": "3.0.87",
+  "version": "3.0.89",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -11,6 +11,7 @@
     "prepare": "npm run build",
     "start": "tsc --watch",
     "build": "tsc",
+    "lint": "eslint . --ext .ts",
     "test": "rm -rf ./node_modules/* && npm i && tsc && cd tests/ && ./test.sh"
   },
   "repository": {
@@ -37,16 +38,19 @@
     "bluebird": "^3.7.2",
     "check-disk-space": "^3.3.1",
     "file-type": "^17.1.4",
-    "g": "^2.0.1",
-    "pg-promise": "^10.11.1",
+    "pg-promise": "^11.3.0",
     "prostgles-types": "^3.0.24",
-    "sharp": "^0.31.0",
-    "typescript": "^4.9.5"
+    "sharp": "^0.31.0"
   },
   "devDependencies": {
     "@aws-sdk/types": "^3.110.0",
     "@types/bluebird": "^3.5.36",
+    "@types/json-schema": "^7.0.11",
     "@types/node": "^18.0.3",
-    "@types/sharp": "^0.30.4"
+    "@types/sharp": "^0.30.4",
+    "@typescript-eslint/eslint-plugin": "^5.53.0",
+    "@typescript-eslint/parser": "^5.53.0",
+    "eslint": "^8.35.0",
+    "typescript": "^4.9.5"
   }
 }