@prosekit/core 0.0.0-next-20240715071354 → 0.0.0-next-20240724155246

package/dist/{chunk-UDQXAK7F.js → chunk-MOSGJZHV.js}

@@ -512,15 +512,36 @@ function defineDefaultState({
   ]);
 }
 
+// src/utils/is-subset.ts
+function isSubset(subset, superset) {
+  return Object.keys(subset).every((key) => subset[key] === superset[key]);
+}
+
+// src/utils/includes-mark.ts
+function includesMark(marks, markType, attrs) {
+  attrs = attrs || {};
+  return marks.some((mark) => {
+    return mark.type === markType && isSubset(attrs, mark.attrs);
+  });
+}
+
 // src/utils/is-mark-absent.ts
 function isMarkAbsent(node, from, to, markType, attrs) {
-  const mark = attrs ? markType.create(attrs) : markType;
   let missing = false;
+  let available = false;
   node.nodesBetween(from, to, (node2, pos, parent) => {
-    if (missing) return false;
-    missing = !mark.isInSet(node2.marks) && !!parent && parent.type.allowsMarkType(markType);
+    if (missing) {
+      return false;
+    }
+    const allowed = (parent == null ? void 0 : parent.type.allowsMarkType(markType)) && !node2.marks.some((m) => m.type !== markType && m.type.excludes(markType));
+    if (allowed) {
+      available = true;
+      if (!includesMark(node2.marks, markType, attrs)) {
+        missing = true;
+      }
+    }
   });
-  return missing;
+  return available ? missing : true;
 }
 
 // src/utils/is-mark-active.ts
@@ -528,8 +549,8 @@ function isMarkActive(state, type, attrs) {
   const { from, $from, to, empty } = state.selection;
   const markType = getMarkType(state.schema, type);
   if (empty) {
-    const mark = attrs ? markType.create(attrs) : markType;
-    return !!mark.isInSet(state.storedMarks || $from.marks());
+    const marks = state.storedMarks || $from.marks();
+    return includesMark(marks, markType, attrs);
   } else {
     return !isMarkAbsent(state.doc, from, to, markType, attrs);
   }
@@ -589,12 +610,10 @@ var UnionExtensionImpl = class extends BaseExtension {
 };
 
 // src/editor/union.ts
-function union(extension) {
-  const array = Array.isArray(extension) ? extension : [extension];
-  assert(array.length > 0, "At least one extension is required");
-  return new UnionExtensionImpl(
-    array
-  );
+function union(...exts) {
+  const extensions = exts.flat();
+  assert(extensions.length > 0, "At least one extension is required");
+  return new UnionExtensionImpl(extensions);
 }
 
 // src/editor/editor.ts
@@ -625,7 +644,7 @@ function deepEquals(a, b) {
   return false;
 }
 
-// src/editor/builder.ts
+// src/editor/action.ts
 import "@prosekit/pm/model";
 
 // src/utils/attrs-match.ts
@@ -652,8 +671,8 @@ function isNodeActive(state, type, attrs) {
   return false;
 }
 
-// src/editor/builder.ts
-function createNodeBuilders(schema, getState, createNode = defaultCreateNode) {
+// src/editor/action.ts
+function createNodeActions(schema, getState, createNode = defaultCreateNode) {
   const builders = {};
   for (const type of Object.values(schema.nodes)) {
     const builder = (...args) => buildNode(type, args, createNode);
@@ -665,7 +684,7 @@ function createNodeBuilders(schema, getState, createNode = defaultCreateNode) {
   }
   return builders;
 }
-function createMarkBuilders(schema, getState, applyMark = defaultApplyMark) {
+function createMarkActions(schema, getState, applyMark = defaultApplyMark) {
   const builders = {};
   for (const type of Object.values(schema.marks)) {
     const builder = (...args) => buildMark(type, args, applyMark);
@@ -751,7 +770,7 @@ function createEditor(options) {
 var EditorInstance = class {
   constructor(extension) {
     this.view = null;
-    this.commandAppliers = {};
+    this.commands = {};
     this.getState = () => {
       var _a;
       return ((_a = this.view) == null ? void 0 : _a.state) || this.directEditorProps.state;
@@ -767,8 +786,8 @@ var EditorInstance = class {
         this.defineCommand(name, commandCreator);
       }
     }
-    this.nodeBuilders = createNodeBuilders(state.schema, this.getState);
-    this.markBuilders = createMarkBuilders(state.schema, this.getState);
+    this.nodes = createNodeActions(state.schema, this.getState);
+    this.marks = createMarkActions(state.schema, this.getState);
     this.schema = state.schema;
     this.directEditorProps = { state, ...payload.view };
   }
@@ -852,13 +871,13 @@ var EditorInstance = class {
     view.setProps({ state: newState });
   }
   defineCommand(name, commandCreator) {
-    const applier = (...args) => {
+    const action = (...args) => {
       const view = this.view;
       assert(view, `Cannot call command "${name}" before the editor is mounted`);
       const command = commandCreator(...args);
       return command(view.state, view.dispatch.bind(view), view);
     };
-    applier.canApply = (...args) => {
+    action.canApply = (...args) => {
       const view = this.view;
       if (!view) {
         return false;
@@ -866,10 +885,10 @@ var EditorInstance = class {
       const command = commandCreator(...args);
       return command(view.state, void 0, view);
     };
-    this.commandAppliers[name] = applier;
+    this.commands[name] = action;
   }
   removeCommand(name) {
-    delete this.commandAppliers[name];
+    delete this.commands[name];
   }
 };
 var Editor = class _Editor {
@@ -910,12 +929,6 @@ var Editor = class _Editor {
   get schema() {
     return this.instance.schema;
   }
-  /**
-   * All commands defined by the editor.
-   */
-  get commands() {
-    return this.instance.commandAppliers;
-  }
   /**
    * Whether the editor is focused.
    */
@@ -995,11 +1008,23 @@ var Editor = class _Editor {
   updateState(state) {
     this.instance.updateState(state);
   }
+  /**
+   * All {@link CommandAction}s defined by the editor.
+   */
+  get commands() {
+    return this.instance.commands;
+  }
+  /**
+   * All {@link NodeAction}s defined by the editor.
+   */
   get nodes() {
-    return this.instance.nodeBuilders;
+    return this.instance.nodes;
   }
+  /**
+   * All {@link MarkAction}s defined by the editor.
+   */
   get marks() {
-    return this.instance.markBuilders;
+    return this.instance.marks;
   }
 };
 
@@ -1037,8 +1062,8 @@ export {
   isTextSelection,
   isNodeSelection,
   isAllSelection,
-  createNodeBuilders,
-  createMarkBuilders,
+  createNodeActions,
+  createMarkActions,
   union,
   setupEditorExtension,
   createEditor,

package/dist/prosekit-core-test.js

@@ -2,10 +2,10 @@ import {
   Editor,
   EditorInstance,
   assert,
-  createMarkBuilders,
-  createNodeBuilders,
+  createMarkActions,
+  createNodeActions,
   setupEditorExtension
-} from "./chunk-UDQXAK7F.js";
+} from "./chunk-MOSGJZHV.js";
 
 // src/test/test-editor.ts
 import { EditorState, NodeSelection, TextSelection } from "@prosekit/pm/state";
@@ -82,16 +82,8 @@ function getSelection(doc) {
 var TestEditorInstance = class extends EditorInstance {
   constructor(extension) {
     super(extension);
-    this.nodeBuilders = createNodeBuilders(
-      this.schema,
-      this.getState,
-      createNodeForTest
-    );
-    this.markBuilders = createMarkBuilders(
-      this.schema,
-      this.getState,
-      applyMarkForTest
-    );
+    this.nodes = createNodeActions(this.schema, this.getState, createNodeForTest);
+    this.marks = createMarkActions(this.schema, this.getState, applyMarkForTest);
   }
 };
 var TestEditor = class extends Editor {

package/dist/prosekit-core.d.ts

@@ -22,8 +22,11 @@ export { unsetMark } from './_tsup-dts-rollup';
 export { UnsetMarkOptions } from './_tsup-dts-rollup';
 export { wrap } from './_tsup-dts-rollup';
 export { WrapOptions } from './_tsup-dts-rollup';
+export { MarkAction } from './_tsup-dts-rollup';
 export { MarkBuilder } from './_tsup-dts-rollup';
+export { NodeAction } from './_tsup-dts-rollup';
 export { NodeBuilder } from './_tsup-dts-rollup';
+export { NodeChild } from './_tsup-dts-rollup';
 export { Editor } from './_tsup-dts-rollup';
 export { createEditor } from './_tsup-dts-rollup';
 export { EditorOptions } from './_tsup-dts-rollup';
@@ -101,26 +104,39 @@ export { defineText } from './_tsup-dts-rollup';
 export { defineFacet } from './_tsup-dts-rollup';
 export { Facet } from './_tsup-dts-rollup';
 export { defineFacetPayload } from './_tsup-dts-rollup';
+export { AnyAttrs } from './_tsup-dts-rollup';
+export { AttrSpec } from './_tsup-dts-rollup';
 export { BaseNodeViewOptions } from './_tsup-dts-rollup';
-export { CommandTyping } from './_tsup-dts-rollup';
 export { Extension } from './_tsup-dts-rollup';
 export { ExtensionTyping } from './_tsup-dts-rollup';
+export { ExtractCommandActions } from './_tsup-dts-rollup';
 export { ExtractCommandAppliers } from './_tsup-dts-rollup';
 export { ExtractCommandCreators } from './_tsup-dts-rollup';
+export { ExtractMarkActions } from './_tsup-dts-rollup';
 export { ExtractMarks } from './_tsup-dts-rollup';
+export { ExtractNodeActions } from './_tsup-dts-rollup';
 export { ExtractNodes } from './_tsup-dts-rollup';
 export { UnionExtension } from './_tsup-dts-rollup';
+export { CommandAction } from './_tsup-dts-rollup';
+export { CommandTyping } from './_tsup-dts-rollup';
+export { MarkTyping } from './_tsup-dts-rollup';
+export { ToMarkAction } from './_tsup-dts-rollup';
+export { NodeTyping } from './_tsup-dts-rollup';
+export { ToNodeAction } from './_tsup-dts-rollup';
 export { NodeJSON } from './_tsup-dts-rollup';
 export { SelectionJSON } from './_tsup-dts-rollup';
 export { StateJSON } from './_tsup-dts-rollup';
 export { StepJSON } from './_tsup-dts-rollup';
+export { PickSubType } from './_tsup-dts-rollup';
 export { Priority } from './_tsup-dts-rollup';
+export { SimplifyDeeper } from './_tsup-dts-rollup';
 export { SimplifyUnion } from './_tsup-dts-rollup';
 export { assert } from './_tsup-dts-rollup';
 export { canUseRegexLookbehind } from './_tsup-dts-rollup';
 export { clsx } from './_tsup-dts-rollup';
 export { collectNodes } from './_tsup-dts-rollup';
 export { NodeContent } from './_tsup-dts-rollup';
+export { containsInlineNode } from './_tsup-dts-rollup';
 export { defaultBlockAt } from './_tsup-dts-rollup';
 export { isApple } from './_tsup-dts-rollup';
 export { _getId } from './_tsup-dts-rollup';

package/dist/prosekit-core.js

@@ -35,11 +35,10 @@ import {
   stateFromJSON,
   toReversed,
   union
-} from "./chunk-UDQXAK7F.js";
+} from "./chunk-MOSGJZHV.js";
 
 // src/commands/add-mark.ts
 import "@prosekit/pm/model";
-import "@prosekit/pm/state";
 function addMark(options) {
   return (state, dispatch) => {
     var _a, _b;
@@ -108,7 +107,6 @@ function expandMarkAfter($pos, predicate) {
 }
 
 // src/commands/insert-node.ts
-import "@prosekit/pm/state";
 import { insertPoint } from "@prosekit/pm/transform";
 
 // src/utils/set-selection-around.ts
@@ -143,7 +141,6 @@ function insertNode(options) {
 
 // src/commands/remove-mark.ts
 import "@prosekit/pm/model";
-import "@prosekit/pm/state";
 function removeMark(options) {
   return (state, dispatch) => {
     var _a, _b;
@@ -192,9 +189,6 @@ function removeNode(options) {
   };
 }
 
-// src/commands/set-block-type.ts
-import "@prosekit/pm/state";
-
 // src/utils/get-custom-selection.ts
 import { TextSelection as TextSelection3 } from "@prosekit/pm/state";
 function getCustomSelection(state, from, to) {
@@ -366,7 +360,6 @@ function toggleMark({ type, attrs }) {
 // src/commands/toggle-node.ts
 import { setBlockType as setBlockType2 } from "@prosekit/pm/commands";
 import "@prosekit/pm/model";
-import "@prosekit/pm/state";
 function toggleNode({ type, attrs }) {
   return (state, dispatch, view) => {
     if (isNodeActive(state, type, attrs)) {
@@ -426,7 +419,6 @@ function unsetTextBlockType(tr, from, to) {
 }
 
 // src/commands/unset-mark.ts
-import "@prosekit/pm/state";
 function unsetMark(options) {
   return (state, dispatch) => {
     var _a, _b;
@@ -440,7 +432,6 @@ function unsetMark(options) {
 
 // src/commands/wrap.ts
 import "@prosekit/pm/model";
-import "@prosekit/pm/state";
 import { findWrapping } from "@prosekit/pm/transform";
 function wrap({ nodeType, attrs }) {
   return (state, dispatch) => {
@@ -554,16 +545,16 @@ function defineNodeAttr(options) {
 }
 var nodeSpecFacet = defineFacet({
   reducer: (payloads) => {
-    let nodes = OrderedMap2.from({});
+    let specs = OrderedMap2.from({});
     let topNodeName = void 0;
     const specPayloads = payloads.map((input) => input[0]).filter(isNotNull);
     const attrPayloads = payloads.map((input) => input[1]).filter(isNotNull);
     for (const { name, topNode, ...spec } of specPayloads) {
-      assert(!nodes.get(name), `Node type ${name} can only be defined once`);
+      assert(!specs.get(name), `Node type ${name} can only be defined once`);
       if (topNode) {
         topNodeName = name;
       }
-      nodes = nodes.addToStart(name, spec);
+      specs = specs.addToStart(name, spec);
     }
     for (const {
       type,
@@ -573,7 +564,7 @@ var nodeSpecFacet = defineFacet({
       toDOM,
       parseDOM
     } of attrPayloads) {
-      const spec = nodes.get(type);
+      const spec = specs.get(type);
       assert(spec, `Node type ${type} must be defined`);
       if (!spec.attrs) {
         spec.attrs = {};
@@ -638,7 +629,7 @@ var nodeSpecFacet = defineFacet({
         }
       }
     }
-    return { nodes, topNode: topNodeName };
+    return { nodes: specs, topNode: topNodeName };
   },
   parent: schemaSpecFacet,
   singleton: true
@@ -1071,6 +1062,7 @@ function defineBaseKeymap(options) {
 }
 
 // src/extensions/mark-spec.ts
+import OrderedMap3 from "orderedmap";
 function defineMarkSpec(options) {
   const payload = [options, void 0];
   return defineFacetPayload(markSpecFacet, [payload]);
@@ -1081,14 +1073,12 @@ function defineMarkAttr(options) {
 }
 var markSpecFacet = defineFacet({
   reducer: (payloads) => {
-    const marks = {};
+    let specs = OrderedMap3.from({});
     const specPayloads = payloads.map((input) => input[0]).filter(isNotNull);
     const attrPayloads = payloads.map((input) => input[1]).filter(isNotNull);
     for (const { name, ...spec } of specPayloads) {
-      if (marks[name]) {
-        throw new ProseKitError(`Mark type ${name} has already been defined`);
-      }
-      marks[name] = spec;
+      assert(!specs.get(name), `Mark type ${name} can only be defined once`);
+      specs = specs.addToStart(name, spec);
     }
     for (const {
       type,
@@ -1097,12 +1087,8 @@ var markSpecFacet = defineFacet({
       toDOM,
       parseDOM
     } of attrPayloads) {
-      const spec = marks[type];
-      if (!spec) {
-        throw new ProseKitError(
-          `Mark type ${type} must be defined before defining attributes`
-        );
-      }
+      const spec = specs.get(type);
+      assert(spec, `Mark type ${type} must be defined`);
       if (!spec.attrs) {
         spec.attrs = {};
       }
@@ -1155,7 +1141,7 @@ var markSpecFacet = defineFacet({
         }
       }
     }
-    return { marks, nodes: {} };
+    return { marks: specs, nodes: {} };
   },
   parent: schemaSpecFacet,
   singleton: true
@@ -1163,7 +1149,6 @@ var markSpecFacet = defineFacet({
 
 // src/extensions/node-view.ts
 import { PluginKey as PluginKey5, ProseMirrorPlugin as ProseMirrorPlugin5 } from "@prosekit/pm/state";
-import "@prosekit/pm/view";
 function defineNodeView(options) {
   return defineFacetPayload(nodeViewFacet, [options]);
 }
@@ -1187,7 +1172,6 @@ var nodeViewFacet = defineFacet({
 
 // src/extensions/node-view-effect.ts
 import { PluginKey as PluginKey6, ProseMirrorPlugin as ProseMirrorPlugin6 } from "@prosekit/pm/state";
-import "@prosekit/pm/view";
 function defineNodeViewFactory(options) {
   const input = [options, null];
   return defineFacetPayload(nodeViewFactoryFacet, [input]);
@@ -1285,6 +1269,16 @@ function collectNodes(content) {
   throw new ProseKitError(`Invalid node content: ${typeof content}`);
 }
 
+// src/utils/contains-inline-node.ts
+function containsInlineNode(doc, from, to) {
+  let found = false;
+  doc.nodesBetween(from, to, (node) => {
+    if (found) return false;
+    if (node.isInline) found = true;
+  });
+  return found;
+}
+
 // src/utils/default-block-at.ts
 function defaultBlockAt(match) {
   for (let i = 0; i < match.edgeCount; i++) {
@@ -1346,6 +1340,7 @@ export {
   canUseRegexLookbehind,
   clsx,
   collectNodes,
+  containsInlineNode,
   createEditor,
   defaultBlockAt,
   defineBaseCommands,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@prosekit/core",
   "type": "module",
-  "version": "0.0.0-next-20240715071354",
+  "version": "0.0.0-next-20240724155246",
   "private": false,
   "author": {
     "name": "ocavue",
@@ -43,13 +43,13 @@
     "clsx": "^2.1.1",
     "orderedmap": "^2.1.1",
     "prosemirror-splittable": "^0.1.1",
-    "type-fest": "^4.21.0",
-    "@prosekit/pm": "^0.0.0-next-20240715071354"
+    "type-fest": "^4.23.0",
+    "@prosekit/pm": "^0.0.0-next-20240724155246"
   },
   "devDependencies": {
-    "tsup": "^8.1.0",
+    "tsup": "^8.2.2",
     "typescript": "^5.5.3",
-    "vitest": "^2.0.2",
+    "vitest": "^2.0.4",
     "@prosekit/dev": "0.0.0"
   },
   "scripts": {