prostgles-server 2.0.269 → 2.0.272

package/lib/TableConfig.js

@@ -87,6 +87,8 @@ class TableConfigurator {
                 if ("columns" in td && td.columns?.[targetTable]) {
                     const cd = td.columns[targetTable];
                     if ("joinDef" in cd) {
+                        if (!cd.joinDef)
+                            throw "cd.joinDef missing";
                         const { joinDef } = cd;
                         const res = {
                             expectOne: false,
@@ -161,13 +163,13 @@ class TableConfigurator {
             if ("columns" in tableConf) {
                 const getColDef = (name, colConf) => {
                     const colNameEsc = (0, prostgles_types_1.asName)(name);
-                    const getColDef = (colConf, pgType) => {
+                    const getColTypeDef = (colConf, pgType) => {
                         const { nullable, defaultValue } = colConf;
                         return `${pgType} ${!nullable ? " NOT NULL " : ""} ${defaultValue ? ` DEFAULT ${(0, PubSubManager_1.asValue)(defaultValue)} ` : ""}`;
                     };
                     if ("references" in colConf && colConf.references) {
                         const { tableName: lookupTable, columnName: lookupCol = "id" } = colConf.references;
-                        return ` ${colNameEsc} ${getColDef(colConf.references, "TEXT")} REFERENCES ${lookupTable} (${lookupCol}) `;
+                        return ` ${colNameEsc} ${getColTypeDef(colConf.references, "TEXT")} REFERENCES ${lookupTable} (${lookupCol}) `;
                     }
                     else if ("sqlDefinition" in colConf && colConf.sqlDefinition) {
                         return ` ${colNameEsc} ${colConf.sqlDefinition} `;
@@ -183,7 +185,7 @@ class TableConfigurator {
                         if (cArr.length) {
                             checks = `CHECK (${cArr.join(" AND ")})`;
                         }
-                        return ` ${colNameEsc} ${getColDef(colConf, "TEXT")} ${checks}`;
+                        return ` ${colNameEsc} ${getColTypeDef(colConf, "TEXT")} ${checks}`;
                     }
                     else if ("jsonbSchema" in colConf && colConf.jsonbSchema) {
                         /** Validate default value against jsonbSchema  */
@@ -198,11 +200,11 @@ class TableConfigurator {
                             });
                         }
                         const checkStatement = (0, validation_1.getPGCheckConstraint)({ schema: colConf.jsonbSchema, escapedFieldName: colNameEsc, nullable: !!colConf.nullable }, 0);
-                        return ` ${colNameEsc} ${getColDef(colConf, "JSONB")} CHECK(${checkStatement})`;
+                        return ` ${colNameEsc} ${getColTypeDef(colConf, "JSONB")} CHECK(${checkStatement})`;
                     }
                     else if ("oneOf" in colConf) {
-                        if (!colConf.oneOf.length)
-                            throw new Error("Must not be empty");
+                        if (!colConf.oneOf?.length)
+                            throw new Error("colConf.oneOf Must not be empty");
                         const type = colConf.oneOf.every(v => Number.isFinite(v)) ? "NUMERIC" : "TEXT";
                         const checks = colConf.oneOf.map(v => `${colNameEsc} = ${(0, PubSubManager_1.asValue)(v)}`).join(" OR ");
                         return ` ${colNameEsc} ${type} ${colConf.nullable ? "" : "NOT NULL"} ${"defaultValue" in colConf ? ` DEFAULT ${(0, PubSubManager_1.asValue)(colConf.defaultValue)}` : ""} CHECK(${checks})`;

package/lib/TableConfig.ts

@@ -154,7 +154,11 @@ type OneOf = {
   defaultValue?: OneOf["oneOf"][number]; 
 };
 
-type ColumnConfig<LANG_IDS = { en: 1 }> = NamedJoinColumn | MediaColumn | (BaseColumn<LANG_IDS> & (SQLDefColumn | ReferencedColumn | TextColumn | JSONBColumnDef | OneOf))
+type ColumnConfig<LANG_IDS = { en: 1 }> = StrictUnion<NamedJoinColumn | MediaColumn | (BaseColumn<LANG_IDS> & (SQLDefColumn | ReferencedColumn | TextColumn | JSONBColumnDef | OneOf))>
+
+type UnionKeys<T> = T extends T ? keyof T : never;
+type StrictUnionHelper<T, TAll> = T extends any ? T & Partial<Record<Exclude<UnionKeys<TAll>, keyof T>, never>> : never;
+type StrictUnion<T> = StrictUnionHelper<T, T>
 
 type TableDefinition<LANG_IDS> = {
   columns?: {
@@ -309,6 +313,7 @@ export default class TableConfigurator<LANG_IDS = { en: 1 }> {
       if ("columns" in td && td.columns?.[targetTable]) {
         const cd = td.columns[targetTable];
         if ("joinDef" in cd) {
+          if(!cd.joinDef) throw "cd.joinDef missing"
           const { joinDef } = cd;
           const res: JoinInfo = {
             expectOne: false,
@@ -372,14 +377,14 @@ export default class TableConfigurator<LANG_IDS = { en: 1 }> {
       if ("columns" in tableConf) {
         const getColDef = (name: string, colConf: ColumnConfig): string => {
           const colNameEsc = asName(name);
-          const getColDef = (colConf: TextColDef, pgType: "TEXT" | "JSONB") => {
+          const getColTypeDef = (colConf: TextColDef, pgType: "TEXT" | "JSONB") => {
             const { nullable, defaultValue } = colConf;
             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} ${getColDef(colConf.references, "TEXT")} REFERENCES ${lookupTable} (${lookupCol}) `;
+            return ` ${colNameEsc} ${getColTypeDef(colConf.references, "TEXT")} REFERENCES ${lookupTable} (${lookupCol}) `;
 
           } else if ("sqlDefinition" in colConf && colConf.sqlDefinition) {
 
@@ -396,7 +401,7 @@ export default class TableConfigurator<LANG_IDS = { en: 1 }> {
             if (cArr.length) {
               checks = `CHECK (${cArr.join(" AND ")})`
             }
-            return ` ${colNameEsc} ${getColDef(colConf, "TEXT")} ${checks}`;
+            return ` ${colNameEsc} ${getColTypeDef(colConf, "TEXT")} ${checks}`;
 
           } else if ("jsonbSchema" in colConf && colConf.jsonbSchema) {
 
@@ -412,10 +417,10 @@ export default class TableConfigurator<LANG_IDS = { en: 1 }> {
               })
             }
             const checkStatement = getPGCheckConstraint({ schema: colConf.jsonbSchema, escapedFieldName: colNameEsc, nullable: !!colConf.nullable }, 0)
-            return ` ${colNameEsc} ${getColDef(colConf, "JSONB")} CHECK(${checkStatement})`;
+            return ` ${colNameEsc} ${getColTypeDef(colConf, "JSONB")} CHECK(${checkStatement})`;
 
           } else if("oneOf" in colConf) {
-            if(!colConf.oneOf.length) throw new Error("Must not be empty");
+            if(!colConf.oneOf?.length) throw new Error("colConf.oneOf Must not be empty");
             const type = colConf.oneOf.every(v => Number.isFinite(v))? "NUMERIC" : "TEXT";
             const checks = colConf.oneOf.map(v => `${colNameEsc} = ${asValue(v)}`).join(" OR ");
             return ` ${colNameEsc} ${type} ${colConf.nullable? "" : "NOT NULL"} ${"defaultValue" in colConf? ` DEFAULT ${asValue(colConf.defaultValue)}` : ""} CHECK(${checks})`;

package/lib/validation.js

@@ -67,8 +67,7 @@ function getPGCheckConstraint(args, depth) {
         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`);
+        checks.push(`jsonb_typeof(${escapedFieldName}) = 'object' ` + (t.optional ? `AND ${escapedFieldName} ? ${(0, PubSubManager_1.asValue)(k)} = FALSE` : ""));
         if ("oneOfTypes" in t) {
             checks.push(`(${t.oneOfTypes.map(subType => getPGCheckConstraint({ escapedFieldName: valAsJson, schema: subType, nullable }, depth + 1)).join(" OR ")})`);
         }

package/lib/validation.ts

@@ -103,7 +103,7 @@ export function getPGCheckConstraint(args: { escapedFieldName: string; schema: V
     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`);
+    checks.push(`jsonb_typeof(${escapedFieldName}) = 'object' ` + (t.optional? `AND ${escapedFieldName} ? ${asValue(k)} = FALSE` : ""));
 
     if("oneOfTypes" in t){
       checks.push(`(${t.oneOfTypes.map(subType => getPGCheckConstraint({ escapedFieldName: valAsJson, schema: subType, nullable }, depth + 1)).join(" OR ")})`)
@@ -113,7 +113,7 @@ export function getPGCheckConstraint(args: { escapedFieldName: string; schema: V
       }
       const oneOfHasNull = t.oneOf.includes(null);
       if(oneOfHasNull) checks.push(`${valAsText} IS NULL`);
-      const oneOf = t.oneOf.filter(o => o !== null);
+    const oneOf = t.oneOf.filter(o => o !== null);
       oneOf.forEach(o => {
         checks.push(`(${valAsText})${(jsToPGtypes as any)[typeof o]} = ${asValue(o)}`);
       })

package/package.json

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

package/tests/client/PID.txt

@@ -1 +1 @@
-14377
+22288

package/tests/server/package-lock.json

@@ -21,7 +21,7 @@
     },
     "../..": {
       "name": "prostgles-server",
-      "version": "2.0.268",
+      "version": "2.0.271",
       "license": "MIT",
       "dependencies": {
         "@aws-sdk/client-s3": "^3.121.0",

package/lib/QueryBuilder.d.ts.map

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