@milkdown/preset-commonmark 7.15.1 → 7.15.2

package/lib/__test__/html.spec.d.ts

@@ -0,0 +1,2 @@
+import '@testing-library/jest-dom/vitest';
+//# sourceMappingURL=html.spec.d.ts.map

package/lib/__test__/html.spec.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"html.spec.d.ts","sourceRoot":"","sources":["../../src/__test__/html.spec.ts"],"names":[],"mappings":"AAAA,OAAO,kCAAkC,CAAA"}

package/lib/index.js

@@ -97,7 +97,7 @@ withMeta(emphasisStarInputRule, {
   group: "Emphasis"
 });
 const emphasisUnderscoreInputRule = $inputRule((ctx) => {
-  return markRule(/(?:^|[^_])_([^_]+)_$/, emphasisSchema.type(ctx), {
+  return markRule(/\b_(?![_\s])(.*?[^_\s])_\b/, emphasisSchema.type(ctx), {
     getAttr: () => ({
       marker: "_"
     }),
@@ -187,13 +187,17 @@ withMeta(toggleStrongCommand, {
   group: "Strong"
 });
 const strongInputRule = $inputRule((ctx) => {
-  return markRule(/(?:\*\*|__)([^*_]+)(?:\*\*|__)$/, strongSchema.type(ctx), {
-    getAttr: (match) => {
-      return {
-        marker: match[0].startsWith("*") ? "*" : "_"
-      };
+  return markRule(
+    new RegExp("(?<![\\w:/])(?:\\*\\*|__)([^*_]+?)(?:\\*\\*|__)(?![\\w/])$"),
+    strongSchema.type(ctx),
+    {
+      getAttr: (match) => {
+        return {
+          marker: match[0].startsWith("*") ? "*" : "_"
+        };
+      }
     }
-  });
+  );
 });
 withMeta(strongInputRule, {
   displayName: "InputRule<strong>",
@@ -1909,12 +1913,13 @@ function flatMapWithDepth(ast, fn) {
     return fn(node, index, parent);
   }
 }
+const BLOCK_CONTAINER_TYPES = ["root", "blockquote", "listItem"];
 const remarkHtmlTransformer = $remark(
   "remarkHTMLTransformer",
   () => () => (tree) => {
     flatMapWithDepth(tree, (node, _index, parent) => {
       if (!isHTML(node)) return [node];
-      if (parent?.type === "root") {
+      if (parent && BLOCK_CONTAINER_TYPES.includes(parent.type)) {
         node.children = [{ ...node }];
         delete node.value;
         node.type = "paragraph";
@@ -2159,12 +2164,14 @@ withMeta(syncHeadingIdPlugin, {
   group: "Prose"
 });
 const syncListOrderPlugin = $prose((ctx) => {
-  const syncOrderLabel = (view) => {
-    if (view.composing || !view.editable) return;
+  const syncOrderLabel = (transactions, _oldState, newState) => {
+    if (!newState.selection || transactions.some(
+      (tr2) => tr2.getMeta("addToHistory") === false || !tr2.isGeneric
+    ))
+      return null;
     const orderedListType = orderedListSchema.type(ctx);
     const bulletListType = bulletListSchema.type(ctx);
     const listItemType = listItemSchema.type(ctx);
-    const state = view.state;
     const handleNodeItem = (attrs, index) => {
       let changed = false;
       const expectedLabel = `${index + 1}.`;
@@ -2174,50 +2181,47 @@ const syncListOrderPlugin = $prose((ctx) => {
       }
       return changed;
     };
-    let tr = state.tr;
+    let tr = newState.tr;
     let needDispatch = false;
-    state.doc.descendants((node, pos, parent, index) => {
-      if (node.type === bulletListType) {
-        const base = node.maybeChild(0);
-        if (base?.type === listItemType && base.attrs.listType === "ordered") {
-          needDispatch = true;
-          tr.setNodeMarkup(pos, orderedListType, { spread: "true" });
-          node.descendants((child, pos2, _parent, index2) => {
-            if (child.type === listItemType) {
-              const attrs = { ...child.attrs };
-              const changed = handleNodeItem(attrs, index2);
-              if (changed) tr = tr.setNodeMarkup(pos2, void 0, attrs);
-            }
-            return false;
-          });
-        }
-      } else if (node.type === listItemType && parent?.type === orderedListType) {
-        const attrs = { ...node.attrs };
-        let changed = false;
-        if (attrs.listType !== "ordered") {
-          attrs.listType = "ordered";
-          changed = true;
-        }
-        const base = parent?.maybeChild(0);
-        if (base) changed = handleNodeItem(attrs, index);
-        if (changed) {
-          tr = tr.setNodeMarkup(pos, void 0, attrs);
-          needDispatch = true;
+    newState.doc.descendants(
+      (node, pos, parent, index) => {
+        if (node.type === bulletListType) {
+          const base = node.maybeChild(0);
+          if (base?.type === listItemType && base.attrs.listType === "ordered") {
+            needDispatch = true;
+            tr.setNodeMarkup(pos, orderedListType, { spread: "true" });
+            node.descendants(
+              (child, pos2, _parent, index2) => {
+                if (child.type === listItemType) {
+                  const attrs = { ...child.attrs };
+                  const changed = handleNodeItem(attrs, index2);
+                  if (changed) tr = tr.setNodeMarkup(pos2, void 0, attrs);
+                }
+                return false;
+              }
+            );
+          }
+        } else if (node.type === listItemType && parent?.type === orderedListType) {
+          const attrs = { ...node.attrs };
+          let changed = false;
+          if (attrs.listType !== "ordered") {
+            attrs.listType = "ordered";
+            changed = true;
+          }
+          const base = parent?.maybeChild(0);
+          if (base) changed = handleNodeItem(attrs, index);
+          if (changed) {
+            tr = tr.setNodeMarkup(pos, void 0, attrs);
+            needDispatch = true;
+          }
         }
       }
-    });
-    if (needDispatch) view.dispatch(tr.setMeta("addToHistory", false));
+    );
+    return needDispatch ? tr.setMeta("addToHistory", false) : null;
   };
   return new Plugin({
     key: new PluginKey("MILKDOWN_KEEP_LIST_ORDER"),
-    view: (view) => {
-      syncOrderLabel(view);
-      return {
-        update: (view2) => {
-          syncOrderLabel(view2);
-        }
-      };
-    }
+    appendTransaction: syncOrderLabel
   });
 });
 withMeta(syncListOrderPlugin, {