cspell-lib 9.7.0 → 10.0.0

package/dist/lib/Settings/CSpellSettingsServer.js

@@ -4,8 +4,7 @@ import { autoResolveWeak, AutoResolveWeakCache } from '../util/AutoResolve.js';
 import { toFileUrl } from '../util/url.js';
 import * as util from '../util/util.js';
 import { configSettingsFileVersion0_1, ENV_CSPELL_GLOB_ROOT } from './constants.js';
-import { calcDictionaryDefsToLoad, mapDictDefsToInternal } from './internal/index.js';
-import { cleanCSpellSettingsInternal as csi, isCSpellSettingsInternal } from './internal/index.js';
+import { calcDictionaryDefsToLoad, cleanCSpellSettingsInternal as csi, isCSpellSettingsInternal, mapDictDefsToInternal, } from './internal/index.js';
 import { mergeList, mergeListUnique } from './mergeList.js';
 import { resolvePatterns } from './patterns.js';
 import { CwdUrlResolver } from './resolveCwd.js';

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

@@ -1,8 +1,7 @@
 import assert from 'node:assert';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
-import { CSpellConfigFile, CSpellConfigFileWithErrors } from 'cspell-config-lib';
-import { createReaderWriter } from 'cspell-config-lib';
+import { createReaderWriter, CSpellConfigFile, CSpellConfigFileWithErrors } from 'cspell-config-lib';
 import { CSPELL_VFS_PROTOCOL, isUrlLike, toFileURL } from 'cspell-io';
 import { URI, Utils as UriUtils } from 'vscode-uri';
 import { onClearCache } from '../../../events/index.js';

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/spellCheckFile.d.ts

@@ -1,7 +1,7 @@
 import type { CSpellSettingsWithSourceTrace, CSpellUserSettings } from '@cspell/cspell-types';
 import type { ICSpellConfigFile } from 'cspell-config-lib';
 import type { Document, DocumentWithText } from './Document/index.js';
-import { type ValidationIssueRPC } from './Models/ValidationIssue.js';
+import type { ValidationIssueRPC } from './Models/ValidationIssue.js';
 import type { ImportFileRefWithError } from './Settings/index.js';
 import type { Uri } from './util/IUri.js';
 import type { ValidateTextOptions, ValidationIssue } from './validator.js';

package/dist/lib/textValidation/docValidator.d.ts

@@ -3,8 +3,7 @@ import type { ICSpellConfigFile } from 'cspell-config-lib';
 import type { ExtendedSuggestion } from '../Models/Suggestion.js';
 import type { TextDocument, TextDocumentRef } from '../Models/TextDocument.js';
 import type { ValidationIssue } from '../Models/ValidationIssue.js';
-import type { ImportFileRefWithError } from '../Settings/index.js';
-import type { CSpellSettingsInternal, CSpellSettingsInternalFinalized } from '../Settings/index.js';
+import type { CSpellSettingsInternal, CSpellSettingsInternalFinalized, ImportFileRefWithError } from '../Settings/index.js';
 import type { SpellingDictionaryCollection } from '../SpellingDictionary/index.js';
 import type { WordSuggestion } from '../suggestions.js';
 import type { MatchRange, SimpleRange, SubstitutionTransformer } from '../Transform/index.js';

package/dist/lib/util/fileReader.d.ts

@@ -1,3 +1,3 @@
-import { type TextEncoding } from 'cspell-io';
+import type { TextEncoding } from 'cspell-io';
 export declare function readLines(url: URL | string, encoding?: TextEncoding): Promise<IterableIterator<string>>;
 //# sourceMappingURL=fileReader.d.ts.map

package/package.json

@@ -4,7 +4,7 @@
     "access": "public",
     "provenance": true
   },
-  "version": "9.7.0",
+  "version": "10.0.0",
   "description": "A library of useful functions used across various cspell tools.",
   "type": "module",
   "sideEffects": false,
@@ -75,53 +75,52 @@
   },
   "homepage": "https://github.com/streetsidesoftware/cspell/tree/main/packages/cspell-lib#readme",
   "dependencies": {
-    "@cspell/cspell-bundled-dicts": "9.7.0",
-    "@cspell/cspell-performance-monitor": "9.7.0",
-    "@cspell/cspell-pipe": "9.7.0",
-    "@cspell/cspell-resolver": "9.7.0",
-    "@cspell/cspell-types": "9.7.0",
-    "@cspell/dynamic-import": "9.7.0",
-    "@cspell/filetypes": "9.7.0",
-    "@cspell/rpc": "9.7.0",
-    "@cspell/strong-weak-map": "9.7.0",
-    "@cspell/url": "9.7.0",
-    "clear-module": "^4.1.2",
-    "cspell-config-lib": "9.7.0",
-    "cspell-dictionary": "9.7.0",
-    "cspell-glob": "9.7.0",
-    "cspell-grammar": "9.7.0",
-    "cspell-io": "9.7.0",
-    "cspell-trie-lib": "9.7.0",
+    "@cspell/cspell-bundled-dicts": "10.0.0",
+    "@cspell/cspell-performance-monitor": "10.0.0",
+    "@cspell/cspell-pipe": "10.0.0",
+    "@cspell/cspell-resolver": "10.0.0",
+    "@cspell/cspell-types": "10.0.0",
+    "@cspell/dynamic-import": "10.0.0",
+    "@cspell/filetypes": "10.0.0",
+    "@cspell/rpc": "10.0.0",
+    "@cspell/strong-weak-map": "10.0.0",
+    "@cspell/url": "10.0.0",
+    "cspell-config-lib": "10.0.0",
+    "cspell-dictionary": "10.0.0",
+    "cspell-glob": "10.0.0",
+    "cspell-grammar": "10.0.0",
+    "cspell-io": "10.0.0",
+    "cspell-trie-lib": "10.0.0",
     "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.7.0",
+    "@cspell/cspell-tools": "10.0.0",
     "@cspell/dict-cpp": "^7.0.2",
     "@cspell/dict-csharp": "^4.0.8",
-    "@cspell/dict-css": "^4.0.19",
-    "@cspell/dict-en_us": "^4.4.29",
+    "@cspell/dict-css": "^4.1.1",
+    "@cspell/dict-en_us": "^4.4.33",
     "@cspell/dict-fa-ir": "^4.0.5",
     "@cspell/dict-fr-fr": "^2.3.2",
-    "@cspell/dict-html": "^4.0.14",
+    "@cspell/dict-html": "^4.0.15",
     "@cspell/dict-nl-nl": "^2.4.2",
-    "@cspell/dict-python": "^4.2.25",
+    "@cspell/dict-python": "^4.2.26",
     "@cspell/dictionary-bundler-plugin": "",
     "@types/configstore": "^6.0.2",
-    "comment-json": "^4.5.1",
+    "comment-json": "^4.6.2",
     "configstore": "^8.0.0",
     "cspell-dict-nl-nl": "^1.1.2",
     "leaked-handles": "^5.2.0",
     "lorem-ipsum": "^2.0.8",
     "perf-insight": "^2.0.1"
   },
-  "gitHead": "48f64e0bd95b39011af6dc80cd8ae4d519511f73"
+  "gitHead": "6ddfd576b6bb554a7cb8dba1ab053a0b6ff8021f"
 }