prostgles-server 2.0.228 → 2.0.231

package/lib/TableConfig.ts

@@ -2,6 +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";
 
 type ColExtraInfo = {
   min?: string | number;
@@ -85,6 +86,10 @@ type TextColumn = TextColDef & {
   lowerCased?: boolean;
 }
 
+type JSONBColumnDef = TextColDef & {
+  jsonbSchema: ValidationSchema;
+}
+
 /**
  * Allows referencing media to this table.
  * Requires this table to have a primary key AND a valid fileTable config
@@ -138,7 +143,7 @@ type NamedJoinColumn = {
   joinDef: JoinDef[];
 }
 
-type ColumnConfig<LANG_IDS = { en: 1 }> = NamedJoinColumn | MediaColumn | (BaseColumn<LANG_IDS> & (SQLDefColumn | ReferencedColumn | TextColumn))
+type ColumnConfig<LANG_IDS = { en: 1 }> = NamedJoinColumn | MediaColumn | (BaseColumn<LANG_IDS> & (SQLDefColumn | ReferencedColumn | TextColumn | JSONBColumnDef))
 
 type TableDefinition<LANG_IDS> = {
   columns?: {
@@ -351,19 +356,19 @@ export default class TableConfigurator<LANG_IDS = { en: 1 }> {
     queries = [];
 
     /* Create referenced columns */
-    await Promise.all(Object.keys(this.config).map(async tableName => {
+    await Promise.all(getKeys(this.config).map(async tableName => {
       const tableConf = this.config![tableName];
       if ("columns" in tableConf) {
         const getColDef = (name: string, colConf: ColumnConfig): string => {
           const colNameEsc = asName(name);
-          const getTextDef = (colConf: TextColDef) => {
+          const getColDef = (colConf: TextColDef, pgType: "TEXT" | "JSONB") => {
             const { nullable, defaultValue } = colConf;
-            return ` TEXT ${!nullable ? " NOT NULL " : ""} ${defaultValue ? ` DEFAULT ${asValue(defaultValue)} ` : ""}`
+            return `${pgType} ${!nullable ? " NOT NULL " : ""} ${defaultValue ? ` DEFAULT ${asValue(defaultValue)} ` : ""}`
           }
           if ("references" in colConf && colConf.references) {
 
             const { tableName: lookupTable, columnName: lookupCol = "id" } = colConf.references;
-            return ` ${colNameEsc} ${getTextDef(colConf.references)} REFERENCES ${lookupTable} (${lookupCol}) `;
+            return ` ${colNameEsc} ${getColDef(colConf.references, "TEXT")} REFERENCES ${lookupTable} (${lookupCol}) `;
 
           } else if ("sqlDefinition" in colConf && colConf.sqlDefinition) {
 
@@ -380,46 +385,51 @@ export default class TableConfigurator<LANG_IDS = { en: 1 }> {
             if (cArr.length) {
               checks = `CHECK (${cArr.join(" AND ")})`
             }
-            return ` ${colNameEsc} ${getTextDef(colConf)} ${checks}`;
+            return ` ${colNameEsc} ${getColDef(colConf, "TEXT")} ${checks}`;
+
+          } else if ("jsonbSchema" in colConf && colConf.jsonbSchema) {
+
+            return ` ${colNameEsc} ${getColDef(colConf, "JSONB")} CHECK(${getPGCheckConstraint({ schema: colConf.jsonbSchema, escapedFieldName: colNameEsc })})`;
+
           } else {
             throw "Unknown column config: " + JSON.stringify(colConf);
           }
         }
 
-        const colDefs: string[] = [];
+        const colCreateLines: string[] = [];
+        const tableHandler = this.dbo[tableName];
         if (tableConf.columns) {
           getKeys(tableConf?.columns).filter(c => !("joinDef" in tableConf.columns![c])).map(colName => {
             const colConf = tableConf.columns![colName];
 
-            if (!this.dbo[tableName]) {
-              colDefs.push(getColDef(colName, colConf))
-            } else if (!colDefs.length && !this.dbo[tableName].columns?.find(c => colName === c.name)) {
+            /* Add columns to create statement */
+            if (!tableHandler) {
+              colCreateLines.push(getColDef(colName, colConf));
 
+            } else if (tableHandler && !tableHandler.columns?.find(c => colName === c.name)) {
+
+
+              queries.push(`
+                ALTER TABLE ${asName(tableName)} 
+                ADD COLUMN ${getColDef(colName, colConf)};
+              `)
               if ("references" in colConf && colConf.references) {
 
                 const { tableName: lookupTable, } = colConf.references;
-                queries.push(`
-                              ALTER TABLE ${asName(tableName)} 
-                              ADD COLUMN ${getColDef(colName, colConf)};
-                          `)
                 console.log(`TableConfigurator: ${tableName}(${colName})` + " referenced lookup table " + lookupTable);
-
-              } else if ("sqlDefinition" in colConf && colConf.sqlDefinition) {
-
-                queries.push(`
-                                ALTER TABLE ${asName(tableName)} 
-                                ADD COLUMN ${getColDef(colName, colConf)};
-                            `)
-                console.log(`TableConfigurator: created/added column ${tableName}(${colName}) ` + colConf.sqlDefinition)
+              }  else {
+                console.log(`TableConfigurator: created/added column ${tableName}(${colName}) `)
               }
             }
           });
         }
 
-        if (colDefs.length) {
-          queries.push(`CREATE TABLE ${asName(tableName)} (
-                        ${colDefs.join(", \n")}
-                    );`)
+        if (colCreateLines.length) {
+          queries.push([
+            `CREATE TABLE ${asName(tableName)} (`,
+              colCreateLines.join(", \n"),
+            `);`
+          ].join("\n"))
           console.log("TableConfigurator: Created table: \n" + queries[0])
         }
       }

package/lib/validation.d.ts

@@ -0,0 +1,50 @@
+declare type FieldType = ({
+    type: "number" | "boolean" | "integer" | "string" | "number[]" | "boolean[]" | "integer[]" | "string[]" | ValidationSchema;
+} | {
+    oneOf: readonly any[];
+} | {
+    oneOfTypes: readonly ValidationSchema[];
+}) & {
+    optional?: boolean;
+    nullable?: boolean;
+};
+declare type GetType<T extends FieldType> = T extends {
+    type: ValidationSchema;
+} ? SchemaObject<T["type"]> : T extends {
+    type: "number";
+} ? number : T extends {
+    type: "boolean";
+} ? boolean : T extends {
+    type: "integer";
+} ? number : T extends {
+    type: "string";
+} ? string : T extends {
+    type: "number[]";
+} ? number[] : T extends {
+    type: "boolean[]";
+} ? boolean[] : T extends {
+    type: "integer[]";
+} ? number[] : T extends {
+    type: "string[]";
+} ? string[] : T extends {
+    oneOf: readonly any[];
+} ? T["oneOf"][number] : 
+/** This needs fixing */
+T extends {
+    oneOfTypes: readonly ValidationSchema[];
+} ? SchemaObject<T["oneOfTypes"][number]> : any;
+export declare type ValidationSchema = Record<string, FieldType>;
+export declare type SchemaObject<S extends ValidationSchema> = ({
+    [K in keyof S as S[K]["optional"] extends true ? K : never]?: GetType<S[K]>;
+} & {
+    [K in keyof S as S[K]["optional"] extends true ? never : K]: GetType<S[K]>;
+});
+export declare function validate<T>(obj: T, key: keyof T, validation: FieldType): boolean;
+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;
+}): string;
+export declare function getSchemaTSTypes(schema: ValidationSchema, leading?: string, isOneOf?: boolean): string;
+export {};
+//# sourceMappingURL=validation.d.ts.map

package/lib/validation.d.ts.map

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

package/lib/validation.js

@@ -0,0 +1,139 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getSchemaTSTypes = exports.getPGCheckConstraint = exports.validateSchema = exports.validate = void 0;
+const prostgles_types_1 = require("prostgles-types");
+const PubSubManager_1 = require("./PubSubManager");
+/** tests */
+const s = {
+    a: { type: "boolean" },
+    c: { type: { c1: { type: "string" } } },
+    o: { oneOfTypes: [
+            { z: { type: "integer" } },
+            { z1: { type: "integer" } }
+        ] }
+};
+const ss = {
+    a: true,
+    c: {
+        c1: ""
+    },
+    o: { z: 1, z1: 23 }
+};
+function validate(obj, key, validation) {
+    let err = `The provided value for ${JSON.stringify(key)} is of invalid type. Expecting `;
+    const val = obj[key];
+    if ("type" in validation && validation.type) {
+        if (typeof validation.type !== "string") {
+            (0, prostgles_types_1.getKeys)(validation.type).forEach(subKey => {
+                validate(val, subKey, validation.type[subKey]);
+            });
+        }
+        err += validation.type;
+        if (validation.type === "boolean" && typeof val !== validation.type)
+            throw new Error(err);
+        if (validation.type === "string" && typeof val !== validation.type)
+            throw new Error(err);
+        if (validation.type === "number" && !Number.isFinite(val))
+            throw new Error(err);
+        if (validation.type === "integer" && !Number.isInteger(val))
+            throw new Error(err);
+    }
+    else if ("oneOf" in validation && validation.oneOf) {
+        err += `on of: ${validation.oneOf}`;
+        if (!validation.oneOf.includes(val))
+            throw new Error(err);
+    }
+    return true;
+}
+exports.validate = validate;
+function validateSchema(schema, obj, objName, optional = false) {
+    if ((!schema || (0, prostgles_types_1.isEmpty)(schema)) && !optional)
+        throw new Error(`Expecting ${objName} to be defined`);
+    (0, prostgles_types_1.getKeys)(schema).forEach(k => validate(obj, k, schema[k]));
+}
+exports.validateSchema = validateSchema;
+function getPGCheckConstraint(args) {
+    const { schema: s, escapedFieldName } = args;
+    const jsToPGtypes = {
+        "number": "::NUMERIC",
+        "boolean": "::BOOLEAN",
+        "string": "" // already a string
+    };
+    const kChecks = (k) => {
+        const t = s[k];
+        const checks = [];
+        const valAsJson = `${escapedFieldName}->${(0, PubSubManager_1.asValue)(k)}`;
+        const valAsText = `${escapedFieldName}->>${(0, PubSubManager_1.asValue)(k)}`;
+        if (t.nullable)
+            checks.push(`${valAsJson} IS NULL`);
+        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 })).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`);
+            }
+            const oneOfHasNull = t.oneOf.includes(null);
+            if (oneOfHasNull)
+                checks.push(`${valAsText} IS NULL`);
+            const oneOf = t.oneOf.filter(o => o !== null);
+            oneOf.forEach(o => {
+                (0, PubSubManager_1.asValue)(o.toString());
+                checks.push(`${valAsText}${jsToPGtypes[typeof o]} = ${(0, PubSubManager_1.asValue)(o)}`);
+            });
+        }
+        else if ("type" in t) {
+            if (typeof t.type === "string") {
+                const correctType = t.type.replace("integer", "number");
+                if (t.type.endsWith("[]")) {
+                    /** Must add custom functions to type check each array element */
+                    checks.push(`
+          jsonb_typeof(${valAsJson}) = 'array' AND 
+          ( jsonb_array_length(${valAsJson}) = 0 OR jsonb_typeof(jsonb_array_element(${valAsJson}, 1)) = ${(0, PubSubManager_1.asValue)(correctType.slice(0, -2))} )`);
+                }
+                else {
+                    checks.push(`jsonb_typeof(${valAsJson}) = ${(0, PubSubManager_1.asValue)(correctType)} `);
+                }
+            }
+            else {
+                checks.push("( " + getPGCheckConstraint({ escapedFieldName: valAsJson, schema: t.type }) + " )");
+            }
+        }
+        return checks.join(" OR ");
+    };
+    return (0, prostgles_types_1.getKeys)(s).map(k => "(" + kChecks(k) + ")").join(" AND ");
+}
+exports.getPGCheckConstraint = getPGCheckConstraint;
+function getSchemaTSTypes(schema, leading = "", isOneOf = false) {
+    const getFieldType = (def) => {
+        if ("type" in def) {
+            if (typeof def.type === "string") {
+                const correctType = def.type.replace("integer", "number");
+                return correctType;
+            }
+            else {
+                return getSchemaTSTypes(def.type);
+            }
+        }
+        else if ("oneOf" in def) {
+            return def.oneOf.map(v => v).join(" | ");
+        }
+        else if ("oneOfTypes" in def) {
+            return def.oneOfTypes.map(v => `\n${leading}  | ` + getSchemaTSTypes(v, "", true)).join("");
+        }
+        else
+            throw "Unexpected getSchemaTSTypes";
+    };
+    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) + ";";
+    }).join("\n") + ` \n${leading}}${isOneOf ? "" : ";"}`;
+    /** Keep single line */
+    if (isOneOf)
+        res = res.split("\n").join("");
+    return res;
+}
+exports.getSchemaTSTypes = getSchemaTSTypes;

package/lib/validation.ts

@@ -0,0 +1,163 @@
+import { asName, getKeys, isEmpty, isObject } from "prostgles-types";
+import { asValue } from "./PubSubManager";
+
+type FieldType = ({
+  type:  
+  | "number" | "boolean" | "integer" | "string" 
+  | "number[]" | "boolean[]" | "integer[]" | "string[]" 
+  | ValidationSchema;
+
+} | {
+  oneOf: readonly any[];
+} | {
+  oneOfTypes: readonly ValidationSchema[];
+}) & {
+  optional?: boolean;
+  nullable?: boolean;
+};
+
+type GetType<T extends FieldType> = 
+| T extends { type: ValidationSchema }? SchemaObject<T["type"]> : 
+| T extends { type: "number" }? number:
+| T extends { type: "boolean" }? boolean:
+| T extends { type: "integer" }? number:
+| T extends { type: "string" }? string:
+| T extends { type: "number[]" }? number[]:
+| T extends { type: "boolean[]" }? boolean[]:
+| T extends { type: "integer[]" }? number[]:
+| T extends { type: "string[]" }? string[]:
+| T extends { oneOf: readonly any[] }? T["oneOf"][number] : 
+
+/** This needs fixing */
+| T extends { oneOfTypes: readonly ValidationSchema[] }? SchemaObject<T["oneOfTypes"][number]> : 
+any;
+
+export type ValidationSchema = Record<string, FieldType>;
+export type SchemaObject<S extends ValidationSchema> = ({
+  [K in keyof S as S[K]["optional"] extends true? K : never]?: GetType<S[K]>
+} & {
+  [K in keyof S as S[K]["optional"] extends true? never : K]: GetType<S[K]>
+});
+
+/** tests */
+const s = {
+  a: { type: "boolean" },
+  c: { type: { c1: { type: "string" } } },
+  o: { oneOfTypes: [
+    { z: { type: "integer" } },
+    { z1: { type: "integer" } }
+  ] }
+} as const;
+const ss: SchemaObject<typeof s> = {
+  a: true,
+  c: {
+    c1: ""
+  },
+  o: { z: 1, z1: 23 }
+}
+
+export function validate<T>(obj: T, key: keyof T, validation: FieldType): boolean {
+  let err = `The provided value for ${JSON.stringify(key)} is of invalid type. Expecting `;
+  const val = obj[key];
+  if("type" in validation && validation.type){
+    if(typeof validation.type !== "string"){
+      getKeys(validation.type).forEach(subKey => {
+        validate(val, subKey as any, (validation.type as ValidationSchema)[subKey])
+      });
+    }
+    err += validation.type;
+    if(validation.type === "boolean" && typeof val !== validation.type) throw new Error(err)
+    if(validation.type === "string" && typeof val !== validation.type) throw new Error(err)
+    if(validation.type === "number" && !Number.isFinite(val)) throw new Error(err)
+    if(validation.type === "integer" && !Number.isInteger(val)) throw new Error(err)
+  } else if("oneOf" in validation && validation.oneOf){
+    err += `on of: ${validation.oneOf}`;
+    if(!validation.oneOf.includes(val)) throw new Error(err)
+  }
+  return true
+}
+
+export function validateSchema<S extends ValidationSchema>(schema: S, obj: SchemaObject<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]));
+}
+
+export function getPGCheckConstraint(args: { escapedFieldName: string; schema: ValidationSchema }): string {
+  const { schema: s, escapedFieldName } = args;
+
+  const jsToPGtypes = {
+    "number": "::NUMERIC",
+    "boolean": "::BOOLEAN",
+    "string": "" // already a string
+  }
+
+  const kChecks = (k: string) => {
+    const t = s[k];
+    const checks: string[] = [];
+    const valAsJson = `${escapedFieldName}->${asValue(k)}`;
+    const valAsText = `${escapedFieldName}->>${asValue(k)}`;
+    if(t.nullable) checks.push(`${valAsJson} IS NULL`);
+    if(t.optional) checks.push(`${escapedFieldName} ? ${asValue(k)} = FALSE`);
+
+    if("oneOfTypes" in t){
+      checks.push(`(${t.oneOfTypes.map(subType => getPGCheckConstraint({ escapedFieldName: valAsJson, schema: subType })).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`);
+      }
+      const oneOfHasNull = t.oneOf.includes(null);
+      if(oneOfHasNull) checks.push(`${valAsText} IS NULL`);
+      const oneOf = t.oneOf.filter(o => o !== null);
+      oneOf.forEach(o => {
+        asValue(o.toString())
+        checks.push(`${valAsText}${(jsToPGtypes as any)[typeof o]} = ${asValue(o)}`);
+      })
+    } else if("type" in t){
+      if(typeof t.type === "string") {
+        const correctType = t.type.replace("integer", "number")
+        if(t.type.endsWith("[]")){
+          /** Must add custom functions to type check each array element */
+          checks.push(`
+          jsonb_typeof(${valAsJson}) = 'array' AND 
+          ( jsonb_array_length(${valAsJson}) = 0 OR jsonb_typeof(jsonb_array_element(${valAsJson}, 1)) = ${asValue(correctType.slice(0, -2))} )`)
+        } else {
+          checks.push(`jsonb_typeof(${valAsJson}) = ${asValue(correctType)} `)
+        }
+      } else {
+        checks.push("( " + getPGCheckConstraint({ escapedFieldName: valAsJson, schema: t.type }) + " )")
+      }
+    }
+
+    return checks.join(" OR ")
+  }
+
+  return getKeys(s).map(k => "(" + kChecks(k) + ")").join(" AND ");
+}
+
+export function getSchemaTSTypes(schema: ValidationSchema, leading = "", isOneOf = false): string {
+  const getFieldType = (def: FieldType) => {
+    if("type" in def){
+      if(typeof def.type === "string"){
+        const correctType = def.type.replace("integer", "number")
+        return correctType
+      } else {
+        return getSchemaTSTypes(def.type)
+      }
+    } else if("oneOf" in def){
+      return def.oneOf.map(v => v).join(" | ")
+    } else if("oneOfTypes" in def){
+      return def.oneOfTypes.map(v => `\n${leading}  | ` + getSchemaTSTypes(v, "", true)).join("")
+    } else throw "Unexpected getSchemaTSTypes"
+  }
+
+  let spacing = isOneOf? " " : "  ";
+
+  let res = `${leading}{ \n` + getKeys(schema).map(k => {
+    const def = schema[k];
+    return `${leading}${spacing}${k}${def.optional? "?" : ""}: ${def.nullable? " null | " : ""} ` + getFieldType(def) + ";";
+  }).join("\n") + ` \n${leading}}${isOneOf? "" : ";"}`;
+  
+  /** Keep single line */
+  if(isOneOf) res = res.split("\n").join("")
+  return res;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prostgles-server",
-  "version": "2.0.228",
+  "version": "2.0.231",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -28,6 +28,7 @@
     "@types/express": "^4.17.13",
     "aws-sdk": "^2.1168.0",
     "bluebird": "^3.7.2",
+    "check-disk-space": "^3.3.1",
     "file-type": "^17.1.3",
     "pg-promise": "^10.11.1",
     "prostgles-types": "^1.5.169",

package/tests/client/PID.txt

@@ -1 +1 @@
-165333
+8122

package/tests/isomorphic_queries.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"isomorphic_queries.d.ts","sourceRoot":"","sources":["isomorphic_queries.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAC,MAAM,mBAAmB,CAAC;AACnD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAGtD,wBAAsB,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,EAAE,GAAG,CAAC,EAAE,QAAQ,iBAYzE;AACD,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,KAAK,GAAG,EAAE,GAAG,CAAC,EAAE,QAAQ,oBAW7F;AAED,wBAA8B,UAAU,CAAC,EAAE,EAAE,OAAO,CAAC,eAAe,CAAC,GAAG,OAAO,CAAC,eAAe,CAAC,iBAgyB/F"}
+{"version":3,"file":"isomorphic_queries.d.ts","sourceRoot":"","sources":["isomorphic_queries.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAC,MAAM,mBAAmB,CAAC;AACnD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAGtD,wBAAsB,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,EAAE,GAAG,CAAC,EAAE,QAAQ,iBAYzE;AACD,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,KAAK,GAAG,EAAE,GAAG,CAAC,EAAE,QAAQ,oBAW7F;AAED,wBAA8B,UAAU,CAAC,EAAE,EAAE,OAAO,CAAC,eAAe,CAAC,GAAG,OAAO,CAAC,eAAe,CAAC,iBA2zB/F"}

package/tests/isomorphic_queries.js

@@ -544,6 +544,31 @@ async function isomorphic(db) {
         const newF = await db.media.findOne({ id: original.id });
         assert_1.strict.equal(newF.original_name, newFile.name);
     });
+    await tryRun("jsonbSchema validation", async () => {
+        /**
+         *
+      tjson: {
+        json: { jsonbSchema: {
+            a: { type: "boolean" },
+            arr: { oneOf: ["1", "2", "3"] },
+            arr2: { type: "integer[]" },
+            o: { oneOfTypes: [{ o1: { type: "integer" } }, { o2: { type: "boolean" } }], optional: true },
+          }
+        }
+      },
+         */
+        const json = { a: true, arr: "2" };
+        const fo = await db.tjson.insert({ json }, { returning: "*" });
+        assert_1.strict.deepStrictEqual(fo.json, json);
+        await db.tjson.insert({ json: { o: { o1: 2, o2: true }, a: true, arr: 1 } });
+        try {
+            await db.tjson.insert({ json: { a: true, arr: "22" } });
+            throw "Should have failed";
+        }
+        catch (e) {
+            // Perfect
+        }
+    });
     await tryRun("Exists filter example", async () => {
         const fo = await db.items.findOne(), f = await db.items.find();
         assert_1.strict.deepStrictEqual(fo, { h: null, id: 1, name: 'a' }, "findOne query failed");

package/tests/isomorphic_queries.ts

@@ -623,7 +623,34 @@ export default async function isomorphic(db: Partial<DBHandlerServer> | Partial<
     const newF = await db.media.findOne({ id: original.id });
 
     assert.equal(newF.original_name, newFile.name)
-  })
+  });
+
+  await tryRun("jsonbSchema validation", async () => {
+    
+    /**
+     * 
+  tjson: {
+    json: { jsonbSchema: { 
+        a: { type: "boolean" },
+        arr: { oneOf: ["1", "2", "3"] },
+        arr2: { type: "integer[]" },
+        o: { oneOfTypes: [{ o1: { type: "integer" } }, { o2: { type: "boolean" } }], optional: true },
+      }  
+    }
+  },
+     */
+
+    const json = {a: true, arr: "2"}
+    const fo = await db.tjson.insert({ json }, { returning: "*"});
+    assert.deepStrictEqual(fo.json, json);
+    await db.tjson.insert({ json: {o: { o1: 2, o2: true }, a: true, arr: 1 } })
+    try {
+      await db.tjson.insert({ json: { a: true, arr: "22"} });
+      throw "Should have failed"
+    } catch(e){
+      // Perfect
+    }
+  });
   
   await tryRun("Exists filter example", async () => {