cspell-lib 9.8.0 → 10.0.1

package/dist/lib/Settings/Controller/pnpLoader.js

@@ -2,8 +2,7 @@
  * Handles loading of `.pnp.js` and `.pnp.js` files.
  */
 import { fileURLToPath } from 'node:url';
-import clearModule from 'clear-module';
-import importFresh from 'import-fresh';
+import createImportFresh from 'import-fresh';
 import { findUp } from '../../util/findUp.js';
 import { toFileUrl } from '../../util/url.js';
 import { UnsupportedPnpFile } from './ImportError.js';
@@ -11,7 +10,7 @@ const defaultPnpFiles = ['.pnp.cjs', '.pnp.js'];
 const supportedSchemas = new Set(['file:']);
 const cachedRequests = new Map();
 let lock = undefined;
-const cachedPnpImportsSync = new Map();
+const cachedPnpImports = new Map();
 const cachedRequestsSync = new Map();
 export class PnpLoader {
     pnpFiles;
@@ -59,28 +58,29 @@ export class PnpLoader {
 export function pnpLoader(pnpFiles) {
     return new PnpLoader(pnpFiles);
 }
-/**
- * @param urlDirectory - directory to start at.
- */
 async function findPnpAndLoad(urlDirectory, pnpFiles) {
     const found = await findUp(pnpFiles, { cwd: fileURLToPath(urlDirectory) });
     return loadPnpIfNeeded(found);
 }
-function loadPnpIfNeeded(found) {
+async function loadPnpIfNeeded(found) {
     if (!found)
         return undefined;
-    const c = cachedPnpImportsSync.get(found);
-    if (c || cachedPnpImportsSync.has(found))
-        return c;
+    const cached = cachedPnpImports.get(found);
+    if (cached)
+        return cached;
     const r = loadPnp(found);
-    cachedPnpImportsSync.set(found, r);
+    cachedPnpImports.set(found, r);
+    // If loading fails, remove from cache so subsequent calls can retry.
+    r.catch(() => cachedPnpImports.delete(found));
     return r;
 }
-function loadPnp(pnpFile) {
-    const pnp = importFresh(pnpFile);
-    if (pnp.setup) {
+async function loadPnp(pnpFile) {
+    const pnpFileUrl = toFileUrl(pnpFile);
+    const importFresh = createImportFresh(pnpFileUrl);
+    const { default: pnp } = await importFresh(pnpFileUrl.href);
+    if (pnp?.setup) {
         pnp.setup();
-        return toFileUrl(pnpFile);
+        return pnpFileUrl;
     }
     throw new UnsupportedPnpFile(`Unsupported pnp file: "${pnpFile}"`);
 }
@@ -94,11 +94,9 @@ export function clearPnPGlobalCache() {
 }
 async function _cleanCache() {
     await Promise.all([...cachedRequests.values()].map(rejectToUndefined));
-    const modules = [...cachedPnpImportsSync.values()];
-    modules.forEach((r) => r && clearModule.single(fileURLToPath(r)));
+    cachedPnpImports.clear();
     cachedRequests.clear();
     cachedRequestsSync.clear();
-    cachedPnpImportsSync.clear();
     return undefined;
 }
 function rejectToUndefined(p) {

package/dist/lib/Transform/SubstitutionTransformer.js

@@ -12,16 +12,18 @@ export class SubstitutionTransformer {
         if (!this.#trie)
             return text;
         const transformed = this.transformString(text.text);
+        const rawText = text.rawText ?? text.text;
         const result = {
             ...text,
             text: transformed.text,
             map: mergeSourceMaps(text.map, transformed.map),
+            rawText,
         };
         return result;
     }
     transformString(text) {
         if (!this.#trie) {
-            return { text, range: [0, text.length] };
+            return { text, range: [0, text.length], rawText: text };
         }
         const map = [0, 0];
         let repText = '';
@@ -36,7 +38,7 @@ export class SubstitutionTransformer {
             lastEnd = edit.range[1];
         }
         if (lastEnd === 0) {
-            return { text, range: [0, text.length] };
+            return { text, range: [0, text.length], rawText: text };
         }
         if (lastEnd < text.length) {
             repText += text.slice(lastEnd);
@@ -46,6 +48,7 @@ export class SubstitutionTransformer {
             text: repText,
             range: [0, text.length],
             map: mapOffsetPairsToSourceMap(map),
+            rawText: text,
         };
         return result;
     }

package/dist/lib/textValidation/checkText.js

@@ -95,14 +95,15 @@ function genResult(text, issues, includeRanges) {
                 const issue = issues[i];
                 const endPos = issue.offset;
                 const text = span.text.slice(0, endPos - span.startPos);
-                const endPosError = issue.offset + issue.text.length;
+                const endPosError = issue.offset + (issue.length ?? issue.text.length);
+                const issueText = span.text.slice(endPos - span.startPos, endPosError - span.startPos);
                 yield { ...span, text, endPos };
                 yield {
                     ...span,
                     isError: true,
                     startPos: issue.offset,
                     endPos: endPosError,
-                    text: issue.text,
+                    text: issueText,
                 };
                 span.text = span.text.slice(endPosError - span.startPos);
                 span.startPos = endPosError;

package/dist/lib/textValidation/lineValidatorFactory.js

@@ -366,7 +366,15 @@ export function textValidatorFactory(dict, options) {
             const { text, offset, isFlagged, isFound, suggestionsEx, hasPreferredSuggestions, hasSimpleSuggestions } = vr;
             const r = mapRangeBackToOriginalPos([offset, offset + text.length], map);
             const range = [r[0] + srcOffset, r[1] + srcOffset];
-            return { text, range, isFlagged, isFound, suggestionsEx, hasPreferredSuggestions, hasSimpleSuggestions };
+            return {
+                text,
+                range,
+                isFlagged,
+                isFound,
+                suggestionsEx,
+                hasPreferredSuggestions,
+                hasSimpleSuggestions,
+            };
         }
         return [...lineValidatorFn(lineSegment)].map(mapBackToOriginSimple);
     }

package/package.json

@@ -4,7 +4,7 @@
     "access": "public",
     "provenance": true
   },
-  "version": "9.8.0",
+  "version": "10.0.1",
   "description": "A library of useful functions used across various cspell tools.",
   "type": "module",
   "sideEffects": false,
@@ -75,36 +75,35 @@
   },
   "homepage": "https://github.com/streetsidesoftware/cspell/tree/main/packages/cspell-lib#readme",
   "dependencies": {
-    "@cspell/cspell-bundled-dicts": "9.8.0",
-    "@cspell/cspell-performance-monitor": "9.8.0",
-    "@cspell/cspell-pipe": "9.8.0",
-    "@cspell/cspell-resolver": "9.8.0",
-    "@cspell/cspell-types": "9.8.0",
-    "@cspell/dynamic-import": "9.8.0",
-    "@cspell/filetypes": "9.8.0",
-    "@cspell/rpc": "9.8.0",
-    "@cspell/strong-weak-map": "9.8.0",
-    "@cspell/url": "9.8.0",
-    "clear-module": "^4.1.2",
-    "cspell-config-lib": "9.8.0",
-    "cspell-dictionary": "9.8.0",
-    "cspell-glob": "9.8.0",
-    "cspell-grammar": "9.8.0",
-    "cspell-io": "9.8.0",
-    "cspell-trie-lib": "9.8.0",
+    "@cspell/cspell-bundled-dicts": "10.0.1",
+    "@cspell/cspell-performance-monitor": "10.0.1",
+    "@cspell/cspell-pipe": "10.0.1",
+    "@cspell/cspell-resolver": "10.0.1",
+    "@cspell/cspell-types": "10.0.1",
+    "@cspell/dynamic-import": "10.0.1",
+    "@cspell/filetypes": "10.0.1",
+    "@cspell/rpc": "10.0.1",
+    "@cspell/strong-weak-map": "10.0.1",
+    "@cspell/url": "10.0.1",
+    "cspell-config-lib": "10.0.1",
+    "cspell-dictionary": "10.0.1",
+    "cspell-glob": "10.0.1",
+    "cspell-grammar": "10.0.1",
+    "cspell-io": "10.0.1",
+    "cspell-trie-lib": "10.0.1",
     "env-paths": "^4.0.0",
     "gensequence": "^8.0.8",
-    "import-fresh": "^3.3.1",
+    "import-fresh": "^4.0.0",
     "resolve-from": "^5.0.0",
     "vscode-languageserver-textdocument": "^1.0.12",
     "vscode-uri": "^3.1.0",
     "xdg-basedir": "^5.1.0"
   },
   "engines": {
-    "node": ">=20"
+    "node": ">=22.18.0"
   },
   "devDependencies": {
-    "@cspell/cspell-tools": "9.8.0",
+    "@cspell/cspell-tools": "10.0.1",
     "@cspell/dict-cpp": "^7.0.2",
     "@cspell/dict-csharp": "^4.0.8",
     "@cspell/dict-css": "^4.1.1",
@@ -116,12 +115,12 @@
     "@cspell/dict-python": "^4.2.26",
     "@cspell/dictionary-bundler-plugin": "",
     "@types/configstore": "^6.0.2",
-    "comment-json": "^4.6.2",
+    "comment-json": "^5.0.0",
     "configstore": "^8.0.0",
     "cspell-dict-nl-nl": "^1.1.2",
     "leaked-handles": "^5.2.0",
-    "lorem-ipsum": "^2.0.8",
+    "lorem-ipsum": "^2.0.10",
     "perf-insight": "^2.0.1"
   },
-  "gitHead": "c822013ce676dffb5fa5544567c25a3ae666718f"
+  "gitHead": "0f43abf29e5da0ecbcb08214055cdc1e3267c3ea"
 }