@prosekit/extensions 0.0.0-next-20240427200701 → 0.0.0-next-20240427204211

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

@@ -415,10 +415,21 @@ expandLink: [];
 };
 }>;
 
+/**
+ * Apply link marks after typing Enter.
+ */
 export declare function defineLinkEnterRule(): Extension<ExtensionTyping<string, string, CommandArgs>>;
 
+/**
+ * Apply link marks after pressing Space.
+ */
 export declare function defineLinkInputRule(): Extension<ExtensionTyping<string, string, CommandArgs>>;
 
+/**
+ * Apply and remove link marks to the text during typing.
+ */
+export declare function defineLinkMarkRule(): Extension<ExtensionTyping<string, string, CommandArgs>>;
+
 export declare function defineLinkSpec(): Extension<    {
 MARKS: "link";
 }>;
@@ -810,9 +821,11 @@ export declare function insertTable({ row, col, header, }: {
     header: boolean;
 }): Command;
 
-export declare const LINK_RE: RegExp;
+export declare const LINK_ENTER_RE: RegExp;
+
+export declare const LINK_INPUT_RE: RegExp;
 
-export declare const LINK_SPACE_RE: RegExp;
+export declare const LINK_MARK_RE: RegExp;
 
 /**
  * @public

package/dist/chunk-TXF4SPMB.js

@@ -0,0 +1,185 @@
+// src/mark-rule/index.ts
+import { Facet, pluginFacet } from "@prosekit/core";
+import { ProseMirrorPlugin } from "@prosekit/pm/state";
+
+// src/mark-rule/apply.ts
+import { OBJECT_REPLACEMENT_CHARACTER, getMarkType } from "@prosekit/core";
+import "@prosekit/pm/model";
+import "@prosekit/pm/state";
+
+// src/mark-rule/range.ts
+import "@prosekit/pm/state";
+function getSpanTextRanges($from, $to) {
+  const nodeRange = $from.blockRange($to);
+  if (!nodeRange) {
+    return [];
+  }
+  const stack = [];
+  let start = nodeRange.start;
+  for (let i = nodeRange.startIndex; i < nodeRange.endIndex; i++) {
+    const child = nodeRange.parent.child(i);
+    stack.push([start, child]);
+    start += child.nodeSize;
+  }
+  const ranges = [];
+  while (stack.length > 0) {
+    const [start2, node] = stack.pop();
+    if (node.type.spec.code) {
+      continue;
+    }
+    if (node.type.isTextblock) {
+      ranges.push([start2 + 1, start2 + 1 + node.content.size]);
+      continue;
+    }
+    node.forEach((child, offset) => {
+      stack.push([start2 + offset + 1, child]);
+    });
+  }
+  return ranges;
+}
+function getInlineTextRange($from, $to) {
+  return [$from.start(), $to.end()];
+}
+function getTextRanges(doc, from, to) {
+  const $from = doc.resolve(from);
+  const $to = doc.resolve(to);
+  if ($from.sameParent($to) && $from.parent.isTextblock) {
+    return [getInlineTextRange($from, $to)];
+  } else {
+    const nodeRange = $from.blockRange($to);
+    if (!nodeRange) {
+      return [];
+    }
+    return getSpanTextRanges($from, $to);
+  }
+}
+function getMapRange(transactions, oldState, newState) {
+  let lo = oldState.selection.from;
+  let hi = oldState.selection.to;
+  for (const tr of transactions) {
+    for (const map of tr.mapping.maps) {
+      lo = map.map(lo);
+      hi = map.map(hi);
+      map.forEach((_oldStart, _oldEnd, newStart, newEnd) => {
+        lo = Math.min(lo, hi, newStart);
+        hi = Math.max(hi, hi, newEnd);
+      });
+    }
+  }
+  lo = Math.min(lo, hi, newState.selection.from);
+  hi = Math.min(lo, hi, newState.selection.to);
+  return [lo, hi];
+}
+function getCheckRanges(transactions, oldState, newState) {
+  const [from, to] = getMapRange(transactions, oldState, newState);
+  return getTextRanges(newState.doc, from, to);
+}
+
+// src/mark-rule/apply.ts
+function getExpectedMarkings(rules, doc, from, to) {
+  const text = doc.textBetween(from, to, OBJECT_REPLACEMENT_CHARACTER);
+  const result = [];
+  for (const rule of rules) {
+    rule.regex.lastIndex = 0;
+    const matches = text.matchAll(rule.regex);
+    const markType = getMarkType(doc.type.schema, rule.type);
+    for (const match of matches) {
+      const index = match.index;
+      if (index == null)
+        continue;
+      const attrs = rule.getAttrs(match);
+      const mark = markType.create(attrs);
+      result.push([mark, from + index, from + index + match[0].length]);
+    }
+  }
+  return result;
+}
+function getReceivedMarkings(rules, doc, from, to) {
+  const result = [];
+  const schema = doc.type.schema;
+  const markTypes = rules.map((rule) => getMarkType(schema, rule.type));
+  doc.nodesBetween(from, to, (node, pos) => {
+    if (!node.isInline) {
+      return;
+    }
+    for (const markType of markTypes) {
+      const mark = node.marks.find((mark2) => mark2.type === markType);
+      if (mark) {
+        result.push([mark, pos, pos + node.nodeSize]);
+      }
+    }
+  });
+  return result;
+}
+function markingEquals(a, b) {
+  return a[1] === b[1] && a[2] === b[2] && a[0].eq(b[0]);
+}
+function markingDiffs(a, b) {
+  return a.filter((x) => !b.some((y) => markingEquals(x, y)));
+}
+function applyMarkRules(rules, transactions, oldState, newState) {
+  if (transactions.length === 0 || transactions.every((tr2) => !tr2.docChanged)) {
+    return null;
+  }
+  const ranges = getCheckRanges(transactions, oldState, newState);
+  const toRemove = [];
+  const toCreate = [];
+  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));
+  }
+  if (toCreate.length === 0 && toRemove.length === 0) {
+    return null;
+  }
+  const tr = newState.tr;
+  for (const [mark, from, to] of toRemove) {
+    tr.removeMark(from, to, mark);
+  }
+  for (const [mark, from, to] 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
+function defineMarkRule(options) {
+  return markRuleFacet.extension([new MarkRule(options)]);
+}
+var markRuleFacet = Facet.define({
+  converter: () => {
+    let rules = [];
+    const plugin = new ProseMirrorPlugin({
+      appendTransaction: (transactions, oldState, newState) => {
+        return applyMarkRules(rules, transactions, oldState, newState);
+      }
+    });
+    const pluginFunc = () => [plugin];
+    return {
+      create: (inputs) => {
+        rules = inputs;
+        return pluginFunc;
+      },
+      update: (inputs) => {
+        rules = inputs;
+        return null;
+      }
+    };
+  },
+  next: pluginFacet
+});
+
+export {
+  defineMarkRule
+};

package/dist/prosekit-extensions-link.d.ts

@@ -2,5 +2,6 @@ export { defineLinkSpec } from './_tsup-dts-rollup';
 export { defineLinkCommands } from './_tsup-dts-rollup';
 export { defineLinkInputRule } from './_tsup-dts-rollup';
 export { defineLinkEnterRule } from './_tsup-dts-rollup';
+export { defineLinkMarkRule } from './_tsup-dts-rollup';
 export { defineLink } from './_tsup-dts-rollup';
 export { LinkAttrs } from './_tsup-dts-rollup';

package/dist/prosekit-extensions-link.js

@@ -1,3 +1,6 @@
+import {
+  defineMarkRule
+} from "./chunk-TXF4SPMB.js";
 import {
   defineEnterRule
 } from "./chunk-ASTUC4KT.js";
@@ -24,10 +27,12 @@ var LINK_RE_BASE_PATTERN = (
   "((?:(?:(?:https?:)?\\/\\/)?(?:(?:[a-z0-9\\u00a1-\\uffff][a-z0-9\\u00a1-\\uffff_-]{0,62})?[a-z0-9\\u00a1-\\uffff]\\.)+(?:" + TLD_RE_PATTERN + "))(?::\\d{2,5})?(?:[/?#]\\S*)?)"
 );
 var LINK_STOP_PATTERN = "(?:\\.|\\,|\\;\\!)?";
-var LINK_RE_PATTERN = LINK_RE_BASE_PATTERN + LINK_STOP_PATTERN + "$";
-var LINK_SPACE_RE_PATTERN = LINK_RE_BASE_PATTERN + LINK_STOP_PATTERN + "\\s$";
-var LINK_RE = new RegExp(LINK_RE_PATTERN, "gi");
-var LINK_SPACE_RE = new RegExp(LINK_SPACE_RE_PATTERN, "gi");
+var LINK_ENTER_PATTERN = LINK_RE_BASE_PATTERN + LINK_STOP_PATTERN + "$";
+var LINK_INPUT_PATTERN = LINK_RE_BASE_PATTERN + LINK_STOP_PATTERN + "\\s$";
+var LINK_MARK_PATTERN = LINK_RE_BASE_PATTERN + LINK_STOP_PATTERN;
+var LINK_ENTER_RE = new RegExp(LINK_ENTER_PATTERN, "gi");
+var LINK_INPUT_RE = new RegExp(LINK_INPUT_PATTERN, "gi");
+var LINK_MARK_RE = new RegExp(LINK_MARK_PATTERN, "gi");
 
 // src/link/index.ts
 function defineLinkSpec() {
@@ -63,7 +68,7 @@ function defineLinkCommands() {
 }
 function defineLinkInputRule() {
   return defineInputRule(
-    new InputRule(LINK_SPACE_RE, (state, match, from) => {
+    new InputRule(LINK_INPUT_RE, (state, match, from) => {
       const href = match[1];
       if (!href)
         return null;
@@ -74,7 +79,7 @@ function defineLinkInputRule() {
 }
 function defineLinkEnterRule() {
   return defineEnterRule({
-    regex: LINK_RE,
+    regex: LINK_ENTER_RE,
     handler: ({ state, from, match }) => {
       const href = match[1];
       if (!href)
@@ -85,6 +90,13 @@ function defineLinkEnterRule() {
     }
   });
 }
+function defineLinkMarkRule() {
+  return defineMarkRule({
+    regex: LINK_MARK_RE,
+    type: "link",
+    attrs: (match) => ({ href: match[1] })
+  });
+}
 function defineLink() {
   return union([
     defineLinkSpec(),
@@ -98,5 +110,6 @@ export {
   defineLinkCommands,
   defineLinkEnterRule,
   defineLinkInputRule,
+  defineLinkMarkRule,
   defineLinkSpec
 };

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

@@ -1,184 +1,6 @@
-// src/mark-rule/index.ts
-import { Facet, pluginFacet } from "@prosekit/core";
-import { ProseMirrorPlugin } from "@prosekit/pm/state";
-
-// src/mark-rule/apply.ts
-import { OBJECT_REPLACEMENT_CHARACTER, getMarkType } from "@prosekit/core";
-import "@prosekit/pm/model";
-import "@prosekit/pm/state";
-
-// src/mark-rule/range.ts
-import "@prosekit/pm/state";
-function getSpanTextRanges($from, $to) {
-  const nodeRange = $from.blockRange($to);
-  if (!nodeRange) {
-    return [];
-  }
-  const stack = [];
-  let start = nodeRange.start;
-  for (let i = nodeRange.startIndex; i < nodeRange.endIndex; i++) {
-    const child = nodeRange.parent.child(i);
-    stack.push([start, child]);
-    start += child.nodeSize;
-  }
-  const ranges = [];
-  while (stack.length > 0) {
-    const [start2, node] = stack.pop();
-    if (node.type.spec.code) {
-      continue;
-    }
-    if (node.type.isTextblock) {
-      ranges.push([start2 + 1, start2 + 1 + node.content.size]);
-      continue;
-    }
-    node.forEach((child, offset) => {
-      stack.push([start2 + offset + 1, child]);
-    });
-  }
-  return ranges;
-}
-function getInlineTextRange($from, $to) {
-  return [$from.start(), $to.end()];
-}
-function getTextRanges(doc, from, to) {
-  const $from = doc.resolve(from);
-  const $to = doc.resolve(to);
-  if ($from.sameParent($to) && $from.parent.isTextblock) {
-    return [getInlineTextRange($from, $to)];
-  } else {
-    const nodeRange = $from.blockRange($to);
-    if (!nodeRange) {
-      return [];
-    }
-    return getSpanTextRanges($from, $to);
-  }
-}
-function getMapRange(transactions, oldState, newState) {
-  let lo = oldState.selection.from;
-  let hi = oldState.selection.to;
-  for (const tr of transactions) {
-    for (const map of tr.mapping.maps) {
-      lo = map.map(lo);
-      hi = map.map(hi);
-      map.forEach((_oldStart, _oldEnd, newStart, newEnd) => {
-        lo = Math.min(lo, hi, newStart);
-        hi = Math.max(hi, hi, newEnd);
-      });
-    }
-  }
-  lo = Math.min(lo, hi, newState.selection.from);
-  hi = Math.min(lo, hi, newState.selection.to);
-  return [lo, hi];
-}
-function getCheckRanges(transactions, oldState, newState) {
-  const [from, to] = getMapRange(transactions, oldState, newState);
-  return getTextRanges(newState.doc, from, to);
-}
-
-// src/mark-rule/apply.ts
-function getExpectedMarkings(rules, doc, from, to) {
-  const text = doc.textBetween(from, to, OBJECT_REPLACEMENT_CHARACTER);
-  const result = [];
-  for (const rule of rules) {
-    rule.regex.lastIndex = 0;
-    const matches = text.matchAll(rule.regex);
-    const markType = getMarkType(doc.type.schema, rule.type);
-    for (const match of matches) {
-      const index = match.index;
-      if (index == null)
-        continue;
-      const attrs = rule.getAttrs(match);
-      const mark = markType.create(attrs);
-      result.push([mark, from + index, from + index + match[0].length]);
-    }
-  }
-  return result;
-}
-function getReceivedMarkings(rules, doc, from, to) {
-  const result = [];
-  const schema = doc.type.schema;
-  const markTypes = rules.map((rule) => getMarkType(schema, rule.type));
-  doc.nodesBetween(from, to, (node, pos) => {
-    if (!node.isInline) {
-      return;
-    }
-    for (const markType of markTypes) {
-      const mark = node.marks.find((mark2) => mark2.type === markType);
-      if (mark) {
-        result.push([mark, pos, pos + node.nodeSize]);
-      }
-    }
-  });
-  return result;
-}
-function markingEquals(a, b) {
-  return a[1] === b[1] && a[2] === b[2] && a[0].eq(b[0]);
-}
-function markingDiffs(a, b) {
-  return a.filter((x) => !b.some((y) => markingEquals(x, y)));
-}
-function applyMarkRules(rules, transactions, oldState, newState) {
-  if (transactions.length === 0 || transactions.every((tr2) => !tr2.docChanged)) {
-    return null;
-  }
-  const ranges = getCheckRanges(transactions, oldState, newState);
-  const toRemove = [];
-  const toCreate = [];
-  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));
-  }
-  if (toCreate.length === 0 && toRemove.length === 0) {
-    return null;
-  }
-  const tr = newState.tr;
-  for (const [mark, from, to] of toRemove) {
-    tr.removeMark(from, to, mark);
-  }
-  for (const [mark, from, to] 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
-function defineMarkRule(options) {
-  return markRuleFacet.extension([new MarkRule(options)]);
-}
-var markRuleFacet = Facet.define({
-  converter: () => {
-    let rules = [];
-    const plugin = new ProseMirrorPlugin({
-      appendTransaction: (transactions, oldState, newState) => {
-        return applyMarkRules(rules, transactions, oldState, newState);
-      }
-    });
-    const pluginFunc = () => [plugin];
-    return {
-      create: (inputs) => {
-        rules = inputs;
-        return pluginFunc;
-      },
-      update: (inputs) => {
-        rules = inputs;
-        return null;
-      }
-    };
-  },
-  next: pluginFacet
-});
+import {
+  defineMarkRule
+} from "./chunk-TXF4SPMB.js";
 export {
   defineMarkRule
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@prosekit/extensions",
   "type": "module",
-  "version": "0.0.0-next-20240427200701",
+  "version": "0.0.0-next-20240427204211",
   "private": false,
   "author": {
     "name": "ocavue",
@@ -152,8 +152,8 @@
     "dist"
   ],
   "dependencies": {
-    "@prosekit/core": "0.0.0-next-20240427200701",
-    "@prosekit/pm": "0.0.0-next-20240427200701",
+    "@prosekit/core": "0.0.0-next-20240427204211",
+    "@prosekit/pm": "0.0.0-next-20240427204211",
     "prosemirror-dropcursor": "^1.8.1",
     "prosemirror-flat-list": "^0.5.0",
     "prosemirror-highlight": "^0.5.0",