@coderich/autograph 0.13.33 → 0.13.34

package/package.json

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

package/src/data/Pipeline.js

@@ -161,9 +161,9 @@ module.exports = class Pipeline {
   static resolve(params, pipeline) {
     const transformers = params.field.pipelines[pipeline] || [];
 
-    return Util.pipeline(transformers.map(t => (value) => {
-      return Pipeline[t]({ ...params, value });
-    }), params.value);
+    return transformers.reduce((value, t) => {
+      return Util.uvl(Pipeline[t]({ ...params, value }), value);
+    }, params.value);
   }
 };
 

package/src/data/Transformer.js

@@ -1,8 +1,15 @@
 const Util = require('@coderich/util');
 
+// { query, path: path.concat(key), context: this.#context }
+
 module.exports = class Transformer {
-  #config;
-  #operation;
+  #config = {
+    args: {},
+    shape: {},
+    defaults: {},
+    operation: 'set',
+  };
+
   #operations = {
     get: {
       get: () => {
@@ -10,21 +17,25 @@ module.exports = class Transformer {
       },
     },
     set: {
-      set: (target, prop, value) => {
+      set: (target, prop, startValue) => {
         const transforms = this.#config.shape[prop] ?? [];
-        const $value = transforms.reduce((prev, t) => {
-          if (typeof t === 'function') return t(prev);
+
+        const result = transforms.reduce((value, t) => {
+          if (typeof t === 'function') return Util.uvl(t({ startValue, value, ...this.#config.args }), value);
           prop = t;
-          return prev;
-        }, value);
-        target[prop] = $value;
+          return value;
+        }, startValue);
+
+        target[prop] = result;
         return true;
       },
     },
   };
 
+  #operation;
+
   /**
-   * Allowing construction of object before knowing configuration
+   * Allowing construction of object before knowing full configuration
    */
   constructor(config = {}) {
     this.config(config);
@@ -34,14 +45,21 @@ module.exports = class Transformer {
    * Re-assign configuration after instantiation
    */
   config(config = {}) {
-    this.#config = config;
-    this.#config.shape ??= {};
-    this.#config.defaults ??= {};
-    this.#config.operation ??= 'set';
+    Object.assign(this.#config, config);
     this.#operation = this.#operations[this.#config.operation];
+    return this;
+  }
+
+  /**
+   * Re-assign args after instantiation
+   */
+  args(args = {}) {
+    Object.assign(this.#config.args, args);
+    return this;
   }
 
-  transform(mixed) {
+  transform(mixed, args) {
+    this.args(args);
     return Util.map(mixed, data => Object.assign(new Proxy({}, this.#operation), this.#config.defaults, data));
   }
 };

package/src/query/Query.js

@@ -64,6 +64,7 @@ module.exports = class Query {
    */
   transform(asClone = true) {
     return Promise.all([
+      // this.#model.transformers.input.transform(this.#query.input),
       this.pipeline('input', this.#query.input),
       this.#query.isNative ? this.#query.where : this.pipeline('where', this.#query.where ?? {}),
       this.pipeline('sort', this.#query.sort),

package/src/schema/Schema.js

@@ -144,7 +144,10 @@ module.exports = class Schema {
             loader: this.#config.dataLoaders?.default,
             generator: this.#config.generators?.default,
             pipelines: pipelines.reduce((prev, key) => Object.assign(prev, { [key]: [] }), {}),
-            transformers: { doc: new Transformer() },
+            transformers: {
+              input: new Transformer(),
+              doc: new Transformer({ args: { model, schema: this.#schema } }),
+            },
             directives: {},
             toString: () => name,
           };
@@ -155,7 +158,9 @@ module.exports = class Schema {
             name,
             key: name,
             pipelines: pipelines.reduce((prev, key) => Object.assign(prev, { [key]: [] }), {}),
-            transformers: { doc: new Transformer() },
+            transformers: {
+              input: new Transformer({ args: { model, field, schema: this.#schema } }),
+            },
             directives: {},
             toString: () => name,
           };
@@ -345,11 +350,27 @@ module.exports = class Schema {
               where: Object.values($model.fields).filter(f => f.pipelines.instruct.length).reduce((prev, f) => Object.assign(prev, { [f.name]: undefined }), {}),
             };
 
+            $model.transformers.input.config({
+              shape: Object.values($model.fields).reduce((prev, curr) => {
+                const rules = [
+                  a => Pipeline.$default({ ...a, field: curr }),
+                  a => Pipeline.$cast({ ...a, field: curr }),
+                  a => Pipeline.$normalize({ ...a, field: curr }),
+                  a => Pipeline.$instruct({ ...a, field: curr }),
+                  // a => Pipeline.$finalize({ ...a, field: curr }),
+                ];
+                // if (curr.isEmbedded) rules.push(a => Util.map(a.value, value => curr.model.transformers.input.transform(value)));
+                if (curr.isEmbedded) rules.push(a => curr.model.transformers.input.transform(a.value));
+                // rules.push(curr.key); // rename
+                return Object.assign(prev, { [curr.name]: rules });
+              }, {}),
+            });
+
             $model.transformers.doc.config({
               shape: Object.values($model.fields).reduce((prev, curr) => {
                 const rules = [curr.name]; // Rename key
-                if (curr.isArray) rules.unshift(v => (v == null ? v : Util.ensureArray(v)));
-                if (curr.isEmbedded) rules.unshift(v => Util.map(v, el => curr.model.transformers.doc.transform(el)));
+                if (curr.isArray) rules.unshift(({ value }) => (value == null ? value : Util.ensureArray(value)));
+                if (curr.isEmbedded) rules.unshift(({ value }) => Util.map(value, v => curr.model.transformers.doc.transform(v)));
                 return Object.assign(prev, { [curr.key]: rules });
               }, {}),
             });