@graphql-codegen/core 2.6.3-alpha-20221025134913-ec8a36be2 → 2.6.3-alpha-20221031145604-c8709223b

package/cjs/codegen.js

@@ -60,15 +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, () => (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();
@@ -206,7 +209,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/esm/codegen.js

@@ -1,7 +1,7 @@
-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 { validateGraphQlDocuments, asArray } from '@graphql-tools/utils';
 import { mergeSchemas } from '@graphql-tools/schema';
 import { extractHashFromSchema, getSkipDocumentsValidationOption, hasFederationSpec, pickFlag, prioritize, shouldValidateDocumentsAgainstSchema, shouldValidateDuplicateDocuments, } from './utils.js';
 export async function codegen(options) {
@@ -57,15 +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, () => 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();
@@ -201,7 +204,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/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@graphql-codegen/core",
-  "version": "2.6.3-alpha-20221025134913-ec8a36be2",
+  "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-20221025134913-ec8a36be2",
+    "@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": {