prostgles-server 2.0.332 → 2.0.334

package/lib/TableConfig.js

@@ -205,11 +205,11 @@ class TableConfigurator {
                         const checkStatement = (0, validation_1.getPGCheckConstraint)({ schema: colConf.jsonbSchema, escapedFieldName: colNameEsc, nullable: !!colConf.nullable }, 0);
                         return ` ${colNameEsc} ${getColTypeDef(colConf, "JSONB")} CHECK(${checkStatement})`;
                     }
-                    else if ("oneOf" in colConf) {
-                        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 ");
+                    else if ("enum" in colConf) {
+                        if (!colConf.enum?.length)
+                            throw new Error("colConf.enum Must not be empty");
+                        const type = colConf.enum.every(v => Number.isFinite(v)) ? "NUMERIC" : "TEXT";
+                        const checks = colConf.enum.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})`;
                     }
                     else {

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 { getJSONBSchemaAsJSONSchema, getPGCheckConstraint, OneOfTypes, ValidationSchema } from "./validation";
+import { getJSONBSchemaAsJSONSchema, getPGCheckConstraint, OneOf, ValidationSchema } from "./validation";
 
 type ColExtraInfo = {
   min?: string | number;
@@ -99,12 +99,12 @@ type SQLDefColumn = {
   sqlDefinition?: string;
 }
 
-type TextColDef = {
-  defaultValue?: string;
+type BaseColumnTypes = {
+  defaultValue?: any;
   nullable?: boolean;
 }
 
-type TextColumn = TextColDef & {
+type TextColumn = BaseColumnTypes & {
   isText: true;
   /**
    * Value will be trimmed before update/insert
@@ -117,8 +117,8 @@ type TextColumn = TextColDef & {
   lowerCased?: boolean;
 }
 
-export type JSONBColumnDef = TextColDef & {
-  jsonbSchema: ValidationSchema | Omit<OneOfTypes, "optional">;
+export type JSONBColumnDef = BaseColumnTypes & {
+  jsonbSchema: ValidationSchema | Omit<OneOf, "optional">;
 
   /**
    * If the new schema CHECK fails old rows the update old rows using this function
@@ -153,7 +153,7 @@ type ReferencedColumn = {
   /**
    * Will create a lookup table that this column will reference
    */
-  references?: TextColDef & {
+  references?: BaseColumnTypes & {
 
 
     tableName: string;
@@ -179,13 +179,23 @@ type NamedJoinColumn = {
   joinDef: JoinDef[];
 }
 
-type OneOf<T extends string | number = any> = { 
-  oneOf: T[];
+type Enum<T extends string | number = any> = { 
+  enum: T[];
   nullable?: boolean; 
   defaultValue?: T; 
 };
 
-export type ColumnConfig<LANG_IDS = { en: 1 }> = string | StrictUnion<NamedJoinColumn | MediaColumn | (BaseColumn<LANG_IDS> & (SQLDefColumn | ReferencedColumn | TextColumn | JSONBColumnDef | OneOf))>
+export type ColumnConfig<LANG_IDS = { en: 1 }> = string | StrictUnion<NamedJoinColumn | MediaColumn | (BaseColumn<LANG_IDS> & (SQLDefColumn | ReferencedColumn | TextColumn | JSONBColumnDef | Enum))>;
+
+export type ColumnConfigs<LANG_IDS = { en: 1 }> = {
+  sql: string | BaseColumn<LANG_IDS> & SQLDefColumn;
+  join: BaseColumn<LANG_IDS> & NamedJoinColumn;
+  media: BaseColumn<LANG_IDS> & MediaColumn;
+  referenced: BaseColumn<LANG_IDS> & ReferencedColumn;
+  text: BaseColumn<LANG_IDS> & TextColumn;
+  jsonb: BaseColumn<LANG_IDS> & JSONBColumnDef;
+  enum: BaseColumn<LANG_IDS> & Enum;
+}
 
 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;
@@ -416,7 +426,7 @@ export default class TableConfigurator<LANG_IDS = { en: 1 }> {
       if ("columns" in tableConf) {
         const getColDef = (name: string, colConf: ColumnConfig): string => {
           const colNameEsc = asName(name);
-          const getColTypeDef = (colConf: TextColDef, pgType: "TEXT" | "JSONB") => {
+          const getColTypeDef = (colConf: BaseColumnTypes, pgType: "TEXT" | "JSONB") => {
             const { nullable, defaultValue } = colConf;
             return `${pgType} ${!nullable ? " NOT NULL " : ""} ${defaultValue ? ` DEFAULT ${asValue(defaultValue)} ` : ""}`
           }
@@ -458,10 +468,10 @@ export default class TableConfigurator<LANG_IDS = { en: 1 }> {
             const checkStatement = getPGCheckConstraint({ schema: colConf.jsonbSchema, escapedFieldName: colNameEsc, nullable: !!colConf.nullable }, 0)
             return ` ${colNameEsc} ${getColTypeDef(colConf, "JSONB")} CHECK(${checkStatement})`;
 
-          } else if("oneOf" in colConf) {
-            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 ");
+          } else if("enum" in colConf) {
+            if(!colConf.enum?.length) throw new Error("colConf.enum Must not be empty");
+            const type = colConf.enum.every(v => Number.isFinite(v))? "NUMERIC" : "TEXT";
+            const checks = colConf.enum.map(v => `${colNameEsc} = ${asValue(v)}`).join(" OR ");
             return ` ${colNameEsc} ${type} ${colConf.nullable? "" : "NOT NULL"} ${"defaultValue" in colConf? ` DEFAULT ${asValue(colConf.defaultValue)}` : ""} CHECK(${checks})`;
 
           } else {

package/lib/validation.d.ts

@@ -9,12 +9,12 @@ declare type BaseOptions = {
 declare type SimpleType = BaseOptions & ({
     type: "number" | "boolean" | "integer" | "string" | "any" | "number[]" | "boolean[]" | "integer[]" | "string[]" | "any[]" | ValidationSchema;
 } | {
-    oneOf: readonly any[];
+    enum: readonly any[];
 });
-export declare type OneOfTypes = BaseOptions & {
-    oneOfTypes: readonly ValidationSchema[];
+export declare type OneOf = BaseOptions & {
+    oneOf: readonly ValidationSchema[];
 };
-declare type FieldType = SimpleType | OneOfTypes;
+declare type FieldType = SimpleType | OneOf;
 declare type GetType<T extends FieldType> = T extends {
     type: ValidationSchema;
 } ? SchemaObject<T["type"]> : T extends {
@@ -38,12 +38,12 @@ declare type GetType<T extends FieldType> = T extends {
 } ? string[] : T extends {
     type: "any[]";
 } ? any[] : T extends {
-    oneOf: readonly any[];
-} ? T["oneOf"][number] : 
+    enum: readonly any[];
+} ? T["enum"][number] : 
 /** This needs fixing */
 T extends {
-    oneOfTypes: readonly ValidationSchema[];
-} ? SchemaObject<T["oneOfTypes"][number]> : any;
+    oneOf: readonly ValidationSchema[];
+} ? SchemaObject<T["oneOf"][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]>;
@@ -54,7 +54,7 @@ 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 | OneOfTypes;
+    schema: ValidationSchema | OneOf;
     nullable: boolean;
     isRootQuery?: boolean;
     optional?: boolean;
@@ -63,7 +63,7 @@ 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 declare function getJSONBSchemaTSTypes(schema: ValidationSchema | OneOf, colOpts: ColOpts, leading?: string, isOneOf?: boolean): string;
 export declare function getJSONBSchemaAsJSONSchema(tableName: string, colName: string, columnConfig: BaseColumn<{
     en: 1;
 }> & JSONBColumnDef): AnyObject;

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

@@ -7,10 +7,12 @@ const PubSubManager_1 = require("./PubSubManager");
 const s = {
     a: { type: "boolean" },
     c: { type: { c1: { type: "string" } } },
-    o: { oneOfTypes: [
+    o: {
+        oneOf: [
             { z: { type: "integer" } },
             { z1: { type: "integer" } }
-        ] }
+        ]
+    }
 };
 const ss = {
     a: true,
@@ -38,9 +40,9 @@ function validate(obj, key, validation) {
         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))
+    else if ("enum" in validation && validation.enum) {
+        err += `on of: ${validation.enum}`;
+        if (!validation.enum.includes(val))
             throw new Error(err);
     }
     return true;
@@ -70,18 +72,18 @@ function getPGCheckConstraint(args, depth) {
             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, nullable, optional: t.optional }, depth + 1)).join(" OR ")})`);
+        if ("oneOf" in t) {
+            checks.push(`(${t.oneOf.map(subType => getPGCheckConstraint({ escapedFieldName: valAsJson, schema: subType, nullable, optional: t.optional }, 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`);
+        else if ("enum" in t) {
+            if (!t.enum.length || t.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`);
             }
-            const oneOfHasNull = t.oneOf.includes(null);
+            const oneOfHasNull = t.enum.includes(null);
             if (oneOfHasNull)
                 checks.push(`${valAsText} IS NULL`);
-            const oneOf = t.oneOf.filter(o => o !== null);
-            oneOf.forEach(o => {
+            const _enum = t.enum.filter(o => o !== null);
+            _enum.forEach(o => {
                 checks.push(`(${valAsText})${jsToPGtypes[typeof o]} = ${(0, PubSubManager_1.asValue)(o)}`);
             });
         }
@@ -114,7 +116,7 @@ function getPGCheckConstraint(args, depth) {
     const checks = [];
     let typeChecks = "";
     if (isOneOfTypes(s)) {
-        typeChecks = s.oneOfTypes.map(t => `(${getSchemaChecks(t)})`).join(" OR ");
+        typeChecks = s.oneOf.map(t => `(${getSchemaChecks(t)})`).join(" OR ");
     }
     else {
         typeChecks = getSchemaChecks(s);
@@ -126,9 +128,9 @@ function getPGCheckConstraint(args, depth) {
 }
 exports.getPGCheckConstraint = getPGCheckConstraint;
 const isOneOfTypes = (s) => {
-    if ("oneOfTypes" in s) {
-        if (!Array.isArray(s.oneOfTypes)) {
-            throw "Expecting oneOfTypes to be an array of types";
+    if ("oneOf" in s) {
+        if (!Array.isArray(s.oneOf)) {
+            throw "Expecting oneOf to be an array of types";
         }
         return true;
     }
@@ -146,11 +148,11 @@ function getSchemaTSTypes(schema, leading = "", isOneOf = false) {
                 return nullType + getSchemaTSTypes(def.type, "", true);
             }
         }
-        else if ("oneOf" in def) {
-            return nullType + def.oneOf.map(v => (0, PubSubManager_1.asValue)(v)).join(" | ");
+        else if ("enum" in def) {
+            return nullType + def.enum.map(v => (0, PubSubManager_1.asValue)(v)).join(" | ");
         }
-        else if ("oneOfTypes" in def) {
-            return (def.nullable ? `\n${leading}  | null` : "") + def.oneOfTypes.map(v => `\n${leading}  | ` + getSchemaTSTypes(v, "", true)).join("");
+        else if ("oneOf" in def) {
+            return (def.nullable ? `\n${leading}  | null` : "") + def.oneOf.map(v => `\n${leading}  | ` + getSchemaTSTypes(v, "", true)).join("");
         }
         else
             throw "Unexpected getSchemaTSTypes";
@@ -168,7 +170,7 @@ function getSchemaTSTypes(schema, leading = "", isOneOf = false) {
 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("");
+        return (colOpts.nullable ? `\n${leading}  | null` : "") + schema.oneOf.map(s => `\n${leading}  | ` + getSchemaTSTypes(s, "", true)).join("");
     }
     else {
         return (colOpts.nullable ? `null | ` : "") + getSchemaTSTypes(schema, leading, isOneOf);
@@ -211,18 +213,15 @@ const getJSONSchemaObject = (objDef) => {
                 };
             }
         }
-        else if ("oneOf" in itemSchema) {
+        else if ("enum" in itemSchema) {
             item = {
-                type: "array",
-                items: {
-                    "type": typeof itemSchema.oneOf[0],
-                    "enum": itemSchema.oneOf //.concat(nullable? [null] : [])
-                }
+                type: typeof itemSchema.enum[0],
+                "enum": itemSchema.enum //.concat(nullable? [null] : [])
             };
         }
-        else if ("oneOfTypes" in itemSchema) {
+        else if ("oneOf" in itemSchema) {
             item = {
-                oneOf: itemSchema.oneOfTypes.map(t => getJSONSchemaObject(t))
+                oneOf: itemSchema.oneOf.map(t => getJSONSchemaObject(t))
             };
         }
         else {