cspell-lib 10.0.0 → 10.1.0

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/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/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/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.0",
+  "version": "10.1.0",
   "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.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",
+    "@cspell/cspell-bundled-dicts": "10.1.0",
+    "@cspell/cspell-performance-monitor": "10.1.0",
+    "@cspell/cspell-pipe": "10.1.0",
+    "@cspell/cspell-resolver": "10.1.0",
+    "@cspell/cspell-types": "10.1.0",
+    "@cspell/dynamic-import": "10.1.0",
+    "@cspell/filetypes": "10.1.0",
+    "@cspell/rpc": "10.1.0",
+    "@cspell/strong-weak-map": "10.1.0",
+    "@cspell/url": "10.1.0",
+    "cspell-config-lib": "10.1.0",
+    "cspell-dictionary": "10.1.0",
+    "cspell-glob": "10.1.0",
+    "cspell-grammar": "10.1.0",
+    "cspell-io": "10.1.0",
+    "cspell-trie-lib": "10.1.0",
     "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.0",
-    "@cspell/dict-cpp": "^7.0.2",
+    "@cspell/cspell-tools": "10.1.0",
+    "@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": "^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": "^3.0.0",
     "perf-insight": "^2.0.1"
   },
-  "gitHead": "6ddfd576b6bb554a7cb8dba1ab053a0b6ff8021f"
+  "gitHead": "401518c5e37c06fb406aedadb3fc7a1c27eca8e6"
 }