@coderich/autograph 0.10.30 → 0.10.32

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@coderich/autograph",
   "author": "Richard Livolsi (coderich)",
-  "version": "0.10.30",
+  "version": "0.10.32",
   "description": "AutoGraph",
   "keywords": [
     "graphql",
@@ -30,7 +30,7 @@
     "ratchet": "ratchet"
   },
   "dependencies": {
-    "@coderich/util": "0.1.12",
+    "@coderich/util": "0.1.13",
     "@hapi/boom": "^9.1.0",
     "dataloader": "^2.0.0",
     "deepmerge": "^4.2.2",

package/src/query/QueryService.js

@@ -44,6 +44,7 @@ exports.resolveSortBy = (query) => {
   const { model, sort = {} } = query.toObject();
   const shape = model.getShape('create', 'sortBy');
   const $sort = model.shapeObject(shape, sort, query);
+  const deletions = [];
 
   // Because normalize casts the value (sometimes to an array) need special handling
   keyPaths($sort).forEach((path) => {
@@ -55,14 +56,17 @@ exports.resolveSortBy = (query) => {
 
     // If you need to sort by something that's in another FK document
     if (join) {
-      delete $sort[attr];
+      deletions.push(attr); // Keep track of what to delete
       query.joins(Object.assign(join, { as: `_.${field}`, left: true }));
       path = `_.${path}`;
-    } else {
-      set($sort, path, val.toLowerCase() === 'asc' ? 1 : -1);
     }
+
+    set($sort, path, val.toLowerCase() === 'asc' ? 1 : -1);
   });
 
+  // Delete the sorts on the "base" collection because you're sorting by _.path.to.it (above)
+  deletions.forEach(attr => delete $sort[attr]);
+
   return $sort;
 };
 

package/src/service/app.service.js

@@ -40,7 +40,7 @@ exports.isIdValue = value => exports.isScalarValue(value) || value instanceof Ob
 exports.mergeDeep = (...args) => DeepMerge.all(args, { isMergeableObject: obj => (exports.isPlainObject(obj) || Array.isArray(obj)), arrayMerge: smartMerge });
 exports.uniq = arr => [...new Set(arr.map(a => `${a}`))];
 exports.timeout = ms => new Promise(res => setTimeout(res, ms));
-exports.hashObject = obj => ObjectHash(obj, { respectType: false, respectFunctionNames: false, respectFunctionProperties: false, unorderedArrays: true, ignoreUnknown: true, replacer: r => (r instanceof ObjectId ? `${r}` : r) });
+exports.hashObject = obj => ObjectHash(obj, { respectType: false, respectFunctionNames: false, respectFunctionProperties: false, unorderedArrays: true, ignoreUnknown: true, replacer: r => (ObjectId.isValid(r) ? `${r}` : r) });
 exports.globToRegex = (glob, options = {}) => PicoMatch.makeRe(glob, { ...options, expandRange: (a, b) => `(${FillRange(a, b, { toRegex: true })})` });
 exports.globToRegexp = (glob, options = {}) => PicoMatch.toRegex(exports.globToRegex(glob, options));
 exports.toGUID = (model, id) => Buffer.from(`${model},${`${id}`}`).toString('base64');

package/src/service/schema.service.js

@@ -3,53 +3,6 @@
 // https://graphql.org/graphql-js/utilities/
 
 const { uniqWith } = require('lodash');
-const { GraphQLScalarType, GraphQLObjectType, GraphQLInterfaceType, GraphQLUnionType, GraphQLEnumType, GraphQLInputObjectType } = require('graphql');
-
-exports.getSchemaData = (schema) => {
-  const operations = ['Query', 'Mutation', 'Subscription'];
-
-  return Object.entries(schema.getTypeMap()).reduce((prev, [key, value]) => {
-    let type;
-
-    if (value instanceof GraphQLScalarType) {
-      type = 'scalars';
-    } else if (value instanceof GraphQLEnumType) {
-      type = 'enums';
-    } else if (value instanceof GraphQLUnionType) {
-      type = 'unions';
-    } else if (value instanceof GraphQLInterfaceType) {
-      type = 'interfaces';
-    } else if (value instanceof GraphQLInputObjectType) {
-      type = 'inputs';
-    } else if (value instanceof GraphQLObjectType) {
-      if (operations.includes(key)) {
-        type = 'operations';
-      } else {
-        type = 'models';
-      }
-    }
-
-    if (type) {
-      if (!key.startsWith('__')) {
-        prev[type][key] = value;
-      }
-    } else {
-      console.log(`Unknown schema type { ${key}: ${value} }`);
-    }
-
-    return prev;
-  }, {
-    enums: {},
-    models: {},
-    inputs: {},
-    unions: {},
-    scalars: {},
-    operations: {},
-    directives: {},
-    interfaces: {},
-    enumerations: {},
-  });
-};
 
 exports.identifyOnDeletes = (models, parentModel) => {
   return models.reduce((prev, model) => {