@prosekit/core 0.9.0 → 0.10.0

package/src/index.ts

@@ -1,98 +1,30 @@
-export {
-  addMark,
-  type AddMarkOptions,
-} from './commands/add-mark'
-export {
-  expandMark,
-  type ExpandMarkOptions,
-} from './commands/expand-mark'
-export {
-  insertDefaultBlock,
-  type InsertDefaultBlockOptions,
-} from './commands/insert-default-block'
-export {
-  insertNode,
-  type InsertNodeOptions,
-} from './commands/insert-node'
-export {
-  removeMark,
-  type RemoveMarkOptions,
-} from './commands/remove-mark'
-export {
-  removeNode,
-  type RemoveNodeOptions,
-} from './commands/remove-node'
+export { addMark, type AddMarkOptions } from './commands/add-mark'
+export { expandMark, type ExpandMarkOptions } from './commands/expand-mark'
+export { insertDefaultBlock, type InsertDefaultBlockOptions } from './commands/insert-default-block'
+export { insertNode, type InsertNodeOptions } from './commands/insert-node'
+export { removeMark, type RemoveMarkOptions } from './commands/remove-mark'
+export { removeNode, type RemoveNodeOptions } from './commands/remove-node'
 export { selectAll } from './commands/select-all'
 export { selectBlock } from './commands/select-block'
-export {
-  setBlockType,
-  type SetBlockTypeOptions,
-} from './commands/set-block-type'
-export {
-  setNodeAttrs,
-  type SetNodeAttrsOptions,
-} from './commands/set-node-attrs'
-export {
-  toggleMark,
-  type ToggleMarkOptions,
-} from './commands/toggle-mark'
-export {
-  toggleNode,
-  type ToggleNodeOptions,
-} from './commands/toggle-node'
-export {
-  toggleWrap,
-  type ToggleWrapOptions,
-} from './commands/toggle-wrap'
-export {
-  unsetBlockType,
-  type UnsetBlockTypeOptions,
-} from './commands/unset-block-type'
-export {
-  unsetMark,
-  type UnsetMarkOptions,
-} from './commands/unset-mark'
-export {
-  wrap,
-  type WrapOptions,
-} from './commands/wrap'
-export type {
-  MarkAction,
-  NodeAction,
-  NodeChild,
-} from './editor/action'
-export {
-  createEditor,
-  Editor,
-  type EditorOptions,
-} from './editor/editor'
+export { setBlockType, type SetBlockTypeOptions } from './commands/set-block-type'
+export { setNodeAttrs, type SetNodeAttrsOptions } from './commands/set-node-attrs'
+export { setNodeAttrsBetween, type SetNodeAttrsBetweenOptions } from './commands/set-node-attrs-between'
+export { toggleMark, type ToggleMarkOptions } from './commands/toggle-mark'
+export { toggleNode, type ToggleNodeOptions } from './commands/toggle-node'
+export { toggleWrap, type ToggleWrapOptions } from './commands/toggle-wrap'
+export { unsetBlockType, type UnsetBlockTypeOptions } from './commands/unset-block-type'
+export { unsetMark, type UnsetMarkOptions } from './commands/unset-mark'
+export { wrap, type WrapOptions } from './commands/wrap'
+export type { MarkAction, NodeAction, NodeChild } from './editor/action'
+export { createEditor, Editor, type EditorOptions } from './editor/editor'
 export { union } from './editor/union'
 export { withPriority } from './editor/with-priority'
-export {
-  EditorNotFoundError,
-  ProseKitError,
-} from './error'
-export {
-  defineClipboardSerializer,
-  type ClipboardSerializerOptions,
-} from './extensions/clipboard-serializer'
-export {
-  defineBaseCommands,
-  defineCommands,
-  type BaseCommandsExtension,
-} from './extensions/command'
-export {
-  defineDefaultState,
-  type DefaultStateOptions,
-} from './extensions/default-state'
-export {
-  defineDocChangeHandler,
-  type DocChangeHandler,
-} from './extensions/events/doc-change'
-export {
-  defineDOMEventHandler,
-  type DOMEventHandler,
-} from './extensions/events/dom-event'
+export { EditorNotFoundError, ProseKitError } from './error'
+export { defineClipboardSerializer, type ClipboardSerializerOptions } from './extensions/clipboard-serializer'
+export { defineBaseCommands, defineCommands, type BaseCommandsExtension } from './extensions/command'
+export { defineDefaultState, type DefaultStateOptions } from './extensions/default-state'
+export { defineDocChangeHandler, type DocChangeHandler } from './extensions/events/doc-change'
+export { defineDOMEventHandler, type DOMEventHandler } from './extensions/events/dom-event'
 export {
   defineClickHandler,
   defineClickOnHandler,
@@ -121,10 +53,7 @@ export {
   type TripleClickHandler,
   type TripleClickOnHandler,
 } from './extensions/events/editor-event'
-export {
-  defineFocusChangeHandler,
-  type FocusChangeHandler,
-} from './extensions/events/focus'
+export { defineFocusChangeHandler, type FocusChangeHandler } from './extensions/events/focus'
 export {
   defineMountHandler,
   defineUnmountHandler,
@@ -133,69 +62,30 @@ export {
   type UnmountHandler,
   type UpdateHandler,
 } from './extensions/events/plugin-view'
-export {
-  defineHistory,
-  type HistoryExtension,
-  type HistoryOptions,
-} from './extensions/history'
-export {
-  defineKeymap,
-  keymapFacet,
-  type Keymap,
-  type KeymapPayload,
-} from './extensions/keymap'
-export {
-  defineBaseKeymap,
-  type BaseKeymapExtension,
-  type BaseKeymapOptions,
-} from './extensions/keymap-base'
-export {
-  defineMarkAttr,
-  defineMarkSpec,
-  type MarkAttrOptions,
-  type MarkSpecOptions,
-} from './extensions/mark-spec'
-export {
-  defineMarkView,
-  type MarkViewOptions,
-} from './extensions/mark-view'
+export { defineHistory, type HistoryExtension, type HistoryOptions } from './extensions/history'
+export { defineKeymap, keymapFacet, type Keymap, type KeymapPayload } from './extensions/keymap'
+export { defineBaseKeymap, type BaseKeymapExtension, type BaseKeymapOptions } from './extensions/keymap-base'
+export { defineMarkAttr, defineMarkSpec, type MarkAttrOptions, type MarkSpecOptions } from './extensions/mark-spec'
+export { defineMarkView, type MarkViewOptions } from './extensions/mark-view'
 export {
   defineMarkViewComponent,
   defineMarkViewFactory,
   type MarkViewComponentOptions,
   type MarkViewFactoryOptions,
 } from './extensions/mark-view-effect'
-export {
-  defineNodeAttr,
-  defineNodeSpec,
-  type NodeAttrOptions,
-  type NodeSpecOptions,
-} from './extensions/node-spec'
-export {
-  defineNodeView,
-  type NodeViewOptions,
-} from './extensions/node-view'
+export { defineNodeAttr, defineNodeSpec, type NodeAttrOptions, type NodeSpecOptions } from './extensions/node-spec'
+export { defineNodeView, type NodeViewOptions } from './extensions/node-view'
 export {
   defineNodeViewComponent,
   defineNodeViewFactory,
   type NodeViewComponentOptions,
   type NodeViewFactoryOptions,
 } from './extensions/node-view-effect'
-export {
-  definePlugin,
-  pluginFacet,
-  type PluginPayload,
-} from './extensions/plugin'
-export {
-  defineFacet,
-  type Facet,
-} from './facets/facet'
+export { definePlugin, pluginFacet, type PluginPayload } from './extensions/plugin'
+export { defineFacet, type Facet } from './facets/facet'
 export { defineFacetPayload } from './facets/facet-extension'
 export type { AnyFunction } from './types/any-function'
-export type {
-  AnyAttrs,
-  AttrSpec,
-} from './types/attrs'
+export type { AnyAttrs, AttrSpec } from './types/attrs'
 export type {
   Extension,
   ExtensionTyping,
@@ -210,24 +100,10 @@ export type {
   PlainExtension,
   Union,
 } from './types/extension'
-export type {
-  CommandAction,
-  CommandTyping,
-} from './types/extension-command'
-export type {
-  MarkTyping,
-  ToMarkAction,
-} from './types/extension-mark'
-export type {
-  NodeTyping,
-  ToNodeAction,
-} from './types/extension-node'
-export type {
-  NodeJSON,
-  SelectionJSON,
-  StateJSON,
-  StepJSON,
-} from './types/model'
+export type { CommandAction, CommandTyping } from './types/extension-command'
+export type { MarkTyping, ToMarkAction } from './types/extension-mark'
+export type { NodeTyping, ToNodeAction } from './types/extension-node'
+export type { NodeJSON, SelectionJSON, StateJSON, StepJSON } from './types/model'
 export type { PickSubType } from './types/pick-sub-type'
 export { Priority } from './types/priority'
 export type { SimplifyDeeper } from './types/simplify-deeper'
@@ -238,10 +114,8 @@ export { clsx } from './utils/clsx'
 export { containsInlineNode } from './utils/contains-inline-node'
 export { defaultBlockAt } from './utils/default-block-at'
 export { isApple } from './utils/env'
-export {
-  findParentNode,
-  type FindParentNodeResult,
-} from './utils/find-parent-node'
+export { findNode, findNodes, type FindNodeResult } from './utils/find-node'
+export { findParentNode, type FindParentNodeResult } from './utils/find-parent-node'
 export { findParentNodeOfType } from './utils/find-parent-node-of-type'
 export { getMarkType } from './utils/get-mark-type'
 export { getNodeType } from './utils/get-node-type'

package/src/test/index.ts

@@ -1,4 +1 @@
-export {
-  createTestEditor,
-  type TestEditor,
-} from './test-editor'
+export { createTestEditor, type TestEditor } from './test-editor'

package/src/test/test-builder.ts

@@ -1,9 +1,6 @@
 import type { ProseMirrorNode } from '@prosekit/pm/model'
 
-import type {
-  ApplyMarkFunction,
-  CreateNodeFunction,
-} from '../editor/action'
+import type { ApplyMarkFunction, CreateNodeFunction } from '../editor/action'
 import { assert } from '../utils/assert'
 
 type Tags = Record<string, number>

package/src/test/test-editor.spec.ts

@@ -1,8 +1,4 @@
-import {
-  describe,
-  expect,
-  it,
-} from 'vitest'
+import { describe, expect, it } from 'vitest'
 
 import { setupTest } from '../testing'
 

package/src/test/test-editor.ts

@@ -1,32 +1,13 @@
 import type { ProseMirrorNode } from '@prosekit/pm/model'
-import {
-  NodeSelection,
-  TextSelection,
-  type Selection,
-} from '@prosekit/pm/state'
+import { NodeSelection, TextSelection, type Selection } from '@prosekit/pm/state'
 
-import {
-  createMarkActions,
-  createNodeActions,
-} from '../editor/action'
-import {
-  Editor,
-  EditorInstance,
-  setupEditorExtension,
-  type EditorOptions,
-} from '../editor/editor'
+import { createMarkActions, createNodeActions } from '../editor/action'
+import { Editor, EditorInstance, setupEditorExtension, type EditorOptions } from '../editor/editor'
 import type { Extension } from '../types/extension'
-import type {
-  NodeJSON,
-  SelectionJSON,
-} from '../types/model'
+import type { NodeJSON, SelectionJSON } from '../types/model'
 import { isProseMirrorNode } from '../utils/type-assertion'
 
-import {
-  applyMarkForTest,
-  createNodeForTest,
-  type TaggedProseMirrorNode,
-} from './test-builder'
+import { applyMarkForTest, createNodeForTest, type TaggedProseMirrorNode } from './test-builder'
 
 function maybeResolve(doc: ProseMirrorNode, pos?: number) {
   if (pos != null) {

package/src/testing/index.ts

@@ -9,15 +9,8 @@ import { defineHistory } from '../extensions/history'
 import { defineBaseKeymap } from '../extensions/keymap-base'
 import { defineMarkSpec } from '../extensions/mark-spec'
 import { defineNodeSpec } from '../extensions/node-spec'
-import {
-  createTestEditor,
-  type TestEditor,
-} from '../test'
-import type {
-  Extension,
-  ExtractMarkActions,
-  ExtractNodeActions,
-} from '../types/extension'
+import { createTestEditor, type TestEditor } from '../test'
+import type { Extension, ExtractMarkActions, ExtractNodeActions } from '../types/extension'
 import { Priority } from '../types/priority'
 
 type DocExtension = Extension<{ Nodes: { doc: Attrs } }>
@@ -182,7 +175,7 @@ function defineHeading(): HeadingExtension {
 
 type CodeBlockExtension = Extension<{
   Nodes: {
-    codeBlock: { language: string }
+    codeBlock: { language: string; lineNumbers?: boolean }
   }
 }>
 
@@ -197,16 +190,23 @@ function defineCodeBlock(): CodeBlockExtension {
     code: true,
     defining: true,
     marks: '',
-    attrs: { language: { default: '', validate: 'string' } },
+    attrs: {
+      language: { default: '', validate: 'string' },
+      lineNumbers: { default: false, validate: 'boolean' },
+    },
     toDOM() {
       return ['pre', ['code', 0]]
     },
   })
 }
 
+interface BlockquoteAttrs {
+  variant: string
+}
+
 type BlockquoteExtension = Extension<{
   Nodes: {
-    blockquote: Attrs
+    blockquote: BlockquoteAttrs
   }
 }>
 
@@ -219,9 +219,13 @@ function defineBlockquote(): BlockquoteExtension {
     content: 'block+',
     group: 'block',
     defining: true,
+    attrs: {
+      variant: { default: '', validate: 'string' },
+    },
     parseDOM: [{ tag: 'blockquote' }],
-    toDOM() {
-      return ['blockquote', 0]
+    toDOM(node) {
+      const { variant } = node.attrs as BlockquoteAttrs
+      return ['blockquote', { 'data-variant': variant }, 0]
     },
   })
 }

package/src/types/extension.spec.ts

@@ -1,10 +1,7 @@
 import { test } from 'vitest'
 
 import { assertTypeEqual } from './assert-type-equal'
-import type {
-  Extension,
-  Union,
-} from './extension'
+import type { Extension, Union } from './extension'
 
 test('ExtractTyping', () => {
   type E1 = Extension<{

package/src/types/extension.ts

@@ -1,18 +1,8 @@
 import type { Schema } from '@prosekit/pm/model'
 
-import type {
-  CommandTyping,
-  ToCommandAction,
-  ToCommandCreators,
-} from './extension-command'
-import type {
-  MarkTyping,
-  ToMarkAction,
-} from './extension-mark'
-import type {
-  NodeTyping,
-  ToNodeAction,
-} from './extension-node'
+import type { CommandTyping, ToCommandAction, ToCommandCreators } from './extension-command'
+import type { MarkTyping, ToMarkAction } from './extension-mark'
+import type { NodeTyping, ToNodeAction } from './extension-node'
 import type { PickStringLiteral } from './pick-string-literal'
 import type { PickSubType } from './pick-sub-type'
 import type { Priority } from './priority'

package/src/types/simplify-union.ts

@@ -1,7 +1,4 @@
-import type {
-  Simplify,
-  UnionToIntersection,
-} from 'type-fest'
+import type { Simplify, UnionToIntersection } from 'type-fest'
 
 /**
  * @internal

package/src/utils/array-grouping.spec.ts

@@ -1,7 +1,4 @@
-import {
-  expect,
-  test,
-} from 'vitest'
+import { expect, test } from 'vitest'
 
 import { groupEntries } from './array-grouping'
 

package/src/utils/attrs-match.ts

@@ -1,8 +1,4 @@
-import type {
-  Attrs,
-  Mark,
-  ProseMirrorNode,
-} from '@prosekit/pm/model'
+import type { Attrs, Mark, ProseMirrorNode } from '@prosekit/pm/model'
 
 export function attrsMatch(
   nodeOrMark: ProseMirrorNode | Mark,

package/src/utils/clsx.spec.ts

@@ -1,7 +1,4 @@
-import {
-  expect,
-  test,
-} from 'vitest'
+import { expect, test } from 'vitest'
 
 import { clsx } from './clsx'
 

package/src/utils/combine-event-handlers.spec.ts

@@ -1,8 +1,4 @@
-import {
-  expect,
-  test,
-  vi,
-} from 'vitest'
+import { expect, test, vi } from 'vitest'
 
 import { combineEventHandlers } from './combine-event-handlers'
 

package/src/utils/default-block-at.ts

@@ -1,7 +1,4 @@
-import type {
-  ContentMatch,
-  NodeType,
-} from '@prosekit/pm/model'
+import type { ContentMatch, NodeType } from '@prosekit/pm/model'
 
 /**
  * @internal

package/src/utils/editor-content.spec.ts

@@ -1,8 +1,5 @@
 import { AllSelection } from '@prosekit/pm/state'
-import {
-  expect,
-  test,
-} from 'vitest'
+import { expect, test } from 'vitest'
 
 import { setupTest } from '../testing'
 

package/src/utils/editor-content.ts

@@ -1,24 +1,12 @@
 import { isElementLike } from '@ocavue/utils'
-import type {
-  ProseMirrorNode,
-  Schema,
-} from '@prosekit/pm/model'
+import type { ProseMirrorNode, Schema } from '@prosekit/pm/model'
 import { Selection } from '@prosekit/pm/state'
 
-import type {
-  NodeJSON,
-  SelectionJSON,
-} from '../types/model'
+import type { NodeJSON, SelectionJSON } from '../types/model'
 
 import { assert } from './assert'
-import {
-  jsonFromElement,
-  jsonFromHTML,
-} from './parse'
-import {
-  isProseMirrorNode,
-  isSelection,
-} from './type-assertion'
+import { jsonFromElement, jsonFromHTML } from './parse'
+import { isProseMirrorNode, isSelection } from './type-assertion'
 
 export function getEditorContentJSON(
   schema: Schema,

package/src/utils/find-node.ts

@@ -0,0 +1,65 @@
+import type { ProseMirrorNode } from '@prosekit/pm/model'
+
+/**
+ * Finds the first node that satisfies the predicate from the given document.
+ *
+ * @internal
+ */
+export function findNode(
+  doc: ProseMirrorNode,
+  predicate: (node: ProseMirrorNode) => boolean,
+): FindNodeResult | undefined {
+  let found: FindNodeResult | undefined
+  doc.descendants((node, pos, parent, index) => {
+    if (found) {
+      return false
+    }
+    if (predicate(node)) {
+      found = { node, pos, parent, index }
+      return false
+    }
+  })
+  return found
+}
+
+/**
+ * Finds all nodes that satisfy the predicate from the given document.
+ *
+ * @internal
+ */
+export function findNodes(
+  doc: ProseMirrorNode,
+  predicate: (node: ProseMirrorNode) => boolean,
+): FindNodeResult[] {
+  const results: FindNodeResult[] = []
+  doc.descendants((node, pos, parent, index) => {
+    if (predicate(node)) {
+      results.push({ node, pos, parent, index })
+    }
+  })
+  return results
+}
+
+/**
+ * The result of the {@link findNode} function.
+ *
+ * @internal
+ */
+export interface FindNodeResult {
+  /**
+   * The node that satisfies the predicate.
+   */
+  node: ProseMirrorNode
+  /**
+   * The position of the node.
+   */
+  pos: number
+  /**
+   * The parent of the node.
+   */
+  parent: ProseMirrorNode | null
+  /**
+   * The index of the node in the parent.
+   */
+  index: number
+}

package/src/utils/find-parent-node-of-type.ts

@@ -1,13 +1,7 @@
-import type {
-  NodeType,
-  ResolvedPos,
-} from '@prosekit/pm/model'
+import type { NodeType, ResolvedPos } from '@prosekit/pm/model'
 
-import {
-  findParentNode,
-  type FindParentNodeResult,
-} from './find-parent-node'
-import { getNodeType } from './get-node-type'
+import { findParentNode, type FindParentNodeResult } from './find-parent-node'
+import { getNodeTypes } from './get-node-types'
 
 /**
  * Finds the closest parent node that matches the given node type.
@@ -18,12 +12,12 @@ export function findParentNodeOfType(
   /**
    * The type of the node to find.
    */
-  type: NodeType | string,
+  type: string | NodeType | string[] | NodeType[],
   /**
    * The position to start searching from.
    */
   $pos: ResolvedPos,
 ): FindParentNodeResult | undefined {
-  const nodeType = getNodeType($pos.doc.type.schema, type)
-  return findParentNode((node) => node.type === nodeType, $pos)
+  const nodeTypes = getNodeTypes($pos.doc.type.schema, type)
+  return findParentNode((node) => nodeTypes.includes(node.type), $pos)
 }

package/src/utils/find-parent-node.spec.ts

@@ -1,8 +1,4 @@
-import {
-  describe,
-  expect,
-  it,
-} from 'vitest'
+import { describe, expect, it } from 'vitest'
 
 import { setupTest } from '../testing'
 

package/src/utils/find-parent-node.ts

@@ -1,7 +1,4 @@
-import type {
-  ProseMirrorNode,
-  ResolvedPos,
-} from '@prosekit/pm/model'
+import type { ProseMirrorNode, ResolvedPos } from '@prosekit/pm/model'
 
 /**
  * @public

package/src/utils/get-custom-selection.ts

@@ -1,8 +1,4 @@
-import {
-  TextSelection,
-  type EditorState,
-  type Selection,
-} from '@prosekit/pm/state'
+import { TextSelection, type EditorState, type Selection } from '@prosekit/pm/state'
 
 export function getCustomSelection(
   state: EditorState,

package/src/utils/get-mark-type.ts

@@ -1,7 +1,4 @@
-import type {
-  MarkType,
-  Schema,
-} from '@prosekit/pm/model'
+import type { MarkType, Schema } from '@prosekit/pm/model'
 
 import { ProseKitError } from '../error'