@coderich/autograph 0.13.35 → 0.13.37

package/package.json

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

package/src/data/DataLoader.js

@@ -11,8 +11,8 @@ module.exports = class Loader {
   constructor(model, resolver) {
     this.#model = model;
     this.#resolver = resolver;
-    model.loader.cacheKeyFn ??= (query => hashObject(query.toCacheKey()));
-    this.#loader = new DataLoader(keys => this.#resolve(keys), model.loader);
+    this.#model.loader.cacheKeyFn ??= query => hashObject(query.toCacheKey());
+    this.#loader = new DataLoader(keys => this.#resolve(keys), this.#model.loader);
   }
 
   clearAll() {

package/src/data/Pipeline.js

@@ -78,8 +78,6 @@ module.exports = class Pipeline {
       return Util.map(v, value => params.field.generator({ ...params, value }));
     });
 
-    Pipeline.define('$default', ({ field: { defaultValue }, value }) => (value === undefined ? defaultValue : value), { ignoreNull: false });
-
     //
     Pipeline.define('$cast', ({ field, value }) => {
       const { type, isEmbedded } = field;

package/src/schema/Schema.js

@@ -342,12 +342,6 @@ module.exports = class Schema {
               }, {});
             };
 
-            // Pre-processing
-            $model.pipelineFields = {
-              input: Object.values($model.fields).filter(f => f.defaultValue !== undefined || inputPipelines.some(k => f.pipelines[k].length)).reduce((prev, f) => Object.assign(prev, { [f.name]: undefined }), {}),
-              where: Object.values($model.fields).filter(f => f.pipelines.instruct.length).reduce((prev, f) => Object.assign(prev, { [f.name]: undefined }), {}),
-            };
-
             $model.transformers.toDriver = new Transformer({
               shape: Object.values($model.fields).reduce((prev, curr) => {
                 const rules = [curr.key]; // Rename key
@@ -362,7 +356,6 @@ module.exports = class Schema {
                 const args = { model: $model, field: curr };
 
                 const rules = [
-                  a => Pipeline.$default({ ...a, ...args, path: a.path.concat(curr.name) }),
                   a => Pipeline.$cast({ ...a, ...args, path: a.path.concat(curr.name) }),
                   a => Pipeline.$normalize({ ...a, ...args, path: a.path.concat(curr.name) }),
                   a => Pipeline.$instruct({ ...a, ...args, path: a.path.concat(curr.name) }),
@@ -387,7 +380,11 @@ module.exports = class Schema {
 
                 return Object.assign(prev, { [curr.name]: rules });
               }, {}),
-              defaults: $model.pipelineFields.input,
+              defaults: Object.values($model.fields).reduce((prev, curr) => {
+                if (curr.defaultValue !== undefined) return Object.assign(prev, { [curr.name]: curr.defaultValue });
+                if (inputPipelines.some(el => curr.pipelines[el].length)) return Object.assign(prev, { [curr.name]: undefined });
+                return prev;
+              }, {}),
             });
 
             $model.transformers.where.config({
@@ -411,7 +408,10 @@ module.exports = class Schema {
 
                 return Object.assign(prev, { [curr.name]: rules });
               }, {}),
-              defaults: $model.pipelineFields.where,
+              defaults: Object.values($model.fields).reduce((prev, curr) => {
+                if (curr.pipelines.instruct.length) return Object.assign(prev, { [curr.name]: undefined });
+                return prev;
+              }, {}),
             });
 
             $model.transformers.sort = $model.transformers.where.clone({ defaults: {} });
@@ -423,6 +423,10 @@ module.exports = class Schema {
                 if (curr.isEmbedded) rules.unshift(({ value }) => Util.map(value, v => curr.model.transformers.doc.transform(v)));
                 return Object.assign(prev, { [curr.key]: rules });
               }, {}),
+              defaults: Object.values($model.fields).reduce((prev, curr) => {
+                if (curr.defaultValue === undefined) return prev;
+                return Object.assign(prev, { [curr.key]: curr.defaultValue });
+              }, {}),
             });
           });
         } else if (node.kind === Kind.FIELD_DEFINITION) {
@@ -440,7 +444,7 @@ module.exports = class Schema {
             $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.linkField = $field.isVirtual ? $model.fields[$model.pkField] : $field;
-            $field.isFKReference = !$field.isPrimaryKey && $field.model?.isMarkedModel && !$field.model?.isEmbedded;
+            $field.isFKReference = $field.fkField && !$field.isPrimaryKey && $field.model?.isMarkedModel && !$field.model?.isEmbedded;
             $field.isEmbedded = Boolean($field.model && !$field.isFKReference && !$field.isPrimaryKey);
             $field.isScalar = scalars.includes($field.type);
             $field.generator ??= $model.generator;