pantsdown 1.6.0 → 1.6.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pantsdown",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "author": "wallpants",
   "description": "Markdown to 'GitHub HTML' parser",
   "license": "MIT",

package/src/lexer.ts

@@ -57,7 +57,7 @@ export class Lexer {
         const tokenLines = rawToken.split("\n");
         const sourceMap: SourceMap = [this.line, (this.line += tokenLines.length - 1)];
 
-        while (tokenLines.slice(-1)[0] === "") {
+        while (tokenLines[tokenLines.length - 1] === "") {
             // token.raw sometimes includes newline chars at the end of the string
             // which we don't want to include in the sourceMap
             tokenLines.pop();

package/src/tokenizer.ts

@@ -283,19 +283,25 @@ export class Tokenizer {
                 loose: false,
                 text: itemContents,
                 tokens: [],
+                sourceMap: this.lexer.getSourceMap(raw),
             });
 
             list.raw += raw;
         }
 
         // Do not consume newlines at end of final item. Alternatively, make itemRegex *start* with any newlines to simplify/speed up endsWithBlankLine logic
-        list.items[list.items.length - 1]!.raw = raw.trimEnd();
+        const lastTrimmed = raw.trimEnd();
+
+        if (list.items[list.items.length - 1]!.sourceMap) {
+            this.lexer.line -= raw.length - lastTrimmed.length;
+        }
+
+        list.items[list.items.length - 1]!.raw = lastTrimmed;
         list.items[list.items.length - 1]!.text = itemContents.trimEnd();
         list.raw = list.raw.trimEnd();
 
         // Item child tokens handled here at end because we needed to have the final item to trim it first
         for (let i = 0, listItemsLen = list.items.length; i < listItemsLen; i++) {
-            list.items[i]!.sourceMap = this.lexer.getSourceMap(list.items[i]!.raw);
             this.lexer.state.top = false;
             list.items[i]!.tokens = this.lexer.blockTokens(list.items[i]!.text, []);
 

package/src/types.ts

@@ -72,7 +72,7 @@ export interface Tokens extends Record<string, BaseToken> {
         checked?: boolean | undefined;
         loose: boolean;
         tokens: Token[];
-        sourceMap?: SourceMap;
+        sourceMap: SourceMap;
     };
     Paragraph: {
         type: "paragraph";

package/bunfig.toml

@@ -1,2 +0,0 @@
-[test]
-preload = "./tests/happydom.ts"