@coderich/autograph 0.13.27 → 0.13.29

package/package.json

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

package/src/data/Resolver.js

@@ -286,22 +286,17 @@ module.exports = class Resolver {
   }
 
   #createSystemEvent($query, thunk = () => {}) {
-    const query = $query.toObject();
+    let query = $query.toObject();
     const type = query.isMutation ? 'Mutation' : 'Query';
-    const event = { schema: this.#schema, context: this.#context, resolver: this, query };
-
-    // Backwards compat
-    Object.assign(event, query);
-    query.match = query.where;
-    query.toObject = () => query;
-    event.merged = event.input;
-    event.input = event.args?.input;
+    let event = this.#createEvent(query);
 
     return Emitter.emit(`pre${type}`, event).then(async (resultEarly) => {
       if (resultEarly !== undefined) return resultEarly; // Nothing to validate/transform
       // if (query.crud === 'update' && Util.isEqual({ added: {}, updated: {}, deleted: {} }, Util.changeset(query.doc, query.input))) return query.doc;
-      const tquery = await $query.transform();
-      // await Emitter.emit('validate', event); // We need to re-connect tquery to event
+      const tquery = await $query.transform(false);
+      query = tquery.toObject();
+      event = this.#createEvent(query)
+      if (query.isMutation) await Emitter.emit('validate', event);
       return thunk(tquery);
     }).then((result) => {
       event.doc ??= result; // Case of create
@@ -314,6 +309,19 @@ module.exports = class Resolver {
     });
   }
 
+  #createEvent(query) {
+    const event = { schema: this.#schema, context: this.#context, resolver: this, query };
+
+    // Backwards compat
+    Object.assign(event, query);
+    query.match = query.where;
+    query.toObject = () => query;
+    event.merged = event.input;
+    event.input = event.args?.input;
+
+    return event;
+  }
+
   static $loader(name, resolver, config) {
     if (!name) return loaders;
     if (!resolver) return loaders[name];

package/src/query/Query.js

@@ -62,12 +62,18 @@ module.exports = class Query {
   /**
    * Transform entire query via pipeline. At minimum, pipeline is needed to unflatten the data...
    */
-  transform() {
+  transform(asClone = true) {
     return Promise.all([
       this.pipeline('input', this.#query.input),
       this.#query.isNative ? this.#query.where : this.pipeline('where', this.#query.where ?? {}),
       this.pipeline('sort', this.#query.sort),
-    ]).then(([input, where, sort]) => this.clone({ input, where, sort }));
+    ]).then(([input, where, sort]) => {
+      if (asClone) return this.clone({ input, where, sort });
+      this.#query.input = input;
+      this.#query.where = where;
+      this.#query.sort = sort;
+      return this;
+    });
   }
 
   /**