@lvce-editor/markdown-worker 2.1.0 → 3.0.0

package/dist/markdownWorkerMain.js

@@ -1122,68 +1122,68 @@ const Tfoot = 'tfoot';
 
 const getVirtualDomTag = text => {
   switch (text) {
-    case H1:
-      return H1$1;
-    case H2:
-      return H2$1;
-    case H3:
-      return H3$1;
-    case H4:
-      return H4$1;
-    case H5:
-      return H5$1;
-    case Div:
-      return Div$1;
+    case A:
+      return A$1;
+    case Abbr:
+      return Abbr$1;
     case Article:
       return Article$1;
     case Aside:
       return Aside$1;
-    case Footer:
-      return Footer$1;
-    case Header:
-      return Header$1;
-    case Nav:
-      return Nav$1;
-    case Section:
-      return Section$1;
-    case Search:
-      return Search$1;
+    case Br:
+      return Br$1;
+    case Cite:
+      return Cite$1;
+    case Data:
+      return Data$1;
     case Dd:
       return Dd$1;
+    case Div:
+      return Div$1;
     case Dl:
       return Dl$1;
     case Figcaption:
       return Figcaption$1;
     case Figure:
       return Figure$1;
+    case Footer:
+      return Footer$1;
+    case H1:
+      return H1$1;
+    case H2:
+      return H2$1;
+    case H3:
+      return H3$1;
+    case H4:
+      return H4$1;
+    case H5:
+      return H5$1;
+    case Header:
+      return Header$1;
     case Hr:
       return Hr$1;
+    case Img:
+      return Img$1;
     case Li:
       return Li$1;
+    case Nav:
+      return Nav$1;
     case Ol:
       return Ol$1;
     case P$1:
       return P$2;
     case Pre:
       return Pre$1;
-    case A:
-      return A$1;
-    case Abbr:
-      return Abbr$1;
-    case Br:
-      return Br$1;
-    case Cite:
-      return Cite$1;
-    case Data:
-      return Data$1;
-    case Time:
-      return Time$1;
-    case Tfoot:
-      return Tfoot$1;
-    case Img:
-      return Img$1;
+    case Search:
+      return Search$1;
+    case Section:
+      return Section$1;
     case Span:
       return Span$1;
+    case Tfoot:
+      return Tfoot$1;
+    case Time:
+      return Time$1;
     default:
       return Div$1;
   }
@@ -1233,19 +1233,19 @@ class UnexpectedTokenError extends Error {
 }
 
 const State = {
-  TopLevelContent: 1,
-  AfterOpeningAngleBracket: 2,
-  InsideOpeningTag: 3,
-  AfterClosingTagSlash: 4,
-  AfterClosingTagName: 5,
-  InsideOpeningTagAfterWhitespace: 6,
-  AfterAttributeName: 7,
   AfterAttributeEqualSign: 8,
-  InsideAttributeAfterDoubleQuote: 9,
-  AfterAttributeValueInsideDoubleQuote: 10,
+  AfterAttributeName: 7,
   AfterAttributeValueClosingQuote: 11,
+  AfterAttributeValueInsideDoubleQuote: 10,
+  AfterClosingTagName: 5,
+  AfterClosingTagSlash: 4,
   AfterExclamationMark: 16,
-  InsideComment: 17
+  AfterOpeningAngleBracket: 2,
+  InsideAttributeAfterDoubleQuote: 9,
+  InsideComment: 17,
+  InsideOpeningTag: 3,
+  InsideOpeningTagAfterWhitespace: 6,
+  TopLevelContent: 1
 };
 const RE_ANGLE_BRACKET_OPEN = /^</;
 const RE_ANGLE_BRACKET_OPEN_TAG = /^<(?![\s!%])/;
@@ -1266,6 +1266,7 @@ const RE_BLOCK_COMMENT_CONTENT = /^[a-zA-Z\s]+/;
 const RE_COMMENT_END = /^-->/;
 const RE_TAG_TEXT = /^[^\s>]+/;
 const RE_ANY_TEXT = /^[^\n]+/;
+const RE_ATTRIBUTE_TEXT = /^[^\n<>/\s]+/;
 const RE_BLOCK_COMMENT_START = /^<!--/;
 const RE_SELF_CLOSING = /^\/>/;
 const tokenizeHtml = text => {
@@ -1278,26 +1279,97 @@ const tokenizeHtml = text => {
   while (index < text.length) {
     const part = text.slice(index);
     switch (state) {
-      case State.TopLevelContent:
-        if (next = part.match(RE_ANGLE_BRACKET_OPEN_TAG)) {
+      case State.AfterAttributeEqualSign:
+        if (next = part.match(RE_DOUBLE_QUOTE)) {
+          token = AttributeQuoteStart;
+          state = State.InsideAttributeAfterDoubleQuote;
+        } else if (next = part.match(RE_ANGLE_BRACKET_CLOSE)) {
+          token = ClosingAngleBracket;
+          state = State.TopLevelContent;
+        } else if (next = part.match(RE_ATTRIBUTE_TEXT)) {
+          token = AttributeValue;
+          state = State.InsideOpeningTag;
+        } else {
+          throw new UnexpectedTokenError();
+        }
+        break;
+      case State.AfterAttributeName:
+        if (next = part.match(RE_EQUAL_SIGN)) {
+          token = AttributeEqualSign;
+          state = State.AfterAttributeEqualSign;
+        } else if (next = part.match(RE_ANGLE_BRACKET_CLOSE)) {
+          token = ClosingAngleBracket;
+          state = State.TopLevelContent;
+        } else if (next = part.match(RE_WHITESPACE)) {
+          token = WhitespaceInsideOpeningTag;
+          state = State.InsideOpeningTagAfterWhitespace;
+        } else if (next = part.match(RE_ANGLE_BRACKET_OPEN)) {
           token = OpeningAngleBracket;
           state = State.AfterOpeningAngleBracket;
-        } else if (next = part.match(RE_CONTENT)) {
-          token = Content;
+        } else {
+          text.slice(index); // ?
+          throw new UnexpectedTokenError();
+        }
+        break;
+      case State.AfterAttributeValueClosingQuote:
+        if (next = part.match(RE_ANGLE_BRACKET_CLOSE)) {
+          token = ClosingAngleBracket;
           state = State.TopLevelContent;
-        } else if (next = part.match(RE_BLOCK_COMMENT_START)) {
-          token = CommentStart;
-          state = State.InsideComment;
-        } else if (next = part.match(RE_ANGLE_BRACKET_CLOSE)) {
+        } else if (next = part.match(RE_WHITESPACE)) {
+          token = WhitespaceInsideOpeningTag;
+          state = State.InsideOpeningTagAfterWhitespace;
+        } else if (next = part.match(RE_SELF_CLOSING)) {
+          token = ClosingAngleBracket;
+          state = State.TopLevelContent;
+        } else {
+          throw new UnexpectedTokenError();
+        }
+        break;
+      case State.AfterAttributeValueInsideDoubleQuote:
+        if (next = part.match(RE_DOUBLE_QUOTE)) {
+          token = AttributeQuoteEnd;
+          state = State.AfterAttributeValueClosingQuote;
+        } else {
+          throw new UnexpectedTokenError();
+        }
+        break;
+      case State.AfterClosingTagName:
+        if (next = part.match(RE_ANGLE_BRACKET_CLOSE)) {
+          token = ClosingAngleBracket;
+          state = State.TopLevelContent;
+        } else if (next = part.match(RE_WHITESPACE)) {
           token = Content;
           state = State.TopLevelContent;
-        } else if (next = part.match(RE_ANGLE_BRACKET_OPEN)) {
-          token = Text;
+        } else {
+          throw new UnexpectedTokenError();
+        }
+        break;
+      case State.AfterClosingTagSlash:
+        if (next = part.match(RE_TAGNAME)) {
+          token = TagNameEnd;
+          state = State.AfterClosingTagName;
+        } else if (next = part.match(RE_WHITESPACE)) {
+          token = WhitespaceAfterClosingTagSlash;
+          state = State.TopLevelContent;
+        } else if (next = part.match(RE_ANGLE_BRACKET_CLOSE)) {
+          token = ClosingAngleBracket;
           state = State.TopLevelContent;
         } else {
           throw new UnexpectedTokenError();
         }
         break;
+      case State.AfterExclamationMark:
+        if (next = part.match(RE_DASH_DASH)) {
+          token = StartCommentDashes;
+          state = State.InsideComment;
+        } else if (next = part.match(RE_DOCTYPE)) {
+          token = Doctype;
+          state = State.InsideOpeningTag;
+        } else {
+          text.slice(index); // ?
+          throw new UnexpectedTokenError();
+        }
+        break;
       case State.AfterOpeningAngleBracket:
         if (next = part.match(RE_TAGNAME)) {
           token = TagNameStart;
@@ -1322,15 +1394,14 @@ const tokenizeHtml = text => {
           throw new UnexpectedTokenError();
         }
         break;
-      case State.AfterExclamationMark:
-        if (next = part.match(RE_DASH_DASH)) {
-          token = StartCommentDashes;
-          state = State.InsideComment;
-        } else if (next = part.match(RE_DOCTYPE)) {
-          token = Doctype;
-          state = State.InsideOpeningTag;
+      case State.InsideAttributeAfterDoubleQuote:
+        if (next = text.slice(index).match(RE_ATTRIBUTE_VALUE_INSIDE_DOUBLE_QUOTE)) {
+          token = AttributeValue;
+          state = State.AfterAttributeValueInsideDoubleQuote;
+        } else if (next = part.match(RE_DOUBLE_QUOTE)) {
+          token = AttributeQuoteEnd;
+          state = State.AfterAttributeValueClosingQuote;
         } else {
-          text.slice(index); // ?
           throw new UnexpectedTokenError();
         }
         break;
@@ -1379,89 +1450,22 @@ const tokenizeHtml = text => {
           throw new UnexpectedTokenError();
         }
         break;
-      case State.AfterAttributeName:
-        if (next = part.match(RE_EQUAL_SIGN)) {
-          token = AttributeEqualSign;
-          state = State.AfterAttributeEqualSign;
-        } else if (next = part.match(RE_ANGLE_BRACKET_CLOSE)) {
-          token = ClosingAngleBracket;
-          state = State.TopLevelContent;
-        } else if (next = part.match(RE_WHITESPACE)) {
-          token = WhitespaceInsideOpeningTag;
-          state = State.InsideOpeningTagAfterWhitespace;
-        } else if (next = part.match(RE_ANGLE_BRACKET_OPEN)) {
+      case State.TopLevelContent:
+        if (next = part.match(RE_ANGLE_BRACKET_OPEN_TAG)) {
           token = OpeningAngleBracket;
           state = State.AfterOpeningAngleBracket;
-        } else {
-          text.slice(index); // ?
-          throw new UnexpectedTokenError();
-        }
-        break;
-      case State.AfterAttributeEqualSign:
-        if (next = part.match(RE_DOUBLE_QUOTE)) {
-          token = AttributeQuoteStart;
-          state = State.InsideAttributeAfterDoubleQuote;
-        } else if (next = part.match(RE_ANGLE_BRACKET_CLOSE)) {
-          token = ClosingAngleBracket;
-          state = State.TopLevelContent;
-        } else {
-          throw new UnexpectedTokenError();
-        }
-        break;
-      case State.InsideAttributeAfterDoubleQuote:
-        if (next = text.slice(index).match(RE_ATTRIBUTE_VALUE_INSIDE_DOUBLE_QUOTE)) {
-          token = AttributeValue;
-          state = State.AfterAttributeValueInsideDoubleQuote;
-        } else if (next = part.match(RE_DOUBLE_QUOTE)) {
-          token = AttributeQuoteEnd;
-          state = State.AfterAttributeValueClosingQuote;
-        } else {
-          throw new UnexpectedTokenError();
-        }
-        break;
-      case State.AfterAttributeValueInsideDoubleQuote:
-        if (next = part.match(RE_DOUBLE_QUOTE)) {
-          token = AttributeQuoteEnd;
-          state = State.AfterAttributeValueClosingQuote;
-        } else {
-          throw new UnexpectedTokenError();
-        }
-        break;
-      case State.AfterAttributeValueClosingQuote:
-        if (next = part.match(RE_ANGLE_BRACKET_CLOSE)) {
-          token = ClosingAngleBracket;
-          state = State.TopLevelContent;
-        } else if (next = part.match(RE_WHITESPACE)) {
-          token = WhitespaceInsideOpeningTag;
-          state = State.InsideOpeningTagAfterWhitespace;
-        } else if (next = part.match(RE_SELF_CLOSING)) {
-          token = ClosingAngleBracket;
-          state = State.TopLevelContent;
-        } else {
-          throw new UnexpectedTokenError();
-        }
-        break;
-      case State.AfterClosingTagSlash:
-        if (next = part.match(RE_TAGNAME)) {
-          token = TagNameEnd;
-          state = State.AfterClosingTagName;
-        } else if (next = part.match(RE_WHITESPACE)) {
-          token = WhitespaceAfterClosingTagSlash;
+        } else if (next = part.match(RE_CONTENT)) {
+          token = Content;
           state = State.TopLevelContent;
+        } else if (next = part.match(RE_BLOCK_COMMENT_START)) {
+          token = CommentStart;
+          state = State.InsideComment;
         } else if (next = part.match(RE_ANGLE_BRACKET_CLOSE)) {
-          token = ClosingAngleBracket;
-          state = State.TopLevelContent;
-        } else {
-          throw new UnexpectedTokenError();
-        }
-        break;
-      case State.AfterClosingTagName:
-        if (next = part.match(RE_ANGLE_BRACKET_CLOSE)) {
-          token = ClosingAngleBracket;
-          state = State.TopLevelContent;
-        } else if (next = part.match(RE_WHITESPACE)) {
           token = Content;
           state = State.TopLevelContent;
+        } else if (next = part.match(RE_ANGLE_BRACKET_OPEN)) {
+          token = Text;
+          state = State.TopLevelContent;
         } else {
           throw new UnexpectedTokenError();
         }
@@ -1471,8 +1475,8 @@ const tokenizeHtml = text => {
     }
     const tokenText = next[0];
     tokens.push({
-      type: token,
-      text: tokenText
+      text: tokenText,
+      type: token
     });
     index += tokenText.length;
   }
@@ -1485,33 +1489,14 @@ const parseHtml = (html, allowedAttributes) => {
   const tokens = tokenizeHtml(html);
   const dom = [];
   const root = {
-    type: 0,
-    childCount: 0
+    childCount: 0,
+    type: 0
   };
   let current = root;
   const stack = [root];
   let attributeName = '';
   for (const token of tokens) {
     switch (token.type) {
-      case TagNameStart:
-        current.childCount++;
-        current = {
-          type: getVirtualDomTag(token.text),
-          childCount: 0
-        };
-        dom.push(current);
-        if (!isSelfClosingTag(token.text)) {
-          stack.push(current);
-        }
-        break;
-      case TagNameEnd:
-        stack.pop();
-        current = stack.at(-1) || root;
-        break;
-      case Content:
-        current.childCount++;
-        dom.push(text(parseText(token.text)));
-        break;
       case AttributeName:
         attributeName = token.text;
         if (attributeName === 'class') {
@@ -1524,6 +1509,25 @@ const parseHtml = (html, allowedAttributes) => {
         }
         attributeName = '';
         break;
+      case Content:
+        current.childCount++;
+        dom.push(text(parseText(token.text)));
+        break;
+      case TagNameEnd:
+        stack.pop();
+        current = stack.at(-1) || root;
+        break;
+      case TagNameStart:
+        current.childCount++;
+        current = {
+          childCount: 0,
+          type: getVirtualDomTag(token.text)
+        };
+        dom.push(current);
+        if (!isSelfClosingTag(token.text)) {
+          stack.push(current);
+        }
+        break;
     }
   }
   return dom;
@@ -1534,11 +1538,11 @@ const getMarkdownVirtualDom = html => {
   const childDom = parseHtml(html, allowedMarkdownAttributes);
   const markdownChildCount = getVirtualDomChildCount(childDom);
   return [{
-    type: Div$1,
+    childCount: markdownChildCount,
     className: Markdown,
-    role: Document,
     onContextMenu: HandleReadmeContextMenu,
-    childCount: markdownChildCount
+    role: Document,
+    type: Div$1
   }, ...childDom];
 };
 
@@ -3227,6 +3231,17 @@ const renderMarkdown$1 = async (markdown, options = {}) => {
       return localLink ? html : html.replace(RE_LINK_START, `<a target="_blank" rel="noreferrer noopener nofollow" `);
     };
   }
+  const {
+    baseUrl
+  } = options;
+  if (baseUrl) {
+    const imageRenderer = renderer.image.bind(renderer);
+    renderer.image = image => {
+      image.href = new URL(image.href, baseUrl).toString();
+      const html = imageRenderer(image);
+      return html;
+    };
+  }
   const html = await k(markdown, {
     renderer
   });
@@ -3234,13 +3249,13 @@ const renderMarkdown$1 = async (markdown, options = {}) => {
 };
 
 const commandMap = {
+  'Markdown.getMarkDownVirtualDom': getMarkdownVirtualDom,
   'Markdown.getVirtualDom': getMarkdownVirtualDom,
   'Markdown.handleMessagePort': handleMessagePort,
   'Markdown.render': renderMarkdown$1,
-  'Markdown.terminate': terminate,
   // deprecated
   'Markdown.renderMarkdown': renderMarkdown$1,
-  'Markdown.getMarkDownVirtualDom': getMarkdownVirtualDom
+  'Markdown.terminate': terminate
 };
 
 const rpcs = Object.create(null);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/markdown-worker",
-  "version": "2.1.0",
+  "version": "3.0.0",
   "description": "Markdown Worker",
   "repository": {
     "type": "git",