@coderich/autograph 0.9.0 → 0.9.4

package/package.json

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

package/src/core/Resolver.js

@@ -10,7 +10,7 @@ module.exports = class Resolver {
     this.models = schema.getModels();
     this.schema = schema;
     this.context = context;
-    this.loaders = this.models.reduce((prev, model) => prev.set(model, new DataLoader(this, model)), new WeakMap());
+    this.loaders = this.models.reduce((prev, model) => prev.set(`${model}`, new DataLoader(this, model)), new Map());
 
     //
     this.getSchema = () => this.schema;
@@ -62,7 +62,7 @@ module.exports = class Resolver {
         if (Object.prototype.hasOwnProperty.call(where, key) && where[key] == null) return Promise.resolve(null);
 
         //
-        return this.loaders.get(model).load(query);
+        return this.loaders.get(`${model}`).load(query);
       }
     }
   }
@@ -92,7 +92,7 @@ module.exports = class Resolver {
 
   // DataLoader Proxy Methods
   clear(model) {
-    this.loaders.get(this.toModel(model)).clearAll();
+    this.loaders.get(`${model}`).clearAll();
     return this;
   }
 

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/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

@@ -69,13 +69,19 @@ module.exports = (schema) => {
         }
       `),
 
-      ...entityModels.map(model => `
+      ...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()}SubscriptionPayloadEventData {
-          ${getGQLWhereFields(model).filter(field => field.isBasicType() || field.isEmbedded()).map(field => `${field.getName()}: ${field.getGQLType()}`)}
+        type ${model.getName()}SubscriptionPayload {
+          event: ${model.getName()}SubscriptionPayloadEvent
+          query: ${model.getName()}SubscriptionQuery
         }
 
         type ${model.getName()}SubscriptionPayloadEvent {
@@ -83,13 +89,20 @@ module.exports = (schema) => {
           data: ${model.getName()}SubscriptionPayloadEventData!
         }
 
-        type ${model.getName()}SubscriptionPayload {
-          event: ${model.getName()}SubscriptionPayloadEvent
+        type ${model.getName()}SubscriptionPayloadEventData {
+          ${getGQLWhereFields(model).map(field => `${field.getName()}: ${field.isFKReference() ? 'ID' : field.getGQLType()}`)}
         }
 
-        input ${model.getName()}SubscriptionInputFilter {
-          when: SubscriptionWhenEnum! = anytime
-          where: ${model.getName()}SubscriptionInputWhere! = {}
+        interface ${model.getName()}SubscriptionQuery {
+          ${model.getFields().filter(field => field.hasGQLScope('r')).map(field => `${field.getName()}: ${field.getPayloadType()}`)}
+        }
+
+        type ${model.getName()}Create implements ${model.getName()}SubscriptionQuery {
+          ${model.getFields().filter(field => field.hasGQLScope('r')).map(field => `${field.getName()}: ${field.getPayloadType()}`)}
+        }
+
+        type ${model.getName()}Update implements ${model.getName()}SubscriptionQuery {
+          ${model.getFields().filter(field => field.hasGQLScope('r')).map(field => `${field.getName()}: ${field.getPayloadType()}`)}
         }
       `),
 
@@ -110,6 +123,8 @@ 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 {
@@ -152,6 +167,15 @@ module.exports = (schema) => {
         });
       }, {});
 
+      if (model.isEntity() && model.hasGQLScope('s')) {
+        prev[`${model.getName()}SubscriptionQuery`] = {
+          __resolveType: root => root.__typename, // eslint-disable-line no-underscore-dangle
+          ...fieldResolvers,
+        };
+        prev[`${model.getName()}Create`] = fieldResolvers;
+        prev[`${model.getName()}Update`] = fieldResolvers;
+      }
+
       return Object.assign(prev, {
         [modelName]: fieldResolvers,
         [`${modelName}Connection`]: {

package/src/graphql/extension/type.js

@@ -9,9 +9,13 @@ module.exports = (schema) => {
       const createdAt = model.getDirectiveArg('model', 'createdAt', 'createdAt');
       const updatedAt = model.getDirectiveArg('model', 'updatedAt', 'updatedAt');
 
-      if (model.getKind() === 'ObjectTypeDefinition') {
+      if (model.getKind() === 'ObjectTypeDefinition' && (id || createdAt || updatedAt)) {
+        const interfaces = [];
+        if (id) interfaces.push('Node');
+        const interfacesGQL = interfaces.length ? ' implements'.concat(' ', interfaces.join(' & ')) : '';
+
         return `
-          extend type ${modelName} ${id ? 'implements Node' : ''} {
+          extend type ${modelName}${interfacesGQL} {
             ${id ? `id: ID! @field(key: "${id}", gqlScope: r)` : ''}
             ${createdAt ? `createdAt: AutoGraphDateTime @field(key: "${createdAt}", gqlScope: r)` : ''}
             ${updatedAt ? `updatedAt: AutoGraphDateTime @field(key: "${updatedAt}", gqlScope: r)` : ''}
@@ -24,7 +28,7 @@ module.exports = (schema) => {
       interface Node { id: ID! }
       enum SortOrderEnum { asc desc }
       enum SubscriptionCrudEnum { create update delete } # Not going to support "read"
-      enum SubscriptionWhenEnum { anytime preEvent postEvent }
+      enum SubscriptionWhenEnum { preEvent postEvent }
     `),
   });
 };

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