@coderich/autograph 0.10.19 → 0.10.21

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@coderich/autograph",
   "author": "Richard Livolsi (coderich)",
-  "version": "0.10.19",
+  "version": "0.10.21",
   "description": "AutoGraph",
   "keywords": [
     "graphql",

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.badRequest(`${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.badRequest(`${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.badRequest(`${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.badRequest(`${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.badRequest(`${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/Query.js

@@ -1,5 +1,3 @@
-const Boom = require('../core/Boom');
-
 module.exports = class Query {
   constructor(props = {}) {
     this.props = {};
@@ -21,7 +19,7 @@ module.exports = class Query {
 
   propCheck(prop, ...checks) {
     checks.forEach((check) => {
-      if (this.props[check]) throw Boom.badRequest(`Cannot use "${prop}" while using "${check}"`);
+      if (this.props[check]) throw new Error(`Cannot use "${prop}" while using "${check}"`);
     });
   }
 
@@ -98,7 +96,7 @@ module.exports = class Query {
 
   skip(skip) {
     this.propCheck('skip', 'id');
-    if (this.isCursorPaging) throw Boom.badRequest('Cannot use "skip" while using Cursor-Style Pagination');
+    if (this.isCursorPaging) throw new Error('Cannot use "skip" while using Cursor-Style Pagination');
     this.isClassicPaging = true;
     this.props.skip = skip;
     return this;
@@ -106,7 +104,7 @@ module.exports = class Query {
 
   limit(limit) {
     this.propCheck('limit', 'id');
-    if (this.isCursorPaging) throw Boom.badRequest('Cannot use "limit" while using Cursor-Style Pagination');
+    if (this.isCursorPaging) throw new Error('Cannot use "limit" while using Cursor-Style Pagination');
     this.isClassicPaging = true;
     this.props.limit = limit;
     return this;
@@ -114,7 +112,7 @@ module.exports = class Query {
 
   first(first) {
     this.propCheck('first', 'id', 'last');
-    if (this.isClassicPaging) throw Boom.badRequest('Cannot use "first" while using Classic-Style Pagination');
+    if (this.isClassicPaging) throw new Error('Cannot use "first" while using Classic-Style Pagination');
     this.isCursorPaging = true;
     this.props.first = first + 2; // Adding 2 for pagination meta info (hasNext hasPrev)
     return this;
@@ -122,7 +120,7 @@ module.exports = class Query {
 
   last(last) {
     this.propCheck('last', 'id', 'first');
-    if (this.isClassicPaging) throw Boom.badRequest('Cannot use "last" while using Classic-Style Pagination');
+    if (this.isClassicPaging) throw new Error('Cannot use "last" while using Classic-Style Pagination');
     this.isCursorPaging = true;
     this.props.last = last + 2; // Adding 2 for pagination meta info (hasNext hasPrev)
     return this;
@@ -130,7 +128,7 @@ module.exports = class Query {
 
   before(before) {
     this.propCheck('before', 'id');
-    if (this.isClassicPaging) throw Boom.badRequest('Cannot use "before" while using Classic-Style Pagination');
+    if (this.isClassicPaging) throw new Error('Cannot use "before" while using Classic-Style Pagination');
     this.isCursorPaging = true;
     this.props.before = before;
     return this;
@@ -138,7 +136,7 @@ module.exports = class Query {
 
   after(after) {
     this.propCheck('after', 'id');
-    if (this.isClassicPaging) throw Boom.badRequest('Cannot use "after" while using Classic-Style Pagination');
+    if (this.isClassicPaging) throw new Error('Cannot use "after" while using Classic-Style Pagination');
     this.isCursorPaging = true;
     this.props.after = after;
     return this;

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) || [];