@snowtop/ent 0.2.14 → 0.2.15

package/action/orchestrator.d.ts

@@ -17,7 +17,7 @@ export interface OrchestratorOptions<TEnt extends Ent<TViewer>, TInput extends D
     action?: Action<TEnt, Builder<TEnt, TViewer>, TViewer, TInput>;
     schema: SchemaInputType;
     editedFields(): Map<string, any> | Promise<Map<string, any>>;
-    updateInput?: (data: TInput, operation?: WriteOperation) => void;
+    updateInput?: (data: TInput, operation?: WriteOperation, defaultKeys?: ReadonlySet<string>) => void;
     expressions?: Map<string, clause.Clause>;
     fieldInfo: FieldInfoMap;
 }

package/action/orchestrator.js

@@ -708,6 +708,8 @@ class Orchestrator {
     async getFieldsWithDefaultValues(builder, schemaFields, editedFields, action) {
         let data = {};
         let defaultData = {};
+        const defaultKeys = new Set();
+        const transformedFields = new Set();
         let input = action?.getInput() || {};
         let updateInput = false;
         // transformations
@@ -760,6 +762,7 @@ class Orchestrator {
                     }
                     data[this.getStorageKey(k)] = dbVal;
                     if (!field.immutable) {
+                        transformedFields.add(k);
                         this.defaultFieldsByTSName[this.getInputKey(k)] = inputVal;
                     }
                     // hmm do we need this?
@@ -797,7 +800,7 @@ class Orchestrator {
             if (value !== undefined) {
                 userDefinedKeys.add(dbKey);
             }
-            if (value === undefined) {
+            if (value === undefined && !transformedFields.has(fieldName)) {
                 if (this.actualOperation === action_1.WriteOperation.Insert) {
                     if (field.defaultToViewerOnCreate && field.defaultValueOnCreate) {
                         throw new Error(`cannot set both defaultToViewerOnCreate and defaultValueOnCreate`);
@@ -836,6 +839,9 @@ class Orchestrator {
                 }
                 this.defaultFieldsByFieldName[fieldName] = defaultValue;
                 this.defaultFieldsByTSName[this.getInputKey(fieldName)] = defaultValue;
+                if (field.disableUserEditable || updateOnlyIfOther) {
+                    defaultKeys.add(this.getInputKey(fieldName));
+                }
             }
         }
         // if there's data changing, add data
@@ -846,7 +852,7 @@ class Orchestrator {
             };
             if (updateInput && this.options.updateInput) {
                 // this basically fixes #605. just needs to be exposed correctly
-                this.options.updateInput(this.defaultFieldsByTSName, this.actualOperation);
+                this.options.updateInput(this.defaultFieldsByTSName, this.actualOperation, defaultKeys);
             }
         }
         return { data, userDefinedKeys };
@@ -941,6 +947,12 @@ class Orchestrator {
         for (const fieldName of needsFullDataChecks) {
             const field = schemaFields.get(fieldName);
             let value = editedFields.get(fieldName);
+            // Deferred defaults are absent from editedFields, but validators must
+            // still receive the value that will be saved when this operation writes.
+            if (value === undefined &&
+                (op === action_1.WriteOperation.Insert || this.hasData(data))) {
+                value = this.defaultFieldsByFieldName[fieldName];
+            }
             // @ts-ignore...
             // type hackery because it's hard
             const v = await field.validateWithFullData(value, this.options.builder);

package/package.json

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

package/schema/base_schema.js

@@ -3,26 +3,31 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseEntSchemaWithTZ = exports.BaseEntSchema = exports.EntSchemaWithTZ = exports.EntSchema = exports.Node = exports.Timestamps = void 0;
 const uuid_1 = require("uuid");
 const field_1 = require("./field");
-let tsFields = {
-    createdAt: (0, field_1.TimestampType)({
-        hideFromGraphQL: true,
-        disableUserEditable: true,
-        defaultValueOnCreate: () => {
-            return new Date();
-        },
-    }),
-    updatedAt: (0, field_1.TimestampType)({
-        hideFromGraphQL: true,
-        disableUserEditable: true,
-        defaultValueOnCreate: () => {
-            return new Date();
-        },
-        onlyUpdateIfOtherFieldsBeingSet_BETA: true,
-        defaultValueOnEdit: () => {
-            return new Date();
-        },
-    }),
-};
+function timestampFields(withTimezone) {
+    return {
+        createdAt: (0, field_1.TimestampType)({
+            withTimezone,
+            hideFromGraphQL: true,
+            disableUserEditable: true,
+            defaultValueOnCreate: () => {
+                return new Date();
+            },
+        }),
+        updatedAt: (0, field_1.TimestampType)({
+            withTimezone,
+            hideFromGraphQL: true,
+            disableUserEditable: true,
+            defaultValueOnCreate: () => {
+                return new Date();
+            },
+            onlyUpdateIfOtherFieldsBeingSet_BETA: true,
+            defaultValueOnEdit: () => {
+                return new Date();
+            },
+        }),
+    };
+}
+let tsFields = timestampFields(false);
 // Timestamps is a Pattern that adds a createdAt and updatedAt timestamp fields to the ent
 exports.Timestamps = {
     name: "timestamps",
@@ -43,25 +48,7 @@ let nodeFields = {
 let nodeFieldsWithTZ = {
     // inconsistent naming :(
     id: nodeField,
-    createdAt: (0, field_1.TimestampType)({
-        hideFromGraphQL: true,
-        disableUserEditable: true,
-        defaultValueOnCreate: () => {
-            return new Date();
-        },
-        withTimezone: true,
-    }),
-    updatedAt: (0, field_1.TimestampType)({
-        hideFromGraphQL: true,
-        disableUserEditable: true,
-        defaultValueOnCreate: () => {
-            return new Date();
-        },
-        defaultValueOnEdit: () => {
-            return new Date();
-        },
-        withTimezone: true,
-    }),
+    ...timestampFields(true),
 };
 // Node is a Pattern that adds 3 fields to the ent: (id, createdAt, and updatedAt timestamps)
 exports.Node = {

package/testutils/builder.d.ts

@@ -81,6 +81,7 @@ export declare class SimpleBuilder<T extends Ent, TExistingEnt extends TMaybleNu
     placeholderID: ID;
     orchestrator: Orchestrator<T, Data, Viewer, TExistingEnt>;
     fields: Map<string, any>;
+    private defaultInput;
     nodeType: string;
     m: Map<string, any>;
     constructor(viewer: Viewer, schema: BuilderSchema<T>, fields: Map<string, any>, operation: WriteOperation | undefined, existingEnt: TExistingEnt, action?: Action<T, SimpleBuilder<T, TExistingEnt>, Viewer, Data, TExistingEnt> | undefined, expressions?: Map<string, Clause>);

package/testutils/builder.js

@@ -191,6 +191,7 @@ class SimpleBuilder {
         this.schema = schema;
         this.operation = operation;
         this.existingEnt = existingEnt;
+        this.defaultInput = new Map();
         this.m = new Map();
         // create dynamic placeholder
         // TODO: do we need to use this as the node when there's an existingEnt
@@ -247,11 +248,18 @@ class SimpleBuilder {
                 // to simulate what we do in generated builders where we return a new Map
                 const m = new Map();
                 for (const [k, v] of this.fields) {
-                    m.set(k, v);
+                    if (!this.defaultInput.has(k) || this.defaultInput.get(k) !== v) {
+                        m.set(k, v);
+                    }
                 }
                 return m;
             },
-            updateInput: this.updateInput.bind(this),
+            updateInput: (input, _operation, defaultKeys) => {
+                this.updateInput(input);
+                for (const key of defaultKeys ?? []) {
+                    this.defaultInput.set(key, input[key]);
+                }
+            },
         });
     }
     getInput() {
@@ -264,6 +272,7 @@ class SimpleBuilder {
     updateInput(input) {
         const knownFields = (0, schema_1.getFields)(this.schema);
         for (const k in input) {
+            this.defaultInput.delete(k);
             if (knownFields.has(k)) {
                 this.fields.set(k, input[k]);
             }