@coderich/autograph 0.13.103 → 0.13.105

package/package.json

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

package/src/data/Emitter.js

@@ -18,10 +18,14 @@ class Emitter extends EventEmitter {
       return prev[isBasic ? 0 : 1].push(wrapper) && prev;
     }, [[], []]);
 
+    // Basic functions are not designed to be bound to the query execution so we need an isolated resolver from any transactions
+    const resolver = data?.resolver?.clone();
+    const basicData = { ...data, resolver };
+
     return new Promise((resolve, reject) => {
       // Basic functions run first; if they return a value they abort the flow of execution
       basicFuncs.sort(Emitter.sort).forEach((fn) => {
-        const value = fn(data);
+        const value = fn(basicData);
         if (value !== undefined && !(value instanceof Promise)) throw new AbortEarlyError(value);
       });
 

package/src/data/Resolver.js

@@ -142,10 +142,11 @@ module.exports = class Resolver {
    * @returns {*} - The promise resolution
    */
   run(promise) {
-    return this.commit().then(() => promise);
-    // return this.commit().then(() => promise).catch((e) => {
-    //   return this.rollback().then(() => Promise.reject(e));
-    // });
+    return promise.catch((e) => {
+      return this.rollback().then(() => Promise.reject(e));
+    }).then((results) => {
+      return this.commit().then(() => results);
+    });
   }
 
   /**
@@ -308,7 +309,7 @@ module.exports = class Resolver {
     const type = query.isMutation ? 'Mutation' : 'Query';
     const event = this.#createEvent(query);
 
-    const promise = Emitter.emit(`pre${type}`, event).then(async (resultEarly) => {
+    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;
 
@@ -319,9 +320,7 @@ module.exports = class Resolver {
       }
 
       return thunk(tquery);
-    });
-
-    promise.then((result) => {
+    }).then((result) => {
       event.result = result; // backwards compat
       query.result = result;
       return Emitter.emit(`post${type}`, event);
@@ -330,8 +329,6 @@ module.exports = class Resolver {
       // const { data = {} } = e;
       // throw Boom.boomify(e, { data: { ...event, ...data } });
     });
-
-    return promise;
   }
 
   #createEvent(query) {

package/src/data/Transaction.js

@@ -45,10 +45,10 @@ module.exports = class Transaction {
   }
 
   #close(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]());
-      }));
-    });
+    // 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/QueryResolver.js

@@ -36,7 +36,7 @@ module.exports = class QueryResolver extends QueryBuilder {
         return this.#resolver.resolve(query);
       }
       case 'createMany': {
-        return this.#resolver.transaction(false).run(Promise.all(input.map(el => this.#resolver.match(this.#model.name).save(el))));
+        return Promise.all(input.map(el => this.#resolver.match(this.#model.name).save(el)));
       }
       case 'updateOne': {
         return this.#get(query).then((doc) => {
@@ -46,7 +46,7 @@ module.exports = class QueryResolver extends QueryBuilder {
       }
       case 'updateMany': {
         return this.#find(query).then((docs) => {
-          return this.#resolver.transaction(false).run(Promise.all(docs.map(doc => this.#resolver.match(this.#model.name).id(doc.id).save(input))));
+          return Promise.all(docs.map(doc => this.#resolver.match(this.#model.name).id(doc.id).save(input)));
         });
       }
       case 'pushOne': {
@@ -62,7 +62,7 @@ module.exports = class QueryResolver extends QueryBuilder {
       case 'pushMany': {
         const [[key, values]] = Object.entries(input);
         return this.#find(query).then((docs) => {
-          return this.#resolver.transaction(false).run(Promise.all(docs.map(doc => this.#resolver.match(this.#model.name).id(doc.id).push(key, values))));
+          return Promise.all(docs.map(doc => this.#resolver.match(this.#model.name).id(doc.id).push(key, values)));
         });
       }
       case 'pullOne': {
@@ -81,7 +81,7 @@ module.exports = class QueryResolver extends QueryBuilder {
       case 'pullMany': {
         const [[key, values]] = Object.entries(input);
         return this.#find(query).then((docs) => {
-          return this.#resolver.transaction(false).run(Promise.all(docs.map(doc => this.#resolver.match(this.#model.name).id(doc.id).pull(key, values))));
+          return Promise.all(docs.map(doc => this.#resolver.match(this.#model.name).id(doc.id).pull(key, values)));
         });
       }
       case 'spliceOne': {
@@ -103,7 +103,7 @@ module.exports = class QueryResolver extends QueryBuilder {
       }
       case 'deleteMany': {
         return this.#find(query).then((docs) => {
-          return this.#resolver.transaction(false).run(Promise.all(docs.map(doc => this.#resolver.match(this.#model.name).id(doc.id).delete())));
+          return Promise.all(docs.map(doc => this.#resolver.match(this.#model.name).id(doc.id).delete()));
         });
       }
       default: {
@@ -121,9 +121,9 @@ module.exports = class QueryResolver extends QueryBuilder {
   }
 
   #resolveReferentialIntegrity(doc) {
-    const txn = this.#resolver.transaction(false);
+    const txn = this.#resolver;
 
-    return txn.run(Util.promiseChain(this.#model.referentialIntegrity.map(({ model, field, path }) => () => {
+    return Util.promiseChain(this.#model.referentialIntegrity.map(({ model, field, path }) => () => {
       const { onDelete, isArray, fkField } = field;
       const id = doc[fkField];
       const $path = path.join('.');
@@ -136,6 +136,6 @@ module.exports = class QueryResolver extends QueryBuilder {
         case 'defer': return Promise.resolve(); // Used for embedded models (could be improved)
         default: throw new Error(`Unknown onDelete operator: '${onDelete}'`);
       }
-    })));
+    }));
   }
 };