@coderich/autograph 0.10.4 → 0.10.6

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@coderich/autograph",
   "author": "Richard Livolsi (coderich)",
-  "version": "0.10.4",
+  "version": "0.10.6",
   "description": "AutoGraph",
   "keywords": [
     "graphql",
@@ -42,14 +42,10 @@
     "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/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);
@@ -113,7 +115,7 @@ 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) => {
         const structs = structures[struct];
         if (struct === 'instructs' && structs.length) instructed = true;

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

@@ -16,6 +16,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 +25,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 +45,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,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
@@ -28,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; };
 
@@ -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/service/app.service.js

@@ -180,12 +180,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