prostgles-server 2.0.234 → 2.0.237

package/lib/TableConfig.ts

@@ -2,7 +2,7 @@ import { getKeys, asName, AnyObject, TableInfo,  ALLOWED_EXTENSION, ALLOWED_CONT
 import { isPlainObject, JoinInfo } from "./DboBuilder";
 import { DB, DBHandlerServer, Joins, Prostgles } from "./Prostgles";
 import { asValue } from "./PubSubManager";
-import { getPGCheckConstraint, ValidationSchema } from "./validation";
+import { getPGCheckConstraint, OneOfTypes, ValidationSchema } from "./validation";
 
 type ColExtraInfo = {
   min?: string | number;
@@ -87,7 +87,7 @@ type TextColumn = TextColDef & {
 }
 
 type JSONBColumnDef = TextColDef & {
-  jsonbSchema: ValidationSchema;
+  jsonbSchema: ValidationSchema | Pick<OneOfTypes, "oneOfTypes">;
 
   /**
    * If the new schema CHECK fails old rows the update old rows using this function
@@ -394,7 +394,7 @@ export default class TableConfigurator<LANG_IDS = { en: 1 }> {
 
           } else if ("jsonbSchema" in colConf && colConf.jsonbSchema) {
 
-            return ` ${colNameEsc} ${getColDef(colConf, "JSONB")} CHECK(${getPGCheckConstraint({ schema: colConf.jsonbSchema, escapedFieldName: colNameEsc }, 0)})`;
+            return ` ${colNameEsc} ${getColDef(colConf, "JSONB")} CHECK(${getPGCheckConstraint({ schema: colConf.jsonbSchema, escapedFieldName: colNameEsc, nullable: !!colConf.nullable }, 0)})`;
 
           } else {
             throw "Unknown column config: " + JSON.stringify(colConf);

package/lib/index.d.ts

@@ -1,6 +1,6 @@
 import { ProstglesInitOptions } from "./Prostgles";
 declare function prostgles<S = void>(params: ProstglesInitOptions<S>): Promise<{
-    db: import("./DboBuilder").DBHandlerServer;
+    db: import("./DboBuilder").DBHandlerServer<import("./DboBuilder").TableHandlers>;
     _db: import("./Prostgles").DB;
     pgp: import("./Prostgles").PGP;
     io?: any;

package/lib/validation.d.ts

@@ -1,13 +1,16 @@
-declare type FieldType = ({
+declare type BaseOptions = {
+    optional?: boolean;
+    nullable?: boolean;
+};
+declare type SimpleType = BaseOptions & ({
     type: "number" | "boolean" | "integer" | "string" | "number[]" | "boolean[]" | "integer[]" | "string[]" | ValidationSchema;
 } | {
     oneOf: readonly any[];
-} | {
+});
+export declare type OneOfTypes = BaseOptions & {
     oneOfTypes: readonly ValidationSchema[];
-}) & {
-    optional?: boolean;
-    nullable?: boolean;
 };
+declare type FieldType = SimpleType | OneOfTypes;
 declare type GetType<T extends FieldType> = T extends {
     type: ValidationSchema;
 } ? SchemaObject<T["type"]> : T extends {
@@ -43,8 +46,14 @@ export declare function validate<T>(obj: T, key: keyof T, validation: FieldType)
 export declare function validateSchema<S extends ValidationSchema>(schema: S, obj: SchemaObject<S>, objName?: string, optional?: boolean): void;
 export declare function getPGCheckConstraint(args: {
     escapedFieldName: string;
-    schema: ValidationSchema;
+    schema: ValidationSchema | OneOfTypes;
+    nullable: boolean;
+    isRootQuery?: boolean;
 }, depth: number): string;
+declare type ColOpts = {
+    nullable?: boolean;
+};
 export declare function getSchemaTSTypes(schema: ValidationSchema, leading?: string, isOneOf?: boolean): string;
+export declare function getJSONBSchemaTSTypes(schema: ValidationSchema | OneOfTypes, colOpts: ColOpts, leading?: string, isOneOf?: boolean): string;
 export {};
 //# sourceMappingURL=validation.d.ts.map

package/lib/validation.d.ts.map

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

package/lib/validation.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSchemaTSTypes = exports.getPGCheckConstraint = exports.validateSchema = exports.validate = void 0;
+exports.getJSONBSchemaTSTypes = exports.getSchemaTSTypes = exports.getPGCheckConstraint = exports.validateSchema = exports.validate = void 0;
 const prostgles_types_1 = require("prostgles-types");
 const PubSubManager_1 = require("./PubSubManager");
 /** tests */
@@ -53,14 +53,14 @@ function validateSchema(schema, obj, objName, optional = false) {
 }
 exports.validateSchema = validateSchema;
 function getPGCheckConstraint(args, depth) {
-    const { schema: s, escapedFieldName } = args;
+    const { schema: s, escapedFieldName, nullable } = args;
     const jsToPGtypes = {
         "integer": "::INTEGER",
         "number": "::NUMERIC",
         "boolean": "::BOOLEAN",
         "string": "::TEXT"
     };
-    const kChecks = (k) => {
+    const kChecks = (k, s) => {
         const t = s[k];
         const checks = [];
         const valAsJson = `${escapedFieldName}->${(0, PubSubManager_1.asValue)(k)}`;
@@ -70,7 +70,7 @@ function getPGCheckConstraint(args, depth) {
         if (t.optional)
             checks.push(`${escapedFieldName} ? ${(0, PubSubManager_1.asValue)(k)} = FALSE`);
         if ("oneOfTypes" in t) {
-            checks.push(`(${t.oneOfTypes.map(subType => getPGCheckConstraint({ escapedFieldName: valAsJson, schema: subType }, depth + 1)).join(" OR ")})`);
+            checks.push(`(${t.oneOfTypes.map(subType => getPGCheckConstraint({ escapedFieldName: valAsJson, schema: subType, nullable }, depth + 1)).join(" OR ")})`);
         }
         else if ("oneOf" in t) {
             if (!t.oneOf.length || t.oneOf.some(v => v === undefined || !["number", "boolean", "string", null].includes(typeof v))) {
@@ -96,7 +96,7 @@ function getPGCheckConstraint(args, depth) {
                 }
             }
             else {
-                checks.push("( " + getPGCheckConstraint({ escapedFieldName: valAsJson, schema: t.type }, depth + 1) + " )");
+                checks.push("( " + getPGCheckConstraint({ escapedFieldName: valAsJson, schema: t.type, nullable: !!t.nullable }, depth + 1) + " )");
             }
         }
         const result = checks.join(" OR ");
@@ -104,25 +104,43 @@ function getPGCheckConstraint(args, depth) {
             return `COALESCE(${result}, false)`;
         return result;
     };
-    return (0, prostgles_types_1.getKeys)(s).map(k => "(" + kChecks(k) + ")").join(" AND ");
+    const getSchemaChecks = (s) => (0, prostgles_types_1.getKeys)(s).map(k => "(" + kChecks(k, s) + ")").join(" AND ");
+    let q = "";
+    if (isOneOfTypes(s)) {
+        q = s.oneOfTypes.map(t => `(${getSchemaChecks(t)})`).join(" OR ");
+    }
+    else {
+        q = getSchemaChecks(s);
+    }
+    return nullable ? ` ${escapedFieldName} IS NULL OR (${q})` : q;
 }
 exports.getPGCheckConstraint = getPGCheckConstraint;
+const isOneOfTypes = (s) => {
+    if ("oneOfTypes" in s) {
+        if (!Array.isArray(s.oneOfTypes)) {
+            throw "Expecting oneOfTypes to be an array of types";
+        }
+        return true;
+    }
+    return false;
+};
 function getSchemaTSTypes(schema, leading = "", isOneOf = false) {
     const getFieldType = (def) => {
+        const nullType = (def.nullable ? `null | ` : "");
         if ("type" in def) {
             if (typeof def.type === "string") {
                 const correctType = def.type.replace("integer", "number");
-                return correctType;
+                return nullType + correctType;
             }
             else {
-                return getSchemaTSTypes(def.type);
+                return nullType + getSchemaTSTypes(def.type);
             }
         }
         else if ("oneOf" in def) {
-            return def.oneOf.map(v => (0, PubSubManager_1.asValue)(v)).join(" | ");
+            return nullType + def.oneOf.map(v => (0, PubSubManager_1.asValue)(v)).join(" | ");
         }
         else if ("oneOfTypes" in def) {
-            return def.oneOfTypes.map(v => `\n${leading}  | ` + getSchemaTSTypes(v, "", true)).join("");
+            return (def.nullable ? `\n${leading}  | null` : "") + def.oneOfTypes.map(v => `\n${leading}  | ` + getSchemaTSTypes(v, "", true)).join("");
         }
         else
             throw "Unexpected getSchemaTSTypes";
@@ -130,7 +148,7 @@ function getSchemaTSTypes(schema, leading = "", isOneOf = false) {
     let spacing = isOneOf ? " " : "  ";
     let res = `${leading}{ \n` + (0, prostgles_types_1.getKeys)(schema).map(k => {
         const def = schema[k];
-        return `${leading}${spacing}${k}${def.optional ? "?" : ""}: ${def.nullable ? " null | " : ""} ` + getFieldType(def) + ";";
+        return `${leading}${spacing}${k}${def.optional ? "?" : ""}: ` + getFieldType(def) + ";";
     }).join("\n") + ` \n${leading}}${isOneOf ? "" : ";"}`;
     /** Keep single line */
     if (isOneOf)
@@ -138,3 +156,12 @@ function getSchemaTSTypes(schema, leading = "", isOneOf = false) {
     return res;
 }
 exports.getSchemaTSTypes = getSchemaTSTypes;
+function getJSONBSchemaTSTypes(schema, colOpts, leading = "", isOneOf = false) {
+    if (isOneOfTypes(schema)) {
+        return (colOpts.nullable ? `\n${leading}  | null` : "") + schema.oneOfTypes.map(s => `\n${leading}  | ` + getSchemaTSTypes(s, "", true)).join("");
+    }
+    else {
+        return (colOpts.nullable ? `null | ` : "") + getSchemaTSTypes(schema, leading, isOneOf);
+    }
+}
+exports.getJSONBSchemaTSTypes = getJSONBSchemaTSTypes;

package/lib/validation.ts

@@ -1,7 +1,12 @@
 import { asName, getKeys, isEmpty, isObject } from "prostgles-types";
 import { asValue } from "./PubSubManager";
 
-type FieldType = ({
+type BaseOptions = {
+  optional?: boolean;
+  nullable?: boolean;
+};
+
+type SimpleType = BaseOptions & ({
   type:  
   | "number" | "boolean" | "integer" | "string" 
   | "number[]" | "boolean[]" | "integer[]" | "string[]" 
@@ -9,12 +14,12 @@ type FieldType = ({
 
 } | {
   oneOf: readonly any[];
-} | {
+})
+
+export type OneOfTypes = BaseOptions & {
   oneOfTypes: readonly ValidationSchema[];
-}) & {
-  optional?: boolean;
-  nullable?: boolean;
-};
+}
+type FieldType = SimpleType | OneOfTypes;
 
 type GetType<T extends FieldType> = 
 | T extends { type: ValidationSchema }? SchemaObject<T["type"]> : 
@@ -82,8 +87,8 @@ export function validateSchema<S extends ValidationSchema>(schema: S, obj: Schem
   getKeys(schema).forEach(k => validate(obj as any, k, schema[k]));
 }
 
-export function getPGCheckConstraint(args: { escapedFieldName: string; schema: ValidationSchema }, depth: number): string {
-  const { schema: s, escapedFieldName } = args;
+export function getPGCheckConstraint(args: { escapedFieldName: string; schema: ValidationSchema | OneOfTypes, nullable: boolean; isRootQuery?: boolean; }, depth: number): string {
+  const { schema: s, escapedFieldName, nullable } = args;
 
   const jsToPGtypes = {
     "integer": "::INTEGER",
@@ -92,7 +97,7 @@ export function getPGCheckConstraint(args: { escapedFieldName: string; schema: V
     "string": "::TEXT"
   }
 
-  const kChecks = (k: string) => {
+  const kChecks = (k: string, s: ValidationSchema) => {
     const t = s[k];
     const checks: string[] = [];
     const valAsJson = `${escapedFieldName}->${asValue(k)}`;
@@ -101,7 +106,7 @@ export function getPGCheckConstraint(args: { escapedFieldName: string; schema: V
     if(t.optional) checks.push(`${escapedFieldName} ? ${asValue(k)} = FALSE`);
 
     if("oneOfTypes" in t){
-      checks.push(`(${t.oneOfTypes.map(subType => getPGCheckConstraint({ escapedFieldName: valAsJson, schema: subType }, depth + 1)).join(" OR ")})`)
+      checks.push(`(${t.oneOfTypes.map(subType => getPGCheckConstraint({ escapedFieldName: valAsJson, schema: subType, nullable }, depth + 1)).join(" OR ")})`)
     } else if("oneOf" in t){
       if(!t.oneOf.length || t.oneOf.some(v => v === undefined || !["number", "boolean", "string", null].includes(typeof v))) {
         throw new Error(`Invalid ValidationSchema for property: ${k} of field ${escapedFieldName}: oneOf cannot be empty AND can only contain: numbers, text, boolean, null`);
@@ -122,7 +127,7 @@ export function getPGCheckConstraint(args: { escapedFieldName: string; schema: V
           checks.push(`jsonb_typeof(${valAsJson}) = ${asValue(correctType)} `)
         }
       } else {
-        checks.push("( " + getPGCheckConstraint({ escapedFieldName: valAsJson, schema: t.type }, depth + 1) + " )")
+        checks.push("( " + getPGCheckConstraint({ escapedFieldName: valAsJson, schema: t.type, nullable: !!t.nullable }, depth + 1) + " )")
       }
     }
     const result = checks.join(" OR ")
@@ -130,22 +135,42 @@ export function getPGCheckConstraint(args: { escapedFieldName: string; schema: V
     return result
   }
 
-  return getKeys(s).map(k => "(" + kChecks(k) + ")").join(" AND ");
+  const getSchemaChecks = (s: ValidationSchema) => getKeys(s).map(k => "(" + kChecks(k, s) + ")").join(" AND ")
+
+  let q = "";
+  if(isOneOfTypes(s)){
+    q = s.oneOfTypes.map(t => `(${getSchemaChecks(t)})` ).join(" OR ");
+  } else {
+    q = getSchemaChecks(s);
+  }
+  return nullable? ` ${escapedFieldName} IS NULL OR (${q})` : q
+}
+type ColOpts = { nullable?: boolean };
+const isOneOfTypes = (s: ValidationSchema | OneOfTypes): s is OneOfTypes => {
+
+  if("oneOfTypes" in s){
+    if(!Array.isArray(s.oneOfTypes)){
+      throw "Expecting oneOfTypes to be an array of types";
+    }
+    return true;
+  }
+  return false;
 }
 
 export function getSchemaTSTypes(schema: ValidationSchema, leading = "", isOneOf = false): string {
   const getFieldType = (def: FieldType) => {
+    const nullType = (def.nullable? `null | ` : "");
     if("type" in def){
       if(typeof def.type === "string"){
         const correctType = def.type.replace("integer", "number")
-        return correctType
+        return nullType + correctType
       } else {
-        return getSchemaTSTypes(def.type)
+        return nullType + getSchemaTSTypes(def.type)
       }
     } else if("oneOf" in def){
-      return def.oneOf.map(v => asValue(v)).join(" | ")
+      return nullType + def.oneOf.map(v => asValue(v)).join(" | ")
     } else if("oneOfTypes" in def){
-      return def.oneOfTypes.map(v => `\n${leading}  | ` + getSchemaTSTypes(v, "", true)).join("")
+      return (def.nullable? `\n${leading}  | null` : "") + def.oneOfTypes.map(v => `\n${leading}  | ` + getSchemaTSTypes(v, "", true)).join("")
     } else throw "Unexpected getSchemaTSTypes"
   }
 
@@ -153,10 +178,18 @@ export function getSchemaTSTypes(schema: ValidationSchema, leading = "", isOneOf
 
   let res = `${leading}{ \n` + getKeys(schema).map(k => {
     const def = schema[k];
-    return `${leading}${spacing}${k}${def.optional? "?" : ""}: ${def.nullable? " null | " : ""} ` + getFieldType(def) + ";";
+    return `${leading}${spacing}${k}${def.optional? "?" : ""}: ` + getFieldType(def) + ";";
   }).join("\n") + ` \n${leading}}${isOneOf? "" : ";"}`;
   
   /** Keep single line */
   if(isOneOf) res = res.split("\n").join("")
   return res;
 }
+
+export function getJSONBSchemaTSTypes(schema: ValidationSchema | OneOfTypes, colOpts: ColOpts, leading = "", isOneOf = false): string {
+  if(isOneOfTypes(schema)){
+    return (colOpts.nullable? `\n${leading}  | null` : "") + schema.oneOfTypes.map(s => `\n${leading}  | ` + getSchemaTSTypes(s, "", true)).join("")
+  } else {
+    return (colOpts.nullable? `null | ` : "") + getSchemaTSTypes(schema, leading, isOneOf);
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prostgles-server",
-  "version": "2.0.234",
+  "version": "2.0.237",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -29,7 +29,7 @@
     "aws-sdk": "^2.1168.0",
     "bluebird": "^3.7.2",
     "check-disk-space": "^3.3.1",
-    "file-type": "^17.1.3",
+    "file-type": "^17.1.4",
     "pg-promise": "^10.11.1",
     "prostgles-types": "^1.5.169",
     "sharp": "^0.30.7"

package/tests/client/PID.txt

@@ -1 +1 @@
-3720
+77079

package/tests/isomorphic_queries.js

@@ -558,7 +558,7 @@ async function isomorphic(db) {
         }
       },
          */
-        const json = { a: true, arr: "2", arr1: 3, arr2: [1] };
+        const json = { a: true, arr: "2", arr1: 3, arr2: [1], arrStr: ["1123.string"] };
         const fo = await db.tjson.insert({ json }, { returning: "*" });
         // assert.deepStrictEqual(fo.json, json);
         await db.tjson.insert({ json: { ...json, o: { o1: 2, o2: true } } });

package/tests/isomorphic_queries.ts

@@ -641,7 +641,7 @@ export default async function isomorphic(db: Partial<DBHandlerServer> | Partial<
   },
      */
 
-    const json = {a: true, arr: "2", arr1: 3, arr2: [1] }
+    const json = {a: true, arr: "2", arr1: 3, arr2: [1], arrStr: ["1123.string"] }
     const fo = await db.tjson.insert({ json }, { returning: "*"});
     // assert.deepStrictEqual(fo.json, json);
     await db.tjson.insert({ json: {...json, o: { o1: 2, o2: true } } })

package/tests/server/DBoGenerated.d.ts

@@ -336,14 +336,20 @@ export type DBSchemaGenerated = {
     delete: true;
     columns: {
       json:       { 
-        a:  boolean;
-        arr:  '1' | '2' | '3';
-        arr1:  1 | 2 | 3;
-        arr2:  number[];
-        o?:  
-        | {  o1:  number; }
-        | {  o2:  boolean; }; 
+        a: boolean;
+        arr: '1' | '2' | '3';
+        arr1: 1 | 2 | 3;
+        arr2: number[];
+        arrStr?: null | string[];
+        o?: 
+        | null
+        | {  o1: number; }
+        | {  o2: boolean; }; 
       };
+      jsonOneOf?: 
+        | null
+        | {  command: 'a'; }
+        | {  command: 'b'; option: number[]; }
     };
   };
   tr1: {

package/tests/server/index.js

@@ -72,7 +72,24 @@ function dd() {
                         arr: { oneOf: ["1", "2", "3"] },
                         arr1: { oneOf: [1, 2, 3] },
                         arr2: { type: "integer[]" },
-                        o: { oneOfTypes: [{ o1: { type: "integer" } }, { o2: { type: "boolean" } }], optional: true },
+                        arrStr: { type: "string[]", optional: true, nullable: true },
+                        o: { oneOfTypes: [{ o1: { type: "integer" } }, { o2: { type: "boolean" } }], optional: true, nullable: true },
+                    }
+                },
+                jsonOneOf: { nullable: true, jsonbSchema: {
+                        oneOfTypes: [
+                            { command: { oneOf: ["a"] } },
+                            {
+                                command: { oneOf: ["b"] },
+                                option: { type: "integer[]" }
+                            }
+                        ]
+                        // a: { type: "boolean" },
+                        // arr: { oneOf: ["1", "2", "3"] },
+                        // arr1: { oneOf: [1, 2, 3] },
+                        // arr2: { type: "integer[]" },
+                        // arrStr: { type: "string[]", optional: true },
+                        // o: { oneOfTypes: [{ o1: { type: "integer" } }, { o2: { type: "boolean" } }], optional: true },
                     }
                 }
             }

package/tests/server/index.ts

@@ -93,9 +93,26 @@ function dd(){
 						arr: { oneOf: ["1", "2", "3"] },
 						arr1: { oneOf: [1, 2, 3] },
 						arr2: { type: "integer[]" },
-						o: { oneOfTypes: [{ o1: { type: "integer" } }, { o2: { type: "boolean" } }], optional: true },
+						arrStr: { type: "string[]", optional: true, nullable: true },
+						o: { oneOfTypes: [{ o1: { type: "integer" } }, { o2: { type: "boolean" } }], optional: true, nullable: true },
 					}  
-				}
+				},
+				jsonOneOf: { nullable: true, jsonbSchema: { 
+					oneOfTypes: [
+						{ command: { oneOf: ["a"] } },
+						{ 
+							command: { oneOf: ["b"] },
+							option: { type: "integer[]" }
+						}
+					]
+					// a: { type: "boolean" },
+					// arr: { oneOf: ["1", "2", "3"] },
+					// arr1: { oneOf: [1, 2, 3] },
+					// arr2: { type: "integer[]" },
+					// arrStr: { type: "string[]", optional: true },
+					// o: { oneOfTypes: [{ o1: { type: "integer" } }, { o2: { type: "boolean" } }], optional: true },
+				}  
+			}
 			}
 		},
 		lookup_col1: {

package/tests/server/package-lock.json

@@ -21,7 +21,7 @@
     },
     "../..": {
       "name": "prostgles-server",
-      "version": "2.0.233",
+      "version": "2.0.236",
       "license": "MIT",
       "dependencies": {
         "@aws-sdk/client-s3": "^3.121.0",
@@ -29,7 +29,7 @@
         "aws-sdk": "^2.1168.0",
         "bluebird": "^3.7.2",
         "check-disk-space": "^3.3.1",
-        "file-type": "^17.1.3",
+        "file-type": "^17.1.4",
         "pg-promise": "^10.11.1",
         "prostgles-types": "^1.5.169",
         "sharp": "^0.30.7"
@@ -1373,7 +1373,7 @@
         "aws-sdk": "^2.1168.0",
         "bluebird": "^3.7.2",
         "check-disk-space": "^3.3.1",
-        "file-type": "^17.1.3",
+        "file-type": "^17.1.4",
         "pg-promise": "^10.11.1",
         "prostgles-types": "^1.5.169",
         "sharp": "^0.30.7",