@devticon-os/graphql-codegen-axios 0.2.0 → 0.2.2

package/package.json

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

package/src/fragments.js

@@ -1,29 +1,23 @@
 const { GraphQLObjectType } = require('graphql/type');
 const { getGraphqlTypeInfo } = require('./types');
+const { getField } = require('./results');
 const findUsageFragments = (documents, schema) => {
   const fragments = [];
   for (let { document } of documents) {
     for (const definition of document.definitions) {
       if (definition.kind === 'FragmentDefinition') {
+        const name = definition.name.value;
         const parentName = definition.typeCondition.name.value;
         const parent = findObjectTypeInSchema(schema, parentName);
+        const nestedFragments = definition.selectionSet.selections.filter(s => s.kind === 'FragmentSpread');
+        const fields = definition.selectionSet.selections.filter(s => s.kind !== 'FragmentSpread');
+        const union = nestedFragments.map(f => f.name.value);
+
         fragments.push({
-          name: definition.name.value,
+          name,
           type: definition,
-          fields: definition.selectionSet.selections.map(f => {
-            const selections = f.selectionSet?.selections || [];
-            const fragments = selections.filter(s => s.kind === 'FragmentSpread');
-            const union = fragments.map(f => f.name.value);
-            const parentField = parent._fields[f.name.value];
-            const typeInfo = getGraphqlTypeInfo(parentField.type);
-            return {
-              name: f.name.value,
-              ...typeInfo,
-              fields: [],
-              typeName: union.length ? '{}' : typeInfo.typeName,
-              union,
-            };
-          }),
+          union,
+          fields: fields.map(f => getField(parent, f, schema)),
         });
       }
     }

package/src/index.js

@@ -1,12 +1,10 @@
 const fs = require('fs');
 const path = require('path');
-const { print } = require('graphql');
-const { GraphQLList, GraphQLNonNull, GraphQLInputObjectType } = require('graphql/type');
 const { findUsageInputs } = require('./input');
 const { getVariablesFields } = require('./variables');
 const { getResultsFields } = require('./results');
 const { findScalars } = require('./scalar');
-const { renderType, renderQuery, renderSdk, renderScalars, renderEnum } = require('./render');
+const { renderType, renderQuery, renderSdk, renderScalars, renderEnum, renderHeader } = require('./render');
 const { findUsageEnums } = require('./enums');
 const { findUsageFragments } = require('./fragments');
 
@@ -80,10 +78,15 @@ module.exports = {
 
       const enums = findUsageEnums(types, schema);
       return [
+        renderHeader('HELPERS'),
         helpers,
+        renderHeader('Scalars'),
         renderScalars(scalars),
+        renderHeader('Enum'),
         ...enums.map(e => renderEnum(e)),
+        renderHeader('TYPES'),
         ...types.map(t => renderType(t)),
+        renderHeader('QUERIES'),
         ...queries.map(q => renderQuery(q)),
         renderSdk(functions),
       ].join('\n');

package/src/input.js

@@ -7,7 +7,8 @@ const findUsageInputs = (document, schema) => {
       continue;
     }
     for (const variableDefinition of definition.variableDefinitions) {
-      const name = variableDefinition.type.name.value;
+      const type = unpackVariableType(variableDefinition.type);
+      const name = type.name.value;
       const input = findInputInSchema(name, schema);
       if (input) {
         inputs.push(input);
@@ -45,6 +46,7 @@ const getInputFields = input => {
       name: field.name,
       fields: [],
       ...typeInfo,
+      inLine: !typeInfo.isScalar,
     };
   });
 };
@@ -59,4 +61,14 @@ const unpackInputType = type => {
   return type;
 };
 
+const unpackVariableType = type => {
+  if (type.kind === 'ListType') {
+    return unpackVariableType(type.type);
+  }
+  if (type.kind === 'NonNullType') {
+    return unpackVariableType(type.type);
+  }
+  return type;
+};
+
 module.exports = { findUsageInputs, findInputInSchema };

package/src/render.js

@@ -1,22 +1,27 @@
 const { print } = require('graphql/index');
 const { getUsedFragments } = require('./query');
-const renderType = ({ name, fields }) => {
-  return `export type ${name} = { ${renderTypeField(fields)} };`;
+const { GraphQLInputObjectType } = require('graphql/type');
+const renderType = ({ name, fields, union }) => {
+  return `export type ${name} = ${union ? union.join('&') + '&' : ''} { ${renderTypeField(fields)} };`;
 };
+
+const renderHeader = text => `/** \n ${text} \n **/`;
 const renderTypeField = fields => {
   return fields
-    .map(({ isList, isNullable, typeName, name, fields, isScalar, union }) => {
+    .map(({ isList, isNullable, typeName, name, fields, isScalar, union, type, inLine }) => {
       let tsType = '';
       if (union && union.length) {
         tsType += [...union, ''].join(' & ');
       }
       if (isScalar) {
         tsType += getScalarTsType(typeName);
+      } else if (inLine) {
+        tsType += typeName;
       } else {
-        if (fields.length) {
-          tsType += `{${renderTypeField(fields)}}`;
-        } else {
+        if (type instanceof GraphQLInputObjectType) {
           tsType += typeName;
+        } else {
+          tsType += `{${renderTypeField(fields)}}`;
         }
       }
       return `${name}${isNullable ? '?' : ''}: ${tsType}${isList ? '[]' : ''}`;
@@ -71,4 +76,4 @@ const renderScalars = (scalars, map = {}) => {
     })
     .join(',')}};`;
 };
-module.exports = { renderType, renderQuery, renderSdk, renderScalars, renderEnum };
+module.exports = { renderType, renderQuery, renderSdk, renderScalars, renderEnum, renderHeader };

package/src/results.js

@@ -31,4 +31,4 @@ const getField = (parent, field, schema, document) => {
   };
 };
 
-module.exports = { getResultsFields };
+module.exports = { getResultsFields, getField };

package/src/variables.js

@@ -18,7 +18,7 @@ const getVariableType = (type, schema, isList = false, isNullable = true) => {
   }
   const typeName = type.name.value;
   const isScalar = !findInputInSchema(typeName, schema);
-  return { type: type.type, isList, isNullable, typeName, isScalar };
+  return { type: type.type, isList, isNullable, typeName, isScalar, inLine: !isScalar };
 };
 
 module.exports = { getVariablesFields };