@coderich/autograph 0.13.102 → 0.13.104

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@coderich/autograph",
   "main": "index.js",
-  "version": "0.13.102",
+  "version": "0.13.104",
   "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

@@ -47,6 +47,7 @@ module.exports = class Resolver {
   clone() {
     return new Resolver({
       schema: this.#schema,
+      xschema: this.#xschema,
       context: this.#context,
     });
   }
@@ -141,10 +142,10 @@ module.exports = class Resolver {
    * @returns {*} - The promise resolution
    */
   run(promise) {
-    return promise.then((results) => {
-      return this.commit().then(() => results);
-    }).catch((e) => {
+    return promise.catch((e) => {
       return this.rollback().then(() => Promise.reject(e));
+    }).then((results) => {
+      return this.commit().then(() => results);
     });
   }
 

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]());
+    }));
+    // });
   }
 };