cspell 6.21.0 → 6.22.0

package/README.md

@@ -29,12 +29,16 @@ A Spell Checker for Code!
 cspell was initially built as the spell checking service for the [spell checker extension](https://marketplace.visualstudio.com/items?itemName=streetsidesoftware.code-spell-checker) for
 [Visual Studio Code](https://code.visualstudio.com/).
 
-## cspell for enterprise
+## CSpell for Enterprise
+
+<!--- @@inject: ../../static/tidelift.md --->
 
 Available as part of the Tidelift Subscription.
 
 The maintainers of cspell and thousands of other packages are working with Tidelift to deliver commercial support and maintenance for the open source packages you use to build your applications. Save time, reduce risk, and improve code health, while paying the maintainers of the exact packages you use. [Learn more.](https://tidelift.com/subscription/pkg/npm-cspell?utm_source=npm-cspell&utm_medium=referral&utm_campaign=enterprise&utm_term=repo)
 
+<!--- @@inject-end: ../../static/tidelift.md --->
+
 ## Installation
 
 ```sh
@@ -45,9 +49,19 @@ npm install -g cspell
 
 There is a docker image at [Packages for cspell](https://github.com/streetsidesoftware/cspell-cli/pkgs/container/cspell).
 
-`cspell` commands below can be run by replacing `cspell` with: `docker run -v -i -t $PWD:/workdir ghcr.io/streetsidesoftware/cspell:latest`
+`cspell` commands below can be run by replacing
 
-Example:
+```
+cspell
+```
+
+with:
+
+```
+docker run -v -i -t $PWD:/workdir ghcr.io/streetsidesoftware/cspell:latest
+```
+
+**Example:**
 
 ```sh
 docker run -v -i -t $PWD:/workdir ghcr.io/streetsidesoftware/cspell:latest lint --help
@@ -310,7 +324,7 @@ The concept is simple, split camelCase and snake_case words before checking them
 It is possible to add spell check settings into your source code.
 This is to help with file specific issues that may not be applicable to the entire project.
 
-All settings are prefixed with `cSpell:` or `spell-checker:`.
+All settings are prefixed with `cspell:` or `spell-checker:`.
 
 - `disable` -- turn off the spell checker for a section of code.
 - `enable` -- turn the spell checker back on after it has been turned off.
@@ -327,26 +341,26 @@ It is possible to disable / enable the spell checker by adding comments to your
 
 #### Disable Checking
 
-- `/* cSpell:disable */`
+- `/* cspell:disable */`
 - `/* spell-checker: disable */`
 - `/* spellchecker: disable */`
 - `// cspell:disable-line` -- disables checking for the current line.
 - `/* cspell:disable-next-line */` -- disables checking till the end of the next line.
 
-<!--- cSpell:enable -->
+<!--- cspell:enable -->
 
 #### Enable Checking
 
-- `/* cSpell:enable */`
+- `/* cspell:enable */`
 - `/* spell-checker: enable */`
 - `/* spellchecker: enable */`
 
 #### Example
 
 ```javascript
-// cSpell:disable
+// cspell:disable
 const wackyWord = ['zaallano', 'wooorrdd', 'zzooommmmmmmm'];
-/* cSpell:enable */
+/* cspell:enable */
 
 const words = ['zaallano', 'wooorrdd', 'zzooommmmmmmm']; // cspell:disable-line disables this entire line
 
@@ -363,7 +377,7 @@ var liep = 1;
 /* cspell:disable */
 // It is still disabled
 
-// cSpell:enable
+// cspell:enable
 // It is now enabled
 
 const str = 'goededag'; // <- will be flagged as an error.
@@ -376,15 +390,15 @@ const str = 'goededag'; // <- will be flagged as an error.
 const str = 'goedemorgen'; // <- will NOT be flagged as an error.
 ```
 
-<!--- cSpell:enable -->
+<!--- cspell:enable -->
 
 ### Ignore
 
 _Ignore_ allows you the specify a list of words you want to ignore within the document.
 
 ```javascript
-// cSpell:ignore zaallano, wooorrdd
-// cSpell:ignore zzooommmmmmmm
+// cspell:ignore zaallano, wooorrdd
+// cspell:ignore zzooommmmmmmm
 const wackyWord = ['zaallano', 'wooorrdd', 'zzooommmmmmmm'];
 ```
 
@@ -395,7 +409,7 @@ const wackyWord = ['zaallano', 'wooorrdd', 'zzooommmmmmmm'];
 The _words_ list allows you to add words that will be considered correct and will be used as suggestions.
 
 ```javascript
-// cSpell:words woorxs sweeetbeat
+// cspell:words woorxs sweeetbeat
 const companyName = 'woorxs sweeetbeat';
 ```
 
@@ -406,8 +420,8 @@ const companyName = 'woorxs sweeetbeat';
 In some programing language it is common to glue words together.
 
 ```c
-// cSpell:enableCompoundWords
-char * errormessage;  // Is ok with cSpell:enableCompoundWords
+// cspell:enableCompoundWords
+char * errormessage;  // Is ok with cspell:enableCompoundWords
 int    errornumber;   // Is also ok.
 ```
 
@@ -417,7 +431,7 @@ The last setting in the file determines the value for the entire file.
 ### Excluding and Including Text to be checked.
 
 By default, the entire document is checked for spelling.
-`cSpell:disable`/`cSpell:enable` above allows you to block off sections of the document.
+`cspell:disable`/`cspell:enable` above allows you to block off sections of the document.
 `ignoreRegExp` and `includeRegExp` give you the ability to ignore or include patterns of text.
 By default the flags `gim` are added if no flags are given.
 
@@ -430,17 +444,17 @@ The spell checker works in the following way:
 #### Exclude Example
 
 ```javascript
-// cSpell:ignoreRegExp 0x[0-9a-f]+     -- will ignore c style hex numbers
-// cSpell:ignoreRegExp /0x[0-9A-F]+/g  -- will ignore upper case c style hex numbers.
-// cSpell:ignoreRegExp g{5} h{5}       -- will only match ggggg, but not hhhhh or 'ggggg hhhhh'
-// cSpell:ignoreRegExp g{5}|h{5}       -- will match both ggggg and hhhhh
-// cSpell:ignoreRegExp /g{5} h{5}/     -- will match 'ggggg hhhhh'
-/* cSpell:ignoreRegExp /n{5}/          -- will NOT work as expected because of the ending comment -> */
+// cspell:ignoreRegExp 0x[0-9a-f]+     -- will ignore c style hex numbers
+// cspell:ignoreRegExp /0x[0-9A-F]+/g  -- will ignore upper case c style hex numbers.
+// cspell:ignoreRegExp g{5} h{5}       -- will only match ggggg, but not hhhhh or 'ggggg hhhhh'
+// cspell:ignoreRegExp g{5}|h{5}       -- will match both ggggg and hhhhh
+// cspell:ignoreRegExp /g{5} h{5}/     -- will match 'ggggg hhhhh'
+/* cspell:ignoreRegExp /n{5}/          -- will NOT work as expected because of the ending comment -> */
 /*
-   cSpell:ignoreRegExp /q{5}/          -- will match qqqqq just fine but NOT QQQQQ
+   cspell:ignoreRegExp /q{5}/          -- will match qqqqq just fine but NOT QQQQQ
 */
-// cSpell:ignoreRegExp /[^\s]{40,}/    -- will ignore long strings with no spaces.
-// cSpell:ignoreRegExp Email           -- this will ignore email like patterns -- see Predefined RegExp expressions
+// cspell:ignoreRegExp /[^\s]{40,}/    -- will ignore long strings with no spaces.
+// cspell:ignoreRegExp Email           -- this will ignore email like patterns -- see Predefined RegExp expressions
 var encodedImage = 'HR+cPzr7XGAOJNurPL0G8I2kU0UhKcqFssoKvFTR7z0T3VJfK37vS025uKroHfJ9nA6WWbHZ/ASn...';
 var email1 = 'emailaddress@myfancynewcompany.com';
 var email2 = '<emailaddress@myfancynewcompany.com>';
@@ -453,8 +467,8 @@ var email2 = '<emailaddress@myfancynewcompany.com>';
 In general you should not need to use `includeRegExp`. But if you are mixing languages then it could come in helpful.
 
 ```Python
-# cSpell:includeRegExp #.*
-# cSpell:includeRegExp ("""|''')[^\1]*\1
+# cspell:includeRegExp #.*
+# cspell:includeRegExp ("""|''')[^\1]*\1
 # only comments and block strings will be checked for spelling.
 def sum_it(self, seq):
     """This is checked for spelling"""
@@ -471,7 +485,7 @@ def sum_it(self, seq):
 The _dictionaries_ list allows you to specify dictionaries to use for the file.
 
 ```javascript
-// cSpell:dictionaries lorem-ipsum
+// cspell:dictionaries lorem-ipsum
 const companyName = 'Lorem ipsum dolor sit amet';
 ```
 
@@ -682,7 +696,7 @@ The number of `!`s is important.
 
 ## LanguageSettings
 
-The Language Settings allow configuration to be based upon the programming language and/or the e.
+The Language Settings allow configuration to be based upon the programming language and/or the locale.
 There are two selector fields `locale` and `languageId`.
 
 - `languageId` defines which programming languages to match against.
@@ -749,13 +763,13 @@ Brought to you by <a href="https://streetsidesoftware.com" title="Street Side So
 <!--- @@inject-end: ../../static/footer.md --->
 
 <!---
-    cSpell:disableCompoundWords
-    cSpell:ignore  compoundwords stringlength errornumber
-    cSpell:ignore jsja goededag alek wheerd behaviour tsmerge QQQQQ ncode
-    cSpell:includeRegExp Everything
-    cSpell:ignore hte variabele alinea
-    cSpell:ignore mkdirp githubusercontent streetsidesoftware vsmarketplacebadge visualstudio
-    cSpell:words Verdana
-    cSpell:ignore ieeees beees treeees
-    cSpell:ignore amet
+    cspell:disableCompoundWords
+    cspell:ignore  compoundwords stringlength errornumber
+    cspell:ignore jsja goededag alek wheerd behaviour tsmerge QQQQQ ncode
+    cspell:includeRegExp Everything
+    cspell:ignore hte variabele alinea
+    cspell:ignore mkdirp githubusercontent streetsidesoftware vsmarketplacebadge visualstudio
+    cspell:words Verdana
+    cspell:ignore ieeees beees treeees
+    cspell:ignore amet
 -->

package/dist/lint/lint.js

@@ -229,7 +229,7 @@ async function runLint(cfg) {
             ...cfg.options,
         };
         const reporters = cfg.options.reporter ?? configInfo.config.reporters;
-        reporter = (0, reporters_1.mergeReporters)(...(0, reporters_1.loadReporters)(reporters, cfg.reporter, reporterConfig));
+        reporter = (0, reporters_1.mergeReporters)(...(await (0, reporters_1.loadReporters)(reporters, cfg.reporter, reporterConfig)));
         cspell.setLogger(getLoggerFromReporter(reporter));
         const globInfo = await determineGlobs(configInfo, cfg);
         const { fileGlobs, excludeGlobs } = globInfo;

package/dist/util/cache/fileEntryCache.js

@@ -27,6 +27,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizePath = exports.createFromFile = void 0;
+const node_worker_threads_1 = require("node:worker_threads");
 const file_entry_cache = __importStar(require("file-entry-cache"));
 const fs_1 = require("fs");
 const path = __importStar(require("path"));
@@ -87,11 +88,11 @@ function createFromFile(pathToCache, useCheckSum, useRelative) {
         return (...params) => {
             const cwd = process.cwd();
             try {
-                process.chdir(relDir);
+                node_worker_threads_1.isMainThread && process.chdir(relDir);
                 return fn(cwd, ...params);
             }
             finally {
-                process.chdir(cwd);
+                node_worker_threads_1.isMainThread && process.chdir(cwd);
             }
         };
     }

package/dist/util/reporters.d.ts

@@ -7,7 +7,7 @@ export declare function mergeReporters(...reporters: ReadonlyArray<CSpellReporte
 /**
  * Loads reporter modules configured in cspell config file
  */
-export declare function loadReporters(reporters: FileSettings['reporters'], defaultReporter: CSpellReporter, config: ReporterConfiguration): ReadonlyArray<CSpellReporter>;
+export declare function loadReporters(reporters: FileSettings['reporters'], defaultReporter: CSpellReporter, config: ReporterConfiguration): Promise<ReadonlyArray<CSpellReporter>>;
 export declare function finalizeReporter(reporter: undefined): undefined;
 export declare function finalizeReporter(reporter: CSpellReporter): FinalizedReporter;
 export declare function finalizeReporter(reporter: CSpellReporter | undefined): FinalizedReporter | undefined;

package/dist/util/reporters.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.finalizeReporter = exports.loadReporters = exports.mergeReporters = void 0;
+const dynamic_import_1 = require("@cspell/dynamic-import");
 const errors_1 = require("./errors");
 function callAll(methods) {
     return (...p) => {
@@ -38,8 +39,8 @@ exports.mergeReporters = mergeReporters;
 /**
  * Loads reporter modules configured in cspell config file
  */
-function loadReporters(reporters, defaultReporter, config) {
-    function loadReporter(reporterSettings) {
+async function loadReporters(reporters, defaultReporter, config) {
+    async function loadReporter(reporterSettings) {
         if (reporterSettings === 'default')
             return defaultReporter;
         if (!Array.isArray(reporterSettings)) {
@@ -47,8 +48,7 @@ function loadReporters(reporters, defaultReporter, config) {
         }
         const [moduleName, settings] = reporterSettings;
         try {
-            // eslint-disable-next-line @typescript-eslint/no-var-requires
-            const { getReporter } = require(moduleName);
+            const { getReporter } = await (0, dynamic_import_1.dynamicImport)(moduleName, [process.cwd(), __dirname]);
             return getReporter(settings, config);
         }
         catch (e) {
@@ -56,7 +56,8 @@ function loadReporters(reporters, defaultReporter, config) {
         }
     }
     reporters = !reporters || !reporters.length ? ['default'] : [...reporters];
-    return reporters.map(loadReporter).filter((v) => v !== undefined);
+    const loadedReporters = await Promise.all(reporters.map(loadReporter));
+    return loadedReporters.filter((v) => v !== undefined);
 }
 exports.loadReporters = loadReporters;
 function finalizeReporter(reporter) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cspell",
-  "version": "6.21.0",
+  "version": "6.22.0",
   "description": "A Spelling Checker for Code!",
   "funding": "https://github.com/streetsidesoftware/cspell?sponsor=1",
   "main": "dist/index.js",
@@ -46,11 +46,13 @@
     "clean-build": "pnpm run clean && pnpm run build",
     "compile": "tsc -p .",
     "watch": "tsc --watch -p .",
-    "coverage": "jest --coverage",
-    "test-watch": "jest --watch",
+    "coverage": "pnpm coverage:vitest && pnpm coverage:fix",
+    "coverage:vitest": "vitest run --coverage",
+    "coverage:fix": "nyc report --temp-dir \"$(pwd)/coverage\" --reporter lcov --report-dir \"$(pwd)/coverage\" --cwd ../..",
+    "test-watch": "vitest",
     "prepublishOnly": "pnpm run clean-build",
-    "test": "jest --maxWorkers=1",
-    "test:update-snapshot": "jest --updateSnapshot"
+    "test": "vitest run",
+    "test:update-snapshot": "vitest run --updateSnapshot"
   },
   "repository": {
     "type": "git",
@@ -74,12 +76,13 @@
   },
   "homepage": "https://streetsidesoftware.github.io/cspell/",
   "dependencies": {
-    "@cspell/cspell-pipe": "6.21.0",
+    "@cspell/cspell-pipe": "6.22.0",
+    "@cspell/dynamic-import": "6.22.0",
     "chalk": "^4.1.2",
     "commander": "^10.0.0",
-    "cspell-gitignore": "6.21.0",
-    "cspell-glob": "6.21.0",
-    "cspell-lib": "6.21.0",
+    "cspell-gitignore": "6.22.0",
+    "cspell-glob": "6.22.0",
+    "cspell-lib": "6.22.0",
     "fast-glob": "^3.2.12",
     "fast-json-stable-stringify": "^2.1.0",
     "file-entry-cache": "^6.0.1",
@@ -93,18 +96,18 @@
     "node": ">=14"
   },
   "devDependencies": {
-    "@cspell/cspell-json-reporter": "6.21.0",
-    "@cspell/cspell-types": "6.21.0",
+    "@cspell/cspell-json-reporter": "6.22.0",
+    "@cspell/cspell-types": "6.22.0",
     "@types/file-entry-cache": "^5.0.2",
     "@types/glob": "^8.0.1",
     "@types/imurmurhash": "^0.1.1",
     "@types/micromatch": "^4.0.2",
     "@types/semver": "^7.3.13",
-    "jest": "^29.4.1",
     "micromatch": "^4.0.5",
     "minimatch": "^6.1.6",
-    "rollup": "^3.12.1",
-    "rollup-plugin-dts": "^5.1.1"
+    "rollup": "^3.14.0",
+    "rollup-plugin-dts": "^5.1.1",
+    "vitest": "^0.28.4"
   },
-  "gitHead": "67b37de0cbcbe62feb8fb6ec95adad1275c14caa"
+  "gitHead": "a133874ed7590cbe140f5067cfa80db84b644a5d"
 }