@graphql-codegen/core 2.6.3-alpha-20221025134913-ec8a36be2 → 2.6.3-alpha-20221031143038-b4e11f6bc

package/cjs/codegen.js

@@ -66,7 +66,9 @@ async function codegen(options) {
                 .concat(documents.map(doc => doc.hash))
                 .concat(JSON.stringify(fragments))
                 .join(',');
-            return options.cache('documents-validation', cacheKey, () => (0, utils_1.validateGraphQlDocuments)(schemaInstance, [...documents, ...fragments], rules));
+            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));
         }, 'Validate documents against schema');
         (0, utils_1.checkValidationErrors)(errors);
     }
@@ -206,7 +208,8 @@ function validateDuplicateDocuments(files) {
     `.trimRight())
                 .join('');
             const definitionKindName = kind.replace('Definition', '').toLowerCase();
-            throw new Error(`Not all ${definitionKindName}s have an unique name: ${duplicated.join(', ')}: \n
+            throw new plugin_helpers_1.DetailedError(`Not all ${definitionKindName}s have an unique name: ${duplicated.join(', ')}`, `
+          Not all ${definitionKindName}s have an unique name
           ${list}
         `);
         }

package/cjs/execute-plugin.js

@@ -6,7 +6,7 @@ const graphql_1 = require("graphql");
 async function executePlugin(options, plugin) {
     var _a;
     if (!plugin || !plugin.plugin || typeof plugin.plugin !== 'function') {
-        throw new Error(`Invalid Custom Plugin "${options.name}" \n
+        throw new plugin_helpers_1.DetailedError(`Invalid Custom Plugin "${options.name}"`, `
         Plugin ${options.name} does not export a valid JS object with "plugin" function.
 
         Make sure your custom plugin is written in the following form:
@@ -28,7 +28,7 @@ async function executePlugin(options, plugin) {
             await profiler.run(async () => plugin.validate(outputSchema, documents, options.config, options.outputFilename, options.allPlugins, pluginContext), `Plugin ${options.name} validate`);
         }
         catch (e) {
-            throw new Error(`Plugin "${options.name}" validation failed: \n
+            throw new plugin_helpers_1.DetailedError(`Plugin "${options.name}" validation failed:`, `
             ${e.message}
           `);
         }

package/cjs/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.extractHashFromSchema = exports.hasFederationSpec = exports.getSkipDocumentsValidationOption = exports.shouldValidateDocumentsAgainstSchema = exports.shouldValidateDuplicateDocuments = exports.pickFlag = exports.prioritize = exports.isObjectMap = void 0;
+exports.fastValidateGraphQLDocuments = 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,3 +77,26 @@ 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 { isComplexPluginOutput, federationSpec, getCachedDocumentNodeFromSchema, createNoopProfiler, } from '@graphql-codegen/plugin-helpers';
+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 { mergeSchemas } from '@graphql-tools/schema';
-import { extractHashFromSchema, getSkipDocumentsValidationOption, hasFederationSpec, pickFlag, prioritize, shouldValidateDocumentsAgainstSchema, shouldValidateDuplicateDocuments, } from './utils.js';
+import { extractHashFromSchema, fastValidateGraphQLDocuments, getSkipDocumentsValidationOption, hasFederationSpec, pickFlag, prioritize, shouldValidateDocumentsAgainstSchema, shouldValidateDuplicateDocuments, } from './utils.js';
 export async function codegen(options) {
     var _a;
     const documents = options.documents || [];
@@ -63,7 +63,9 @@ export async function codegen(options) {
                 .concat(documents.map(doc => doc.hash))
                 .concat(JSON.stringify(fragments))
                 .join(',');
-            return options.cache('documents-validation', cacheKey, () => validateGraphQlDocuments(schemaInstance, [...documents, ...fragments], rules));
+            return options.cache('documents-validation', cacheKey, () => options.documentsValidator === 'codegen'
+                ? fastValidateGraphQLDocuments(schemaInstance, [...documents, ...fragments], rules)
+                : validateGraphQlDocuments(schemaInstance, [...documents, ...fragments], rules));
         }, 'Validate documents against schema');
         checkValidationErrors(errors);
     }
@@ -201,7 +203,8 @@ function validateDuplicateDocuments(files) {
     `.trimRight())
                 .join('');
             const definitionKindName = kind.replace('Definition', '').toLowerCase();
-            throw new Error(`Not all ${definitionKindName}s have an unique name: ${duplicated.join(', ')}: \n
+            throw new DetailedError(`Not all ${definitionKindName}s have an unique name: ${duplicated.join(', ')}`, `
+          Not all ${definitionKindName}s have an unique name
           ${list}
         `);
         }

package/esm/execute-plugin.js

@@ -1,9 +1,9 @@
-import { createNoopProfiler } from '@graphql-codegen/plugin-helpers';
+import { DetailedError, createNoopProfiler } from '@graphql-codegen/plugin-helpers';
 import { buildASTSchema } from 'graphql';
 export async function executePlugin(options, plugin) {
     var _a;
     if (!plugin || !plugin.plugin || typeof plugin.plugin !== 'function') {
-        throw new Error(`Invalid Custom Plugin "${options.name}" \n
+        throw new DetailedError(`Invalid Custom Plugin "${options.name}"`, `
         Plugin ${options.name} does not export a valid JS object with "plugin" function.
 
         Make sure your custom plugin is written in the following form:
@@ -25,7 +25,7 @@ export async function executePlugin(options, plugin) {
             await profiler.run(async () => plugin.validate(outputSchema, documents, options.config, options.outputFilename, options.allPlugins, pluginContext), `Plugin ${options.name} validate`);
         }
         catch (e) {
-            throw new Error(`Plugin "${options.name}" validation failed: \n
+            throw new DetailedError(`Plugin "${options.name}" validation failed:`, `
             ${e.message}
           `);
         }

package/esm/utils.js

@@ -1,5 +1,5 @@
 import { isDocumentNode } from '@graphql-tools/utils';
-import { isSchema, Kind } from 'graphql';
+import { isSchema, Kind, validate } from 'graphql';
 export function isObjectMap(obj) {
     return obj && typeof obj === 'object' && !Array.isArray(obj);
 }
@@ -66,3 +66,25 @@ 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,11 +1,11 @@
 {
   "name": "@graphql-codegen/core",
-  "version": "2.6.3-alpha-20221025134913-ec8a36be2",
+  "version": "2.6.3-alpha-20221031143038-b4e11f6bc",
   "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-20221025134913-ec8a36be2",
+    "@graphql-codegen/plugin-helpers": "2.7.2-alpha-20221031143038-b4e11f6bc",
     "@graphql-tools/schema": "^9.0.0",
     "@graphql-tools/utils": "^8.8.0",
     "tslib": "~2.4.0"

package/typings/utils.d.cts

@@ -1,5 +1,6 @@
 import { Types } from '@graphql-codegen/plugin-helpers';
-import { DocumentNode, GraphQLSchema } from 'graphql';
+import { LoadDocumentError, Source } from '@graphql-tools/utils';
+import { DocumentNode, GraphQLSchema, ValidationRule } 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;
@@ -8,3 +9,4 @@ 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,5 +1,6 @@
 import { Types } from '@graphql-codegen/plugin-helpers';
-import { DocumentNode, GraphQLSchema } from 'graphql';
+import { LoadDocumentError, Source } from '@graphql-tools/utils';
+import { DocumentNode, GraphQLSchema, ValidationRule } 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;
@@ -8,3 +9,4 @@ 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[]>;