@coderich/autograph 0.11.0 → 0.12.0

package/CHANGELOG.md

@@ -0,0 +1,41 @@
+# 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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@coderich/autograph",
   "author": "Richard Livolsi (coderich)",
-  "version": "0.11.0",
+  "version": "0.12.0",
   "description": "AutoGraph",
   "keywords": [
     "graphql",
@@ -34,22 +34,19 @@
     "dataloader": "^2.0.0",
     "deepmerge": "^4.2.2",
     "fill-range": "^7.0.1",
+    "flat": "^5.0.2",
     "glob": "^7.1.6",
     "graphql-fields": "^2.0.3",
     "lodash": "^4.17.21",
-    "mongodb": "^4.8.0",
+    "mongodb": "4.8.1",
     "object-hash": "^2.0.1",
     "picomatch": "^2.1.1"
   },
   "devDependencies": {
-    "@coderich/ratchet": "^1.5.7",
+    "@coderich/ratchet": "^1.5.8",
     "@graphql-tools/schema": "^9.0.1",
     "graphql": "^15.5.0",
     "mongodb-memory-server": "^8.7.2",
-    "neo4j-driver": "^4.0.0",
-    "neodb": "^3.0.0",
-    "redis": "^2.8.0",
-    "redis-mock": "^0.47.0",
     "validator": "^13.7.0"
   },
   "peerDependencies": {

package/src/data/Model.js

@@ -135,7 +135,7 @@ module.exports = class extends Model {
     return shape;
   }
 
-  shapeObject(shape, obj, query, root) {
+  shapeObject(shape, obj, query, root, base) {
     const { serdes, model } = shape;
     const { context, resolver, doc = {}, flags = {} } = query.toObject();
     const { pipeline } = flags;
@@ -143,8 +143,11 @@ module.exports = class extends Model {
     if (!pipeline) return obj;
     // const filters = pipeline === true ? [] : Object.entries(pipeline).map(([k, v]) => (v === false ? k : null)).filter(Boolean);
 
+    // base is the base model
+    base = base || model;
+
     return map(obj, (parent) => {
-      // "root" is the base of the object
+      // root is the base data object
       root = root || parent;
 
       // Lookup helper functions
@@ -158,7 +161,7 @@ module.exports = class extends Model {
 
         // Transform value
         const transformedValue = transformers.reduce((value, t) => {
-          const v = t({ model, field, path, docPath, rootPath, parentPath, startValue, value, resolver, context });
+          const v = t({ base, model, field, path, docPath, rootPath, parentPath, startValue, value, resolver, context });
           return v === undefined ? value : v;
         }, startValue);
 
@@ -167,22 +170,25 @@ module.exports = class extends Model {
         if (!instructed && subShape && typeof transformedValue !== 'object') return prev;
 
         // Rename key & assign value
-        prev[to] = (!subShape || transformedValue == null) ? transformedValue : this.shapeObject(subShape, transformedValue, query, root);
+        prev[to] = (!subShape || transformedValue == null) ? transformedValue : this.shapeObject(subShape, transformedValue, query, root, base);
 
         return prev;
       }, {});
     });
   }
 
-  validateObject(shape, obj, query, root, silent = false) {
+  validateObject(shape, obj, query, root, base, silent = false) {
     const { model } = shape;
     const { context, resolver, doc = {}, flags = {} } = query.toObject();
     const { validate = true } = flags;
 
     if (!validate) return Promise.resolve();
 
+    // base is the base model
+    base = base || model;
+
     return mapPromise(obj, (parent) => {
-      // "root" is the base of the object
+      // root is the base data object
       root = root || parent;
 
       // Lookup helper functions
@@ -195,10 +201,10 @@ module.exports = class extends Model {
 
         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);
+            return Promise.resolve(v({ base, 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();
+          return subShape ? this.validateObject(subShape, value, query, root, base, true) : Promise.resolve();
         });
       }));
     }).then(() => {

package/src/driver/MongoDriver.js

@@ -1,4 +1,5 @@
 const Util = require('util');
+const Flat = require('flat');
 const { get } = require('lodash');
 const { MongoClient, ObjectId } = require('mongodb');
 const { map, ensureArray, proxyDeep, toKeyObj, globToRegex, proxyPromise, isScalarDataType, promiseRetry } = require('../service/app.service');
@@ -64,12 +65,11 @@ 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 = { $set: $doc };
+    const $update = { $set: Flat.flatten($doc, { safe: true }) };
     return this.query(model, 'updateOne', where, $update, options, flags).then(() => $doc);
   }
 

package/src/graphql/ast/Node.js

@@ -117,7 +117,7 @@ module.exports = class Node {
   }
 
   getVirtualRef() {
-    return this.getDirectiveArg('link', 'by');
+    return this.getDirectiveArg('join', 'by');
   }
 
   getAuthz() {
@@ -153,7 +153,7 @@ module.exports = class Node {
    * Is the field virtual; does it's value come from another model
    */
   isVirtual() {
-    return Boolean(this.getDirectiveArg('link', 'by'));
+    return Boolean(this.getDirectiveArg('join', 'by'));
   }
 
   /**

package/src/graphql/ast/Schema.js

@@ -128,6 +128,6 @@ module.exports = class Schema extends TypeDefApi {
   }
 
   toString() {
-    return print(this.typeDefs);
+    return print(this.schema.typeDefs);
   }
 };

package/src/graphql/extension/api.js

@@ -107,8 +107,6 @@ module.exports = (schema) => {
       `type Query {
         node(id: ID!): Node
         ${entityModels.map(model => makeReadAPI(model.getName(), model))}
-        ${entityModels.map(model => makeReadAPI(`${model.getName()}Create`, model))}
-        ${entityModels.map(model => makeReadAPI(`${model.getName()}Update`, model))}
       }`,
 
       `type Mutation {

package/src/graphql/extension/framework.js

@@ -8,7 +8,6 @@ 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 }
@@ -56,10 +55,10 @@ module.exports = (schema) => {
         deserialize: [AutoGraphPipelineEnum!]
       ) on FIELD_DEFINITION | INPUT_FIELD_DEFINITION | SCALAR
 
-      directive @link(
-        to: AutoGraphMixed  # The MODEL to link to (default's to modelRef)
+      directive @join(
+        to: AutoGraphMixed  # The MODEL to join to (default's to modelRef)
         by: AutoGraphMixed! # The FIELD to match yourself by
-        use: AutoGraphMixed # The VALUE to use (default's to @link'd value); useful for many-to-many relationships
+        use: AutoGraphMixed # The VALUE to use (default's to @join'd value); useful for many-to-many relationships
       ) on FIELD_DEFINITION
 
       directive @index(

package/src/query/QueryBuilder.js

@@ -10,7 +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.terminated = false; // Prevent accidental re-use of the QueryBuilder
     this.query = new Query({ model, resolver });
 
     // Chainable commands
@@ -58,10 +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'));
+    // // Do not allow re-use
+    // if (this.terminated) return Promise.reject(new Error('This query has already been executed'));
+    // this.terminated = true;
 
-    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 { objectIntersectionEqual, mergeDeep, getGQLReturnType } = require('../service/app.service');
+const { mergeDeep, getGQLReturnType } = require('../service/app.service');
 
 module.exports = class QueryResolver {
   constructor(query) {
@@ -81,8 +81,6 @@ 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,9 +130,6 @@ exports.castCmp = (type, value) => {
   }
 };
 
-/**
- * Returns true if b is a subset of a
- */
 exports.objectContaining = (a, b) => {
   if (a === b) return true;
 
@@ -140,7 +137,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.every(bb => exports.ensureArray($a).some(aa => exports.objectContaining(aa, bb)));
+      if (Array.isArray($b)) return $b.some(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);
     });
@@ -149,23 +146,6 @@ 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' } }

package/src/service/event.service.js

@@ -29,7 +29,7 @@ const makeMiddleware = () => {
         query.match($$where);
       }
 
-      if (sort) {
+      if (sort && Object.keys(sort).length) {
         query.$sort(QueryService.resolveSortBy(query));
       }