@coderich/autograph 0.13.0 → 0.13.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@coderich/autograph",
   "main": "index.js",
-  "version": "0.13.0",
+  "version": "0.13.2",
   "publishConfig": {
     "access": "public"
   },
@@ -23,6 +23,7 @@
     "dataloader": "2.2.2",
     "deepmerge": "4.3.1",
     "fill-range": "7.0.1",
+    "graphql-parse-resolve-info": "4.13.0",
     "lodash.get": "4.4.2",
     "lodash.merge": "4.6.2",
     "lodash.uniqwith": "4.5.0",

package/src/query/Query.js

@@ -75,6 +75,7 @@ module.exports = class Query {
     const { input, where, sort, before, after, isNative, isCursorPaging } = this.#query;
 
     const query = this.clone({
+      model: this.#model.key,
       select: Object.values(this.#model.fields).map(field => field.key),
       input: this.#model.walk(input, node => node.value !== undefined && Object.assign(node, { key: node.field.key })),
       where: isNative ? where : this.#model.walk(where, node => Object.assign(node, { key: node.field.key })),

package/src/query/QueryBuilder.js

@@ -1,5 +1,5 @@
 const Query = require('./Query');
-const { getGQLReturnType, mergeDeep } = require('../service/AppService');
+const { getGQLReturnType, getGQLSelectFields, mergeDeep } = require('../service/AppService');
 
 module.exports = class QueryBuilder {
   #config;
@@ -41,7 +41,9 @@ module.exports = class QueryBuilder {
    * For use in GraphQL resolver methods to return the "correct" response
    */
   resolve(info) {
-    switch (getGQLReturnType(`${info.returnType}`)) {
+    this.info(info);
+
+    switch (getGQLReturnType(info)) {
       case 'array': return this.many();
       case 'number': return this.count();
       case 'connection': return { count: () => this.count(), edges: () => this.many(), pageInfo: () => this.many() };
@@ -65,6 +67,11 @@ module.exports = class QueryBuilder {
     return this;
   }
 
+  info(info) {
+    this.select(getGQLSelectFields(this.#query.model, info));
+    return this;
+  }
+
   native(clause) {
     this.#propCheck('native', 'id', 'where');
     this.#query.isNative = true;
@@ -83,7 +90,6 @@ module.exports = class QueryBuilder {
   }
 
   select(...select) {
-    this.#propCheck('select');
     select = select.flat();
     this.#query.select = select;
     this.#query.args.select = select;

package/src/schema/Schema.js

@@ -61,11 +61,19 @@ module.exports = class Schema {
    * Merge typeDefs and resolvers
    */
   merge(schema = {}) {
+    // Normalize schema input
     if (typeof schema === 'string') schema = { typeDefs: schema };
     else if (schema instanceof Schema) schema = schema.toObject();
-    const { typeDefs, resolvers } = schema;
-    if (typeDefs) this.#typeDefs = mergeTypeDefs([parse(typeDefs), this.#typeDefs], { noLocation: true, reverseDirectives: true, onFieldTypeConflict: a => a });
-    if (resolvers) this.#resolvers = mergeDeep(this.#resolvers, resolvers);
+
+    if (schema.typeDefs) {
+      const typeDefs = Util.ensureArray(schema.typeDefs).map(td => (typeof td === 'string' ? parse(td) : td));
+      this.#typeDefs = mergeTypeDefs([typeDefs, this.#typeDefs], { noLocation: true, reverseDirectives: true, onFieldTypeConflict: a => a });
+    }
+
+    if (schema.resolvers) {
+      this.#resolvers = mergeDeep(this.#resolvers, schema.resolvers);
+    }
+
     return this;
   }
 
@@ -75,7 +83,8 @@ module.exports = class Schema {
   parse() {
     if (this.#schema) return this.#schema;
 
-    this.#schema = { models: {}, indexes: [] };
+    // const schema = buildASTSchema(this.#typeDefs);
+    this.#schema = { types: {}, models: {}, indexes: [] };
     let model, field, isField, isList;
     const thunks = [];
 
@@ -86,6 +95,8 @@ module.exports = class Schema {
         if (!allowedKinds.includes(node.kind)) return false;
 
         if (modelKinds.includes(node.kind) && !operations.includes(name)) {
+          // this.#schema.types[name] = schema.getType(name);
+
           model = this.#schema.models[name] = {
             name,
             key: name,
@@ -344,6 +355,7 @@ module.exports = class Schema {
         scope: AutoGraphMixed #
         meta: AutoGraphMixed # Custom input "meta" field for mutations
         source: AutoGraphMixed # Data source (default: "default")
+        decorate: AutoGraphMixed # Decorator (default: "default")
         embed: Boolean # Mark this an embedded model (default false)
         persist: Boolean # Persist this model (default true)
       ) on OBJECT | INTERFACE
@@ -381,15 +393,15 @@ module.exports = class Schema {
 
   static #api(schema) {
     // These models are for creating types
-    const readModels = Object.values(schema.models).filter(model => model.crud.includes('r'));
-    const createModels = Object.values(schema.models).filter(model => model.crud.includes('c'));
-    const updateModels = Object.values(schema.models).filter(model => model.crud.includes('u'));
+    const readModels = Object.values(schema.models).filter(model => model.crud?.includes('r'));
+    const createModels = Object.values(schema.models).filter(model => model.crud?.includes('c'));
+    const updateModels = Object.values(schema.models).filter(model => model.crud?.includes('u'));
 
     // These are for defining schema queries/mutations
     const entityModels = Object.values(schema.models).filter(model => model.isEntity);
-    const queryModels = entityModels.filter(model => model.crud.includes('r'));
-    const mutationModels = entityModels.filter(model => ['c', 'u', 'd'].some(el => model.crud.includes(el)));
-    const subscriptionModels = entityModels.filter(model => model.crud.includes('s'));
+    const queryModels = entityModels.filter(model => model.crud?.includes('r'));
+    const mutationModels = entityModels.filter(model => ['c', 'u', 'd'].some(el => model.crud?.includes(el)));
+    const subscriptionModels = entityModels.filter(model => model.crud?.includes('s'));
 
     return {
       typeDefs: `
@@ -415,7 +427,7 @@ module.exports = class Schema {
         `)}
 
         ${readModels.map((model) => {
-          const fields = Object.values(model.fields).filter(field => field.crud.includes('r'));
+          const fields = Object.values(model.fields).filter(field => field.crud?.includes('r'));
           const connectionFields = fields.filter(field => field.isConnection);
 
           return `
@@ -443,7 +455,7 @@ module.exports = class Schema {
         })}
 
         ${createModels.map((model) => {
-          const fields = Object.values(model.fields).filter(field => field.crud.includes('c') && !field.isVirtual);
+          const fields = Object.values(model.fields).filter(field => field.crud?.includes('c') && !field.isVirtual);
 
           return `
             input ${model}InputCreate {
@@ -453,7 +465,7 @@ module.exports = class Schema {
         })}
 
         ${updateModels.map((model) => {
-          const fields = Object.values(model.fields).filter(field => field.crud.includes('u') && !field.isVirtual);
+          const fields = Object.values(model.fields).filter(field => field.crud?.includes('u') && !field.isVirtual);
 
           return `
             input ${model}InputUpdate {
@@ -484,9 +496,9 @@ module.exports = class Schema {
             ${mutationModels.map((model) => {
               const api = [];
               const meta = model.meta ? `meta: ${model.meta}` : '';
-              if (model.crud.includes('c')) api.push(`create${model}(input: ${model}InputCreate! ${meta}): ${model}!`);
-              if (model.crud.includes('u')) api.push(`update${model}(id: ID! input: ${model}InputUpdate ${meta}): ${model}!`);
-              if (model.crud.includes('d')) api.push(`delete${model}(id: ID! ${meta}): ${model}!`);
+              if (model.crud?.includes('c')) api.push(`create${model}(input: ${model}InputCreate! ${meta}): ${model}!`);
+              if (model.crud?.includes('u')) api.push(`update${model}(id: ID! input: ${model}InputUpdate ${meta}): ${model}!`);
+              if (model.crud?.includes('d')) api.push(`delete${model}(id: ID! ${meta}): ${model}!`);
               return api.join('\n');
             })}
           }
@@ -518,12 +530,12 @@ module.exports = class Schema {
         }, {}),
         Query: queryModels.reduce((prev, model) => {
           return Object.assign(prev, {
-            [`get${model}`]: (doc, args, context, info) => context.autograph.resolver.match(model).args(args).one({ required: true }),
+            [`get${model}`]: (doc, args, context, info) => context.autograph.resolver.match(model).args(args).info(info).one({ required: true }),
             [`find${model}`]: (doc, args, context, info) => {
               return {
-                edges: () => context.autograph.resolver.match(model).args(args).many(),
-                count: () => context.autograph.resolver.match(model).args(args).count(),
-                pageInfo: () => context.autograph.resolver.match(model).args(args).many(),
+                edges: () => context.autograph.resolver.match(model).args(args).info(info).many(),
+                count: () => context.autograph.resolver.match(model).args(args).info(info).count(),
+                pageInfo: () => context.autograph.resolver.match(model).args(args).info(info).many(),
               };
             },
           });
@@ -532,7 +544,7 @@ module.exports = class Schema {
             const { id } = args;
             const [modelName] = fromGUID(id);
             const model = schema.models[modelName];
-            return context.autograph.resolver.match(model).id(id).one().then((result) => {
+            return context.autograph.resolver.match(model).id(id).info(info).one().then((result) => {
               if (result == null) return result;
               result.__typename = modelName; // eslint-disable-line no-underscore-dangle
               return result;
@@ -541,9 +553,9 @@ module.exports = class Schema {
         }),
         ...(mutationModels.length ? {
           Mutation: mutationModels.reduce((prev, model) => {
-            if (model.crud.includes('c')) prev[`create${model}`] = (doc, args, context, info) => context.autograph.resolver.match(model).args(args).save(args.input);
-            if (model.crud.includes('u')) prev[`update${model}`] = (doc, args, context, info) => context.autograph.resolver.match(model).args(args).save(args.input);
-            if (model.crud.includes('d')) prev[`delete${model}`] = (doc, args, context, info) => context.autograph.resolver.match(model).args(args).delete();
+            if (model.crud?.includes('c')) prev[`create${model}`] = (doc, args, context, info) => context.autograph.resolver.match(model).args(args).info(info).save(args.input);
+            if (model.crud?.includes('u')) prev[`update${model}`] = (doc, args, context, info) => context.autograph.resolver.match(model).args(args).info(info).save(args.input);
+            if (model.crud?.includes('d')) prev[`delete${model}`] = (doc, args, context, info) => context.autograph.resolver.match(model).args(args).info(info).delete();
             return prev;
           }, {}),
         } : {}),
@@ -552,7 +564,7 @@ module.exports = class Schema {
             [model]: Object.values(model.fields).filter(field => field.model?.isEntity).reduce((prev2, field) => {
               return Object.assign(prev2, {
                 [field]: (doc, args, context, info) => {
-                  return context.autograph.resolver.match(field.model).where({ [field.linkBy]: doc[field.linkField.name] }).args(args).resolve(info);
+                  return context.autograph.resolver.match(field.model).where({ [field.linkBy]: doc[field.linkField.name] }).args(args).info(info).resolve(info);
                 },
               });
             }, {}),

package/src/service/AppService.js

@@ -1,9 +1,11 @@
+const get = require('lodash.get');
 const Util = require('@coderich/util');
 const PicoMatch = require('picomatch');
 const FillRange = require('fill-range');
 const ObjectHash = require('object-hash');
 const ObjectId = require('bson-objectid');
 const DeepMerge = require('deepmerge');
+const { parseResolveInfo, simplifyParsedResolveInfoFragmentWithType } = require('graphql-parse-resolve-info');
 
 exports.isGlob = str => PicoMatch.scan(str).isGlob;
 exports.globToRegex = (glob, options = {}) => PicoMatch.makeRe(glob, { nocase: true, ...options, expandRange: (a, b) => `(${FillRange(a, b, { toRegex: true })})` });
@@ -26,11 +28,19 @@ exports.finalizeWhereClause = (obj, arrayOp = '$in') => {
   }, {});
 };
 
-exports.getGQLReturnType = (returnType) => {
+exports.getGQLReturnType = (info) => {
+  const returnType = `${info.returnType}`;
   const typeMap = { array: /^\[.+\].?$/, connection: /.+Connection!?$/, number: /^(Int|Float)!?$/, scalar: /.*/ };
   return Object.entries(typeMap).find(([type, pattern]) => returnType.match(pattern))[0];
 };
 
+exports.getGQLSelectFields = (model, info) => {
+  const parsed = parseResolveInfo(info, { noLocation: true });
+  const { fields } = simplifyParsedResolveInfoFragmentWithType(parsed, info.returnType);
+  const node = get(fields, `edges.fieldsByTypeName.${model}Edge.node.fieldsByTypeName.${model}`);
+  return Object.keys(node || fields);
+};
+
 exports.removeUndefinedDeep = (obj) => {
   return Util.unflatten(Object.entries(Util.flatten(obj)).reduce((prev, [key, value]) => {
     return value === undefined ? prev : Object.assign(prev, { [key]: value });