@prosekit/core 0.2.7 → 0.3.0

package/dist/_tsup-dts-rollup.d.ts

@@ -9,7 +9,6 @@ import { EditorState } from '@prosekit/pm/state';
 import type { EditorStateConfig } from '@prosekit/pm/state';
 import { EditorView } from '@prosekit/pm/view';
 import type { EmptyObject } from 'type-fest';
-import { InputRule } from '@prosekit/pm/inputrules';
 import type { IsEqual } from 'type-fest';
 import { Mark } from '@prosekit/pm/model';
 import type { MarkSpec } from '@prosekit/pm/model';
@@ -333,22 +332,6 @@ redo: [];
 export { defineHistory }
 export { defineHistory as defineHistory_alias_1 }
 
-/**
- * Defines an input rule extension.
- *
- * @param rule - The ProseMirror input rule to add, or an array of input rules,
- * or a function that returns one or multiple input rules.
- *
- * @public
- *
- * @deprecated Use `prosekit/extensions/input-rule` instead.
- */
-declare function defineInputRule(rule: InputRule | InputRule[] | ((context: {
-    schema: Schema;
-}) => InputRule | InputRule[])): Extension;
-export { defineInputRule }
-export { defineInputRule as defineInputRule_alias_1 }
-
 /**
  * @public
  */
@@ -585,6 +568,20 @@ declare type EmptyValue = undefined | null | EmptyObject;
 
 export declare type ExceptEmptyValue<T> = ConditionalExcept<T, EmptyValue>;
 
+/**
+ * Expands the selection to include the entire mark at the current position.
+ *
+ * @public
+ */
+declare function expandMark(options: {
+    /**
+     * The type of the mark to expand.
+     */
+    type: string | MarkType;
+}): Command;
+export { expandMark }
+export { expandMark as expandMark_alias_1 }
+
 /**
  * @public
  */
@@ -834,6 +831,9 @@ declare function isMark(mark: unknown): mark is Mark;
 export { isMark }
 export { isMark as isMark_alias_1 }
 
+/**
+ * @internal
+ */
 export declare function isMarkActive(state: EditorState, type: string | MarkType, attrs?: Attrs | null): boolean;
 
 export declare function isNodeActive(state: EditorState, type: string | NodeType, attrs?: Attrs | null): boolean;

package/dist/prosekit-core.d.ts

@@ -1,4 +1,5 @@
 export { addMark } from './_tsup-dts-rollup';
+export { expandMark } from './_tsup-dts-rollup';
 export { insertNode } from './_tsup-dts-rollup';
 export { removeMark } from './_tsup-dts-rollup';
 export { setBlockType } from './_tsup-dts-rollup';
@@ -10,8 +11,8 @@ export { createEditor } from './_tsup-dts-rollup';
 export { EditorOptions } from './_tsup-dts-rollup';
 export { union } from './_tsup-dts-rollup';
 export { withPriority } from './_tsup-dts-rollup';
-export { ProseKitError_alias_1 as ProseKitError } from './_tsup-dts-rollup';
 export { EditorNotFoundError_alias_1 as EditorNotFoundError } from './_tsup-dts-rollup';
+export { ProseKitError_alias_1 as ProseKitError } from './_tsup-dts-rollup';
 export { defineBaseCommands } from './_tsup-dts-rollup';
 export { defineCommands } from './_tsup-dts-rollup';
 export { defineDefaultState } from './_tsup-dts-rollup';
@@ -28,7 +29,6 @@ export { MountHandler } from './_tsup-dts-rollup';
 export { UnmountHandler } from './_tsup-dts-rollup';
 export { UpdateHandler } from './_tsup-dts-rollup';
 export { defineHistory } from './_tsup-dts-rollup';
-export { defineInputRule } from './_tsup-dts-rollup';
 export { defineBaseKeymap } from './_tsup-dts-rollup';
 export { defineKeymap } from './_tsup-dts-rollup';
 export { keymapFacet } from './_tsup-dts-rollup';

package/dist/prosekit-core.js

@@ -43,6 +43,59 @@ function addMark(options) {
   };
 }
 
+// src/commands/expand-mark.ts
+import { TextSelection } from "@prosekit/pm/state";
+function expandMark(options) {
+  return (state, dispatch) => {
+    const markType = getMarkType(state.schema, options.type);
+    const predicate = (mark) => mark.type === markType;
+    const from = expandMarkBefore(state.selection.$from, predicate);
+    const to = expandMarkAfter(state.selection.$to, predicate);
+    if (from === state.selection.from && to === state.selection.to) {
+      return false;
+    }
+    if (dispatch) {
+      dispatch(state.tr.setSelection(TextSelection.create(state.doc, from, to)));
+    }
+    return true;
+  };
+}
+function expandMarkBefore($pos, predicate) {
+  const { parent } = $pos;
+  if (!$pos.marks().some(predicate)) {
+    return $pos.pos;
+  }
+  const index = $pos.index();
+  let boundaryIndex = index;
+  for (let i = index; i >= 0; i--) {
+    const node = parent.child(i);
+    if (node.marks.some(predicate)) {
+      boundaryIndex = i;
+    } else {
+      break;
+    }
+  }
+  return $pos.posAtIndex(boundaryIndex);
+}
+function expandMarkAfter($pos, predicate) {
+  const { parent } = $pos;
+  if (!$pos.marks().some(predicate)) {
+    return $pos.pos;
+  }
+  const index = Math.max(0, $pos.indexAfter() - 1);
+  const childCount = parent.childCount;
+  let boundaryIndex = index;
+  for (let i = index; i < childCount; i++) {
+    const node = parent.child(i);
+    if (node.marks.some(predicate)) {
+      boundaryIndex = i;
+    } else {
+      break;
+    }
+  }
+  return $pos.posAtIndex(boundaryIndex) + parent.child(boundaryIndex).nodeSize;
+}
+
 // src/commands/insert-node.ts
 import "@prosekit/pm/state";
 import { insertPoint } from "@prosekit/pm/transform";
@@ -61,11 +114,11 @@ function getNodeType(schema, type) {
 }
 
 // src/utils/set-selection-around.ts
-import { TextSelection } from "@prosekit/pm/state";
+import { TextSelection as TextSelection2 } from "@prosekit/pm/state";
 function setSelectionAround(tr, pos) {
   const docSize = tr.doc.content.size;
   const $pos = tr.doc.resolve(pos > docSize ? docSize : pos < 0 ? 0 : pos);
-  const selection = TextSelection.between($pos, $pos);
+  const selection = TextSelection2.between($pos, $pos);
   tr.setSelection(selection);
 }
 
@@ -115,13 +168,13 @@ function removeMark(options) {
 import "@prosekit/pm/state";
 
 // src/utils/get-custom-selection.ts
-import { TextSelection as TextSelection2 } from "@prosekit/pm/state";
+import { TextSelection as TextSelection3 } from "@prosekit/pm/state";
 function getCustomSelection(state, from, to) {
   const pos = from != null ? from : to;
   if (pos != null) {
     const $from = state.doc.resolve(from != null ? from : pos);
     const $to = state.doc.resolve(to != null ? to : pos);
-    return TextSelection2.between($from, $to);
+    return TextSelection3.between($from, $to);
   }
   return state.selection;
 }
@@ -696,12 +749,25 @@ function updateExtension(prevInputs, prevConverters, extension, mode) {
 // src/editor/builder.ts
 import "@prosekit/pm/model";
 
+// src/utils/is-mark-active.ts
+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());
+  } else {
+    const markOrType = attrs ? markType.create(attrs) : markType;
+    return state.doc.rangeHasMark(from, to, markOrType);
+  }
+}
+
 // src/utils/type-assertion.ts
 import { Mark, ProseMirrorNode } from "@prosekit/pm/model";
 import {
   AllSelection,
   NodeSelection,
-  TextSelection as TextSelection3
+  TextSelection as TextSelection4
 } from "@prosekit/pm/state";
 function isProseMirrorNode(node) {
   return node instanceof ProseMirrorNode;
@@ -710,7 +776,7 @@ function isMark(mark) {
   return mark instanceof Mark;
 }
 function isTextSelection(sel) {
-  return sel instanceof TextSelection3;
+  return sel instanceof TextSelection4;
 }
 function isNodeSelection(sel) {
   return sel instanceof NodeSelection;
@@ -719,28 +785,6 @@ function isAllSelection(sel) {
   return sel instanceof AllSelection;
 }
 
-// src/utils/is-mark-active.ts
-function isMarkActive(state, type, attrs) {
-  const markType = getMarkType(state.schema, type);
-  const mark = attrs ? markType.create(attrs) : markType;
-  const { from, $from, to, empty } = state.selection;
-  if (empty) {
-    return hasMark(state.storedMarks || $from.marks(), mark);
-  } else {
-    return state.doc.rangeHasMark(from, to, mark);
-  }
-}
-function hasMark(marks, mark) {
-  if (marks.length === 0) {
-    return false;
-  }
-  if (isMark(mark)) {
-    return marks.some((m) => m.eq(mark));
-  } else {
-    return marks.some((m) => m.type === mark);
-  }
-}
-
 // src/editor/builder.ts
 function createNodeBuilder(getState, type) {
   const builder = (...args) => buildNode(type, args);
@@ -1405,16 +1449,11 @@ function defineFocusChangeHandler(handler) {
   const handleBlur = () => handler(false);
   const plugin = new ProseMirrorPlugin2({
     key: new PluginKey2("prosekit-focus-handler"),
-    view: (view) => {
-      const dom = view.dom;
-      dom.addEventListener("focus", handleFocus);
-      dom.addEventListener("blur", handleBlur);
-      return {
-        destroy: () => {
-          dom.removeEventListener("focus", handleFocus);
-          dom.removeEventListener("blur", handleBlur);
-        }
-      };
+    props: {
+      handleDOMEvents: {
+        focus: handleFocus,
+        blur: handleBlur
+      }
     }
   });
   return definePlugin(plugin);
@@ -1501,32 +1540,6 @@ function defineHistory() {
   ]);
 }
 
-// src/extensions/input-rules.ts
-import { InputRule, inputRules } from "@prosekit/pm/inputrules";
-import "@prosekit/pm/model";
-import "@prosekit/pm/state";
-function defineInputRule(rule) {
-  if (rule instanceof InputRule) {
-    return inputRuleFacet.extension([() => rule]);
-  }
-  if (Array.isArray(rule) && rule.every((r) => r instanceof InputRule)) {
-    return inputRuleFacet.extension([() => rule]);
-  }
-  if (typeof rule === "function") {
-    return inputRuleFacet.extension([rule]);
-  }
-  throw new TypeError("Invalid input rule");
-}
-var inputRuleFacet = Facet.define({
-  convert: (inputs) => {
-    return (context) => {
-      const rules = inputs.flatMap((callback) => callback(context));
-      return [inputRules({ rules })];
-    };
-  },
-  next: pluginFacet
-});
-
 // src/extensions/mark-spec.ts
 function defineMarkSpec(options) {
   const payload = [options, void 0];
@@ -1756,7 +1769,6 @@ export {
   defineDocChangeHandler,
   defineFocusChangeHandler,
   defineHistory,
-  defineInputRule,
   defineKeymap,
   defineMarkAttr,
   defineMarkSpec,
@@ -1770,6 +1782,7 @@ export {
   defineText,
   defineUnmountHandler,
   defineUpdateHandler,
+  expandMark,
   getMarkType,
   getNodeType,
   insertNode,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@prosekit/core",
   "type": "module",
-  "version": "0.2.7",
+  "version": "0.3.0",
   "private": false,
   "author": {
     "name": "ocavue",
@@ -38,13 +38,13 @@
     "@prosekit/pm": "^0.1.1",
     "clsx": "^2.1.0",
     "orderedmap": "^2.1.1",
-    "type-fest": "^4.10.1"
+    "type-fest": "^4.10.2"
   },
   "devDependencies": {
     "@prosekit/dev": "*",
     "tsup": "^8.0.1",
     "typescript": "^5.3.3",
-    "vitest": "^1.2.1"
+    "vitest": "^1.2.2"
   },
   "scripts": {
     "build:tsup": "tsup",