cspell-lib 10.0.1 → 10.1.1

package/dist/lib/Settings/Controller/configLoader/configLoader.d.ts

@@ -95,6 +95,7 @@ export interface IConfigLoader {
     getStats(): Readonly<Record<string, Readonly<Record<string, number>>>>;
     readonly isTrusted: boolean;
     setIsTrusted(isTrusted: boolean): void;
+    isTrustedUrl(url: URL): boolean;
 }
 export declare const defaultExtensionsAll: string[];
 export declare class ConfigLoader implements IConfigLoader {
@@ -166,6 +167,7 @@ export declare class ConfigLoader implements IConfigLoader {
     private resolveFilename;
     get isTrusted(): boolean;
     setIsTrusted(isTrusted: boolean): void;
+    isTrustedUrl(url: URL): boolean;
 }
 declare class ConfigLoaderInternal extends ConfigLoader {
     constructor(vfs: VFileSystem);

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

@@ -176,7 +176,8 @@ export class ConfigLoader {
     async resolveDefaultConfig() {
         const r = await this.fileResolver.resolveFile(defaultConfigFileModuleRef, srcDirectory);
         const url = toFileURL(r.filename);
-        this.cspellConfigFileReaderWriter.setTrustedUrls([new URL('../..', url)]);
+        const baseUrl = new URL('../..', url); // go up two directories to get out of the node_modules directory.
+        this.cspellConfigFileReaderWriter.setTrustedUrls([baseUrl]);
         return url;
     }
     importSettings(fileRef, pnpSettings, backReferences) {
@@ -250,6 +251,8 @@ export class ConfigLoader {
         }
     }
     async setupPnp(cfgFile, pnpSettings) {
+        if (!this.#isTrusted)
+            return;
         if (!pnpSettings?.usePnP || pnpSettings === defaultPnPSettings)
             return;
         if (cfgFile.url.protocol !== 'file:')
@@ -410,6 +413,14 @@ export class ConfigLoader {
         this.configSearch = new ConfigSearch(searchPlaces, isTrusted ? trustedSearch : unTrustedSearch, this.fs);
         this.cspellConfigFileReaderWriter.setUntrustedExtensions(isTrusted ? [] : defaultJsExtensions);
     }
+    isTrustedUrl(url) {
+        if (!this.#isTrusted) {
+            const ext = path.extname(url.pathname).toLowerCase();
+            if (defaultJsExtensions.includes(ext))
+                return false;
+        }
+        return this.cspellConfigFileReaderWriter.isTrusted(url);
+    }
     async #extractStopSearchAtURLs(options) {
         if (!options?.stopSearchAt)
             return undefined;

package/dist/lib/textValidation/docValidator.js

@@ -106,7 +106,8 @@ export class DocumentValidator {
             this.addPossibleError(`Missing substitutions: ${sub.missing.join(', ')}`);
         }
         const validateOptions = { ...settingsToValidateOptions(finalSettings), transformer: sub.transformer };
-        const includeRanges = calcTextInclusionRanges(this._document.text, validateOptions);
+        const rangeTransformer = finalSettings.substitutions?.length ? sub.transformer : undefined;
+        const includeRanges = calcTextInclusionRanges(this._document.text, validateOptions, rangeTransformer);
         const segmenter = createMappedTextSegmenter(includeRanges);
         const textValidator = textValidatorFactory(dict, validateOptions);
         recFinalizeTime();
@@ -143,7 +144,8 @@ export class DocumentValidator {
             this.addPossibleError(`Missing substitutions: ${sub.missing.join(', ')}`);
         }
         const validateOptions = { ...settingsToValidateOptions(finalSettings), transformer: sub.transformer };
-        const includeRanges = calcTextInclusionRanges(this._document.text, validateOptions);
+        const rangeTransformer = finalSettings.substitutions?.length ? sub.transformer : undefined;
+        const includeRanges = calcTextInclusionRanges(this._document.text, validateOptions, rangeTransformer);
         const segmenter = createMappedTextSegmenter(includeRanges);
         const textValidator = textValidatorFactory(dict, validateOptions);
         this._preparations = {

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

@@ -1,5 +1,6 @@
 import type { SpellingDictionary } from 'cspell-dictionary';
 import type { ValidationResult } from '../Models/ValidationResult.js';
+import type { SubstitutionTransformer } from '../Transform/index.js';
 import * as TextRange from '../Transform/index.js';
 import type { IncludeExcludeOptions, LineSegment, ValidationOptions } from './ValidationTypes.js';
 /**
@@ -7,7 +8,7 @@ import type { IncludeExcludeOptions, LineSegment, ValidationOptions } from './Va
  * @deprecation Use spellCheckDocument
  */
 export declare function validateText(text: string, dict: SpellingDictionary, options: ValidationOptions): Iterable<ValidationResult>;
-export declare function calcTextInclusionRanges(text: string, options: IncludeExcludeOptions): TextRange.MatchRange[];
+export declare function calcTextInclusionRanges(text: string, options: IncludeExcludeOptions, transformer?: SubstitutionTransformer): TextRange.MatchRange[];
 /**
  * Returns a mapper function that will segment a TextOffset based upon the includeRanges.
  * This function is optimized for forward scanning. It will perform poorly for randomly ordered offsets.

package/dist/lib/textValidation/textValidator.js

@@ -23,13 +23,22 @@ export function validateText(text, dict, options) {
     }), opTake(maxNumberOfProblems));
     return iter;
 }
-export function calcTextInclusionRanges(text, options) {
+export function calcTextInclusionRanges(text, options, transformer) {
     const { ignoreRegExpList = [], includeRegExpList = [] } = options;
     const filteredIncludeList = includeRegExpList.filter((a) => !!a);
     const finalIncludeList = filteredIncludeList.length ? filteredIncludeList : [/.*/gim];
-    const includeRanges = TextRange.excludeRanges(TextRange.findMatchingRangesForPatterns(finalIncludeList, text), TextRange.findMatchingRangesForPatterns(ignoreRegExpList, text));
+    const excludeRanges = TextRange.findMatchingRangesForPatterns(ignoreRegExpList, text).filter((range) => !isFullySubstitutedRange(text, range, transformer));
+    const includeRanges = TextRange.excludeRanges(TextRange.findMatchingRangesForPatterns(finalIncludeList, text), excludeRanges);
     return includeRanges;
 }
+function isFullySubstitutedRange(text, range, transformer) {
+    if (!transformer)
+        return false;
+    const source = text.slice(range.startPos, range.endPos);
+    const transformed = transformer.transform(source);
+    // One source-map segment means a single substitution consumed the entire ignored range.
+    return transformed.text !== source && transformed.map?.length === 2 && transformed.map[0] === source.length;
+}
 function mapLineToLineSegments(includeRanges) {
     const mapAgainstRanges = mapLineSegmentAgainstRangesFactory(includeRanges);
     return (line) => {

package/package.json

@@ -4,7 +4,7 @@
     "access": "public",
     "provenance": true
   },
-  "version": "10.0.1",
+  "version": "10.1.1",
   "description": "A library of useful functions used across various cspell tools.",
   "type": "module",
   "sideEffects": false,
@@ -75,22 +75,22 @@
   },
   "homepage": "https://github.com/streetsidesoftware/cspell/tree/main/packages/cspell-lib#readme",
   "dependencies": {
-    "@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",
+    "@cspell/cspell-bundled-dicts": "10.1.1",
+    "@cspell/cspell-performance-monitor": "10.1.1",
+    "@cspell/cspell-pipe": "10.1.1",
+    "@cspell/cspell-resolver": "10.1.1",
+    "@cspell/cspell-types": "10.1.1",
+    "@cspell/dynamic-import": "10.1.1",
+    "@cspell/filetypes": "10.1.1",
+    "@cspell/rpc": "10.1.1",
+    "@cspell/strong-weak-map": "10.1.1",
+    "@cspell/url": "10.1.1",
+    "cspell-config-lib": "10.1.1",
+    "cspell-dictionary": "10.1.1",
+    "cspell-glob": "10.1.1",
+    "cspell-grammar": "10.1.1",
+    "cspell-io": "10.1.1",
+    "cspell-trie-lib": "10.1.1",
     "env-paths": "^4.0.0",
     "gensequence": "^8.0.8",
     "import-fresh": "^4.0.0",
@@ -103,24 +103,24 @@
     "node": ">=22.18.0"
   },
   "devDependencies": {
-    "@cspell/cspell-tools": "10.0.1",
-    "@cspell/dict-cpp": "^7.0.2",
+    "@cspell/cspell-tools": "10.1.1",
+    "@cspell/dict-cpp": "^7.1.0",
     "@cspell/dict-csharp": "^4.0.8",
-    "@cspell/dict-css": "^4.1.1",
-    "@cspell/dict-en_us": "^4.4.33",
+    "@cspell/dict-css": "^4.1.2",
+    "@cspell/dict-en_us": "^4.4.36",
     "@cspell/dict-fa-ir": "^4.0.5",
     "@cspell/dict-fr-fr": "^2.3.2",
-    "@cspell/dict-html": "^4.0.15",
+    "@cspell/dict-html": "^4.0.16",
     "@cspell/dict-nl-nl": "^2.4.2",
-    "@cspell/dict-python": "^4.2.26",
+    "@cspell/dict-python": "^4.4.0",
     "@cspell/dictionary-bundler-plugin": "",
     "@types/configstore": "^6.0.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.10",
+    "lorem-ipsum": "^3.0.0",
     "perf-insight": "^2.0.1"
   },
-  "gitHead": "0f43abf29e5da0ecbcb08214055cdc1e3267c3ea"
+  "gitHead": "bc3bc22aa1aa1b3073768f2ac9cf0d9a06f65177"
 }