prostgles-server 3.0.86 → 3.0.88

package/dist/validation.js

@@ -3,10 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getJSONBSchemaAsJSONSchema = exports.getJSONBSchemaTSTypes = exports.getSchemaTSTypes = exports.getPGCheckConstraint = exports.validateSchema = exports.validate = void 0;
 const prostgles_types_1 = require("prostgles-types");
 const PubSubManager_1 = require("./PubSubManager/PubSubManager");
+const PrimitiveTypes = ["boolean", "number", "integer", "string", "any"];
+const DATA_TYPES = [
+    ...PrimitiveTypes,
+    ...PrimitiveTypes.map(v => `${v}[]`)
+];
 /** tests */
 const s = {
     a: { type: "boolean" },
     c: { type: { c1: { type: "string" } } },
+    arr: { arrayOf: { d: "string" } },
     o: {
         oneOf: [
             { z: { type: "integer" } },
@@ -16,33 +22,40 @@ const s = {
 };
 const ss = {
     a: true,
+    arr: [{ d: "" }],
     c: {
         c1: ""
     },
-    o: { z: 1, z1: 23 }
+    o: { z1: 23 }
 };
-function validate(obj, key, validation) {
+const getFieldTypeObj = (rawFieldType) => {
+    if (typeof rawFieldType === "string")
+        return { type: rawFieldType };
+    return rawFieldType;
+};
+function validate(obj, key, rawFieldType) {
     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]);
+    const fieldType = getFieldTypeObj(rawFieldType);
+    if ("type" in fieldType && fieldType.type) {
+        if (typeof fieldType.type !== "string") {
+            (0, prostgles_types_1.getKeys)(fieldType.type).forEach(subKey => {
+                validate(val, subKey, fieldType.type[subKey]);
             });
         }
-        err += validation.type;
-        if (validation.type === "boolean" && typeof val !== validation.type)
+        err += fieldType.type;
+        if (fieldType.type === "boolean" && typeof val !== fieldType.type)
             throw new Error(err);
-        if (validation.type === "string" && typeof val !== validation.type)
+        if (fieldType.type === "string" && typeof val !== fieldType.type)
             throw new Error(err);
-        if (validation.type === "number" && !Number.isFinite(val))
+        if (fieldType.type === "number" && !Number.isFinite(val))
             throw new Error(err);
-        if (validation.type === "integer" && !Number.isInteger(val))
+        if (fieldType.type === "integer" && !Number.isInteger(val))
             throw new Error(err);
     }
-    else if ("enum" in validation && validation.enum) {
-        err += `on of: ${validation.enum}`;
-        if (!validation.enum.includes(val))
+    else if (fieldType.enum) {
+        err += `on of: ${fieldType.enum}`;
+        if (!fieldType.enum.includes(val))
             throw new Error(err);
     }
     return true;
@@ -54,6 +67,113 @@ function validateSchema(schema, obj, objName, optional = false) {
     (0, prostgles_types_1.getKeys)(schema).forEach(k => validate(obj, k, schema[k]));
 }
 exports.validateSchema = validateSchema;
+function getPGTypeCheck(path, fieldType) {
+    if (!path.length)
+        throw "path must not be empty";
+    const { type, oneOf, arrayOf, nullable, optional, allowedValues } = getFieldTypeObj(fieldType);
+    let jsPathCondition = "";
+    let conditions = [];
+    let orConditions = [];
+    const escapedPath = path.slice(1).join(".");
+    const key = path.length > 1 ? path.at(-1) : undefined;
+    if (!key) {
+        /** Is column root */
+        if (nullable) {
+            orConditions.push(`${escapedPath} IS NULL`);
+        }
+    }
+    const escapedKeyFull = !key ? "@" : ("@." + JSON.stringify(key));
+    const escapedKey = !key ? undefined : JSON.stringify(key);
+    if (optional) {
+        if (!escapedKey) {
+            throw "Column root objects cannot be optional. Only nullable";
+        }
+    }
+    else {
+        if (escapedKey) {
+            conditions.push(`strict $${escapedPath}.${escapedKey}`);
+        }
+    }
+    if (nullable) {
+        orConditions.push(`strict $${escapedPath} ? (${escapedKeyFull} == null)`);
+    }
+    const isPrimitive = typeof type === "string";
+    const isPrimitiveArray = isPrimitive && type.endsWith("[]");
+    if (isPrimitiveArray) {
+        jsPathCondition = ` (@.type() == "array")`;
+    }
+    else if (isPrimitive) {
+        if (type !== "any") {
+            const isInteger = type === "integer";
+            const validJSONType = isInteger ? "number" : type;
+            jsPathCondition = !allowedValues?.length ?
+                `${escapedKeyFull}.type() == ${JSON.stringify(validJSONType)} ${isInteger ? ` && ${escapedKeyFull}.ceiling() == ${escapedKeyFull}.floor() ` : ""}` :
+                `${allowedValues.map(v => `${escapedKeyFull} == ${typeof v === "string" ? JSON.stringify(v) : v}`).join(" || ")} `;
+            jsPathCondition += nullable ? ` || ${escapedKeyFull}.type() == "null" ` : "";
+        }
+        else {
+            jsPathCondition += "@.type() != null";
+        }
+    }
+    else if (type) {
+        return Object.entries(type).map(([key, value]) => {
+            return getPGTypeCheck([...path, JSON.stringify(key)], value);
+        }).join(" AND ");
+    }
+    else if (oneOf) {
+    }
+    else if (arrayOf) {
+    }
+    const andCondition = [
+        ...conditions,
+        `strict $${escapedPath} ? (${jsPathCondition})`
+    ].map(cond => `jsonb_path_exists(${(0, prostgles_types_1.asName)(path[0])}, ${(0, PubSubManager_1.asValue)(cond)})`).join(" AND \n");
+    return [...orConditions.map(cond => `jsonb_path_exists(${(0, prostgles_types_1.asName)(path[0])}, ${(0, PubSubManager_1.asValue)(cond)})`), andCondition].join(" OR \n");
+}
+console.log(getPGTypeCheck(["col"], {
+    type: {
+        arr: { arrayOf: {
+                z: "boolean",
+                a: { optional: true, arrayOf: {
+                        c: { type: "string[]", allowedValues: ["a", "ad"] }
+                    }
+                }
+            }
+        }
+    }
+}));
+const jsc = {
+    userGroupNames: { type: "string[]", description: "List of user types that this rule applies to" },
+    dbsPermissions: { description: "Permission types and rules for the state database", optional: true, type: {
+            createWorkspaces: { type: "boolean", optional: true },
+            viewPublishedWorkspaces: { type: {
+                    workspaceIds: { type: "string[]" }
+                }, optional: true },
+        } },
+    dbPermissions: { description: "Permission types and rules for this (connection_id) database", oneOf: [
+            {
+                type: { enum: ["Run SQL"], description: "Allows complete access to the database" },
+                allowSQL: { type: "boolean", optional: true },
+            },
+            {
+                type: { enum: ["All views/tables"], description: "Custom access (View/Edit/Remove) to all tables" },
+                allowAllTables: { type: "string[]", allowedValues: ["select", "insert", "update", "delete"] }
+                // allowAllTables: { type: "string[]"  }  
+            },
+            {
+                type: { enum: ["Custom"], description: "Fine grained access to specific tables" },
+                customTables: { type: "any[]" },
+            }
+        ] },
+    methods: {
+        description: "Custom server-side functions",
+        optional: true,
+        type: "any[]",
+    }
+};
+const d = {
+    v: null
+};
 function getPGCheckConstraint(args, depth) {
     const { schema: s, escapedFieldName, nullable, optional, isRootQuery } = args;
     const jsToPGtypes = {
@@ -64,48 +184,51 @@ function getPGCheckConstraint(args, depth) {
         "any": "::JSONB"
     };
     const kChecks = (k, s) => {
-        const t = s[k];
+        const fieldType = getFieldTypeObj(s[k]);
         const checks = [];
         const valAsJson = `${escapedFieldName}->${(0, PubSubManager_1.asValue)(k)}`;
         const valAsText = `${escapedFieldName}->>${(0, PubSubManager_1.asValue)(k)}`;
-        if (t.nullable)
+        if (fieldType.nullable)
             checks.push(`${valAsJson} IS NULL`);
-        if (t.optional)
+        if (fieldType.optional)
             checks.push(`${escapedFieldName} ? ${(0, PubSubManager_1.asValue)(k)} = FALSE`);
-        if ("oneOf" in t) {
-            checks.push(`(${t.oneOf.map(subType => getPGCheckConstraint({ escapedFieldName: valAsJson, schema: subType, nullable, optional: t.optional }, depth + 1)).join(" OR ")})`);
+        if (fieldType?.arrayOf) {
+            // checks.push
+        }
+        else if (fieldType?.oneOf) {
+            checks.push(`(${fieldType.oneOf.map(subType => getPGCheckConstraint({ escapedFieldName: valAsJson, schema: subType, nullable, optional: fieldType.optional }, depth + 1)).join(" OR ")})`);
         }
-        else if ("enum" in t) {
-            if (!t.enum.length || t.enum.some(v => v === undefined || !["number", "boolean", "string", null].includes(typeof v))) {
+        else if ("enum" in fieldType) {
+            if (!fieldType.enum?.length || fieldType.enum.some(v => v === undefined || !["number", "boolean", "string", null].includes(typeof v))) {
                 throw new Error(`Invalid ValidationSchema for property: ${k} of field ${escapedFieldName}: enum cannot be empty AND can only contain: numbers, text, boolean, null`);
             }
-            checks.push(`array_position(${(0, PubSubManager_1.asValue)(t.enum)}::text[], ${valAsText}::text) IS NOT NULL`);
+            checks.push(`array_position(${(0, PubSubManager_1.asValue)(fieldType.enum)}::text[], ${valAsText}::text) IS NOT NULL`);
         }
-        else if ("type" in t) {
-            if (typeof t.type === "string") {
-                if (t.type.endsWith("[]")) {
-                    const correctType = t.type.slice(0, -2);
+        else if ("type" in fieldType) {
+            if (typeof fieldType.type === "string") {
+                if (fieldType.type.endsWith("[]")) {
+                    const correctType = fieldType.type.slice(0, -2);
                     let elemCheck = correctType === "any" ? "" : `AND ('{' || right(left(${valAsText},-1),-1) || '}')${jsToPGtypes[correctType]}[] IS NOT NULL`;
                     checks.push(`jsonb_typeof(${valAsJson}) = 'array' ${elemCheck}`);
-                    if (t.allowedValues) {
-                        const types = Array.from(new Set(t.allowedValues.map(v => typeof v)));
+                    if (fieldType.allowedValues) {
+                        const types = Array.from(new Set(fieldType.allowedValues.map(v => typeof v)));
                         const allowedTypes = ["boolean", "number", "string"];
                         if (types.length !== 1 || !allowedTypes.includes(types[0])) {
-                            throw new Error(`Invalid allowedValues (${t.allowedValues}). Must be a non empty array with elements of same type. Allowed types: ${allowedTypes}`);
+                            throw new Error(`Invalid allowedValues (${fieldType.allowedValues}). Must be a non empty array with elements of same type. Allowed types: ${allowedTypes}`);
                         }
                         const type = types[0];
-                        checks.push(`(${valAsText})${jsToPGtypes[type]}[] <@ ${(0, PubSubManager_1.asValue)(t.allowedValues)}`);
+                        checks.push(`(${valAsText})${jsToPGtypes[type]}[] <@ ${(0, PubSubManager_1.asValue)(fieldType.allowedValues)}`);
                     }
                 }
                 else {
-                    const correctType = t.type.replace("integer", "number");
+                    const correctType = fieldType.type.replace("integer", "number");
                     if (correctType !== "any") {
                         checks.push(`jsonb_typeof(${valAsJson}) = ${(0, PubSubManager_1.asValue)(correctType)} `);
                     }
                 }
             }
             else {
-                const check = getPGCheckConstraint({ escapedFieldName: valAsJson, schema: t.type, nullable: !!t.nullable, optional: !!t.optional }, depth + 1).trim();
+                const check = getPGCheckConstraint({ escapedFieldName: valAsJson, schema: fieldType.type, nullable: !!fieldType.nullable, optional: !!fieldType.optional }, depth + 1).trim();
                 if (check)
                     checks.push(`(${check})`);
             }
@@ -140,37 +263,38 @@ const isOneOfTypes = (s) => {
     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");
-                if (def.allowedValues && def.type.endsWith("[]")) {
-                    return nullType + ` (${def.allowedValues.map(v => JSON.stringify(v)).join(" | ")})[]`;
+    const getFieldType = (rawFieldType) => {
+        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(def.type, "", true);
+                return nullType + getSchemaTSTypes(fieldType.type, "", true);
             }
         }
-        else if ("enum" in def) {
-            return nullType + def.enum.map(v => (0, PubSubManager_1.asValue)(v)).join(" | ");
+        else if (fieldType?.enum) {
+            return nullType + fieldType.enum.map(v => (0, PubSubManager_1.asValue)(v)).join(" | ");
         }
-        else if ("oneOf" in def) {
-            return (def.nullable ? `\n${leading}  | null` : "") + def.oneOf.map(v => `\n${leading}  | ` + getSchemaTSTypes(v, "", true)).join("");
+        else if (fieldType?.oneOf) {
+            return (fieldType.nullable ? `\n${leading}  | null` : "") + fieldType.oneOf.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 ? "?" : ""}: ` + getFieldType(def) + ";";
+    const spacing = isOneOf ? " " : "  ";
+    const res = `${leading}{ \n` + (0, prostgles_types_1.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)
-        res = res.split("\n").join("");
+        return res.split("\n").join("");
     return res;
 }
 exports.getSchemaTSTypes = getSchemaTSTypes;
@@ -187,10 +311,10 @@ const getJSONSchemaObject = (objDef) => {
     const resultType = {
         type: "object",
         properties: (0, prostgles_types_1.getKeys)(objDef).reduce((a, k) => {
-            const itemSchema = objDef[k];
+            const itemSchema = getFieldTypeObj(objDef[k]);
             const { nullable, optional, description, title } = itemSchema;
             let item = {};
-            if ("type" in itemSchema) {
+            if (itemSchema.type) {
                 const { type } = itemSchema;
                 /**
                  * Is primitive or any
@@ -220,13 +344,13 @@ const getJSONSchemaObject = (objDef) => {
                     item = getJSONSchemaObject(type);
                 }
             }
-            else if ("enum" in itemSchema) {
+            else if (itemSchema?.enum) {
                 item = {
                     type: typeof itemSchema.enum[0],
                     "enum": itemSchema.enum //.concat(nullable? [null] : [])
                 };
             }
-            else if ("oneOf" in itemSchema) {
+            else if (itemSchema?.oneOf) {
                 item = {
                     type: "object",
                     oneOf: itemSchema.oneOf.map(t => getJSONSchemaObject(t))

package/dist/validation.js.map

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

package/lib/AuthHandler.d.ts

@@ -3,21 +3,21 @@ import { AnyObject } from "prostgles-types";
 import { LocalParams, PRGLIOSocket } from "./DboBuilder";
 import { DBOFullyTyped } from "./DBSchemaBuilder";
 import { DB, DBHandlerServer, Prostgles } from "./Prostgles";
-declare type Awaitable<T> = T | Promise<T>;
-declare type AuthSocketSchema = {
+type Awaitable<T> = T | Promise<T>;
+type AuthSocketSchema = {
     user?: AnyObject;
     register?: boolean;
     login?: boolean;
     logout?: boolean;
     pathGuard?: boolean;
 };
-declare type ExpressReq = Request;
-declare type ExpressRes = Response;
-declare type LoginClientInfo = {
+type ExpressReq = Request;
+type ExpressRes = Response;
+type LoginClientInfo = {
     ip_address: string;
     user_agent?: string | undefined;
 };
-export declare type BasicSession = {
+export type BasicSession = {
     /** Must be hard to bruteforce */
     sid: string;
     /** UNIX millisecond timestamp */
@@ -25,12 +25,12 @@ export declare type BasicSession = {
     /** On expired */
     onExpiration: "redirect" | "show_error";
 };
-export declare type AuthClientRequest = {
+export type AuthClientRequest = {
     socket: any;
 } | {
     httpReq: ExpressReq;
 };
-export declare type SessionUser<ServerUser extends AnyObject = AnyObject, ClientUser extends AnyObject = AnyObject> = {
+export type SessionUser<ServerUser extends AnyObject = AnyObject, ClientUser extends AnyObject = AnyObject> = {
     /**
      * This user will be available in all serverside prostgles options
      * */
@@ -40,19 +40,19 @@ export declare type SessionUser<ServerUser extends AnyObject = AnyObject, Client
      */
     clientUser: ClientUser;
 };
-export declare type AuthResult<SU = SessionUser> = SU & {
+export type AuthResult<SU = SessionUser> = SU & {
     sid: string;
 } | {
     user?: undefined;
     clientUser?: undefined;
     sid?: string;
 } | undefined;
-export declare type AuthRequestParams<S, SUser extends SessionUser> = {
+export type AuthRequestParams<S, SUser extends SessionUser> = {
     db: DB;
     dbo: DBOFullyTyped<S>;
     getUser: () => Promise<AuthResult<SUser>>;
 };
-export declare type Auth<S = void, SUser extends SessionUser = SessionUser> = {
+export type Auth<S = void, SUser extends SessionUser = SessionUser> = {
     /**
      * Name of the cookie or socket hadnshake query param that represents the session id.
      * Defaults to "session_id"

package/lib/AuthHandler.d.ts.map

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

package/lib/DBEventsManager.js

@@ -66,7 +66,7 @@ class DBEventsManager {
             q = q.toLowerCase();
         }
         q = q.replace(/""/g, `"`);
-        let channel = q;
+        const channel = q;
         let notifChannel = await this.getNotifChannelName(channel);
         notifChannel = notifChannel.replace(/""/g, `"`);
         if (notifChannel.startsWith('"'))

package/lib/DBEventsManager.ts

@@ -95,7 +95,7 @@ export class DBEventsManager {
     }
     q = q.replace(/""/g, `"`);
 
-    let channel = q;    
+    const channel = q;    
     let notifChannel = await this.getNotifChannelName(channel)
 
     notifChannel = notifChannel.replace(/""/g, `"`);

package/lib/DBSchemaBuilder.d.ts

@@ -2,11 +2,11 @@ import { DBSchema, TableHandler, ViewHandler } from "prostgles-types";
 import { DBHandlerServer, DboBuilder } from "./DboBuilder";
 import { PublishAllOrNothing, PublishTableRule, PublishViewRule } from "./PublishParser";
 export declare const getDBSchema: (dboBuilder: DboBuilder) => string;
-declare type DBTableHandlersFromSchema<Schema = void> = Schema extends DBSchema ? {
+type DBTableHandlersFromSchema<Schema = void> = Schema extends DBSchema ? {
     [tov_name in keyof Schema]: Schema[tov_name]["is_view"] extends true ? ViewHandler<Schema[tov_name]["columns"]> : TableHandler<Schema[tov_name]["columns"]>;
 } : Record<string, TableHandler>;
-export declare type DBOFullyTyped<Schema = void> = Schema extends DBSchema ? (DBTableHandlersFromSchema<Schema> & Pick<DBHandlerServer<DBTableHandlersFromSchema<Schema>>, "tx" | "sql">) : DBHandlerServer;
-export declare type PublishFullyTyped<Schema = void> = Schema extends DBSchema ? (PublishAllOrNothing | {
+export type DBOFullyTyped<Schema = void> = Schema extends DBSchema ? (DBTableHandlersFromSchema<Schema> & Pick<DBHandlerServer<DBTableHandlersFromSchema<Schema>>, "tx" | "sql">) : DBHandlerServer;
+export type PublishFullyTyped<Schema = void> = Schema extends DBSchema ? (PublishAllOrNothing | {
     [tov_name in keyof Partial<Schema>]: PublishAllOrNothing | (Schema[tov_name]["is_view"] extends true ? PublishViewRule<Schema[tov_name]["columns"], Schema> : PublishTableRule<Schema[tov_name]["columns"], Schema>);
 }) : (PublishAllOrNothing | Record<string, PublishViewRule | PublishTableRule | PublishAllOrNothing>);
 export {};

package/lib/DBSchemaBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DBSchemaBuilder.d.ts","sourceRoot":"","sources":["DBSchemaBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAY,YAAY,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAGhF,OAAO,EAAE,eAAe,EAAE,UAAU,EAAmC,MAAM,cAAc,CAAC;AAC5F,OAAO,EAAE,mBAAmB,EAAiB,gBAAgB,EAAE,eAAe,EAAI,MAAM,iBAAiB,CAAC;AAI1G,eAAO,MAAM,WAAW,eAAgB,UAAU,KAAG,MAyCpD,CAAA;AAED,aAAK,yBAAyB,CAAC,MAAM,GAAG,IAAI,IAAI,MAAM,SAAS,QAAQ,GAAE;KACtE,QAAQ,IAAI,MAAM,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,SAAS,IAAI,GAClE,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,CAAC,GACxC,YAAY,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,CAAC;CAC5C,GAAG,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;AAEjC,oBAAY,aAAa,CAAC,MAAM,GAAG,IAAI,IAAI,MAAM,SAAS,QAAQ,GAAE,CAChE,yBAAyB,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC,yBAAyB,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,GAAG,KAAK,CAAC,CAC3G,GACD,eAAe,CAAC;AAKlB,oBAAY,iBAAiB,CAAC,MAAM,GAAG,IAAI,IAAI,MAAM,SAAS,QAAQ,GAAE,CACpE,mBAAmB,GACnB;KACC,QAAQ,IAAI,MAAM,OAAO,CAAC,MAAM,CAAC,GAC9B,mBAAmB,GACnB,CACA,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,SAAS,IAAI,GACtC,eAAe,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,GACpD,gBAAgB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,CACxD;CACJ,CACF,GAAG,CACA,mBAAmB,GACnB,MAAM,CAAC,MAAM,EAAE,eAAe,GAAG,gBAAgB,GAAG,mBAAmB,CAAC,CAC3E,CAAC"}
+{"version":3,"file":"DBSchemaBuilder.d.ts","sourceRoot":"","sources":["DBSchemaBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAY,YAAY,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAGhF,OAAO,EAAE,eAAe,EAAE,UAAU,EAAmC,MAAM,cAAc,CAAC;AAC5F,OAAO,EAAE,mBAAmB,EAAiB,gBAAgB,EAAE,eAAe,EAAI,MAAM,iBAAiB,CAAC;AAI1G,eAAO,MAAM,WAAW,eAAgB,UAAU,KAAG,MA0CpD,CAAA;AAED,KAAK,yBAAyB,CAAC,MAAM,GAAG,IAAI,IAAI,MAAM,SAAS,QAAQ,GAAE;KACtE,QAAQ,IAAI,MAAM,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,SAAS,IAAI,GAClE,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,CAAC,GACxC,YAAY,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,CAAC;CAC5C,GAAG,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;AAEjC,MAAM,MAAM,aAAa,CAAC,MAAM,GAAG,IAAI,IAAI,MAAM,SAAS,QAAQ,GAAE,CAChE,yBAAyB,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC,yBAAyB,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,GAAG,KAAK,CAAC,CAC3G,GACD,eAAe,CAAC;AAKlB,MAAM,MAAM,iBAAiB,CAAC,MAAM,GAAG,IAAI,IAAI,MAAM,SAAS,QAAQ,GAAE,CACpE,mBAAmB,GACnB;KACC,QAAQ,IAAI,MAAM,OAAO,CAAC,MAAM,CAAC,GAC9B,mBAAmB,GACnB,CACA,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,SAAS,IAAI,GACtC,eAAe,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,GACpD,gBAAgB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,CACxD;CACJ,CACF,GAAG,CACA,mBAAmB,GACnB,MAAM,CAAC,MAAM,EAAE,eAAe,GAAG,gBAAgB,GAAG,mBAAmB,CAAC,CAC3E,CAAC"}

package/lib/DBSchemaBuilder.js

@@ -7,9 +7,9 @@ exports.getDBSchema = void 0;
 const prostgles_types_1 = require("prostgles-types");
 const _1 = __importDefault(require("."));
 const DboBuilder_1 = require("./DboBuilder");
-const validation_1 = require("./validation");
+const validation_1 = require("./JSONBValidation/validation");
 const getDBSchema = (dboBuilder) => {
-    let tables = [];
+    const tables = [];
     /** Tables and columns are sorted to avoid infinite loops due to changing order */
     dboBuilder.tablesOrViews?.slice(0).sort((a, b) => a.name.localeCompare(b.name)).forEach(tov => {
         const cols = tov.columns.slice(0).sort((a, b) => a.name.localeCompare(b.name));
@@ -17,10 +17,10 @@ const getDBSchema = (dboBuilder) => {
             let type = (c.is_nullable ? "null | " : "") + (0, DboBuilder_1.postgresToTsType)(c.udt_name) + ";";
             const colConf = dboBuilder.prostgles.tableConfigurator?.getColumnConfig(tov.name, c.name);
             if (colConf) {
-                if ((0, prostgles_types_1.isObject)(colConf) && "jsonbSchema" in colConf) {
-                    if (!colConf.jsonbSchema)
-                        throw "colConf.jsonbSchema missing";
-                    type = (0, validation_1.getJSONBSchemaTSTypes)(colConf.jsonbSchema, { nullable: colConf.nullable }, "      ");
+                if ((0, prostgles_types_1.isObject)(colConf) && (colConf.jsonbSchema || colConf.jsonbSchemaType)) {
+                    const schema = colConf.jsonbSchema ? colConf.jsonbSchema : { ...colConf, type: colConf.jsonbSchemaType };
+                    // if(!colConf.jsonbSchema) throw "colConf.jsonbSchema missing";
+                    type = (0, validation_1.getJSONBSchemaTSTypes)(schema, { nullable: colConf.nullable }, "      ");
                 }
                 else if ((0, prostgles_types_1.isObject)(colConf) && "enum" in colConf) {
                     if (!colConf.enum)

package/lib/DBSchemaBuilder.ts

@@ -3,11 +3,11 @@ import prostgles from ".";
 import { Auth } from "./AuthHandler";
 import { DBHandlerServer, DboBuilder, escapeTSNames, postgresToTsType } from "./DboBuilder";
 import { PublishAllOrNothing, PublishParams, PublishTableRule, PublishViewRule,  } from "./PublishParser";
-import { getJSONBSchemaTSTypes } from "./validation";
+import { getJSONBSchemaTSTypes, JSONB } from "./JSONBValidation/validation";
 
 
 export const getDBSchema = (dboBuilder: DboBuilder): string => {
-  let tables: string[] = [];
+  const tables: string[] = [];
 
   
   /** Tables and columns are sorted to avoid infinite loops due to changing order */
@@ -17,9 +17,10 @@ export const getDBSchema = (dboBuilder: DboBuilder): string => {
       let type: string = (c.is_nullable? "null | " : "") + postgresToTsType(c.udt_name) + ";"
       const colConf = dboBuilder.prostgles.tableConfigurator?.getColumnConfig(tov.name, c.name);
       if(colConf){
-        if(isObject(colConf) && "jsonbSchema" in colConf){
-          if(!colConf.jsonbSchema) throw "colConf.jsonbSchema missing"
-          type = getJSONBSchemaTSTypes(colConf.jsonbSchema, { nullable: colConf.nullable }, "      ");
+        if(isObject(colConf) && (colConf.jsonbSchema || colConf.jsonbSchemaType)){
+          const schema: JSONB.JSONBSchema = colConf.jsonbSchema? colConf.jsonbSchema : { ...colConf, type: colConf.jsonbSchemaType }
+          // if(!colConf.jsonbSchema) throw "colConf.jsonbSchema missing";
+          type = getJSONBSchemaTSTypes(schema, { nullable: colConf.nullable }, "      ");
         } else if(isObject(colConf) && "enum" in colConf){
           if(!colConf.enum) throw "colConf.enum missing"
           const types = colConf.enum.map(t => typeof t === "number"? t : JSON.stringify(t));
@@ -101,7 +102,7 @@ export type PublishFullyTyped<Schema = void> = Schema extends DBSchema? (
     publish: async (params) => {
       const row = await params.dbo.dwadwa.find?.({});
       
-      return "*" as "*"
+      return "*" as const
     },
     onReady: (dbo) => {
       dbo.tdwa.find!()
@@ -151,7 +152,7 @@ export type PublishFullyTyped<Schema = void> = Schema extends DBSchema? (
     const r = {
       tbl1: {
         select: {
-          fields: "*" as "*", 
+          fields: "*" as const, 
           forcedFilter: { col1: 32, col2: "" }
         },
         getColumns: true,
@@ -162,7 +163,7 @@ export type PublishFullyTyped<Schema = void> = Schema extends DBSchema? (
       },
       tbl2: {
         delete: {
-          filterFields: "*" as "*",
+          filterFields: "*" as const,
           forcedFilter: {col1: 2}
         }
       }
@@ -181,7 +182,7 @@ export type PublishFullyTyped<Schema = void> = Schema extends DBSchema? (
       },
       tbl2: {
         delete: {
-          filterFields: "*" as "*",
+          filterFields: "*" as const,
           forcedFilter: { col1: 2 }
         }
       }