@meowdown/core 0.67.1 → 0.68.0

package/README.md

@@ -31,7 +31,7 @@ const markdown = docToMarkdown(editor.state.doc)
 
 [CommonMark](https://commonmark.org/) and [GFM](https://github.github.com/gfm/), plus:
 
-- Wikilinks (`[[target]]`, `[[target|alias]]`)
+- Wikilinks (`[[target]]`; alias forms such as `[[target|alias]]` are the host's to split via `resolveWikilink`)
 - Wiki embeds (`![[path]]`)
 - Tags (`#tag`)
 - Highlight (`==highlight==`)

package/dist/index.d.ts

@@ -215,7 +215,14 @@ interface MdLinkTextAttrs {
   href: string;
 }
 interface MdWikilinkAttrs {
+  /**
+   * Target passed to click and hover handlers: the bracketed text unless the
+   * host's `resolveWikilink` replaced it.
+   */
   target: string;
+  /**
+   * Label shown in place of the source, or `''` to show the target.
+   */
   display: string;
 }
 /**
@@ -593,6 +600,45 @@ export declare function formatSizedWikiEmbed(target: string, width: number, heig
  */
 export declare function wikiEmbedBasename(target: string): string;
 //#endregion
+//#region src/extensions/wikilink.d.ts
+/**
+ * What {@link WikilinkResolver} sees for one `[[...]]` wikilink.
+ */
+interface WikilinkPayload {
+  /**
+   * The text between the brackets, trimmed. Meowdown reads no syntax inside
+   * it: an alias form such as `[[target|alias]]` arrives here whole.
+   */
+  target: string;
+}
+/**
+ * A resolved wikilink.
+ */
+interface WikilinkResolution {
+  /**
+   * Target passed to click and hover handlers. Defaults to the bracketed text.
+   */
+  target?: string;
+  /**
+   * Label shown in place of the source. Defaults to the target.
+   */
+  display?: string;
+}
+/**
+ * Resolves one `[[...]]` wikilink into the target its handlers receive and
+ * the label its chip shows; the Markdown source stays as written. Return
+ * `undefined` to use the bracketed text as both. The resolver participates
+ * in the parse cache, so it must be pure: the same payload must always
+ * return the same result.
+ */
+type WikilinkResolver = (link: WikilinkPayload) => WikilinkResolution | undefined;
+/**
+ * Host options for wikilink parsing.
+ */
+interface WikilinkOptions {
+  resolveWikilink?: WikilinkResolver;
+}
+//#endregion
 //#region src/extensions/inline-text-to-mark-chunks.d.ts
 /**
  * What {@link FileLinkResolver} sees for one `[label](url)` link.
@@ -632,7 +678,7 @@ interface FileLinkOptions {
 /**
  * Host options that influence source-backed inline atom parsing.
  */
-type InlineMarkOptions = FileLinkOptions & WikiEmbedOptions;
+type InlineMarkOptions = FileLinkOptions & WikiEmbedOptions & WikilinkOptions;
 interface InlineMarkContext {
   /**
    * Effective document-wide definitions, keyed by normalized reference label.
@@ -861,9 +907,9 @@ declare function defineEditorExtensionImpl(options: EditorExtensionOptions): imp
 type EditorExtension = ReturnType<typeof defineEditorExtensionImpl>;
 /**
  * Options for {@link defineEditorExtension}. Creation-time configuration:
- * `resolveFileLink` and `resolveWikiEmbed` are baked into the editor's parse
- * pipeline, so changing them requires rebuilding the editor; `markMode` is
- * only the initial value.
+ * `resolveFileLink`, `resolveWikiEmbed`, and `resolveWikilink` are baked into
+ * the editor's parse pipeline, so changing them requires rebuilding the
+ * editor; `markMode` is only the initial value.
  */
 type EditorExtensionOptions = InlineMarkOptions & {
   /**
@@ -1594,4 +1640,4 @@ export declare function getSelectedText(state: EditorState): string;
  */
 export declare function getVirtualElementFromRange(view: EditorView, range: PositionRange): VirtualElement;
 //#endregion
-export { type AcceptPendingReplacementOptions, type CheckRoundTripOptions, type CodeBlockAttrs, type CodeBlockFenceStyle, type CodeToken, type DocToMarkdownOptions, type EditorExtension, type EditorExtensionOptions, type EmbedDescriptor, type ExitBoundaryHandler, type ExitBoundaryOptions, type FileClickHandler, type FileClickPayload, type FileInfo, type FileInfoResolver, type FileLinkOptions, type FileLinkPayload, type FileLinkResolver, type FilePasteHandler, type FilePasteOptions, type FileSaveErrorHandler, type FileViewOptions, type FollowLinkHandlers, type ImageClickHandler, type ImageClickPayload, type ImageOptions, type InlineMarkContext, type InlineMarkOptions, type KaTeXRender, type LanguageItem, type LinkAttrs, type LinkClickHandler, type LinkClickPayload, type LinkCopyHandler, type LinkCopyPayload, type LinkEditHandler, type LinkEditOptions, type LinkHoverHandler, type LinkHoverOptions, type LinkPreview, type LinkPreviewResolver, type LinkUnit, type ListMarker, type MarkChunk, type MarkMode, type MarkName, type MarkdownToDocOptions, type MdFileAttrs, type MdImageAttrs, type MdLinkTextAttrs, type MdMathAttrs, type MdWikilinkAttrs, type MeowdownCodeBlockAttrs, type MeowdownHTMLCommentAttrs, type MeowdownListAttrs, type MeowdownTableCellAttrs, type NodeName, type ParsedWikiEmbed, type PendingReplacement, type PendingReplacementEvent, type PendingReplacementHandler, type PendingReplacementMode, type PendingReplacementOutcome, type PlaceholderOptions, type PositionRange, Priority, type ReferenceDefinition, type ReferenceDefinitionIndex, type ReferenceDefinitions, type RoundTripFidelity, type SearchStatus, type SearchStatusHandler, type StartPendingReplacementOptions, type TableColumnAlign, type TagClickHandler, type TagClickPayload, type TypedEditor, type TypedMarkBuilders, type VirtualElement, type WikiEmbedOptions, type WikiEmbedResolution, type WikiEmbedResolver, type WikilinkClickHandler, type WikilinkClickPayload, type WikilinkHoverHandler, type WikilinkHoverHit, defineCodeBlockPreviewPlugin, definePlaceholder, defineReadonly, defineSearchStatusHandler, getSearchStatus, isCodeBlockPreviewHiddenDecoration, withPriority };
+export { type AcceptPendingReplacementOptions, type CheckRoundTripOptions, type CodeBlockAttrs, type CodeBlockFenceStyle, type CodeToken, type DocToMarkdownOptions, type EditorExtension, type EditorExtensionOptions, type EmbedDescriptor, type ExitBoundaryHandler, type ExitBoundaryOptions, type FileClickHandler, type FileClickPayload, type FileInfo, type FileInfoResolver, type FileLinkOptions, type FileLinkPayload, type FileLinkResolver, type FilePasteHandler, type FilePasteOptions, type FileSaveErrorHandler, type FileViewOptions, type FollowLinkHandlers, type ImageClickHandler, type ImageClickPayload, type ImageOptions, type InlineMarkContext, type InlineMarkOptions, type KaTeXRender, type LanguageItem, type LinkAttrs, type LinkClickHandler, type LinkClickPayload, type LinkCopyHandler, type LinkCopyPayload, type LinkEditHandler, type LinkEditOptions, type LinkHoverHandler, type LinkHoverOptions, type LinkPreview, type LinkPreviewResolver, type LinkUnit, type ListMarker, type MarkChunk, type MarkMode, type MarkName, type MarkdownToDocOptions, type MdFileAttrs, type MdImageAttrs, type MdLinkTextAttrs, type MdMathAttrs, type MdWikilinkAttrs, type MeowdownCodeBlockAttrs, type MeowdownHTMLCommentAttrs, type MeowdownListAttrs, type MeowdownTableCellAttrs, type NodeName, type ParsedWikiEmbed, type PendingReplacement, type PendingReplacementEvent, type PendingReplacementHandler, type PendingReplacementMode, type PendingReplacementOutcome, type PlaceholderOptions, type PositionRange, Priority, type ReferenceDefinition, type ReferenceDefinitionIndex, type ReferenceDefinitions, type RoundTripFidelity, type SearchStatus, type SearchStatusHandler, type StartPendingReplacementOptions, type TableColumnAlign, type TagClickHandler, type TagClickPayload, type TypedEditor, type TypedMarkBuilders, type VirtualElement, type WikiEmbedOptions, type WikiEmbedResolution, type WikiEmbedResolver, type WikilinkClickHandler, type WikilinkClickPayload, type WikilinkHoverHandler, type WikilinkHoverHit, type WikilinkOptions, type WikilinkPayload, type WikilinkResolution, type WikilinkResolver, defineCodeBlockPreviewPlugin, definePlaceholder, defineReadonly, defineSearchStatusHandler, getSearchStatus, isCodeBlockPreviewHiddenDecoration, withPriority };

package/dist/index.js

@@ -190,7 +190,9 @@ function computeRevealDecorations(state, mode) {
 		});
 	}
 	if (ranges.length === 0) return;
-	const decorations = ranges.map((range) => Decoration.inline(range.from, range.to, { class: "show" }));
+	const decorations = ranges.map((range) => {
+		return Decoration.inline(range.from, range.to, { class: "show" });
+	});
 	return DecorationSet.create(state.doc, decorations);
 }
 function defineMarkMode(mode) {
@@ -962,11 +964,13 @@ function headingFromDOM() {
 		4,
 		5,
 		6
-	].map((level) => createSourceTextRule(`h${level}`, "heading", (dom) => ({
-		level,
-		setextUnderline: parsePositiveInteger(dom.getAttribute("data-setext-underline")) ?? null,
-		closingHashes: parsePositiveInteger(dom.getAttribute("data-closing-hashes")) ?? null
-	})));
+	].map((level) => {
+		return createSourceTextRule(`h${level}`, "heading", (dom) => ({
+			level,
+			setextUnderline: parsePositiveInteger(dom.getAttribute("data-setext-underline")) ?? null,
+			closingHashes: parsePositiveInteger(dom.getAttribute("data-closing-hashes")) ?? null
+		}));
+	});
 }
 function defineSetextUnderlineAttr() {
 	return defineNodeAttr({
@@ -3038,67 +3042,6 @@ function wikiEmbedBasename(target) {
 	}
 }
 
-//#endregion
-//#region src/extensions/wikilink.ts
-/**
-* Splits `[[target]]`/`[[target|alias]]` into its target and display label (the alias, or empty).
-*/
-function parseWikilink(text) {
-	const inner = text.replace(/^\[\[/, "").replace(/\]\]$/, "");
-	const pipe = inner.indexOf("|");
-	if (pipe < 0) return {
-		target: inner.trim(),
-		display: ""
-	};
-	return {
-		target: inner.slice(0, pipe).trim(),
-		display: inner.slice(pipe + 1).trim()
-	};
-}
-/**
-* Render `mdWikilink` as a non-editable label standing in for the raw source.
-* The source stays in `contentDOM` after the label, hidden by `style.css`
-* (`.md-atom-view-content`); the whole wikilink is one caret stop owned by
-* `defineAtomMarkNavigation`.
-*/
-function createWikilinkMarkView() {
-	return (mark) => {
-		const attrs = mark.attrs;
-		const dom = document.createElement("span");
-		dom.className = "md-wikilink-view md-atom-view";
-		const preview = document.createElement("span");
-		preview.className = "md-wikilink-view-preview md-atom-view-preview";
-		preview.contentEditable = "false";
-		preview.dataset.testid = "wikilink";
-		dom.appendChild(preview);
-		const label = document.createElement("span");
-		label.className = "md-wikilink-view-label";
-		label.contentEditable = "false";
-		label.textContent = attrs.display || attrs.target;
-		preview.appendChild(label);
-		const contentDOM = document.createElement("span");
-		contentDOM.className = "md-wikilink-view-content md-atom-view-content";
-		dom.appendChild(contentDOM);
-		return {
-			dom,
-			contentDOM,
-			ignoreMutation: (mutation) => !contentDOM.contains(mutation.target)
-		};
-	};
-}
-/**
-* Render `[[target]]`/`[[target|alias]]` as an immutable inline label (a mark
-* view) standing in for the raw source. The single-caret-stop behavior comes
-* from the shared `defineAtomMarkNavigation` in the editor extension, which
-* treats `mdWikilink` (and `mdImage`) as one unit.
-*/
-function defineWikilink() {
-	return defineMarkView({
-		name: "mdWikilink",
-		constructor: createWikilinkMarkView()
-	});
-}
-
 //#endregion
 //#region src/extensions/inline-text-to-mark-chunks.ts
 /**
@@ -3221,7 +3164,7 @@ function walkAtomChild(nodes, index, parentMarks, text, marks, out, options, con
 	const node = nodes[index];
 	switch (node.type) {
 		case LEZER_NODE_IDS.Wikilink:
-			walkWikilink(node, parentMarks, text, marks, out);
+			walkWikilink(node, parentMarks, text, marks, out, options);
 			return node.to;
 		case LEZER_NODE_IDS.WikiEmbed:
 			walkWikiEmbed(node, parentMarks, text, marks, out, options);
@@ -3577,16 +3520,18 @@ function walkMath(node, parentMarks, text, marks, out) {
 	emit(out, markNodes[1].from, node.to, [...base, marks.mdMark.create()]);
 }
 /**
-* Special walker for a wikilink `[[target]]`/`[[target|alias]]`.
+* Special walker for a wikilink `[[...]]`. The bracketed text is the target
+* and the label unless the host's `resolveWikilink` replaces either.
 */
-function walkWikilink(node, parentMarks, text, marks, out) {
-	const { target, display } = parseWikilink(text.slice(node.from, node.to));
+function walkWikilink(node, parentMarks, text, marks, out, options) {
+	const source = text.slice(node.from + 2, node.to - 2).trim();
+	const resolution = options?.resolveWikilink?.({ target: source });
 	emit(out, node.from, node.to, [
 		...parentMarks,
 		createUnitPack(marks, out, parentMarks, node.from, { key: "wikilink" }),
 		marks.mdWikilink.create({
-			target,
-			display
+			target: resolution?.target ?? source,
+			display: resolution?.display ?? ""
 		})
 	]);
 }
@@ -4041,7 +3986,7 @@ function defineMdTag() {
 	});
 }
 /**
-* Covers the whole `[[target]]`/`[[target|alias]]` source.
+* Covers the whole `[[...]]` source.
 */
 function defineMdWikilink() {
 	return defineMarkSpec({
@@ -4428,11 +4373,13 @@ function toggleInline(spec) {
 			return false;
 		});
 		const remove = segments.length > 0 && segments.every((segment) => segment.active);
-		const edits = segments.filter((segment) => remove || !segment.active).flatMap((segment) => toggleInlineEdits(segment.text, segment.from, segment.to, spec, remove).map((edit) => ({
-			from: edit.from + segment.base,
-			to: edit.to + segment.base,
-			insert: edit.insert
-		})));
+		const edits = segments.filter((segment) => remove || !segment.active).flatMap((segment) => {
+			return toggleInlineEdits(segment.text, segment.from, segment.to, spec, remove).map((edit) => ({
+				from: edit.from + segment.base,
+				to: edit.to + segment.base,
+				insert: edit.insert
+			}));
+		});
 		if (edits.length === 0) return false;
 		if (dispatch) {
 			const tr = state.tr;
@@ -4513,7 +4460,9 @@ function lastMarkRunIn(state, range, markName) {
 * the `mdLinkUri` run locates the `( )` body.
 */
 function getLinkUnitAt(state, pos) {
-	const unit = getMarkRangeAt(state, pos, "mdPack", (mark) => mark.attrs.key.startsWith("link-"));
+	const unit = getMarkRangeAt(state, pos, "mdPack", (mark) => {
+		return mark.attrs.key.startsWith("link-");
+	});
 	if (!unit) return;
 	const attrs = unit.mark.attrs;
 	const unitRange = {
@@ -5737,7 +5686,8 @@ function tryCoordsAtPos(view, pos, side) {
 	let coords;
 	try {
 		coords = view.coordsAtPos(pos, side);
-	} catch {
+	} catch (error) {
+		console.warn(`[meowdown] Failed to get caret coords at pos ${pos}:`, error);
 		return;
 	}
 	return isPointRect(coords) ? void 0 : coords;
@@ -5758,9 +5708,12 @@ function findNativeCaretRect(view) {
 	if (!view.dom.contains(selection.anchorNode)) return void 0;
 	const range = selection.getRangeAt(0).cloneRange();
 	range.collapse(true);
+	return findLastRangeRect(range);
+}
+function findLastRangeRect(range) {
 	const rects = Array.from(range.getClientRects()).filter((rect) => rect.height > 0);
-	if (rects.length === 0) return void 0;
 	const rect = rects[rects.length - 1];
+	if (rect == null) return void 0;
 	return {
 		left: rect.left,
 		top: rect.top,
@@ -5773,18 +5726,35 @@ function findCoordsCaretRect(view) {
 	const runBefore = getHiddenRunBefore(state, head);
 	const runAfter = getHiddenRunAfter(state, head);
 	const afterLineBreak = isAfterLineBreak($head);
-	const preferredBeforeSide = runBefore == null && !afterLineBreak;
-	const probes = [[head, preferredBeforeSide], [head, !preferredBeforeSide]];
+	const previousLineTop = afterLineBreak ? tryCoordsAtPos(view, head, -1)?.top : void 0;
+	const probes = afterLineBreak ? [[head, false]] : [[head, runBefore == null], [head, runBefore != null]];
 	if (runBefore != null) probes.push([runBefore.from, true]);
 	if (runAfter != null) probes.push([runAfter.to, false]);
 	for (const [pos, beforeSide] of probes) {
 		const coords = tryCoordsAtPos(view, pos, beforeSide ? -1 : 1);
-		if (coords != null && coords.bottom > coords.top) return {
+		if (coords == null || coords.bottom <= coords.top) continue;
+		if (pos === head && previousLineTop != null && coords.top <= previousLineTop) continue;
+		return {
 			left: coords.left,
 			top: coords.top,
 			height: coords.bottom - coords.top
 		};
 	}
+	if (previousLineTop != null) {
+		const collapsed = findCollapsedRangeRect(view, head);
+		if (collapsed != null && collapsed.top > previousLineTop) return collapsed;
+	}
+}
+function findCollapsedRangeRect(view, pos) {
+	try {
+		const { node, offset } = view.domAtPos(pos, 0);
+		const range = view.dom.ownerDocument.createRange();
+		range.setStart(node, offset);
+		range.collapse(true);
+		return findLastRangeRect(range);
+	} catch {
+		return;
+	}
 }
 function findAtomCaretRect(view) {
 	const state = view.state;
@@ -6055,6 +6025,52 @@ function defineViewAttributes(attributes) {
 	return definePlugin(new Plugin({ props: { attributes } }));
 }
 
+//#endregion
+//#region src/extensions/wikilink.ts
+/**
+* Render `mdWikilink` as a non-editable label standing in for the raw source.
+* The source stays in `contentDOM` after the label, hidden by `style.css`
+* (`.md-atom-view-content`); the whole wikilink is one caret stop owned by
+* `defineAtomMarkNavigation`.
+*/
+function createWikilinkMarkView() {
+	return (mark) => {
+		const attrs = mark.attrs;
+		const dom = document.createElement("span");
+		dom.className = "md-wikilink-view md-atom-view";
+		const preview = document.createElement("span");
+		preview.className = "md-wikilink-view-preview md-atom-view-preview";
+		preview.contentEditable = "false";
+		preview.dataset.testid = "wikilink";
+		dom.appendChild(preview);
+		const label = document.createElement("span");
+		label.className = "md-wikilink-view-label";
+		label.contentEditable = "false";
+		label.textContent = attrs.display || attrs.target;
+		preview.appendChild(label);
+		const contentDOM = document.createElement("span");
+		contentDOM.className = "md-wikilink-view-content md-atom-view-content";
+		dom.appendChild(contentDOM);
+		return {
+			dom,
+			contentDOM,
+			ignoreMutation: (mutation) => !contentDOM.contains(mutation.target)
+		};
+	};
+}
+/**
+* Render `[[...]]` as an immutable inline label (a mark
+* view) standing in for the raw source. The single-caret-stop behavior comes
+* from the shared `defineAtomMarkNavigation` in the editor extension, which
+* treats `mdWikilink` (and `mdImage`) as one unit.
+*/
+function defineWikilink() {
+	return defineMarkView({
+		name: "mdWikilink",
+		constructor: createWikilinkMarkView()
+	});
+}
+
 //#endregion
 //#region src/extensions/extension.ts
 function defineEditorExtensionImpl(options) {

package/dist/style.css

@@ -691,6 +691,10 @@
     display: contents;
   }
 
+  .ProseMirror .md-pack[data-key="noLink"] {
+    display: inline;
+  }
+
   .ProseMirror[data-mark-mode="hide"], .ProseMirror[data-mark-mode="focus"] {
     & .md-mark, & .md-link-uri, & .md-link-title {
       letter-spacing: 0;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@meowdown/core",
   "type": "module",
-  "version": "0.67.1",
+  "version": "0.68.0",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -26,12 +26,12 @@
     "@floating-ui/dom": "^1.8.0",
     "@lezer/highlight": "^1.2.3",
     "@ocavue/utils": "^1.7.0",
-    "@prosekit/core": "^0.13.1",
-    "@prosekit/extensions": "^0.18.1",
+    "@prosekit/core": "^0.13.2",
+    "@prosekit/extensions": "^0.18.2",
     "@prosekit/pm": "^0.1.19",
-    "@prosekit/web": "^0.9.1",
+    "@prosekit/web": "^0.9.2",
     "hast-util-to-mdast": "^10.1.2",
-    "katex": "^0.18.1",
+    "katex": "^0.18.5",
     "mdast-util-to-markdown": "^2.1.2",
     "micromark-util-decode-string": "^2.0.1",
     "micromark-util-normalize-identifier": "^2.0.1",
@@ -43,19 +43,20 @@
     "remark-stringify": "^11.0.0",
     "unicode-by-name": "^0.2.0",
     "unified": "^11.0.5",
-    "@meowdown/markdown": "^0.67.1"
+    "@meowdown/markdown": "^0.68.0"
   },
   "devDependencies": {
     "@ocavue/tsconfig": "^0.7.1",
-    "@tsdown/css": "^0.23.0-beta.2",
+    "@tsdown/css": "^0.23.0-rc.1",
     "@types/hast": "^3.0.5",
     "@types/mdast": "^4.0.4",
     "@vitest/browser-playwright": "^4.1.11",
     "commonmark.json": "^0.31.0",
     "dedent": "^1.7.2",
     "diffable-html-snapshot": "^0.3.0",
-    "tsdown": "^0.23.0-beta.2",
+    "tsdown": "^0.23.0-rc.1",
     "vitest": "^4.1.11",
+    "vitest-browser-commands": "^0.4.1",
     "@meowdown/vitest": "0.0.0"
   },
   "publishConfig": {