@coderich/autograph 0.9.0 → 0.9.1

package/package.json

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

package/src/graphql/extension/api.js

@@ -69,7 +69,7 @@ module.exports = (schema) => {
         }
       `),
 
-      ...entityModels.map(model => `
+      ...entityModels.filter(model => model.hasGQLScope('s')).map(model => `
         input ${model.getName()}SubscriptionInputWhere {
           ${getGQLWhereFields(model).filter(field => field.isBasicType() || field.isEmbedded()).map(field => `${field.getName()}: ${field.getModelRef() ? `${ucFirst(field.getDataRef())}InputWhere` : 'AutoGraphMixed'}`)}
         }
@@ -78,6 +78,18 @@ module.exports = (schema) => {
           ${getGQLWhereFields(model).filter(field => field.isBasicType() || field.isEmbedded()).map(field => `${field.getName()}: ${field.getGQLType()}`)}
         }
 
+        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()}`)}
+        }
+
         type ${model.getName()}SubscriptionPayloadEvent {
           crud: SubscriptionCrudEnum!
           data: ${model.getName()}SubscriptionPayloadEventData!
@@ -85,10 +97,11 @@ module.exports = (schema) => {
 
         type ${model.getName()}SubscriptionPayload {
           event: ${model.getName()}SubscriptionPayloadEvent
+          query: ${model.getName()}SubscriptionQuery
         }
 
         input ${model.getName()}SubscriptionInputFilter {
-          when: SubscriptionWhenEnum! = anytime
+          when: [SubscriptionWhenEnum!]! = [preEvent, postEvent]
           where: ${model.getName()}SubscriptionInputWhere! = {}
         }
       `),
@@ -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 }
     `),
   });
 };