@coderich/autograph 0.13.57 → 0.13.59

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@coderich/autograph",
   "main": "index.js",
-  "version": "0.13.57",
+  "version": "0.13.59",
   "publishConfig": {
     "access": "public"
   },
@@ -10,7 +10,8 @@
     "!__mocks__"
   ],
   "scripts": {
-    "test": "NODE_OPTIONS=\"--stack-trace-limit=1000\" jest --config=jest.config.js",
+    "publish": "APP_ROOT_PATH=$(pwd) npm run dev npmPublish",
+    "test": "NODE_OPTIONS=\"--stack-trace-limit=1000\" jest --config=test/jest.config.js",
     "lint": "eslint --config=.eslintrc ./",
     "dev": "coderich-dev"
   },
@@ -32,13 +33,12 @@
   },
   "devDependencies": {
     "@apollo/server": "4.9.5",
+    "@coderich/autograph-db-tests": "*",
     "@coderich/autograph-mongodb": "0.0.4",
-    "@coderich/dev": "0.2.1",
     "@graphql-tools/schema": "10.0.0",
     "graphql": "16.8.1",
     "mongodb": "5.9.2",
-    "mongodb-memory-server": "8.13.0",
-    "validator": "13.9.0"
+    "mongodb-memory-server": "8.13.0"
   },
   "peerDependencies": {
     "graphql": "*"

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/data/__mocks__/Emitter.js

@@ -0,0 +1,11 @@
+const API = jest.requireActual('../Emitter');
+const { mergeDeep } = require('../../service/AppService');
+
+const { emit } = API;
+
+API.emit = (eventName, data) => {
+  if (API.cloneData) data = { ...data, query: mergeDeep({}, data.query) };
+  return emit.call(API, eventName, data);
+};
+
+module.exports = API;

package/src/data/__mocks__/Pipeline.js

@@ -0,0 +1,32 @@
+/**
+ * We need to export Pipeline as a POJO so jest can spy on it
+ * This is because all the methods are defined using Object.defineProperty
+ */
+const Pipeline = jest.requireActual('../Pipeline');
+const Util = require('@coderich/util');
+
+const API = {};
+
+Pipeline.resolve = (params, pipeline) => {
+  const transformers = params.field.pipelines[pipeline] || [];
+
+  return transformers.reduce((value, t) => {
+    return Util.uvl(API[t]({ ...params, value }), value);
+  }, params.value);
+
+  // return Util.pipeline(transformers.map(t => (value) => {
+  //   return API[t]({ ...params, value });
+  // }), params.value);
+};
+
+Object.getOwnPropertyNames(Pipeline).reduce((prev, key) => {
+  return Object.assign(prev, { [key]: Pipeline[key] });
+}, API);
+
+// For those defined outside of Pipeline.js itself
+API.define = (key, ...args) => {
+  Pipeline.define(key, ...args);
+  API[key] = Pipeline[key];
+};
+
+module.exports = API;

package/src/schema/Schema.js

@@ -19,7 +19,7 @@ const allowedKinds = modelKinds.concat(fieldKinds).concat(Kind.DOCUMENT, Kind.NO
 const pipelines = ['validate', 'construct', 'restruct', 'instruct', 'normalize', 'serialize', 'deserialize'];
 const createPipelines = ['validate', 'construct', 'instruct', 'normalize', 'serialize'];
 const updatePipelines = ['validate', 'restruct', 'instruct', 'normalize', 'serialize'];
-const validatePipelines = ['validate', 'instruct', 'normalize', 'serialize'];
+// const validatePipelines = ['validate', 'instruct', 'normalize', 'serialize'];
 const scalars = ['ID', 'String', 'Float', 'Int', 'Boolean'];
 
 module.exports = class Schema {
@@ -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);