prostgles-server 3.0.86 → 3.0.88

package/lib/JSONBValidation/validation.ts

@@ -0,0 +1,332 @@
+import { JSONSchema7, JSONSchema7TypeName } from "json-schema";
+import { getKeys, isEmpty, isObject } from "prostgles-types";
+import { asValue } from "../PubSubManager/PubSubManager";
+import { BaseColumn, JSONBColumnDef, StrictUnion } from "../TableConfig";
+
+
+const PrimitiveTypes = ["boolean" , "number", "integer", "string", "any"] as const;
+const DATA_TYPES = [
+  ...PrimitiveTypes,
+  ...PrimitiveTypes.map(v => `${v}[]` as `${typeof v}[]`)
+] as const;
+type DataType = typeof DATA_TYPES[number];
+
+export namespace JSONB {
+
+  export type BaseOptions = {
+    /**
+     * False by default
+     */
+    optional?: boolean;
+    /**
+     * False by default
+     */
+    nullable?: boolean;
+    description?: string;
+    title?: string;
+  }; 
+
+  export type BasicType = BaseOptions & {
+    type: DataType;
+    allowedValues?: any[];
+    oneOf?: undefined;
+    arrayOf?: undefined;
+    enum?: undefined;
+  };
+  
+  export type ObjectType = BaseOptions & {
+    type: ObjectSchema;
+    allowedValues?: undefined;
+    oneOf?: undefined;
+    arrayOf?: undefined;
+    enum?: undefined;
+  } 
+  
+  export type EnumType = BaseOptions & {
+    type?: undefined;
+    enum: readonly any[];
+    oneOf?: undefined;
+    arrayOf?: undefined;
+    allowedValues?: undefined;
+  };
+  
+  export type OneOf = BaseOptions & {
+    type?: undefined;
+    oneOf: readonly ObjectSchema[];
+    arrayOf?: undefined;
+    allowedValues?: undefined;
+    enum?: undefined;
+  }
+  export type ArrayOf = BaseOptions & {
+    type?: undefined;
+    arrayOf: ObjectSchema;
+    allowedValues?: undefined;
+    oneOf?: undefined;
+    enum?: undefined;
+  }
+   
+
+  export type FieldTypeObj = 
+  | BasicType
+  | ObjectType
+  | EnumType
+  | OneOf
+  | ArrayOf;
+
+  export type FieldType = 
+  | DataType 
+  | FieldTypeObj;
+
+
+  export type GetType<T extends FieldType | Omit<FieldTypeObj, "optional">> =
+  | T extends { type: ObjectSchema } ? NestedSchemaObject<T["type"]> :
+  | T extends "number" | { type: "number" } ? number :
+  | T extends "boolean" | { type: "boolean" } ? boolean :
+  | T extends "integer" | { type: "integer" } ? number :
+  | T extends "string" | { type: "string" } ? string :
+  | T extends "any" | { type: "any" } ? any :
+  | T extends "number[]" | { type: "number[]" } ? number[] :
+  | T extends "boolean[]" | { type: "boolean[]" } ? boolean[] :
+  | T extends "integer[]" | { type: "integer[]" } ? number[] :
+  | T extends "string[]" | { type: "string[]" } ? string[] :
+  | T extends "any[]" | { type: "any[]" } ? any[] :
+  | T extends { enum: readonly any[] } ? T["enum"][number] :
+
+  | T extends { oneOf: readonly ObjectSchema[] } ? StrictUnion<NestedSchemaObject<T["oneOf"][number]>> :
+
+  | T extends { arrayOf: ObjectSchema } ? NestedSchemaObject<T["arrayOf"]>[] :
+  any;
+
+  type IsOptional<F extends FieldType> = F extends DataType? false : F extends { optional: true }? true : false; 
+
+
+  export type ObjectSchema = Record<string, FieldType>;
+  export type JSONBSchema = Omit<FieldTypeObj, "optional">;
+
+  export type NestedSchemaObject<S extends ObjectSchema> = (
+    {
+      [K in keyof S as IsOptional<S[K]> extends true ? K : never]?: GetType<S[K]>
+    } & {
+      [K in keyof S as IsOptional<S[K]> extends true ? never : K]: GetType<S[K]>
+    }
+  );
+  export type SchemaObject<S extends JSONBSchema> = S["nullable"] extends true? (null | GetType<S>) : GetType<S>;
+}
+
+
+/** tests */
+const s: JSONB.JSONBSchema = {
+  type: {
+    a: { type: "boolean" },
+    c: { type: { c1: { type: "string" } } },
+    arr: { arrayOf: { d: "string" } },
+    o: {
+      oneOf: [
+        { z: { type: "integer" } },
+        { z1: { type: "integer" } }
+      ]
+    }
+  }
+};
+
+const ss: JSONB.SchemaObject<typeof s> = {
+  a: true,
+  arr: [{ d: "" }],
+  c: {
+    c1: ""
+  },
+  o: { z1: 23 }
+}
+
+const getFieldTypeObj = (rawFieldType: JSONB.FieldType): JSONB.FieldTypeObj => {
+  if(typeof rawFieldType === "string") return { type: rawFieldType };
+
+  return rawFieldType;
+} 
+
+export function validate<T>(obj: T, key: keyof T, rawFieldType: JSONB.FieldType): boolean {
+  let err = `The provided value for ${JSON.stringify(key)} is of invalid type. Expecting `;
+  const val = obj[key];
+  const fieldType = getFieldTypeObj(rawFieldType);
+  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.ObjectSchema)[subKey])
+      });
+    }
+    err += fieldType.type;
+    if (fieldType.type === "boolean" && typeof val !== fieldType.type) throw new Error(err)
+    if (fieldType.type === "string" && typeof val !== fieldType.type) throw new Error(err)
+    if (fieldType.type === "number" && !Number.isFinite(val)) throw new Error(err)
+    if (fieldType.type === "integer" && !Number.isInteger(val)) throw new Error(err);
+
+  } else if (fieldType.enum) {
+    err += `on of: ${fieldType.enum}`;
+    if (!fieldType.enum.includes(val)) throw new Error(err)
+  }
+  return true
+}
+
+export function validateSchema<S extends JSONB.ObjectSchema>(schema: S, obj: JSONB.NestedSchemaObject<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]));
+}
+
+
+type ColOpts = { nullable?: boolean }; 
+
+export function getSchemaTSTypes(schema: JSONB.ObjectSchema, leading = "", isOneOf = false): string {
+  const getFieldType = (rawFieldType: JSONB.FieldType) => {
+    const fieldType = getFieldTypeObj(rawFieldType);
+    const nullType = (fieldType.nullable ? `null | ` : "");
+    if (fieldType?.type) {
+      if (typeof fieldType.type === "string") {
+        const correctType = fieldType.type.replace("integer", "number");
+        if (fieldType.allowedValues && fieldType.type.endsWith("[]")) {
+          return nullType + ` (${fieldType.allowedValues.map(v => JSON.stringify(v)).join(" | ")})[]`
+        }
+        return nullType + correctType
+      } else {
+        return nullType + getSchemaTSTypes(fieldType.type, "", true)
+      }
+    } else if (fieldType?.enum) {
+      return nullType + fieldType.enum.map(v => asValue(v)).join(" | ")
+    } else if (fieldType?.oneOf) {
+      return (fieldType.nullable ? `\n${leading}  | null` : "") + fieldType.oneOf.map(v => `\n${leading}  | ` + getSchemaTSTypes(v, "", true)).join("")
+    } else if (fieldType?.arrayOf) {
+      return (fieldType.nullable ? `\n${leading}  | null` : "") + getSchemaTSTypes(fieldType.arrayOf, "", true) + "[]";
+    } else throw "Unexpected getSchemaTSTypes: " + JSON.stringify({ fieldType, schema }, null, 2)
+  }
+
+  const spacing = isOneOf ? " " : "  ";
+
+  const res = `${leading}{ \n` + getKeys(schema).map(k => {
+    const fieldType = getFieldTypeObj(schema[k]);
+    return `${leading}${spacing}${k}${fieldType.optional ? "?" : ""}: ` + getFieldType(fieldType) + ";";
+  }).join("\n") + ` \n${leading}}${isOneOf ? "" : ";"}`;
+
+  /** Keep single line */
+  if (isOneOf) return res.split("\n").join("");
+
+  return res;
+}
+
+export function getJSONBSchemaTSTypes(schema: JSONB.JSONBSchema, colOpts: ColOpts, leading = "", isOneOf = false): string { 
+  if (schema.arrayOf) {
+    return (colOpts.nullable ? `\n${leading}  | null` : "") + getSchemaTSTypes(schema.arrayOf, leading, isOneOf) + "[]";
+  } else if (schema.enum) {
+    return (colOpts.nullable ? `\n${leading}  | null` : "") + schema.enum.map(v => asValue(v)).join(" | ")
+  } else if (schema.oneOf) {
+    return (colOpts.nullable ? `\n${leading}  | null` : "") + schema.oneOf.map(s => `\n${leading}  | ` + getSchemaTSTypes(s, "", true)).join("")
+  } else {
+    if(typeof schema.type === "string"){
+      return (colOpts.nullable ? `null | ` : "") + schema.type;
+    } else if(schema.type){
+      return (colOpts.nullable ? `null | ` : "") + getSchemaTSTypes(schema.type, leading, isOneOf);
+    }
+
+    return "";
+  }
+}
+
+
+const getJSONSchemaObject = (rawType: JSONB.FieldType | JSONB.JSONBSchema, rootInfo?: { id: string }): JSONSchema7 => {
+  const {  type, arrayOf, description, nullable, oneOf, title, ...t } = 
+    typeof rawType === "string"? ({ type: rawType } satisfies JSONB.FieldTypeObj) : 
+    rawType; 
+
+  let result: JSONSchema7 = {};
+  const partialProps: Partial<JSONSchema7> = {
+    ...((t.enum || t.allowedValues?.length) && { enum: t.allowedValues ?? t.enum!.slice(0) }),
+    ...(!!description && { description }),
+    ...(!!title && { title }),
+  };
+
+  if(t.enum?.length){
+    partialProps.type = typeof t.enum[0]! as any;
+  }
+
+  if(typeof type === "string" || arrayOf){
+
+    /** ARRAY */
+    if(type && typeof type !== "string") {
+      throw "Not expected";
+    }
+    if(arrayOf || type?.endsWith("[]")){
+
+      const arrayItems = 
+        arrayOf? getJSONSchemaObject({ type: arrayOf }) : 
+        type?.startsWith("any")? { type: undefined } :
+        {  
+          type: type?.slice(0, -2) as JSONSchema7TypeName,
+          ...(t.allowedValues && { enum: t.allowedValues }), 
+        };
+      result = {
+        type: "array",
+        items: arrayItems,
+      }
+
+    /** PRIMITIVES */
+    } else {
+      result = {
+        type: type as JSONSchema7TypeName,
+      }
+    }
+
+  /** OBJECT */
+  } else if(isObject(type)){
+    result = {
+      type: "object",
+      required: getKeys(type).filter(k => {
+        const t = type[k];
+        return typeof t === "string" || !t.optional
+      }),
+      properties: getKeys(type).reduce((a, k) => { 
+        return {
+          ...a,
+          [k]: getJSONSchemaObject(type[k])
+        }
+      }, {}),
+    }
+  } else if(oneOf){
+    result = {
+      type: "object",
+      oneOf: oneOf.map(s => getJSONSchemaObject({ type: s }))
+    }
+  }
+
+  if (nullable) {
+    const nullDef = { type: "null" } as const;
+    if (result.oneOf) {
+      result.oneOf.push(nullDef)
+    } else if (result.enum && !result.enum.includes(null)) {
+      result.enum.push(null)
+
+    } else result = {
+      type: 'object',
+      oneOf: [result, nullDef]
+    }
+  }
+
+  const rootSchema: JSONSchema7 | undefined = !rootInfo? undefined : {
+    "$id": rootInfo?.id,
+    "$schema": "https://json-schema.org/draft/2020-12/schema",
+  };
+
+  return {
+    ...rootSchema,
+    ...partialProps,
+    ...result,
+  }
+}
+
+export function getJSONBSchemaAsJSONSchema(tableName: string, colName: string, columnConfig: BaseColumn<{ en: 1 }> & JSONBColumnDef): JSONSchema7 {
+
+  const schema: JSONB.JSONBSchema = {
+     ...columnConfig,
+    ...(columnConfig.jsonbSchema ?? { type: columnConfig.jsonbSchemaType! })
+  };
+
+  return getJSONSchemaObject(schema, { id: `${tableName}.${colName}` })
+}
+

package/lib/PostgresNotifListenManager.d.ts

@@ -1,7 +1,7 @@
 import { DB } from "./Prostgles";
 import pg from "pg-promise/typescript/pg-subset";
 import pgPromise from "pg-promise";
-export declare type PrglNotifListener = (args: {
+export type PrglNotifListener = (args: {
     length: number;
     processId: number;
     channel: string;

package/lib/PostgresNotifListenManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PostgresNotifListenManager.d.ts","sourceRoot":"","sources":["PostgresNotifListenManager.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,MAAM,iCAAiC,CAAC;AACjD,OAAO,SAAS,MAAM,YAAY,CAAC;AAEnC,oBAAY,iBAAiB,GAAG,CAAC,IAAI,EAAE;IACnC,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;CAChB,KAAK,IAAI,CAAC;AAEX,qBAAa,0BAA0B;IACnC,UAAU,CAAC,EAAE,SAAS,CAAC,UAAU,CAAC,EAAE,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC;IAClD,KAAK,EAAE,EAAE,CAAC;IACV,aAAa,EAAE,iBAAiB,CAAC;IACjC,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,GAAG,CAAC;IACjB,MAAM,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC;IAEpB,MAAM,CAAC,MAAM,6BAA8B,iBAAiB,mBAAmB,MAAM,KAAG,QAAQ,0BAA0B,CAAC,CAG1H;gBAEW,KAAK,EAAE,EAAE,EAAE,aAAa,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,UAAQ;IAS1F,IAAI,IAAI,OAAO,CAAC,0BAA0B,CAAC;IAQjD,OAAO;IAIP,cAAc;IA+Bd,SAAS,UAAS;IAClB,OAAO,aAMN;IAED,aAAa,aAKZ;IAED,SAAS,CAAC,KAAK,GAAE,MAAM,GAAG,SAAa,EAAE,WAAW,GAAE,MAAM,GAAG,SAAa;CAyD/E"}
+{"version":3,"file":"PostgresNotifListenManager.d.ts","sourceRoot":"","sources":["PostgresNotifListenManager.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,MAAM,iCAAiC,CAAC;AACjD,OAAO,SAAS,MAAM,YAAY,CAAC;AAEnC,MAAM,MAAM,iBAAiB,GAAG,CAAC,IAAI,EAAE;IACnC,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;CAChB,KAAK,IAAI,CAAC;AAEX,qBAAa,0BAA0B;IACnC,UAAU,CAAC,EAAE,SAAS,CAAC,UAAU,CAAC,EAAE,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC;IAClD,KAAK,EAAE,EAAE,CAAC;IACV,aAAa,EAAE,iBAAiB,CAAC;IACjC,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,GAAG,CAAC;IACjB,MAAM,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC;IAEpB,MAAM,CAAC,MAAM,6BAA8B,iBAAiB,mBAAmB,MAAM,KAAG,QAAQ,0BAA0B,CAAC,CAG1H;gBAEW,KAAK,EAAE,EAAE,EAAE,aAAa,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,UAAQ;IAS1F,IAAI,IAAI,OAAO,CAAC,0BAA0B,CAAC;IAQjD,OAAO;IAIP,cAAc;IA+Bd,SAAS,UAAS;IAClB,OAAO,aAMN;IAED,aAAa,aAKZ;IAED,SAAS,CAAC,KAAK,GAAE,MAAM,GAAG,SAAa,EAAE,WAAW,GAAE,MAAM,GAAG,SAAa;CAyD/E"}

package/lib/PostgresNotifListenManager.js

@@ -13,7 +13,7 @@ class PostgresNotifListenManager {
     isListening;
     client;
     static create = (db_pg, notifListener, db_channel_name) => {
-        let res = new PostgresNotifListenManager(db_pg, notifListener, db_channel_name, true);
+        const res = new PostgresNotifListenManager(db_pg, notifListener, db_channel_name, true);
         return res.init();
     };
     constructor(db_pg, notifListener, db_channel_name, noInit = false) {

package/lib/PostgresNotifListenManager.ts

@@ -24,7 +24,7 @@ export class PostgresNotifListenManager {
     client?: pg.IClient;
 
     static create = (db_pg: DB, notifListener: PrglNotifListener, db_channel_name: string): Promise<PostgresNotifListenManager> => {
-        let res = new PostgresNotifListenManager(db_pg, notifListener, db_channel_name, true);
+        const res = new PostgresNotifListenManager(db_pg, notifListener, db_channel_name, true);
         return res.init();
     }
 

package/lib/Prostgles.d.ts

@@ -7,32 +7,32 @@ import AuthHandler, { Auth, SessionUser, AuthRequestParams } from "./AuthHandler
 import TableConfigurator, { TableConfig } from "./TableConfig";
 import { DboBuilder, DBHandlerServer, PRGLIOSocket } from "./DboBuilder";
 export { DBHandlerServer };
-export declare type PGP = pgPromise.IMain<{}, pg.IClient>;
+export type PGP = pgPromise.IMain<{}, pg.IClient>;
 import { AnyObject, FileColumnConfig } from "prostgles-types";
 import { Publish, PublishMethods, PublishParams, PublishParser } from "./PublishParser";
 import { DBEventsManager } from "./DBEventsManager";
-export declare type DB = pgPromise.IDatabase<{}, pg.IClient>;
-declare type DbConnection = string | pg.IConnectionParameters<pg.IClient>;
-declare type DbConnectionOpts = pg.IDefaults;
+export type DB = pgPromise.IDatabase<{}, pg.IClient>;
+type DbConnection = string | pg.IConnectionParameters<pg.IClient>;
+type DbConnectionOpts = pg.IDefaults;
 export declare const TABLE_METHODS: readonly ["update", "find", "findOne", "insert", "delete", "upsert"];
 export declare const JOIN_TYPES: readonly ["one-many", "many-one", "one-one", "many-many"];
-export declare type Join = {
+export type Join = {
     tables: [string, string];
     on: {
         [key: string]: string;
     }[];
     type: typeof JOIN_TYPES[number];
 };
-export declare type Joins = Join[] | "inferred";
-declare type Keywords = {
+export type Joins = Join[] | "inferred";
+type Keywords = {
     $and: string;
     $or: string;
     $not: string;
 };
-export declare type DeepPartial<T> = {
+export type DeepPartial<T> = {
     [P in keyof T]?: DeepPartial<T[P]>;
 };
-export declare type ExpressApp = {
+export type ExpressApp = {
     get: (routePath: string, cb: (req: {
         params: {
             name: string;
@@ -77,7 +77,7 @@ export declare type ExpressApp = {
  *  1. create a column in that table called media
  *  2. create a lookup table lookup_media_{referencedTable} that joins referencedTable to the media table
  */
-export declare type FileTableConfig = {
+export type FileTableConfig = {
     tableName?: string;
     /**
      * GET path used in serving media. defaults to /${tableName}
@@ -117,7 +117,7 @@ export declare type FileTableConfig = {
     };
     imageOptions?: ImageOptions;
 };
-export declare type ProstglesInitOptions<S = void, SUser extends SessionUser = SessionUser> = {
+export type ProstglesInitOptions<S = void, SUser extends SessionUser = SessionUser> = {
     dbConnection: DbConnection;
     dbOptions?: DbConnectionOpts;
     tsGeneratedTypesDir?: string;
@@ -180,12 +180,12 @@ export declare type ProstglesInitOptions<S = void, SUser extends SessionUser = S
     fileTable?: FileTableConfig;
     tableConfig?: TableConfig;
 };
-export declare type OnReady = {
+export type OnReady = {
     dbo: DBHandlerServer;
     db: DB;
 };
-declare type OnReadyCallback<S = void> = (dbo: DBOFullyTyped<S>, db: DB) => any;
-export declare type InitResult = {
+type OnReadyCallback<S = void> = (dbo: DBOFullyTyped<S>, db: DB) => any;
+export type InitResult = {
     db: DBOFullyTyped;
     _db: DB;
     pgp: PGP;

package/lib/Prostgles.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Prostgles.d.ts","sourceRoot":"","sources":["Prostgles.ts"],"names":[],"mappings":";AAMA,OAAO,KAAK,SAAS,MAAM,YAAY,CAAC;AACxC,OAAO,EAAE,GAAG,QAAQ,iCAAiC,CAAC,CAAC;AACvD,OAAO,WAAW,EAAE,EAAE,YAAY,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACjF,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAI5C,OAAO,WAAW,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAGlF,OAAO,iBAAiB,EAAE,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAG/D,OAAO,EAAE,UAAU,EAAE,eAAe,EAAiB,YAAY,EAAE,MAAM,cAAc,CAAC;AAExF,OAAO,EAAE,eAAe,EAAE,CAAA;AAC1B,oBAAY,GAAG,GAAG,SAAS,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC;AAElD,OAAO,EAA8C,SAAS,EAAwC,gBAAgB,EAAsB,MAAM,iBAAiB,CAAC;AACpK,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AACxF,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,oBAAY,EAAE,GAAG,SAAS,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC;AACrD,aAAK,YAAY,GAAG,MAAM,GAAG,EAAE,CAAC,qBAAqB,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC;AAClE,aAAK,gBAAgB,GAAG,EAAE,CAAC,SAAS,CAAC;AACrC,eAAO,MAAM,aAAa,sEAAuE,CAAC;AAmElG,eAAO,MAAM,UAAU,2DAA4D,CAAC;AACpF,oBAAY,IAAI,GAAG;IACjB,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACzB,EAAE,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,EAAE,CAAC;IAChC,IAAI,EAAE,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC;CACjC,CAAC;AACF,oBAAY,KAAK,GAAG,IAAI,EAAE,GAAG,UAAU,CAAC;AAIxC,aAAK,QAAQ,GAAG;IACd,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,oBAAY,WAAW,CAAC,CAAC,IAAI;KAC1B,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CACnC,CAAC;AAYF,oBAAY,UAAU,GAAG;IACvB,GAAG,EAAE,CACH,SAAS,EAAE,MAAM,EACjB,EAAE,EAAE,CACF,GAAG,EAAE;QACH,MAAM,EAAE;YAAE,IAAI,EAAE,MAAM,CAAA;SAAE,CAAC;QACzB,OAAO,EAAE;YAAE,GAAG,EAAE,MAAM,CAAA;SAAE,CAAA;KACzB,EACD,GAAG,EAAE;QACH,QAAQ,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,GAAG,CAAC;QACvC,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;QACpC,QAAQ,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE;YAAE,IAAI,EAAE,MAAM,CAAA;SAAE,KAAK,GAAG,CAAC;QAC7D,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK;YACxB,IAAI,EAAE,CAAC,QAAQ,EAAE,SAAS,KAAK,GAAG,CAAC;SACpC,CAAA;KACF,KACE,GAAG,KACL,GAAG,CAAC;IACT,OAAO,CAAC,EAAE;QACR,KAAK,CAAC,EAAE;YACN,MAAM,EAAE,QAAQ,CAAC;YACjB,IAAI,EAAE,SAAS,CAAC;YAChB,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;YACb,KAAK,CAAC,EAAE;gBACN,IAAI,CAAC,EAAE,MAAM,CAAC;aACf,CAAA;SACF,EAAE,CAAA;KACJ,CAAA;CACF,CAAC;AAEF;;;;;;;;;;;;;;;GAeG;AACH,oBAAY,eAAe,GAAG;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB,WAAW,CAAC,EAAE,QAAQ,CAAC;IACvB,WAAW,CAAC,EAAE,WAAW,CAAC;IAQ1B;;;;OAIG;IACH,aAAa,CAAC,EAAE;QACd;;WAEG;QACH,gBAAgB,EAAE,MAAM,CAAC;QACzB;;WAEG;QACH,kBAAkB,CAAC,EAAE,MAAM,CAAC;KAC7B,CAAA;IACD,UAAU,EAAE,UAAU,CAAC;IACvB,gBAAgB,CAAC,EAAE;QACjB,CAAC,SAAS,EAAE,MAAM,GACd,KAAK,GAAG,MAAM;QAEhB;;aAEK;QAGL;;;aAGK;WACH;YAAE,IAAI,EAAE,QAAQ,CAAC;YAAC,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAA;SAAE,CAAA;KAC3E,CAAC;IACF,YAAY,CAAC,EAAE,YAAY,CAAA;CAC5B,CAAC;AAEF,oBAAY,oBAAoB,CAAC,CAAC,GAAG,IAAI,EAAE,KAAK,SAAS,WAAW,GAAG,WAAW,IAAI;IACpF,YAAY,EAAE,YAAY,CAAC;IAC3B,SAAS,CAAC,EAAE,gBAAgB,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,EAAE,CAAC,EAAE,GAAG,CAAC;IACT,OAAO,CAAC,EAAE,OAAO,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;IAC5B,cAAc,CAAC,EAAE,cAAc,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;IAC1C,aAAa,CAAC,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,OAAO,GAAG,GAAG,CAAC,GAAG,OAAO,CAAC,CAAC,OAAO,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;IAC9F,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC;IAC5B,YAAY,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IAChC,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B;;OAEG;IACH,eAAe,CAAC,EAAE,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC,EAAE,KAAK,CAAC,GAAG;QAAE,MAAM,EAAE,YAAY,CAAA;KAAE,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACzG,kBAAkB,CAAC,EAAE,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC,EAAE,KAAK,CAAC,GAAG;QAAE,MAAM,EAAE,YAAY,CAAA;KAAE,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5G,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;IACtB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,eAAe,CAAC;IAEhB;;;OAGG;IACD,aAAa;IAEf;;;OAGG;OACD,mBAAmB;IAErB;;OAEG;OACD;QAAE,mBAAmB,EAAE,MAAM,CAAA;KAAE,CAAC;IAElC;;OAEG;IACH,WAAW,CAAC,EACR,OAAO;IAET;;;OAGG;OACD,eAAe;IAEjB;;OAEG;OACD,CAAC,CAAC,KAAK,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC,CAAA;IAEzD,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IACzD,SAAS,CAAC,EAAE,eAAe,CAAC;IAC5B,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B,CAAA;AAUD,oBAAY,OAAO,GAAG;IACpB,GAAG,EAAE,eAAe,CAAC;IACrB,EAAE,EAAE,EAAE,CAAC;CACR,CAAA;AAED,aAAK,eAAe,CAAC,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,KAAK,GAAG,CAAC;AAExE,oBAAY,UAAU,GAAG;IACvB,EAAE,EAAE,aAAa,CAAC;IAClB,GAAG,EAAE,EAAE,CAAC;IACR,GAAG,EAAE,GAAG,CAAC;IACT,EAAE,CAAC,EAAE,GAAG,CAAC;IACT,OAAO,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;IAChC;;OAEG;IACH,WAAW,EAAE,MAAM,MAAM,CAAC;IAC1B,MAAM,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,oBAAoB,EAAE,WAAW,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5E,OAAO,EAAE,MAAM,OAAO,CAAC,UAAU,CAAC,CAAA;CACnC,CAAA;AAUD,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,qBAAa,SAAS;IAEpB,IAAI,EAAE,oBAAoB,CAWxB;IAQF,EAAE,CAAC,EAAE,EAAE,CAAC;IACR,GAAG,CAAC,EAAE,GAAG,CAAC;IACV,GAAG,CAAC,EAAE,eAAe,CAAC;IACtB,WAAW,CAAC,EAAE,UAAU,CAAC;IACzB,IAAI,UAAU,IAAI,UAAU,CAG3B;IACD,IAAI,UAAU,CAAC,CAAC,EAAE,UAAU,EAE3B;IACD,aAAa,CAAC,EAAE,aAAa,CAAC;IAE9B,WAAW,CAAC,EAAE,WAAW,CAAC;IAE1B,WAAW,CAAC,EAAE,WAAW,CAAC;IAE1B,QAAQ;;;;;MAAoB;IAC5B,OAAO,CAAC,MAAM,CAAS;IAEvB,eAAe,CAAC,EAAE,eAAe,CAAC;IAGlC,WAAW,CAAC,EAAE,WAAW,CAAC;IAE1B,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IAEtC,OAAO,CAAC,SAAS,EAAE,MAAM;gBAIb,MAAM,EAAE,oBAAoB;IA+BxC,SAAS,UAAS;IAEZ,cAAc,CAAC,KAAK,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE;IA+B9D,OAAO;IAIP,aAAa;;;;IAMb,OAAO,CAAC,WAAW;IASnB,gBAAgB,eAKf;IAED;;OAEG;IACH,aAAa,CAAC,KAAK,UAAQ;IAgB3B;;OAEG;IACH,UAAU,uEAUT;IAED,OAAO,CAAC,eAAe,CAyBtB;IAGD,aAAa,sBAiBZ;IAED,WAAW,UAAS;IACpB,0BAA0B,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC;IAGtC,IAAI,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,UAAU,CAAC;IAoInD,UAAU,CAAC,QAAQ,EAAE,MAAM;IA0BjC,gBAAgB,EAAE,GAAG,EAAE,CAAM;IACvB,eAAe;IAkHrB,gBAAgB,WAAkB,GAAG,mBAoGpC;CACF;AAqCD,wBAAsB,WAAW,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAE1D"}
+{"version":3,"file":"Prostgles.d.ts","sourceRoot":"","sources":["Prostgles.ts"],"names":[],"mappings":";AAMA,OAAO,KAAK,SAAS,MAAM,YAAY,CAAC;AACxC,OAAO,EAAE,GAAG,QAAQ,iCAAiC,CAAC,CAAC;AACvD,OAAO,WAAW,EAAE,EAAE,YAAY,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACjF,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAG5C,OAAO,WAAW,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAElF,OAAO,iBAAiB,EAAE,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAG/D,OAAO,EAAE,UAAU,EAAE,eAAe,EAAiB,YAAY,EAAE,MAAM,cAAc,CAAC;AAExF,OAAO,EAAE,eAAe,EAAE,CAAA;AAC1B,MAAM,MAAM,GAAG,GAAG,SAAS,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC;AAElD,OAAO,EAA8C,SAAS,EAAwC,gBAAgB,EAAsB,MAAM,iBAAiB,CAAC;AACpK,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AACxF,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,MAAM,MAAM,EAAE,GAAG,SAAS,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC;AACrD,KAAK,YAAY,GAAG,MAAM,GAAG,EAAE,CAAC,qBAAqB,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC;AAClE,KAAK,gBAAgB,GAAG,EAAE,CAAC,SAAS,CAAC;AACrC,eAAO,MAAM,aAAa,sEAAuE,CAAC;AAoElG,eAAO,MAAM,UAAU,2DAA4D,CAAC;AACpF,MAAM,MAAM,IAAI,GAAG;IACjB,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACzB,EAAE,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,EAAE,CAAC;IAChC,IAAI,EAAE,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC;CACjC,CAAC;AACF,MAAM,MAAM,KAAK,GAAG,IAAI,EAAE,GAAG,UAAU,CAAC;AAIxC,KAAK,QAAQ,GAAG;IACd,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI;KAC1B,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CACnC,CAAC;AAYF,MAAM,MAAM,UAAU,GAAG;IACvB,GAAG,EAAE,CACH,SAAS,EAAE,MAAM,EACjB,EAAE,EAAE,CACF,GAAG,EAAE;QACH,MAAM,EAAE;YAAE,IAAI,EAAE,MAAM,CAAA;SAAE,CAAC;QACzB,OAAO,EAAE;YAAE,GAAG,EAAE,MAAM,CAAA;SAAE,CAAA;KACzB,EACD,GAAG,EAAE;QACH,QAAQ,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,GAAG,CAAC;QACvC,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;QACpC,QAAQ,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE;YAAE,IAAI,EAAE,MAAM,CAAA;SAAE,KAAK,GAAG,CAAC;QAC7D,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK;YACxB,IAAI,EAAE,CAAC,QAAQ,EAAE,SAAS,KAAK,GAAG,CAAC;SACpC,CAAA;KACF,KACE,GAAG,KACL,GAAG,CAAC;IACT,OAAO,CAAC,EAAE;QACR,KAAK,CAAC,EAAE;YACN,MAAM,EAAE,QAAQ,CAAC;YACjB,IAAI,EAAE,SAAS,CAAC;YAChB,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;YACb,KAAK,CAAC,EAAE;gBACN,IAAI,CAAC,EAAE,MAAM,CAAC;aACf,CAAA;SACF,EAAE,CAAA;KACJ,CAAA;CACF,CAAC;AAEF;;;;;;;;;;;;;;;GAeG;AACH,MAAM,MAAM,eAAe,GAAG;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB,WAAW,CAAC,EAAE,QAAQ,CAAC;IACvB,WAAW,CAAC,EAAE,WAAW,CAAC;IAQ1B;;;;OAIG;IACH,aAAa,CAAC,EAAE;QACd;;WAEG;QACH,gBAAgB,EAAE,MAAM,CAAC;QACzB;;WAEG;QACH,kBAAkB,CAAC,EAAE,MAAM,CAAC;KAC7B,CAAA;IACD,UAAU,EAAE,UAAU,CAAC;IACvB,gBAAgB,CAAC,EAAE;QACjB,CAAC,SAAS,EAAE,MAAM,GACd,KAAK,GAAG,MAAM;QAEhB;;aAEK;QAGL;;;aAGK;WACH;YAAE,IAAI,EAAE,QAAQ,CAAC;YAAC,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAA;SAAE,CAAA;KAC3E,CAAC;IACF,YAAY,CAAC,EAAE,YAAY,CAAA;CAC5B,CAAC;AAEF,MAAM,MAAM,oBAAoB,CAAC,CAAC,GAAG,IAAI,EAAE,KAAK,SAAS,WAAW,GAAG,WAAW,IAAI;IACpF,YAAY,EAAE,YAAY,CAAC;IAC3B,SAAS,CAAC,EAAE,gBAAgB,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,EAAE,CAAC,EAAE,GAAG,CAAC;IACT,OAAO,CAAC,EAAE,OAAO,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;IAC5B,cAAc,CAAC,EAAE,cAAc,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;IAC1C,aAAa,CAAC,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,OAAO,GAAG,GAAG,CAAC,GAAG,OAAO,CAAC,CAAC,OAAO,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;IAC9F,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC;IAC5B,YAAY,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IAChC,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B;;OAEG;IACH,eAAe,CAAC,EAAE,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC,EAAE,KAAK,CAAC,GAAG;QAAE,MAAM,EAAE,YAAY,CAAA;KAAE,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACzG,kBAAkB,CAAC,EAAE,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC,EAAE,KAAK,CAAC,GAAG;QAAE,MAAM,EAAE,YAAY,CAAA;KAAE,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5G,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;IACtB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,eAAe,CAAC;IAEhB;;;OAGG;IACD,aAAa;IAEf;;;OAGG;OACD,mBAAmB;IAErB;;OAEG;OACD;QAAE,mBAAmB,EAAE,MAAM,CAAA;KAAE,CAAC;IAElC;;OAEG;IACH,WAAW,CAAC,EACR,OAAO;IAET;;;OAGG;OACD,eAAe;IAEjB;;OAEG;OACD,CAAC,CAAC,KAAK,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC,CAAA;IAEzD,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IACzD,SAAS,CAAC,EAAE,eAAe,CAAC;IAC5B,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B,CAAA;AAUD,MAAM,MAAM,OAAO,GAAG;IACpB,GAAG,EAAE,eAAe,CAAC;IACrB,EAAE,EAAE,EAAE,CAAC;CACR,CAAA;AAED,KAAK,eAAe,CAAC,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,KAAK,GAAG,CAAC;AAExE,MAAM,MAAM,UAAU,GAAG;IACvB,EAAE,EAAE,aAAa,CAAC;IAClB,GAAG,EAAE,EAAE,CAAC;IACR,GAAG,EAAE,GAAG,CAAC;IACT,EAAE,CAAC,EAAE,GAAG,CAAC;IACT,OAAO,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;IAChC;;OAEG;IACH,WAAW,EAAE,MAAM,MAAM,CAAC;IAC1B,MAAM,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,oBAAoB,EAAE,WAAW,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5E,OAAO,EAAE,MAAM,OAAO,CAAC,UAAU,CAAC,CAAA;CACnC,CAAA;AAUD,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,qBAAa,SAAS;IAEpB,IAAI,EAAE,oBAAoB,CAaxB;IAQF,EAAE,CAAC,EAAE,EAAE,CAAC;IACR,GAAG,CAAC,EAAE,GAAG,CAAC;IACV,GAAG,CAAC,EAAE,eAAe,CAAC;IACtB,WAAW,CAAC,EAAE,UAAU,CAAC;IACzB,IAAI,UAAU,IAAI,UAAU,CAG3B;IACD,IAAI,UAAU,CAAC,CAAC,EAAE,UAAU,EAE3B;IACD,aAAa,CAAC,EAAE,aAAa,CAAC;IAE9B,WAAW,CAAC,EAAE,WAAW,CAAC;IAE1B,WAAW,CAAC,EAAE,WAAW,CAAC;IAE1B,QAAQ;;;;;MAAoB;IAC5B,OAAO,CAAC,MAAM,CAAS;IAEvB,eAAe,CAAC,EAAE,eAAe,CAAC;IAGlC,WAAW,CAAC,EAAE,WAAW,CAAC;IAE1B,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IAEtC,OAAO,CAAC,SAAS,EAAE,MAAM;gBAIb,MAAM,EAAE,oBAAoB;IA+BxC,SAAS,UAAS;IAEZ,cAAc,CAAC,KAAK,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE;IA+B9D,OAAO;IAIP,aAAa;;;;IAMb,OAAO,CAAC,WAAW;IASnB,gBAAgB,eAKf;IAED;;OAEG;IACH,aAAa,CAAC,KAAK,UAAQ;IAgB3B;;OAEG;IACH,UAAU,uEAUT;IAED,OAAO,CAAC,eAAe,CAyBtB;IAGD,aAAa,sBAiBZ;IAED,WAAW,UAAS;IACpB,0BAA0B,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC;IAGtC,IAAI,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,UAAU,CAAC;IAoInD,UAAU,CAAC,QAAQ,EAAE,MAAM;IA0BjC,gBAAgB,EAAE,GAAG,EAAE,CAAM;IACvB,eAAe;IAkHrB,gBAAgB,WAAkB,GAAG,mBAoGpC;CACF;AAqCD,wBAAsB,WAAW,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAE1D"}

package/lib/Prostgles.js

@@ -34,10 +34,8 @@ exports.isSuperUser = exports.Prostgles = exports.JOIN_TYPES = exports.TABLE_MET
 const promise = __importStar(require("bluebird"));
 const pgPromise = __importStar(require("pg-promise"));
 const FileManager_1 = __importDefault(require("./FileManager"));
-const pkgj = require('../package.json');
-const version = pkgj.version;
+const { version } = require('../package.json');
 const AuthHandler_1 = __importDefault(require("./AuthHandler"));
-console.log("Add a basic auth mode where user and sessions table are created");
 const TableConfig_1 = __importDefault(require("./TableConfig"));
 const utils_1 = require("./utils");
 const DboBuilder_1 = require("./DboBuilder");
@@ -47,7 +45,7 @@ const PublishParser_1 = require("./PublishParser");
 const DBEventsManager_1 = require("./DBEventsManager");
 exports.TABLE_METHODS = ["update", "find", "findOne", "insert", "delete", "upsert"];
 function getDbConnection(dbConnection, options, debugQueries = false, onNotice) {
-    let pgp = pgPromise({
+    const pgp = pgPromise({
         promiseLib: promise,
         ...(debugQueries ? {
             query: function (ctx) {
@@ -63,7 +61,8 @@ function getDbConnection(dbConnection, options, debugQueries = false, onNotice)
             }
         } : {}),
         ...((onNotice || debugQueries) ? {
-            connect: function (client, dc, isFresh) {
+            connect: function ({ client, dc, useCount }) {
+                const isFresh = !useCount;
                 if (isFresh && !client.listeners('notice').length) {
                     client.on('notice', function (msg) {
                         if (onNotice) {
@@ -124,7 +123,9 @@ class Prostgles {
             port: 5432,
             application_name: "prostgles_app"
         },
-        onReady: () => { },
+        onReady: () => {
+            //empty 
+        },
         schema: "public",
         watchSchema: false,
         watchSchemaType: "DDL_trigger",
@@ -164,7 +165,7 @@ class Prostgles {
         if (!params.io)
             console.warn("io missing. WebSockets will not be set up");
         // TODO: find an exact keyof T<->arr TS matching method
-        let config = [
+        const config = [
             "transactions", "joins", "tsGeneratedTypesDir",
             "onReady", "dbConnection", "dbOptions", "publishMethods", "io",
             "publish", "schema", "publishRawSQL", "wsChannelNamePrefix", "onSocketConnect",
@@ -454,7 +455,7 @@ class Prostgles {
         this.checkDb();
         if (!this.dbo)
             throw "dbo missing";
-        let publishParser = new PublishParser_1.PublishParser(this.opts.publish, this.opts.publishMethods, this.opts.publishRawSQL, this.dbo, this.db, this);
+        const publishParser = new PublishParser_1.PublishParser(this.opts.publish, this.opts.publishMethods, this.opts.publishRawSQL, this.dbo, this.db, this);
         this.publishParser = publishParser;
         if (!this.opts.io)
             return;
@@ -476,7 +477,7 @@ class Prostgles {
             this.connectedSockets.push(socket);
             if (!this.db || !this.dbo)
                 throw new Error("db/dbo missing");
-            let { dbo, db, pgp } = this;
+            const { dbo, db } = this;
             try {
                 if (this.opts.onSocketConnect) {
                     try {
@@ -494,16 +495,16 @@ class Prostgles {
                     Checks request against publish and if OK run it with relevant publish functions. Local (server) requests do not check the policy
                 */
                 socket.removeAllListeners(prostgles_types_1.CHANNELS.DEFAULT);
-                socket.on(prostgles_types_1.CHANNELS.DEFAULT, async ({ tableName, command, param1, param2, param3 }, cb = (...callback) => { }) => {
+                socket.on(prostgles_types_1.CHANNELS.DEFAULT, async ({ tableName, command, param1, param2, param3 }, cb = (..._callback) => { }) => {
                     try { /* Channel name will only include client-sent params so we ignore table_rules enforced params */
                         if (!socket || !this.authHandler || !this.publishParser || !this.dbo) {
                             console.error("socket or authhandler missing??!!");
                             throw "socket or authhandler missing??!!";
                         }
                         const clientInfo = await this.authHandler.getClientInfo({ socket });
-                        let valid_table_command_rules = await this.publishParser.getValidatedRequestRule({ tableName, command, localParams: { socket } }, clientInfo);
+                        const valid_table_command_rules = await this.publishParser.getValidatedRequestRule({ tableName, command, localParams: { socket } }, clientInfo);
                         if (valid_table_command_rules) {
-                            let res = await this.dbo[tableName][command](param1, param2, param3, valid_table_command_rules, { socket, isRemoteRequest: true });
+                            const res = await this.dbo[tableName][command](param1, param2, param3, valid_table_command_rules, { socket, isRemoteRequest: true });
                             cb(null, res);
                         }
                         else
@@ -529,7 +530,7 @@ class Prostgles {
                     ;
                 });
                 socket.removeAllListeners(prostgles_types_1.CHANNELS.METHOD);
-                socket.on(prostgles_types_1.CHANNELS.METHOD, async ({ method, params }, cb = (...callback) => { }) => {
+                socket.on(prostgles_types_1.CHANNELS.METHOD, async ({ method, params }, cb = (..._callback) => { }) => {
                     try {
                         const methods = await this.publishParser?.getAllowedMethods(socket);
                         if (!methods || !methods[method]) {
@@ -561,11 +562,11 @@ class Prostgles {
     }
     pushSocketSchema = async (socket) => {
         try {
-            let { auth, userData } = await this.authHandler?.makeSocketAuth(socket) || {};
+            const { auth, userData } = await this.authHandler?.makeSocketAuth(socket) || {};
             // let needType = this.publishRawSQL && typeof this.publishRawSQL === "function";
             // let DATA_TYPES = !needType? [] : await this.db.any("SELECT oid, typname FROM pg_type");
             // let USER_TABLES = !needType? [] :  await this.db.any("SELECT relid, relname FROM pg_catalog.pg_statio_user_tables");
-            const { dbo, db, pgp, publishParser } = this;
+            const { db, publishParser } = this;
             let fullSchema;
             let publishValidationError;
             let rawSQL = false;
@@ -585,12 +586,12 @@ class Prostgles {
             if (this.opts.publishRawSQL && typeof this.opts.publishRawSQL === "function") {
                 const canRunSQL = async () => {
                     const publishParams = await this.publishParser?.getPublishParams({ socket });
-                    let res = await this.opts.publishRawSQL?.(publishParams);
+                    const res = await this.opts.publishRawSQL?.(publishParams);
                     return Boolean(res && typeof res === "boolean" || res === "*");
                 };
                 if (await canRunSQL()) {
                     socket.removeAllListeners(prostgles_types_1.CHANNELS.SQL);
-                    socket.on(prostgles_types_1.CHANNELS.SQL, async ({ query, params, options }, cb = (...callback) => { }) => {
+                    socket.on(prostgles_types_1.CHANNELS.SQL, async ({ query, params, options }, cb = (..._callback) => { }) => {
                         if (!this.dbo?.sql)
                             throw "Internal error: sql handler missing";
                         this.dbo.sql(query, params, options, { socket }).then(res => {
@@ -609,9 +610,9 @@ class Prostgles {
                 }
             }
             const { schema, tables } = fullSchema ?? { schema: {}, tables: [] };
-            let joinTables2 = [];
+            const joinTables2 = [];
             if (this.opts.joins) {
-                let _joinTables2 = this.dboBuilder.getJoinPaths()
+                const _joinTables2 = this.dboBuilder.getJoinPaths()
                     .filter(jp => ![jp.t1, jp.t2].find(t => !schema[t] || !schema[t].findOne)).map(jp => [jp.t1, jp.t2].sort());
                 _joinTables2.map(jt => {
                     if (!joinTables2.find(_jt => _jt.join() === jt.join())) {