@milkdown/preset-commonmark 7.14.0 → 7.15.1

package/lib/index.js

@@ -4,7 +4,7 @@ import { TextSelection, Selection, PluginKey, Plugin } from "@milkdown/prose/sta
 import { findWrapping, ReplaceStep, AddMarkStep } from "@milkdown/prose/transform";
 import { $markAttr, $markSchema, $inputRule, $command, $useKeymap, $node, $remark, $nodeAttr, $nodeSchema, $ctx, $prose } from "@milkdown/utils";
 import { remarkStringifyOptionsCtx, commandsCtx, editorViewCtx } from "@milkdown/core";
-import { toggleMark, setBlockType, wrapIn } from "@milkdown/prose/commands";
+import { toggleMark, setBlockType, wrapIn, joinBackward } from "@milkdown/prose/commands";
 import { visitParents } from "unist-util-visit-parents";
 import { expectDomTypeError } from "@milkdown/exception";
 import { textblockTypeInputRule, wrappingInputRule, InputRule } from "@milkdown/prose/inputrules";
@@ -13,8 +13,7 @@ import { Decoration, DecorationSet } from "@milkdown/prose/view";
 import { visit } from "unist-util-visit";
 import remarkInlineLinks from "remark-inline-links";
 function serializeText(state, node) {
-  var _a;
-  const lastIsHardBreak = node.childCount >= 1 && ((_a = node.lastChild) == null ? void 0 : _a.type.name) === "hardbreak";
+  const lastIsHardBreak = node.childCount >= 1 && node.lastChild?.type.name === "hardbreak";
   if (!lastIsHardBreak) {
     state.next(node.content);
     return;
@@ -258,7 +257,7 @@ const toggleInlineCodeCommand = $command(
     const { from, to } = selection;
     const has = state.doc.rangeHasMark(from, to, inlineCodeSchema.type(ctx));
     if (has) {
-      dispatch == null ? void 0 : dispatch(tr.removeMark(from, to, inlineCodeSchema.type(ctx)));
+      dispatch?.(tr.removeMark(from, to, inlineCodeSchema.type(ctx)));
       return true;
     }
     const restMarksName = Object.keys(state.schema.marks).filter(
@@ -267,7 +266,7 @@ const toggleInlineCodeCommand = $command(
     restMarksName.map((name) => state.schema.marks[name]).forEach((t) => {
       tr.removeMark(from, to, t);
     });
-    dispatch == null ? void 0 : dispatch(tr.addMark(from, to, inlineCodeSchema.type(ctx).create()));
+    dispatch?.(tr.addMark(from, to, inlineCodeSchema.type(ctx).create()));
     return true;
   }
 );
@@ -411,12 +410,9 @@ withMeta(docSchema, {
 function visitEmptyLine(ast) {
   return visitParents(
     ast,
-    (node) => {
-      var _a;
-      return node.type === "html" && ["<br />", "<br>", "<br >", "<br/>"].includes(
-        (_a = node.value) == null ? void 0 : _a.trim()
-      );
-    },
+    (node) => node.type === "html" && ["<br />", "<br>", "<br >", "<br/>"].includes(
+      node.value?.trim()
+    ),
     (node, parents) => {
       if (!parents.length) return;
       const parent = parents[parents.length - 1];
@@ -462,9 +458,8 @@ const paragraphSchema = $nodeSchema("paragraph", (ctx) => ({
   toMarkdown: {
     match: (node) => node.type.name === "paragraph",
     runner: (state, node) => {
-      var _a;
       const view = ctx.get(editorViewCtx);
-      const lastNode = (_a = view.state) == null ? void 0 : _a.doc.lastChild;
+      const lastNode = view.state?.doc.lastChild;
       state.openNode("paragraph");
       if ((!node.content || node.content.size === 0) && node !== lastNode && shouldPreserveEmptyLine(ctx)) {
         state.addNode("html", void 0, "<br />");
@@ -520,7 +515,7 @@ withMeta(paragraphKeymap.shortcuts, {
 });
 const headingIndex = Array(6).fill(0).map((_, i) => i + 1);
 function defaultHeadingIdGenerator(node) {
-  return node.textContent.toLowerCase().trim().replace(/[^\w\s-]/g, "").replace(/\s+/g, "-");
+  return node.textContent.toLowerCase().trim().replace(/\s+/g, "-");
 }
 const headingIdGenerator = $ctx(
   defaultHeadingIdGenerator,
@@ -600,8 +595,7 @@ const wrapInHeadingInputRule = $inputRule((ctx) => {
     /^(?<hashes>#+)\s$/,
     headingSchema.type(ctx),
     (match) => {
-      var _a, _b;
-      const x = ((_b = (_a = match.groups) == null ? void 0 : _a.hashes) == null ? void 0 : _b.length) || 0;
+      const x = match.groups?.hashes?.length || 0;
       const view = ctx.get(editorViewCtx);
       const { $from } = view.state.selection;
       const node = $from.node();
@@ -620,7 +614,7 @@ withMeta(wrapInHeadingInputRule, {
 });
 const wrapInHeadingCommand = $command("WrapInHeading", (ctx) => {
   return (level) => {
-    level ?? (level = 1);
+    level ??= 1;
     if (level < 1) return setBlockType(paragraphSchema.type(ctx));
     return setBlockType(headingSchema.type(ctx), { level });
   };
@@ -639,7 +633,7 @@ const downgradeHeadingCommand = $command(
     const level = node.attrs.level - 1;
     if (!level)
       return setBlockType(paragraphSchema.type(ctx))(state, dispatch, view);
-    dispatch == null ? void 0 : dispatch(
+    dispatch?.(
       state.tr.setNodeMarkup(state.selection.$from.before(), void 0, {
         ...node.attrs,
         level
@@ -835,8 +829,7 @@ const codeBlockSchema = $nodeSchema("code_block", (ctx) => {
     toMarkdown: {
       match: (node) => node.type.name === "code_block",
       runner: (state, node) => {
-        var _a;
-        state.addNode("code", void 0, ((_a = node.content.firstChild) == null ? void 0 : _a.text) || "", {
+        state.addNode("code", void 0, node.content.firstChild?.text || "", {
           lang: node.attrs.language
         });
       }
@@ -855,12 +848,9 @@ const createCodeBlockInputRule = $inputRule(
   (ctx) => textblockTypeInputRule(
     /^```(?<language>[a-z]*)?[\s\n]$/,
     codeBlockSchema.type(ctx),
-    (match) => {
-      var _a;
-      return {
-        language: ((_a = match.groups) == null ? void 0 : _a.language) ?? ""
-      };
-    }
+    (match) => ({
+      language: match.groups?.language ?? ""
+    })
   )
 );
 withMeta(createCodeBlockInputRule, {
@@ -882,7 +872,7 @@ const updateCodeBlockLanguageCommand = $command(
     language: ""
   }) => (state, dispatch) => {
     if (pos >= 0) {
-      dispatch == null ? void 0 : dispatch(state.tr.setNodeAttribute(pos, "language", language));
+      dispatch?.(state.tr.setNodeAttribute(pos, "language", language));
       return true;
     }
     return false;
@@ -1007,7 +997,7 @@ const updateImageCommand = $command(
     if (src !== void 0) newAttrs.src = src;
     if (alt !== void 0) newAttrs.alt = alt;
     if (title !== void 0) newAttrs.title = title;
-    dispatch == null ? void 0 : dispatch(
+    dispatch?.(
       state.tr.setNodeMarkup(pos, void 0, newAttrs).scrollIntoView()
     );
     return true;
@@ -1067,10 +1057,9 @@ const hardbreakSchema = $nodeSchema("hardbreak", (ctx) => ({
   parseMarkdown: {
     match: ({ type }) => type === "break",
     runner: (state, node, type) => {
-      var _a;
       state.addNode(type, {
         isInline: Boolean(
-          (_a = node.data) == null ? void 0 : _a.isInline
+          node.data?.isInline
         )
       });
     }
@@ -1095,13 +1084,12 @@ withMeta(hardbreakSchema.ctx, {
 const insertHardbreakCommand = $command(
   "InsertHardbreak",
   (ctx) => () => (state, dispatch) => {
-    var _a;
     const { selection, tr } = state;
     if (!(selection instanceof TextSelection)) return false;
     if (selection.empty) {
       const node = selection.$from.node();
-      if (node.childCount > 0 && ((_a = node.lastChild) == null ? void 0 : _a.type.name) === "hardbreak") {
-        dispatch == null ? void 0 : dispatch(
+      if (node.childCount > 0 && node.lastChild?.type.name === "hardbreak") {
+        dispatch?.(
           tr.replaceRangeWith(
             selection.to - 1,
             selection.to,
@@ -1111,7 +1099,7 @@ const insertHardbreakCommand = $command(
         return true;
       }
     }
-    dispatch == null ? void 0 : dispatch(
+    dispatch?.(
       tr.setMeta("hardbreak", true).replaceSelectionWith(hardbreakSchema.type(ctx).create()).scrollIntoView()
     );
     return true;
@@ -1504,11 +1492,8 @@ function liftFirstListItem(ctx) {
     const { empty, $from } = selection;
     if (!empty || $from.parentOffset !== 0) return false;
     const parentItem = $from.node(-1);
-    if (parentItem.type !== listItemSchema.type(ctx) || parentItem.firstChild !== $from.node())
-      return false;
-    const list = $from.node(-2);
-    if (list.childCount > 1) return false;
-    return liftListItem(listItemSchema.type(ctx))(state, dispatch, view);
+    if (parentItem.type !== listItemSchema.type(ctx)) return false;
+    return joinBackward(state, dispatch, view);
   };
 }
 const liftFirstListItemCommand = $command(
@@ -1710,7 +1695,7 @@ const clearTextInCurrentBlockCommand = $command(
     const left = from - $from.node().content.size;
     if (left < 0) return false;
     tr = tr.deleteRange(left, right);
-    dispatch == null ? void 0 : dispatch(tr);
+    dispatch?.(tr);
     return true;
   }
 );
@@ -1726,7 +1711,7 @@ const setBlockTypeCommand = $command(
     } catch {
       return false;
     }
-    dispatch == null ? void 0 : dispatch(tr);
+    dispatch?.(tr);
     return true;
   }
 );
@@ -1745,7 +1730,7 @@ const wrapInBlockTypeCommand = $command(
     } catch {
       return false;
     }
-    dispatch == null ? void 0 : dispatch(tr);
+    dispatch?.(tr);
     return true;
   }
 );
@@ -1762,7 +1747,7 @@ const addBlockTypeCommand = $command(
     } catch {
       return false;
     }
-    dispatch == null ? void 0 : dispatch(tr);
+    dispatch?.(tr);
     return true;
   }
 );
@@ -1779,7 +1764,7 @@ const selectTextNearPosCommand = $command(
     } catch {
       return false;
     }
-    dispatch == null ? void 0 : dispatch(tr.scrollIntoView());
+    dispatch?.(tr.scrollIntoView());
     return true;
   }
 );
@@ -1929,7 +1914,7 @@ const remarkHtmlTransformer = $remark(
   () => () => (tree) => {
     flatMapWithDepth(tree, (node, _index, parent) => {
       if (!isHTML(node)) return [node];
-      if ((parent == null ? void 0 : parent.type) === "root") {
+      if (parent?.type === "root") {
         node.children = [{ ...node }];
         delete node.value;
         node.type = "paragraph";
@@ -2194,7 +2179,7 @@ const syncListOrderPlugin = $prose((ctx) => {
     state.doc.descendants((node, pos, parent, index) => {
       if (node.type === bulletListType) {
         const base = node.maybeChild(0);
-        if ((base == null ? void 0 : base.type) === listItemType && base.attrs.listType === "ordered") {
+        if (base?.type === listItemType && base.attrs.listType === "ordered") {
           needDispatch = true;
           tr.setNodeMarkup(pos, orderedListType, { spread: "true" });
           node.descendants((child, pos2, _parent, index2) => {
@@ -2206,14 +2191,14 @@ const syncListOrderPlugin = $prose((ctx) => {
             return false;
           });
         }
-      } else if (node.type === listItemType && (parent == null ? void 0 : parent.type) === orderedListType) {
+      } 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 == null ? void 0 : parent.maybeChild(0);
+        const base = parent?.maybeChild(0);
         if (base) changed = handleNodeItem(attrs, index);
         if (changed) {
           tr = tr.setNodeMarkup(pos, void 0, attrs);