@prosekit/core 0.9.0 → 0.11.0

package/src/commands/set-node-attrs.ts

@@ -1,10 +1,8 @@
-import type {
-  Attrs,
-  NodeType,
-} from '@prosekit/pm/model'
+import type { Attrs, NodeType } from '@prosekit/pm/model'
 import type { Command } from '@prosekit/pm/state'
 
-import { getNodeTypes } from '../utils/get-node-types'
+import { findParentNodeOfType } from '../utils/find-parent-node-of-type.ts'
+import { getNodeTypes } from '../utils/get-node-types.ts'
 
 /**
  * @public
@@ -12,8 +10,6 @@ import { getNodeTypes } from '../utils/get-node-types'
 export interface SetNodeAttrsOptions {
   /**
    * The type of node to set the attributes of.
-   *
-   * If current node is not of this type, the command will do nothing.
    */
   type: string | NodeType | string[] | NodeType[]
 
@@ -23,43 +19,46 @@ export interface SetNodeAttrsOptions {
   attrs: Attrs
 
   /**
-   * The position of the node. Defaults to the position of the wrapping node
-   * containing the current selection.
+   * The document position of the node to update. If not provided, the command
+   * will find the closest ancestor node that matches the type based on the
+   * anchor position of the selection.
    */
   pos?: number
 }
 
 /**
- * Returns a command that set the attributes of the current node.
+ * Returns a command that sets the attributes of the current node.
+ *
+ * @param options
  *
  * @public
  */
-export function setNodeAttrs(options: SetNodeAttrsOptions): Command {
+export function setNodeAttrs({ type, attrs, pos }: SetNodeAttrsOptions): Command {
   return (state, dispatch) => {
-    const nodeTypes = getNodeTypes(state.schema, options.type)
-    const from = options.pos ?? state.selection.from
-    const to = options.pos ?? state.selection.to
-    const positions: number[] = []
+    let updatePos: number
 
-    state.doc.nodesBetween(from, to, (node, pos) => {
-      if (nodeTypes.includes(node.type)) {
-        positions.push(pos)
+    if (pos == null) {
+      const found = findParentNodeOfType(type, state.selection.$anchor)
+      if (!found) {
+        return false
       }
-      if (!dispatch && positions.length > 0) {
+      updatePos = found.pos
+    } else {
+      const found = state.doc.nodeAt(pos)
+      if (!found) {
         return false
       }
-    })
-
-    if (positions.length === 0) {
-      return false
+      const nodeTypes = getNodeTypes(state.schema, type)
+      if (!nodeTypes.includes(found.type)) {
+        return false
+      }
+      updatePos = pos
     }
 
     if (dispatch) {
       const { tr } = state
-      for (const pos of positions) {
-        for (const [key, value] of Object.entries(options.attrs)) {
-          tr.setNodeAttribute(pos, key, value)
-        }
+      for (const [key, value] of Object.entries(attrs)) {
+        tr.setNodeAttribute(updatePos, key, value)
       }
       dispatch(tr)
     }

package/src/commands/toggle-mark.ts

@@ -1,12 +1,9 @@
 import { toggleMark as baseToggleMark } from '@prosekit/pm/commands'
-import type {
-  Attrs,
-  MarkType,
-} from '@prosekit/pm/model'
+import type { Attrs, MarkType } from '@prosekit/pm/model'
 import type { Command } from '@prosekit/pm/state'
 
-import type { CommandCreator } from '../types/extension-command'
-import { getMarkType } from '../utils/get-mark-type'
+import type { CommandCreator } from '../types/extension-command.ts'
+import { getMarkType } from '../utils/get-mark-type.ts'
 
 /**
  * @public

package/src/commands/toggle-node.ts

@@ -1,12 +1,9 @@
 import { setBlockType } from '@prosekit/pm/commands'
-import type {
-  Attrs,
-  NodeType,
-} from '@prosekit/pm/model'
+import type { Attrs, NodeType } from '@prosekit/pm/model'
 import type { Command } from '@prosekit/pm/state'
 
-import { getNodeType } from '../utils/get-node-type'
-import { isNodeActive } from '../utils/is-node-active'
+import { getNodeType } from '../utils/get-node-type.ts'
+import { isNodeActive } from '../utils/is-node-active.ts'
 
 /**
  * @public
@@ -24,7 +21,7 @@ export interface ToggleNodeOptions {
 }
 
 /**
- * Returns a command that set the selected textblocks to the given node type
+ * Returns a command that sets the selected textblocks to the given node type
  * with the given attributes.
  *
  * @param options

package/src/commands/toggle-wrap.spec.ts

@@ -1,10 +1,6 @@
-import {
-  describe,
-  expect,
-  it,
-} from 'vitest'
+import { describe, expect, it } from 'vitest'
 
-import { setupTest } from '../testing'
+import { setupTest } from '../testing/index.ts'
 
 describe('toggle-wrap', () => {
   it('adds the node wrapping the selection', () => {

package/src/commands/toggle-wrap.ts

@@ -1,13 +1,10 @@
 import { lift } from '@prosekit/pm/commands'
-import type {
-  Attrs,
-  NodeType,
-} from '@prosekit/pm/model'
+import type { Attrs, NodeType } from '@prosekit/pm/model'
 import type { Command } from '@prosekit/pm/state'
 
-import { isNodeActive } from '../utils/is-node-active'
+import { isNodeActive } from '../utils/is-node-active.ts'
 
-import { wrap } from './wrap'
+import { wrap } from './wrap.ts'
 
 export interface ToggleWrapOptions {
   /**

package/src/commands/unset-block-type.spec.ts

@@ -1,10 +1,6 @@
-import {
-  describe,
-  expect,
-  it,
-} from 'vitest'
+import { describe, expect, it } from 'vitest'
 
-import { setupTest } from '../testing'
+import { setupTest } from '../testing/index.ts'
 
 describe('unsetBlockType', () => {
   it('can unset a single block', () => {

package/src/commands/unset-block-type.ts

@@ -1,14 +1,8 @@
-import {
-  Fragment,
-  Slice,
-} from '@prosekit/pm/model'
-import type {
-  Command,
-  Transaction,
-} from '@prosekit/pm/state'
+import { Fragment, Slice } from '@prosekit/pm/model'
+import type { Command, Transaction } from '@prosekit/pm/state'
 import { ReplaceAroundStep } from '@prosekit/pm/transform'
 
-import type { CommandCreator } from '../types/extension-command'
+import type { CommandCreator } from '../types/extension-command.ts'
 
 /**
  * @public

package/src/commands/unset-mark.spec.ts

@@ -1,10 +1,6 @@
-import {
-  describe,
-  expect,
-  it,
-} from 'vitest'
+import { describe, expect, it } from 'vitest'
 
-import { setupTest } from '../testing'
+import { setupTest } from '../testing/index.ts'
 
 describe('unsetMark', () => {
   it('can unset marks', () => {

package/src/commands/unset-mark.ts

@@ -1,6 +1,6 @@
 import type { Command } from '@prosekit/pm/state'
 
-import type { CommandCreator } from '../types/extension-command'
+import type { CommandCreator } from '../types/extension-command.ts'
 
 /**
  * @public

package/src/commands/wrap.ts

@@ -1,11 +1,8 @@
-import type {
-  Attrs,
-  NodeType,
-} from '@prosekit/pm/model'
+import type { Attrs, NodeType } from '@prosekit/pm/model'
 import type { Command } from '@prosekit/pm/state'
 import { findWrapping } from '@prosekit/pm/transform'
 
-import { getNodeType } from '../utils/get-node-type'
+import { getNodeType } from '../utils/get-node-type.ts'
 
 /**
  * @public

package/src/editor/action.spec.ts

@@ -1,13 +1,9 @@
-import {
-  describe,
-  expect,
-  it,
-} from 'vitest'
+import { describe, expect, it } from 'vitest'
 
-import { setupTest } from '../testing'
-import { jsonFromNode } from '../utils/parse'
+import { setupTest } from '../testing/index.ts'
+import { jsonFromNode } from '../utils/parse.ts'
 
-import type { NodeChild } from './action'
+import type { NodeChild } from './action.ts'
 
 describe('NodeAction', () => {
   const { editor, n } = setupTest()
@@ -22,7 +18,7 @@ describe('NodeAction', () => {
   it('can apply node with attrs', () => {
     expect(n.codeBlock({ language: 'javascript' }, 'foo').toJSON()).toEqual({
       type: 'codeBlock',
-      attrs: { language: 'javascript' },
+      attrs: { language: 'javascript', lineNumbers: false },
       content: [{ text: 'foo', type: 'text' }],
     })
   })

package/src/editor/action.ts

@@ -1,20 +1,13 @@
 import { mapValues } from '@ocavue/utils'
-import type {
-  Attrs,
-  Mark,
-  MarkType,
-  NodeType,
-  ProseMirrorNode,
-  Schema,
-} from '@prosekit/pm/model'
+import type { Attrs, Mark, MarkType, NodeType, ProseMirrorNode, Schema } from '@prosekit/pm/model'
 import type { EditorState } from '@prosekit/pm/state'
 
-import { ProseKitError } from '../error'
-import type { AnyAttrs } from '../types/attrs'
-import { assert } from '../utils/assert'
-import { isMarkActive } from '../utils/is-mark-active'
-import { isNodeActive } from '../utils/is-node-active'
-import { isProseMirrorNode } from '../utils/type-assertion'
+import { ProseKitError } from '../error.ts'
+import type { AnyAttrs } from '../types/attrs.ts'
+import { assert } from '../utils/assert.ts'
+import { isMarkActive } from '../utils/is-mark-active.ts'
+import { isNodeActive } from '../utils/is-node-active.ts'
+import { isProseMirrorNode } from '../utils/type-assertion.ts'
 
 /**
  * Available children parameters for {@link NodeAction} and {@link MarkAction}.

package/src/editor/editor.spec.ts

@@ -1,18 +1,11 @@
-import {
-  describe,
-  expect,
-  it,
-} from 'vitest'
-
-import { insertText } from '../commands/insert-text'
-import { wrap } from '../commands/wrap'
-import {
-  defineTestExtension,
-  setupTest,
-} from '../testing'
-import type { NodeJSON } from '../types/model'
-
-import { createEditor } from './editor'
+import { describe, expect, it } from 'vitest'
+
+import { insertText } from '../commands/insert-text.ts'
+import { wrap } from '../commands/wrap.ts'
+import { defineTestExtension, setupTest } from '../testing/index.ts'
+import type { NodeJSON } from '../types/model.ts'
+
+import { createEditor } from './editor.ts'
 
 describe('createEditor', () => {
   it('can mount the editor', () => {

package/src/editor/editor.ts

@@ -1,29 +1,13 @@
 import { isDeepEqual } from '@ocavue/utils'
-import type {
-  ProseMirrorNode,
-  Schema,
-} from '@prosekit/pm/model'
-import {
-  EditorState,
-  type Command,
-  type Plugin,
-  type Selection,
-  type Transaction,
-} from '@prosekit/pm/state'
-import {
-  EditorView,
-  type DirectEditorProps,
-  type EditorProps,
-} from '@prosekit/pm/view'
-
-import { ProseKitError } from '../error'
-import { defineDefaultState } from '../extensions/default-state'
-import type { BaseExtension } from '../facets/base-extension'
-import {
-  subtractFacetNode,
-  unionFacetNode,
-  type FacetNode,
-} from '../facets/facet-node'
+import type { ProseMirrorNode, Schema } from '@prosekit/pm/model'
+import { EditorState, type Command, type Plugin, type Selection, type Transaction } from '@prosekit/pm/state'
+import { EditorView, type DirectEditorProps, type EditorProps } from '@prosekit/pm/view'
+
+import { ProseKitError } from '../error.ts'
+import { defineDefaultState } from '../extensions/default-state.ts'
+import type { BaseExtension } from '../facets/base-extension.ts'
+import { subtractFacetNode, unionFacetNode, type FacetNode } from '../facets/facet-node.ts'
+import type { CommandAction, CommandCreator } from '../types/extension-command.ts'
 import type {
   Extension,
   ExtractCommandActions,
@@ -31,33 +15,14 @@ import type {
   ExtractMarkNames,
   ExtractNodeActions,
   ExtractNodeNames,
-} from '../types/extension'
-import type {
-  CommandAction,
-  CommandCreator,
-} from '../types/extension-command'
-import type {
-  NodeJSON,
-  SelectionJSON,
-} from '../types/model'
-import { assert } from '../utils/assert'
-import {
-  getEditorContentDoc,
-  getEditorSelection,
-} from '../utils/editor-content'
-import {
-  htmlFromNode,
-  jsonFromNode,
-  type DOMDocumentOptions,
-} from '../utils/parse'
-
-import {
-  createMarkActions,
-  createNodeActions,
-  type MarkAction,
-  type NodeAction,
-} from './action'
-import { union } from './union'
+} from '../types/extension.ts'
+import type { NodeJSON, SelectionJSON } from '../types/model.ts'
+import { assert } from '../utils/assert.ts'
+import { getEditorContentDoc, getEditorSelection } from '../utils/editor-content.ts'
+import { htmlFromNode, jsonFromNode, type DOMDocumentOptions } from '../utils/parse.ts'
+
+import { createMarkActions, createNodeActions, type MarkAction, type NodeAction } from './action.ts'
+import { union } from './union.ts'
 
 /**
  * @public
@@ -297,6 +262,7 @@ export class EditorInstance {
     }
     this.view = new EditorView({ mount: place }, this.directEditorProps)
     this.afterMounted.forEach((callback) => callback())
+    this.afterMounted.length = 0
   }
 
   public unmount(): void {

package/src/editor/union.spec.ts

@@ -1,19 +1,15 @@
 import type { Attrs } from '@prosekit/pm/model'
 import type { Command } from '@prosekit/pm/state'
-import {
-  describe,
-  expectTypeOf,
-  it,
-} from 'vitest'
+import { describe, expectTypeOf, it } from 'vitest'
 
-import { defineCommands } from '../extensions/command'
-import { defineMarkSpec } from '../extensions/mark-spec'
-import { defineNodeSpec } from '../extensions/node-spec'
-import { assertTypeEqual } from '../types/assert-type-equal'
-import type { Extension } from '../types/extension'
-import type { CommandCreator } from '../types/extension-command'
+import { defineCommands } from '../extensions/command.ts'
+import { defineMarkSpec } from '../extensions/mark-spec.ts'
+import { defineNodeSpec } from '../extensions/node-spec.ts'
+import { assertTypeEqual } from '../types/assert-type-equal.ts'
+import type { CommandCreator } from '../types/extension-command.ts'
+import type { Extension } from '../types/extension.ts'
 
-import { union } from './union'
+import { union } from './union.ts'
 
 describe('union', () => {
   it('can merge one extension types', () => {

package/src/editor/union.ts

@@ -1,10 +1,7 @@
-import type { BaseExtension } from '../facets/base-extension'
-import { UnionExtensionImpl } from '../facets/union-extension'
-import type {
-  Extension,
-  Union,
-} from '../types/extension'
-import { assert } from '../utils/assert'
+import type { BaseExtension } from '../facets/base-extension.ts'
+import { UnionExtensionImpl } from '../facets/union-extension.ts'
+import type { Extension, Union } from '../types/extension.ts'
+import { assert } from '../utils/assert.ts'
 
 /**
  * Merges multiple extensions into one. You can pass multiple extensions as

package/src/editor/with-priority.ts

@@ -1,7 +1,7 @@
-import type { Extension } from '../types/extension'
-import type { Priority } from '../types/priority'
+import type { Extension } from '../types/extension.ts'
+import type { Priority } from '../types/priority.ts'
 
-import { union } from './union'
+import { union } from './union.ts'
 
 /**
  * Return an new extension with the given priority.

package/src/error.ts

@@ -3,7 +3,14 @@
  *
  * @internal
  */
-export class ProseKitError extends Error {}
+export class ProseKitError extends Error {
+  constructor(message?: string, options?: ErrorOptions) {
+    if (typeof message === 'string' && !message.startsWith('[')) {
+      message = `[prosekit] ${message}`
+    }
+    super(message, options)
+  }
+}
 
 /**
  * @internal

package/src/extensions/clipboard-serializer.ts

@@ -1,25 +1,13 @@
-import {
-  DOMSerializer,
-  type DOMOutputSpec,
-  type Mark,
-  type ProseMirrorNode,
-  type Schema,
-} from '@prosekit/pm/model'
-import {
-  PluginKey,
-  ProseMirrorPlugin,
-} from '@prosekit/pm/state'
-
-import { defineFacet } from '../facets/facet'
-import { defineFacetPayload } from '../facets/facet-extension'
-import type { AnyFunction } from '../types/any-function'
-import type { PlainExtension } from '../types/extension'
-import { isNotNullish } from '../utils/type-assertion'
-
-import {
-  pluginFacet,
-  type PluginPayload,
-} from './plugin'
+import { isNotNullish } from '@ocavue/utils'
+import { DOMSerializer, type DOMOutputSpec, type Mark, type ProseMirrorNode, type Schema } from '@prosekit/pm/model'
+import { PluginKey, ProseMirrorPlugin } from '@prosekit/pm/state'
+
+import { defineFacetPayload } from '../facets/facet-extension.ts'
+import { defineFacet } from '../facets/facet.ts'
+import type { AnyFunction } from '../types/any-function.ts'
+import type { PlainExtension } from '../types/extension.ts'
+
+import { pluginFacet, type PluginPayload } from './plugin.ts'
 
 type SerializeFragmentFunction = typeof DOMSerializer.prototype.serializeFragment
 type SerializeNodeFunction = typeof DOMSerializer.prototype.serializeNode
@@ -47,29 +35,37 @@ function wrapFunction<T extends AnyFunction>(fn: T, wrapper?: FunctionWrapper<T>
 }
 
 class CustomDOMSerializer extends DOMSerializer {
+  private serializeFragmentWrapper?: FunctionWrapper<SerializeFragmentFunction>
+  private serializeNodeWrapper?: FunctionWrapper<SerializeNodeFunction>
+
   constructor(
     nodes: Record<string, (node: ProseMirrorNode) => DOMOutputSpec>,
     marks: Record<string, (mark: Mark, inline: boolean) => DOMOutputSpec>,
-    private serializeFragmentWrapper?: FunctionWrapper<SerializeFragmentFunction>,
-    private serializeNodeWrapper?: FunctionWrapper<SerializeNodeFunction>,
+    serializeFragmentWrapper?: FunctionWrapper<SerializeFragmentFunction>,
+    serializeNodeWrapper?: FunctionWrapper<SerializeNodeFunction>,
   ) {
     super(nodes, marks)
+    this.serializeFragmentWrapper = serializeFragmentWrapper
+    this.serializeNodeWrapper = serializeNodeWrapper
   }
 
   override serializeFragment(...args: Parameters<SerializeFragmentFunction>): ReturnType<SerializeFragmentFunction> {
+    // eslint-disable-next-line unicorn/consistent-function-scoping -- See https://github.com/sindresorhus/eslint-plugin-unicorn/issues/2088
     const fn: SerializeFragmentFunction = (...args) => super.serializeFragment(...args)
     return wrapFunction(fn, this.serializeFragmentWrapper)(...args)
   }
 
   override serializeNode(...args: Parameters<SerializeNodeFunction>): ReturnType<SerializeNodeFunction> {
+    // eslint-disable-next-line unicorn/consistent-function-scoping -- See https://github.com/sindresorhus/eslint-plugin-unicorn/issues/2088
     const fn: SerializeNodeFunction = (...args) => super.serializeNode(...args)
     return wrapFunction(fn, this.serializeNodeWrapper)(...args)
   }
 }
 
+const nodesFromSchema = /* @__PURE__ */ DOMSerializer.nodesFromSchema.bind(DOMSerializer)
+const marksFromSchema = /* @__PURE__ */ DOMSerializer.marksFromSchema.bind(DOMSerializer)
+
 function createCustomDOMSerializer(schema: Schema, options: ClipboardSerializerOptions) {
-  const nodesFromSchema: NodesFromSchemaFunction = (...args) => DOMSerializer.nodesFromSchema(...args)
-  const marksFromSchema: MarksFromSchemaFunction = (...args) => DOMSerializer.marksFromSchema(...args)
   const nodes = wrapFunction(nodesFromSchema, options.nodesFromSchemaWrapper)(schema)
   const marks = wrapFunction(marksFromSchema, options.marksFromSchemaWrapper)(schema)
   return new CustomDOMSerializer(nodes, marks, options.serializeFragmentWrapper, options.serializeNodeWrapper)

package/src/extensions/command.ts

@@ -1,57 +1,22 @@
-import {
-  addMark,
-  type AddMarkOptions,
-} from '../commands/add-mark'
-import {
-  insertDefaultBlock,
-  type InsertDefaultBlockOptions,
-} from '../commands/insert-default-block'
-import {
-  insertNode,
-  type InsertNodeOptions,
-} from '../commands/insert-node'
-import {
-  insertText,
-  type InsertTextOptions,
-} from '../commands/insert-text'
-import {
-  removeMark,
-  type RemoveMarkOptions,
-} from '../commands/remove-mark'
-import {
-  removeNode,
-  type RemoveNodeOptions,
-} from '../commands/remove-node'
-import { selectAll } from '../commands/select-all'
-import { selectBlock } from '../commands/select-block'
-import {
-  setBlockType,
-  type SetBlockTypeOptions,
-} from '../commands/set-block-type'
-import {
-  setNodeAttrs,
-  type SetNodeAttrsOptions,
-} from '../commands/set-node-attrs'
-import {
-  toggleWrap,
-  type ToggleWrapOptions,
-} from '../commands/toggle-wrap'
-import {
-  unsetBlockType,
-  type UnsetBlockTypeOptions,
-} from '../commands/unset-block-type'
-import {
-  unsetMark,
-  type UnsetMarkOptions,
-} from '../commands/unset-mark'
-import {
-  wrap,
-  type WrapOptions,
-} from '../commands/wrap'
-import { commandFacet } from '../facets/command'
-import { defineFacetPayload } from '../facets/facet-extension'
-import type { Extension } from '../types/extension'
-import type { CommandCreator } from '../types/extension-command'
+import { addMark, type AddMarkOptions } from '../commands/add-mark.ts'
+import { insertDefaultBlock, type InsertDefaultBlockOptions } from '../commands/insert-default-block.ts'
+import { insertNode, type InsertNodeOptions } from '../commands/insert-node.ts'
+import { insertText, type InsertTextOptions } from '../commands/insert-text.ts'
+import { removeMark, type RemoveMarkOptions } from '../commands/remove-mark.ts'
+import { removeNode, type RemoveNodeOptions } from '../commands/remove-node.ts'
+import { selectAll } from '../commands/select-all.ts'
+import { selectBlock } from '../commands/select-block.ts'
+import { setBlockType, type SetBlockTypeOptions } from '../commands/set-block-type.ts'
+import { setNodeAttrsBetween, type SetNodeAttrsBetweenOptions } from '../commands/set-node-attrs-between.ts'
+import { setNodeAttrs, type SetNodeAttrsOptions } from '../commands/set-node-attrs.ts'
+import { toggleWrap, type ToggleWrapOptions } from '../commands/toggle-wrap.ts'
+import { unsetBlockType, type UnsetBlockTypeOptions } from '../commands/unset-block-type.ts'
+import { unsetMark, type UnsetMarkOptions } from '../commands/unset-mark.ts'
+import { wrap, type WrapOptions } from '../commands/wrap.ts'
+import { commandFacet } from '../facets/command.ts'
+import { defineFacetPayload } from '../facets/facet-extension.ts'
+import type { CommandCreator } from '../types/extension-command.ts'
+import type { Extension } from '../types/extension.ts'
 
 export function defineCommands<
   T extends Record<string, CommandCreator> = Record<string, CommandCreator>,
@@ -77,6 +42,7 @@ export type BaseCommandsExtension = Extension<{
     toggleWrap: [options: ToggleWrapOptions]
     setBlockType: [options: SetBlockTypeOptions]
     setNodeAttrs: [options: SetNodeAttrsOptions]
+    setNodeAttrsBetween: [options: SetNodeAttrsBetweenOptions]
     insertDefaultBlock: [options?: InsertDefaultBlockOptions]
     selectAll: []
     selectBlock: []
@@ -108,6 +74,8 @@ export function defineBaseCommands(): BaseCommandsExtension {
 
     setNodeAttrs,
 
+    setNodeAttrsBetween,
+
     insertDefaultBlock,
 
     selectAll,