@coderich/autograph 0.13.48 → 0.13.50

package/package.json

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

package/src/data/Emitter.js

@@ -27,8 +27,8 @@ class Emitter extends EventEmitter {
 
       // Next functions are async and control the timing of the next phase
       Promise.all(nextFuncs.sort(Emitter.sort).map((fn) => {
-        return new Promise((next) => {
-          Promise.resolve(fn(data, next));
+        return new Promise((next, err) => {
+          Promise.resolve().then(() => fn(data, next)).catch(err);
         }).then((result) => {
           if (result !== undefined) throw new AbortEarlyError(result);
         }).catch(reject);
@@ -89,7 +89,7 @@ class Emitter extends EventEmitter {
     } : (event, next) => {
       if (arr.includes(`${event.query[prop]}`)) {
         if (once) this.removeListener(eventName, wrapper);
-        return next(listener(event, next));
+        return listener(event, next);
       }
       return next();
     };

package/src/data/Pipeline.js

@@ -117,7 +117,9 @@ module.exports = class Pipeline {
       const ids = Util.filterBy(Util.ensureArray(value), (a, b) => `${a}` === `${b}`);
       if (!ids.length) return undefined;
       return resolver.match(type).flags(query.flags).where({ [fkField]: ids }).count().then((count) => {
-        if (count !== ids.length) throw Boom.notFound(`${type} Not Found`);
+        if (count !== ids.length) {
+          throw Boom.notFound(`${type} Not Found`);
+        }
       });
     }, { itemize: false });
 

package/src/data/Resolver.js

@@ -2,6 +2,7 @@ const { graphql } = require('graphql');
 const Boom = require('@hapi/boom');
 const Util = require('@coderich/util');
 const QueryResolver = require('../query/QueryResolver');
+const AppService = require('../service/AppService');
 const Emitter = require('./Emitter');
 const Loader = require('./Loader');
 const DataLoader = require('./DataLoader');
@@ -225,7 +226,7 @@ module.exports = class Resolver {
 
     return this.#createSystemEvent(query, (tquery) => {
       return thunk(tquery).then((result) => {
-        if (flags?.required && (result == null || result?.length === 0)) throw Boom.notFound();
+        if (flags?.required && (result == null || result?.length === 0)) throw Boom.notFound(`${model} Not Found`);
         return result;
       });
     });
@@ -309,7 +310,6 @@ module.exports = class Resolver {
       if (query.isMutation) await Promise.all([...query.input.$thunks, Emitter.emit('validate', event)]);
       return thunk(tquery);
     }).then((result) => {
-      event.doc ??= result; // Case of create
       event.result = result; // backwards compat
       query.result = result;
       return Emitter.emit(`post${type}`, event);
@@ -328,6 +328,7 @@ module.exports = class Resolver {
     query.toObject = () => query;
     event.merged = event.input;
     event.input = event.args?.input;
+    event.doc ??= {};
 
     return event;
   }

package/src/query/QueryResolver.js

@@ -65,8 +65,10 @@ module.exports = class QueryResolver extends QueryBuilder {
         return this.#get(query).then((doc) => {
           const [key] = Object.keys(input);
           const values = get(this.#model.transformers.input.transform(input), key, []);
-          const $input = { [key]: (get(doc, key) || []).filter(el => values.every(v => `${v}` !== `${el}`)) };
-          return this.#resolver.match(this.#model.name).id(doc.id).save($input);
+          const $doc = Util.pathmap(key, doc, (arr) => {
+            return arr.filter(el => values.every(v => `${v}` !== `${el}`));
+          });
+          return this.#resolver.match(this.#model.name).id(doc.id).save($doc);
         });
       }
       case 'pullMany': {
@@ -110,11 +112,11 @@ module.exports = class QueryResolver extends QueryBuilder {
   }
 
   #resolveReferentialIntegrity(doc) {
-    const { id } = doc;
     const txn = this.#resolver.transaction(false);
 
     return txn.run(Util.promiseChain(this.#model.referentialIntegrity.map(({ model, field, path }) => () => {
-      const { onDelete, isArray } = field;
+      const { onDelete, isArray, fkField } = field;
+      const id = doc[fkField];
       const $path = path.join('.');
       const where = field.isVirtual ? { [field.model.pkField]: get(doc, field.linkBy) } : { [$path]: id };