@coderich/autograph 0.13.39 → 0.13.40

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@coderich/autograph",
   "main": "index.js",
-  "version": "0.13.39",
+  "version": "0.13.40",
   "publishConfig": {
     "access": "public"
   },

package/src/data/Pipeline.js

@@ -73,17 +73,19 @@ module.exports = class Pipeline {
     }, { ignoreNull: false });
 
     Pipeline.define('$fk', (params) => {
-      const { fkField } = params.field;
-      const v = params.value?.[fkField] || params.value;
+      const { fkField, isPrimaryKey } = params.field;
+      const lookupField = isPrimaryKey ? params.field : fkField;
+      const v = params.value?.[lookupField] || params.value;
       return Util.map(v, value => params.field.generator({ ...params, value }));
     });
 
     //
-    Pipeline.define('$cast', ({ field, value }) => {
-      const { type, isEmbedded } = field;
-      if (isEmbedded) return value;
+    Pipeline.define('$cast', (params) => {
+      const { field, value } = params;
 
-      switch (type.toLowerCase()) {
+      if (field.isEmbedded) return value;
+
+      switch (field.type.toLowerCase()) {
         case 'string': {
           return `${value}`;
         }

package/src/data/Resolver.js

@@ -173,7 +173,7 @@ module.exports = class Resolver {
 
     // All transactions bound to this resolver are to be rolled back
     return Util.promiseChain(session.map(transaction => () => {
-      transaction.rollback().catch(e => errors.push(e));
+      return transaction.rollback().catch(e => errors.push(e));
     })).then(() => {
       return errors.length ? Promise.reject(errors) : Promise.all(session.thunks.map(thunk => thunk()));
     });

package/src/schema/Schema.js

@@ -459,7 +459,16 @@ module.exports = class Schema {
             if (scalar) Object.entries(scalar.pipelines).forEach(([key, values]) => $field.pipelines[key].push(...values));
 
             if ($field.isArray) $field.pipelines.normalize.unshift('toArray');
-            if ($field.isPrimaryKey) $field.pipelines.serialize.unshift('$pk'); // Will create/convert to FK type always
+
+            // Will create/convert to ID type always
+            if ($field.isPrimaryKey) {
+              $field.pipelines.construct.unshift('$pk');
+              $field.pipelines.restruct.unshift('$pk');
+            }
+
+            // Will convert to ID type IFF defined in payload
+            if ($field.isFKReference || $field.isPrimaryKey) $field.pipelines.serialize.unshift('$fk');
+
             if ($field.isRequired && $field.isPersistable && !$field.isVirtual) $field.pipelines.validate.push('required');
 
             if ($field.isFKReference) {
@@ -468,7 +477,6 @@ module.exports = class Schema {
               const from = $field.linkField.key;
               const as = `join_${to}`;
               $field.join = { to, on, from, as };
-              $field.pipelines.serialize.unshift('$fk'); // Will convert to FK type IFF defined in payload
               $field.pipelines.validate.push('ensureFK'); // Absolute Last
             }
           });