@coderich/autograph 0.13.57 → 0.13.58

package/package.json

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

package/src/data/Pipeline.js

@@ -74,10 +74,11 @@ module.exports = class Pipeline {
     }, { ignoreNull: false });
 
     Pipeline.define('$fk', (params) => {
-      const { fkField, isPrimaryKey } = params.field;
+      const { fkField, linkTo, isPrimaryKey, generator } = 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 }));
+      const $generator = isPrimaryKey ? generator : linkTo.fields[fkField].generator;
+      return Util.map(v, value => $generator({ ...params, value }));
     });
 
     //

package/src/schema/Schema.js

@@ -506,7 +506,8 @@ module.exports = class Schema {
             $field.linkTo = $schema.models[$field.linkTo];
             $field.crud = Util.uvl($field.crud, $field.model?.scope, 'crud');
             $field.linkBy ??= $field.linkTo?.pkField; // This defines join logic (below) for both straight+virtual references
-            $field.fkField ??= $field.model?.pkField; // This is the fkReference field for straight references
+            $field.fkField ??= $field.linkTo?.pkField; // This is the fkReference field for straight references
+            // $field.fkField ??= $field.model?.pkField; // This is the fkReference field for straight references
             $field.linkField = $field.isVirtual ? $model.fields[$model.pkField] : $field;
             $field.isFKReference = $field.fkField && !$field.isPrimaryKey && $field.model?.isMarkedModel && !$field.model?.isEmbedded;
             $field.isEmbedded = Boolean($field.model && !$field.isFKReference && !$field.isPrimaryKey);