@graphql-codegen/core 2.6.3-alpha-20221031143038-b4e11f6bc → 2.6.3-alpha-20221031145604-c8709223b

package/cjs/codegen.js

@@ -60,17 +60,18 @@ async function codegen(options) {
             const rules = graphql_1.specifiedRules.filter(rule => !ignored.some(ignoredRule => rule.name.startsWith(ignoredRule)));
             const schemaHash = (0, utils_js_1.extractHashFromSchema)(schemaInstance);
             if (!schemaHash || !options.cache || documents.some(d => typeof d.hash !== 'string')) {
-                return (0, utils_1.validateGraphQlDocuments)(schemaInstance, [...documents, ...fragments], rules);
+                return Promise.resolve((0, utils_1.validateGraphQlDocuments)(schemaInstance, [...documents.flatMap(d => d.document), ...fragments.flatMap(f => f.document)], rules));
             }
             const cacheKey = [schemaHash]
                 .concat(documents.map(doc => doc.hash))
                 .concat(JSON.stringify(fragments))
                 .join(',');
-            return options.cache('documents-validation', cacheKey, () => options.documentsValidator === 'codegen'
-                ? (0, utils_js_1.fastValidateGraphQLDocuments)(schemaInstance, [...documents, ...fragments], rules)
-                : (0, utils_1.validateGraphQlDocuments)(schemaInstance, [...documents, ...fragments], rules));
+            return options.cache('documents-validation', cacheKey, () => Promise.resolve((0, utils_1.validateGraphQlDocuments)(schemaInstance, [...documents.flatMap(d => d.document), ...fragments.flatMap(f => f.document)], rules)));
         }, 'Validate documents against schema');
-        (0, utils_1.checkValidationErrors)(errors);
+        if (errors) {
+            throw new Error(`GraphQL Document Validation failed with ${errors.length} errors;
+  ${errors.map((error, index) => `Error ${index}: ${error.stack}`).join('\n\n')}`);
+        }
     }
     const prepend = new Set();
     const append = new Set();

package/cjs/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fastValidateGraphQLDocuments = exports.extractHashFromSchema = exports.hasFederationSpec = exports.getSkipDocumentsValidationOption = exports.shouldValidateDocumentsAgainstSchema = exports.shouldValidateDuplicateDocuments = exports.pickFlag = exports.prioritize = exports.isObjectMap = void 0;
+exports.extractHashFromSchema = exports.hasFederationSpec = exports.getSkipDocumentsValidationOption = exports.shouldValidateDocumentsAgainstSchema = exports.shouldValidateDuplicateDocuments = exports.pickFlag = exports.prioritize = exports.isObjectMap = void 0;
 const utils_1 = require("@graphql-tools/utils");
 const graphql_1 = require("graphql");
 function isObjectMap(obj) {
@@ -77,26 +77,3 @@ function extractHashFromSchema(schema) {
     return (_a = schema.extensions['hash']) !== null && _a !== void 0 ? _a : null;
 }
 exports.extractHashFromSchema = extractHashFromSchema;
-function fastValidateGraphQLDocuments(schema, documentFiles, effectiveRules) {
-    const document = {
-        kind: graphql_1.Kind.DOCUMENT,
-        definitions: documentFiles.flatMap(df => df.document.definitions),
-    };
-    const errors = (0, graphql_1.validate)(schema, document, effectiveRules);
-    if (errors) {
-        return Promise.reject(errors.reduce((acc, e) => {
-            if (!acc[e.name]) {
-                acc[e.name] = {
-                    filePath: e.name,
-                    errors: [],
-                };
-            }
-            acc[e.name].errors.push(e);
-            return acc;
-        }, {}));
-    }
-    else {
-        return Promise.resolve([]);
-    }
-}
-exports.fastValidateGraphQLDocuments = fastValidateGraphQLDocuments;

package/esm/codegen.js

@@ -1,9 +1,9 @@
 import { DetailedError, isComplexPluginOutput, federationSpec, getCachedDocumentNodeFromSchema, createNoopProfiler, } from '@graphql-codegen/plugin-helpers';
 import { visit, Kind, print, specifiedRules } from 'graphql';
 import { executePlugin } from './execute-plugin.js';
-import { checkValidationErrors, validateGraphQlDocuments, asArray } from '@graphql-tools/utils';
+import { validateGraphQlDocuments, asArray } from '@graphql-tools/utils';
 import { mergeSchemas } from '@graphql-tools/schema';
-import { extractHashFromSchema, fastValidateGraphQLDocuments, getSkipDocumentsValidationOption, hasFederationSpec, pickFlag, prioritize, shouldValidateDocumentsAgainstSchema, shouldValidateDuplicateDocuments, } from './utils.js';
+import { extractHashFromSchema, getSkipDocumentsValidationOption, hasFederationSpec, pickFlag, prioritize, shouldValidateDocumentsAgainstSchema, shouldValidateDuplicateDocuments, } from './utils.js';
 export async function codegen(options) {
     var _a;
     const documents = options.documents || [];
@@ -57,17 +57,18 @@ export async function codegen(options) {
             const rules = specifiedRules.filter(rule => !ignored.some(ignoredRule => rule.name.startsWith(ignoredRule)));
             const schemaHash = extractHashFromSchema(schemaInstance);
             if (!schemaHash || !options.cache || documents.some(d => typeof d.hash !== 'string')) {
-                return validateGraphQlDocuments(schemaInstance, [...documents, ...fragments], rules);
+                return Promise.resolve(validateGraphQlDocuments(schemaInstance, [...documents.flatMap(d => d.document), ...fragments.flatMap(f => f.document)], rules));
             }
             const cacheKey = [schemaHash]
                 .concat(documents.map(doc => doc.hash))
                 .concat(JSON.stringify(fragments))
                 .join(',');
-            return options.cache('documents-validation', cacheKey, () => options.documentsValidator === 'codegen'
-                ? fastValidateGraphQLDocuments(schemaInstance, [...documents, ...fragments], rules)
-                : validateGraphQlDocuments(schemaInstance, [...documents, ...fragments], rules));
+            return options.cache('documents-validation', cacheKey, () => Promise.resolve(validateGraphQlDocuments(schemaInstance, [...documents.flatMap(d => d.document), ...fragments.flatMap(f => f.document)], rules)));
         }, 'Validate documents against schema');
-        checkValidationErrors(errors);
+        if (errors) {
+            throw new Error(`GraphQL Document Validation failed with ${errors.length} errors;
+  ${errors.map((error, index) => `Error ${index}: ${error.stack}`).join('\n\n')}`);
+        }
     }
     const prepend = new Set();
     const append = new Set();

package/esm/utils.js

@@ -1,5 +1,5 @@
 import { isDocumentNode } from '@graphql-tools/utils';
-import { isSchema, Kind, validate } from 'graphql';
+import { isSchema, Kind } from 'graphql';
 export function isObjectMap(obj) {
     return obj && typeof obj === 'object' && !Array.isArray(obj);
 }
@@ -66,25 +66,3 @@ export function extractHashFromSchema(schema) {
     }
     return (_a = schema.extensions['hash']) !== null && _a !== void 0 ? _a : null;
 }
-export function fastValidateGraphQLDocuments(schema, documentFiles, effectiveRules) {
-    const document = {
-        kind: Kind.DOCUMENT,
-        definitions: documentFiles.flatMap(df => df.document.definitions),
-    };
-    const errors = validate(schema, document, effectiveRules);
-    if (errors) {
-        return Promise.reject(errors.reduce((acc, e) => {
-            if (!acc[e.name]) {
-                acc[e.name] = {
-                    filePath: e.name,
-                    errors: [],
-                };
-            }
-            acc[e.name].errors.push(e);
-            return acc;
-        }, {}));
-    }
-    else {
-        return Promise.resolve([]);
-    }
-}

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@graphql-codegen/core",
-  "version": "2.6.3-alpha-20221031143038-b4e11f6bc",
+  "version": "2.6.3-alpha-20221031145604-c8709223b",
   "peerDependencies": {
     "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0"
   },
   "dependencies": {
-    "@graphql-codegen/plugin-helpers": "2.7.2-alpha-20221031143038-b4e11f6bc",
+    "@graphql-codegen/plugin-helpers": "2.7.2-alpha-20221031145604-c8709223b",
     "@graphql-tools/schema": "^9.0.0",
-    "@graphql-tools/utils": "^8.8.0",
+    "@graphql-tools/utils": "9.0.0-alpha-20221031144042-b669677e",
     "tslib": "~2.4.0"
   },
   "repository": {

package/typings/utils.d.cts

@@ -1,6 +1,5 @@
 import { Types } from '@graphql-codegen/plugin-helpers';
-import { LoadDocumentError, Source } from '@graphql-tools/utils';
-import { DocumentNode, GraphQLSchema, ValidationRule } from 'graphql';
+import { DocumentNode, GraphQLSchema } from 'graphql';
 export declare function isObjectMap(obj: any): obj is Types.PluginConfig<any>;
 export declare function prioritize<T>(...values: T[]): T;
 export declare function pickFlag<TConfig, TKey extends keyof TConfig>(flag: TKey, config: TConfig): TConfig[TKey] | undefined;
@@ -9,4 +8,3 @@ export declare function shouldValidateDocumentsAgainstSchema(skipDocumentsValida
 export declare function getSkipDocumentsValidationOption(options: Types.GenerateOptions): Types.SkipDocumentsValidationOptions;
 export declare function hasFederationSpec(schemaOrAST: GraphQLSchema | DocumentNode): boolean;
 export declare function extractHashFromSchema(schema: GraphQLSchema): string | null;
-export declare function fastValidateGraphQLDocuments(schema: GraphQLSchema, documentFiles: Source[], effectiveRules?: ValidationRule[]): Promise<readonly LoadDocumentError[]>;

package/typings/utils.d.ts

@@ -1,6 +1,5 @@
 import { Types } from '@graphql-codegen/plugin-helpers';
-import { LoadDocumentError, Source } from '@graphql-tools/utils';
-import { DocumentNode, GraphQLSchema, ValidationRule } from 'graphql';
+import { DocumentNode, GraphQLSchema } from 'graphql';
 export declare function isObjectMap(obj: any): obj is Types.PluginConfig<any>;
 export declare function prioritize<T>(...values: T[]): T;
 export declare function pickFlag<TConfig, TKey extends keyof TConfig>(flag: TKey, config: TConfig): TConfig[TKey] | undefined;
@@ -9,4 +8,3 @@ export declare function shouldValidateDocumentsAgainstSchema(skipDocumentsValida
 export declare function getSkipDocumentsValidationOption(options: Types.GenerateOptions): Types.SkipDocumentsValidationOptions;
 export declare function hasFederationSpec(schemaOrAST: GraphQLSchema | DocumentNode): boolean;
 export declare function extractHashFromSchema(schema: GraphQLSchema): string | null;
-export declare function fastValidateGraphQLDocuments(schema: GraphQLSchema, documentFiles: Source[], effectiveRules?: ValidationRule[]): Promise<readonly LoadDocumentError[]>;