mikel-markdown 0.26.0 → 0.26.1

package/index.js

@@ -80,14 +80,14 @@ const allExpressions = {
         replace: (args, cn) => {
             return render("ul", {class: cn.list}, render("li", {class: cn.listItem}, args[1]));
         },
-        afterRegex: /(<\/ul>\n(?:.*)<ul ?(?:class=".*")?>*)+/g
+        afterRegex: /(<\/ul>\n(?:.*)<ul ?(?:class="[^"]*")?>*)+/g
     },
     orderedList: {
         regex: /^[\t\s]*?(?:\d(?:\)|\.))\s(.*)/gm,
         replace: (args, cn) => {
             return render("ol", {class: cn.list}, render("li", {class: cn.listItem}, args[1]));
         },
-        afterRegex: /(<\/ol>\n(?:.*)<ol ?(?:class=".*")?>*)+/g
+        afterRegex: /(<\/ol>\n(?:.*)<ol ?(?:class="[^"]*")?>*)+/g
     },
     strong: {
         regex: /(?:\*\*|__)([^\n]+?)(?:\*\*|__)/g,
@@ -101,8 +101,8 @@ const allExpressions = {
         regex: /^((?:.+(?:\n|$))+)/gm,
         replace: (args, cn) => {
             const line = args[0].trim();
-            // check if the line starts with a block tag
-            if (/^\<(\/? *(ul|ol|bl|h\d|p|di|st|sc|t)|!--)/.test(line.slice(0, 4)) === true) {
+            // check if the line starts with a block tag or is an empty line
+            if (!line || /^\<(\/? *(ul|ol|bl|h\d|p|div|sty|scr|t)|!--)/.test(line.slice(0, 4))) {
                 return line;
             }
             return render("p", {class: cn.paragraph}, line.replace(/\n/g, ""));
@@ -110,10 +110,13 @@ const allExpressions = {
     }
 };
 
-// @description inline expressions
-const inlineExpressions = Object.fromEntries(["code", "link", "strong", "emphasis"].map(key => {
-    return [key, allExpressions[key]];
-}));
+// @description get only inline expressions
+const getInlineExpressions = expressions => {
+    const fields = ["code", "link", "strong", "emphasis", "image"].filter(key => !!expressions[key]);
+    return Object.fromEntries(fields.map(key => {
+        return [key, expressions[key]];
+    }));
+};
 
 // @description markdown parser
 const parser = (str = "", options = {}) => {
@@ -160,8 +163,8 @@ const markdownPlugin = (options = {}) => {
             },
             inlineMarkdown: params => {
                 return parser(params.fn(params.data) || "", {
-                    expressions: inlineExpressions,
                     ...options,
+                    expressions: getInlineExpressions(options.expressions || allExpressions),
                 });
             },
         },

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "mikel-markdown",
     "description": "A mikel helper for parsing markdown content.",
-    "version": "0.26.0",
+    "version": "0.26.1",
     "type": "module",
     "license": "MIT",
     "author": {