@meowdown/core 0.64.2 → 0.64.3

package/dist/index.d.ts

@@ -260,7 +260,7 @@ interface MdMathAttrs {
  *   source reveals around the caret.
  */
 type MdPackAttrs = {
-  key: 'italic' | 'bold' | 'code' | 'del' | 'highlight' | 'autolink';
+  key: 'italic' | 'bold' | 'code' | 'del' | 'highlight';
   data?: null;
   slot?: 1 | null;
   revealInFocus: true;
@@ -268,13 +268,25 @@ type MdPackAttrs = {
 } | {
   key: 'link';
   data: {
+    form: 'inline' | 'reference';
     href: string;
     title: string;
-    isReference: boolean;
+  } | {
+    form: 'angle';
+    href: string;
   };
   slot?: 1 | null;
   revealInFocus: true;
   revealInHide?: null;
+} | {
+  key: 'link';
+  data: {
+    form: 'bare';
+    href: string;
+  };
+  slot?: 1 | null;
+  revealInFocus?: null;
+  revealInHide?: null;
 } | {
   key: 'math';
   data?: null;
@@ -296,7 +308,7 @@ interface PositionRange {
 }
 //#endregion
 //#region src/extensions/get-link-unit-at.d.ts
-interface LinkUnit {
+interface LinkUnitBase {
   /**
    * Whole inline link, reference link, or autolink range.
    */
@@ -308,14 +320,6 @@ interface LinkUnit {
    * whose collapsed glyphs measure at bogus coordinates.
    */
   text: PositionRange;
-  /**
-   * Interior of `[ ]`. Absent for an autolink.
-   */
-  label?: PositionRange;
-  /**
-   * Interior of `( )`. What `updateLink` rewrites. Absent for an autolink.
-   */
-  dest?: PositionRange;
   /**
    * The link URL. Could be an empty string.
    */
@@ -325,6 +329,25 @@ interface LinkUnit {
    */
   title: string;
 }
+type LinkUnit = (LinkUnitBase & {
+  form: 'inline';
+  /**
+   * Interior of `[ ]`.
+   */
+  label: PositionRange;
+  /**
+   * Interior of `( )`. What `updateLink` rewrites.
+   */
+  dest: PositionRange;
+}) | (LinkUnitBase & {
+  /**
+   * A reference link or autolink resolves an href but has no editable
+   * label/dest.
+   */
+  form: 'reference' | 'angle' | 'bare';
+  label?: undefined;
+  dest?: undefined;
+});
 /**
  * The link covering `pos`, with its sub-ranges (`label`, `dest`) and parsed
  * `href`/`title`. The single query the commands and the hover/click handlers

package/dist/index.js

@@ -347,19 +347,14 @@ function resolvePosition(state, pos) {
 	return $pos;
 }
 /**
-* Returns the run of the first listed mark covering `pos`, or `undefined` when
-* none covers it. `attrs` narrows the match to marks whose attributes contain
-* it, which is how a caller picks one level out of a nested stack of the same
-* mark.
+* Returns the run of the mark covering `pos`, or `undefined` when none covers
+* it. `attrs` narrows the match to marks whose attributes contain it, which
+* is how a caller picks one level out of a nested stack of the same mark.
 */
 function getMarkRangeAt(state, pos, markName, attrs) {
 	const $pos = resolvePosition(state, pos);
 	if (!$pos) return;
-	const markNames = Array.isArray(markName) ? markName : [markName];
-	for (const name of markNames) {
-		const range = ATOM_MARK_NAMES.includes(name) ? getAtomUnitRange(state, $pos, name) : getMarkRange($pos, name, attrs);
-		if (range) return range;
-	}
+	return ATOM_MARK_NAMES.includes(markName) ? getAtomUnitRange(state, $pos, markName) : getMarkRange($pos, markName, attrs);
 }
 /**
 * The range of the atom unit touching `$pos`, preferring the child to the
@@ -2848,7 +2843,6 @@ function getGenericPackKey(type) {
 		case LEZER_NODE_IDS.InlineCode: return "code";
 		case LEZER_NODE_IDS.Strikethrough: return "del";
 		case LEZER_NODE_IDS.Highlight: return "highlight";
-		case LEZER_NODE_IDS.Autolink: return "autolink";
 		default: return;
 	}
 }
@@ -2914,6 +2908,7 @@ function walkNode(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);
 		default: return walkGenericNode(node, parentMarks, text, marks, out, options, context);
 	}
@@ -2935,14 +2930,55 @@ function walkGenericNode(node, parentMarks, text, marks, out, options, context)
 	else walk(node.children, childMarks, node.from, node.to, text, marks, out, options, context);
 }
 /**
-* A standalone `URL` node is a GFM autolink (the address part of a real
-* `[text](url)` is handled inside `walkResolvedLink`, not here). Linkify the
-* shapes we recognize; anything else keeps the muted `mdLinkUri`.
+* Special walker for an angle autolink `<url>`. The unit's `href` lives on
+* its pack, computed from the `URL` child (`''` when the address is not
+* linkable, in which case the URL keeps the muted `mdLinkUri`). The children
+* are only the `<`/`>` marks and the `URL`, consumed right here: the `URL`
+* is a component of this unit, never a unit of its own.
+*/
+function walkAutolink(node, parentMarks, text, marks, out) {
+	const urlNode = node.children.find((child) => child.type === LEZER_NODE_IDS.URL);
+	const href = urlNode ? getAutolinkHref(text.slice(urlNode.from, urlNode.to)) ?? "" : "";
+	const base = [...parentMarks, createUnitPack(marks, out, parentMarks, node.from, {
+		key: "link",
+		data: {
+			form: "angle",
+			href
+		},
+		revealInFocus: true
+	})];
+	let pos = node.from;
+	for (const child of node.children) {
+		if (child.from > pos) emit(out, pos, child.from, base);
+		const childMark = child.type === LEZER_NODE_IDS.URL ? href ? marks.mdLinkText.create({ href }) : marks.mdLinkUri.create() : marks.mdMark.create();
+		emit(out, child.from, child.to, [...base, childMark]);
+		pos = child.to;
+	}
+	if (pos < node.to) emit(out, pos, node.to, base);
+}
+/**
+* A `URL` node reaching this walker is a standalone GFM autolink: the address
+* part of a `[text](url)` link is consumed by `walkResolvedLink`, and an
+* angle autolink's URL by `walkAutolink`. Linkify the shapes we recognize,
+* packing each as its own unit; anything else keeps the muted `mdLinkUri`.
 */
 function walkURL(node, parentMarks, text, marks, out) {
 	const href = getAutolinkHref(text.slice(node.from, node.to));
-	const mark = href ? marks.mdLinkText.create({ href }) : marks.mdLinkUri.create();
-	emit(out, node.from, node.to, [...parentMarks, mark]);
+	if (!href) {
+		emit(out, node.from, node.to, [...parentMarks, marks.mdLinkUri.create()]);
+		return;
+	}
+	emit(out, node.from, node.to, [
+		...parentMarks,
+		createUnitPack(marks, out, parentMarks, node.from, {
+			key: "link",
+			data: {
+				form: "bare",
+				href
+			}
+		}),
+		marks.mdLinkText.create({ href })
+	]);
 }
 function walkLink(node, parentMarks, text, marks, out, options, context) {
 	const parts = scanLinkParts(node);
@@ -2966,6 +3002,9 @@ function walkLink(node, parentMarks, text, marks, out, options, context) {
 * Locate the pieces of a `Link` node in Lezer's flat child list:
 *   LinkMark `[`, [label children], LinkMark `]`, LinkMark `(`, URL,
 *   optional LinkTitle, LinkMark `)`.
+*
+* An autolink inside the label also emits a `URL` child, so only a `URL`
+* after the second `LinkMark` (the `]` closing the label) is the destination.
 */
 function scanLinkParts(node) {
 	let labelFrom = -1;
@@ -2982,7 +3021,7 @@ function scanLinkParts(node) {
 			bracketCount++;
 			if (bracketCount === 1) labelFrom = child.to;
 			if (bracketCount === 2) labelTo = child.from;
-		} else if (urlNode == null && childType === LEZER_NODE_IDS.URL) urlNode = child;
+		} else if (urlNode == null && bracketCount >= 2 && childType === LEZER_NODE_IDS.URL) urlNode = child;
 		else if (titleNode == null && childType === LEZER_NODE_IDS.LinkTitle) titleNode = child;
 		else if (referenceLabelNode == null && childType === LEZER_NODE_IDS.LinkLabel) referenceLabelNode = child;
 	}
@@ -3084,9 +3123,9 @@ function walkResolvedLink(node, parts, resolution, parentMarks, text, marks, out
 	const pack = createUnitPack(marks, out, parentMarks, node.from, {
 		key: "link",
 		data: {
+			form: isReference ? "reference" : "inline",
 			href,
-			title,
-			isReference
+			title
 		},
 		revealInFocus: true
 	});
@@ -3118,6 +3157,11 @@ function walkResolvedLink(node, parts, resolution, parentMarks, text, marks, out
 			pos = child.to;
 			continue;
 		}
+		if (child.type === LEZER_NODE_IDS.URL && inLabel(child.from)) {
+			emit(out, child.from, child.to, baseForChild);
+			pos = child.to;
+			continue;
+		}
 		const maybeMarkName = MARK_NAME_BY_TYPE_ID.get(child.type);
 		const childMarks = maybeMarkName ? [...baseForChild, marks[maybeMarkName].create()] : baseForChild;
 		if (child.children.length === 0) emit(out, child.from, child.to, childMarks);
@@ -3709,10 +3753,11 @@ function defineMdMath() {
 }
 /**
 * Wraps a whole inline unit. For a revealable unit (emphasis, strong, code,
-* strikethrough, link, autolink, math) focus mode reveals the unit with one
-* range lookup instead of stitching its punctuation back together; an atom
-* unit (wikilink, image, file) carries it purely as unit identity.
-* `excludes: ''` lets nested units carry two of these marks at once.
+* strikethrough, inline and angle link, math) focus mode reveals the unit
+* with one range lookup instead of stitching its punctuation back together;
+* a unit that never reveals (wikilink, image, file, bare autolink) carries
+* it as unit identity. `excludes: ''` lets nested units carry two of these
+* marks at once.
 */
 function defineMdPack() {
 	return defineMarkSpec({
@@ -4106,67 +4151,66 @@ function lastMarkRunIn(state, range, markName) {
 * the `mdLinkUri` run locates the `( )` body.
 */
 function getLinkUnitAt(state, pos) {
-	const linkText = getMarkRangeAt(state, pos, "mdLinkText");
-	const pack = getMarkRangeAt(state, pos, "mdPack", { key: "link" }) ?? getMarkRangeAt(state, pos, "mdPack", { key: "autolink" });
-	const unit = pack ?? linkText;
+	const unit = getMarkRangeAt(state, pos, "mdPack", { key: "link" });
 	if (!unit) return;
-	const packAttrs = pack?.mark.attrs;
-	const href = (linkText?.mark.attrs)?.href ?? "";
-	if (!pack || packAttrs?.key !== "link") {
-		const unitRange = {
-			from: unit.from,
-			to: unit.to
+	const { data } = unit.mark.attrs;
+	const unitRange = {
+		from: unit.from,
+		to: unit.to
+	};
+	switch (data.form) {
+		case "bare": return {
+			form: "bare",
+			unit: unitRange,
+			text: unitRange,
+			href: data.href,
+			title: ""
 		};
-		return {
+		case "angle": return {
+			form: "angle",
 			unit: unitRange,
-			text: packAttrs?.key === "autolink" ? lastMarkRunIn(state, unitRange, "mdLinkText") ?? {
+			text: {
 				from: unit.from + 1,
 				to: unit.to - 1
-			} : unitRange,
-			href,
-			title: ""
-		};
-	}
-	const linkData = packAttrs.data;
-	if (linkData.isReference) {
-		const text = linkText == null ? {
-			from: unit.from,
-			to: unit.to
-		} : {
-			from: linkText.from + 1,
-			to: linkText.to
-		};
-		return {
-			unit: {
-				from: unit.from,
-				to: unit.to
 			},
-			text,
-			href: linkData.href,
-			title: linkData.title
+			href: data.href,
+			title: ""
 		};
+		case "reference": {
+			const linkText = getMarkRangeAt(state, pos, "mdLinkText");
+			return {
+				form: "reference",
+				unit: unitRange,
+				text: linkText == null ? unitRange : {
+					from: linkText.from + 1,
+					to: linkText.to
+				},
+				href: data.href,
+				title: data.title
+			};
+		}
+		case "inline": {
+			const uri = lastMarkRunIn(state, unitRange, "mdLinkUri");
+			const closeBracket = uri ? uri.from - 2 : unit.to - 3;
+			const destFrom = uri ? uri.from : unit.to - 1;
+			const label = {
+				from: unit.from + 1,
+				to: closeBracket
+			};
+			return {
+				form: "inline",
+				unit: unitRange,
+				text: label,
+				label,
+				dest: {
+					from: destFrom,
+					to: unit.to - 1
+				},
+				href: data.href,
+				title: data.title
+			};
+		}
 	}
-	const uri = lastMarkRunIn(state, unit, "mdLinkUri");
-	const closeBracket = uri ? uri.from - 2 : unit.to - 3;
-	const destFrom = uri ? uri.from : unit.to - 1;
-	const label = {
-		from: unit.from + 1,
-		to: closeBracket
-	};
-	return {
-		unit: {
-			from: unit.from,
-			to: unit.to
-		},
-		text: label,
-		label,
-		dest: {
-			from: destFrom,
-			to: unit.to - 1
-		},
-		href: linkData.href,
-		title: linkData.title
-	};
 }
 
 //#endregion
@@ -4226,7 +4270,7 @@ function insertLink({ href, title, wrapText = true } = {}) {
 function updateLink(attrs) {
 	return (state, dispatch) => {
 		const link = getLinkUnitAt(state, state.selection.from);
-		if (!link?.dest) return false;
+		if (link?.form !== "inline") return false;
 		const dest = destText(normalizeHref(attrs.href ?? link.href), attrs.title ?? link.title);
 		if (dispatch) dispatch(state.tr.insertText(dest, link.dest.from, link.dest.to).scrollIntoView());
 		return true;
@@ -4238,7 +4282,7 @@ function updateLink(attrs) {
 function removeLink() {
 	return (state, dispatch) => {
 		const link = getLinkUnitAt(state, state.selection.from);
-		if (!link?.label) return false;
+		if (link?.form !== "inline") return false;
 		if (dispatch) dispatch(state.tr.delete(link.label.to, link.unit.to).delete(link.unit.from, link.label.from).scrollIntoView());
 		return true;
 	};
@@ -4254,7 +4298,7 @@ function openLinkEdit(onLinkEdit) {
 	return (state, dispatch, view) => {
 		const link = getLinkUnitAt(state, state.selection.from);
 		if (link) {
-			if (link.label == null || link.dest == null) return false;
+			if (link.form !== "inline") return false;
 			if (dispatch && view) {
 				const { unit: { from, to } } = link;
 				dispatch(state.tr.setSelection(TextSelection.create(state.doc, from, to)).scrollIntoView());

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@meowdown/core",
   "type": "module",
-  "version": "0.64.2",
+  "version": "0.64.3",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -43,7 +43,7 @@
     "remark-stringify": "^11.0.0",
     "unicode-by-name": "^0.2.0",
     "unified": "^11.0.5",
-    "@meowdown/markdown": "^0.64.2"
+    "@meowdown/markdown": "^0.64.3"
   },
   "devDependencies": {
     "@ocavue/tsconfig": "^0.7.1",