@coderich/autograph 0.13.101 → 0.13.103

package/package.json

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

package/src/data/Resolver.js

@@ -47,6 +47,7 @@ module.exports = class Resolver {
   clone() {
     return new Resolver({
       schema: this.#schema,
+      xschema: this.#xschema,
       context: this.#context,
     });
   }
@@ -141,11 +142,10 @@ module.exports = class Resolver {
    * @returns {*} - The promise resolution
    */
   run(promise) {
-    return promise.then((results) => {
-      return this.commit().then(() => results);
-    }).catch((e) => {
-      return this.rollback().then(() => Promise.reject(e));
-    });
+    return this.commit().then(() => promise);
+    // return this.commit().then(() => promise).catch((e) => {
+    //   return this.rollback().then(() => Promise.reject(e));
+    // });
   }
 
   /**
@@ -231,6 +231,8 @@ module.exports = class Resolver {
       return thunk(tquery).then((result) => {
         if (flags?.required && (result == null || result?.length === 0)) throw Boom.notFound(`${model} Not Found`);
         return result;
+      }).finally(() => {
+        query.resolve();
       });
     });
   }
@@ -306,7 +308,7 @@ module.exports = class Resolver {
     const type = query.isMutation ? 'Mutation' : 'Query';
     const event = this.#createEvent(query);
 
-    return Emitter.emit(`pre${type}`, event).then(async (resultEarly) => {
+    const promise = 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;
 
@@ -317,7 +319,9 @@ module.exports = class Resolver {
       }
 
       return thunk(tquery);
-    }).then((result) => {
+    });
+
+    promise.then((result) => {
       event.result = result; // backwards compat
       query.result = result;
       return Emitter.emit(`post${type}`, event);
@@ -326,6 +330,8 @@ module.exports = class Resolver {
       // const { data = {} } = e;
       // throw Boom.boomify(e, { data: { ...event, ...data } });
     });
+
+    return promise;
   }
 
   #createEvent(query) {

package/src/data/Transaction.js

@@ -45,7 +45,7 @@ module.exports = class Transaction {
   }
 
   #close(op) {
-    return Promise.all(this.#queries.map(q => q.promise())).then(() => {
+    return Promise.all(this.#queries.map(q => q.promise())).finally(() => {
       return Promise.all(Array.from(this.#sourceMap.entries()).map(([client, promise]) => {
         return promise.then(transaction => transaction[op]());
       }));

package/src/query/Query.js

@@ -1,5 +1,5 @@
 const Util = require('@coderich/util');
-const { isGlob, globToRegex, mergeDeep, JSONParse } = require('../service/AppService');
+const { isGlob, globToRegex, mergeDeep, JSONParse, withResolvers } = require('../service/AppService');
 
 module.exports = class Query {
   #config;
@@ -8,20 +8,30 @@ module.exports = class Query {
   #schema;
   #model;
   #query;
+  #resolution;
 
   constructor(config) {
-    const { schema, context, resolver, query } = config;
+    const { schema, context, resolver, query, resolution = withResolvers() } = config;
     this.#config = config;
     this.#resolver = resolver;
     this.#context = context;
     this.#schema = schema;
     this.#model = schema.models[query.model];
     this.#query = query;
+    this.#resolution = resolution;
+  }
+
+  promise() {
+    return this.#resolution.promise;
+  }
+
+  resolve() {
+    this.#resolution.resolve();
   }
 
   clone(query) {
     query = { ...this.#query, ...query }; // NO deepMerge here; must replace fields entirely
-    return new Query({ ...this.#config, query });
+    return new Query({ ...this.#config, query, resolution: this.#resolution });
   }
 
   toObject() {

package/src/query/QueryResolver.js

@@ -26,17 +26,8 @@ module.exports = class QueryResolver extends QueryBuilder {
   }
 
   terminate() {
-    return this.#terminate().then((result) => {
-      this.#resolution.resolve(result);
-      return result;
-    }).catch((e) => {
-      this.#resolution.reject(e);
-      return Promise.reject(e);
-    });
-  }
-
-  #terminate() {
     const query = super.terminate();
+    query.promise().then(this.#resolution.resolve).catch(this.#resolution.reject);
     const { op, args: { input } } = query.toObject();
 
     // Resolve