@meowdown/core 0.65.0 → 0.65.2

package/dist/index.d.ts

@@ -810,7 +810,7 @@ declare function defineEditorExtensionImpl(options: EditorExtensionOptions): imp
   Commands: {
     setMarkMode: [mode: MarkMode];
   };
-}>]>, import("@prosekit/core").PlainExtension, import("@prosekit/core").PlainExtension, import("@prosekit/core").PlainExtension, import("@prosekit/core").PlainExtension, import("@prosekit/core").PlainExtension, import("@prosekit/core").BaseCommandsExtension, import("@prosekit/core").HistoryExtension, import("@prosekit/core").PlainExtension, import("@prosekit/core").PlainExtension, import("@prosekit/core").PlainExtension, import("@prosekit/core").Extension<{
+}>]>, import("@prosekit/core").PlainExtension, import("@prosekit/core").PlainExtension, import("@prosekit/core").PlainExtension, import("@prosekit/core").PlainExtension, import("@prosekit/core").PlainExtension, import("@prosekit/core").PlainExtension, import("@prosekit/core").BaseCommandsExtension, import("@prosekit/core").HistoryExtension, import("@prosekit/core").PlainExtension, import("@prosekit/core").PlainExtension, import("@prosekit/core").PlainExtension, import("@prosekit/core").Extension<{
   Commands: {
     insertMarkdown: [markdown: string];
     insertTrigger: [text: string];
@@ -1396,6 +1396,9 @@ type NodeName = (typeof NODE_NAMES)[number];
 declare function isNodeOfType(node: ProseMirrorNode, name: NodeName): boolean;
 //#endregion
 //#region src/extensions/spell-check.d.ts
+/**
+ * @deprecated This will be removed in future versions.
+ */
 declare function defineSpellCheckPlugin(spellCheck: boolean): PlainExtension;
 //#endregion
 //#region src/extensions/substitution.d.ts

package/dist/index.js

@@ -440,13 +440,14 @@ function getSelectedAtomRange(state) {
 	return getSelectedRange(state, ATOM_SOURCE_MARK_NAMES);
 }
 function findSelectionAcrossBlockBoundary(state, pos, markNames, direction) {
+	const unitMarkNames = [...markNames, "mdPack"];
 	const $pos = state.doc.resolve(pos);
 	if (!(direction === -1 ? $pos.parentOffset === 0 : $pos.parentOffset === $pos.parent.content.size) || $pos.depth === 0) return;
-	const nearUnit = direction === -1 ? getMarkRangeAfter(state, pos, markNames) : getMarkRangeBefore(state, pos, markNames);
+	const nearUnit = direction === -1 ? getMarkRangeAfter(state, pos, unitMarkNames) : getMarkRangeBefore(state, pos, unitMarkNames);
 	const boundary = direction === -1 ? $pos.before() : $pos.after();
 	const target = Selection.findFrom(state.doc.resolve(boundary), direction);
 	if (!target) return;
-	const farUnit = isTextSelection(target) ? direction === -1 ? getMarkRangeBefore(state, target.head, markNames) : getMarkRangeAfter(state, target.head, markNames) : void 0;
+	const farUnit = isTextSelection(target) ? direction === -1 ? getMarkRangeBefore(state, target.head, unitMarkNames) : getMarkRangeAfter(state, target.head, unitMarkNames) : void 0;
 	if (nearUnit == null && farUnit == null) return;
 	return target;
 }
@@ -2537,7 +2538,7 @@ const emptyBatchSetMarkStep = new BatchSetMarkStep([]);
 //#endregion
 //#region src/extensions/magic-comment.ts
 const MAGIC_COMMENT_RE = /^<!--\s*(\{[^}]*\})\s*-->$/;
-const TRAILING_MAGIC_COMMENT_RE = /<!--\s*\{[^}]*\}\s*-->$/;
+const TRAILING_MAGIC_COMMENT_RE = /(?:<!--\s*\{[^}]*\}\s*-->)+$/;
 /**
 * Read the metadata out of a `<!-- {...} -->` comment, or `undefined` when the
 * text is not a comment carrying at least one recognized field.
@@ -2570,7 +2571,7 @@ function formatMagicComment(magic) {
 	return `<!-- ${JSON.stringify(magic)} -->`;
 }
 /**
-* Drop a trailing magic comment from the source text.
+* Drop the trailing run of magic comments from the source text.
 */
 function stripMagicComment(source) {
 	return source.replace(TRAILING_MAGIC_COMMENT_RE, "");
@@ -2889,12 +2890,11 @@ function walk(nodes, parentMarks, rangeStart, rangeEnd, text, marks, out, option
 	let pos = rangeStart;
 	for (let index = 0; index < nodes.length; index++) {
 		const node = nodes[index];
+		if (node.to <= pos) continue;
 		if (node.from > pos) emit(out, pos, node.from, parentMarks);
-		if (node.type === LEZER_NODE_IDS.Image) {
-			const trailing = takeMagicComment(node, nodes[index + 1], text);
-			walkImage(node, parentMarks, text, marks, out, options, context, trailing);
-			if (trailing) index++;
-			pos = trailing ? trailing.to : node.to;
+		const atomEnd = walkAtomChild(nodes, index, parentMarks, text, marks, out, options, context);
+		if (atomEnd != null) {
+			pos = atomEnd;
 			continue;
 		}
 		walkNode(node, parentMarks, text, marks, out, options, context);
@@ -2905,8 +2905,6 @@ function walk(nodes, parentMarks, rangeStart, rangeEnd, text, marks, out, option
 function walkNode(node, parentMarks, text, marks, out, options, context) {
 	switch (node.type) {
 		case LEZER_NODE_IDS.Link: return walkLink(node, parentMarks, text, marks, out, options, context);
-		case LEZER_NODE_IDS.Wikilink: return walkWikilink(node, parentMarks, text, marks, out);
-		case LEZER_NODE_IDS.WikiEmbed: return walkWikiEmbed(node, parentMarks, text, marks, out, options);
 		case LEZER_NODE_IDS.InlineMath: return walkMath(node, parentMarks, text, marks, out);
 		case LEZER_NODE_IDS.Autolink: return walkAutolink(node, parentMarks, text, marks, out);
 		case LEZER_NODE_IDS.URL: return walkURL(node, parentMarks, text, marks, out);
@@ -2914,6 +2912,31 @@ function walkNode(node, parentMarks, text, marks, out, options, context) {
 	}
 }
 /**
+* Walk `nodes[index]` when it is a source-backed atom (wikilink, wiki embed,
+* or image); returns the source position after everything the atom consumed,
+* or undefined for any other node type. An image also consumes the magic
+* comments chained behind it, so callers must skip children ending at or
+* before the returned position. Shared by `walk` and `walkResolvedLink` so an
+* atom behaves the same at the top level and inside a link label.
+*/
+function walkAtomChild(nodes, index, parentMarks, text, marks, out, options, context) {
+	const node = nodes[index];
+	switch (node.type) {
+		case LEZER_NODE_IDS.Wikilink:
+			walkWikilink(node, parentMarks, text, marks, out);
+			return node.to;
+		case LEZER_NODE_IDS.WikiEmbed:
+			walkWikiEmbed(node, parentMarks, text, marks, out, options);
+			return node.to;
+		case LEZER_NODE_IDS.Image: {
+			const trailing = takeMagicComments(nodes, index, text);
+			walkImage(node, parentMarks, text, marks, out, options, context, trailing);
+			return trailing ? trailing.to : node.to;
+		}
+		default: return;
+	}
+}
+/**
 * A node with no source-backed atom of its own: it contributes its `mdPack` and
 * syntax marks, then recurses into its children.
 */
@@ -3131,25 +3154,17 @@ function walkResolvedLink(node, parts, resolution, parentMarks, text, marks, out
 	});
 	const base = [...parentMarks, pack];
 	let pos = node.from;
-	for (const child of node.children) {
+	for (let index = 0; index < node.children.length; index++) {
+		const child = node.children[index];
+		if (child.to <= pos) continue;
 		if (child.from > pos) {
 			const childMarks = inLabel(pos) ? [...base, linkTextMark] : base;
 			emit(out, pos, child.from, childMarks);
 		}
 		const baseForChild = inLabel(child.from) ? [...base, linkTextMark] : base;
-		if (child.type === LEZER_NODE_IDS.Wikilink) {
-			walkWikilink(child, baseForChild, text, marks, out);
-			pos = child.to;
-			continue;
-		}
-		if (child.type === LEZER_NODE_IDS.WikiEmbed) {
-			walkWikiEmbed(child, baseForChild, text, marks, out, options);
-			pos = child.to;
-			continue;
-		}
-		if (child.type === LEZER_NODE_IDS.Image) {
-			walkImage(child, baseForChild, text, marks, out, options, context);
-			pos = child.to;
+		const atomEnd = walkAtomChild(node.children, index, baseForChild, text, marks, out, options, context);
+		if (atomEnd != null) {
+			pos = atomEnd;
 			continue;
 		}
 		if (isReference && child.type === LEZER_NODE_IDS.LinkLabel) {
@@ -3170,19 +3185,33 @@ function walkResolvedLink(node, parts, resolution, parentMarks, text, marks, out
 	}
 	if (pos < node.to) emit(out, pos, node.to, base);
 }
-function takeMagicComment(image, next, text) {
-	if (!next || next.type !== LEZER_NODE_IDS.Comment || next.from !== image.to) return void 0;
-	const magic = parseMagicComment(text.slice(next.from, next.to));
+/**
+* The run of magic comments chained immediately behind `nodes[index]` (an
+* image), or undefined when no magic comment directly abuts it. The first
+* comment's data wins: a rewrite of an unfolded image inserted the fresh
+* comment right at the image's end, so in a stacked run left is newest.
+*/
+function takeMagicComments(nodes, index, text) {
+	let magic;
+	let to = nodes[index].to;
+	for (let i = index + 1; i < nodes.length; i++) {
+		const next = nodes[i];
+		if (next.type !== LEZER_NODE_IDS.Comment || next.from !== to) break;
+		const parsed = parseMagicComment(text.slice(next.from, next.to));
+		if (!parsed) break;
+		magic ??= parsed;
+		to = next.to;
+	}
 	if (!magic) return void 0;
 	return {
 		magic,
-		to: next.to
+		to
 	};
 }
 /**
 * Special walker for a direct image `![alt](url)`.
 *
-* A `trailing` magic comment immediately after the image (e.g.
+* A `trailing` run of magic comments immediately after the image (e.g.
 * `<!-- {"width":320} -->`) is folded into the mark range so it round-trips as
 * source while supplying the image's `width`.
 */
@@ -5543,6 +5572,33 @@ function defineSelectDocBoundary() {
 	});
 }
 
+//#endregion
+//#region src/extensions/system-substitution-guard.ts
+const EM_DASH = "—";
+/**
+* Block the macOS "smart dashes" rewrite. With the `spellcheck` attribute on,
+* WebKit rewrites already-typed `--` near the caret into an em dash and
+* delivers the rewrite as a cancelable `beforeinput` with
+* `inputType: 'insertReplacementText'`. That corrupts Markdown such as the
+* `-->` closing an image sizing comment, so cancel any replacement that
+* inserts an em dash; word-level autocorrect passes through.
+*/
+function defineSystemSubstitutionGuard() {
+	const plugin = new Plugin({ props: { handleDOMEvents: { beforeinput: (view, event) => {
+		if (event.inputType !== "insertReplacementText") return false;
+		if (!(event.dataTransfer?.getData("text/plain") || event.data || "").includes(EM_DASH)) return false;
+		event.preventDefault();
+		const { doc, selection } = view.state;
+		requestAnimationFrame(() => {
+			const { state } = view;
+			if (view.isDestroyed || state.doc !== doc || state.selection.eq(selection)) return;
+			view.dispatch(state.tr.setSelection(selection));
+		});
+		return true;
+	} } } });
+	return withPriority$1(definePlugin(plugin), Priority$1.highest);
+}
+
 //#endregion
 //#region src/extensions/view-attributes.ts
 /**
@@ -5557,7 +5613,7 @@ function defineViewAttributes(attributes) {
 //#endregion
 //#region src/extensions/extension.ts
 function defineEditorExtensionImpl(options) {
-	return union(defineMeowdownParagraph(), defineDoc(), defineDocFrontmatterAttr(), defineText(), defineBlockquote(), defineMeowdownList(), defineHeading(), defineTable(), defineCodeBlock$1(), defineMeowdownHorizontalRule(), defineHTMLComment(), defineInlineMarks(), defineViewAttributes({ class: "meowdown-content" }), defineCodeBlockSyntaxHighlight(), defineCrossEditorDrag(), defineEscapeCollapse(), defineMoveBlock(), defineSelectDocBoundary(), defineInlineMarkPlugin(options), defineInlineToggle(), defineLinkCommands(), defineWikilink(), defineMath(), defineMarkMode(options.markMode ?? "focus"), defineClipboard(), defineScrollToSelection(), defineHiddenRunCaret(), defineAtomMarkNavigation({ marks: ATOM_SOURCE_MARK_NAMES.map((name) => ({
+	return union(defineMeowdownParagraph(), defineDoc(), defineDocFrontmatterAttr(), defineText(), defineBlockquote(), defineMeowdownList(), defineHeading(), defineTable(), defineCodeBlock$1(), defineMeowdownHorizontalRule(), defineHTMLComment(), defineInlineMarks(), defineViewAttributes({ class: "meowdown-content" }), defineCodeBlockSyntaxHighlight(), defineCrossEditorDrag(), defineEscapeCollapse(), defineMoveBlock(), defineSelectDocBoundary(), defineInlineMarkPlugin(options), defineInlineToggle(), defineLinkCommands(), defineWikilink(), defineMath(), defineMarkMode(options.markMode ?? "focus"), defineClipboard(), defineScrollToSelection(), defineHiddenRunCaret(), defineSystemSubstitutionGuard(), defineAtomMarkNavigation({ marks: ATOM_SOURCE_MARK_NAMES.map((name) => ({
 		name,
 		modes: [
 			"hide",
@@ -7632,6 +7688,9 @@ function createSpellCheckPlugin(spellCheck) {
 		}
 	});
 }
+/**
+* @deprecated This will be removed in future versions.
+*/
 function defineSpellCheckPlugin(spellCheck) {
 	return definePlugin(createSpellCheckPlugin(spellCheck));
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@meowdown/core",
   "type": "module",
-  "version": "0.65.0",
+  "version": "0.65.2",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -26,24 +26,24 @@
     "@floating-ui/dom": "^1.8.0",
     "@lezer/highlight": "^1.2.3",
     "@ocavue/utils": "^1.7.0",
-    "@prosekit/core": "^0.13.0-beta.7",
-    "@prosekit/extensions": "^0.18.0-beta.19",
-    "@prosekit/pm": "^0.1.19-beta.4",
-    "@prosekit/web": "^0.9.0-beta.25",
+    "@prosekit/core": "^0.13.0",
+    "@prosekit/extensions": "^0.18.0",
+    "@prosekit/pm": "^0.1.19",
+    "@prosekit/web": "^0.9.0",
     "hast-util-to-mdast": "^10.1.2",
     "katex": "^0.18.1",
     "mdast-util-to-markdown": "^2.1.2",
     "micromark-util-decode-string": "^2.0.1",
     "micromark-util-normalize-identifier": "^2.0.1",
     "prosemirror-flat-list": "^0.7.1",
-    "prosemirror-highlight": "^0.15.3",
+    "prosemirror-highlight": "^0.16.0",
     "rehype-parse": "^9.0.1",
     "rehype-remark": "^10.0.1",
     "remark-gfm": "^4.0.1",
     "remark-stringify": "^11.0.0",
     "unicode-by-name": "^0.2.0",
     "unified": "^11.0.5",
-    "@meowdown/markdown": "^0.65.0"
+    "@meowdown/markdown": "^0.65.2"
   },
   "devDependencies": {
     "@ocavue/tsconfig": "^0.7.1",