@prosekit/extensions 0.12.2 → 0.14.0

package/src/code-block/code-block-commands.ts

@@ -1,11 +1,4 @@
-import {
-  defineCommands,
-  insertNode,
-  setBlockType,
-  setNodeAttrs,
-  toggleNode,
-  type Extension,
-} from '@prosekit/core'
+import { defineCommands, insertNode, setBlockType, setNodeAttrs, toggleNode, type Extension } from '@prosekit/core'
 
 import type { CodeBlockAttrs } from './code-block-types'
 

package/src/code-block/code-block-highlight.ts

@@ -1,11 +1,5 @@
-import {
-  definePlugin,
-  type Extension,
-} from '@prosekit/core'
-import {
-  createHighlightPlugin,
-  type Parser,
-} from 'prosemirror-highlight'
+import { definePlugin, type Extension } from '@prosekit/core'
+import { createHighlightPlugin, type Parser } from 'prosemirror-highlight'
 
 /**
  * @public

package/src/code-block/code-block-keymap.ts

@@ -1,12 +1,5 @@
-import {
-  defaultBlockAt,
-  defineKeymap,
-  type PlainExtension,
-} from '@prosekit/core'
-import {
-  TextSelection,
-  type Command,
-} from '@prosekit/pm/state'
+import { defaultBlockAt, defineKeymap, type PlainExtension } from '@prosekit/core'
+import { TextSelection, type Command } from '@prosekit/pm/state'
 
 /**
  * Defines the keymap for code blocks.

package/src/code-block/code-block-shiki.ts

@@ -2,10 +2,7 @@ import type { Extension } from '@prosekit/core'
 import type { SpecialLanguage } from 'shiki'
 
 import { defineCodeBlockHighlight } from './code-block-highlight'
-import type {
-  ShikiBundledLanguage,
-  ShikiBundledTheme,
-} from './shiki-bundle'
+import type { ShikiBundledLanguage, ShikiBundledTheme } from './shiki-bundle'
 import type { ShikiHighlighterOptions } from './shiki-highlighter-chunk'
 import { createLazyParser } from './shiki-parser'
 

package/src/code-block/code-block-spec.spec.ts

@@ -1,16 +1,9 @@
 import { jsonFromHTML } from '@prosekit/core'
-import {
-  describe,
-  expect,
-  it,
-} from 'vitest'
+import { formatHTML } from 'diffable-html-snapshot'
+import { describe, expect, it } from 'vitest'
 
 import { setupTest } from '../testing'
-import { formatHTML } from '../testing/format-html'
-import {
-  htmlFromMarkdown,
-  markdownFromHTML,
-} from '../testing/markdown'
+import { htmlFromMarkdown, markdownFromHTML } from '../testing/markdown'
 
 describe('defineCodeBlockSpec', () => {
   it('can parse and serialize code blocks', () => {
@@ -152,7 +145,7 @@ describe('defineCodeBlockSpec', () => {
     editor.set(n.doc(n.codeBlock({ language: 'javascript' }, '123')))
     const html = editor.getDocHTML()
     expect(html).toMatchInlineSnapshot(`"<div><pre data-language="javascript"><code class="language-javascript">123</code></pre></div>"`)
-    let markdown = markdownFromHTML(html)
+    const markdown = markdownFromHTML(html)
     expect(markdown).toMatchInlineSnapshot(`
       "\`\`\`javascript
       123

package/src/code-block/code-block-spec.ts

@@ -1,7 +1,4 @@
-import {
-  defineNodeSpec,
-  type Extension,
-} from '@prosekit/core'
+import { defineNodeSpec, type Extension } from '@prosekit/core'
 
 import type { CodeBlockAttrs } from './code-block-types'
 

package/src/code-block/code-block.ts

@@ -1,21 +1,9 @@
-import {
-  union,
-  type Union,
-} from '@prosekit/core'
+import { union, type Union } from '@prosekit/core'
 
-import {
-  defineCodeBlockCommands,
-  type CodeBlockCommandsExtension,
-} from './code-block-commands'
-import {
-  defineCodeBlockEnterRule,
-  defineCodeBlockInputRule,
-} from './code-block-input-rule'
+import { defineCodeBlockCommands, type CodeBlockCommandsExtension } from './code-block-commands'
+import { defineCodeBlockEnterRule, defineCodeBlockInputRule } from './code-block-input-rule'
 import { defineCodeBlockKeymap } from './code-block-keymap'
-import {
-  defineCodeBlockSpec,
-  type CodeBlockSpecExtension,
-} from './code-block-spec'
+import { defineCodeBlockSpec, type CodeBlockSpecExtension } from './code-block-spec'
 
 /**
  * @internal

package/src/code-block/index.ts

@@ -1,26 +1,10 @@
-export {
-  defineCodeBlock,
-  type CodeBlockExtension,
-} from './code-block'
-export {
-  defineCodeBlockCommands,
-  type CodeBlockCommandsExtension,
-} from './code-block-commands'
-export {
-  defineCodeBlockHighlight,
-  type CodeBlockHighlightOptions,
-  type HighlightParser,
-} from './code-block-highlight'
-export {
-  defineCodeBlockEnterRule,
-  defineCodeBlockInputRule,
-} from './code-block-input-rule'
+export { defineCodeBlock, type CodeBlockExtension } from './code-block'
+export { defineCodeBlockCommands, type CodeBlockCommandsExtension } from './code-block-commands'
+export { defineCodeBlockHighlight, type CodeBlockHighlightOptions, type HighlightParser } from './code-block-highlight'
+export { defineCodeBlockEnterRule, defineCodeBlockInputRule } from './code-block-input-rule'
 export { defineCodeBlockKeymap } from './code-block-keymap'
 export { defineCodeBlockShiki } from './code-block-shiki'
-export {
-  defineCodeBlockSpec,
-  type CodeBlockSpecExtension,
-} from './code-block-spec'
+export { defineCodeBlockSpec, type CodeBlockSpecExtension } from './code-block-spec'
 export type { CodeBlockAttrs } from './code-block-types'
 export {
   shikiBundledLanguagesInfo,

package/src/code-block/shiki-highlighter-chunk.ts

@@ -1,10 +1,4 @@
-import type {
-  BundledHighlighterOptions,
-  BundledLanguage,
-  BundledTheme,
-  Highlighter,
-  SpecialLanguage,
-} from 'shiki'
+import type { BundledHighlighterOptions, BundledLanguage, BundledTheme, Highlighter, SpecialLanguage } from 'shiki'
 import { createHighlighter } from 'shiki/bundle/full'
 import { createJavaScriptRegexEngine } from 'shiki/engine/javascript'
 

package/src/code-block/shiki-highlighter.ts

@@ -1,7 +1,4 @@
-import type {
-  HighlighterOptions,
-  HighlighterResult,
-} from './shiki-highlighter-chunk'
+import type { HighlighterOptions, HighlighterResult } from './shiki-highlighter-chunk'
 
 let loaded: ((options: HighlighterOptions) => HighlighterResult) | undefined
 

package/src/code-block/shiki-parser.ts

@@ -2,10 +2,7 @@ import type { Parser } from 'prosemirror-highlight'
 import { createParser } from 'prosemirror-highlight/shiki'
 
 import type { ShikiBundledLanguage } from './shiki-bundle'
-import {
-  createOrGetHighlighter,
-  type HighlighterOptions,
-} from './shiki-highlighter'
+import { createOrGetHighlighter, type HighlighterOptions } from './shiki-highlighter'
 
 /**
  * @internal

package/src/commit/index.ts

@@ -1,33 +1,9 @@
-import {
-  defineDefaultState,
-  definePlugin,
-  jsonFromNode,
-  union,
-  type NodeJSON,
-  type PlainExtension,
-  type StepJSON,
-} from '@prosekit/core'
-import {
-  DOMSerializer,
-  Fragment,
-  Slice,
-  type ProseMirrorNode,
-} from '@prosekit/pm/model'
-import {
-  PluginKey,
-  ProseMirrorPlugin,
-  type Transaction,
-} from '@prosekit/pm/state'
+import { defineDefaultState, definePlugin, jsonFromNode, union, type NodeJSON, type PlainExtension, type StepJSON } from '@prosekit/core'
+import { DOMSerializer, Fragment, Slice, type ProseMirrorNode } from '@prosekit/pm/model'
+import { PluginKey, ProseMirrorPlugin, type Transaction } from '@prosekit/pm/state'
 import { Step } from '@prosekit/pm/transform'
-import {
-  Decoration,
-  DecorationSet,
-  type EditorView,
-} from '@prosekit/pm/view'
-import {
-  ChangeSet,
-  type Change,
-} from 'prosemirror-changeset'
+import { Decoration, DecorationSet, type EditorView } from '@prosekit/pm/view'
+import { ChangeSet, type Change } from 'prosemirror-changeset'
 
 /**
  * A JSON representation of a commit.
@@ -250,7 +226,7 @@ function defineCommitDecoration(commit: Commit): PlainExtension {
  */
 function defineCommitViewer(commit: Commit): PlainExtension {
   return union(
-    defineDefaultState({ defaultDoc: commit.doc }),
+    defineDefaultState({ defaultContent: commit.doc }),
     defineCommitDecoration(commit),
   )
 }
@@ -322,9 +298,4 @@ function defineCommitRecorder(commitRecorder: CommitRecorder): PlainExtension {
   )
 }
 
-export {
-  CommitRecorder,
-  defineCommitRecorder,
-  defineCommitViewer,
-  type Commit,
-}
+export { CommitRecorder, defineCommitRecorder, defineCommitViewer, type Commit }

package/src/doc/index.ts

@@ -1,7 +1,4 @@
-import {
-  defineNodeSpec,
-  type Extension,
-} from '@prosekit/core'
+import { defineNodeSpec, type Extension } from '@prosekit/core'
 import type { Attrs } from '@prosekit/pm/model'
 
 /**

package/src/drop-cursor/drop-cursor.ts

@@ -1,7 +1,4 @@
-import {
-  definePlugin,
-  type PlainExtension,
-} from '@prosekit/core'
+import { definePlugin, type PlainExtension } from '@prosekit/core'
 import { dropCursor } from 'prosemirror-dropcursor'
 
 export interface DropCursorOptions {

package/src/drop-cursor/index.ts

@@ -1,5 +1 @@
-export {
-  defineDropCursor,
-  type DropCursorExtension,
-  type DropCursorOptions,
-} from './drop-cursor'
+export { defineDropCursor, type DropCursorExtension, type DropCursorOptions } from './drop-cursor'

package/src/drop-indicator/drop-indicator-facet.ts

@@ -1,15 +1,6 @@
-import {
-  defineFacet,
-  defineFacetPayload,
-  pluginFacet,
-  type PlainExtension,
-  type PluginPayload,
-} from '@prosekit/core'
-import type {
-  DragEventHandler,
-  DropIndicatorPluginOptions,
-  ShowHandler,
-} from 'prosemirror-drop-indicator'
+import { isNotNullish } from '@ocavue/utils'
+import { defineFacet, defineFacetPayload, pluginFacet, type PlainExtension, type PluginPayload } from '@prosekit/core'
+import type { DragEventHandler, DropIndicatorPluginOptions, ShowHandler } from 'prosemirror-drop-indicator'
 import { createDropIndicatorPlugin } from 'prosemirror-drop-indicator'
 
 /**
@@ -25,24 +16,24 @@ const dropIndicatorFacet = defineFacet<DropIndicatorPluginOptions, PluginPayload
   parent: pluginFacet,
   singleton: true,
   reducer: (payloads: DropIndicatorPluginOptions[]): PluginPayload => {
-    let showHandlers = payloads.map(p => p.onShow).filter(x => !!x)
-    let hideHandlers = payloads.map(p => p.onHide).filter(x => !!x)
-    let dragHandlers = payloads.map(p => p.onDrag).filter(x => !!x)
+    const showHandlers = payloads.map(p => p.onShow).filter(isNotNullish)
+    const hideHandlers = payloads.map(p => p.onHide).filter(isNotNullish)
+    const dragHandlers = payloads.map(p => p.onDrag).filter(isNotNullish)
 
-    let showHandler: ShowHandler = (options) => {
-      for (let fn of showHandlers) {
+    const showHandler: ShowHandler = (options) => {
+      for (const fn of showHandlers) {
         fn(options)
       }
     }
 
-    let hideHandler: VoidFunction = () => {
-      for (let fn of hideHandlers) {
+    const hideHandler: VoidFunction = () => {
+      for (const fn of hideHandlers) {
         fn()
       }
     }
 
-    let dragHandler: DragEventHandler = (options): boolean => {
-      for (let fn of dragHandlers) {
+    const dragHandler: DragEventHandler = (options): boolean => {
+      for (const fn of dragHandlers) {
         if (fn(options) === false) return false
       }
       return true

package/src/drop-indicator/index.ts

@@ -7,8 +7,4 @@ export type {
   ShowHandlerOptions,
   ViewDragging,
 } from 'prosemirror-drop-indicator'
-export {
-  defineDropIndicator,
-  type DropIndicatorExtension,
-  type DropIndicatorOptions,
-} from './drop-indicator'
+export { defineDropIndicator, type DropIndicatorExtension, type DropIndicatorOptions } from './drop-indicator'

package/src/enter-rule/index.ts

@@ -10,17 +10,8 @@ import {
   type PluginPayload,
 } from '@prosekit/core'
 import { keydownHandler } from '@prosekit/pm/keymap'
-import type {
-  Attrs,
-  NodeType,
-} from '@prosekit/pm/model'
-import {
-  PluginKey,
-  ProseMirrorPlugin,
-  type Command,
-  type EditorState,
-  type Transaction,
-} from '@prosekit/pm/state'
+import type { Attrs, NodeType } from '@prosekit/pm/model'
+import { PluginKey, ProseMirrorPlugin, type Command, type EditorState, type Transaction } from '@prosekit/pm/state'
 import type { EditorView } from '@prosekit/pm/view'
 
 /**

package/src/file/file-paste-handler.spec.ts

@@ -1,20 +1,7 @@
-import {
-  Priority,
-  union,
-  withPriority,
-} from '@prosekit/core'
-import {
-  beforeEach,
-  describe,
-  expect,
-  it,
-  vi,
-} from 'vitest'
+import { Priority, union, withPriority } from '@prosekit/core'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
 
-import {
-  defineTestExtension,
-  setupTestFromExtension,
-} from '../testing'
+import { defineTestExtension, setupTestFromExtension } from '../testing'
 import { pasteFiles } from '../testing/clipboard'
 
 import { defineFilePasteHandler } from './file-paste-handler'

package/src/file/index.ts

@@ -1,16 +1,3 @@
-export {
-  defineFileDropHandler,
-  type FileDropHandler,
-  type FileDropHandlerOptions,
-} from './file-drop-handler'
-export {
-  defineFilePasteHandler,
-  type FilePasteHandler,
-  type FilePasteHandlerOptions,
-} from './file-paste-handler'
-export {
-  UploadTask,
-  type Uploader,
-  type UploaderOptions,
-  type UploadProgress,
-} from './file-upload'
+export { defineFileDropHandler, type FileDropHandler, type FileDropHandlerOptions } from './file-drop-handler'
+export { defineFilePasteHandler, type FilePasteHandler, type FilePasteHandlerOptions } from './file-paste-handler'
+export { UploadTask, type Uploader, type UploaderOptions, type UploadProgress } from './file-upload'

package/src/gap-cursor/gap-cursor.ts

@@ -1,7 +1,4 @@
-import {
-  definePlugin,
-  type PlainExtension,
-} from '@prosekit/core'
+import { definePlugin, type PlainExtension } from '@prosekit/core'
 import { gapCursor } from 'prosemirror-gapcursor'
 
 /**

package/src/gap-cursor/index.ts

@@ -1,4 +1 @@
-export {
-  defineGapCursor,
-  type GapCursorExtension,
-} from './gap-cursor'
+export { defineGapCursor, type GapCursorExtension } from './gap-cursor'

package/src/hard-break/hard-break-commands.ts

@@ -1,8 +1,4 @@
-import {
-  defineCommands,
-  insertNode,
-  type Extension,
-} from '@prosekit/core'
+import { defineCommands, insertNode, type Extension } from '@prosekit/core'
 import type { Command } from '@prosekit/pm/state'
 
 /**

package/src/hard-break/hard-break-keymap.spec.ts

@@ -1,14 +1,8 @@
-import {
-  describe,
-  expect,
-  it,
-} from 'vitest'
+import { describe, expect, it } from 'vitest'
+import { keyboard } from 'vitest-browser-commands/playwright'
 
 import { setupTest } from '../testing'
-import {
-  inputText,
-  pressKey,
-} from '../testing/keyboard'
+import { inputText } from '../testing/keyboard'
 
 describe('defineHardBreakKeymap', () => {
   it('should insert hard break', async () => {
@@ -19,12 +13,12 @@ describe('defineHardBreakKeymap', () => {
 
     editor.set(doc1)
     expect(editor.state.doc.toJSON()).toEqual(doc1.toJSON())
-    await pressKey('Shift-Enter')
+    await keyboard.press('Shift+Enter')
     expect(editor.state.doc.toJSON()).toEqual(doc2.toJSON())
 
     editor.set(doc1)
     expect(editor.state.doc.toJSON()).toEqual(doc1.toJSON())
-    await pressKey('Mod-Enter')
+    await keyboard.press('ControlOrMeta+Enter')
     expect(editor.state.doc.toJSON()).toEqual(doc2.toJSON())
   })
 
@@ -37,7 +31,7 @@ describe('defineHardBreakKeymap', () => {
 
     editor.set(doc1)
     expect(editor.state.doc.toJSON()).toEqual(doc1.toJSON())
-    await pressKey('Shift-Enter')
+    await keyboard.press('Shift+Enter')
     expect(editor.state.doc.toJSON()).toEqual(doc2.toJSON())
     await inputText('baz')
     expect(editor.state.doc.toJSON()).toEqual(doc3.toJSON())

package/src/hard-break/hard-break-keymap.ts

@@ -1,7 +1,4 @@
-import {
-  defineKeymap,
-  type PlainExtension,
-} from '@prosekit/core'
+import { defineKeymap, type PlainExtension } from '@prosekit/core'
 
 import { insertHardBreak } from './hard-break-commands'
 

package/src/hard-break/hard-break-spec.ts

@@ -1,7 +1,4 @@
-import {
-  defineNodeSpec,
-  type Extension,
-} from '@prosekit/core'
+import { defineNodeSpec, type Extension } from '@prosekit/core'
 import type { Attrs } from '@prosekit/pm/model'
 
 /**

package/src/hard-break/hard-break.ts

@@ -1,17 +1,8 @@
-import {
-  union,
-  type Union,
-} from '@prosekit/core'
+import { union, type Union } from '@prosekit/core'
 
-import {
-  defineHardBreakCommands,
-  type HardBreakCommandsExtension,
-} from './hard-break-commands'
+import { defineHardBreakCommands, type HardBreakCommandsExtension } from './hard-break-commands'
 import { defineHardBreakKeymap } from './hard-break-keymap'
-import {
-  defineHardBreakSpec,
-  type HardBreakSpecExtension,
-} from './hard-break-spec'
+import { defineHardBreakSpec, type HardBreakSpecExtension } from './hard-break-spec'
 
 /**
  * @internal

package/src/hard-break/index.ts

@@ -1,13 +1,4 @@
-export {
-  defineHardBreak,
-  type HardBreakExtension,
-} from './hard-break'
-export {
-  defineHardBreakCommands,
-  type HardBreakCommandsExtension,
-} from './hard-break-commands'
+export { defineHardBreak, type HardBreakExtension } from './hard-break'
+export { defineHardBreakCommands, type HardBreakCommandsExtension } from './hard-break-commands'
 export { defineHardBreakKeymap } from './hard-break-keymap'
-export {
-  defineHardBreakSpec,
-  type HardBreakSpecExtension,
-} from './hard-break-spec'
+export { defineHardBreakSpec, type HardBreakSpecExtension } from './hard-break-spec'

package/src/heading/heading-commands.ts

@@ -1,10 +1,4 @@
-import {
-  defineCommands,
-  insertNode,
-  setBlockType,
-  toggleNode,
-  type Extension,
-} from '@prosekit/core'
+import { defineCommands, insertNode, setBlockType, toggleNode, type Extension } from '@prosekit/core'
 
 import type { HeadingAttrs } from './heading-types'
 

package/src/heading/heading-keymap.spec.ts

@@ -1,11 +1,7 @@
-import {
-  describe,
-  expect,
-  it,
-} from 'vitest'
+import { describe, expect, it } from 'vitest'
+import { keyboard } from 'vitest-browser-commands/playwright'
 
 import { setupTest } from '../testing'
-import { pressKey } from '../testing/keyboard'
 
 describe('defineHeadingKeymap', () => {
   it('should toggle heading', async () => {
@@ -17,13 +13,13 @@ describe('defineHeadingKeymap', () => {
 
     editor.set(doc)
     expect(editor.state.doc.toJSON()).toEqual(doc.toJSON())
-    await pressKey('mod-alt-1')
+    await keyboard.press('ControlOrMeta+Alt+1')
     expect(editor.state.doc.toJSON()).toEqual(docH1.toJSON())
-    await pressKey('mod-alt-1')
+    await keyboard.press('ControlOrMeta+Alt+1')
     expect(editor.state.doc.toJSON()).toEqual(doc.toJSON())
-    await pressKey('mod-alt-3')
+    await keyboard.press('ControlOrMeta+Alt+3')
     expect(editor.state.doc.toJSON()).toEqual(docH3.toJSON())
-    await pressKey('mod-alt-1')
+    await keyboard.press('ControlOrMeta+Alt+1')
     expect(editor.state.doc.toJSON()).toEqual(docH1.toJSON())
   })
 
@@ -35,7 +31,7 @@ describe('defineHeadingKeymap', () => {
 
     editor.set(doc1)
     expect(editor.state.doc.toJSON()).toEqual(doc1.toJSON())
-    await pressKey('Backspace')
+    await keyboard.press('Backspace')
     expect(editor.state.doc.toJSON()).toEqual(doc2.toJSON())
   })
 
@@ -47,7 +43,7 @@ describe('defineHeadingKeymap', () => {
 
     editor.set(doc1)
     expect(editor.state.doc.toJSON()).toEqual(doc1.toJSON())
-    await pressKey('Backspace')
+    await keyboard.press('Backspace')
     expect(editor.state.doc.toJSON()).toEqual(doc2.toJSON())
   })
 })

package/src/heading/heading-keymap.ts

@@ -1,11 +1,4 @@
-import {
-  defineKeymap,
-  isAtBlockStart,
-  toggleNode,
-  unsetBlockType,
-  withSkipCodeBlock,
-  type PlainExtension,
-} from '@prosekit/core'
+import { defineKeymap, isAtBlockStart, toggleNode, unsetBlockType, withSkipCodeBlock, type PlainExtension } from '@prosekit/core'
 import type { Command } from '@prosekit/pm/state'
 
 function toggleHeadingKeybinding(level: number): Command {
@@ -29,12 +22,12 @@ const backspaceUnsetHeading: Command = (state, dispatch, view) => {
  */
 export function defineHeadingKeymap(): PlainExtension {
   return defineKeymap({
-    'mod-alt-1': toggleHeadingKeybinding(1),
-    'mod-alt-2': toggleHeadingKeybinding(2),
-    'mod-alt-3': toggleHeadingKeybinding(3),
-    'mod-alt-4': toggleHeadingKeybinding(4),
-    'mod-alt-5': toggleHeadingKeybinding(5),
-    'mod-alt-6': toggleHeadingKeybinding(6),
+    'Mod-Alt-1': toggleHeadingKeybinding(1),
+    'Mod-Alt-2': toggleHeadingKeybinding(2),
+    'Mod-Alt-3': toggleHeadingKeybinding(3),
+    'Mod-Alt-4': toggleHeadingKeybinding(4),
+    'Mod-Alt-5': toggleHeadingKeybinding(5),
+    'Mod-Alt-6': toggleHeadingKeybinding(6),
     'Backspace': backspaceUnsetHeading,
   })
 }

package/src/heading/heading-spec.ts

@@ -1,7 +1,4 @@
-import {
-  defineNodeSpec,
-  type Extension,
-} from '@prosekit/core'
+import { defineNodeSpec, type Extension } from '@prosekit/core'
 
 import type { HeadingAttrs } from './heading-types'