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

package/package.json

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

package/src/enums.js

@@ -2,7 +2,11 @@ const { GraphQLEnumType } = require('graphql/type');
 const findUsageEnums = (types, schema) => {
   const enums = [];
   for (let type of types) {
-    enums.push(...findEnumInType(type, schema, enums));
+    for (let e of findEnumInType(type, schema, enums)) {
+      if (!enums.includes(e)) {
+        enums.push(e);
+      }
+    }
   }
 
   return enums.map(e => ({

package/src/index.js

@@ -4,7 +4,15 @@ const { findUsageInputs } = require('./input');
 const { getVariablesFields } = require('./variables');
 const { getResultsFields } = require('./results');
 const { findScalars } = require('./scalar');
-const { renderType, renderQuery, renderSdk, renderScalars, renderEnum, renderHeader } = require('./render');
+const {
+  renderType,
+  renderQuery,
+  renderSdk,
+  renderScalars,
+  renderEnum,
+  renderHeader,
+  renderFragment,
+} = require('./render');
 const { findUsageEnums } = require('./enums');
 const { findUsageFragments } = require('./fragments');
 
@@ -16,14 +24,12 @@ module.exports = {
     try {
       const functions = [];
       const queries = [];
+      const inputs = findUsageInputs(documents, schema);
       const fragments = findUsageFragments(documents, schema);
-      const types = [...fragments];
+      const types = [];
       const scalars = findScalars(schema);
 
       for (let { document } of documents) {
-        const inputs = findUsageInputs(document, schema);
-        types.push(...inputs);
-
         for (const definition of document.definitions) {
           if (definition.kind !== 'OperationDefinition') {
             continue;
@@ -76,7 +82,7 @@ module.exports = {
         // }
       }
 
-      const enums = findUsageEnums(types, schema);
+      const enums = findUsageEnums([...types, ...inputs, ...fragments], schema);
       return [
         renderHeader('HELPERS'),
         helpers,
@@ -84,6 +90,11 @@ module.exports = {
         renderScalars(scalars),
         renderHeader('Enum'),
         ...enums.map(e => renderEnum(e)),
+        renderHeader('FRAGMENTS'),
+        ...fragments.map(t => renderType(t)),
+        ...fragments.map(f => renderFragment(f)),
+        renderHeader('INPUTS'),
+        ...inputs.map(t => renderType(t)),
         renderHeader('TYPES'),
         ...types.map(t => renderType(t)),
         renderHeader('QUERIES'),

package/src/input.js

@@ -1,22 +1,24 @@
 const { GraphQLInputObjectType, GraphQLNonNull, GraphQLList } = require('graphql/type');
 const { getGraphqlTypeInfo } = require('./types');
-const findUsageInputs = (document, schema) => {
+const findUsageInputs = (documents, schema) => {
   const inputs = [];
-  for (let definition of document.definitions) {
-    if (definition.kind !== 'OperationDefinition') {
-      continue;
-    }
-    for (const variableDefinition of definition.variableDefinitions) {
-      const type = unpackVariableType(variableDefinition.type);
-      const name = type.name.value;
-      const input = findInputInSchema(name, schema);
-      if (input) {
-        inputs.push(input);
-        inputs.push(...findInputDependencies(input, schema, inputs));
+  for (let { document } of documents) {
+    for (let definition of document.definitions) {
+      if (definition.kind !== 'OperationDefinition') {
+        continue;
+      }
+      for (const variableDefinition of definition.variableDefinitions) {
+        const type = unpackVariableType(variableDefinition.type);
+        const name = type.name.value;
+        const input = findInputInSchema(name, schema);
+        if (input && !inputs.includes(input)) {
+          inputs.push(input);
+          inputs.push(...findInputDependencies(input, schema, inputs));
+        }
       }
     }
   }
-  return inputs.map(input => ({
+  return [...new Set(inputs)].map(input => ({
     name: input.name,
     fields: getInputFields(input),
   }));

package/src/render.js

@@ -45,7 +45,7 @@ const renderQuery = ({ name, ast, allFragments }) => {
   const raw = print(ast).replace('@firstOrFail', '').replace('@first', '').replace('@nonNullable', '');
 
   let fragments = getUsedFragments(raw, allFragments);
-  fragments = [...new Set(fragments)].map(f => print(f.type));
+  fragments = [...new Set(fragments)].map(f => `\${${f.name}FragmentQuery}`);
 
   const gql = fragments.join('\n') + '\n' + raw;
   return `const ${name}RawQuery = \`${gql}\`;`;
@@ -61,6 +61,10 @@ const renderEnum = e => {
   str += `};`;
   return str;
 };
+
+const renderFragment = fragment => {
+  return `export const ${fragment.name}FragmentQuery = \`${print(fragment.type)}\`;`;
+};
 const renderScalars = (scalars, map = {}) => {
   map = {
     String: 'string',
@@ -76,4 +80,4 @@ const renderScalars = (scalars, map = {}) => {
     })
     .join(',')}};`;
 };
-module.exports = { renderType, renderQuery, renderSdk, renderScalars, renderEnum, renderHeader };
+module.exports = { renderType, renderQuery, renderSdk, renderScalars, renderEnum, renderHeader, renderFragment };