@snowtop/ent 0.1.0-alpha111 → 0.1.0-alpha112

package/action/orchestrator.js

@@ -35,6 +35,7 @@ const executor_1 = require("./executor");
 const logger_1 = require("../core/logger");
 const memoizee_1 = __importDefault(require("memoizee"));
 const clause = __importStar(require("../core/clause"));
+const util_1 = require("util");
 var edgeDirection;
 (function (edgeDirection) {
     edgeDirection[edgeDirection["inboundEdge"] = 0] = "inboundEdge";
@@ -272,12 +273,32 @@ class Orchestrator {
         }
         return new EntCannotDeleteEntError(privacyPolicy, action, this.existingEnt);
     }
-    getEntForPrivacyPolicyImpl(editedData) {
+    async getEntForPrivacyPolicyImpl(schemaFields, editedData) {
         if (this.actualOperation !== action_1.WriteOperation.Insert) {
             return this.existingEnt;
         }
+        // need to format fields if possible because ent constructors expect data that's
+        // in the format that's coming from the db
+        // required for object fields...
+        const formatted = { ...editedData };
+        for (const [fieldName, field] of schemaFields) {
+            if (!field.format) {
+                continue;
+            }
+            let dbKey = this.getStorageKey(fieldName);
+            let val = formatted[dbKey];
+            if (!val) {
+                continue;
+            }
+            // nested so it's not JSON stringified or anything like that
+            val = field.format(formatted[dbKey], true);
+            if (util_1.types.isPromise(val)) {
+                val = await val;
+            }
+            formatted[dbKey] = val;
+        }
         // we create an unsafe ent to be used for privacy policies
-        return new this.options.builder.ent(this.options.builder.viewer, editedData);
+        return new this.options.builder.ent(this.options.builder.viewer, formatted);
     }
     getSQLStatementOperation() {
         switch (this.actualOperation) {
@@ -307,8 +328,8 @@ class Orchestrator {
         if (this.actualOperation !== action_1.WriteOperation.Insert) {
             return this.existingEnt;
         }
-        const { editedData } = await this.memoizedGetFields();
-        return this.getEntForPrivacyPolicyImpl(editedData);
+        const { schemaFields, editedData } = await this.memoizedGetFields();
+        return this.getEntForPrivacyPolicyImpl(schemaFields, editedData);
     }
     // this gets the fields that were explicitly set plus any default or transformed values
     // mainly exists to get default fields e.g. default id to be used in triggers
@@ -359,7 +380,7 @@ class Orchestrator {
         let privacyError = null;
         if (privacyPolicy) {
             try {
-                await (0, privacy_1.applyPrivacyPolicyX)(this.options.viewer, privacyPolicy, this.getEntForPrivacyPolicyImpl(editedData), this.throwError.bind(this));
+                await (0, privacy_1.applyPrivacyPolicyX)(this.options.viewer, privacyPolicy, await this.getEntForPrivacyPolicyImpl(schemaFields, editedData), this.throwError.bind(this));
             }
             catch (err) {
                 privacyError = err;
@@ -536,11 +557,17 @@ class Orchestrator {
                         if (defaultValue === undefined) {
                             throw new Error(`defaultValueOnCreate() returned undefined for field ${fieldName}`);
                         }
+                        if (util_1.types.isPromise(defaultValue)) {
+                            defaultValue = await defaultValue;
+                        }
                     }
                 }
                 if (field.defaultValueOnEdit &&
                     this.actualOperation === action_1.WriteOperation.Edit) {
                     defaultValue = field.defaultValueOnEdit(builder, input);
+                    if (util_1.types.isPromise(defaultValue)) {
+                        defaultValue = await defaultValue;
+                    }
                 }
             }
             if (value !== undefined) {

package/package.json

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