@snowtop/ent 0.1.0-alpha80 → 0.1.0-alpha85

package/action/action.d.ts

@@ -1,14 +1,16 @@
-import { Ent, EntConstructor, Viewer, ID, Data, PrivacyPolicy, Context } from "../core/base";
+import { Ent, EntConstructor, Viewer, ID, Data, PrivacyPolicy, Context, WriteOperation } from "../core/base";
 import { DataOperation, AssocEdgeInputOptions } from "../core/ent";
 import { Queryer } from "../core/db";
 import { TransformedUpdateOperation, UpdateOperation } from "../schema";
-export declare enum WriteOperation {
-    Insert = "insert",
-    Edit = "edit",
-    Delete = "delete"
-}
+import { FieldInfoMap } from "../schema/schema";
+export { WriteOperation };
 declare type MaybeNull<T extends Ent> = T | null;
 declare type TMaybleNullableEnt<T extends Ent> = T | MaybeNull<T>;
+interface BuilderOrchestrator {
+    __getOptions(): {
+        fieldInfo: FieldInfoMap;
+    };
+}
 export interface Builder<TEnt extends Ent<TViewer>, TViewer extends Viewer = Viewer, TExistingEnt extends TMaybleNullableEnt<TEnt> = MaybeNull<TEnt>> {
     existingEnt: TExistingEnt;
     ent: EntConstructor<TEnt, TViewer>;
@@ -18,6 +20,8 @@ export interface Builder<TEnt extends Ent<TViewer>, TViewer extends Viewer = Vie
     operation: WriteOperation;
     editedEnt?(): Promise<TEnt | null>;
     nodeType: string;
+    getInput(): Data;
+    orchestrator: BuilderOrchestrator;
 }
 export interface Executor extends Iterable<DataOperation>, Iterator<DataOperation> {
     placeholderID: ID;
@@ -66,4 +70,3 @@ interface Orchestrator {
     viewer: Viewer;
 }
 export declare function setEdgeTypeInGroup<T extends string>(orchestrator: Orchestrator, inputEnumValue: string, id1: ID, id2: ID, nodeType: string, m: Map<T, string>): Promise<void>;
-export {};

package/action/action.js

@@ -1,14 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setEdgeTypeInGroup = exports.saveBuilderX = exports.saveBuilder = exports.WriteOperation = void 0;
+const base_1 = require("../core/base");
+Object.defineProperty(exports, "WriteOperation", { enumerable: true, get: function () { return base_1.WriteOperation; } });
 const ent_1 = require("../core/ent");
 const logger_1 = require("../core/logger");
-var WriteOperation;
-(function (WriteOperation) {
-    WriteOperation["Insert"] = "insert";
-    WriteOperation["Edit"] = "edit";
-    WriteOperation["Delete"] = "delete";
-})(WriteOperation = exports.WriteOperation || (exports.WriteOperation = {}));
 async function saveBuilder(builder) {
     await saveBuilderImpl(builder, false);
 }

package/action/orchestrator.d.ts

@@ -49,6 +49,7 @@ export declare class Orchestrator<TEnt extends Ent<TViewer>, TInput extends Data
     private disableTransformations;
     private memoizedGetFields;
     constructor(options: OrchestratorOptions<TEnt, TInput, TViewer, TExistingEnt>);
+    __getOptions(): OrchestratorOptions<any, any, any, any>;
     private addEdge;
     setDisableTransformations(val: boolean): void;
     addInboundEdge<T2 extends Ent>(id1: ID | Builder<T2, any>, edgeType: string, nodeType: string, options?: AssocEdgeInputOptions): void;

package/action/orchestrator.js

@@ -88,6 +88,10 @@ class Orchestrator {
         this.existingEnt = this.options.builder.existingEnt;
         this.memoizedGetFields = (0, memoizee_1.default)(this.getFieldsInfo.bind(this));
     }
+    // don't type this because we don't care
+    __getOptions() {
+        return this.options;
+    }
     addEdge(edge, op) {
         this.edgeSet.add(edge.edgeType);
         let m1 = this.edges.get(edge.edgeType) || new Map();
@@ -607,8 +611,12 @@ class Orchestrator {
         // build up data to be saved...
         let data = {};
         let logValues = {};
+        let needsFullDataChecks = [];
         for (const [fieldName, field] of schemaFields) {
             let value = editedFields.get(fieldName);
+            if (field.validateWithFullData) {
+                needsFullDataChecks.push(fieldName);
+            }
             if (value === undefined && op === action_1.WriteOperation.Insert) {
                 // null allowed
                 value = this.defaultFieldsByFieldName[fieldName];
@@ -626,6 +634,21 @@ class Orchestrator {
                 logValues[dbKey] = field.logValue(value);
             }
         }
+        for (const fieldName of needsFullDataChecks) {
+            const field = schemaFields.get(fieldName);
+            let value = editedFields.get(fieldName);
+            // @ts-ignore...
+            // type hackery because it's hard
+            const v = await field.validateWithFullData(value, this.options.builder);
+            if (!v) {
+                if (value === undefined) {
+                    errors.push(new Error(`field ${fieldName} set to undefined when it can't be nullable`));
+                }
+                else {
+                    errors.push(new Error(`field ${fieldName} set to null when it can't be nullable`));
+                }
+            }
+        }
         //  we ignored default values while editing.
         // if we're editing and there's data, add default values
         if (op === action_1.WriteOperation.Edit && this.hasData(data)) {

package/core/base.d.ts

@@ -143,4 +143,9 @@ export interface PrivacyPolicyRule<TEnt extends Ent = Ent, TViewer = Viewer> {
 export interface PrivacyPolicy<TEnt extends Ent = Ent, TViewer = Viewer> {
     rules: PrivacyPolicyRule<TEnt, TViewer>[];
 }
+export declare enum WriteOperation {
+    Insert = "insert",
+    Edit = "edit",
+    Delete = "delete"
+}
 export {};

package/core/base.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DenyWithReason = exports.Deny = exports.Skip = exports.Allow = void 0;
+exports.WriteOperation = exports.DenyWithReason = exports.Deny = exports.Skip = exports.Allow = void 0;
 // Privacy
 var privacyResult;
 (function (privacyResult) {
@@ -53,3 +53,9 @@ function DenyWithReason(e) {
     };
 }
 exports.DenyWithReason = DenyWithReason;
+var WriteOperation;
+(function (WriteOperation) {
+    WriteOperation["Insert"] = "insert";
+    WriteOperation["Edit"] = "edit";
+    WriteOperation["Delete"] = "delete";
+})(WriteOperation = exports.WriteOperation || (exports.WriteOperation = {}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@snowtop/ent",
-  "version": "0.1.0-alpha80",
+  "version": "0.1.0-alpha85",
   "description": "snowtop ent framework",
   "main": "index.js",
   "types": "index.d.ts",

package/schema/field.d.ts

@@ -131,8 +131,6 @@ export interface EnumOptions extends FieldOptions {
     graphQLType?: string;
     createEnumType?: boolean;
 }
-export interface StringEnumOptions extends EnumOptions {
-}
 /**
  * @deprecated Use StringEnumField
  */
@@ -147,6 +145,11 @@ export declare class EnumField extends BaseField implements Field {
 }
 export declare class StringEnumField extends EnumField {
 }
+export interface PolymorphicStringEnumOptions extends EnumOptions {
+    parentFieldToValidate: string;
+}
+export interface StringEnumOptions extends EnumOptions {
+}
 export declare function EnumType(options: StringEnumOptions): EnumField;
 declare type IntEnumMap = {
     [key: string]: number;
@@ -165,11 +168,15 @@ export declare class IntegerEnumField extends BaseField implements Field {
     format(val: any): any;
 }
 export declare function IntegerEnumType(options: IntegerEnumOptions): IntegerEnumField;
+interface ListOptions extends FieldOptions {
+    disableJSONStringify?: boolean;
+}
 export declare class ListField extends BaseField {
     private field;
+    private options?;
     type: Type;
     private validators;
-    constructor(field: Field, options?: FieldOptions);
+    constructor(field: Field, options?: ListOptions | undefined);
     __getElemField(): Field;
     validate(validator: (val: any[]) => boolean): this;
     valid(val: any): Promise<boolean>;

package/schema/field.js

@@ -22,10 +22,11 @@ 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;
 const luxon_1 = require("luxon");
 const snake_case_1 = require("snake-case");
-const db_1 = __importStar(require("../core/db"));
-const schema_1 = require("./schema");
 const util_1 = require("util");
 const uuid_1 = require("uuid");
+const base_1 = require("../core/base");
+const db_1 = __importStar(require("../core/db"));
+const schema_1 = require("./schema");
 class BaseField {
     logValue(val) {
         if (this.sensitive) {
@@ -68,21 +69,22 @@ class UUIDField extends BaseField {
             if (typeof polymorphic === "object" && polymorphic.types) {
                 // an enum with types validated here
                 return {
-                    [name]: EnumType({
+                    [name]: PolymorphicStringEnumType({
                         values: polymorphic.types,
                         hideFromGraphQL: true,
                         derivedWhenEmbedded: true,
                         nullable: this.options?.nullable,
+                        parentFieldToValidate: fieldName,
                     }),
                 };
             }
             else {
-                // just a string field...
                 return {
-                    [name]: StringType({
+                    [name]: PolymorphicStringType({
                         hideFromGraphQL: true,
                         derivedWhenEmbedded: true,
                         nullable: this.options?.nullable,
+                        parentFieldToValidate: fieldName,
                     }),
                 };
             }
@@ -311,6 +313,33 @@ 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;
+    }
+    validateWithFullData(val, b) {
+        return validatePolymorphicTypeWithFullData(val, b, this.opts.parentFieldToValidate);
+    }
+}
+function PolymorphicStringType(opts) {
+    let result = new PolymorphicStringField(opts);
+    return Object.assign(result, opts);
+}
 function StringType(options) {
     let result = new StringField(options);
     const options2 = { ...options };
@@ -556,6 +585,19 @@ 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);
@@ -608,6 +650,7 @@ class ListField extends BaseField {
     constructor(field, options) {
         super();
         this.field = field;
+        this.options = options;
         this.validators = [];
         if (field.type.dbType === schema_1.DBType.List) {
             throw new Error(`nested lists not currently supported`);
@@ -648,11 +691,12 @@ class ListField extends BaseField {
         return result;
     }
     postgresVal(val, jsonType) {
-        if (!jsonType) {
+        if (!jsonType && val === "") {
             // support empty strings in list
-            if (val === "") {
-                val = '"' + val + '"';
-            }
+            val = '"' + val + '"';
+            return val;
+        }
+        if (this.options?.disableJSONStringify) {
             return val;
         }
         return JSON.stringify(val);
@@ -789,6 +833,9 @@ function IntegerEnumListType(options) {
 }
 exports.IntegerEnumListType = IntegerEnumListType;
 function UUIDListType(options) {
-    return new ListField(UUIDType(options), options);
+    return new ListField(UUIDType(options), {
+        ...options,
+        disableJSONStringify: true,
+    });
 }
 exports.UUIDListType = UUIDListType;

package/schema/schema.d.ts

@@ -217,6 +217,7 @@ export interface PolymorphicOptions {
 export interface Field extends FieldOptions {
     type: Type;
     valid?(val: any): Promise<boolean> | boolean;
+    validateWithFullData?(val: any, builder: Builder<any>): boolean | Promise<boolean>;
     format?(val: any, nested?: boolean): any;
     logValue(val: any): any;
 }

package/schema/struct_field.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StructTypeAsList = exports.StructListType = exports.StructType = exports.StructField = void 0;
+const camel_case_1 = require("camel-case");
 const field_1 = require("./field");
 const schema_1 = require("./schema");
-const camel_case_1 = require("camel-case");
 class StructField extends field_1.BaseField {
     constructor(options) {
         super();

package/scripts/custom_graphql.js

@@ -26,10 +26,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const glob_1 = __importDefault(require("glob"));
 const json5_1 = __importDefault(require("json5"));
 const minimist_1 = __importDefault(require("minimist"));
-const graphql_1 = require("../graphql/graphql");
-const readline = __importStar(require("readline"));
 const path = __importStar(require("path"));
 const fs = __importStar(require("fs"));
+const graphql_1 = require("../graphql/graphql");
+const readline = __importStar(require("readline"));
 const imports_1 = require("../imports");
 const process_1 = require("process");
 // need to use the GQLCapture from the package so that when we call GQLCapture.enable()

package/scripts/migrate_v0.1.js

@@ -3,12 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const minimist_1 = __importDefault(require("minimist"));
 const transform_1 = require("../tsc/transform");
 const transform_schema_1 = require("../tsc/transform_schema");
 const transform_ent_1 = require("../tsc/transform_ent");
 const move_generated_1 = require("../tsc/move_generated");
 const transform_action_1 = require("../tsc/transform_action");
-const minimist_1 = __importDefault(require("minimist"));
 const ast_1 = require("../tsc/ast");
 // todo-sqlite
 //  ts-node-script --swc --project ./tsconfig.json -r tsconfig-paths/register ../../ts/src/scripts/migrate_v0.1.ts --transform_schema --old_base_class BaseEntTodoSchema --new_schema_class TodoEntSchema  --transform_path src/schema/patterns/base

package/testutils/builder.js

@@ -137,7 +137,8 @@ function getFieldInfo(value) {
     for (const [k, f] of fields) {
         ret[k] = {
             dbCol: (0, schema_2.getStorageKey)(f, k),
-            inputKey: (0, camel_case_1.camelCase)(k),
+            // in tests (anything using SimpleBuilder), make it be the same as the fieldName
+            inputKey: k,
         };
     }
     return ret;