cspell-grammar 9.6.4 → 9.7.0

package/dist/mappers/appendMappedText.d.ts

@@ -1,3 +1,5 @@
+import type { ParsedText } from '@cspell/cspell-types';
 import type { MappedText } from './types.js';
+export declare function appendParsedText(a: ParsedText, b: ParsedText): ParsedText;
 export declare function appendMappedText(a: MappedText, b: MappedText): MappedText;
 //# sourceMappingURL=appendMappedText.d.ts.map

package/dist/mappers/appendMappedText.js

@@ -1,19 +1,39 @@
 import assert from 'node:assert';
+export function appendParsedText(a, b) {
+    const adjacent = a.range[1] === b.range[0];
+    if (adjacent && !a.map && !b.map) {
+        return {
+            text: a.text + b.text,
+            range: [a.range[0], b.range[1]],
+        };
+    }
+    const aMap = a.map || [a.range[1] - a.range[0], a.text.length];
+    const bMap = b.map || [b.range[1] - b.range[0], b.text.length];
+    const inject = adjacent ? [] : [b.range[0] - a.range[1], 0];
+    const map = [...aMap, ...inject, ...bMap];
+    return {
+        ...a,
+        ...b,
+        text: a.text + b.text,
+        range: [a.range[0], b.range[1]],
+        map,
+    };
+}
 export function appendMappedText(a, b) {
-    if (!a.map && !b.map) {
+    if (!a.offsetMap && !b.offsetMap) {
         return { text: a.text + b.text };
     }
     const aLen = a.text.length;
     const bLen = b.text.length;
-    const aMap = [0, 0, ...(a.map || [0, 0, aLen, aLen])];
-    const bMap = [0, 0, ...(b.map || [0, 0, bLen, bLen])];
+    const aMap = [0, 0, ...(a.offsetMap || [0, 0, aLen, aLen])];
+    const bMap = [0, 0, ...(b.offsetMap || [0, 0, bLen, bLen])];
     assert(aMap[aMap.length - 1] === aLen);
     assert(bMap[bMap.length - 1] === bLen);
     assert((aMap.length & 1) === 0);
     assert((bMap.length & 1) === 0);
     return {
         text: a.text + b.text,
-        map: joinMaps(aMap, bMap),
+        offsetMap: joinMaps(aMap, bMap),
     };
 }
 function joinMaps(aMap, bMap) {

package/dist/mappers/types.d.ts

@@ -12,6 +12,7 @@ export interface MappedText {
      *   where the `[0, 0]` is unnecessary.
      *
      */
-    map?: number[] | undefined;
+    offsetMap?: number[] | undefined;
+    map?: never;
 }
 //# sourceMappingURL=types.d.ts.map

package/dist/mappers/typescript.js

@@ -144,7 +144,7 @@ export function mapRawString(text) {
     }
     return {
         text: t,
-        map,
+        offsetMap: map,
     };
 }
 //# sourceMappingURL=typescript.js.map

package/dist/parsers/index.d.ts

@@ -1,2 +1,2 @@
-export declare const parsers: import("@cspell/cspell-types/Parser").Parser[];
+export declare const parsers: import("@cspell/cspell-types").Parser[];
 //# sourceMappingURL=index.d.ts.map

package/dist/parsers/typescript/TypeScriptParser.js

@@ -1,6 +1,7 @@
+import assert from 'node:assert';
 import { opFlatten, opMap, pipe } from '@cspell/cspell-pipe/sync';
 import { grammar } from '../../grammars/typescript.js';
-import { appendMappedText } from '../../mappers/appendMappedText.js';
+import { appendParsedText } from '../../mappers/appendMappedText.js';
 import { mapRawString } from '../../mappers/typescript.js';
 import { compileGrammar } from '../../parser/grammar.js';
 import { createParser } from '../../parser/parser.js';
@@ -16,7 +17,7 @@ function* transform(texts) {
             yield {
                 text: mapped.text,
                 scope: scope?.parent,
-                map: mapped.map,
+                map: absMapToRelMap(mapped.offsetMap),
                 range: parsed.range,
             };
             continue;
@@ -50,12 +51,10 @@ function* mergeStringResults(results) {
         yield last;
 }
 function mergeParsedText(a, b) {
-    const abT = appendMappedText(a, b);
+    const abT = appendParsedText(a, b);
     const ab = {
-        text: abT.text,
+        ...abT,
         scope: a.scope,
-        range: [a.range[0], b.range[1]],
-        map: abT.map,
         delegate: a.delegate,
     };
     return ab;
@@ -87,4 +86,22 @@ function doesScopeMatch(s, match) {
         return false;
     return typeof s === 'string' ? s.startsWith(match) : s.value.startsWith(match);
 }
+function absMapToRelMap(map) {
+    if (!map)
+        return undefined;
+    assert((map.length & 1) === 0, 'Map must be pairs of values.');
+    const relMap = [];
+    let base0 = 0;
+    let base1 = 0;
+    for (let i = 0; i < map.length; i += 2) {
+        const d0 = map[i] - base0;
+        const d1 = map[i + 1] - base1;
+        base0 += d0;
+        base1 += d1;
+        if (d0 === 0 && d1 === 0)
+            continue;
+        relMap.push(d0, d1);
+    }
+    return relMap;
+}
 //# sourceMappingURL=TypeScriptParser.js.map

package/package.json

@@ -4,7 +4,7 @@
     "access": "public",
     "provenance": true
   },
-  "version": "9.6.4",
+  "version": "9.7.0",
   "description": "Grammar parsing support for cspell",
   "keywords": [
     "cspell",
@@ -85,8 +85,8 @@
     "node": ">=20"
   },
   "dependencies": {
-    "@cspell/cspell-pipe": "9.6.4",
-    "@cspell/cspell-types": "9.6.4"
+    "@cspell/cspell-pipe": "9.7.0",
+    "@cspell/cspell-types": "9.7.0"
   },
-  "gitHead": "e126c7f5708d4258ada35ba1d29d18952d7f0886"
+  "gitHead": "48f64e0bd95b39011af6dc80cd8ae4d519511f73"
 }