@coderich/autograph 0.9.2 → 0.9.3

package/package.json

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

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/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);
   });
 };