@coderich/autograph 0.13.54 → 0.13.56

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@coderich/autograph",
   "main": "index.js",
-  "version": "0.13.54",
+  "version": "0.13.56",
   "publishConfig": {
     "access": "public"
   },
@@ -15,7 +15,7 @@
     "dev": "coderich-dev"
   },
   "dependencies": {
-    "@coderich/util": "1.0.4",
+    "@coderich/util": "1.0.6",
     "@graphql-tools/merge": "9.0.0",
     "@graphql-tools/resolvers-composition": "7.0.0",
     "@hapi/boom": "10.0.1",

package/src/data/Resolver.js

@@ -306,10 +306,13 @@ module.exports = class Resolver {
       // if (query.crud === 'update' && Util.isEqual({ added: {}, updated: {}, deleted: {} }, Util.changeset(query.doc, query.input))) return query.doc;
       tquery = $query.transform(false);
       query = tquery.toObject();
-      event = this.#createEvent(query);
       if (['create', 'update'].includes(query.crud)) {
-        tquery.validate();
-        await Promise.all([...query.input.$thunks, Emitter.emit('validate', event)]);
+        tquery.validate(); // Transformation sets $thunks
+        await Promise.all([...query.input.$thunks]);
+        event = this.#createEvent(query);
+        await Emitter.emit('validate', event);
+      } else {
+        event = this.#createEvent(query);
       }
       return thunk(tquery);
     }).then((result) => {

package/src/query/Query.js

@@ -48,13 +48,12 @@ module.exports = class Query {
    * Transform entire query for user consumption
    */
   transform(asClone = true) {
+    let { input, where, sort } = this.#query;
     const args = { query: this.#query, resolver: this.#resolver, context: this.#context };
 
-    const [input, where, sort] = [
-      this.#model.transformers[this.#query.crud]?.transform(Util.unflatten(this.#query.input, { safe: true }), args),
-      this.#query.isNative ? this.#query.where : this.#model.transformers.where.transform(Util.unflatten(this.#query.where ?? {}, { safe: true }), args),
-      this.#model.transformers.sort.transform(Util.unflatten(this.#query.sort, { safe: true }), args),
-    ];
+    if (['create', 'update'].includes(this.#query.crud)) input = this.#model.transformers[this.#query.crud]?.transform(Util.unflatten(this.#query.input, { safe: true }), args);
+    if (!this.#query.isNative && ['read', 'update', 'delete'].includes(this.#query.crud)) where = this.#model.transformers.where.transform(Util.unflatten(this.#query.where ?? {}, { safe: true }), args);
+    if (['read'].includes(this.#query.crud)) sort = this.#model.transformers.sort.transform(Util.unflatten(this.#query.sort, { safe: true }), args);
 
     if (asClone) return this.clone({ input, where, sort });
     this.#query.input = input;

package/src/query/QueryResolver.js

@@ -47,7 +47,8 @@ module.exports = class QueryResolver extends QueryBuilder {
         return this.#get(query).then((doc) => {
           const [key] = Object.keys(input);
           const $query = Object.assign(query.toObject(), { doc });
-          const values = get(this.#model.transformers.create.transform(input, { query: $query }), key);
+          const args = { query: $query, resolver: this.#resolver, context: this.#context };
+          const values = get(this.#model.transformers.create.transform(input, args), key);
           const $input = { [key]: (get(doc, key) || []).concat(...values) };
           return this.#resolver.match(this.#model.name).id(doc.id).save($input);
         });
@@ -62,7 +63,8 @@ module.exports = class QueryResolver extends QueryBuilder {
         return this.#get(query).then((doc) => {
           const [key] = Object.keys(input);
           const $query = Object.assign(query.toObject(), { doc });
-          const values = get(this.#model.transformers.create.transform(input, { query: $query }), key, []);
+          const args = { query: $query, resolver: this.#resolver, context: this.#context };
+          const values = get(this.#model.transformers.create.transform(input, args), key, []);
           const $doc = Util.pathmap(key, doc, (arr) => {
             return arr.filter(el => values.every(v => `${v}` !== `${el}`));
           });
@@ -79,7 +81,8 @@ module.exports = class QueryResolver extends QueryBuilder {
         return this.#get(query).then((doc) => {
           const [key] = Object.keys(input);
           const $query = Object.assign(query.toObject(), { doc });
-          const [find, replace] = get(this.#model.transformers.create.transform(input, { query: $query }), key);
+          const args = { query: $query, resolver: this.#resolver, context: this.#context };
+          const [find, replace] = get(this.#model.transformers.create.transform(input, args), key);
           const $input = { [key]: (get(doc, key) || []).map(el => (`${el}` === `${find}` ? replace : el)) };
           return this.#resolver.match(this.#model.name).id(doc.id).save($input);
         });

package/src/schema/Schema.js

@@ -194,7 +194,7 @@ module.exports = class Schema {
         if (node.kind === Kind.NON_NULL_TYPE) {
           target[isList ? 'isArrayRequired' : 'isRequired'] = true;
         } else if (node.kind === Kind.NAMED_TYPE) {
-          target.type = node.name.value;
+          target.type = target.linkTo = node.name.value;
         } else if (node.kind === Kind.LIST_TYPE) {
           target.isArray = true;
           isList = true;
@@ -503,8 +503,8 @@ module.exports = class Schema {
           thunks.unshift(($schema) => {
             $field.parent = $model;
             $field.model = $schema.models[$field.type];
+            $field.linkTo = $schema.models[$field.linkTo];
             $field.crud = Util.uvl($field.crud, $field.model?.scope, 'crud');
-            $field.linkTo ??= $field.model;
             $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;
@@ -537,7 +537,7 @@ module.exports = class Schema {
 
             if ($field.isFKReference) {
               const to = $field.model.key;
-              const on = $field.model.fields[$field.linkBy].key;
+              const on = $field.linkTo.fields[$field.linkBy].key;
               const from = $field.linkField.key;
               const as = `join_${to}`;
               $field.join = { to, on, from, as };