@mtcute/markdown-parser 0.20.0 → 0.22.0

package/index.cjs

@@ -228,16 +228,18 @@ function parse(strings, ...sub) {
           }
           pos += 1;
           if (pos > text.length) {
-            throw new Error("Malformed PRE entity, expected LF after ```");
+            result += "```";
+            feed(language);
+          } else {
+            if (!("pre" in stacks)) stacks.pre = [];
+            stacks.pre.push({
+              _: "messageEntityPre",
+              offset: result.length,
+              length: 0,
+              language
+            });
+            insidePre = true;
           }
-          if (!("pre" in stacks)) stacks.pre = [];
-          stacks.pre.push({
-            _: "messageEntityPre",
-            offset: result.length,
-            length: 0,
-            language
-          });
-          insidePre = true;
         } else {
           pos += 1;
           if (!("code" in stacks)) stacks.code = [];
@@ -335,9 +337,51 @@ function parse(strings, ...sub) {
     }
   });
   feed(strings[strings.length - 1]);
+  function adjustOffsets(from, by) {
+    for (const ent of entities) {
+      if (ent.offset >= from) ent.offset += by;
+    }
+    for (const stack of Object.values(stacks)) {
+      for (const ent of stack) {
+        if (ent.offset >= from) ent.offset += by;
+      }
+    }
+  }
   for (const [name, stack] of Object.entries(stacks)) {
+    if (stack.length > 1) {
+      throw new Error(`Malformed ${name} entity`);
+    }
     if (stack.length) {
-      throw new Error(`Unterminated ${name} entity`);
+      switch (name) {
+        case "link": {
+          const startOffset = stack.pop().offset;
+          insideLink = false;
+          insideLinkUrl = false;
+          const url = pendingLinkUrl;
+          pendingLinkUrl = "";
+          result = `${result.substring(0, startOffset)}[${result.substring(startOffset)}](`;
+          adjustOffsets(startOffset, 1);
+          feed(url);
+          break;
+        }
+        default: {
+          const startOffset = stack.pop().offset;
+          const tag = {
+            Bold: TAG_BOLD,
+            Italic: TAG_ITALIC,
+            Underline: TAG_UNDERLINE,
+            Strike: TAG_STRIKE,
+            Spoiler: TAG_SPOILER,
+            code: TAG_CODE
+          }[name];
+          if (!tag) throw new Error(`invalid tag ${name}`);
+          const remaining = result.substring(startOffset);
+          result = `${result.substring(0, startOffset)}${tag}`;
+          adjustOffsets(startOffset, tag.length);
+          feed(remaining);
+          break;
+        }
+      }
     }
   }
   return {

package/index.js

@@ -221,16 +221,18 @@ function parse(strings, ...sub) {
           }
           pos += 1;
           if (pos > text.length) {
-            throw new Error("Malformed PRE entity, expected LF after ```");
+            result += "```";
+            feed(language);
+          } else {
+            if (!("pre" in stacks)) stacks.pre = [];
+            stacks.pre.push({
+              _: "messageEntityPre",
+              offset: result.length,
+              length: 0,
+              language
+            });
+            insidePre = true;
           }
-          if (!("pre" in stacks)) stacks.pre = [];
-          stacks.pre.push({
-            _: "messageEntityPre",
-            offset: result.length,
-            length: 0,
-            language
-          });
-          insidePre = true;
         } else {
           pos += 1;
           if (!("code" in stacks)) stacks.code = [];
@@ -328,9 +330,51 @@ function parse(strings, ...sub) {
     }
   });
   feed(strings[strings.length - 1]);
+  function adjustOffsets(from, by) {
+    for (const ent of entities) {
+      if (ent.offset >= from) ent.offset += by;
+    }
+    for (const stack of Object.values(stacks)) {
+      for (const ent of stack) {
+        if (ent.offset >= from) ent.offset += by;
+      }
+    }
+  }
   for (const [name, stack] of Object.entries(stacks)) {
+    if (stack.length > 1) {
+      throw new Error(`Malformed ${name} entity`);
+    }
     if (stack.length) {
-      throw new Error(`Unterminated ${name} entity`);
+      switch (name) {
+        case "link": {
+          const startOffset = stack.pop().offset;
+          insideLink = false;
+          insideLinkUrl = false;
+          const url = pendingLinkUrl;
+          pendingLinkUrl = "";
+          result = `${result.substring(0, startOffset)}[${result.substring(startOffset)}](`;
+          adjustOffsets(startOffset, 1);
+          feed(url);
+          break;
+        }
+        default: {
+          const startOffset = stack.pop().offset;
+          const tag = {
+            Bold: TAG_BOLD,
+            Italic: TAG_ITALIC,
+            Underline: TAG_UNDERLINE,
+            Strike: TAG_STRIKE,
+            Spoiler: TAG_SPOILER,
+            code: TAG_CODE
+          }[name];
+          if (!tag) throw new Error(`invalid tag ${name}`);
+          const remaining = result.substring(startOffset);
+          result = `${result.substring(0, startOffset)}${tag}`;
+          adjustOffsets(startOffset, tag.length);
+          feed(remaining);
+          break;
+        }
+      }
     }
   }
   return {

package/package.json

@@ -1,11 +1,11 @@
 {
     "name": "@mtcute/markdown-parser",
     "type": "module",
-    "version": "0.20.0",
+    "version": "0.22.0",
     "description": "Markdown entities parser for mtcute",
     "license": "MIT",
     "dependencies": {
-        "@mtcute/core": "^0.20.0",
+        "@mtcute/core": "^0.22.0",
         "long": "5.2.3"
     },
     "exports": {