@coderich/autograph 0.10.20 → 0.10.22

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@coderich/autograph",
   "author": "Richard Livolsi (coderich)",
-  "version": "0.10.20",
+  "version": "0.10.22",
   "description": "AutoGraph",
   "keywords": [
     "graphql",
@@ -39,7 +39,7 @@
     "graphql-fields": "^2.0.3",
     "lodash": "^4.17.21",
     "mongodb": "4.8.1",
-    "object-hash": "^2.0.1",
+    "object-hash": "^3.0.0",
     "picomatch": "^2.1.1"
   },
   "devDependencies": {

package/src/data/Pipeline.js

@@ -76,12 +76,13 @@ module.exports = class Pipeline {
     Pipeline.define('idField', ({ model, field, value }) => field.getIdModel().idValue(value.id || value));
     Pipeline.define('ensureArrayValue', ({ field, value }) => (field.toObject().isArray && !Array.isArray(value) ? [value] : value), { itemize: false });
 
-    Pipeline.define('ensureId', ({ resolver, field, value }) => {
+    Pipeline.define('ensureId', ({ resolver, model, field, value }) => {
+      const path = `${model}.${field}`;
       const { type } = field.toObject();
       const ids = Array.from(new Set(ensureArray(value).map(v => `${v}`)));
 
       return resolver.match(type).where({ id: ids }).count().then((count) => {
-        if (count !== ids.length) throw Boom.notFound(`${type} Not Found`);
+        if (count !== ids.length) throw Boom.notFound(`${type} Not Found`, { path });
       });
     }, { itemize: false });
 
@@ -124,29 +125,34 @@ module.exports = class Pipeline {
 
     // Required fields
     Pipeline.define('required', ({ model, field, value }) => {
-      if (value == null) throw Boom.badRequest(`${model}.${field} is required`);
+      const path = `${model}.${field}`;
+      if (value == null) throw Boom.badRequest(`${path} is required`, { path });
     }, { ignoreNull: false });
 
     // A field cannot hold a reference to itself
     Pipeline.define('selfless', ({ model, field, parent, parentPath, value }) => {
-      if (`${value}` === `${parentPath('id')}`) throw Boom.badData(`${model}.${field} cannot hold a reference to itself`);
+      const path = `${model}.${field}`;
+      if (`${value}` === `${parentPath('id')}`) throw Boom.badData(`${path} cannot hold a reference to itself`, { path });
     });
 
     // Once set it cannot be changed
     Pipeline.define('immutable', ({ model, field, docPath, parentPath, path, value }) => {
+      const $path = `${model}.${field}`;
       const hint = { id: parentPath('id') };
       const oldVal = docPath(path, hint);
-      if (oldVal !== undefined && value !== undefined && `${hashObject(oldVal)}` !== `${hashObject(value)}`) throw Boom.badData(`${model}.${field} is immutable; cannot be changed once set ${oldVal} -> ${value}`);
+      if (oldVal !== undefined && value !== undefined && `${hashObject(oldVal)}` !== `${hashObject(value)}`) throw Boom.badData(`${$path} is immutable; cannot be changed once set ${oldVal} -> ${value}`, { path: $path });
     });
 
     // List of allowed values
     Pipeline.factory('Allow', (...args) => function allow({ model, field, value }) {
-      if (args.indexOf(value) === -1) throw Boom.badData(`${model}.${field} allows ${args}; found '${value}'`);
+      const path = `${model}.${field}`;
+      if (args.indexOf(value) === -1) throw Boom.badData(`${path} allows ${args}; found '${value}'`, { path });
     });
 
     // List of disallowed values
     Pipeline.factory('Deny', (...args) => function deny({ model, field, value }) {
-      if (args.indexOf(value) > -1) throw Boom.badData(`${model}.${field} denys ${args}; found '${value}'`);
+      const path = `${model}.${field}`;
+      if (args.indexOf(value) > -1) throw Boom.badData(`${path} denys ${args}; found '${value}'`, { path });
     });
 
     // Min/Max range
@@ -155,9 +161,10 @@ module.exports = class Pipeline {
       if (max == null) max = undefined;
 
       return function range({ model, field, value }) {
+        const path = `${model}.${field}`;
         const num = +value; // Coerce to number if possible
         const test = Number.isNaN(num) ? value.length : num;
-        if (test < min || test > max) throw Boom.badData(`${model}.${field} must satisfy range ${min}:${max}; found '${value}'`);
+        if (test < min || test > max) throw Boom.badData(`${path} must satisfy range ${min}:${max}; found '${value}'`, { path });
       };
     }, { itemize: false });
   }

package/src/query/QueryResolver.js

@@ -186,7 +186,8 @@ module.exports = class QueryResolver {
     // Can only splice arrays
     const field = model.getField(key);
     const isArray = field.isArray();
-    if (!isArray) throw Boom.badRequest(`Cannot splice field '${model}.${field}'`);
+    const path = `${model}.${field}`;
+    if (!isArray) throw Boom.badRequest(`Cannot splice field '${path}'`, { path });
 
     return this.resolver.match(model).match(match).one({ required: true }).then(async (doc) => {
       const array = get(doc, key) || [];