@graphql-eslint/eslint-plugin 3.14.4-alpha-20230125194817-6f69222 → 3.15.0-alpha-20230125195254-57d0b30

package/cjs/parser.js

@@ -26,12 +26,21 @@ function parseForESLint(code, options) {
         const gqlConfig = (0, graphql_config_js_1.loadGraphQLConfig)(options);
         const realFilepath = filePath.replace(utils_js_1.VIRTUAL_DOCUMENT_REGEX, '');
         const project = gqlConfig.getProjectForFile(realFilepath);
-        const schema = project
-            ? (0, schema_js_1.getSchema)(project, options.schemaOptions)
-            : typeof options.schema === 'string'
-                ? (0, graphql_1.buildSchema)(options.schema)
-                : null;
-        const rootTree = (0, index_js_1.convertToESTree)(document, schema instanceof graphql_1.GraphQLSchema ? schema : undefined);
+        let schema = null;
+        try {
+            schema = project
+                ? (0, schema_js_1.getSchema)(project, options.schemaOptions)
+                : typeof options.schema === 'string'
+                    ? (0, graphql_1.buildSchema)(options.schema)
+                    : null;
+        }
+        catch (error) {
+            if (error instanceof Error) {
+                error.message = `Error while loading schema: ${error.message}`;
+            }
+            throw error;
+        }
+        const rootTree = (0, index_js_1.convertToESTree)(document, schema);
         return {
             services: {
                 schema,

package/cjs/schema.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSchema = void 0;
 const tslib_1 = require("tslib");
-const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const debug_1 = tslib_1.__importDefault(require("debug"));
 const fast_glob_1 = tslib_1.__importDefault(require("fast-glob"));
 const graphql_1 = require("graphql");
@@ -18,27 +17,18 @@ function getSchema(project, schemaOptions) {
     if (cache) {
         return cache;
     }
-    let schema;
-    try {
-        debug('Loading schema from %o', project.schema);
-        schema = project.loadSchemaSync(project.schema, 'GraphQLSchema', {
-            ...schemaOptions,
-            pluckConfig: project.extensions.pluckConfig,
-        });
-        if (debug.enabled) {
-            debug('Schema loaded: %o', schema instanceof graphql_1.GraphQLSchema);
-            const schemaPaths = fast_glob_1.default.sync(project.schema, { absolute: true });
-            debug('Schema pointers %O', schemaPaths);
-        }
-        // Do not set error to cache, since cache reload will be done after some `lifetime` seconds
-        schemaCache.set(schemaKey, schema);
-    }
-    catch (error) {
-        if (error instanceof Error) {
-            error.message = chalk_1.default.red(`Error while loading schema: ${error.message}`);
-        }
-        schema = error;
+    debug('Loading schema from %o', project.schema);
+    const schema = project.loadSchemaSync(project.schema, 'GraphQLSchema', {
+        ...schemaOptions,
+        pluckConfig: project.extensions.pluckConfig,
+    });
+    if (debug.enabled) {
+        debug('Schema loaded: %o', schema instanceof graphql_1.GraphQLSchema);
+        const schemaPaths = fast_glob_1.default.sync(project.schema, { absolute: true });
+        debug('Schema pointers %O', schemaPaths);
     }
+    // Do not set error to cache, since cache reload will be done after some `lifetime` seconds
+    schemaCache.set(schemaKey, schema);
     return schema;
 }
 exports.getSchema = getSchema;

package/cjs/utils.js

@@ -18,9 +18,6 @@ function requireGraphQLSchemaFromContext(ruleId, context) {
     if (!schema) {
         throw new Error(`Rule \`${ruleId}\` requires \`parserOptions.schema\` to be set and loaded. See https://bit.ly/graphql-eslint-schema for more info`);
     }
-    else if (schema instanceof Error) {
-        throw schema;
-    }
     return schema;
 }
 exports.requireGraphQLSchemaFromContext = requireGraphQLSchemaFromContext;

package/esm/parser.js

@@ -1,6 +1,6 @@
 import { parseGraphQLSDL } from '@graphql-tools/utils';
 import debugFactory from 'debug';
-import { buildSchema, GraphQLError, GraphQLSchema } from 'graphql';
+import { buildSchema, GraphQLError } from 'graphql';
 import { convertToESTree, extractComments, extractTokens } from './estree-converter/index.js';
 import { loadGraphQLConfig } from './graphql-config.js';
 import { getSchema } from './schema.js';
@@ -22,12 +22,21 @@ export function parseForESLint(code, options) {
         const gqlConfig = loadGraphQLConfig(options);
         const realFilepath = filePath.replace(VIRTUAL_DOCUMENT_REGEX, '');
         const project = gqlConfig.getProjectForFile(realFilepath);
-        const schema = project
-            ? getSchema(project, options.schemaOptions)
-            : typeof options.schema === 'string'
-                ? buildSchema(options.schema)
-                : null;
-        const rootTree = convertToESTree(document, schema instanceof GraphQLSchema ? schema : undefined);
+        let schema = null;
+        try {
+            schema = project
+                ? getSchema(project, options.schemaOptions)
+                : typeof options.schema === 'string'
+                    ? buildSchema(options.schema)
+                    : null;
+        }
+        catch (error) {
+            if (error instanceof Error) {
+                error.message = `Error while loading schema: ${error.message}`;
+            }
+            throw error;
+        }
+        const rootTree = convertToESTree(document, schema);
         return {
             services: {
                 schema,

package/esm/schema.js

@@ -1,4 +1,3 @@
-import chalk from 'chalk';
 import debugFactory from 'debug';
 import fg from 'fast-glob';
 import { GraphQLSchema } from 'graphql';
@@ -14,26 +13,17 @@ export function getSchema(project, schemaOptions) {
     if (cache) {
         return cache;
     }
-    let schema;
-    try {
-        debug('Loading schema from %o', project.schema);
-        schema = project.loadSchemaSync(project.schema, 'GraphQLSchema', {
-            ...schemaOptions,
-            pluckConfig: project.extensions.pluckConfig,
-        });
-        if (debug.enabled) {
-            debug('Schema loaded: %o', schema instanceof GraphQLSchema);
-            const schemaPaths = fg.sync(project.schema, { absolute: true });
-            debug('Schema pointers %O', schemaPaths);
-        }
-        // Do not set error to cache, since cache reload will be done after some `lifetime` seconds
-        schemaCache.set(schemaKey, schema);
-    }
-    catch (error) {
-        if (error instanceof Error) {
-            error.message = chalk.red(`Error while loading schema: ${error.message}`);
-        }
-        schema = error;
+    debug('Loading schema from %o', project.schema);
+    const schema = project.loadSchemaSync(project.schema, 'GraphQLSchema', {
+        ...schemaOptions,
+        pluckConfig: project.extensions.pluckConfig,
+    });
+    if (debug.enabled) {
+        debug('Schema loaded: %o', schema instanceof GraphQLSchema);
+        const schemaPaths = fg.sync(project.schema, { absolute: true });
+        debug('Schema pointers %O', schemaPaths);
     }
+    // Do not set error to cache, since cache reload will be done after some `lifetime` seconds
+    schemaCache.set(schemaKey, schema);
     return schema;
 }

package/esm/utils.js

@@ -13,9 +13,6 @@ export function requireGraphQLSchemaFromContext(ruleId, context) {
     if (!schema) {
         throw new Error(`Rule \`${ruleId}\` requires \`parserOptions.schema\` to be set and loaded. See https://bit.ly/graphql-eslint-schema for more info`);
     }
-    else if (schema instanceof Error) {
-        throw schema;
-    }
     return schema;
 }
 export const logger = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-eslint/eslint-plugin",
-  "version": "3.14.4-alpha-20230125194817-6f69222",
+  "version": "3.15.0-alpha-20230125195254-57d0b30",
   "description": "GraphQL plugin for ESLint",
   "sideEffects": false,
   "peerDependencies": {

package/typings/estree-converter/converter.d.cts

@@ -1,3 +1,3 @@
 import { DocumentNode, GraphQLSchema } from 'graphql';
 import { GraphQLESTreeNode } from './types.cjs';
-export declare function convertToESTree<T extends DocumentNode>(node: T, schema?: GraphQLSchema): GraphQLESTreeNode<T, false>;
+export declare function convertToESTree<T extends DocumentNode>(node: T, schema?: GraphQLSchema | null): GraphQLESTreeNode<T, false>;

package/typings/estree-converter/converter.d.ts

@@ -1,3 +1,3 @@
 import { DocumentNode, GraphQLSchema } from 'graphql';
 import { GraphQLESTreeNode } from './types.js';
-export declare function convertToESTree<T extends DocumentNode>(node: T, schema?: GraphQLSchema): GraphQLESTreeNode<T, false>;
+export declare function convertToESTree<T extends DocumentNode>(node: T, schema?: GraphQLSchema | null): GraphQLESTreeNode<T, false>;

package/typings/types.d.cts

@@ -6,8 +6,8 @@ import { IExtensions, IGraphQLProject } from 'graphql-config';
 import { JSONSchema } from 'json-schema-to-ts';
 import { SiblingOperations } from './siblings.cjs';
 import { GraphQLESLintRuleListener } from './testkit.cjs';
-export type Schema = Error | GraphQLSchema | null;
-export type Pointer = string[] | string;
+export type Schema = GraphQLSchema | null;
+export type Pointer = string | string[];
 export interface ParserOptions {
     schema?: Pointer | Record<string, {
         headers: Record<string, string>;

package/typings/types.d.ts

@@ -6,8 +6,8 @@ import { IExtensions, IGraphQLProject } from 'graphql-config';
 import { JSONSchema } from 'json-schema-to-ts';
 import { SiblingOperations } from './siblings.js';
 import { GraphQLESLintRuleListener } from './testkit.js';
-export type Schema = Error | GraphQLSchema | null;
-export type Pointer = string[] | string;
+export type Schema = GraphQLSchema | null;
+export type Pointer = string | string[];
 export interface ParserOptions {
     schema?: Pointer | Record<string, {
         headers: Record<string, string>;