@llui/markdown-editor 0.3.0 → 0.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@llui/markdown-editor",
-  "version": "0.3.0",
+  "version": "0.5.0",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -21,43 +21,57 @@
       "types": "./dist/surfaces/toolbar.d.ts",
       "import": "./dist/surfaces/toolbar.js"
     },
-    "./styles/editor.css": "./dist/styles/editor.css"
+    "./plugins/block-drag": {
+      "types": "./dist/plugins/block-drag.d.ts",
+      "import": "./dist/plugins/block-drag.js"
+    },
+    "./plugins/code-language": {
+      "types": "./dist/plugins/code-language.d.ts",
+      "import": "./dist/plugins/code-language.js"
+    },
+    "./plugins/wikilink": {
+      "types": "./dist/plugins/wikilink.d.ts",
+      "import": "./dist/plugins/wikilink.js"
+    },
+    "./styles/editor.css": "./dist/styles/editor.css",
+    "./styles/block-drag.css": "./dist/styles/block-drag.css"
   },
   "peerDependencies": {
-    "lexical": "^0.46.0",
-    "@lexical/markdown": "^0.46.0",
-    "@lexical/rich-text": "^0.46.0",
-    "@lexical/list": "^0.46.0",
-    "@lexical/link": "^0.46.0",
-    "@lexical/table": "^0.46.0",
-    "@lexical/selection": "^0.46.0",
-    "@lexical/utils": "^0.46.0",
-    "@lexical/code-core": "^0.46.0",
+    "lexical": "^0.48.0",
+    "@lexical/markdown": "^0.48.0",
+    "@lexical/rich-text": "^0.48.0",
+    "@lexical/list": "^0.48.0",
+    "@lexical/link": "^0.48.0",
+    "@lexical/table": "^0.48.0",
+    "@lexical/selection": "^0.48.0",
+    "@lexical/utils": "^0.48.0",
+    "@lexical/code-core": "^0.48.0",
+    "@llui/lexical": "^0.4.0",
+    "@llui/components": "^0.13.0",
     "@llui/dom": "^0.12.0",
-    "@llui/markdown": "^0.12.0",
-    "@llui/lexical": "^0.3.0",
-    "@llui/components": "^0.13.0"
+    "@llui/markdown": "^0.12.0"
   },
   "devDependencies": {
-    "lexical": "^0.46.0",
-    "@lexical/headless": "^0.46.0",
-    "@lexical/markdown": "^0.46.0",
-    "@lexical/rich-text": "^0.46.0",
-    "@lexical/list": "^0.46.0",
-    "@lexical/link": "^0.46.0",
-    "@lexical/table": "^0.46.0",
-    "@lexical/selection": "^0.46.0",
-    "@lexical/utils": "^0.46.0",
+    "lexical": "^0.48.0",
+    "@lexical/headless": "^0.48.0",
+    "@lexical/markdown": "^0.48.0",
+    "@lexical/rich-text": "^0.48.0",
+    "@lexical/list": "^0.48.0",
+    "@lexical/link": "^0.48.0",
+    "@lexical/table": "^0.48.0",
+    "@lexical/selection": "^0.48.0",
+    "@lexical/utils": "^0.48.0",
     "typescript": "^6.0.0",
     "vitest": "^4.1.2",
-    "@lexical/code-core": "^0.46.0",
+    "@lexical/code-core": "^0.48.0",
     "@llui/dom": "0.12.0",
+    "@llui/lexical": "0.4.0",
     "@llui/markdown": "0.12.0",
-    "@llui/components": "0.13.0",
-    "@llui/lexical": "0.3.0"
+    "@llui/components": "0.13.0"
   },
   "sideEffects": [
-    "./dist/styles/editor.css"
+    "./dist/styles/editor.css",
+    "./dist/styles/block-drag.css"
   ],
   "description": "WYSIWYG Markdown editor for LLui — hides Markdown behind a rich, pluggable editing widget built on Lexical",
   "keywords": [
@@ -87,7 +101,7 @@
     "access": "public"
   },
   "scripts": {
-    "build": "tsc -p tsconfig.build.json && mkdir -p dist/styles && cp src/styles/editor.css dist/styles/",
+    "build": "tsc -p tsconfig.build.json && mkdir -p dist/styles && cp src/styles/*.css dist/styles/",
     "check": "tsc --noEmit -p tsconfig.check.json",
     "lint": "eslint src",
     "test": "vitest run"

package/src/editor.ts

@@ -83,10 +83,23 @@ export interface EditorConfig {
 }
 
 /** Disposer-returning binding the collab layer installs on the live editor.
- * `@llui/lexical-collab`'s `YjsCollab` satisfies this structurally, so
- * `@llui/markdown-editor` needs no Yjs dependency of its own. */
+ * `@llui/lexical-collab`'s `YjsCollab` and `@llui/lexical-loro`'s `LoroCollab`
+ * both satisfy this structurally, so `@llui/markdown-editor` needs neither a Yjs
+ * nor a Loro dependency of its own. */
 export interface CollabBinding {
   register: (editor: LexicalEditor) => () => void
+  /**
+   * A CRDT-aware undo owner, if the binding provides one SEPARATELY from
+   * `register`. When present it is handed to `lexicalForeign({ externalUndo })`,
+   * which forces the built-in `@lexical/history` stack off so the two can never
+   * both be live — this is what gives collab mode real, peer-scoped undo.
+   *
+   * Optional because not every binding splits undo out this way: `yjsCollab`
+   * installs its own undo commands INSIDE `register`, so it leaves this unset and
+   * still owns undo. A binding that sets neither would leave the editor with no
+   * undo at all — see `@llui/lexical-loro`, which sets this.
+   */
+  externalUndo?: (editor: LexicalEditor) => () => void
 }
 
 /** Hooks the editor injects into the {@link CollabFactory}: a markdown `seed`
@@ -291,8 +304,18 @@ export function markdownEditor(
       },
       // In collab mode the shared CRDT owns the document: the local undo stack
       // and the boot-time seed are disabled — the binding supplies a scoped undo
-      // manager and a sync-gated bootstrap instead.
-      ...(collabBinding ? { history: false, seedMode: 'deferred' as const } : {}),
+      // manager and a sync-gated bootstrap instead. A binding that owns undo via
+      // a SEPARATE `externalUndo` (Loro) has it wired here; one that owns undo
+      // inside its own `register` (Yjs) leaves the field unset. Either way the
+      // built-in history is off, so a binding that forgot both would show as "no
+      // undo" rather than fighting a local stack.
+      ...(collabBinding
+        ? {
+            history: false as const,
+            seedMode: 'deferred' as const,
+            ...(collabBinding.externalUndo ? { externalUndo: collabBinding.externalUndo } : {}),
+          }
+        : {}),
       defaultValue: collabBinding || config.value ? undefined : (config.defaultValue ?? ''),
       ...(config.value && !collabBinding ? { value: config.value } : {}),
       readonly: state.at('readonly'),

package/src/index.ts

@@ -57,6 +57,17 @@ export {
   $insertCallout,
 } from './plugins/callout.js'
 export { hrPlugin, $insertHorizontalRule } from './plugins/hr.js'
+export {
+  type FrontmatterData,
+  type FrontmatterPluginOptions,
+  FRONTMATTER_BRIDGE_TYPE,
+  FRONTMATTER_TRANSFORMER,
+  frontmatterPlugin,
+  serializeFrontmatter,
+  splitFrontmatter,
+  $getFrontmatter,
+  $setFrontmatter,
+} from './plugins/frontmatter.js'
 export { slashPlugin } from './plugins/slash.js'
 export { contextMenuPlugin } from './plugins/context-menu.js'
 export { floatingToolbarPlugin } from './plugins/floating-toolbar.js'
@@ -66,11 +77,57 @@ export { type Mention, type MentionPluginOptions, mentionPlugin } from './plugin
 export { type EmojiPluginOptions, DEFAULT_EMOJI, emojiPlugin } from './plugins/emoji.js'
 export { type ImagePluginOptions, imagePlugin } from './plugins/image.js'
 export { tablePlugin } from './plugins/table.js'
+export {
+  type CodeLanguagePluginOptions,
+  type CodeLanguageState,
+  type CodeLanguageMsg,
+  type CodeLanguageEffect,
+  CODE_LANGUAGE_PLUGIN,
+  codeLanguagePlugin,
+} from './plugins/code-language.js'
+export {
+  type WikiLink,
+  type WikiLinkPluginOptions,
+  type SerializedWikiLinkNode,
+  WikiLinkNode,
+  $createWikiLinkNode,
+  $isWikiLinkNode,
+  parseWikiLinkInner,
+  formatWikiLink,
+  // The representability guards that make `formatWikiLink` the true inverse of
+  // `parseWikiLinkInner`; exported so a host resolving/creating targets can
+  // apply the same normalization before it hands one to `$createWikiLinkNode`.
+  sanitizeWikiLinkTarget,
+  sanitizeWikiLinkAlias,
+  wikilinkPlugin,
+} from './plugins/wikilink.js'
+export {
+  type BlockDragOptions,
+  type BlockRect,
+  type DropTarget,
+  type IndicatorRect,
+  type Place,
+  BLOCK_DRAG_Z,
+  blockAtPoint,
+  findDropTarget,
+  indicatorRect,
+  blockDragPlugin,
+} from './plugins/block-drag.js'
 
 export { $insertMarkdownAtSelection, registerMarkdownPaste } from './paste.js'
 
 export { GFM_NODES, GFM_TRANSFORMERS, HIGHLIGHT_TRANSFORMER } from './transformers/gfm.js'
-export { buildTransformers, orderTransformers } from './transformers/registry.js'
+// The CommonMark-correct fenced-code transformer. Already part of
+// `GFM_TRANSFORMERS`; exported for consumers assembling a transformer set by hand.
+export { CODE_INFO_TRANSFORMER, normalizeCodeInfo } from './transformers/code.js'
+// `setTransformerPrecedence` breaks ties between SAME-rank transformers, so a
+// collision (e.g. wikilink vs upstream LINK, which both match at the same index)
+// is resolved structurally instead of by the order a consumer lists plugins in.
+export {
+  buildTransformers,
+  orderTransformers,
+  setTransformerPrecedence,
+} from './transformers/registry.js'
 
 export { computeFormatState } from './format.js'