@graphql-eslint/eslint-plugin 3.4.0-alpha-c01d913.0 → 3.4.0-alpha-d7fc26d.0

package/graphql-config.d.ts

@@ -1,4 +1,3 @@
 import { GraphQLConfig } from 'graphql-config';
 import { ParserOptions } from './types';
-export declare function loadCachedGraphQLConfig(options: ParserOptions): GraphQLConfig;
 export declare function loadGraphQLConfig(options: ParserOptions): GraphQLConfig;

package/index.js

@@ -11,10 +11,10 @@ const path = require('path');
 const utils = require('@graphql-tools/utils');
 const lowerCase = _interopDefault(require('lodash.lowercase'));
 const chalk = _interopDefault(require('chalk'));
-const graphqlConfig = require('graphql-config');
-const codeFileLoader = require('@graphql-tools/code-file-loader');
 const depthLimit = _interopDefault(require('graphql-depth-limit'));
 const graphqlTagPluck = require('@graphql-tools/graphql-tag-pluck');
+const graphqlConfig = require('graphql-config');
+const codeFileLoader = require('@graphql-tools/code-file-loader');
 const eslint = require('eslint');
 const codeFrame = require('@babel/code-frame');
 
@@ -175,47 +175,6 @@ const configs = {
     'operations-all': operationsAllConfig,
 };
 
-let graphQLConfig;
-function loadCachedGraphQLConfig(options) {
-    // We don't want cache config on test environment
-    // Otherwise schema and documents will be same for all tests
-    if (process.env.NODE_ENV !== 'test' && graphQLConfig) {
-        return graphQLConfig;
-    }
-    graphQLConfig = loadGraphQLConfig(options);
-    return graphQLConfig;
-}
-function loadGraphQLConfig(options) {
-    const onDiskConfig = options.skipGraphQLConfig
-        ? null
-        : graphqlConfig.loadConfigSync({
-            throwOnEmpty: false,
-            throwOnMissing: false,
-            extensions: [addCodeFileLoaderExtension],
-        });
-    const configOptions = options.projects
-        ? { projects: options.projects }
-        : {
-            schema: (options.schema || ''),
-            documents: options.documents || options.operations,
-            extensions: options.extensions,
-            include: options.include,
-            exclude: options.exclude,
-        };
-    graphQLConfig =
-        onDiskConfig ||
-            new graphqlConfig.GraphQLConfig({
-                config: configOptions,
-                filepath: 'virtual-config',
-            }, [addCodeFileLoaderExtension]);
-    return graphQLConfig;
-}
-const addCodeFileLoaderExtension = api => {
-    api.loaders.schema.register(new codeFileLoader.CodeFileLoader());
-    api.loaders.documents.register(new codeFileLoader.CodeFileLoader());
-    return { name: 'graphql-eslint-loaders' };
-};
-
 function requireSiblingsOperations(ruleName, context) {
     if (!context.parserServices) {
         throw new Error(`Rule '${ruleName}' requires 'parserOptions.operations' to be set and loaded. See http://bit.ly/graphql-eslint-operations for more info`);
@@ -240,37 +199,6 @@ const logger = {
     // eslint-disable-next-line no-console
     warn: (...args) => console.warn(chalk.yellow('warning'), '[graphql-eslint]', chalk(...args)),
 };
-const schemaToExtendCache = new Map();
-const getGraphQLSchemaToExtend = (ruleId, context) => {
-    // If schema is not loaded, there is no reason to make partial schema aka schemaToExtend
-    if (!context.parserServices.hasTypeInfo) {
-        if (!getGraphQLSchemaToExtend.warningPrintedMap[ruleId]) {
-            logger.warn(`Rule "${ruleId}" works best with schema loaded. See http://bit.ly/graphql-eslint-schema for more info`);
-            getGraphQLSchemaToExtend.warningPrintedMap[ruleId] = true;
-        }
-        return null;
-    }
-    const filename = context.getPhysicalFilename();
-    if (!schemaToExtendCache.has(filename)) {
-        const { schema, schemaOptions } = context.parserOptions;
-        const gqlConfig = loadGraphQLConfig({ schema });
-        const projectForFile = gqlConfig.getProjectForFile(filename);
-        let schemaToExtend;
-        try {
-            schemaToExtend = projectForFile.loadSchemaSync(projectForFile.schema, 'GraphQLSchema', {
-                ...schemaOptions,
-                ignore: filename,
-            });
-        }
-        catch (_a) {
-            // If error throws just ignore it because maybe schema is located in 1 file
-            schemaToExtend = null;
-        }
-        schemaToExtendCache.set(filename, schemaToExtend);
-    }
-    return schemaToExtendCache.get(filename);
-};
-getGraphQLSchemaToExtend.warningPrintedMap = Object.create(null);
 function requireReachableTypesFromContext(ruleName, context) {
     const schema = requireGraphQLSchemaFromContext(ruleName, context);
     return context.parserServices.reachableTypes(schema);
@@ -405,12 +333,12 @@ function getLocation(loc, fieldName = '', offset) {
     };
 }
 
-function validateDocument(context, schema = null, documentNode, rule, isSchemaToExtend = false) {
+function validateDocument(context, schema = null, documentNode, rule) {
     if (documentNode.definitions.length === 0) {
         return;
     }
     try {
-        const validationErrors = schema && !isSchemaToExtend
+        const validationErrors = schema
             ? graphql.validate(schema, documentNode, [rule])
             : validate.validateSDL(documentNode, schema, [rule]);
         for (const error of validationErrors) {
@@ -524,19 +452,13 @@ const validationToRule = (ruleId, ruleName, docs, getDocumentNode) => {
                     logger.warn(`You rule "${ruleId}" depends on a GraphQL validation rule "${ruleName}" but it's not available in the "graphql-js" version you are using. Skipping...`);
                     return {};
                 }
-                let schema;
-                if (docs.requiresSchemaToExtend) {
-                    schema = getGraphQLSchemaToExtend(ruleId, context);
-                }
-                else if (docs.requiresSchema) {
-                    schema = requireGraphQLSchemaFromContext(ruleId, context);
-                }
                 return {
                     Document(node) {
+                        const schema = docs.requiresSchema ? requireGraphQLSchemaFromContext(ruleId, context) : null;
                         const documentNode = getDocumentNode
                             ? getDocumentNode({ ruleId, context, schema, node: node.rawNode() })
                             : node.rawNode();
-                        validateDocument(context, schema, documentNode, ruleFn, docs.requiresSchemaToExtend);
+                        validateDocument(context, schema, documentNode, ruleFn);
                     },
                 };
             },
@@ -688,7 +610,6 @@ const GRAPHQL_JS_VALIDATIONS = Object.assign({}, validationToRule('executable-de
     description: `A type extension is only valid if the type is defined and has the same kind.`,
     recommended: false,
     requiresSchema: true,
-    requiresSchemaToExtend: true,
 }), validationToRule('provided-required-arguments', 'ProvidedRequiredArguments', {
     category: ['Schema', 'Operations'],
     description: `A field or directive is only valid if all required (non-null without a default value) field arguments have been provided.`,
@@ -716,13 +637,9 @@ const GRAPHQL_JS_VALIDATIONS = Object.assign({}, validationToRule('executable-de
     category: 'Schema',
     description: `A GraphQL enum type is only valid if all its values are uniquely named.`,
     recommended: false,
-    requiresSchema: true,
-    requiresSchemaToExtend: true,
 }), validationToRule('unique-field-definition-names', 'UniqueFieldDefinitionNames', {
     category: 'Schema',
     description: `A GraphQL complex type is only valid if all its fields are uniquely named.`,
-    requiresSchema: true,
-    requiresSchemaToExtend: true,
 }), validationToRule('unique-input-field-names', 'UniqueInputFieldNames', {
     category: 'Operations',
     description: `A GraphQL input object value is only valid if all supplied fields are uniquely named.`,
@@ -3813,6 +3730,43 @@ function getSiblingOperations(options, gqlConfig) {
     return siblingOperations;
 }
 
+let graphQLConfig;
+function loadGraphQLConfig(options) {
+    // We don't want cache config on test environment
+    // Otherwise schema and documents will be same for all tests
+    if (process.env.NODE_ENV !== 'test' && graphQLConfig) {
+        return graphQLConfig;
+    }
+    const onDiskConfig = options.skipGraphQLConfig
+        ? null
+        : graphqlConfig.loadConfigSync({
+            throwOnEmpty: false,
+            throwOnMissing: false,
+            extensions: [addCodeFileLoaderExtension],
+        });
+    const configOptions = options.projects
+        ? { projects: options.projects }
+        : {
+            schema: (options.schema || ''),
+            documents: options.documents || options.operations,
+            extensions: options.extensions,
+            include: options.include,
+            exclude: options.exclude,
+        };
+    graphQLConfig =
+        onDiskConfig ||
+            new graphqlConfig.GraphQLConfig({
+                config: configOptions,
+                filepath: 'virtual-config',
+            }, [addCodeFileLoaderExtension]);
+    return graphQLConfig;
+}
+const addCodeFileLoaderExtension = api => {
+    api.loaders.schema.register(new codeFileLoader.CodeFileLoader());
+    api.loaders.documents.register(new codeFileLoader.CodeFileLoader());
+    return { name: 'graphql-eslint-loaders' };
+};
+
 let reachableTypesCache;
 function getReachableTypes(schema) {
     // We don't want cache reachableTypes on test environment
@@ -3895,7 +3849,7 @@ function parse(code, options) {
     return parseForESLint(code, options).ast;
 }
 function parseForESLint(code, options = {}) {
-    const gqlConfig = loadCachedGraphQLConfig(options);
+    const gqlConfig = loadGraphQLConfig(options);
     const schema = getSchema(options, gqlConfig);
     const parserServices = {
         hasTypeInfo: schema !== null,

package/index.mjs

@@ -5,10 +5,10 @@ import { dirname, extname, basename, relative, resolve } from 'path';
 import { asArray, parseGraphQLSDL } from '@graphql-tools/utils';
 import lowerCase from 'lodash.lowercase';
 import chalk from 'chalk';
-import { loadConfigSync, GraphQLConfig } from 'graphql-config';
-import { CodeFileLoader } from '@graphql-tools/code-file-loader';
 import depthLimit from 'graphql-depth-limit';
 import { parseCode } from '@graphql-tools/graphql-tag-pluck';
+import { loadConfigSync, GraphQLConfig } from 'graphql-config';
+import { CodeFileLoader } from '@graphql-tools/code-file-loader';
 import { RuleTester, Linter } from 'eslint';
 import { codeFrameColumns } from '@babel/code-frame';
 
@@ -169,47 +169,6 @@ const configs = {
     'operations-all': operationsAllConfig,
 };
 
-let graphQLConfig;
-function loadCachedGraphQLConfig(options) {
-    // We don't want cache config on test environment
-    // Otherwise schema and documents will be same for all tests
-    if (process.env.NODE_ENV !== 'test' && graphQLConfig) {
-        return graphQLConfig;
-    }
-    graphQLConfig = loadGraphQLConfig(options);
-    return graphQLConfig;
-}
-function loadGraphQLConfig(options) {
-    const onDiskConfig = options.skipGraphQLConfig
-        ? null
-        : loadConfigSync({
-            throwOnEmpty: false,
-            throwOnMissing: false,
-            extensions: [addCodeFileLoaderExtension],
-        });
-    const configOptions = options.projects
-        ? { projects: options.projects }
-        : {
-            schema: (options.schema || ''),
-            documents: options.documents || options.operations,
-            extensions: options.extensions,
-            include: options.include,
-            exclude: options.exclude,
-        };
-    graphQLConfig =
-        onDiskConfig ||
-            new GraphQLConfig({
-                config: configOptions,
-                filepath: 'virtual-config',
-            }, [addCodeFileLoaderExtension]);
-    return graphQLConfig;
-}
-const addCodeFileLoaderExtension = api => {
-    api.loaders.schema.register(new CodeFileLoader());
-    api.loaders.documents.register(new CodeFileLoader());
-    return { name: 'graphql-eslint-loaders' };
-};
-
 function requireSiblingsOperations(ruleName, context) {
     if (!context.parserServices) {
         throw new Error(`Rule '${ruleName}' requires 'parserOptions.operations' to be set and loaded. See http://bit.ly/graphql-eslint-operations for more info`);
@@ -234,37 +193,6 @@ const logger = {
     // eslint-disable-next-line no-console
     warn: (...args) => console.warn(chalk.yellow('warning'), '[graphql-eslint]', chalk(...args)),
 };
-const schemaToExtendCache = new Map();
-const getGraphQLSchemaToExtend = (ruleId, context) => {
-    // If schema is not loaded, there is no reason to make partial schema aka schemaToExtend
-    if (!context.parserServices.hasTypeInfo) {
-        if (!getGraphQLSchemaToExtend.warningPrintedMap[ruleId]) {
-            logger.warn(`Rule "${ruleId}" works best with schema loaded. See http://bit.ly/graphql-eslint-schema for more info`);
-            getGraphQLSchemaToExtend.warningPrintedMap[ruleId] = true;
-        }
-        return null;
-    }
-    const filename = context.getPhysicalFilename();
-    if (!schemaToExtendCache.has(filename)) {
-        const { schema, schemaOptions } = context.parserOptions;
-        const gqlConfig = loadGraphQLConfig({ schema });
-        const projectForFile = gqlConfig.getProjectForFile(filename);
-        let schemaToExtend;
-        try {
-            schemaToExtend = projectForFile.loadSchemaSync(projectForFile.schema, 'GraphQLSchema', {
-                ...schemaOptions,
-                ignore: filename,
-            });
-        }
-        catch (_a) {
-            // If error throws just ignore it because maybe schema is located in 1 file
-            schemaToExtend = null;
-        }
-        schemaToExtendCache.set(filename, schemaToExtend);
-    }
-    return schemaToExtendCache.get(filename);
-};
-getGraphQLSchemaToExtend.warningPrintedMap = Object.create(null);
 function requireReachableTypesFromContext(ruleName, context) {
     const schema = requireGraphQLSchemaFromContext(ruleName, context);
     return context.parserServices.reachableTypes(schema);
@@ -399,12 +327,12 @@ function getLocation(loc, fieldName = '', offset) {
     };
 }
 
-function validateDocument(context, schema = null, documentNode, rule, isSchemaToExtend = false) {
+function validateDocument(context, schema = null, documentNode, rule) {
     if (documentNode.definitions.length === 0) {
         return;
     }
     try {
-        const validationErrors = schema && !isSchemaToExtend
+        const validationErrors = schema
             ? validate(schema, documentNode, [rule])
             : validateSDL(documentNode, schema, [rule]);
         for (const error of validationErrors) {
@@ -518,19 +446,13 @@ const validationToRule = (ruleId, ruleName, docs, getDocumentNode) => {
                     logger.warn(`You rule "${ruleId}" depends on a GraphQL validation rule "${ruleName}" but it's not available in the "graphql-js" version you are using. Skipping...`);
                     return {};
                 }
-                let schema;
-                if (docs.requiresSchemaToExtend) {
-                    schema = getGraphQLSchemaToExtend(ruleId, context);
-                }
-                else if (docs.requiresSchema) {
-                    schema = requireGraphQLSchemaFromContext(ruleId, context);
-                }
                 return {
                     Document(node) {
+                        const schema = docs.requiresSchema ? requireGraphQLSchemaFromContext(ruleId, context) : null;
                         const documentNode = getDocumentNode
                             ? getDocumentNode({ ruleId, context, schema, node: node.rawNode() })
                             : node.rawNode();
-                        validateDocument(context, schema, documentNode, ruleFn, docs.requiresSchemaToExtend);
+                        validateDocument(context, schema, documentNode, ruleFn);
                     },
                 };
             },
@@ -682,7 +604,6 @@ const GRAPHQL_JS_VALIDATIONS = Object.assign({}, validationToRule('executable-de
     description: `A type extension is only valid if the type is defined and has the same kind.`,
     recommended: false,
     requiresSchema: true,
-    requiresSchemaToExtend: true,
 }), validationToRule('provided-required-arguments', 'ProvidedRequiredArguments', {
     category: ['Schema', 'Operations'],
     description: `A field or directive is only valid if all required (non-null without a default value) field arguments have been provided.`,
@@ -710,13 +631,9 @@ const GRAPHQL_JS_VALIDATIONS = Object.assign({}, validationToRule('executable-de
     category: 'Schema',
     description: `A GraphQL enum type is only valid if all its values are uniquely named.`,
     recommended: false,
-    requiresSchema: true,
-    requiresSchemaToExtend: true,
 }), validationToRule('unique-field-definition-names', 'UniqueFieldDefinitionNames', {
     category: 'Schema',
     description: `A GraphQL complex type is only valid if all its fields are uniquely named.`,
-    requiresSchema: true,
-    requiresSchemaToExtend: true,
 }), validationToRule('unique-input-field-names', 'UniqueInputFieldNames', {
     category: 'Operations',
     description: `A GraphQL input object value is only valid if all supplied fields are uniquely named.`,
@@ -3807,6 +3724,43 @@ function getSiblingOperations(options, gqlConfig) {
     return siblingOperations;
 }
 
+let graphQLConfig;
+function loadGraphQLConfig(options) {
+    // We don't want cache config on test environment
+    // Otherwise schema and documents will be same for all tests
+    if (process.env.NODE_ENV !== 'test' && graphQLConfig) {
+        return graphQLConfig;
+    }
+    const onDiskConfig = options.skipGraphQLConfig
+        ? null
+        : loadConfigSync({
+            throwOnEmpty: false,
+            throwOnMissing: false,
+            extensions: [addCodeFileLoaderExtension],
+        });
+    const configOptions = options.projects
+        ? { projects: options.projects }
+        : {
+            schema: (options.schema || ''),
+            documents: options.documents || options.operations,
+            extensions: options.extensions,
+            include: options.include,
+            exclude: options.exclude,
+        };
+    graphQLConfig =
+        onDiskConfig ||
+            new GraphQLConfig({
+                config: configOptions,
+                filepath: 'virtual-config',
+            }, [addCodeFileLoaderExtension]);
+    return graphQLConfig;
+}
+const addCodeFileLoaderExtension = api => {
+    api.loaders.schema.register(new CodeFileLoader());
+    api.loaders.documents.register(new CodeFileLoader());
+    return { name: 'graphql-eslint-loaders' };
+};
+
 let reachableTypesCache;
 function getReachableTypes(schema) {
     // We don't want cache reachableTypes on test environment
@@ -3889,7 +3843,7 @@ function parse(code, options) {
     return parseForESLint(code, options).ast;
 }
 function parseForESLint(code, options = {}) {
-    const gqlConfig = loadCachedGraphQLConfig(options);
+    const gqlConfig = loadGraphQLConfig(options);
     const schema = getSchema(options, gqlConfig);
     const parserServices = {
         hasTypeInfo: schema !== null,

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@graphql-eslint/eslint-plugin",
-  "version": "3.4.0-alpha-c01d913.0",
+  "version": "3.4.0-alpha-d7fc26d.0",
   "description": "GraphQL plugin for ESLint",
   "sideEffects": false,
   "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": {
-    "@babel/code-frame": "7.16.0",
+    "@babel/code-frame": "7.16.7",
     "@graphql-tools/code-file-loader": "7.2.3",
     "@graphql-tools/graphql-tag-pluck": "7.1.4",
     "@graphql-tools/utils": "8.5.5",

package/types.d.ts

@@ -51,7 +51,6 @@ export declare type RuleDocsInfo<T> = {
         category: CategoryType | CategoryType[];
         requiresSchema?: true;
         requiresSiblings?: true;
-        requiresSchemaToExtend?: true;
         examples?: {
             title: string;
             code: string;

package/utils.d.ts

@@ -10,11 +10,6 @@ export declare const logger: {
     error: (...args: any[]) => void;
     warn: (...args: any[]) => void;
 };
-declare type GetGraphQLSchemaToExtend = {
-    (ruleId: string, ctx: GraphQLESLintRuleContext): GraphQLSchema | null;
-    warningPrintedMap: Record<string, boolean>;
-};
-export declare const getGraphQLSchemaToExtend: GetGraphQLSchemaToExtend;
 export declare function requireReachableTypesFromContext(ruleName: string, context: GraphQLESLintRuleContext): ReachableTypes | never;
 export declare function requireUsedFieldsFromContext(ruleName: string, context: GraphQLESLintRuleContext): UsedFields | never;
 export declare function extractTokens(source: Source): AST.Token[];
@@ -36,4 +31,3 @@ export declare function getLocation(loc: Partial<AST.SourceLocation>, fieldName?
     offsetStart?: number;
     offsetEnd?: number;
 }): AST.SourceLocation;
-export {};