@devticon-os/graphql-codegen-axios 0.2.14 → 0.2.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devticon-os/graphql-codegen-axios",
-  "version": "0.2.14",
+  "version": "0.2.15",
   "license": "MIT",
   "main": "src/index.js",
   "repository": "https://github.com/devticon/graphql-codegen-axios",

package/src/functions.js

@@ -21,6 +21,11 @@ const getFunctionChain = (operation, useSingleResults) => {
   return chain;
 };
 
-const isSingleResultOperation = operation => operation.selectionSet.selections.length === 1;
+const isSingleResultOperation = (operation, config) => {
+  if (config.autoSingleResult === undefined || config.autoSingleResult === true) {
+    return operation.selectionSet.selections.length === 1;
+  }
+  return operation.directives.some(d => d.name.value === 'singleResult');
+};
 
 module.exports = { getFunctionChain, isSingleResultOperation };

package/src/helpers.ts

@@ -33,7 +33,7 @@ const nonNullable = (key: string, reqParams: GraphqlRequestParams) => (data: any
   return data;
 };
 
-export const handleResponse = <T>({ data }: AxiosResponse<GraphqlResponse<T>>) => {
+export const handleResponse = ({ data }: AxiosResponse<GraphqlResponse<any>>): any => {
   const errors = data.errors;
   if (errors && errors.length > 0) {
     throw new GraphqlError('Request failed', errors);

package/src/index.js

@@ -2,7 +2,7 @@ const fs = require('fs');
 const path = require('path');
 const { findUsageInputs } = require('./input');
 const { getVariablesFields } = require('./variables');
-const { getResultsFields, getResultType } = require('./results');
+const { getResultType } = require('./results');
 const { findScalars } = require('./scalar');
 const {
   renderType,
@@ -19,9 +19,14 @@ const { getFunctionChain, isSingleResultOperation } = require('./functions');
 const { capitalize } = require('./utils');
 
 const helpers = fs.readFileSync(path.join(__dirname, 'helpers.ts'), 'utf-8');
+const directives = ` directive @first on OBJECT
+    directive @firstOrFail on OBJECT
+    directive @singleResult on OBJECT
+    directive @nonNullable on OBJECT`;
 module.exports = {
   plugin(schema, documents, config) {
     try {
+      fs.writeFileSync('directives.graphql', directives);
       const functions = [];
       const queries = [];
       const inputs = findUsageInputs(documents, schema);
@@ -35,7 +40,7 @@ module.exports = {
             continue;
           }
           const name = definition.name.value;
-          const useSingleResults = isSingleResultOperation(definition);
+          const useSingleResults = isSingleResultOperation(definition, config);
 
           const results = getResultType(definition, schema, document, useSingleResults);
           types.push(results);
@@ -85,9 +90,5 @@ module.exports = {
       process.exit(1);
     }
   },
-  addToSchema: /* GraphQL */ `
-    directive @first on OBJECT
-    directive @firstOrFail on OBJECT
-    directive @nonNullable on OBJECT
-  `,
+  addToSchema: directives,
 };

package/src/render.js

@@ -27,7 +27,7 @@ const renderType = ({ name, fields, union, isList, isNullable, gqlType }, config
 const renderHeader = text => `/** \n ${text} \n **/`;
 const renderTypeField = (fields, config) => {
   return fields
-    .map(({ isList, isNullable, typeName, name, fields, isScalar, union, type, inLine, gqlType }) => {
+    .map(({ isList, isNullable, typeName, name, fields, isScalar, union, type, inLine, gqlType, alias }) => {
       let tsType = '';
       if (union && union.length) {
         tsType += [...union.map(u => getName(u, 'fragment', config)), ''].join(' & ');
@@ -40,7 +40,7 @@ const renderTypeField = (fields, config) => {
         if (type instanceof GraphQLInputObjectType || type instanceof GraphQLEnumType) {
           tsType += gqlType ? getName(typeName, gqlType, config) : typeName;
         } else {
-          tsType += `{${renderTypeField(fields)}}`;
+          tsType += `{${renderTypeField(fields, config)}}`;
         }
       }
       tsType = `(${tsType})`;
@@ -50,7 +50,7 @@ const renderTypeField = (fields, config) => {
       if (isNullable) {
         tsType = `Nullable<${tsType}>`;
       }
-      return `${name}${isNullable ? '?' : ''}: ${tsType}`;
+      return `${alias || name}${isNullable ? '?' : ''}: ${tsType}`;
     })
     .join(',\n');
 };
@@ -72,7 +72,11 @@ const renderFunction = ({ name, variables, results, chain }) => {
 };
 
 const renderQuery = ({ name, ast, allFragments }) => {
-  const raw = print(ast).replace('@firstOrFail', '').replace('@first', '').replace('@nonNullable', '');
+  const raw = print(ast)
+    .replace(/@firstOrFail/g, '')
+    .replace(/@first/g, '')
+    .replace(/@nonNullable/g, '')
+    .replace(/@singleResult/g, '');
 
   let fragments = getUsedFragments(raw, allFragments);
   fragments = [...new Set(fragments)].map(f => `\${${f.name}FragmentQuery}`);

package/src/results.js

@@ -36,6 +36,7 @@ const getField = (parent, field, schema, document) => {
     ...type,
     fields,
     union,
+    alias: field.alias?.value,
   };
 };