@simple-mark/codemirror 0.1.0 → 0.2.0

package/index.js

@@ -2,7 +2,7 @@ import { defaultKeymap, history, historyKeymap } from "@codemirror/commands";
 import { commonmarkLanguage, markdown } from "@codemirror/lang-markdown";
 import { EditorState, Facet, Prec, StateEffect, StateField } from "@codemirror/state";
 import { Decoration, EditorView, ViewPlugin, WidgetType, hoverTooltip, keymap, showTooltip } from "@codemirror/view";
-import { cellAt, charWidth, defaultTheme, markdownExtensions, markdownStyles, parseTable, renderTable, resolveLineLook, resolveLook, rowLine } from "@simple-mark/model";
+import { cellAt, charWidth, defaultTheme, markdownExtensions, markdownStyles, mathSource, parseTable, previewBlocks, renderTable, resolveLineLook, resolveLook, rowLine } from "@simple-mark/model";
 import { ensureSyntaxTree, syntaxTree } from "@codemirror/language";
 //#region packages/codemirror/src/decorations.ts
 /** The theme the editor draws with. */
@@ -549,56 +549,24 @@ var MathBlockWidget = class extends WidgetType {
 		return dom;
 	}
 };
-/** The TeX of a math node: the text between its delimiters, without quote markers. */
-function mathTex(state, node) {
-	const marks = node.getChildren("MathMark");
-	if (marks.length < 2) return null;
-	if (node.name === "InlineMath") return state.sliceDoc(marks[0].to, marks[1].from);
-	return node.getChildren("MathText").map((text) => state.sliceDoc(text.from, text.to)).join("\n");
-}
-const normalizeLabel = (label) => label.slice(1, -1).trim().replace(/\s+/g, " ").toLowerCase();
-/** A link destination as written, without the optional angle brackets (`<a b.png>`). */
-const destination = (state, url) => state.sliceDoc(url.from, url.to).replace(/^<(.*)>$/, "$1");
-/** Link reference definitions (`[label]: url`) of the document, by normalized label. */
-function linkDefinitions(state, tree) {
-	const definitions = /* @__PURE__ */ new Map();
-	for (let node = tree.topNode.firstChild; node; node = node.nextSibling) {
-		if (node.name !== "LinkReference") continue;
-		const label = node.getChild("LinkLabel");
-		const url = node.getChild("URL");
-		if (label && url) {
-			const key = normalizeLabel(state.sliceDoc(label.from, label.to));
-			if (!definitions.has(key)) definitions.set(key, destination(state, url));
-		}
-	}
-	return definitions;
-}
-function imageRef(state, node, definitions, resolve) {
-	const marks = node.getChildren("LinkMark");
-	const alt = marks.length >= 2 ? state.sliceDoc(marks[0].to, marks[1].from) : "";
-	const url = node.getChild("URL");
-	let raw = url ? destination(state, url) : void 0;
-	if (raw === void 0) {
-		const labelNode = node.getChild("LinkLabel");
-		const labelText = labelNode && labelNode.to - labelNode.from > 2 ? state.sliceDoc(labelNode.from, labelNode.to) : `[${alt}]`;
-		raw = definitions.get(normalizeLabel(labelText));
-		if (raw === void 0) return {
-			raw: labelText,
-			src: null,
-			alt,
-			problem: `No definition for ${labelText}`
-		};
-	}
-	const src = resolve(raw);
+/** An image from the document with its path resolved by the host. */
+function imageRef(image, resolve) {
+	if (image.src === null) return {
+		raw: image.raw,
+		src: null,
+		alt: image.alt,
+		problem: `No definition for ${image.raw}`
+	};
+	const src = resolve(image.src);
 	return src === null ? {
-		raw,
+		raw: image.raw,
 		src,
-		alt,
-		problem: `Can't load ${raw}`
+		alt: image.alt,
+		problem: `Can't load ${image.raw}`
 	} : {
-		raw,
+		raw: image.raw,
 		src,
-		alt
+		alt: image.alt
 	};
 }
 var ImageWidget = class extends WidgetType {
@@ -672,35 +640,11 @@ var ImageWidget = class extends WidgetType {
 };
 /** What to preview below which lines: the images of each line, and closed non-empty $$ blocks. */
 function blockPreviewSources(state) {
-	const tree = syntaxTree(state);
 	const resolve = state.facet(imageResolver);
-	const definitions = linkDefinitions(state, tree);
-	const imagesByLine = /* @__PURE__ */ new Map();
-	const previews = [];
-	tree.iterate({ enter(node) {
-		if (node.name === "Image") {
-			const at = state.doc.lineAt(node.to).to;
-			let images = imagesByLine.get(at);
-			if (!images) {
-				imagesByLine.set(at, images = []);
-				previews.push({
-					at,
-					images
-				});
-			}
-			images.push(imageRef(state, node.node, definitions, resolve));
-			return false;
-		}
-		if (node.name === "BlockMath") {
-			const tex = mathTex(state, node.node);
-			if (tex !== null && tex.trim()) previews.push({
-				at: state.doc.lineAt(node.to).to,
-				tex
-			});
-			return false;
-		}
-	} });
-	return previews;
+	return previewBlocks(syntaxTree(state), state.doc.toString()).map((block) => "tex" in block ? block : {
+		at: block.at,
+		images: block.images.map((image) => imageRef(image, resolve))
+	});
 }
 function blockPreviews(state) {
 	const ranges = blockPreviewSources(state).map((preview) => {
@@ -728,7 +672,7 @@ function inlineMathAt(state, pos) {
 }
 function mathTooltip(state, pos) {
 	const node = inlineMathAt(state, pos);
-	const tex = node && mathTex(state, node);
+	const tex = node && mathSource(node, (from, to) => state.sliceDoc(from, to));
 	if (!node || !tex) return null;
 	const display = node.getChild("MathMark").to - node.from === 2;
 	return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simple-mark/codemirror",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "CodeMirror 6 editor that styles Markdown without hiding its syntax.",
   "license": "MIT",
   "type": "module",
@@ -28,7 +28,7 @@
     "@codemirror/state": "^6.7.6",
     "@codemirror/view": "^6.43.15",
     "@lezer/common": "^1.5.3",
-    "@simple-mark/math": "^0.1.0",
-    "@simple-mark/model": "^0.1.0"
+    "@simple-mark/math": "^0.2.0",
+    "@simple-mark/model": "^0.2.0"
   }
 }