@coderich/autograph 0.13.100 → 0.13.102

package/package.json

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

package/src/data/Resolver.js

@@ -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();
       });
     });
   }

package/src/data/Transaction.js

@@ -5,6 +5,7 @@ module.exports = class Transaction {
   #context;
   #resolver;
   #sourceMap;
+  #queries = [];
 
   constructor(config) {
     this.#schema = config.schema;
@@ -24,13 +25,15 @@ module.exports = class Transaction {
       }));
     }
 
-    return new QueryResolverTransaction({
+    this.#queries.push(new QueryResolverTransaction({
       resolver: this.#resolver,
       schema: this.#schema,
       context: this.#context,
       transaction: this.#sourceMap.get(client),
       query: { model: `${model}` },
-    });
+    }));
+
+    return this.#queries.at(-1);
   }
 
   commit() {
@@ -42,8 +45,10 @@ module.exports = class Transaction {
   }
 
   #close(op) {
-    return Promise.all(Array.from(this.#sourceMap.entries()).map(([client, promise]) => {
-      return promise.then(transaction => transaction[op]());
-    }));
+    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

@@ -1,7 +1,7 @@
 const get = require('lodash.get');
 const Util = require('@coderich/util');
 const QueryBuilder = require('./QueryBuilder');
-const { mergeDeep } = require('../service/AppService');
+const { mergeDeep, withResolvers } = require('../service/AppService');
 
 module.exports = class QueryResolver extends QueryBuilder {
   #model;
@@ -9,6 +9,7 @@ module.exports = class QueryResolver extends QueryBuilder {
   #config;
   #context;
   #resolver;
+  #resolution = withResolvers(); // Promise for when the query is resolved
 
   constructor(config) {
     const { schema, context, resolver, query } = config;
@@ -20,8 +21,13 @@ module.exports = class QueryResolver extends QueryBuilder {
     this.#model = schema.models[query.model];
   }
 
+  promise() {
+    return this.#resolution.promise;
+  }
+
   terminate() {
     const query = super.terminate();
+    query.promise().then(this.#resolution.resolve).catch(this.#resolution.reject);
     const { op, args: { input } } = query.toObject();
 
     // Resolve
@@ -101,7 +107,7 @@ module.exports = class QueryResolver extends QueryBuilder {
         });
       }
       default: {
-        throw new Error(`Unknown operation "${op}"`);
+        return Promise.reject(new Error(`Unknown operation "${op}"`));
       }
     }
   }

package/src/service/AppService.js

@@ -44,3 +44,9 @@ exports.JSONParse = (mixed) => {
     return undefined;
   }
 };
+
+exports.withResolvers = () => {
+  let resolve, reject;
+  const promise = new Promise((res, rej) => { resolve = res; reject = rej; });
+  return { promise, resolve, reject };
+};