@milkdown/preset-commonmark 7.2.2 → 7.2.3

package/lib/mark/emphasis.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"emphasis.d.ts","sourceRoot":"","sources":["../../src/mark/emphasis.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,YAAY,qCAAwB,CAAA;AAQjD,eAAO,MAAM,cAAc,mDAsBxB,CAAA;AAaH,eAAO,MAAM,qBAAqB,6CAA4E,CAAA;AAS9G,eAAO,MAAM,cAAc,2EAQzB,CAAA"}
+{"version":3,"file":"emphasis.d.ts","sourceRoot":"","sources":["../../src/mark/emphasis.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,YAAY,qCAAwB,CAAA;AAQjD,eAAO,MAAM,cAAc,mDA4BxB,CAAA;AAaH,eAAO,MAAM,qBAAqB,6CAIhC,CAAA;AASF,eAAO,MAAM,cAAc,2EAQzB,CAAA"}

package/lib/mark/strong.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"strong.d.ts","sourceRoot":"","sources":["../../src/mark/strong.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,UAAU,qCAAsB,CAAA;AAQ7C,eAAO,MAAM,YAAY,iDAsBtB,CAAA;AAaH,eAAO,MAAM,mBAAmB,6CAAwE,CAAA;AASxG,eAAO,MAAM,YAAY,qEAQvB,CAAA"}
+{"version":3,"file":"strong.d.ts","sourceRoot":"","sources":["../../src/mark/strong.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,UAAU,qCAAsB,CAAA;AAQ7C,eAAO,MAAM,YAAY,iDA4BtB,CAAA;AAaH,eAAO,MAAM,mBAAmB,6CAK9B,CAAA;AASF,eAAO,MAAM,YAAY,qEAQvB,CAAA"}

package/lib/plugin/index.d.ts

@@ -3,6 +3,7 @@ export * from './remark-add-order-in-list-plugin';
 export * from './remark-line-break';
 export * from './remark-inline-link-plugin';
 export * from './remark-html-transformer';
+export * from './remark-marker-plugin';
 export * from './inline-nodes-cursor-plugin';
 export * from './hardbreak-clear-mark-plugin';
 export * from './hardbreak-filter-plugin';

package/lib/plugin/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/plugin/index.ts"],"names":[],"mappings":"AAEA,cAAc,sBAAsB,CAAA;AAEpC,cAAc,mCAAmC,CAAA;AACjD,cAAc,qBAAqB,CAAA;AACnC,cAAc,6BAA6B,CAAA;AAC3C,cAAc,2BAA2B,CAAA;AAEzC,cAAc,8BAA8B,CAAA;AAE5C,cAAc,+BAA+B,CAAA;AAC7C,cAAc,2BAA2B,CAAA;AAEzC,cAAc,0BAA0B,CAAA;AACxC,cAAc,0BAA0B,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/plugin/index.ts"],"names":[],"mappings":"AAEA,cAAc,sBAAsB,CAAA;AAEpC,cAAc,mCAAmC,CAAA;AACjD,cAAc,qBAAqB,CAAA;AACnC,cAAc,6BAA6B,CAAA;AAC3C,cAAc,2BAA2B,CAAA;AACzC,cAAc,wBAAwB,CAAA;AAEtC,cAAc,8BAA8B,CAAA;AAE5C,cAAc,+BAA+B,CAAA;AAC7C,cAAc,2BAA2B,CAAA;AAEzC,cAAc,0BAA0B,CAAA;AACxC,cAAc,0BAA0B,CAAA"}

package/lib/plugin/inline-sync-plugin/inline-sync-plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"inline-sync-plugin.d.ts","sourceRoot":"","sources":["../../../src/plugin/inline-sync-plugin/inline-sync-plugin.ts"],"names":[],"mappings":"AAgBA,eAAO,MAAM,gBAAgB,kCAoD3B,CAAA"}
+{"version":3,"file":"inline-sync-plugin.d.ts","sourceRoot":"","sources":["../../../src/plugin/inline-sync-plugin/inline-sync-plugin.ts"],"names":[],"mappings":"AAgBA,eAAO,MAAM,gBAAgB,kCAkD3B,CAAA"}

package/lib/plugin/inline-sync-plugin/regexp.d.ts

@@ -1,3 +1,4 @@
 export declare const linkRegexp: RegExp;
+export declare const keepLinkRegexp: RegExp;
 export declare const punctuationRegexp: (holePlaceholder: string) => RegExp;
 //# sourceMappingURL=regexp.d.ts.map

package/lib/plugin/inline-sync-plugin/regexp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"regexp.d.ts","sourceRoot":"","sources":["../../../src/plugin/inline-sync-plugin/regexp.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,UAAU,QAAyE,CAAA;AAEhG,eAAO,MAAM,iBAAiB,oBAAqB,MAAM,WACK,CAAA"}
+{"version":3,"file":"regexp.d.ts","sourceRoot":"","sources":["../../../src/plugin/inline-sync-plugin/regexp.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,UAAU,QAA4B,CAAA;AAEnD,eAAO,MAAM,cAAc,QAAyE,CAAA;AAEpG,eAAO,MAAM,iBAAiB,oBAAqB,MAAM,WACK,CAAA"}

package/lib/plugin/inline-sync-plugin/replacer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"replacer.d.ts","sourceRoot":"","sources":["../../../src/plugin/inline-sync-plugin/replacer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,eAAe,CAAA;AACxC,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAA;AAClD,OAAO,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AAOhF,eAAO,MAAM,WAAW,QACjB,GAAG,OACH,SAAS,SACP,WAAW,iBACH,WAAW,KAAK,IAAI,SAC5B,KAAK,SA6Bb,CAAA"}
+{"version":3,"file":"replacer.d.ts","sourceRoot":"","sources":["../../../src/plugin/inline-sync-plugin/replacer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,eAAe,CAAA;AACxC,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAA;AAClD,OAAO,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AAQhF,eAAO,MAAM,WAAW,QACjB,GAAG,OACH,SAAS,SACP,WAAW,iBACH,WAAW,KAAK,IAAI,SAC5B,KAAK,SAuCb,CAAA"}

package/lib/plugin/remark-marker-plugin.d.ts

@@ -0,0 +1,2 @@
+export declare const remarkMarker: import("@milkdown/utils").$Remark;
+//# sourceMappingURL=remark-marker-plugin.d.ts.map

package/lib/plugin/remark-marker-plugin.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"remark-marker-plugin.d.ts","sourceRoot":"","sources":["../../src/plugin/remark-marker-plugin.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,YAAY,mCAOvB,CAAA"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@milkdown/preset-commonmark",
   "type": "module",
-  "version": "7.2.2",
+  "version": "7.2.3",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -32,15 +32,16 @@
     "remark-inline-links": "^6.0.0",
     "tslib": "^2.5.0",
     "unist-util-visit": "^4.0.0",
-    "@milkdown/exception": "7.2.2",
-    "@milkdown/utils": "7.2.2"
+    "vfile": "^5.3.7",
+    "@milkdown/exception": "7.2.3",
+    "@milkdown/utils": "7.2.3"
   },
   "devDependencies": {
     "@types/unist": "^2.0.6",
-    "@milkdown/core": "7.2.2",
-    "@milkdown/ctx": "7.2.2",
-    "@milkdown/prose": "7.2.2",
-    "@milkdown/transformer": "7.2.2"
+    "@milkdown/core": "7.2.3",
+    "@milkdown/ctx": "7.2.3",
+    "@milkdown/prose": "7.2.3",
+    "@milkdown/transformer": "7.2.3"
   },
   "nx": {
     "targets": {

package/src/composed/plugins.ts

@@ -11,7 +11,7 @@ import {
   remarkAddOrderInListPlugin,
   remarkHtmlTransformer,
   remarkInlineLinkPlugin,
-  remarkLineBreak,
+  remarkLineBreak, remarkMarker,
   syncHeadingIdPlugin,
   syncListOrderPlugin,
 } from '../plugin'
@@ -31,6 +31,7 @@ export const plugins: MilkdownPlugin[] = [
   remarkInlineLinkPlugin,
   remarkLineBreak,
   remarkHtmlTransformer,
+  remarkMarker,
 
   syncHeadingIdPlugin,
   syncListOrderPlugin,

package/src/mark/emphasis.ts

@@ -1,7 +1,7 @@
 /* Copyright 2021, Milkdown by Mirone. */
-import { commandsCtx } from '@milkdown/core'
-import { toggleMark } from '@milkdown/prose/commands'
+import { commandsCtx, remarkStringifyOptionsCtx } from '@milkdown/core'
 import { $command, $markAttr, $markSchema, $useKeymap } from '@milkdown/utils'
+import { toggleMarkdownMark } from '@milkdown/prose'
 import { withMeta } from '../__internal__'
 
 /// HTML attributes for the emphasis mark.
@@ -14,7 +14,11 @@ withMeta(emphasisAttr, {
 
 /// Emphasis mark schema.
 export const emphasisSchema = $markSchema('emphasis', ctx => ({
-  inclusive: false,
+  attrs: {
+    marker: {
+      default: ctx.get(remarkStringifyOptionsCtx).emphasis || '*',
+    },
+  },
   parseDOM: [
     { tag: 'i' },
     { tag: 'em' },
@@ -24,7 +28,7 @@ export const emphasisSchema = $markSchema('emphasis', ctx => ({
   parseMarkdown: {
     match: node => node.type === 'emphasis',
     runner: (state, node, markType) => {
-      state.openMark(markType)
+      state.openMark(markType, { marker: node.marker })
       state.next(node.children)
       state.closeMark(markType)
     },
@@ -32,7 +36,9 @@ export const emphasisSchema = $markSchema('emphasis', ctx => ({
   toMarkdown: {
     match: mark => mark.type.name === 'emphasis',
     runner: (state, mark) => {
-      state.withMark(mark, 'emphasis')
+      state.withMark(mark, 'emphasis', undefined, {
+        marker: mark.attrs.marker,
+      })
     },
   },
 }))
@@ -48,7 +54,11 @@ withMeta(emphasisSchema.ctx, {
 })
 
 /// A command to toggle the emphasis mark.
-export const toggleEmphasisCommand = $command('ToggleEmphasis', () => () => toggleMark(emphasisSchema.type()))
+export const toggleEmphasisCommand = $command('ToggleEmphasis', ctx => () => {
+  const markType = emphasisSchema.type()
+  const mark = ctx.get(remarkStringifyOptionsCtx).emphasis || '*'
+  return toggleMarkdownMark(markType, mark)
+})
 
 withMeta(toggleEmphasisCommand, {
   displayName: 'Command<toggleEmphasisCommand>',

package/src/mark/strong.ts

@@ -1,7 +1,7 @@
 /* Copyright 2021, Milkdown by Mirone. */
-import { commandsCtx } from '@milkdown/core'
-import { toggleMark } from '@milkdown/prose/commands'
+import { commandsCtx, remarkStringifyOptionsCtx } from '@milkdown/core'
 import { $command, $markAttr, $markSchema, $useKeymap } from '@milkdown/utils'
+import { toggleMarkdownMark } from '@milkdown/prose'
 import { withMeta } from '../__internal__'
 
 /// HTML attributes for the strong mark.
@@ -14,7 +14,11 @@ withMeta(strongAttr, {
 
 /// Strong mark schema.
 export const strongSchema = $markSchema('strong', ctx => ({
-  inclusive: false,
+  attrs: {
+    marker: {
+      default: ctx.get(remarkStringifyOptionsCtx).strong || '*',
+    },
+  },
   parseDOM: [
     { tag: 'b' },
     { tag: 'strong' },
@@ -24,7 +28,7 @@ export const strongSchema = $markSchema('strong', ctx => ({
   parseMarkdown: {
     match: node => node.type === 'strong',
     runner: (state, node, markType) => {
-      state.openMark(markType)
+      state.openMark(markType, { marker: node.marker })
       state.next(node.children)
       state.closeMark(markType)
     },
@@ -32,7 +36,9 @@ export const strongSchema = $markSchema('strong', ctx => ({
   toMarkdown: {
     match: mark => mark.type.name === 'strong',
     runner: (state, mark) => {
-      state.withMark(mark, 'strong')
+      state.withMark(mark, 'strong', undefined, {
+        marker: mark.attrs.marker,
+      })
     },
   },
 }))
@@ -48,7 +54,12 @@ withMeta(strongSchema.ctx, {
 })
 
 /// A command to toggle the strong mark.
-export const toggleStrongCommand = $command('ToggleStrong', () => () => toggleMark(strongSchema.type()))
+export const toggleStrongCommand = $command('ToggleStrong', ctx => () => {
+  const markType = strongSchema.type()
+  const markSymbol = ctx.get(remarkStringifyOptionsCtx).strong || '*'
+  const mark = markSymbol + markSymbol
+  return toggleMarkdownMark(markType, mark)
+})
 
 withMeta(toggleStrongCommand, {
   displayName: 'Command<toggleStrongCommand>',

package/src/plugin/index.ts

@@ -6,6 +6,7 @@ export * from './remark-add-order-in-list-plugin'
 export * from './remark-line-break'
 export * from './remark-inline-link-plugin'
 export * from './remark-html-transformer'
+export * from './remark-marker-plugin'
 
 export * from './inline-nodes-cursor-plugin'
 

package/src/plugin/inline-sync-plugin/inline-sync-plugin.ts

@@ -60,8 +60,6 @@ export const inlineSyncPlugin = $prose((ctx: Ctx) => {
           runReplacer(ctx, inlineSyncPluginKey, state, dispatch, prevNode.attrs)
         })
 
-        tr.setMeta('addToHistory', false)
-
         return null
       },
     },

package/src/plugin/inline-sync-plugin/regexp.ts

@@ -1,6 +1,8 @@
 /* Copyright 2021, Milkdown by Mirone. */
 
-export const linkRegexp = /\[(?<span>((www|https:\/\/|http:\/\/)[^\s\]]+))]\((?<url>[^\s\]]+)\)/
+export const linkRegexp = /\[([^\]]+)]\([^\s\]]+\)/
+
+export const keepLinkRegexp = /\[(?<span>((www|https:\/\/|http:\/\/)[^\s\]]+))]\((?<url>[^\s\]]+)\)/
 
 export const punctuationRegexp = (holePlaceholder: string) =>
   new RegExp(`\\\\(?=[^\\w\\s${holePlaceholder}\\\\]|_)`, 'g')

package/src/plugin/inline-sync-plugin/replacer.ts

@@ -7,6 +7,7 @@ import { TextSelection } from '@milkdown/prose/state'
 import { inlineSyncConfig } from './config'
 import { getContextByState } from './context'
 import { calcOffset } from './utils'
+import { linkRegexp } from './regexp'
 
 export const runReplacer = (
   ctx: Ctx,
@@ -26,6 +27,8 @@ export const runReplacer = (
   if (!context)
     return
 
+  const lastUserInput = context.text.slice(0, context.text.indexOf(context.placeholder))
+
   const { $from } = nextState.selection
   const from = $from.before()
   const to = $from.after()
@@ -41,5 +44,13 @@ export const runReplacer = (
   // restore the selection
   tr = tr.setSelection(TextSelection.near(tr.doc.resolve(offset + 1)))
 
+  const needsRestoreMark = linkRegexp.test(lastUserInput) || ['*', '_', '~'].includes(lastUserInput.at(-1) || '')
+  if (needsRestoreMark && tr.selection instanceof TextSelection) {
+    const marks = tr.selection.$cursor?.marks() ?? []
+    marks.forEach((mark) => {
+      tr = tr.removeStoredMark(mark.type)
+    })
+  }
+
   dispatch(tr)
 }

package/src/plugin/inline-sync-plugin/utils.ts

@@ -3,16 +3,16 @@
 import type { Node } from '@milkdown/prose/model'
 
 import type { SyncNodePlaceholder } from './config'
-import { linkRegexp, punctuationRegexp } from './regexp'
+import { keepLinkRegexp, punctuationRegexp } from './regexp'
 
 export const keepLink = (str: string) => {
   let text = str
-  let match = text.match(linkRegexp)
+  let match = text.match(keepLinkRegexp)
   while (match && match.groups) {
     const { span } = match.groups
-    text = text.replace(linkRegexp, span as string)
+    text = text.replace(keepLinkRegexp, span as string)
 
-    match = text.match(linkRegexp)
+    match = text.match(keepLinkRegexp)
   }
   return text
 }

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

@@ -0,0 +1,20 @@
+/* Copyright 2021, Milkdown by Mirone. */
+import { $remark } from '@milkdown/utils'
+import type { Node } from 'unist'
+import type { VFile } from 'vfile'
+import { visit } from 'unist-util-visit'
+import { withMeta } from '../__internal__'
+
+export const remarkMarker = $remark(() => () => (tree: Node, file: VFile) => {
+  const getMarker = (node: Node) => {
+    return (file.value as string).charAt(node.position!.start.offset!)
+  }
+  visit(tree, node => ['strong', 'emphasis'].includes(node.type), (node: Node) => {
+    (node as Node & { marker: string }).marker = getMarker(node)
+  })
+})
+
+withMeta(remarkMarker, {
+  displayName: 'Remark<remarkMarker>',
+  group: 'Remark',
+})