@snowtop/ent 0.1.0-alpha91 → 0.1.0-alpha92-7ebc5680-4591-11ed-b331-8b0a5597e9d8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@snowtop/ent",
-  "version": "0.1.0-alpha91",
+  "version": "0.1.0-alpha92-7ebc5680-4591-11ed-b331-8b0a5597e9d8",
   "description": "snowtop ent framework",
   "main": "index.js",
   "types": "index.d.ts",

package/schema/field.d.ts

@@ -1,3 +1,4 @@
+import { Builder } from "../action/action";
 import { Field, FieldMap, FieldOptions, ForeignKey, PolymorphicOptions, Type } from "./schema";
 export declare abstract class BaseField {
     name: string;
@@ -88,6 +89,18 @@ export declare class StringField extends BaseField implements Field {
     trimLeft(): this;
     trimRight(): this;
 }
+interface PolymorphicStringOptions extends StringOptions {
+    parentFieldToValidate: string;
+    types?: string[];
+}
+export declare class PolymorphicStringField extends StringField {
+    private opts;
+    private camelCaseVals;
+    constructor(opts: PolymorphicStringOptions);
+    validateWithFullData(val: any, b: Builder<any>): boolean;
+    valid(val: any): boolean;
+    format(val: any): any;
+}
 export declare function StringType(options?: StringOptions): StringField;
 export interface TimestampOptions extends FieldOptions {
     withTimezone?: boolean;

package/schema/field.js

@@ -23,9 +23,10 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.UUIDListType = exports.IntegerEnumListType = exports.EnumListType = exports.DateListType = exports.TimetzListType = exports.TimeListType = exports.TimestamptzListType = exports.TimestampListType = exports.BooleanListType = exports.BigIntegerListType = exports.FloatListType = exports.IntegerListType = exports.IntListType = exports.StringListType = exports.ListField = exports.IntegerEnumType = exports.IntegerEnumField = exports.EnumType = exports.StringEnumField = exports.EnumField = exports.DateType = exports.DateField = exports.TimetzType = exports.TimeType = exports.TimeField = exports.leftPad = exports.TimestamptzType = exports.TimestampType = exports.TimestampField = exports.StringType = exports.StringField = exports.BooleanType = exports.BooleanField = exports.FloatType = exports.FloatField = exports.BigIntegerType = exports.BigIntegerField = exports.IntegerType = exports.IntegerField = exports.UUIDType = exports.UUIDField = exports.BaseField = void 0;
+exports.UUIDListType = exports.IntegerEnumListType = exports.EnumListType = exports.DateListType = exports.TimetzListType = exports.TimeListType = exports.TimestamptzListType = exports.TimestampListType = exports.BooleanListType = exports.BigIntegerListType = exports.FloatListType = exports.IntegerListType = exports.IntListType = exports.StringListType = exports.ListField = exports.IntegerEnumType = exports.IntegerEnumField = exports.EnumType = exports.StringEnumField = exports.EnumField = exports.DateType = exports.DateField = exports.TimetzType = exports.TimeType = exports.TimeField = exports.leftPad = exports.TimestamptzType = exports.TimestampType = exports.TimestampField = exports.StringType = exports.PolymorphicStringField = exports.StringField = exports.BooleanType = exports.BooleanField = exports.FloatType = exports.FloatField = exports.BigIntegerType = exports.BigIntegerField = exports.IntegerType = exports.IntegerField = exports.UUIDType = exports.UUIDField = exports.BaseField = void 0;
 const luxon_1 = require("luxon");
 const snake_case_1 = require("snake-case");
+const camel_case_1 = require("camel-case");
 const util_1 = require("util");
 const uuid_1 = require("uuid");
 const base_1 = require("../core/base");
@@ -66,38 +67,26 @@ class UUIDField extends BaseField {
             else {
                 throw new Error(`unsupported id polymorhpic type ${fieldName}`);
             }
+            let types;
+            let serverDefault = undefined;
+            if (typeof polymorphic === "object") {
+                serverDefault = polymorphic.serverDefault;
+                types = polymorphic.types;
+            }
             // polymorphic field automatically hidden from GraphQL
             // can be made visible with custom fields if user wants to change this behavior
             // can't be foreignKey so need to make other changes to the field
             // intentionally not made private as it doesn't seem like it needs to be hidden
-            if (typeof polymorphic === "object" && polymorphic.types) {
-                // an enum with types validated here
-                return {
-                    [name]: PolymorphicStringEnumType({
-                        values: polymorphic.types,
-                        hideFromGraphQL: true,
-                        derivedWhenEmbedded: true,
-                        nullable: this.options?.nullable,
-                        parentFieldToValidate: fieldName,
-                        serverDefault: polymorphic.serverDefault,
-                    }),
-                };
-            }
-            else {
-                let serverDefault = undefined;
-                if (typeof polymorphic === "object") {
-                    serverDefault = polymorphic.serverDefault;
-                }
-                return {
-                    [name]: PolymorphicStringType({
-                        hideFromGraphQL: true,
-                        derivedWhenEmbedded: true,
-                        nullable: this.options?.nullable,
-                        parentFieldToValidate: fieldName,
-                        serverDefault: serverDefault,
-                    }),
-                };
-            }
+            return {
+                [name]: PolymorphicStringType({
+                    types: types,
+                    hideFromGraphQL: true,
+                    derivedWhenEmbedded: true,
+                    nullable: this.options?.nullable,
+                    parentFieldToValidate: fieldName,
+                    serverDefault: serverDefault,
+                }),
+            };
         }
         return {};
     }
@@ -323,29 +312,54 @@ class StringField extends BaseField {
     }
 }
 exports.StringField = StringField;
-function validatePolymorphicTypeWithFullData(val, b, field) {
-    const input = b.getInput();
-    const inputKey = b.orchestrator.__getOptions().fieldInfo[field].inputKey;
-    const v = input[inputKey];
-    if (val === null) {
-        // if this is being set to null, ok if v is also null
-        return v === null;
-    }
-    // if this is not being set, ok if v is not being set
-    if (val === undefined && b.operation === base_1.WriteOperation.Insert) {
-        return v === undefined;
-    }
-    return true;
-}
 class PolymorphicStringField extends StringField {
     constructor(opts) {
         super(opts);
         this.opts = opts;
+        if (opts.types) {
+            this.camelCaseVals = opts.types.map((v) => (0, camel_case_1.camelCase)(v));
+        }
     }
     validateWithFullData(val, b) {
-        return validatePolymorphicTypeWithFullData(val, b, this.opts.parentFieldToValidate);
+        const input = b.getInput();
+        const inputKey = b.orchestrator.__getOptions().fieldInfo[this.opts.parentFieldToValidate]
+            .inputKey;
+        const v = input[inputKey];
+        if (val === null) {
+            // if this is being set to null, ok if v is also null
+            return v === null;
+        }
+        // if this is not being set, ok if v is not being set
+        if (val === undefined && b.operation === base_1.WriteOperation.Insert) {
+            return v === undefined;
+        }
+        return true;
+    }
+    valid(val) {
+        if (!this.camelCaseVals) {
+            return true;
+        }
+        let str = (0, camel_case_1.camelCase)(String(val));
+        // allow different cases because it could be coming from different clients who don't have strong typing
+        return this.camelCaseVals.some((value) => value === str);
+    }
+    format(val) {
+        if (!this.camelCaseVals) {
+            return val;
+        }
+        const converted = (0, camel_case_1.camelCase)(String(val));
+        for (const v of this.camelCaseVals) {
+            if (v === val) {
+                return val;
+            }
+            if (converted === v) {
+                return converted;
+            }
+        }
+        return val;
     }
 }
+exports.PolymorphicStringField = PolymorphicStringField;
 function PolymorphicStringType(opts) {
     let result = new PolymorphicStringField(opts);
     return Object.assign(result, opts);
@@ -596,19 +610,6 @@ exports.EnumField = EnumField;
 class StringEnumField extends EnumField {
 }
 exports.StringEnumField = StringEnumField;
-class PolymorphicStringEnumField extends StringEnumField {
-    constructor(opts) {
-        super(opts);
-        this.opts = opts;
-    }
-    validateWithFullData(val, b) {
-        return validatePolymorphicTypeWithFullData(val, b, this.opts.parentFieldToValidate);
-    }
-}
-function PolymorphicStringEnumType(options) {
-    let result = new PolymorphicStringEnumField(options);
-    return Object.assign(result, options);
-}
 function EnumType(options) {
     let result = new StringEnumField(options);
     return Object.assign(result, options);

package/schema/struct_field.js

@@ -23,27 +23,28 @@ class StructField extends field_1.BaseField {
             };
         }
     }
-    // right now, we store things in the db in lowerCase format
-    // this will lead to issues if field changes.
-    // TODO: use storageKey and convert back...
     formatImpl(obj, nested) {
         if (!(obj instanceof Object)) {
             throw new Error("valid was not called");
         }
         let ret = {};
         for (const k in this.options.fields) {
+            const field = this.options.fields[k];
+            // check two values
+            // wait, two different things
+            // getStoragetKey and getCamelCase()
+            // for weird graphql case and for typescript format...
+            // store in dbKey format
             // TODO more #510
-            let dbKey = (0, camel_case_1.camelCase)(k);
-            let val = obj[dbKey];
-            // for tests with snake_case
-            if (val === undefined && obj[k] !== undefined) {
-                val = obj[k];
-                dbKey = k;
+            let dbKey = (0, schema_1.getStorageKey)(field, k);
+            let camelKey = (0, camel_case_1.camelCase)(k);
+            let val = obj[camelKey];
+            if (val === undefined && obj[dbKey] !== undefined) {
+                val = obj[dbKey];
             }
             if (val === undefined) {
                 continue;
             }
-            const field = this.options.fields[k];
             if (field.format) {
                 // indicate nested so this isn't JSON stringified
                 ret[dbKey] = field.format(val, true);
@@ -78,12 +79,11 @@ class StructField extends field_1.BaseField {
         for (const k in this.options.fields) {
             const field = this.options.fields[k];
             // TODO more #510
-            let dbKey = (0, camel_case_1.camelCase)(k);
-            let val = obj[dbKey];
-            // for tests with snake_case
-            if (val === undefined && obj[k] !== undefined) {
-                val = obj[k];
-                dbKey = k;
+            let dbKey = (0, schema_1.getStorageKey)(field, k);
+            let camelKey = (0, camel_case_1.camelCase)(k);
+            let val = obj[camelKey];
+            if (val === undefined && obj[dbKey] !== undefined) {
+                val = obj[dbKey];
             }
             if (val === undefined || val === null) {
                 // nullable, nothing to do here