@coderich/autograph 0.9.2 → 0.9.6

package/CHANGELOG.md

@@ -3,6 +3,7 @@
 ## v0.9.x
 - Subscriptions API
 - postMutation no longer mutates "doc" and adds "result"
+- Added onDelete defer option
 
 ## v0.8.x
 - Engine 14+

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@coderich/autograph",
   "author": "Richard Livolsi (coderich)",
-  "version": "0.9.2",
+  "version": "0.9.6",
   "description": "AutoGraph",
   "keywords": [
     "graphql",

package/src/core/Resolver.js

@@ -4,6 +4,7 @@ const ResultSet = require('../data/ResultSet');
 const DataLoader = require('../data/DataLoader');
 const DataTransaction = require('../data/DataTransaction');
 const QueryBuilder = require('../query/QueryBuilder');
+const { createSystemEvent } = require('../service/event.service');
 
 module.exports = class Resolver {
   constructor(schema, context = {}) {
@@ -36,6 +37,31 @@ module.exports = class Resolver {
    */
   raw(model) {
     return this.toModelEntity(model).raw();
+    // const entity = this.toModelEntity(model);
+    // const driver = entity.raw();
+    // if (!method) return driver;
+
+    // const resolver = this;
+    // const crud = ['get', 'find', 'count'].indexOf(method) > -1 ? 'read' : method;
+    // const query = new Query({ model: entity, resolver, crud });
+
+    // return new Proxy(driver, {
+    //   get(target, prop, rec) {
+    //     const value = Reflect.get(target, prop, rec);
+
+    //     if (typeof value === 'function') {
+    //       return (...args) => {
+    //         return value.bind(target)(...args).then((result) => {
+    //           const doc = resolver.toResultSet(model, result);
+    //           createSystemEvent('Response', { method, query: query.doc(doc) });
+    //           return result;
+    //         });
+    //       };
+    //     }
+
+    //     return value;
+    //   },
+    // });
   }
 
   /**
@@ -58,8 +84,8 @@ module.exports = class Resolver {
       default: {
         // This is needed in SF tests...
         const key = model.idKey();
-        const { where } = query.toDriver();
-        if (Object.prototype.hasOwnProperty.call(where, key) && where[key] == null) return Promise.resolve(null);
+        const { where, method } = query.toDriver();
+        if (Object.prototype.hasOwnProperty.call(where, key) && where[key] == null) return Promise.resolve(method === 'findMany' ? [] : null);
 
         //
         return this.loaders.get(`${model}`).load(query);
@@ -86,8 +112,22 @@ module.exports = class Resolver {
     return entity;
   }
 
-  toResultSet(model, data) {
-    return new ResultSet(new Query({ model: this.toModel(model), resolver: this }), data);
+  toResultSet(model, data, method) {
+    const crud = ['get', 'find', 'count'].indexOf(method) > -1 ? 'read' : method;
+    const query = new Query({ model: this.toModel(model), resolver: this, crud });
+    const result = new ResultSet(query, data);
+    return createSystemEvent('Response', {
+      model,
+      crud,
+      method,
+      result,
+      doc: result,
+      merged: result,
+      resolver: this,
+      key: `${method}${model}`,
+      context: this.getContext(),
+      query: query.doc(result).merged(result),
+    }, () => result);
   }
 
   // DataLoader Proxy Methods

package/src/core/Schema.js

@@ -50,8 +50,8 @@ module.exports = class extends Schema {
     this.modelsByKey = this.models.reduce((prev, model) => Object.assign(prev, { [model.getKey()]: model }), {});
   }
 
-  loadDir(dir) {
-    super.loadDir(dir);
+  loadDir(dir, options) {
+    super.loadDir(dir, options);
     this.createModels();
     return this;
   }

package/src/data/DataService.js

@@ -79,6 +79,18 @@ exports.spliceEmbeddedArray = async (query, doc, key, from, to) => {
 
   // Pull
   if (from) {
+    // key.split('.').reduce((prev, segment, i, arr) => {
+    //   if (prev == null) return prev;
+
+    //   return map(prev, (data) => {
+    //     const $data = data[segment];
+    //     if (i < (arr.length - 1)) return $data;
+    //     remove($data, el => ($from || from).find(val => objectContaining(el, val)));
+    //     return $data;
+    //   });
+    // }, doc);
+
+    // return doc;
     const data = { [key]: get(doc, key) || [] };
     remove(data[key], el => $from.find(val => objectContaining(el, val)));
     return data;

package/src/data/ResultSet.js

@@ -4,6 +4,7 @@ const { map, ensureArray, keyPaths, mapPromise, toGUID, hashObject } = require('
 
 module.exports = class ResultSet {
   constructor(query, data, adjustForPagination = true) {
+    if (data == null) return data;
     const { resolver, model, sort, first, after, last, before } = query.toObject();
     const fields = model.getFields().filter(f => f.getName() !== 'id');
 

package/src/graphql/ast/Schema.js

@@ -106,12 +106,12 @@ module.exports = class Schema extends Node {
     return this.schema.context;
   }
 
-  loadDir(dir) {
+  loadDir(dir, options) {
     // Typedefs
-    const typeDefs = Glob.sync(`${dir}/**/*.{gql,graphql}`).map(file => loadFile(file)).join('\n\n');
+    const typeDefs = Glob.sync(`${dir}/**/*.{gql,graphql}`, options).map(file => loadFile(file)).join('\n\n');
 
     // Possibly full schema definitions
-    const schema = Glob.sync(`${dir}/**/*.js`).map(file => reqFile(file)).reduce((prev, data) => {
+    const schema = Glob.sync(`${dir}/**/*.js`, options).map(file => reqFile(file)).reduce((prev, data) => {
       return Merge(prev, data);
     }, {
       typeDefs: typeDefs.length ? typeDefs : undefined,

package/src/graphql/extension/api.js

@@ -70,12 +70,27 @@ module.exports = (schema) => {
       `),
 
       ...entityModels.filter(model => model.hasGQLScope('s')).map(model => `
+        input ${model.getName()}SubscriptionInputFilter {
+          when: [SubscriptionWhenEnum!]! = [preEvent, postEvent]
+          where: ${model.getName()}SubscriptionInputWhere! = {}
+        }
+
         input ${model.getName()}SubscriptionInputWhere {
-          ${getGQLWhereFields(model).filter(field => field.isBasicType() || field.isEmbedded()).map(field => `${field.getName()}: ${field.getModelRef() ? `${ucFirst(field.getDataRef())}InputWhere` : 'AutoGraphMixed'}`)}
+          ${getGQLWhereFields(model).map(field => `${field.getName()}: ${field.getModelRef() && !field.isFKReference() ? `${ucFirst(field.getDataRef())}InputWhere` : 'AutoGraphMixed'}`)}
+        }
+
+        type ${model.getName()}SubscriptionPayload {
+          event: ${model.getName()}SubscriptionPayloadEvent
+          query: ${model.getName()}SubscriptionQuery
+        }
+
+        type ${model.getName()}SubscriptionPayloadEvent {
+          crud: SubscriptionCrudEnum!
+          data: ${model.getName()}SubscriptionPayloadEventData!
         }
 
         type ${model.getName()}SubscriptionPayloadEventData {
-          ${getGQLWhereFields(model).filter(field => field.isBasicType() || field.isEmbedded()).map(field => `${field.getName()}: ${field.getGQLType()}`)}
+          ${getGQLWhereFields(model).map(field => `${field.getName()}: ${field.isFKReference() ? 'ID' : field.getGQLType()}`)}
         }
 
         interface ${model.getName()}SubscriptionQuery {
@@ -89,21 +104,6 @@ module.exports = (schema) => {
         type ${model.getName()}Update implements ${model.getName()}SubscriptionQuery {
           ${model.getFields().filter(field => field.hasGQLScope('r')).map(field => `${field.getName()}: ${field.getPayloadType()}`)}
         }
-
-        type ${model.getName()}SubscriptionPayloadEvent {
-          crud: SubscriptionCrudEnum!
-          data: ${model.getName()}SubscriptionPayloadEventData!
-        }
-
-        type ${model.getName()}SubscriptionPayload {
-          event: ${model.getName()}SubscriptionPayloadEvent
-          query: ${model.getName()}SubscriptionQuery
-        }
-
-        input ${model.getName()}SubscriptionInputFilter {
-          when: [SubscriptionWhenEnum!]! = [preEvent, postEvent]
-          where: ${model.getName()}SubscriptionInputWhere! = {}
-        }
       `),
 
       ...spliceModels.map(model => `

package/src/graphql/extension/framework.js

@@ -11,7 +11,7 @@ module.exports = (schema) => {
       enum AutoGraphTransformEnum  { ${Object.keys(Transformer.getInstances()).join(' ')} }
       enum AutoGraphAuthzEnum { private protected public }
       enum AutoGraphValueScopeEnum { self context }
-      enum AutoGraphOnDeleteEnum { cascade nullify restrict }
+      enum AutoGraphOnDeleteEnum { cascade nullify restrict defer }
       enum AutoGraphIndexEnum { unique }
 
       directive @model(

package/src/query/QueryService.js

@@ -111,6 +111,11 @@ exports.resolveReferentialIntegrity = (query) => {
             txn.match(ref).where($where).flags(flags).count().then(count => (count ? reject(new Error('Restricted')) : count));
             break;
           }
+          case 'defer': {
+            // Defer to the embedded object
+            // Marks the field as an onDelete candidate otherwise it (and the embedded object) will get skipped
+            break;
+          }
           default: throw new Error(`Unknown onDelete operator: '${op}'`);
         }
       });

package/src/service/event.service.js

@@ -13,11 +13,11 @@ const systemEvent = new EventEmitter().setMaxListeners(100).on('system', async (
 
 //
 exports.createSystemEvent = (name, mixed = {}, thunk = () => {}) => {
-  let event;
-  let middleware;
+  let event = mixed;
+  let middleware = () => Promise.resolve();
   const type = ucFirst(name);
 
-  if (name !== 'Setup') {
+  if (name !== 'Setup' && name !== 'Response') {
     const { method, query } = mixed;
     const { resolver, model, meta, doc, id, input, sort, merged, native, root, crud } = query.toObject();
 
@@ -49,18 +49,18 @@ exports.createSystemEvent = (name, mixed = {}, thunk = () => {}) => {
 
       resolve();
     });
-  } else {
-    middleware = () => Promise.resolve();
-    event = mixed;
   }
 
   return systemEvent.emit('system', { type: `pre${type}`, data: event }).then((result) => {
     if (result !== undefined) return result; // Allowing middleware to dictate result
     return middleware().then(thunk);
   }).then((result) => {
-    // event.doc = result; // You do actually need this...
     event.result = result;
-    return systemEvent.emit('system', { type: `post${type}`, data: event }).then(finalResult => finalResult || result);
+    return systemEvent.emit('system', { type: `post${type}`, data: event }).then((postResult = result) => postResult);
+  }).then((result) => {
+    if (name === 'Response') return result;
+    event.result = result;
+    return exports.createSystemEvent('Response', event, (finalResult = result) => finalResult);
   });
 };