@cspell/eslint-plugin 8.15.7 → 8.16.0

package/README.md

@@ -98,7 +98,7 @@ interface Options {
    */
   generateSuggestions: boolean;
   /**
-   * Ignore import and require names
+   * Ignore import, require names, and export from names
    * @default true
    */
   ignoreImports?: boolean;

package/dist/common/logger.cjs

@@ -31,10 +31,9 @@ class Logger {
         if (!this.logToFile)
             return console.log(...p);
         const message = new Date().toISOString() + ' ' + prefixLines((0, node_util_1.format)(...p), '  ') + '\n';
-        this.useAsync
+        return this.useAsync
             ? node_fs_1.default.appendFile(this.logFile, message, (err) => err && console.error(err))
             : node_fs_1.default.appendFileSync(this.logFile, message);
-        return;
     }
     log = this._log.bind(this);
 }

package/dist/plugin/configs.d.cts

@@ -1,4 +1,4 @@
 import type { Linter } from 'eslint';
 export * as recommended from './recommended.cjs';
-export declare const debug: Linter.FlatConfig;
+export declare const debug: Linter.Config;
 //# sourceMappingURL=configs.d.cts.map

package/dist/plugin/cspell-eslint-plugin.cjs

@@ -9,7 +9,6 @@ const logger_cjs_1 = require("../common/logger.cjs");
 const defaultCheckOptions_cjs_1 = require("./defaultCheckOptions.cjs");
 const optionsSchema = JSON.parse((0, node_fs_1.readFileSync)((0, node_path_1.join)(__dirname, '../../assets/options.schema.json'), 'utf8'));
 const schema = optionsSchema;
-// eslint-disable-next-line n/no-missing-require
 const spellCheck = (0, synckit_1.createSyncFn)(require.resolve('../worker/worker.mjs'));
 const messages = {
     wordUnknown: 'Unknown word: "{{word}}"',

package/dist/worker/{ASTNode.d.cts → ASTNode.d.mts}

@@ -6,4 +6,4 @@ export type ASTNode = Readonly<(Node | Comment | JSXText) & {
     parent?: Node;
 }>;
 export type NodeType = ASTNode['type'];
-//# sourceMappingURL=ASTNode.d.cts.map
+//# sourceMappingURL=ASTNode.d.mts.map

package/dist/worker/ASTNode.mjs

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=ASTNode.mjs.map

package/dist/worker/ASTPath.d.mts

@@ -1,4 +1,4 @@
-import type { ASTNode } from './ASTNode.cjs';
+import type { ASTNode } from './ASTNode.mjs';
 export type Key = string | number | symbol | null | undefined;
 export interface ASTPathElement {
     node: ASTNode;

package/dist/worker/spellCheck.d.mts

@@ -1,5 +1,5 @@
 import type { Node } from 'estree';
 import type { WorkerOptions } from '../common/options.cjs';
-import type { SpellCheckResults } from './types.cjs';
+import type { SpellCheckResults } from './types.mjs';
 export declare function spellCheck(filename: string, text: string, root: Node, options: WorkerOptions): Promise<SpellCheckResults>;
 //# sourceMappingURL=spellCheck.d.mts.map

package/dist/worker/spellCheck.mjs

@@ -50,7 +50,7 @@ export async function spellCheck(filename, text, root, options) {
             return;
         if (typeof node.value === 'string') {
             debugNode(path, node.value);
-            if (options.ignoreImports && isImportOrRequired(node))
+            if (options.ignoreImports && (isImportOrRequired(node) || isExportNamedDeclaration(node)))
                 return;
             if (options.ignoreImportProperties && isImportedProperty(node))
                 return;
@@ -97,6 +97,13 @@ export async function spellCheck(filename, text, root, options) {
             else if (options.ignoreImportProperties && isImportedProperty(node)) {
                 return;
             }
+            if (isExportIdentifier(node)) {
+                importedIdentifiers.add(node.name);
+                if (isLocalExportIdentifierUnique(node)) {
+                    checkNodeText(path, node.name);
+                }
+                return;
+            }
         }
         if (!options.checkIdentifiers)
             return;
@@ -123,7 +130,7 @@ export async function spellCheck(filename, text, root, options) {
         const range = [node.range[0] + adj, node.range[1] - adj];
         const scope = calcScope(path);
         const result = validator.checkText(range, text, scope);
-        result.forEach((issue) => reportIssue(issue, node.type));
+        result.forEach((issue) => reportIssue(issue, node));
     }
     function calcScope(_path) {
         // inheritance(node);
@@ -138,6 +145,12 @@ export async function spellCheck(filename, text, root, options) {
             parent.type === 'ImportDefaultSpecifier') &&
             parent.local === node);
     }
+    function isExportIdentifier(node) {
+        const parent = getExportParent(node);
+        if (node.type !== 'Identifier' || !parent)
+            return false;
+        return parent.type === 'ExportSpecifier' && parent.exported === node;
+    }
     function isRawImportIdentifier(node) {
         const parent = node.parent;
         if (node.type !== 'Identifier' || !parent)
@@ -154,10 +167,23 @@ export async function spellCheck(filename, text, root, options) {
             return true;
         return imported.range?.[0] !== local.range?.[0] && imported.range?.[1] !== local.range?.[1];
     }
+    function isLocalExportIdentifierUnique(node) {
+        const parent = getExportParent(node);
+        if (!parent)
+            return true;
+        const { exported, local } = parent;
+        if (exported.type === 'Identifier' && exported.name !== local.name)
+            return true;
+        return exported.range?.[0] !== local.range?.[0] && exported.range?.[1] !== local.range?.[1];
+    }
     function getImportParent(node) {
         const parent = node.parent;
         return parent?.type === 'ImportSpecifier' ? parent : undefined;
     }
+    function getExportParent(node) {
+        const parent = node.parent;
+        return parent?.type === 'ExportSpecifier' ? parent : undefined;
+    }
     function skipCheckForRawImportIdentifiers(node) {
         if (options.ignoreImports)
             return false;
@@ -171,13 +197,14 @@ export async function spellCheck(filename, text, root, options) {
     function isObjectProperty(node) {
         return node.parent?.type === 'MemberExpression';
     }
-    function reportIssue(issue, nodeType) {
+    function reportIssue(issue, node) {
+        const nodeType = node.type;
         const word = issue.text;
         const start = issue.offset;
         const end = issue.offset + (issue.length || issue.text.length);
         const suggestions = normalizeSuggestions(issue.suggestionsEx, nodeType);
         const severity = issue.isFlagged ? 'Forbidden' : 'Unknown';
-        issues.push({ word, start, end, nodeType, suggestions, severity });
+        issues.push({ word, start, end, nodeType, node, suggestions, severity });
     }
     const processors = {
         Line: checkComment,
@@ -270,6 +297,9 @@ export async function spellCheck(filename, text, root, options) {
     function isImportOrRequired(node) {
         return isRequireCall(node.parent) || (node.parent?.type === 'ImportDeclaration' && node.parent.source === node);
     }
+    function isExportNamedDeclaration(node) {
+        return node.parent?.type === 'ExportNamedDeclaration' && node.parent.source === node;
+    }
     function debugNode(path, value) {
         log(`${inheritanceSummary(path)}: %o`, value);
         if (debugMode)

package/dist/worker/{types.d.cts → types.d.mts}

@@ -1,6 +1,6 @@
 import type { Node } from 'estree';
 import type { WorkerOptions } from '../common/options.cjs';
-import type { NodeType } from './ASTNode.cjs';
+import type { ASTNode, NodeType } from './ASTNode.mjs';
 interface ExtendedSuggestion {
     /**
      * The suggestion.
@@ -23,6 +23,7 @@ export interface Issue {
     severity: 'Forbidden' | 'Unknown' | 'Hint';
     suggestions: Suggestions;
     nodeType: NodeType;
+    node: ASTNode | undefined;
 }
 export interface SpellCheckResults {
     issues: Issue[];
@@ -31,4 +32,4 @@ export interface SpellCheckResults {
 export type SpellCheckFn = (filename: string, text: string, root: Node, options: WorkerOptions) => Promise<SpellCheckResults>;
 export type SpellCheckSyncFn = (...p: Parameters<SpellCheckFn>) => Awaited<ReturnType<SpellCheckFn>>;
 export {};
-//# sourceMappingURL=types.d.cts.map
+//# sourceMappingURL=types.d.mts.map

package/dist/worker/types.mjs

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=types.mjs.map

package/dist/worker/walkTree.d.mts

@@ -1,4 +1,4 @@
-import type { ASTNode } from './ASTNode.cjs';
+import type { ASTNode } from './ASTNode.mjs';
 import type { ASTPath } from './ASTPath.mjs';
 export declare function walkTree(node: ASTNode, enter: (path: ASTPath) => void): void;
 //# sourceMappingURL=walkTree.d.mts.map

package/dist/worker/walkTree.mjs

@@ -44,7 +44,9 @@ function walk(root, enter) {
             if (Array.isArray(v)) {
                 for (let i = 0; i < v.length; ++i) {
                     const vv = v[i];
-                    isNode(vv) && walkNodes(fx, vv, node, key, i);
+                    if (!isNode(vv))
+                        continue;
+                    walkNodes(fx, vv, node, key, i);
                 }
             }
             else if (isNode(v)) {

package/dist/worker/worker.d.mts

@@ -1,5 +1,2 @@
-export type Node = import("estree").Node;
-export type Issue = import("./types.cjs").Issue;
-export type SpellCheckResults = import("./types.cjs").SpellCheckResults;
-export type WorkerOptions = import("../common/options.cjs").WorkerOptions;
+export {};
 //# sourceMappingURL=worker.d.mts.map

package/dist/worker/worker.mjs

@@ -1,24 +1,6 @@
-// @ts-check
-/**
- * @typedef {import('estree').Node} Node
- * @typedef {import('./types.cjs').Issue} Issue
- * @typedef {import('./types.cjs').SpellCheckResults} SpellCheckResults
- * @typedef {import('../common/options.cjs').WorkerOptions} WorkerOptions
- */
 import { runAsWorker } from 'synckit';
-/**
- * @type {typeof import('./spellCheck.mjs')}
- */
 let spellChecker;
-runAsWorker(
-/**
- * @param {string} filename
- * @param {string} text
- * @param {Node} root
- * @param {WorkerOptions} options
- * @returns {Promise<SpellCheckResults>} The issues found.
- */
-async (filename, text, root, options) => {
+runAsWorker(async (filename, text, root, options) => {
     if (!spellChecker) {
         spellChecker = await import('./spellCheck.mjs');
     }

package/package.json

@@ -4,7 +4,7 @@
     "access": "public",
     "provenance": true
   },
-  "version": "8.15.7",
+  "version": "8.16.0",
   "description": "CSpell ESLint plugin",
   "keywords": [
     "cspell",
@@ -64,7 +64,9 @@
     "coverage": "echo coverage",
     "test-watch": "pnpm run test -- --watch",
     "test-yaml": "npx mocha --timeout 10000 \"dist/**/yaml.test.mjs\"",
-    "test": "npx mocha --timeout 10000 \"dist/**/*.test.mjs\""
+    "test-eslint": "npx mocha --timeout 10000 \"dist/**/*.test.mjs\"",
+    "test-samples": "pnpm -r --filter @internal/eslint-plugin-fixtures-simple test",
+    "test": "pnpm run test-eslint && pnpm run test-samples"
   },
   "repository": {
     "type": "git",
@@ -83,8 +85,8 @@
     "@types/eslint": "^8.56.12",
     "@types/estree": "^1.0.6",
     "@types/mocha": "^10.0.9",
-    "@typescript-eslint/parser": "^8.12.2",
-    "@typescript-eslint/types": "^8.12.2",
+    "@typescript-eslint/parser": "^8.13.0",
+    "@typescript-eslint/types": "^8.13.0",
     "eslint": "^9.14.0",
     "eslint-plugin-jsonc": "^2.16.0",
     "eslint-plugin-mdx": "^3.1.5",
@@ -92,22 +94,22 @@
     "eslint-plugin-react": "^7.37.2",
     "eslint-plugin-simple-import-sort": "^12.1.1",
     "eslint-plugin-yml": "^1.15.0",
-    "globals": "^15.11.0",
+    "globals": "^15.12.0",
     "jsonc-eslint-parser": "^2.4.0",
     "mocha": "^10.8.2",
     "ts-json-schema-generator": "^2.3.0",
     "typescript": "~5.6.3",
-    "typescript-eslint": "^8.12.2",
+    "typescript-eslint": "^8.13.0",
     "yaml-eslint-parser": "^1.2.3"
   },
   "dependencies": {
-    "@cspell/cspell-types": "8.15.7",
-    "@cspell/url": "8.15.7",
-    "cspell-lib": "8.15.7",
+    "@cspell/cspell-types": "8.16.0",
+    "@cspell/url": "8.16.0",
+    "cspell-lib": "8.16.0",
     "synckit": "^0.9.2"
   },
   "peerDependencies": {
     "eslint": "^7 || ^8 || ^9"
   },
-  "gitHead": "9decdc45e8fd0d6bb9c3851813c2c0728d3c7c5e"
+  "gitHead": "41cd50f9ba34033b6da32408855d7fc3b888c5e0"
 }

package/dist/worker/ASTNode.cjs

@@ -1,3 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=ASTNode.cjs.map

package/dist/worker/types.cjs

@@ -1,3 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=types.cjs.map