@prosekit/core 0.8.7 → 0.10.0

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,28 +1,16 @@
 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,
-  content: NodeJSON | string | HTMLElement,
+  content: NodeJSON | string | Element,
 ): NodeJSON {
   if (typeof content === 'string') {
     return jsonFromHTML(content, { schema })
@@ -35,7 +23,7 @@ export function getEditorContentJSON(
 
 function getEditorContentNode(
   schema: Schema,
-  content: NodeJSON | string | HTMLElement | ProseMirrorNode,
+  content: NodeJSON | string | Element | ProseMirrorNode,
 ): ProseMirrorNode {
   if (isProseMirrorNode(content)) {
     return content
@@ -45,7 +33,7 @@ function getEditorContentNode(
 
 export function getEditorContentDoc(
   schema: Schema,
-  content: NodeJSON | string | HTMLElement | ProseMirrorNode,
+  content: NodeJSON | string | Element | ProseMirrorNode,
 ): ProseMirrorNode {
   const doc = getEditorContentNode(schema, content)
   assert(

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'
 

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

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

package/src/utils/get-node-types.ts

@@ -1,7 +1,4 @@
-import type {
-  NodeType,
-  Schema,
-} from '@prosekit/pm/model'
+import type { NodeType, Schema } from '@prosekit/pm/model'
 
 import { getNodeType } from './get-node-type'
 

package/src/utils/includes-mark.ts

@@ -1,8 +1,4 @@
-import type {
-  Attrs,
-  Mark,
-  MarkType,
-} from '@prosekit/pm/model'
+import type { Attrs, Mark, MarkType } from '@prosekit/pm/model'
 
 import { isSubset } from './is-subset'
 

package/src/utils/is-at-block-start.ts

@@ -1,8 +1,5 @@
 import type { ResolvedPos } from '@prosekit/pm/model'
-import type {
-  EditorState,
-  TextSelection,
-} from '@prosekit/pm/state'
+import type { EditorState, TextSelection } from '@prosekit/pm/state'
 import type { EditorView } from '@prosekit/pm/view'
 
 /**

package/src/utils/is-mark-absent.spec.ts

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

package/src/utils/is-mark-absent.ts

@@ -1,8 +1,4 @@
-import type {
-  Attrs,
-  MarkType,
-  ProseMirrorNode,
-} from '@prosekit/pm/model'
+import type { Attrs, MarkType, ProseMirrorNode } from '@prosekit/pm/model'
 
 import { includesMark } from './includes-mark'
 

package/src/utils/is-mark-active.ts

@@ -1,7 +1,4 @@
-import type {
-  Attrs,
-  MarkType,
-} from '@prosekit/pm/model'
+import type { Attrs, MarkType } from '@prosekit/pm/model'
 import type { EditorState } from '@prosekit/pm/state'
 
 import { getMarkType } from './get-mark-type'

package/src/utils/is-node-active.spec.ts

@@ -0,0 +1,109 @@
+import { NodeSelection } from '@prosekit/pm/state'
+import { describe, expect, it } from 'vitest'
+
+import { setupTest } from '../testing'
+
+import { isNodeActive } from './is-node-active'
+
+describe('isNodeActive', () => {
+  it('should return true when cursor is in a node of the specified type', () => {
+    const { editor, n } = setupTest()
+    editor.set(n.doc(n.p('Hello <a>world')))
+
+    expect(isNodeActive(editor.state, 'paragraph')).toBe(true)
+  })
+
+  it('should return false when cursor is not in a node of the specified type', () => {
+    const { editor, n } = setupTest()
+    editor.set(n.doc(n.p('Hello <a>world')))
+
+    expect(isNodeActive(editor.state, 'codeBlock')).toBe(false)
+  })
+
+  it('should return true when cursor is in a nested node of the specified type', () => {
+    const { editor, n } = setupTest()
+    editor.set(n.doc(n.blockquote(n.p('Hello <a>world'))))
+
+    expect(isNodeActive(editor.state, 'blockquote')).toBe(true)
+  })
+
+  it('should return true when cursor is in a node with matching attributes', () => {
+    const { editor, n } = setupTest()
+    editor.set(n.doc(n.codeBlock({ language: 'typescript' }, '<a>code')))
+
+    expect(isNodeActive(editor.state, 'codeBlock', { language: 'typescript' })).toBe(true)
+  })
+
+  it('should return false when cursor is in a node with non-matching attributes', () => {
+    const { editor, n } = setupTest()
+    editor.set(n.doc(n.codeBlock({ language: 'typescript' }, '<a>code')))
+
+    expect(isNodeActive(editor.state, 'codeBlock', { language: 'javascript' })).toBe(false)
+  })
+
+  it('should return true when using NodeSelection with matching type', () => {
+    const { editor, n } = setupTest()
+    editor.set(n.doc(n.p('Hello world')))
+
+    const $pos = editor.state.doc.resolve(0)
+    const state = editor.state.apply(
+      editor.state.tr.setSelection(NodeSelection.create(editor.state.doc, $pos.pos)),
+    )
+
+    expect(isNodeActive(state, 'paragraph')).toBe(true)
+  })
+
+  it('should return true when using NodeSelection with matching type and attributes', () => {
+    const { editor, n } = setupTest()
+    editor.set(n.doc(n.codeBlock({ language: 'python' }, 'code')))
+
+    const $pos = editor.state.doc.resolve(0)
+    const state = editor.state.apply(
+      editor.state.tr.setSelection(NodeSelection.create(editor.state.doc, $pos.pos)),
+    )
+
+    expect(isNodeActive(state, 'codeBlock', { language: 'python' })).toBe(true)
+  })
+
+  it('should return false when using NodeSelection with non-matching attributes', () => {
+    const { editor, n } = setupTest()
+    editor.set(n.doc(n.codeBlock({ language: 'python' }, 'code')))
+
+    const $pos = editor.state.doc.resolve(0)
+    const state = editor.state.apply(
+      editor.state.tr.setSelection(NodeSelection.create(editor.state.doc, $pos.pos)),
+    )
+
+    expect(isNodeActive(state, 'codeBlock', { language: 'javascript' })).toBe(false)
+  })
+
+  it('should work with NodeType instead of string', () => {
+    const { editor, n } = setupTest()
+    editor.set(n.doc(n.p('Hello <a>world')))
+
+    expect(isNodeActive(editor.state, editor.state.schema.nodes.paragraph)).toBe(true)
+  })
+
+  it('should return true when node is at any depth in the hierarchy', () => {
+    const { editor, n } = setupTest()
+    editor.set(n.doc(n.blockquote(n.p('Hello <a>world'))))
+
+    expect(isNodeActive(editor.state, 'paragraph')).toBe(true)
+    expect(isNodeActive(editor.state, 'blockquote')).toBe(true)
+    expect(isNodeActive(editor.state, 'doc')).toBe(true)
+  })
+
+  it('should return true when attributes is null', () => {
+    const { editor, n } = setupTest()
+    editor.set(n.doc(n.codeBlock({ language: 'typescript' }, '<a>code')))
+
+    expect(isNodeActive(editor.state, 'codeBlock', null)).toBe(true)
+  })
+
+  it('should match partial attributes', () => {
+    const { editor, n } = setupTest()
+    editor.set(n.doc(n.codeBlock({ language: 'typescript', lineNumbers: true }, '<a>code')))
+
+    expect(isNodeActive(editor.state, 'codeBlock', { language: 'typescript' })).toBe(true)
+  })
+})

package/src/utils/is-node-active.ts

@@ -1,25 +1,34 @@
-import type {
-  Attrs,
-  NodeType,
-} from '@prosekit/pm/model'
+import type { Attrs, NodeType, ProseMirrorNode } from '@prosekit/pm/model'
 import type { EditorState } from '@prosekit/pm/state'
 
 import { attrsMatch } from './attrs-match'
 import { getNodeType } from './get-node-type'
+import { isNodeSelection } from './type-assertion'
 
+/**
+ * @internal
+ */
 export function isNodeActive(
   state: EditorState,
   type: string | NodeType,
   attrs?: Attrs | null,
 ): boolean {
-  const $pos = state.selection.$from
-  const nodeType = getNodeType(state.schema, type)
+  const { selection, schema } = state
+  const $pos = selection.$from
+  const nodeType = getNodeType(schema, type)
+
+  if (isNodeSelection(selection) && checkNode(selection.node, nodeType, attrs)) {
+    return true
+  }
 
   for (let depth = $pos.depth; depth >= 0; depth--) {
-    const node = $pos.node(depth)
-    if (node.type === nodeType && (!attrs || attrsMatch(node, attrs))) {
+    if (checkNode($pos.node(depth), nodeType, attrs)) {
       return true
     }
   }
   return false
 }
+
+function checkNode(node: ProseMirrorNode, nodeType: NodeType, attrs?: Attrs | null): boolean {
+  return node.type === nodeType && (!attrs || attrsMatch(node, attrs))
+}

package/src/utils/is-subset.spec.ts

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

package/src/utils/maybe-run.spec.ts

@@ -1,8 +1,4 @@
-import {
-  expect,
-  test,
-  vi,
-} from 'vitest'
+import { expect, test, vi } from 'vitest'
 
 import { maybeRun } from './maybe-run'
 

package/src/utils/merge-objects.spec.ts

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

package/src/utils/merge-objects.ts

@@ -1,5 +1,6 @@
+import { isNotNullish } from '@ocavue/utils'
+
 import { removeUndefinedValues } from './remove-undefined-values'
-import { isNotNullish } from './type-assertion'
 
 export function mergeObjects<T extends object>(
   ...objects: Array<Partial<T> | null | undefined>

package/src/utils/merge-specs.ts

@@ -1,7 +1,4 @@
-import type {
-  MarkSpec,
-  NodeSpec,
-} from '@prosekit/pm/model'
+import type { MarkSpec, NodeSpec } from '@prosekit/pm/model'
 
 import { mergeObjects } from './merge-objects'
 

package/src/utils/object-equal.spec.ts

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

package/src/utils/output-spec.test.ts

@@ -1,9 +1,5 @@
 import type { DOMOutputSpec } from '@prosekit/pm/model'
-import {
-  describe,
-  expect,
-  it,
-} from 'vitest'
+import { describe, expect, it } from 'vitest'
 
 import { insertOutputSpecAttrs } from './output-spec'
 

package/src/utils/output-spec.ts

@@ -1,12 +1,5 @@
-import { isElementLike } from '@ocavue/utils'
-import type {
-  DOMOutputSpec,
-  Mark,
-  ProseMirrorNode,
-  TagParseRule,
-} from '@prosekit/pm/model'
-
-import { isNotNullish } from './type-assertion'
+import { isElementLike, isNotNullish } from '@ocavue/utils'
+import type { DOMOutputSpec, Mark, ParseRule, ProseMirrorNode, TagParseRule } from '@prosekit/pm/model'
 
 interface AttrOptions {
   attr: string
@@ -59,6 +52,16 @@ export function wrapTagParseRuleAttrs(
   }
 }
 
+export function wrapParseRuleAttrs(
+  rule: ParseRule,
+  attrs: AttrOptions[],
+): ParseRule {
+  if (rule.tag) {
+    return wrapTagParseRuleAttrs(rule, attrs)
+  }
+  return rule
+}
+
 export function insertOutputSpecAttrs(
   dom: DOMOutputSpec,
   attrs: Array<[key: string, value: string]>,

package/src/utils/parse.spec.ts

@@ -1,18 +1,9 @@
-import {
-  describe,
-  expect,
-  test,
-} from 'vitest'
+import { describe, expect, test } from 'vitest'
 
 import { createEditor } from '../editor/editor'
 import { defineTestExtension } from '../testing'
 
-import {
-  elementFromHTML,
-  htmlFromNode,
-  nodeFromElement,
-  nodeFromHTML,
-} from './parse'
+import { elementFromHTML, htmlFromNode, nodeFromElement, nodeFromHTML } from './parse'
 
 describe('parse', () => {
   const extension = defineTestExtension()

package/src/utils/parse.ts

@@ -1,22 +1,10 @@
-import {
-  DOMParser,
-  DOMSerializer,
-  type ParseOptions,
-  type ProseMirrorNode,
-  type Schema,
-} from '@prosekit/pm/model'
+import { DOMParser, DOMSerializer, type ParseOptions, type ProseMirrorNode, type Schema } from '@prosekit/pm/model'
 import { EditorState } from '@prosekit/pm/state'
 
 import type { DOMNode } from '../types/dom-node'
-import type {
-  NodeJSON,
-  StateJSON,
-} from '../types/model'
+import type { NodeJSON, StateJSON } from '../types/model'
 
-import {
-  getBrowserDocument,
-  getBrowserWindow,
-} from './get-dom-api'
+import { getBrowserDocument, getBrowserWindow } from './get-dom-api'
 
 /** @public */
 export interface DOMParserOptions extends ParseOptions {
@@ -123,7 +111,7 @@ export function nodeFromJSON(
 /////////////// Node <=> Element ///////////////
 
 /**
- * Parse a HTML element to a ProseMirror node.
+ * Parse a DOM node to a ProseMirror node.
  *
  * @public
  *
@@ -145,7 +133,7 @@ export function nodeFromElement(
 }
 
 /**
- * Serialize a ProseMirror node to a HTML element.
+ * Serialize a ProseMirror node to an HTML element.
  *
  * @public
  *
@@ -179,7 +167,7 @@ export function elementFromNode(
 /////////////// Element <=> HTML ///////////////
 
 /**
- * Parse a HTML string to a HTML element.
+ * Parse an HTML string to an HTML element.
  *
  * @internal
  */
@@ -203,7 +191,7 @@ function htmlFromElement(element: HTMLElement): string {
 /////////////// Node <=> HTML ///////////////
 
 /**
- * Parse a HTML string to a ProseMirror node.
+ * Parse an HTML string to a ProseMirror node.
  *
  * @public
  *
@@ -222,7 +210,7 @@ export function nodeFromHTML(
 }
 
 /**
- * Serialize a ProseMirror node to a HTML string
+ * Serialize a ProseMirror node to an HTML string
  *
  * @public
  *
@@ -243,7 +231,7 @@ export function htmlFromNode(
 /////////////// JSON <=> Element ///////////////
 
 /**
- * Serialize a HTML element to a ProseMirror document JSON object.
+ * Serialize an HTML element to a ProseMirror document JSON object.
  *
  * @public
  *
@@ -262,7 +250,7 @@ export function jsonFromElement(
 }
 
 /**
- * Parse a ProseMirror document JSON object to a HTML element.
+ * Parse a ProseMirror document JSON object to an HTML element.
  *
  * @public
  *
@@ -283,7 +271,7 @@ export function elementFromJSON(
 /////////////// JSON <=> HTML ///////////////
 
 /**
- * Parse a HTML string to a ProseMirror document JSON object.
+ * Parse an HTML string to a ProseMirror document JSON object.
  *
  * @public
  *
@@ -302,7 +290,7 @@ export function jsonFromHTML(
 }
 
 /**
- * Parse a ProseMirror document JSON object to a HTML string.
+ * Parse a ProseMirror document JSON object to an HTML string.
  *
  * @public
  *