@coderich/autograph 0.10.3 → 0.11.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@coderich/autograph",
   "author": "Richard Livolsi (coderich)",
-  "version": "0.10.3",
+  "version": "0.11.0",
   "description": "AutoGraph",
   "keywords": [
     "graphql",
@@ -23,7 +23,7 @@
   },
   "scripts": {
     "start": "APP_ROOT_PATH=$(pwd) node ./test/server",
-    "test": "APP_ROOT_PATH=$(pwd) ratchet test --forceExit",
+    "test": "APP_ROOT_PATH=$(pwd) ratchet test",
     "test:debug": "APP_ROOT_PATH=$(pwd) node --inspect-brk ./node_modules/jest/bin/jest.js --watch --runInBand --logHeapUsage",
     "lint": "APP_ROOT_PATH=$(pwd) ratchet lint",
     "inspect": "APP_ROOT_PATH=$(pwd) node --expose-gc --inspect=9222 ./src/server",

package/src/core/Schema.js

@@ -37,10 +37,18 @@ module.exports = class extends Schema {
     });
   }
 
+  disconnect() {
+    return Promise.all(Object.values(this.drivers).map(({ dao }) => dao.disconnect()));
+  }
+
   initialize() {
     super.initialize();
     this.models = super.getModels().map(model => new Model(this, model, this.drivers[model.getDriverName()]));
-    this.models.forEach(model => model.initialize());
+    return this;
+  }
+
+  finalize() {
+    super.finalize();
     this.models.forEach(model => model.referentialIntegrity(identifyOnDeletes(this.models, model)));
     return this;
   }

package/src/data/DataLoader.js

@@ -42,8 +42,6 @@ module.exports = class DataLoader extends FBDataLoader {
        */
       const whereShape = model.getShape('create', 'where');
 
-      // console.log(Object.entries(batchQueries).map(([key, value]) => ({ [key]: value.length })));
-
       return Promise.all(Object.entries(batchQueries).map(([key, values]) => {
         switch (key) {
           case defaultBatchName: {
@@ -52,7 +50,7 @@ module.exports = class DataLoader extends FBDataLoader {
           default: {
             const keys = Array.from(new Set(values.map(({ where }) => map(where[key], el => `${el}`)).flat()));
             const batchQuery = new Query({ resolver, model, method: 'findMany', crud: 'read' });
-            const batchWhere = model.shapeObject(whereShape, { [key]: keys }, batchQuery); // This will add back instructs etc
+            const batchWhere = model.shapeObject(whereShape, { ...values[0].where, [key]: keys }, batchQuery); // All where's should be the same - this is for idKey on keys etc
 
             return driver.resolve(batchQuery.where(batchWhere).toDriver()).then(data => handleData(data, model, batchQuery)).then((results) => {
               // One-time data transformation on results to make matching back faster (below)

package/src/data/DataService.js

@@ -11,7 +11,7 @@ exports.finalizeResults = (rs, query) => {
       $remove: { value: (...args) => resolver.match(model).id(doc.id).remove(...args) },
       $delete: { value: (...args) => resolver.match(model).id(doc.id).delete(...args) },
       $lookup: { value: (fieldName, args) => model.getFieldByName(fieldName).resolve(resolver, doc, args) },
-      // $resolve: { value: (fieldName, args) => model.getFieldByName(fieldName).resolve(resolver, doc, args, true) },
+      // $resolve: { value: (fieldName, args) => model.getFieldByName(fieldName).resolve(resolver, doc, args) },
     });
   });
 };

package/src/data/Model.js

@@ -65,7 +65,9 @@ module.exports = class extends Model {
     }).then(rs => finalizeResults(rs, query));
   }
 
-  getShape(crud = 'read', target = 'doc', paths = []) {
+  getShape(crud = 'read', target = 'doc', paths = [], depth = 0) {
+    if (depth++ > 10) return {}; // Prevent infinite circular references
+
     // Cache check
     const cacheKey = `${crud}:${target}`;
     if (this.shapesCache.has(cacheKey)) return this.shapesCache.get(cacheKey);
@@ -73,6 +75,7 @@ module.exports = class extends Model {
     const serdes = crud === 'read' ? 'deserialize' : 'serialize';
     const fields = serdes === 'deserialize' ? this.getSelectFields() : this.getPersistableFields();
     const crudMap = { create: ['constructs'], update: ['restructs'], delete: ['destructs'], remove: ['destructs'] };
+    const sortKeys = ['isIdField', 'isBasicType', 'isEmbedded'];
     const crudKeys = crudMap[crud] || [];
 
     // Define target mapping
@@ -82,10 +85,29 @@ module.exports = class extends Model {
       // input: ['defaultValue', 'castValue', 'ensureArrayValue'],
       where: ['castValue', 'instructs', `$${serdes}rs`],
     };
+
     const structureKeys = targetMap[target] || ['castValue'];
 
-    // Create shape, recursive
-    const shape = fields.map((field) => {
+    // Create sorted shape, recursive
+    const shape = fields.sort((a, b) => {
+      const aObject = a.toObject();
+      const bObject = b.toObject();
+
+      // PK first
+      if (aObject.isPrimaryKeyId) return -1;
+      if (bObject.isPrimaryKeyId) return 1;
+
+      // Arrays last
+      if (aObject.isArray && !bObject.isArray) return 1;
+      if (bObject.isArray && !aObject.isArray) return -1;
+
+      // Now, follow sort keys
+      const aNum = sortKeys.findIndex(key => aObject[key]);
+      const bNum = sortKeys.findIndex(key => bObject[key]);
+      if (aNum < bNum) return -1;
+      if (aNum > bNum) return 1;
+      return 0;
+    }).map((field) => {
       let instructed = false;
       const structures = field.getStructures();
       const { key, name, type, isArray, isEmbedded, modelRef } = field.toObject();
@@ -93,9 +115,8 @@ module.exports = class extends Model {
       const actualTo = target === 'input' || target === 'splice' ? from : to;
       const path = paths.concat(actualTo);
       const subCrud = crud === 'update' && isArray ? 'create' : crud; // Due to limitation to update embedded array
-      const subShape = isEmbedded ? modelRef.getShape(subCrud, target, path) : null;
+      const subShape = isEmbedded ? modelRef.getShape(subCrud, target, path, depth) : null;
       const transformers = structureKeys.reduce((prev, struct) => {
-        if (instructed) return prev;
         const structs = structures[struct];
         if (struct === 'instructs' && structs.length) instructed = true;
         return prev.concat(structs);
@@ -172,7 +193,11 @@ module.exports = class extends Model {
       return Promise.all(shape.map(({ field, from, path, validators, shape: subShape }) => {
         const value = parent[from]; // It hasn't been shaped yet
 
-        return Promise.all(validators.map(v => v({ model, field, path, docPath, rootPath, parentPath, startValue: value, value, resolver, context }))).then(() => {
+        return Promise.all(validators.map((v) => {
+          return new Promise((resolve, reject) => {
+            return Promise.resolve(v({ model, field, path, docPath, rootPath, parentPath, startValue: value, value, resolver, context })).then(resolve).catch(reject);
+          });
+        })).then(() => {
           return subShape ? this.validateObject(subShape, value, query, root, true) : Promise.resolve();
         });
       }));

package/src/driver/MongoDriver.js

@@ -64,15 +64,12 @@ module.exports = class MongoDriver {
   }
 
   createOne({ model, input, options, flags }) {
+    // console.log(JSON.stringify(input, null, 2));
     return this.query(model, 'insertOne', input, options, flags).then(result => Object.assign(input, { id: result.insertedId }));
   }
 
   updateOne({ model, where, $doc, options, flags }) {
-    const $update = Object.entries($doc).reduce((prev, [key, value]) => {
-      Object.assign(prev.$set, { [key]: value });
-      return prev;
-    }, { $set: {} });
-
+    const $update = { $set: $doc };
     return this.query(model, 'updateOne', where, $update, options, flags).then(() => $doc);
   }
 

package/src/graphql/ast/Field.js

@@ -173,7 +173,7 @@ module.exports = class Field extends Node {
     return this.getGQLType();
   }
 
-  initialize() {
+  finalize() {
     this.props = {
       key: this.getKey(),
       name: this.getName(),
@@ -181,11 +181,13 @@ module.exports = class Field extends Node {
       model: this.model,
       datatype: this.getDataType(),
       defaultValue: this.getDefaultValue(),
+      isEnum: this.isEnum(),
       isArray: this.isArray(),
       isScalar: this.isScalar(),
       isVirtual: this.isVirtual(),
       isRequired: this.isRequired(),
       isEmbedded: this.isEmbedded(),
+      isBasicType: this.isBasicType(),
       isIdField: this.isIdField(),
       isPrimaryKeyId: this.isPrimaryKeyId(),
       isPersistable: this.isPersistable(),

package/src/graphql/ast/Model.js

@@ -138,8 +138,8 @@ module.exports = class Model extends Node {
     });
   }
 
-  initialize() {
-    this.fields.forEach(field => field.initialize());
+  finalize() {
+    this.fields.forEach(field => field.finalize());
     return this;
   }
 };

package/src/graphql/ast/Schema.js

@@ -90,7 +90,6 @@ module.exports = class Schema extends TypeDefApi {
    */
   initialize() {
     super.initialize(this.schema.typeDefs);
-    this.getModels().forEach(model => model.initialize());
     return this;
   }
 
@@ -119,8 +118,8 @@ module.exports = class Schema extends TypeDefApi {
       },
     });
 
+    this.getModels().forEach(model => model.finalize());
     this.schema.typeDefs = { kind: Kind.DOCUMENT, definitions };
-    // validateSchema(this.schema);
     return this;
   }
 

package/src/graphql/extension/framework.js

@@ -8,6 +8,7 @@ module.exports = (schema) => {
       scalar AutoGraphMixed
       scalar AutoGraphDriver
       scalar AutoGraphDateTime @field(transform: toDate)
+      enum AutoGraphSchemaEnum { ${schema.getModels().map(m => m.getName()).join(' ')} }
       enum AutoGraphPipelineEnum { ${Object.keys(Pipeline).join(' ')} }
       enum AutoGraphAuthzEnum { private protected public }
       enum AutoGraphOnDeleteEnum { cascade nullify restrict defer }
@@ -16,6 +17,7 @@ module.exports = (schema) => {
       directive @model(
         id: String # Specify db key (default "id")
         key: String # Specify db table/collection name
+        driver: AutoGraphDriver # External data driver
         createdAt: String # Specify db key (default "createdAt")
         updatedAt: String # Specify db key (default "updatedAt")
         meta: AutoGraphMixed # Custom input "meta" field for mutations
@@ -24,7 +26,6 @@ module.exports = (schema) => {
         gqlScope: AutoGraphMixed # Dictate how GraphQL API behaves
         dalScope: AutoGraphMixed # Dictate how the DAL behaves
         fieldScope: AutoGraphMixed # Dictate how a FIELD may use me
-        driver: AutoGraphDriver # External data driver
         authz: AutoGraphAuthzEnum # Access level used for authorization (default: private)
         namespace: String # Logical grouping of models that can be globbed (useful for authz)
       ) on OBJECT | INTERFACE
@@ -45,12 +46,12 @@ module.exports = (schema) => {
 
         # Pipeline Structure
         validate: [AutoGraphPipelineEnum!]
-        instruct: [AutoGraphPipelineEnum!]
+        construct: [AutoGraphPipelineEnum!]
         restruct: [AutoGraphPipelineEnum!]
         destruct: [AutoGraphPipelineEnum!]
-        construct: [AutoGraphPipelineEnum!]
-        transform: [AutoGraphPipelineEnum!]
+        instruct: [AutoGraphPipelineEnum!]
         normalize: [AutoGraphPipelineEnum!]
+        transform: [AutoGraphPipelineEnum!]
         serialize: [AutoGraphPipelineEnum!]
         deserialize: [AutoGraphPipelineEnum!]
       ) on FIELD_DEFINITION | INPUT_FIELD_DEFINITION | SCALAR

package/src/query/QueryBuilder.js

@@ -10,6 +10,7 @@ const { unravelObject } = require('../service/app.service');
 */
 module.exports = class QueryBuilder {
   constructor(resolver, model) {
+    this.terminated = false; // Prevent accidental re-use of the QueryBuilder
     this.query = new Query({ model, resolver });
 
     // Chainable commands
@@ -27,7 +28,7 @@ module.exports = class QueryBuilder {
     this.after = (cursor) => { this.query.after(cursor); return this; };
     this.meta = (meta) => { this.query.meta(meta); return this; };
     this.flags = (flags) => { this.query.flags(flags); return this; };
-    this.merge = (merge) => { this.query.merge(merge); return this; };
+    this.merge = (merge) => { this.query.merge(unravelObject(merge)); return this; };
     this.batch = (batch) => { this.query.batch(batch); return this; };
     this.transaction = (txn) => { this.query.transaction(txn); return this; };
 
@@ -57,6 +58,10 @@ module.exports = class QueryBuilder {
   }
 
   execute(cmd, args) {
+    // Do not allow re-use
+    if (this.terminated) return Promise.reject(new Error('This query has already been executed'));
+
+    this.terminated = true;
     let method, crud, input, flags = {};
     const { id, where } = this.query.toObject();
 

package/src/query/QueryResolver.js

@@ -3,7 +3,7 @@ const Boom = require('../core/Boom');
 const QueryService = require('./QueryService');
 const DataService = require('../data/DataService');
 const { createSystemEvent } = require('../service/event.service');
-const { mergeDeep, getGQLReturnType } = require('../service/app.service');
+const { objectIntersectionEqual, mergeDeep, getGQLReturnType } = require('../service/app.service');
 
 module.exports = class QueryResolver {
   constructor(query) {
@@ -81,6 +81,8 @@ module.exports = class QueryResolver {
     const docShape = model.getShape('update', 'doc');
 
     return this.resolver.match(model).match(match).one({ required: true }).then((doc) => {
+      if (objectIntersectionEqual(doc, input)) return doc; // If no changes do not perform query
+
       const merged = mergeDeep(doc, input);
 
       return createSystemEvent('Mutation', { query: query.doc(doc).merged(merged) }, async () => {

package/src/service/app.service.js

@@ -130,6 +130,9 @@ exports.castCmp = (type, value) => {
   }
 };
 
+/**
+ * Returns true if b is a subset of a
+ */
 exports.objectContaining = (a, b) => {
   if (a === b) return true;
 
@@ -137,7 +140,7 @@ exports.objectContaining = (a, b) => {
     return exports.keyPathLeafs(b).every((leaf) => {
       const $a = _.get(a, leaf, { a: 'a' });
       const $b = _.get(b, leaf, { b: 'b' });
-      if (Array.isArray($b)) return $b.some(bb => exports.ensureArray($a).some(aa => exports.objectContaining(aa, bb)));
+      if (Array.isArray($b)) return $b.every(bb => exports.ensureArray($a).some(aa => exports.objectContaining(aa, bb)));
       if (exports.isScalarValue($a) && exports.isScalarValue($b)) return PicoMatch.isMatch(`${$a}`, `${$b}`, { nocase: true });
       return exports.hashObject($a) === exports.hashObject($b);
     });
@@ -146,6 +149,23 @@ exports.objectContaining = (a, b) => {
   return exports.hashObject(a) === exports.hashObject(b);
 };
 
+/**
+ * Returns true if (b intersection a) are equal
+ */
+exports.objectIntersectionEqual = (a, b) => {
+  if (a === b) return true;
+
+  if (exports.isPlainObject(b)) {
+    return exports.keyPathLeafs(b).every((leaf) => {
+      const $a = _.get(a, leaf, { a: 'a' });
+      const $b = _.get(b, leaf, { b: 'b' });
+      return exports.hashObject($a) === exports.hashObject($b);
+    });
+  }
+
+  return exports.hashObject(a) === exports.hashObject(b);
+};
+
 /**
  * Transform an object with dot.notation keys into an expanded object.
  * eg. { 'user.name': 'richard' } => { user: { name: 'richard' } }
@@ -180,12 +200,6 @@ exports.keyPaths = (obj = {}, keys = [], path) => {
   return Object.entries(obj).reduce((prev, [key, value]) => {
     const keyPath = path ? `${path}.${key}` : key;
     if (exports.isPlainObject(value) && Object.keys(value).length) return exports.keyPaths(value, prev, keyPath);
-
-    // if (Array.isArray(value)) {
-    //   const arr = value.filter(v => exports.isPlainObject(v));
-    //   if (arr.length) return _.flatten(arr.map(val => exports.keyPaths(val, prev, keyPath)));
-    // }
-
     return prev.concat(keyPath);
   }, keys);
 };

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