prostgles-server 3.0.90 → 3.0.91

package/lib/JSONBValidation/validation.ts

@@ -30,7 +30,9 @@ export namespace JSONB {
     type: DataType;
     allowedValues?: any[];
     oneOf?: undefined;
+    oneOfType?: undefined;
     arrayOf?: undefined;
+    arrayOfType?: undefined;
     enum?: undefined;
   };
   
@@ -38,7 +40,9 @@ export namespace JSONB {
     type: ObjectSchema;
     allowedValues?: undefined;
     oneOf?: undefined;
+    oneOfType?: undefined;
     arrayOf?: undefined;
+    arrayOfType?: undefined;
     enum?: undefined;
   } 
   
@@ -46,32 +50,47 @@ export namespace JSONB {
     type?: undefined;
     enum: readonly any[];
     oneOf?: undefined;
+    oneOfType?: undefined;
     arrayOf?: undefined;
+    arrayOfType?: undefined;
     allowedValues?: undefined;
   };
   
   export type OneOf = BaseOptions & {
     type?: undefined;
-    oneOf: readonly ObjectSchema[];
     arrayOf?: undefined;
+    arrayOfType?: undefined;
     allowedValues?: undefined;
     enum?: undefined;
-  }
+  } & ({
+    oneOf?: undefined;
+    oneOfType: readonly ObjectSchema[];
+  } | {
+    oneOf: FieldType[];
+    oneOfType?: undefined;
+  })
   export type ArrayOf = BaseOptions & {
     type?: undefined;
-    arrayOf: ObjectSchema;
     allowedValues?: undefined;
     oneOf?: undefined;
+    oneOfType?: undefined;
     enum?: undefined;
-  }
+  } & ({
+    arrayOf?: undefined;
+    arrayOfType: ObjectSchema;
+  } | {
+    arrayOf: FieldType;
+    arrayOfType?: undefined;
+  })
    
 
-  export type FieldTypeObj = 
+  export type FieldTypeObj = StrictUnion<
   | BasicType
   | ObjectType
   | EnumType
   | OneOf
-  | ArrayOf;
+  | ArrayOf
+>;
 
   export type FieldType = 
   | DataType 
@@ -79,7 +98,7 @@ export namespace JSONB {
 
 
   export type GetType<T extends FieldType | Omit<FieldTypeObj, "optional">> =
-  | T extends { type: ObjectSchema } ? NestedSchemaObject<T["type"]> :
+  | T extends { type: ObjectSchema } ? GetObjectType<T["type"]> :
   | T extends "number" | { type: "number" } ? number :
   | T extends "boolean" | { type: "boolean" } ? boolean :
   | T extends "integer" | { type: "integer" } ? number :
@@ -90,11 +109,13 @@ export namespace JSONB {
   | 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 { "enum": readonly any[] } ? T["enum"][number] :
 
-  | T extends { oneOf: readonly ObjectSchema[] } ? StrictUnion<NestedSchemaObject<T["oneOf"][number]>> :
+  | T extends { oneOf: FieldType[] } ? StrictUnion<GetType<T["oneOf"][number]>> :
+  | T extends { oneOf: readonly ObjectSchema[] } ? StrictUnion<GetType<T["oneOf"][number]>> :
 
-  | T extends { arrayOf: ObjectSchema } ? NestedSchemaObject<T["arrayOf"]>[] :
+  | T extends { arrayOf: ObjectSchema } ? GetType<T["arrayOf"]>[] :
+  | T extends { arrayOfType: ObjectSchema } ? GetType<T["arrayOfType"]>[] :
   any;
 
   type IsOptional<F extends FieldType> = F extends DataType? false : F extends { optional: true }? true : false; 
@@ -103,7 +124,12 @@ export namespace JSONB {
   export type ObjectSchema = Record<string, FieldType>;
   export type JSONBSchema = Omit<FieldTypeObj, "optional">;
 
-  export type NestedSchemaObject<S extends ObjectSchema> = (
+  const dd: JSONBSchema = {
+    enum: [1],
+    type: "any"
+  }
+
+  export type GetObjectType<S extends ObjectSchema> = (
     {
       [K in keyof S as IsOptional<S[K]> extends true ? K : never]?: GetType<S[K]>
     } & {
@@ -119,9 +145,9 @@ const s: JSONB.JSONBSchema = {
   type: {
     a: { type: "boolean" },
     c: { type: { c1: { type: "string" } } },
-    arr: { arrayOf: { d: "string" } },
+    arr: { arrayOfType: { d: "string" } },
     o: {
-      oneOf: [
+      oneOfType: [
         { z: { type: "integer" } },
         { z1: { type: "integer" } }
       ]
@@ -167,7 +193,7 @@ export function validate<T>(obj: T, key: keyof T, rawFieldType: JSONB.FieldType)
   return true
 }
 
-export function validateSchema<S extends JSONB.ObjectSchema>(schema: S, obj: JSONB.NestedSchemaObject<S>, objName?: string, optional = false) {
+export function validateSchema<S extends JSONB.ObjectSchema>(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]));
 }
@@ -175,63 +201,56 @@ export function validateSchema<S extends JSONB.ObjectSchema>(schema: S, obj: JSO
 
 type ColOpts = { nullable?: boolean }; 
 
-export function getSchemaTSTypes(schema: JSONB.ObjectSchema, leading = "", isOneOf = false): string {
-  const getFieldType = (rawFieldType: JSONB.FieldType) => {
+
+export function getJSONBSchemaTSTypes(schema: JSONB.JSONBSchema, colOpts: ColOpts, leading = ""): string { 
+ 
+  const getFieldType = (rawFieldType: JSONB.FieldType, isOneOf = false): string => {
     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)
+    
+    /** Primitives */
+    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(" | ")})[]`
       }
-    } 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 ? "" : ";"}`;
+      return nullType + correctType;
+
+    /** Object */
+    } else if (isObject(fieldType.type)) {
+      const { type } = fieldType;
+      const spacing = isOneOf ? " " : "  ";
+      let objDef = `${leading}{ \n` + getKeys(type).map(k => {
+        const fieldType = getFieldTypeObj(type[k]);
+        return `${leading}${spacing}${k}${fieldType.optional ? "?" : ""}: ` + getFieldType(fieldType) + ";";
+      }).join("\n") + ` \n${leading}}${isOneOf ? "" : ";"}`;
+    
+      /** Keep single line */
+      if (isOneOf){
+        objDef = objDef.split("\n").join("");
+      }
+      return nullType + objDef;
 
-  /** Keep single line */
-  if (isOneOf) return res.split("\n").join("");
+    } else if (fieldType?.enum) {
+      return nullType + fieldType.enum.map(v => asValue(v)).join(" | ");
 
-  return res;
-}
+    } else if (fieldType?.oneOf || fieldType?.oneOfType) {
+      const oneOf = fieldType?.oneOf || fieldType?.oneOfType.map(type => ({ type }));
+      return (fieldType.nullable ? `\n${leading}  | null` : "") + oneOf.map(v => `\n${leading}  | ` + getFieldType(v)).join("");
 
-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);
-    }
+    } else if (fieldType?.arrayOf || fieldType?.arrayOfType) {
+      const arrayOf = fieldType?.arrayOf || { type: fieldType?.arrayOfType };
+      return (fieldType.nullable ? `\n${leading}  | null` : "") + getFieldType(arrayOf) + "[]";
 
-    return "";
-  }
+    } else throw "Unexpected getSchemaTSTypes: " + JSON.stringify({ fieldType, schema }, null, 2)
+  } 
+ 
+  return getFieldType({ ...schema as any, nullable: colOpts.nullable });
 }
 
 
 const getJSONSchemaObject = (rawType: JSONB.FieldType | JSONB.JSONBSchema, rootInfo?: { id: string }): JSONSchema7 => {
-  const {  type, arrayOf, description, nullable, oneOf, title, ...t } = 
+  const {  type, arrayOf, arrayOfType, description, nullable, oneOf, oneOfType, title, ...t } = 
     typeof rawType === "string"? ({ type: rawType } satisfies JSONB.FieldTypeObj) : 
     rawType; 
 
@@ -246,16 +265,15 @@ const getJSONSchemaObject = (rawType: JSONB.FieldType | JSONB.JSONBSchema, rootI
     partialProps.type = typeof t.enum[0]! as any;
   }
 
-  if(typeof type === "string" || arrayOf){
+  if(typeof type === "string" || arrayOf || arrayOfType){
 
     /** ARRAY */
     if(type && typeof type !== "string") {
       throw "Not expected";
     }
-    if(arrayOf || type?.endsWith("[]")){
-
+    if(arrayOf || arrayOfType || type?.endsWith("[]")){
       const arrayItems = 
-        arrayOf? getJSONSchemaObject({ type: arrayOf }) : 
+        (arrayOf || arrayOfType)? getJSONSchemaObject(arrayOf || { type: arrayOfType }) : 
         type?.startsWith("any")? { type: undefined } :
         {  
           type: type?.slice(0, -2) as JSONSchema7TypeName,
@@ -288,10 +306,11 @@ const getJSONSchemaObject = (rawType: JSONB.FieldType | JSONB.JSONBSchema, rootI
         }
       }, {}),
     }
-  } else if(oneOf){
+  } else if(oneOf || oneOfType){
+    const _oneOf = oneOf || oneOfType!.map(type => ({ type }))
     result = {
       type: "object",
-      oneOf: oneOf.map(s => getJSONSchemaObject({ type: s }))
+      oneOf: _oneOf.map(t => getJSONSchemaObject(t))
     }
   }
 

package/lib/PubSubManager/PubSubManager.d.ts.map

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

package/lib/PubSubManager/PubSubManager.js

@@ -37,7 +37,7 @@ const pgPromise = __importStar(require("pg-promise"));
 const prostgles_types_1 = require("prostgles-types");
 const SyncReplication_1 = require("../SyncReplication");
 const util_1 = require("prostgles-types/dist/util");
-let pgp = pgPromise({
+const pgp = pgPromise({
     promiseLib: Bluebird
 });
 const asValue = (v) => pgp.as.format("$1", [v]);
@@ -332,8 +332,8 @@ class PubSubManager {
                     return;
                 }
                 /* Throttle the subscriptions */
-                for (var i = 0; i < subs.length; i++) {
-                    var sub = subs[i];
+                for (let i = 0; i < subs.length; i++) {
+                    const sub = subs[i];
                     if (this.dbo[sub.table_name] &&
                         sub.is_ready &&
                         (sub.socket_id && this.sockets[sub.socket_id]) || sub.func) {
@@ -425,7 +425,7 @@ class PubSubManager {
      */
     async addSync(syncParams) {
         const { socket = null, table_info = null, table_rules, synced_field = null, allow_delete = false, id_fields = [], filter = {}, params, condition = "", throttle = 0 } = syncParams || {};
-        let conditionParsed = parseCondition(condition);
+        const conditionParsed = parseCondition(condition);
         if (!socket || !table_info)
             throw "socket or table_info missing";
         const { name: table_name } = table_info, channel_name = `${this.socketChannelPreffix}.${table_name}.${JSON.stringify(filter)}.sync`;
@@ -433,7 +433,7 @@ class PubSubManager {
             throw "synced_field missing from table_rules";
         this.upsertSocket(socket, channel_name);
         const upsertSync = () => {
-            let newSync = {
+            const newSync = {
                 channel_name,
                 table_name,
                 filter,
@@ -509,7 +509,7 @@ class PubSubManager {
             return newSync;
         };
         // const { min_id, max_id, count, max_synced } = params;
-        let sync = upsertSync();
+        const _sync = upsertSync();
         await this.addTrigger({ table_name, condition: conditionParsed });
         return channel_name;
     }
@@ -625,7 +625,7 @@ class PubSubManager {
         }
     }
     removeLocalSub(table_name, condition, func) {
-        let cond = parseCondition(condition);
+        const cond = parseCondition(condition);
         if ((0, utils_1.get)(this.subs, [table_name, cond, "subs"])) {
             this.subs[table_name][cond].subs.map((sub, i) => {
                 if (sub.func && sub.func === func) {
@@ -638,7 +638,7 @@ class PubSubManager {
         }
     }
     getActiveListeners = () => {
-        let result = [];
+        const result = [];
         const upsert = (t, c) => {
             if (!result.find(r => r.table_name === t && r.condition === c)) {
                 result.push({ table_name: t, condition: c });
@@ -692,6 +692,7 @@ class PubSubManager {
             });
         }
         if (!socket) {
+            // Do nothing
         }
         else if (!channel_name) {
             delete this.sockets[socket.id];
@@ -712,7 +713,7 @@ class PubSubManager {
                 AND table_name = 'hypertable' \
         );", { schema });
         if (res.exists) {
-            let isHyperTable = await this.db.any("SELECT * FROM " + (0, prostgles_types_1.asName)(schema) + ".hypertable WHERE table_name = ${table_name};", { table_name, schema });
+            const isHyperTable = await this.db.any("SELECT * FROM " + (0, prostgles_types_1.asName)(schema) + ".hypertable WHERE table_name = ${table_name};", { table_name, schema });
             if (isHyperTable && isHyperTable.length) {
                 throw "Triggers do not work on timescaledb hypertables due to bug:\nhttps://github.com/timescale/timescaledb/issues/1084";
             }
@@ -737,7 +738,8 @@ class PubSubManager {
     addTriggerPool = undefined;
     async addTrigger(params, viewOptions) {
         try {
-            let { table_name, condition } = { ...params };
+            const { table_name } = { ...params };
+            let { condition } = { ...params };
             if (!table_name)
                 throw "MISSING table_name";
             if (!this.appID)
@@ -783,7 +785,7 @@ class PubSubManager {
     }
 }
 exports.PubSubManager = PubSubManager;
-const parseCondition = (condition) => Boolean(condition && condition.trim().length) ? condition : "TRUE";
+const parseCondition = (condition) => condition && condition.trim().length ? condition : "TRUE";
 var prostgles_types_2 = require("prostgles-types");
 Object.defineProperty(exports, "pickKeys", { enumerable: true, get: function () { return prostgles_types_2.pickKeys; } });
 Object.defineProperty(exports, "omitKeys", { enumerable: true, get: function () { return prostgles_types_2.omitKeys; } });

package/lib/PubSubManager/PubSubManager.ts

@@ -13,7 +13,7 @@ import * as Bluebird from "bluebird";
 import * as pgPromise from 'pg-promise';
 import pg from 'pg-promise/typescript/pg-subset';
 
-import { SelectParams, FieldFilter, asName, WAL, isEmpty, AnyObject, getKeys } from "prostgles-types";
+import { SelectParams, FieldFilter, asName, WAL, isEmpty, AnyObject } from "prostgles-types";
 
 import { ClientExpressData, syncData } from "../SyncReplication";
 import { TableRule } from "../PublishParser";
@@ -21,7 +21,7 @@ import { find } from "prostgles-types/dist/util";
 
 
 type PGP = pgPromise.IMain<{}, pg.IClient>;
-let pgp: PGP = pgPromise({
+const pgp: PGP = pgPromise({
   promiseLib: Bluebird
 });
 export const asValue = (v: any) => pgp.as.format("$1", [v]);
@@ -453,8 +453,8 @@ export class PubSubManager {
         }
 
         /* Throttle the subscriptions */
-        for (var i = 0; i < subs.length; i++) {
-          var sub = subs[i];
+        for (let i = 0; i < subs.length; i++) {
+          const sub = subs[i];
           if (
             this.dbo[sub.table_name] &&
             sub.is_ready &&
@@ -563,7 +563,7 @@ export class PubSubManager {
       params, condition = "", throttle = 0
     } = syncParams || {};
 
-    let conditionParsed = parseCondition(condition);
+    const conditionParsed = parseCondition(condition);
     if (!socket || !table_info) throw "socket or table_info missing";
 
 
@@ -575,7 +575,7 @@ export class PubSubManager {
     this.upsertSocket(socket, channel_name);
 
     const upsertSync = () => {
-      let newSync = {
+      const newSync = {
         channel_name,
         table_name,
         filter,
@@ -662,7 +662,7 @@ export class PubSubManager {
 
     // const { min_id, max_id, count, max_synced } = params;
 
-    let sync = upsertSync();
+    const _sync = upsertSync();
 
     await this.addTrigger({ table_name, condition: conditionParsed });
 
@@ -808,7 +808,7 @@ export class PubSubManager {
   }
 
   removeLocalSub(table_name: string, condition: string, func: (items: object[]) => any) {
-    let cond = parseCondition(condition);
+    const cond = parseCondition(condition);
     if (get(this.subs, [table_name, cond, "subs"])) {
       this.subs[table_name][cond].subs.map((sub, i) => {
         if (
@@ -823,7 +823,7 @@ export class PubSubManager {
   }
 
   getActiveListeners = (): { table_name: string; condition: string }[] => {
-    let result: { table_name: string; condition: string }[] = [];
+    const result: { table_name: string; condition: string }[] = [];
     const upsert = (t: string, c: string) => {
       if (!result.find(r => r.table_name === t && r.condition === c)) {
         result.push({ table_name: t, condition: c });
@@ -886,7 +886,7 @@ export class PubSubManager {
     }
 
     if (!socket) {
-
+      // Do nothing
     } else if (!channel_name) {
       delete this.sockets[socket.id];
     } else {
@@ -909,7 +909,7 @@ export class PubSubManager {
                 AND table_name = 'hypertable' \
         );", { schema });
     if (res.exists) {
-      let isHyperTable = await this.db.any("SELECT * FROM " + asName(schema) + ".hypertable WHERE table_name = ${table_name};", { table_name, schema });
+      const isHyperTable = await this.db.any("SELECT * FROM " + asName(schema) + ".hypertable WHERE table_name = ${table_name};", { table_name, schema });
       if (isHyperTable && isHyperTable.length) {
         throw "Triggers do not work on timescaledb hypertables due to bug:\nhttps://github.com/timescale/timescaledb/issues/1084"
       }
@@ -939,7 +939,8 @@ export class PubSubManager {
   async addTrigger(params: { table_name: string; condition: string; }, viewOptions?: ViewSubscriptionOptions) {
     try {
 
-      let { table_name, condition } = { ...params }
+      const { table_name } = { ...params }
+      let { condition } = { ...params }
       if (!table_name) throw "MISSING table_name";
       if (!this.appID) throw "MISSING appID";
 
@@ -999,6 +1000,6 @@ export class PubSubManager {
 }
 
 
-const parseCondition = (condition: string): string => Boolean(condition && condition.trim().length) ? condition : "TRUE"
+const parseCondition = (condition: string): string => condition && condition.trim().length ? condition : "TRUE"
 
 export { pickKeys, omitKeys } from "prostgles-types"

package/lib/index.d.ts

@@ -1,5 +1,5 @@
 import { SessionUser } from "./AuthHandler";
-import { ProstglesInitOptions, InitResult } from "./Prostgles";
-declare function prostgles<S = void, SUser extends SessionUser = SessionUser>(params: ProstglesInitOptions<S, SUser>): Promise<InitResult>;
+import { ProstglesInitOptions } from "./Prostgles";
+declare function prostgles<S = void, SUser extends SessionUser = SessionUser>(params: ProstglesInitOptions<S, SUser>): Promise<import("./Prostgles").InitResult>;
 export = prostgles;
 //# sourceMappingURL=index.d.ts.map

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAa,oBAAoB,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAE1E,iBAAS,SAAS,CAAC,CAAC,GAAG,IAAI,EAAE,KAAK,SAAS,WAAW,GAAG,WAAW,EAAE,MAAM,EAAE,oBAAoB,CAAC,CAAC,EAAE,KAAK,CAAC,uBAI3G;AACD,SAAS,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAa,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAE9D,iBAAS,SAAS,CAAC,CAAC,GAAG,IAAI,EAAE,KAAK,SAAS,WAAW,GAAG,WAAW,EAAE,MAAM,EAAE,oBAAoB,CAAC,CAAC,EAAE,KAAK,CAAC,6CAI3G;AACD,SAAS,SAAS,CAAC"}

package/lib/index.ts

@@ -1,5 +1,5 @@
 import { SessionUser } from "./AuthHandler";
-import { Prostgles, ProstglesInitOptions, InitResult } from "./Prostgles";
+import { Prostgles, ProstglesInitOptions } from "./Prostgles";
 
 function prostgles<S = void, SUser extends SessionUser = SessionUser>(params: ProstglesInitOptions<S, SUser>){
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prostgles-server",
-  "version": "3.0.90",
+  "version": "3.0.91",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/tests/client/PID.txt

@@ -1 +1 @@
-377602
+412208

package/tests/client_only_queries.js

@@ -96,7 +96,7 @@ async function client_only(db, auth, log, methods, tableSchema) {
 
           END $$;
         `);
-                }, log);
+                }, { log });
                 /* REPLICATION */
                 log("Started testRealtime");
                 const start = Date.now();

package/tests/client_only_queries.ts

@@ -108,7 +108,7 @@ export default async function client_only(db: Required<DBHandlerClient>, auth: A
 
           END $$;
         `);
-      }, log);
+      }, { log });
 
   
       /* REPLICATION */

package/tests/server/DBoGenerated.d.ts

@@ -377,20 +377,41 @@ export type DBSchemaGenerated = {
         arrStr?: null | string[];
         o?: 
         | null
-        | {  o1: number; }
-        | {  o2: boolean; }; 
+        |       { 
+        o1: number; 
+      };
+        |       { 
+        o2: boolean; 
+      };; 
       };
       jsonOneOf?: 
         | null
-        | {  command: 'a'; }
-        | {  command: 'b'; option: number[]; }
+        |       { 
+        command: 'a'; 
+      };
+        |       { 
+        command: 'b';
+        option: number[]; 
+      };
       status?: 
         | null
-        | {  ok: string; }
-        | {  err: string; }
-        | {  loading: {  loaded: number; total: number; }; }
+        |       { 
+        ok: string; 
+      };
+        |       { 
+        err: string; 
+      };
+        |       { 
+        loading:       { 
+        loaded: number;
+        total: number; 
+      };; 
+      };
       table_config?: null |       { 
-        referencedTables?: {  name: string; minFiles: number; }[]; 
+        referencedTables?:       { 
+        name: string;
+        minFiles: number; 
+      };[]; 
       };
     };
   };

package/tests/server/index.js

@@ -108,7 +108,7 @@ function dd() {
                         arr1: { enum: [1, 2, 3] },
                         arr2: { type: "integer[]" },
                         arrStr: { type: "string[]", optional: true, nullable: true },
-                        o: { optional: true, nullable: true, oneOf: [
+                        o: { optional: true, nullable: true, oneOfType: [
                                 { o1: "integer" },
                                 { o2: "boolean" }
                             ] },
@@ -118,7 +118,7 @@ function dd() {
                 status: {
                     nullable: true,
                     jsonbSchema: {
-                        oneOf: [
+                        oneOfType: [
                             { ok: { type: "string" } },
                             { err: { type: "string" } },
                             {
@@ -134,7 +134,7 @@ function dd() {
                 jsonOneOf: {
                     nullable: true,
                     jsonbSchema: {
-                        oneOf: [
+                        oneOfType: [
                             { command: { enum: ["a"] } },
                             {
                                 command: { enum: ["b"] },
@@ -144,7 +144,7 @@ function dd() {
                     }
                 },
                 table_config: { nullable: true, jsonbSchemaType: {
-                        referencedTables: { optional: true, arrayOf: { name: "string", minFiles: "number" } },
+                        referencedTables: { optional: true, arrayOfType: { name: "string", minFiles: "number" } },
                     }
                 }
             }