@coderich/autograph 0.13.99 → 0.13.101

package/package.json

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

package/src/data/Resolver.js

@@ -72,7 +72,7 @@ module.exports = class Resolver {
    * @returns {QueryResolver|QueryResolverTransaction} - An API to build and execute a query
    */
   match(model) {
-    return this.#sessions.slice(-1).pop()?.slice(-1).pop()?.match(model) ?? new QueryResolver({
+    return this.#sessions.at(-1)?.at(-1)?.match(model) ?? new QueryResolver({
       resolver: this,
       schema: this.#schema,
       context: this.#context,
@@ -104,8 +104,8 @@ module.exports = class Resolver {
   transaction(isolated = true, parent = this) {
     if (isolated) return this.clone().transaction(false, parent);
 
-    const currSession = this.#sessions.slice(-1).pop();
-    const currTransaction = currSession?.slice(-1).pop();
+    const currSession = this.#sessions.at(-1);
+    const currTransaction = currSession?.at(-1);
     const realTransaction = new Transaction({ resolver: this, schema: this.#schema, context: this.#context });
     const thunks = currTransaction ? currSession.thunks : []; // If in a transaction, piggy back off session
 
@@ -194,7 +194,7 @@ module.exports = class Resolver {
   async resolve(query) {
     let thunk;
     const { doc, model, crud, isMutation, flags } = query.toObject();
-    const currSession = this.#sessions.slice(-1).pop();
+    const currSession = this.#sessions.at(-1);
 
     if (isMutation) {
       thunk = tquery => this.#schema.models[model].source.client.resolve(tquery.toDriver().toObject()).then((results) => {
@@ -336,7 +336,7 @@ module.exports = class Resolver {
     query.match = event.args.where;
     query.toObject = () => query;
     event.merged = event.input;
-    event.input = event.args?.input;
+    event.input = Util.unflatten(event.args?.input, { safe: true });
     event.doc ??= {};
 
     return event;

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())).then(() => {
+      return Promise.all(Array.from(this.#sourceMap.entries()).map(([client, promise]) => {
+        return promise.then(transaction => transaction[op]());
+      }));
+    });
   }
 };

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,7 +21,21 @@ module.exports = class QueryResolver extends QueryBuilder {
     this.#model = schema.models[query.model];
   }
 
+  promise() {
+    return this.#resolution.promise;
+  }
+
   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();
     const { op, args: { input } } = query.toObject();
 
@@ -101,7 +116,7 @@ module.exports = class QueryResolver extends QueryBuilder {
         });
       }
       default: {
-        throw new Error(`Unknown operation "${op}"`);
+        return Promise.reject(new Error(`Unknown operation "${op}"`));
       }
     }
   }

package/src/schema/Schema.js

@@ -495,7 +495,7 @@ module.exports = class Schema {
 
             Util.traverse(Object.values($model.fields), (f, info) => {
               const path = info.path.concat(f.name);
-              if (f.isEmbedded) return { value: f.model.fields, info: { path } };
+              if (f.isEmbedded) return { value: Object.values(f.model.fields), info: { path } };
               if (f.isScalar) $model.ignorePaths.push(path.join('.'));
               return null;
             }, { path: [] });

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 };
+};