@prosekit/core 0.8.7 → 0.10.0

package/src/facets/state.ts

@@ -1,25 +1,10 @@
-import type {
-  Mark,
-  ProseMirrorNode,
-  Schema,
-} from '@prosekit/pm/model'
-import type { EditorStateConfig } from '@prosekit/pm/state'
-import type {
-  Plugin,
-  Selection,
-} from '@prosekit/pm/state'
+import type { Mark, ProseMirrorNode, Schema } from '@prosekit/pm/model'
+import type { EditorStateConfig, Plugin, Selection } from '@prosekit/pm/state'
 
-import { toReversed } from '../utils/array'
 import { assert } from '../utils/assert'
 
-import {
-  defineFacet,
-  type Facet,
-} from './facet'
-import {
-  rootFacet,
-  type RootPayload,
-} from './root'
+import { defineFacet, type Facet } from './facet'
+import { rootFacet, type RootPayload } from './root'
 
 export type StatePayload = (ctx: { schema: Schema }) => EditorStateConfig
 
@@ -37,7 +22,7 @@ export const stateFacet: Facet<StatePayload, RootPayload> = defineFacet({
 
       // An array of state payloads from higher to lower priority. This matches the
       // order of plugins required by ProseMirror.
-      const reversedCallbacks = toReversed(callbacks)
+      const reversedCallbacks = [...callbacks].reverse()
 
       for (const callback of reversedCallbacks) {
         const config = callback(ctx)

package/src/facets/union-extension.ts

@@ -1,15 +1,9 @@
-import type {
-  Extension,
-  ExtensionTyping,
-} from '../types/extension'
+import type { Extension, ExtensionTyping } from '../types/extension'
 import type { Priority } from '../types/priority'
 import { assert } from '../utils/assert'
 
 import { BaseExtension } from './base-extension'
-import {
-  unionFacetNode,
-  type FacetNode,
-} from './facet-node'
+import { unionFacetNode, type FacetNode } from './facet-node'
 
 export class UnionExtensionImpl<T extends ExtensionTyping = ExtensionTyping> extends BaseExtension<T> implements Extension<T> {
   /**

package/src/index.ts

@@ -1,102 +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 {
-  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,
-  MarkBuilder,
-  NodeAction,
-  NodeBuilder,
-  NodeChild,
-} from './editor/action'
-export {
-  createEditor,
-  Editor,
-  type EditorOptions,
-} from './editor/editor'
+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 { 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 {
-  defineDoc,
-  type DocExtension,
-} from './extensions/doc'
-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,
@@ -125,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,
@@ -137,82 +62,34 @@ 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,
-} 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 {
-  defineParagraph,
-  type ParagraphExtension,
-} from './extensions/paragraph'
-export {
-  definePlugin,
-  pluginFacet,
-  type PluginPayload,
-} from './extensions/plugin'
-export {
-  defineText,
-  type TextExtension,
-} from './extensions/text'
-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 { BaseNodeViewOptions } from './types/base-node-view-options'
+export type { AnyAttrs, AttrSpec } from './types/attrs'
 export type {
   Extension,
   ExtensionTyping,
   ExtractCommandActions,
-  ExtractCommandAppliers,
   ExtractCommandCreators,
   ExtractCommands,
   ExtractMarkActions,
@@ -222,26 +99,11 @@ export type {
   ExtractTyping,
   PlainExtension,
   Union,
-  UnionExtension,
 } 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'
@@ -249,20 +111,12 @@ export type { SimplifyUnion } from './types/simplify-union'
 export { assert } from './utils/assert'
 export { canUseRegexLookbehind } from './utils/can-use-regex-lookbehind'
 export { clsx } from './utils/clsx'
-export { collectChildren } from './utils/collect-children'
-export {
-  collectNodes,
-  type NodeContent,
-} from './utils/collect-nodes'
 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 { getId as _getId } from './utils/get-id'
 export { getMarkType } from './utils/get-mark-type'
 export { getNodeType } from './utils/get-node-type'
 export { isAtBlockStart } from './utils/is-at-block-start'

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-command.ts

@@ -19,13 +19,6 @@ export interface CommandAction<Args extends any[] = any[]> {
    * can be executed, otherwise `false`.
    */
   canExec(...args: Args): boolean
-
-  /**
-   * An alias for `canExec`.
-   *
-   * @deprecated Use `canExec` instead.
-   */
-  canApply(...args: Args): boolean
 }
 
 export type CommandCreator<Args extends any[] = any[]> = (

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'
@@ -142,11 +132,6 @@ export type ExtractMarkActions<E extends Extension> = ToMarkAction<
   ExtractMarks<E>
 >
 
-/**
- * @deprecated Use `ExtractCommandActions` instead.
- */
-export type ExtractCommandAppliers<E extends Extension> = ExtractCommandActions<E>
-
 /**
  * @internal
  */
@@ -155,14 +140,3 @@ export type Union<E extends readonly Extension[]> = Extension<{
   Marks: ExtractMarks<E[number]>
   Commands: ExtractCommands<E[number]>
 }>
-
-/**
- * @deprecated Use `Union` instead.
- * @internal
- */
-export type UnionExtension<E extends Extension | readonly Extension[]> = E extends readonly Extension[] ? Extension<{
-    Nodes: ExtractNodes<E[number]>
-    Marks: ExtractMarks<E[number]>
-    Commands: ExtractCommands<E[number]>
-  }>
-  : E

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,12 +1,6 @@
-import {
-  expect,
-  test,
-} from 'vitest'
+import { expect, test } from 'vitest'
 
-import {
-  groupBy,
-  groupEntries,
-} from './array-grouping'
+import { groupEntries } from './array-grouping'
 
 test('groupEntries', () => {
   expect(
@@ -20,10 +14,3 @@ test('groupEntries', () => {
     b: [2],
   })
 })
-
-test('groupBy', () => {
-  expect(groupBy([1, 2, 3, 4, 5], (n) => n % 2)).toEqual({
-    0: [2, 4],
-    1: [1, 3, 5],
-  })
-})

package/src/utils/array-grouping.ts

@@ -1,17 +1,4 @@
-import type { ObjectEntries } from '../types/object-entries'
-
-export function groupBy<K extends PropertyKey, T>(
-  items: Iterable<T>,
-  keySelector: (item: T) => K,
-): Partial<Record<K, T[]>> {
-  const result: Partial<Record<K, T[]>> = {}
-  for (const item of items) {
-    const key = keySelector(item)
-    const values = (result[key] ||= [])
-    values.push(item)
-  }
-  return result
-}
+import type { ObjectEntries } from '@ocavue/utils'
 
 export function groupEntries<T extends Record<string, any>>(
   entries: ObjectEntries<T>[],

package/src/utils/array.ts

@@ -15,7 +15,3 @@ export function uniqPush<T>(prev: readonly T[], next: readonly T[]): T[] {
 export function arraySubtract<T>(a: T[], b: T[]): T[] {
   return a.filter((x) => !b.includes(x))
 }
-
-export function toReversed<T>(arr: T[]): T[] {
-  return arr.toReversed?.() ?? [...arr].reverse()
-}

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/combine-event-handlers.ts

@@ -1,5 +1,3 @@
-import { toReversed } from './array'
-
 export function combineEventHandlers<
   Handler extends (...args: any[]) => boolean | void,
   Args extends Parameters<Handler> = Parameters<Handler>,
@@ -10,13 +8,13 @@ export function combineEventHandlers<
   let handlers: Handler[] = []
 
   function setHandlers(eventHandlers: Handler[]): void {
-    // The handlers at the end have a higher priority.
-    handlers = toReversed(eventHandlers)
+    handlers = eventHandlers
   }
 
   function combinedEventHandler(...args: Args): boolean {
-    for (const handler of handlers) {
-      if (handler(...args)) {
+    // The handlers at the end have a higher priority.
+    for (let i = handlers.length - 1; i >= 0; i--) {
+      if (handlers[i](...args)) {
         return true
       }
     }