@prosekit/extensions 0.4.3 → 0.4.4

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

@@ -485,7 +485,9 @@ export declare function defineListSpec(): Extension<{
  * A mark rule is something that can automatically apply marks to text if it
  * matches a certain pattern, and remove them if it doesn't match anymore.
  */
-export declare function defineMarkRule(options: MarkRuleOptions): Extension<ExtensionTyping<string, string, CommandArgs>>;
+declare function defineMarkRule(options: MarkRuleOptions): Extension<ExtensionTyping<string, string, CommandArgs>>;
+export { defineMarkRule }
+export { defineMarkRule as defineMarkRule_alias_1 }
 
 /**
  * @public
@@ -839,11 +841,10 @@ export { ListDOMSerializer }
 /**
  * @internal
  */
-export declare class MarkRule {
-    readonly regex: RegExp;
-    readonly type: string | MarkType;
-    readonly getAttrs: (match: RegExpMatchArray) => Attrs | null;
-    constructor({ regex, type, attrs }: MarkRuleOptions);
+export declare interface MarkRule {
+    regex: RegExp;
+    type: string | MarkType;
+    getAttrs?: ((match: RegExpMatchArray) => Attrs | null) | null;
 }
 
 /**

package/dist/{chunk-TXF4SPMB.js → chunk-MX6UNVWH.js}

@@ -1,4 +1,4 @@
-// src/mark-rule/index.ts
+// src/mark-rule/extension.ts
 import { Facet, pluginFacet } from "@prosekit/core";
 import { ProseMirrorPlugin } from "@prosekit/pm/state";
 
@@ -62,7 +62,7 @@ function getMapRange(transactions, oldState, newState) {
       hi = map.map(hi);
       map.forEach((_oldStart, _oldEnd, newStart, newEnd) => {
         lo = Math.min(lo, hi, newStart);
-        hi = Math.max(hi, hi, newEnd);
+        hi = Math.max(lo, hi, newEnd);
       });
     }
   }
@@ -77,8 +77,9 @@ function getCheckRanges(transactions, oldState, newState) {
 
 // src/mark-rule/apply.ts
 function getExpectedMarkings(rules, doc, from, to) {
+  var _a;
   const text = doc.textBetween(from, to, OBJECT_REPLACEMENT_CHARACTER);
-  const result = [];
+  const ranges = [];
   for (const rule of rules) {
     rule.regex.lastIndex = 0;
     const matches = text.matchAll(rule.regex);
@@ -87,9 +88,18 @@ function getExpectedMarkings(rules, doc, from, to) {
       const index = match.index;
       if (index == null)
         continue;
-      const attrs = rule.getAttrs(match);
+      const attrs = (_a = rule.getAttrs) == null ? void 0 : _a.call(rule, match);
       const mark = markType.create(attrs);
-      result.push([mark, from + index, from + index + match[0].length]);
+      ranges.push([from + index, from + index + match[0].length, mark]);
+    }
+  }
+  ranges.sort((a, b) => a[0] - b[0] || b[1] - a[1]);
+  const result = [];
+  let freeIndex = 0;
+  for (const range of ranges) {
+    if (range[0] >= freeIndex) {
+      result.push(range);
+      freeIndex = range[1];
     }
   }
   return result;
@@ -105,17 +115,17 @@ function getReceivedMarkings(rules, doc, from, to) {
     for (const markType of markTypes) {
       const mark = node.marks.find((mark2) => mark2.type === markType);
       if (mark) {
-        result.push([mark, pos, pos + node.nodeSize]);
+        result.push([pos, pos + node.nodeSize, mark]);
       }
     }
   });
   return result;
 }
-function markingEquals(a, b) {
-  return a[1] === b[1] && a[2] === b[2] && a[0].eq(b[0]);
+function markRangeEquals(a, b) {
+  return a[0] === b[0] && a[1] === b[1] && a[2].eq(b[2]);
 }
-function markingDiffs(a, b) {
-  return a.filter((x) => !b.some((y) => markingEquals(x, y)));
+function markRangeDiffs(a, b) {
+  return a.filter((x) => !b.some((y) => markRangeEquals(x, y)));
 }
 function applyMarkRules(rules, transactions, oldState, newState) {
   if (transactions.length === 0 || transactions.every((tr2) => !tr2.docChanged)) {
@@ -127,35 +137,27 @@ function applyMarkRules(rules, transactions, oldState, newState) {
   for (const [from, to] of ranges) {
     const expected = getExpectedMarkings(rules, newState.doc, from, to);
     const received = getReceivedMarkings(rules, newState.doc, from, to);
-    toRemove.push(...markingDiffs(received, expected));
-    toCreate.push(...markingDiffs(expected, received));
+    toRemove.push(...markRangeDiffs(received, expected));
+    toCreate.push(...markRangeDiffs(expected, received));
   }
   if (toCreate.length === 0 && toRemove.length === 0) {
     return null;
   }
   const tr = newState.tr;
-  for (const [mark, from, to] of toRemove) {
+  for (const [from, to, mark] of toRemove) {
     tr.removeMark(from, to, mark);
   }
-  for (const [mark, from, to] of toCreate) {
+  for (const [from, to, mark] of toCreate) {
     tr.addMark(from, to, mark);
   }
   return tr;
 }
 
-// src/mark-rule/rule.ts
-import "@prosekit/pm/model";
-var MarkRule = class {
-  constructor({ regex, type, attrs = null }) {
-    this.regex = regex;
-    this.type = type;
-    this.getAttrs = typeof attrs === "function" ? attrs : () => attrs;
-  }
-};
-
-// src/mark-rule/index.ts
+// src/mark-rule/extension.ts
 function defineMarkRule(options) {
-  return markRuleFacet.extension([new MarkRule(options)]);
+  const { regex, type, attrs } = options;
+  const getAttrs = attrs && typeof attrs === "object" ? () => attrs : attrs;
+  return markRuleFacet.extension([{ regex, type, getAttrs }]);
 }
 var markRuleFacet = Facet.define({
   converter: () => {

package/dist/prosekit-extensions-link.js

@@ -1,6 +1,6 @@
 import {
   defineMarkRule
-} from "./chunk-TXF4SPMB.js";
+} from "./chunk-MX6UNVWH.js";
 import {
   defineEnterRule
 } from "./chunk-ASTUC4KT.js";

package/dist/prosekit-extensions-mark-rule.d.ts

@@ -1,2 +1,2 @@
-export { defineMarkRule } from './_tsup-dts-rollup';
 export { MarkRuleOptions } from './_tsup-dts-rollup';
+export { defineMarkRule_alias_1 as defineMarkRule } from './_tsup-dts-rollup';

package/dist/prosekit-extensions-mark-rule.js

@@ -1,6 +1,6 @@
 import {
   defineMarkRule
-} from "./chunk-TXF4SPMB.js";
+} from "./chunk-MX6UNVWH.js";
 export {
   defineMarkRule
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@prosekit/extensions",
   "type": "module",
-  "version": "0.4.3",
+  "version": "0.4.4",
   "private": false,
   "author": {
     "name": "ocavue",
@@ -152,7 +152,7 @@
     "dist"
   ],
   "dependencies": {
-    "@prosekit/core": "^0.4.0",
+    "@prosekit/core": "^0.4.1",
     "@prosekit/pm": "^0.1.2",
     "prosemirror-dropcursor": "^1.8.1",
     "prosemirror-flat-list": "^0.5.0",