@prosekit/core 0.7.4 → 0.7.5

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

@@ -272,6 +272,13 @@ declare interface CommandTyping {
 export { CommandTyping }
 export { CommandTyping as CommandTyping_alias_1 }
 
+/**
+ * @internal
+ */
+declare function containsInlineNode(doc: ProseMirrorNode, from: number, to: number): boolean;
+export { containsInlineNode }
+export { containsInlineNode as containsInlineNode_alias_1 }
+
 /**
  * @public
  */
@@ -709,6 +716,9 @@ export declare function defineTestExtension(): Extension<{
     doc: Attrs_2;
     text: Attrs_2;
     heading: Attrs_2;
+    codeBlock: {
+    language: string;
+    };
     }>;
     Marks: SimplifyDeeper<    {
     bold: Attrs_2;
@@ -1346,6 +1356,8 @@ declare function htmlFromNode(node: ProseMirrorNode, options?: DOMSerializerOpti
 export { htmlFromNode }
 export { htmlFromNode as htmlFromNode_alias_1 }
 
+export declare function includesMark(marks: readonly Mark[], markType: MarkType, attrs?: Attrs | null): boolean;
+
 /**
  * Returns a command that inserts the given node at the current selection or at
  * the given position.
@@ -1441,6 +1453,7 @@ export { isMark as isMark_alias_1 }
 /**
  * Returns true if the given mark is missing in some part of the range.
  * Returns false if the entire range has the given mark.
+ * Returns true if the mark is not allowed in the range.
  *
  * @internal
  */
@@ -1473,6 +1486,13 @@ declare function isProseMirrorNode(node: unknown): node is ProseMirrorNode;
 export { isProseMirrorNode }
 export { isProseMirrorNode as isProseMirrorNode_alias_1 }
 
+/**
+ * Check if `subset` is a subset of `superset`.
+ *
+ * @internal
+ */
+export declare function isSubset(subset: Record<string, unknown>, superset: Record<string, unknown>): boolean;
+
 /**
  * @internal
  */
@@ -2098,6 +2118,9 @@ export declare function setupTest(): {
         doc: Attrs_2;
         text: Attrs_2;
         heading: Attrs_2;
+        codeBlock: {
+        language: string;
+        };
         }>;
         Marks: SimplifyDeeper<    {
         bold: Attrs_2;
@@ -2123,20 +2146,6 @@ export declare function setupTest(): {
             readonly redo: [];
         };
     }>>;
-    n: ToNodeAction<SimplifyDeeper<    {
-    paragraph: {
-    readonly [x: string]: any;
-    };
-    doc: {
-    readonly [x: string]: any;
-    };
-    text: {
-    readonly [x: string]: any;
-    };
-    heading: {
-    readonly [x: string]: any;
-    };
-    }>>;
     m: ToMarkAction<SimplifyDeeper<    {
     bold: {
     readonly [x: string]: any;
@@ -2145,6 +2154,26 @@ export declare function setupTest(): {
     readonly [x: string]: any;
     };
     }>>;
+    n: {
+        p: NodeAction<    {
+        readonly [x: string]: any;
+        }>;
+        paragraph: NodeAction<    {
+        readonly [x: string]: any;
+        }>;
+        doc: NodeAction<    {
+        readonly [x: string]: any;
+        }>;
+        text: NodeAction<    {
+        readonly [x: string]: any;
+        }>;
+        heading: NodeAction<    {
+        readonly [x: string]: any;
+        }>;
+        codeBlock: NodeAction<    {
+        language: string;
+        }>;
+    };
 };
 
 /**

package/dist/{chunk-52BNHWWJ.js → chunk-M267LRMB.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);
   }

package/dist/prosekit-core-test.js

@@ -5,7 +5,7 @@ import {
   createMarkActions,
   createNodeActions,
   setupEditorExtension
-} from "./chunk-52BNHWWJ.js";
+} from "./chunk-M267LRMB.js";
 
 // src/test/test-editor.ts
 import { EditorState, NodeSelection, TextSelection } from "@prosekit/pm/state";

package/dist/prosekit-core.d.ts

@@ -136,6 +136,7 @@ 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,7 +35,7 @@ import {
   stateFromJSON,
   toReversed,
   union
-} from "./chunk-52BNHWWJ.js";
+} from "./chunk-M267LRMB.js";
 
 // src/commands/add-mark.ts
 import "@prosekit/pm/model";
@@ -1274,6 +1274,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++) {
@@ -1335,6 +1345,7 @@ export {
   canUseRegexLookbehind,
   clsx,
   collectNodes,
+  containsInlineNode,
   createEditor,
   defaultBlockAt,
   defineBaseCommands,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@prosekit/core",
   "type": "module",
-  "version": "0.7.4",
+  "version": "0.7.5",
   "private": false,
   "author": {
     "name": "ocavue",
@@ -44,7 +44,7 @@
     "orderedmap": "^2.1.1",
     "prosemirror-splittable": "^0.1.1",
     "type-fest": "^4.22.1",
-    "@prosekit/pm": "^0.1.6"
+    "@prosekit/pm": "^0.1.7"
   },
   "devDependencies": {
     "tsup": "^8.1.2",