@prosekit/core 0.9.0 → 0.11.0

package/src/extensions/plugin.spec.ts

@@ -1,25 +1,12 @@
-import {
-  Plugin,
-  PluginKey,
-} from '@prosekit/pm/state'
-import {
-  describe,
-  expect,
-  it,
-  vi,
-} from 'vitest'
-
-import { union } from '../editor/union'
-import { withPriority } from '../editor/with-priority'
-import {
-  defineDoc,
-  defineParagraph,
-  defineText,
-  setupTestFromExtension,
-} from '../testing'
-import { Priority } from '../types/priority'
-
-import { definePlugin } from './plugin'
+import { Plugin, PluginKey } from '@prosekit/pm/state'
+import { describe, expect, it, vi } from 'vitest'
+
+import { union } from '../editor/union.ts'
+import { withPriority } from '../editor/with-priority.ts'
+import { defineDoc, defineParagraph, defineText, setupTestFromExtension } from '../testing/index.ts'
+import { Priority } from '../types/priority.ts'
+
+import { definePlugin } from './plugin.ts'
 
 describe('plugin', () => {
   it('maintains plugin order in state based on priority', () => {

package/src/extensions/plugin.ts

@@ -1,20 +1,11 @@
 import type { Schema } from '@prosekit/pm/model'
-import {
-  Plugin,
-  type ProseMirrorPlugin,
-} from '@prosekit/pm/state'
+import { Plugin, type ProseMirrorPlugin } from '@prosekit/pm/state'
 
-import { ProseKitError } from '../error'
-import {
-  defineFacet,
-  type Facet,
-} from '../facets/facet'
-import { defineFacetPayload } from '../facets/facet-extension'
-import {
-  stateFacet,
-  type StatePayload,
-} from '../facets/state'
-import type { PlainExtension } from '../types/extension'
+import { ProseKitError } from '../error.ts'
+import { defineFacetPayload } from '../facets/facet-extension.ts'
+import { defineFacet, type Facet } from '../facets/facet.ts'
+import { stateFacet, type StatePayload } from '../facets/state.ts'
+import type { PlainExtension } from '../types/extension.ts'
 
 /**
  * Adds a ProseMirror plugin to the editor.

package/src/facets/base-extension.ts

@@ -1,15 +1,12 @@
 import type { Schema } from '@prosekit/pm/model'
 
-import type {
-  Extension,
-  ExtensionTyping,
-} from '../types/extension'
-import { Priority } from '../types/priority'
+import type { Extension, ExtensionTyping } from '../types/extension.ts'
+import type { Priority } from '../types/priority.ts'
 
-import type { Facet } from './facet'
-import type { FacetNode } from './facet-node'
-import type { Tuple5 } from './facet-types'
-import { schemaFacet } from './schema'
+import type { FacetNode } from './facet-node.ts'
+import type { Tuple5 } from './facet-types.ts'
+import type { Facet } from './facet.ts'
+import { schemaFacet } from './schema.ts'
 
 /**
  * @internal
@@ -30,7 +27,7 @@ export abstract class BaseExtension<T extends ExtensionTyping = ExtensionTyping>
    * @internal
    */
   getTree(priority?: Priority): FacetNode {
-    const pri = priority ?? this.priority ?? Priority.default
+    const pri = priority ?? this.priority ?? (2 satisfies typeof Priority.default)
     return (this.trees[pri] ||= this.createTree(pri))
   }
 

package/src/facets/command.ts

@@ -1,13 +1,7 @@
-import type { CommandCreators } from '../types/extension-command'
+import type { CommandCreators } from '../types/extension-command.ts'
 
-import {
-  defineFacet,
-  type Facet,
-} from './facet'
-import {
-  rootFacet,
-  type RootPayload,
-} from './root'
+import { defineFacet, type Facet } from './facet.ts'
+import { rootFacet, type RootPayload } from './root.ts'
 
 type CommandPayload = CommandCreators
 

package/src/facets/facet-extension.spec.ts

@@ -1,24 +1,13 @@
-import {
-  describe,
-  expect,
-  it,
-  vi,
-} from 'vitest'
-
-import { Priority } from '../types/priority'
-import { isNotNullish } from '../utils/type-assertion'
-
-import {
-  defineFacet,
-  Facet,
-} from './facet'
-import { FacetExtensionImpl } from './facet-extension'
-import {
-  subtractFacetNode,
-  unionFacetNode,
-} from './facet-node'
-import type { FacetReducer } from './facet-types'
-import { UnionExtensionImpl } from './union-extension'
+import { isNotNullish } from '@ocavue/utils'
+import { describe, expect, it, vi } from 'vitest'
+
+import { Priority } from '../types/priority.ts'
+
+import { FacetExtensionImpl } from './facet-extension.ts'
+import { subtractFacetNode, unionFacetNode } from './facet-node.ts'
+import type { FacetReducer } from './facet-types.ts'
+import { defineFacet, Facet } from './facet.ts'
+import { UnionExtensionImpl } from './union-extension.ts'
 
 describe('facet extension', () => {
   type FooHandler = (foo: string) => void

package/src/facets/facet-extension.ts

@@ -1,25 +1,29 @@
-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 { BaseExtension } from './base-extension'
-import type { Facet } from './facet'
-import { FacetNode } from './facet-node'
-import type { Tuple5 } from './facet-types'
+import { BaseExtension } from './base-extension.ts'
+import { FacetNode } from './facet-node.ts'
+import type { Tuple5 } from './facet-types.ts'
+import type { Facet } from './facet.ts'
 
 /**
  * @internal
  */
 export class FacetExtensionImpl<Input, Output> extends BaseExtension {
   declare extension: Extension
+  readonly facet: Facet<Input, Output>
+  readonly payloads: Input[]
 
   /**
    * @internal
    */
   constructor(
-    readonly facet: Facet<Input, Output>,
-    readonly payloads: Input[],
+    facet: Facet<Input, Output>,
+    payloads: Input[],
   ) {
     super()
+    this.facet = facet
+    this.payloads = payloads
   }
 
   /**

package/src/facets/facet-node.spec.ts

@@ -1,16 +1,9 @@
-import {
-  expect,
-  test,
-} from 'vitest'
+import { expect, test } from 'vitest'
 
-import { Priority } from '../types/priority'
+import { Priority } from '../types/priority.ts'
 
-import { Facet } from './facet'
-import {
-  FacetNode,
-  subtractFacetNode,
-  unionFacetNode,
-} from './facet-node'
+import { FacetNode, subtractFacetNode, unionFacetNode } from './facet-node.ts'
+import { Facet } from './facet.ts'
 
 const sum = (input: number[]) => input.reduce((acc, cur) => acc + cur, 0)
 

package/src/facets/facet-node.ts

@@ -1,17 +1,12 @@
-import { Priority } from '../types/priority'
-import {
-  arraySubtract,
-  uniqPush,
-} from '../utils/array'
-import { assert } from '../utils/assert'
-import { isNotNullish } from '../utils/type-assertion'
-
-import type { Facet } from './facet'
-import type {
-  FacetReducer,
-  Tuple5,
-} from './facet-types'
-import type { RootOutput } from './root'
+import { isNotNullish } from '@ocavue/utils'
+
+import type { Priority } from '../types/priority.ts'
+import { arraySubtract, uniqPush } from '../utils/array.ts'
+import { assert } from '../utils/assert.ts'
+
+import type { FacetReducer, Tuple5 } from './facet-types.ts'
+import type { Facet } from './facet.ts'
+import type { RootOutput } from './root.ts'
 
 function zip5<T>(
   a: Tuple5<T>,
@@ -109,18 +104,28 @@ export function subtractFacetNode<I, O>(
 export class FacetNode<I = any, O = any> {
   output: Tuple5<O | null> | null = null
 
+  readonly facet: Facet<I, O>
+  readonly inputs: Tuple5<I[] | null>
+  readonly children: Map<number, FacetNode>
+  readonly reducers: Tuple5<FacetReducer<I, O> | null>
+
   constructor(
-    readonly facet: Facet<I, O>,
-    readonly inputs: Tuple5<I[] | null> = [null, null, null, null, null],
-    readonly children: Map<number, FacetNode> = new Map(),
-    readonly reducers: Tuple5<FacetReducer<I, O> | null> = [
+    facet: Facet<I, O>,
+    inputs: Tuple5<I[] | null> = [null, null, null, null, null],
+    children: Map<number, FacetNode> = new Map<number, FacetNode>(),
+    reducers: Tuple5<FacetReducer<I, O> | null> = [
       null,
       null,
       null,
       null,
       null,
     ],
-  ) {}
+  ) {
+    this.facet = facet
+    this.inputs = inputs
+    this.children = children
+    this.reducers = reducers
+  }
 
   private calcOutput(): Tuple5<O | null> {
     const inputs: Tuple5<I[] | null> = [null, null, null, null, null]
@@ -144,9 +149,9 @@ export class FacetNode<I = any, O = any> {
     }
 
     if (this.facet.singleton) {
-      const reducer = (this.reducers[Priority.default] ||= this.facet.reducer)
+      const reducer = (this.reducers[2 satisfies typeof Priority.default] ||= this.facet.reducer)
       const input: I[] = inputs.filter(isNotNullish).flat()
-      output[Priority.default] = reducer(input)
+      output[2 satisfies typeof Priority.default] = reducer(input)
     } else {
       for (let pri = 0; pri < 5; pri++) {
         const input = inputs[pri]
@@ -169,7 +174,7 @@ export class FacetNode<I = any, O = any> {
 
   getSingletonOutput(): O | null {
     assert(this.facet.singleton)
-    return this.getOutput()[Priority.default]
+    return this.getOutput()[2 satisfies typeof Priority.default]
   }
 
   getRootOutput(): RootOutput {

package/src/facets/facet.spec.ts

@@ -1,9 +1,6 @@
-import {
-  expect,
-  test,
-} from 'vitest'
+import { expect, test } from 'vitest'
 
-import { Facet } from './facet'
+import { Facet } from './facet.ts'
 
 type RootInput = {
   count: number

package/src/facets/facet.ts

@@ -1,6 +1,6 @@
-import { assert } from '../utils/assert'
+import { ProseKitError } from '../error.ts'
 
-import type { FacetReducer } from './facet-types'
+import type { FacetReducer } from './facet-types.ts'
 
 let facetCount = 0
 
@@ -27,17 +27,24 @@ export class Facet<Input, Output> {
    */
   readonly path: number[]
 
+  private reduce: () => FacetReducer<Input, Output>
+
   /**
    * @internal
    */
   constructor(
     parent: Facet<Output, any> | null,
     singleton: boolean,
-    private _reducer?: FacetReducer<Input, Output> | undefined,
-    private _reduce?: () => FacetReducer<Input, Output>,
+    reducer?: FacetReducer<Input, Output>,
+    reduce?: () => FacetReducer<Input, Output>,
   ) {
-    // Only one of _reducer or _reduce can be defined
-    assert((_reduce || _reducer) && !(_reduce && _reducer))
+    if (reduce && !reducer) {
+      this.reduce = reduce
+    } else if (reducer && !reduce) {
+      this.reduce = () => reducer
+    } else {
+      throw new ProseKitError('Incorrect reducer')
+    }
 
     this.parent = parent
     this.singleton = singleton
@@ -45,7 +52,7 @@ export class Facet<Input, Output> {
   }
 
   get reducer(): FacetReducer<Input, Output> {
-    return (this._reducer ?? this._reduce?.())!
+    return this.reduce()
   }
 }
 

package/src/facets/root.ts

@@ -2,9 +2,9 @@ import type { Schema } from '@prosekit/pm/model'
 import type { EditorStateConfig } from '@prosekit/pm/state'
 import type { DirectEditorProps } from '@prosekit/pm/view'
 
-import type { CommandCreators } from '../types/extension-command'
+import type { CommandCreators } from '../types/extension-command.ts'
 
-import { Facet } from './facet'
+import { Facet } from './facet.ts'
 
 export type RootPayload = {
   schema?: Schema | null

package/src/facets/schema-spec.ts

@@ -1,15 +1,8 @@
-import type {
-  MarkSpec,
-  NodeSpec,
-  SchemaSpec,
-} from '@prosekit/pm/model'
+import type { MarkSpec, NodeSpec, SchemaSpec } from '@prosekit/pm/model'
 import OrderedMap from 'orderedmap'
 
-import {
-  defineFacet,
-  type Facet,
-} from './facet'
-import { schemaFacet } from './schema'
+import { defineFacet, type Facet } from './facet.ts'
+import { schemaFacet } from './schema.ts'
 
 export const schemaSpecFacet: Facet<SchemaSpec, SchemaSpec> = defineFacet({
   reducer: (specs): SchemaSpec => {

package/src/facets/schema.ts

@@ -1,18 +1,9 @@
-import {
-  Schema,
-  type SchemaSpec,
-} from '@prosekit/pm/model'
+import { Schema, type SchemaSpec } from '@prosekit/pm/model'
 
-import { assert } from '../utils/assert'
+import { assert } from '../utils/assert.ts'
 
-import {
-  defineFacet,
-  type Facet,
-} from './facet'
-import {
-  rootFacet,
-  type RootPayload,
-} from './root'
+import { defineFacet, type Facet } from './facet.ts'
+import { rootFacet, type RootPayload } from './root.ts'
 
 export const schemaFacet: Facet<SchemaSpec, RootPayload> = defineFacet({
   reducer: (specs) => {

package/src/facets/state.spec.ts

@@ -1,18 +1,11 @@
-import {
-  describe,
-  expect,
-  it,
-} from 'vitest'
-
-import { union } from '../editor/union'
-import { withPriority } from '../editor/with-priority'
-import { defineDefaultState } from '../extensions/default-state'
-import {
-  defineTestExtension,
-  setupTestFromExtension,
-} from '../testing'
-import type { NodeJSON } from '../types/model'
-import { Priority } from '../types/priority'
+import { describe, expect, it } from 'vitest'
+
+import { union } from '../editor/union.ts'
+import { withPriority } from '../editor/with-priority.ts'
+import { defineDefaultState } from '../extensions/default-state.ts'
+import { defineTestExtension, setupTestFromExtension } from '../testing/index.ts'
+import type { NodeJSON } from '../types/model.ts'
+import { Priority } from '../types/priority.ts'
 
 describe('state', () => {
   it('uses doc from extension with highest priority', () => {

package/src/facets/state.ts

@@ -1,24 +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 { assert } from '../utils/assert'
+import { assert } from '../utils/assert.ts'
 
-import {
-  defineFacet,
-  type Facet,
-} from './facet'
-import {
-  rootFacet,
-  type RootPayload,
-} from './root'
+import { defineFacet, type Facet } from './facet.ts'
+import { rootFacet, type RootPayload } from './root.ts'
 
 export type StatePayload = (ctx: { schema: Schema }) => EditorStateConfig
 

package/src/facets/union-extension.ts

@@ -1,22 +1,19 @@
-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 type { Extension, ExtensionTyping } from '../types/extension.ts'
+import type { Priority } from '../types/priority.ts'
+import { assert } from '../utils/assert.ts'
+
+import { BaseExtension } from './base-extension.ts'
+import { unionFacetNode, type FacetNode } from './facet-node.ts'
 
 export class UnionExtensionImpl<T extends ExtensionTyping = ExtensionTyping> extends BaseExtension<T> implements Extension<T> {
+  readonly extension: BaseExtension[]
+
   /**
    * @internal
    */
-  constructor(public extension: BaseExtension[] = []) {
+  constructor(extension: BaseExtension[] = []) {
     super()
+    this.extension = extension
   }
 
   /**