@coderich/autograph 0.11.1 → 0.11.3

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@coderich/autograph",
   "author": "Richard Livolsi (coderich)",
-  "version": "0.11.1",
+  "version": "0.11.3",
   "description": "AutoGraph",
   "keywords": [
     "graphql",
@@ -30,15 +30,15 @@
     "ratchet": "ratchet"
   },
   "dependencies": {
-    "@coderich/util": "^0.1.1",
+    "@coderich/util": "1.0.5",
     "@hapi/boom": "^9.1.0",
     "dataloader": "^2.0.0",
     "deepmerge": "^4.2.2",
     "fill-range": "^7.0.1",
-    "glob": "^7.1.6",
+    "glob": "^9.3.5",
     "graphql-fields": "^2.0.3",
     "lodash": "^4.17.21",
-    "mongodb": "4.8.1",
+    "mongodb": "4.17.0",
     "object-hash": "^3.0.0",
     "picomatch": "^2.1.1"
   },
@@ -46,7 +46,7 @@
     "@coderich/ratchet": "^1.5.8",
     "@graphql-tools/schema": "^9.0.1",
     "graphql": "^15.5.0",
-    "mongodb-memory-server": "^8.7.2",
+    "mongodb-memory-server": "8.13.0",
     "validator": "^13.7.0"
   },
   "peerDependencies": {

package/src/data/Model.js

@@ -82,9 +82,9 @@ module.exports = class extends Model {
 
     // Define target mapping
     const targetMap = {
-      doc: [], // Do nothing...
-      // doc: ['defaultValue', 'castValue', 'ensureArrayValue', 'normalizers', 'instructs', ...crudKeys, `$${serdes}rs`, `${serdes}rs`, 'transforms'],
+      doc: ['defaultValue', 'castValue', 'ensureArrayValue', 'normalizers', 'instructs', ...crudKeys, `$${serdes}rs`, `${serdes}rs`, 'transforms'],
       input: ['defaultValue', 'castValue', 'ensureArrayValue', 'normalizers', 'instructs', ...crudKeys, `$${serdes}rs`, `${serdes}rs`, 'transforms'],
+      // input: ['defaultValue', 'castValue', 'ensureArrayValue'],
       where: ['castValue', 'instructs', `$${serdes}rs`],
     };
 

package/src/driver/MongoDriver.js

@@ -29,7 +29,7 @@ module.exports = class MongoDriver {
   query(collection, method, ...args) {
     if (get(args[args.length - 1], 'debug') === true) console.log(collection, method, Util.inspect(args, { depth: null, showHidden: false, colors: true }));
     if (method === 'aggregate') args.splice(2);
-    return this.raw(collection)[method](...args);
+    return this.raw(collection)[method](args[0], args[1]);
   }
 
   resolve(query) {

package/src/graphql/ast/Schema.js

@@ -70,18 +70,14 @@ module.exports = class Schema extends TypeDefApi {
    * Asynchronously load files from a given glob pattern and merge each schema
    */
   mergeSchemaFromFiles(globPattern, options) {
-    return new Promise((resolve, reject) => {
-      Glob(globPattern, options, (err, files) => {
-        if (err) return reject(err);
-
-        return Promise.all(files.map((file) => {
-          return new Promise((res) => {
-            if (file.endsWith('.js')) res(require(file)); // eslint-disable-line global-require,import/no-dynamic-require
-            else res(FS.readFileSync(file, 'utf8'));
-          }).then(schema => this.mergeSchema(schema, options));
-        })).then(() => resolve(this)).catch(e => reject(e));
-      });
-    });
+    return Glob(globPattern, options).then((files) => {
+      return Promise.all(files.map((file) => {
+        return new Promise((res) => {
+          if (file.endsWith('.js')) res(require(file)); // eslint-disable-line global-require,import/no-dynamic-require
+          else res(FS.readFileSync(file, 'utf8'));
+        }).then(schema => this.mergeSchema(schema, options));
+      }));
+    }).then(() => this);
   }
 
   /**

package/src/graphql/extension/api.js

@@ -9,7 +9,7 @@ const interfaceKinds = [Kind.INTERFACE_TYPE_DEFINITION, Kind.INTERFACE_TYPE_EXTE
 
 const getGQLWhereFields = (model) => {
   return model.getFields().filter((field) => {
-    if (!field.hasGQLScope('r')) return false;
+    if (!field.isPersistable() || !field.hasGQLScope('r')) return false;
     const modelRef = field.getModelRef();
     if (modelRef && !modelRef.isEmbedded() && !modelRef.isEntity()) return false;
     return true;

package/src/graphql/extension/framework.js

@@ -27,6 +27,12 @@ module.exports = (schema) => {
         fieldScope: AutoGraphMixed # Dictate how a FIELD may use me
         authz: AutoGraphAuthzEnum # Access level used for authorization (default: private)
         namespace: String # Logical grouping of models that can be globbed (useful for authz)
+
+        # FOR TRANSITION TO NEW VERSION
+        crud: AutoGraphMixed # CRUD API
+        scope: AutoGraphMixed #
+        source: AutoGraphMixed # Data source (default: "default")
+        decorate: AutoGraphMixed # Decorator (default: "default")
       ) on OBJECT | INTERFACE
 
       directive @field(
@@ -53,6 +59,10 @@ module.exports = (schema) => {
         transform: [AutoGraphPipelineEnum!]
         serialize: [AutoGraphPipelineEnum!]
         deserialize: [AutoGraphPipelineEnum!]
+
+        # FOR TRANSITION TO NEW VERSION
+        crud: AutoGraphMixed # CRUD API
+        finalize: [AutoGraphPipelineEnum!]
       ) on FIELD_DEFINITION | INPUT_FIELD_DEFINITION | SCALAR
 
       directive @link(

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) => {

package/CHANGELOG.md

@@ -1,41 +0,0 @@
-# CHANGELOG
-
-## v0.10.x
-- Replaced ResultSet -> POJOs
-  - Removed all $field methods (auto populated)
-  - Removed .toObject()
-  - $model $save remove $delete $lookup $cursor $pageInfo
-- Removed embedded API completely
-- Removed Directives
-  - embedApi -> no replacement
-  - enforce -> use pipeline methods
-  - resolve -> use graphql resolvers
-  - @value -> use @field.instruct directive
-- Removed Model.tform() -> use Model.shapeObject(shape, data)
-- Removed Transformer + Rule -> use Pipeline
-  - Removed many pre-defined rules + transformers
-  - Moved "validator" to dev dependency -> isEmail
-- Added QueryBuilder.resolve() terminal command
-- Exported SchemaDecorator -> Schema
-- Removed embedded schema SystemEvents (internal emitter also removed)
-- Removed spread of arguments in QueryBuilder terminal commands (must pass in array)
-- Mutate "merged" instead of "input"
-- Validate "payload"
-
-## v0.9.x
-- Subscriptions API
-- postMutation no longer mutates "doc" and adds "result"
-- Added onDelete defer option
-
-## v0.8.x
-- Engine 14+
-
-## v0.7.x
-- Complete overhaul of Query to Mongo Driver (pagination, sorting, counts, etc)
-- Removed countModel Queries from the API (now available as `count` property on `Connetion` types)
-- Dropped Neo4J (temporarily)
-
-## v0.6.x
-- Mongo driver no longer checks for `version` directive
-- Models no longer share a Connection type; removing the need to use `... on Model` for GraphQL queries
-- Added `@field(connection: Boolean)` parameter to specifically indicate fields that should return a Connection type