First implementation

dotansimha · Aug 20, 2018 · 7a4a059 · 7a4a059
1 parent 0298abf
commit 7a4a059
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 8 deletions.
diff --git a/packages/graphql-codegen-cli/src/codegen.ts b/packages/graphql-codegen-cli/src/codegen.ts
@@ -2,7 +2,7 @@ import * as commander from 'commander';
 import * as path from 'path';
 import * as fs from 'fs';
 import * as mkdirp from 'mkdirp';
-import { GraphQLSchema } from 'graphql';
+import { GraphQLSchema, DocumentNode, GraphQLError } from 'graphql';
 
 import { documentsFromGlobs } from './utils/documents-glob';
 import { loadDocumentsSources } from './loaders/documents/document-loader';
@@ -259,10 +259,18 @@ export const executeWithOptions = async (options: CLIOptions): Promise<FileOutpu
       }
     });
 
-    const transformedDocuments = transformDocument(
-      graphQlSchema,
-      loadDocumentsSources(await documentsFromGlobs(documents))
-    );
+    const documentSourcesResult = loadDocumentsSources(graphQlSchema, await documentsFromGlobs(documents));
+
+    if (Array.isArray(documentSourcesResult) && documentSourcesResult.length > 0) {
+      const graphQLErrors = documentSourcesResult as ReadonlyArray<GraphQLError>;
+      for (const graphQLError of graphQLErrors) {
+        logger.error(`${graphQLError.path}: ${graphQLError.message}`);
+      }
+      cliError('Found errors when validating queries against schema');
+    }
+
+    const transformedDocuments = transformDocument(graphQlSchema, documentSourcesResult as DocumentNode);
+
     return compileTemplate(templateConfig, context, [transformedDocuments], {
       generateSchema,
       generateDocuments

diff --git a/packages/graphql-codegen-cli/src/loaders/documents/document-loader.ts b/packages/graphql-codegen-cli/src/loaders/documents/document-loader.ts
@@ -1,4 +1,5 @@
-import { DocumentNode, Source, parse, concatAST } from 'graphql-codegen-core';
+import { validate, GraphQLSchema, GraphQLError } from 'graphql';
+import { DocumentNode, Source, parse, concatAST, logger } from 'graphql-codegen-core';
 import * as fs from 'fs';
 import * as path from 'path';
 import { extractDocumentStringFromCodeFile } from '../../utils/document-finder';
@@ -24,6 +25,21 @@ export const loadFileContent = (filePath: string): DocumentNode | null => {
   }
 };
 
-export const loadDocumentsSources = (filePaths: string[]): DocumentNode => {
-  return concatAST(filePaths.map<DocumentNode>(loadFileContent).filter(content => content));
+export const loadDocumentsSources = (
+  schema: GraphQLSchema,
+  filePaths: string[]
+): DocumentNode | ReadonlyArray<GraphQLError> => {
+  const loadResults = filePaths
+    .map(filePath => {
+      const fileContent = loadFileContent(filePath);
+      const errors = validate(schema, fileContent);
+      return {
+        fileContent,
+        errors
+      };
+    })
+    .filter(content => content);
+
+  const errors = loadResults.map(r => r.errors).reduce((soFar, current) => soFar.concat(current), []);
+  return errors.length > 0 ? errors : concatAST(loadResults.map(r => r.fileContent));
 };