fix(parser): Fix endIndex of text events being off by 1 (#932)

fb55 · Aug 28, 2021 · 78ef1b7 · 78ef1b7
1 parent 0ae35d6
commit 78ef1b7
Show file tree

Hide file tree

Showing 32 changed files with 267 additions and 267 deletions.
diff --git a/src/Parser.ts b/src/Parser.ts
@@ -237,7 +237,7 @@ export class Parser {
     /** @internal */
     ontext(data: string): void {
         const idx = this.tokenizer.getAbsoluteIndex();
-        this.endIndex = idx;
+        this.endIndex = idx - 1;
         this.cbs.ontext?.(data);
         this.startIndex = idx;
     }

diff --git a/src/__fixtures__/Events/01-simple.json b/src/__fixtures__/Events/01-simple.json
@@ -29,7 +29,7 @@
         {
             "event": "text",
             "startIndex": 15,
-            "endIndex": 19,
+            "endIndex": 18,
             "data": ["adsf"]
         },
         {

diff --git a/src/__fixtures__/Events/02-template.json b/src/__fixtures__/Events/02-template.json
@@ -41,7 +41,7 @@
         {
             "event": "text",
             "startIndex": 32,
-            "endIndex": 49,
+            "endIndex": 48,
             "data": ["<h1>Heading1</h1>"]
         },
         {

diff --git a/src/__fixtures__/Events/03-lowercase_tags.json b/src/__fixtures__/Events/03-lowercase_tags.json
@@ -34,7 +34,7 @@
         {
             "event": "text",
             "startIndex": 15,
-            "endIndex": 19,
+            "endIndex": 18,
             "data": ["adsf"]
         },
         {

diff --git a/src/__fixtures__/Events/05-cdata-special.json b/src/__fixtures__/Events/05-cdata-special.json
@@ -17,7 +17,7 @@
         {
             "event": "text",
             "startIndex": 8,
-            "endIndex": 53,
+            "endIndex": 52,
             "data": ["/*<![CDATA[*/ asdf ><asdf></adsf><> fo/*]]>*/"]
         },
         {

diff --git a/src/__fixtures__/Events/06-leading-lt.json b/src/__fixtures__/Events/06-leading-lt.json
@@ -5,7 +5,7 @@
         {
             "event": "text",
             "startIndex": 0,
-            "endIndex": 3,
+            "endIndex": 2,
             "data": [">a>"]
         }
     ]

diff --git a/src/__fixtures__/Events/07-self-closing.json b/src/__fixtures__/Events/07-self-closing.json
@@ -29,7 +29,7 @@
         {
             "event": "text",
             "startIndex": 25,
-            "endIndex": 28,
+            "endIndex": 27,
             "data": ["Foo"]
         },
         {

diff --git a/src/__fixtures__/Events/08-implicit-close-tags.json b/src/__fixtures__/Events/08-implicit-close-tags.json
@@ -101,7 +101,7 @@
         {
             "event": "text",
             "startIndex": 56,
-            "endIndex": 58,
+            "endIndex": 57,
             "data": ["TH"]
         },
         {
@@ -149,7 +149,7 @@
         {
             "event": "text",
             "startIndex": 76,
-            "endIndex": 83,
+            "endIndex": 82,
             "data": ["Heading"]
         },
         {
@@ -209,7 +209,7 @@
         {
             "event": "text",
             "startIndex": 101,
-            "endIndex": 104,
+            "endIndex": 103,
             "data": ["Div"]
         },
         {
@@ -251,7 +251,7 @@
         {
             "event": "text",
             "startIndex": 119,
-            "endIndex": 123,
+            "endIndex": 122,
             "data": ["Div2"]
         },
         {
@@ -329,7 +329,7 @@
         {
             "event": "text",
             "startIndex": 156,
-            "endIndex": 165,
+            "endIndex": 164,
             "data": ["Heading 2"]
         },
         {
@@ -371,7 +371,7 @@
         {
             "event": "text",
             "startIndex": 189,
-            "endIndex": 193,
+            "endIndex": 192,
             "data": ["Para"]
         },
         {
@@ -395,7 +395,7 @@
         {
             "event": "text",
             "startIndex": 197,
-            "endIndex": 206,
+            "endIndex": 205,
             "data": ["Heading 4"]
         },
         {
@@ -449,7 +449,7 @@
         {
             "event": "text",
             "startIndex": 222,
-            "endIndex": 224,
+            "endIndex": 223,
             "data": ["Hi"]
         },
         {
@@ -473,7 +473,7 @@
         {
             "event": "text",
             "startIndex": 228,
-            "endIndex": 231,
+            "endIndex": 230,
             "data": ["bye"]
         },
         {

diff --git a/src/__fixtures__/Events/09-attributes.json b/src/__fixtures__/Events/09-attributes.json
@@ -50,7 +50,7 @@
         {
             "event": "text",
             "startIndex": 56,
-            "endIndex": 60,
+            "endIndex": 59,
             "data": ["adsf"]
         },
         {

diff --git a/src/__fixtures__/Events/10-crazy-attrib.json b/src/__fixtures__/Events/10-crazy-attrib.json
@@ -36,7 +36,7 @@
         {
             "event": "text",
             "startIndex": 15,
-            "endIndex": 20,
+            "endIndex": 19,
             "data": ["stuff"]
         },
         {

diff --git a/src/__fixtures__/Events/11-script_in_script.json b/src/__fixtures__/Events/11-script_in_script.json
@@ -29,7 +29,7 @@
         {
             "event": "text",
             "startIndex": 11,
-            "endIndex": 44,
+            "endIndex": 43,
             "data": ["var str = '<script></'+'script>';"]
         },
         {

diff --git a/src/__fixtures__/Events/14-implicit-open-tags.json b/src/__fixtures__/Events/14-implicit-open-tags.json
@@ -17,7 +17,7 @@
         {
             "event": "text",
             "startIndex": 5,
-            "endIndex": 10,
+            "endIndex": 9,
             "data": ["Hallo"]
         },
         {
@@ -41,7 +41,7 @@
         {
             "event": "text",
             "startIndex": 14,
-            "endIndex": 19,
+            "endIndex": 18,
             "data": ["World"]
         },
         {

diff --git a/src/__fixtures__/Events/15-lt-whitespace.json b/src/__fixtures__/Events/15-lt-whitespace.json
@@ -5,7 +5,7 @@
         {
             "event": "text",
             "startIndex": 0,
-            "endIndex": 5,
+            "endIndex": 4,
             "data": ["a < b"]
         }
     ]

diff --git a/src/__fixtures__/Events/17-numeric_entities.json b/src/__fixtures__/Events/17-numeric_entities.json
@@ -5,7 +5,7 @@
         {
             "event": "text",
             "startIndex": 0,
-            "endIndex": 36,
+            "endIndex": 35,
             "data": ["abcdfg&#x;h"]
         }
     ]

diff --git a/src/__fixtures__/Events/18-legacy_entities.json b/src/__fixtures__/Events/18-legacy_entities.json
@@ -5,7 +5,7 @@
         {
             "event": "text",
             "startIndex": 0,
-            "endIndex": 32,
+            "endIndex": 31,
             "data": ["&elíe&eer;s<er&sum"]
         }
     ]

diff --git a/src/__fixtures__/Events/19-named_entities.json b/src/__fixtures__/Events/19-named_entities.json
@@ -5,7 +5,7 @@
         {
             "event": "text",
             "startIndex": 0,
-            "endIndex": 53,
+            "endIndex": 52,
             "data": ["&el<er∳foo&bar"]
         }
     ]

diff --git a/src/__fixtures__/Events/20-xml_entities.json b/src/__fixtures__/Events/20-xml_entities.json
@@ -10,7 +10,7 @@
         {
             "event": "text",
             "startIndex": 0,
-            "endIndex": 49,
+            "endIndex": 48,
             "data": ["&>&amp<&uuml;a&#x62c&#100&#101"]
         }
     ]

diff --git a/src/__fixtures__/Events/22-double_brackets.json b/src/__fixtures__/Events/22-double_brackets.json
@@ -5,7 +5,7 @@
         {
             "event": "text",
             "startIndex": 0,
-            "endIndex": 1,
+            "endIndex": 0,
             "data": ["<"]
         },
         {
@@ -23,7 +23,7 @@
         {
             "event": "text",
             "startIndex": 19,
-            "endIndex": 27,
+            "endIndex": 26,
             "data": [">testing"]
         },
         {

diff --git a/src/__fixtures__/Events/23-legacy_entity_fail.json b/src/__fixtures__/Events/23-legacy_entity_fail.json
@@ -5,7 +5,7 @@
         {
             "event": "text",
             "startIndex": 0,
-            "endIndex": 3,
+            "endIndex": 2,
             "data": ["M&M"]
         }
     ]

diff --git a/src/__fixtures__/Events/24-special_special.json b/src/__fixtures__/Events/24-special_special.json
@@ -17,7 +17,7 @@
         {
             "event": "text",
             "startIndex": 7,
-            "endIndex": 24,
+            "endIndex": 23,
             "data": ["<b>foo</b><title>"]
         },
         {
@@ -113,7 +113,7 @@
         {
             "event": "text",
             "startIndex": 84,
-            "endIndex": 99,
+            "endIndex": 98,
             "data": ["</scripter</soo"]
         },
         {
@@ -137,7 +137,7 @@
         {
             "event": "text",
             "startIndex": 115,
-            "endIndex": 123,
+            "endIndex": 122,
             "data": ["</styler"]
         },
         {

diff --git a/src/__fixtures__/Events/25-empty_tag_name.json b/src/__fixtures__/Events/25-empty_tag_name.json
@@ -5,7 +5,7 @@
         {
             "event": "text",
             "startIndex": 0,
-            "endIndex": 7,
+            "endIndex": 6,
             "data": ["< ></ >"]
         }
     ]

diff --git a/src/__fixtures__/Events/32-script-ending-with-lessthan.json b/src/__fixtures__/Events/32-script-ending-with-lessthan.json
@@ -17,7 +17,7 @@
         {
             "event": "text",
             "startIndex": 8,
-            "endIndex": 9,
+            "endIndex": 8,
             "data": ["<"]
         },
         {

diff --git a/src/__fixtures__/Events/34-not-alpha-tags.json b/src/__fixtures__/Events/34-not-alpha-tags.json
@@ -5,7 +5,7 @@
         {
             "event": "text",
             "startIndex": 0,
-            "endIndex": 8,
+            "endIndex": 7,
             "data": ["<12>text"]
         },
         {

diff --git a/src/__fixtures__/Events/36-entity-in-attrib.json b/src/__fixtures__/Events/36-entity-in-attrib.json
@@ -35,7 +35,7 @@
         {
             "event": "text",
             "startIndex": 44,
-            "endIndex": 75,
+            "endIndex": 74,
             "data": ["?&image_uri=1&ℑ=2&image=3"]
         }
     ]

diff --git a/src/__fixtures__/Events/37-entity-in-title.json b/src/__fixtures__/Events/37-entity-in-title.json
@@ -17,7 +17,7 @@
         {
             "event": "text",
             "startIndex": 7,
-            "endIndex": 27,
+            "endIndex": 26,
             "data": ["the \"title\""]
         },
         {

diff --git a/src/__fixtures__/Events/38-entity-in-title-no-decode.json b/src/__fixtures__/Events/38-entity-in-title-no-decode.json
@@ -22,7 +22,7 @@
         {
             "event": "text",
             "startIndex": 7,
-            "endIndex": 28,
+            "endIndex": 27,
             "data": ["the &quot;title&quot;"]
         },
         {

diff --git a/src/__fixtures__/Events/39-title-in-script.json b/src/__fixtures__/Events/39-title-in-script.json
@@ -17,7 +17,7 @@
         {
             "event": "text",
             "startIndex": 8,
-            "endIndex": 18,
+            "endIndex": 17,
             "data": ["'</title>'"]
         },
         {

diff --git a/src/__fixtures__/Events/41-trailing-legacy-entity.json b/src/__fixtures__/Events/41-trailing-legacy-entity.json
@@ -5,7 +5,7 @@
         {
             "event": "text",
             "startIndex": 0,
-            "endIndex": 19,
+            "endIndex": 18,
             "data": ["⨱×bar"]
         }
     ]

diff --git a/src/__fixtures__/Events/42-trailing-numeric-entity.json b/src/__fixtures__/Events/42-trailing-numeric-entity.json
@@ -5,7 +5,7 @@
         {
             "event": "text",
             "startIndex": 0,
-            "endIndex": 8,
+            "endIndex": 7,
             "data": ["55"]
         }
     ]

diff --git a/src/__fixtures__/Events/43-multibyte-entity.json b/src/__fixtures__/Events/43-multibyte-entity.json
@@ -5,7 +5,7 @@
         {
             "event": "text",
             "startIndex": 0,
-            "endIndex": 21,
+            "endIndex": 20,
             "data": ["≧̸"]
         }
     ]