@milkdown/preset-commonmark 7.7.0 → 7.9.0

package/src/mark/strong.ts

@@ -1,4 +1,6 @@
 import { commandsCtx, remarkStringifyOptionsCtx } from '@milkdown/core'
+import { markRule } from '@milkdown/prose'
+import { toggleMark } from '@milkdown/prose/commands'
 import {
   $command,
   $inputRule,
@@ -6,8 +8,7 @@ import {
   $markSchema,
   $useKeymap,
 } from '@milkdown/utils'
-import { toggleMark } from '@milkdown/prose/commands'
-import { markRule } from '@milkdown/prose'
+
 import { withMeta } from '../__internal__'
 
 /// HTML attributes for the strong mark.
@@ -23,12 +24,26 @@ export const strongSchema = $markSchema('strong', (ctx) => ({
   attrs: {
     marker: {
       default: ctx.get(remarkStringifyOptionsCtx).strong || '*',
+      validate: 'string',
     },
   },
   parseDOM: [
-    { tag: 'b' },
+    // This works around a Google Docs misbehavior where
+    // pasted content will be inexplicably wrapped in `<b>`
+    // tags with a font-weight normal.
+    {
+      tag: 'b',
+      getAttrs: (node: HTMLElement) =>
+        node.style.fontWeight != 'normal' && null,
+    },
     { tag: 'strong' },
     { style: 'font-style', getAttrs: (value) => (value === 'bold') as false },
+    { style: 'font-weight=400', clearMark: (m) => m.type.name == 'strong' },
+    {
+      style: 'font-weight',
+      getAttrs: (value: string) =>
+        /^(bold(er)?|[5-9]\d{2,})$/.test(value) && null,
+    },
   ],
   toDOM: (mark) => ['strong', ctx.get(strongAttr.key)(mark)],
   parseMarkdown: {

package/src/node/blockquote.ts

@@ -1,7 +1,8 @@
+import type { $NodeSchema } from '@milkdown/utils'
+
 import { commandsCtx } from '@milkdown/core'
 import { wrapIn } from '@milkdown/prose/commands'
 import { wrappingInputRule } from '@milkdown/prose/inputrules'
-import type { $NodeSchema } from '@milkdown/utils'
 import {
   $command,
   $inputRule,
@@ -9,6 +10,7 @@ import {
   $nodeSchema,
   $useKeymap,
 } from '@milkdown/utils'
+
 import { withMeta } from '../__internal__'
 
 /// HTML attributes for blockquote node.

package/src/node/bullet-list.ts

@@ -9,6 +9,7 @@ import {
   $nodeSchema,
   $useKeymap,
 } from '@milkdown/utils'
+
 import { withMeta } from '../__internal__'
 
 /// HTML attributes for bullet list node.
@@ -27,6 +28,7 @@ export const bulletListSchema = $nodeSchema('bullet_list', (ctx) => {
     attrs: {
       spread: {
         default: false,
+        validate: 'boolean',
       },
     },
     parseDOM: [
@@ -36,7 +38,7 @@ export const bulletListSchema = $nodeSchema('bullet_list', (ctx) => {
           if (!(dom instanceof HTMLElement)) throw expectDomTypeError(dom)
 
           return {
-            spread: dom.dataset.spread,
+            spread: dom.dataset.spread === 'true',
           }
         },
       },
@@ -64,7 +66,7 @@ export const bulletListSchema = $nodeSchema('bullet_list', (ctx) => {
         state
           .openNode('list', undefined, {
             ordered: false,
-            spread: node.attrs.spread === 'true',
+            spread: node.attrs.spread,
           })
           .next(node.content)
           .closeNode()

package/src/node/code-block.ts

@@ -9,6 +9,7 @@ import {
   $nodeSchema,
   $useKeymap,
 } from '@milkdown/utils'
+
 import { withMeta } from '../__internal__'
 
 /// HTML attributes for code block node.
@@ -33,6 +34,7 @@ export const codeBlockSchema = $nodeSchema('code_block', (ctx) => {
     attrs: {
       language: {
         default: '',
+        validate: 'string',
       },
     },
     parseDOM: [

package/src/node/doc.ts

@@ -1,4 +1,5 @@
 import { $node } from '@milkdown/utils'
+
 import { withMeta } from '../__internal__'
 
 /// The top-level document node.

package/src/node/hardbreak.ts

@@ -1,6 +1,7 @@
 import { commandsCtx } from '@milkdown/core'
 import { Selection, TextSelection } from '@milkdown/prose/state'
 import { $command, $nodeAttr, $nodeSchema, $useKeymap } from '@milkdown/utils'
+
 import { withMeta } from '../__internal__'
 
 /// HTML attributes for the hardbreak node.
@@ -26,6 +27,7 @@ export const hardbreakSchema = $nodeSchema('hardbreak', (ctx) => ({
   attrs: {
     isInline: {
       default: false,
+      validate: 'boolean',
     },
   },
   selectable: false,

package/src/node/heading.ts

@@ -1,8 +1,9 @@
+import type { Node } from '@milkdown/prose/model'
+
 import { commandsCtx, editorViewCtx } from '@milkdown/core'
 import { expectDomTypeError } from '@milkdown/exception'
 import { setBlockType } from '@milkdown/prose/commands'
 import { textblockTypeInputRule } from '@milkdown/prose/inputrules'
-import type { Node } from '@milkdown/prose/model'
 import {
   $command,
   $ctx,
@@ -11,6 +12,7 @@ import {
   $nodeSchema,
   $useKeymap,
 } from '@milkdown/utils'
+
 import { serializeText, withMeta } from '../__internal__'
 import { paragraphSchema } from './paragraph'
 
@@ -56,9 +58,11 @@ export const headingSchema = $nodeSchema('heading', (ctx) => {
     attrs: {
       id: {
         default: '',
+        validate: 'string',
       },
       level: {
         default: 1,
+        validate: 'number',
       },
     },
     parseDOM: headingIndex.map((x) => ({

package/src/node/hr.ts

@@ -1,6 +1,7 @@
 import { InputRule } from '@milkdown/prose/inputrules'
 import { Selection } from '@milkdown/prose/state'
 import { $command, $inputRule, $nodeAttr, $nodeSchema } from '@milkdown/utils'
+
 import { withMeta } from '../__internal__'
 import { paragraphSchema } from './paragraph'
 

package/src/node/html.ts

@@ -1,4 +1,5 @@
 import { $nodeAttr, $nodeSchema } from '@milkdown/utils'
+
 import { withMeta } from '../__internal__'
 
 export const htmlAttr = $nodeAttr('html')
@@ -16,6 +17,7 @@ export const htmlSchema = $nodeSchema('html', (ctx) => {
     attrs: {
       value: {
         default: '',
+        validate: 'string',
       },
     },
     toDOM: (node) => {

package/src/node/image.ts

@@ -2,6 +2,7 @@ import { expectDomTypeError } from '@milkdown/exception'
 import { findSelectedNodeOfType } from '@milkdown/prose'
 import { InputRule } from '@milkdown/prose/inputrules'
 import { $command, $inputRule, $nodeAttr, $nodeSchema } from '@milkdown/utils'
+
 import { withMeta } from '../__internal__'
 
 /// HTML attributes for image node.
@@ -24,9 +25,9 @@ export const imageSchema = $nodeSchema('image', (ctx) => {
     defining: true,
     isolating: true,
     attrs: {
-      src: { default: '' },
-      alt: { default: '' },
-      title: { default: '' },
+      src: { default: '', validate: 'string' },
+      alt: { default: '', validate: 'string' },
+      title: { default: '', validate: 'string' },
     },
     parseDOM: [
       {

package/src/node/list-item.ts

@@ -1,3 +1,5 @@
+import type { Ctx } from '@milkdown/ctx'
+
 import { commandsCtx } from '@milkdown/core'
 import { expectDomTypeError } from '@milkdown/exception'
 import {
@@ -5,9 +7,9 @@ import {
   sinkListItem,
   splitListItem,
 } from '@milkdown/prose/schema-list'
-import { $command, $nodeAttr, $nodeSchema, $useKeymap } from '@milkdown/utils'
 import { type Command, TextSelection } from '@milkdown/prose/state'
-import type { Ctx } from '@milkdown/ctx'
+import { $command, $nodeAttr, $nodeSchema, $useKeymap } from '@milkdown/utils'
+
 import { withMeta } from '../__internal__'
 
 /// HTML attributes for list item node.
@@ -25,12 +27,15 @@ export const listItemSchema = $nodeSchema('list_item', (ctx) => ({
   attrs: {
     label: {
       default: '•',
+      validate: 'string',
     },
     listType: {
       default: 'bullet',
+      validate: 'string',
     },
     spread: {
-      default: 'true',
+      default: true,
+      validate: 'boolean',
     },
   },
   defining: true,
@@ -43,7 +48,7 @@ export const listItemSchema = $nodeSchema('list_item', (ctx) => ({
         return {
           label: dom.dataset.label,
           listType: dom.dataset.listType,
-          spread: dom.dataset.spread,
+          spread: dom.dataset.spread === 'true',
         }
       },
     },
@@ -73,7 +78,7 @@ export const listItemSchema = $nodeSchema('list_item', (ctx) => ({
     match: (node) => node.type.name === 'list_item',
     runner: (state, node) => {
       state.openNode('listItem', undefined, {
-        spread: node.attrs.spread === 'true',
+        spread: node.attrs.spread,
       })
       state.next(node.content)
       state.closeNode()

package/src/node/ordered-list.ts

@@ -9,6 +9,7 @@ import {
   $nodeSchema,
   $useKeymap,
 } from '@milkdown/utils'
+
 import { withMeta } from '../__internal__'
 
 /// HTML attributes for ordered list node.
@@ -26,9 +27,11 @@ export const orderedListSchema = $nodeSchema('ordered_list', (ctx) => ({
   attrs: {
     order: {
       default: 1,
+      validate: 'number',
     },
     spread: {
       default: false,
+      validate: 'boolean',
     },
   },
   parseDOM: [

package/src/node/paragraph.ts

@@ -1,9 +1,11 @@
-import { commandsCtx } from '@milkdown/core'
+import type { Ctx } from '@milkdown/ctx'
+
+import { commandsCtx, editorViewCtx } from '@milkdown/core'
 import { setBlockType } from '@milkdown/prose/commands'
 import { $command, $nodeAttr, $nodeSchema, $useKeymap } from '@milkdown/utils'
+
 import { serializeText, withMeta } from '../__internal__'
 import { remarkPreserveEmptyLinePlugin } from '../plugin/remark-preserve-empty-line'
-import type { Ctx } from '@milkdown/ctx'
 
 /// HTML attributes for paragraph node.
 export const paragraphAttr = $nodeAttr('paragraph')
@@ -32,9 +34,13 @@ export const paragraphSchema = $nodeSchema('paragraph', (ctx) => ({
   toMarkdown: {
     match: (node) => node.type.name === 'paragraph',
     runner: (state, node) => {
+      const view = ctx.get(editorViewCtx)
+      const lastNode = view.state?.doc.lastChild
+
       state.openNode('paragraph')
       if (
         (!node.content || node.content.size === 0) &&
+        node !== lastNode &&
         shouldPreserveEmptyLine(ctx)
       ) {
         state.addNode('html', undefined, '<br />')

package/src/node/text.ts

@@ -1,4 +1,5 @@
 import { $node } from '@milkdown/utils'
+
 import { withMeta } from '../__internal__'
 
 /// The bottom-level node.

package/src/plugin/hardbreak-clear-mark-plugin.ts

@@ -1,8 +1,9 @@
 import { Plugin, PluginKey } from '@milkdown/prose/state'
 import { AddMarkStep, ReplaceStep } from '@milkdown/prose/transform'
 import { $prose } from '@milkdown/utils'
-import { hardbreakSchema } from '../node'
+
 import { withMeta } from '../__internal__'
+import { hardbreakSchema } from '../node'
 
 /// This plugin is used to clear the marks around the hardbreak node.
 export const hardbreakClearMarkPlugin = $prose((ctx) => {

package/src/plugin/hardbreak-filter-plugin.ts

@@ -1,5 +1,6 @@
 import { Plugin, PluginKey } from '@milkdown/prose/state'
 import { $ctx, $prose } from '@milkdown/utils'
+
 import { withMeta } from '../__internal__'
 
 /// This slice contains the nodes that within which the hardbreak will be ignored.

package/src/plugin/inline-nodes-cursor-plugin.ts

@@ -1,6 +1,7 @@
 import { Plugin, PluginKey } from '@milkdown/prose/state'
 import { Decoration, DecorationSet } from '@milkdown/prose/view'
 import { $prose } from '@milkdown/utils'
+
 import { withMeta } from '../__internal__'
 
 /// This plugin is to solve the [chrome 98 bug](https://discuss.prosemirror.net/t/cursor-jumps-at-the-end-of-line-when-it-betweens-two-inline-nodes/4641).

package/src/plugin/remark-add-order-in-list-plugin.ts

@@ -1,5 +1,6 @@
 import { $remark } from '@milkdown/utils'
 import { visit } from 'unist-util-visit'
+
 import { withMeta } from '../__internal__'
 
 /// This plugin is used to add order in list for remark AST.

package/src/plugin/remark-html-transformer.ts

@@ -1,5 +1,7 @@
-import { $remark } from '@milkdown/utils'
 import type { Node } from '@milkdown/transformer'
+
+import { $remark } from '@milkdown/utils'
+
 import { withMeta } from '../__internal__'
 
 const isParent = (node: Node): node is Node & { children: Node[] } =>

package/src/plugin/remark-inline-link-plugin.ts

@@ -1,5 +1,6 @@
 import { $remark } from '@milkdown/utils'
 import remarkInlineLinks from 'remark-inline-links'
+
 import { withMeta } from '../__internal__'
 
 /// This plugin wraps [remark-inline-links](https://github.com/remarkjs/remark-inline-links).

package/src/plugin/remark-line-break.ts

@@ -1,6 +1,8 @@
-import { $remark } from '@milkdown/utils'
 import type { Node } from '@milkdown/transformer'
+
+import { $remark } from '@milkdown/utils'
 import { visit } from 'unist-util-visit'
+
 import { withMeta } from '../__internal__'
 
 /// This plugin is used to add inline line break for remark AST.

package/src/plugin/remark-marker-plugin.ts

@@ -1,6 +1,8 @@
-import { $remark } from '@milkdown/utils'
 import type { Node } from '@milkdown/transformer'
+
+import { $remark } from '@milkdown/utils'
 import { visit } from 'unist-util-visit'
+
 import { withMeta } from '../__internal__'
 
 /// This plugin is used to keep the marker (`_` and `*`) of emphasis and strong nodes.

package/src/plugin/remark-preserve-empty-line.ts

@@ -1,10 +1,12 @@
 import type { Node } from '@milkdown/transformer'
-import { visit } from 'unist-util-visit'
+
 import { $remark } from '@milkdown/utils'
+import { visit } from 'unist-util-visit'
+
 import { withMeta } from '../__internal__'
 
-function visitImage(ast: Node) {
-  return visit(ast, 'paragraph', (node: Node & { children?: Node[] }) => {
+function visitEmptyLine(ast: Node) {
+  return visit(ast, (node: Node & { children?: Node[] }) => {
     if (node.children?.length !== 1) return
     const firstChild = node.children?.[0]
     if (!firstChild || firstChild.type !== 'html') return
@@ -28,7 +30,7 @@ function visitImage(ast: Node) {
 /// This plugin should be used with `linebreakSchema` to work.
 export const remarkPreserveEmptyLinePlugin = $remark(
   'remark-preserve-empty-line',
-  () => () => visitImage
+  () => () => visitEmptyLine
 )
 
 withMeta(remarkPreserveEmptyLinePlugin.plugin, {

package/src/plugin/sync-heading-id-plugin.ts

@@ -1,8 +1,10 @@
-import { Plugin, PluginKey } from '@milkdown/prose/state'
 import type { EditorView } from '@milkdown/prose/view'
+
+import { Plugin, PluginKey } from '@milkdown/prose/state'
 import { $prose } from '@milkdown/utils'
-import { headingIdGenerator, headingSchema } from '../node/heading'
+
 import { withMeta } from '../__internal__'
+import { headingIdGenerator, headingSchema } from '../node/heading'
 
 /// This plugin is used to sync the heading id when the heading content changes.
 /// It will use the `headingIdGenerator` to generate the id.

package/src/plugin/sync-list-order-plugin.ts

@@ -1,11 +1,12 @@
+import type { EditorView } from '@milkdown/prose/view'
+
 import { Plugin, PluginKey } from '@milkdown/prose/state'
 import { $prose } from '@milkdown/utils'
-import type { EditorView } from '@milkdown/prose/view'
-import { listItemSchema } from '../node/list-item'
 
-import { orderedListSchema } from '../node/ordered-list'
-import { bulletListSchema } from '../node'
 import { withMeta } from '../__internal__'
+import { bulletListSchema } from '../node'
+import { listItemSchema } from '../node/list-item'
+import { orderedListSchema } from '../node/ordered-list'
 
 /// This plugin is used to keep the label of list item up to date in ordered list.
 export const syncListOrderPlugin = $prose((ctx) => {