isorite 0.9.1 → 0.10.0

package/dist/core.js

@@ -106,7 +106,7 @@ function normpath(p) {
 	}
 	return "/".repeat(initial) + out.join("/") || ".";
 }
-/** SHA-256 as hex, synchronous and dependency-free, so the core runs anywhere. */
+/** SHA-256 as hex, synchronous and dependency-free, so the core runs anywhere: of text (as UTF-8), or of bytes. */
 function sha256(message) {
 	const K = new Uint32Array([
 		1116352408,
@@ -174,7 +174,7 @@ function sha256(message) {
 		3204031479,
 		3329325298
 	]);
-	const data = new TextEncoder().encode(message);
+	const data = typeof message === "string" ? new TextEncoder().encode(message) : message;
 	const len = data.length;
 	const padded = new Uint8Array(len + 9 + 63 >> 6 << 6);
 	padded.set(data);
@@ -366,7 +366,7 @@ function linkTexts(body) {
 	return out;
 }
 /** Every link and image in a body, in order: where it points, its title, and whether it is an image
-*  (`![…](…)`, which for an artifact or a picture means "shown here", an embed). */
+*  (`![…](…)`, which for an artifact or a picture means "shown here", an embed), with an image's alt text. */
 function citeRefs(body) {
 	const { tokens } = parse$1(body);
 	const out = [];
@@ -380,7 +380,8 @@ function citeRefs(body) {
 		else if (c.type === "image") out.push({
 			href: c.attrGet("src") ?? "",
 			title: c.attrGet("title"),
-			embed: true
+			embed: true,
+			alt: c.content
 		});
 	}
 	return out;
@@ -424,6 +425,62 @@ function section(body, heading) {
 	return null;
 }
 //#endregion
+//#region packages/core/src/picture.ts
+const TYPES = {
+	png: "image/png",
+	jpg: "image/jpeg",
+	jpeg: "image/jpeg",
+	gif: "image/gif",
+	svg: "image/svg+xml",
+	webp: "image/webp",
+	avif: "image/avif"
+};
+/** A picture's media type, by its extension, or null when the path isn't a picture's (M22). */
+const pictureType = (path) => {
+	const dot = path.lastIndexOf(".");
+	return dot < 0 || path.lastIndexOf("/") > dot ? null : TYPES[path.slice(dot + 1).toLowerCase()] ?? null;
+};
+/** Width and height in pixels, or null. */
+function pictureSize(bytes, type) {
+	const v = new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength), n = bytes.length;
+	const at = (i, s) => [...s].every((c, k) => bytes[i + k] === c.charCodeAt(0));
+	const ok = (w, h) => w > 0 && h > 0 ? {
+		width: w,
+		height: h
+	} : null;
+	try {
+		if (type === "image/png" && n >= 24 && at(12, "IHDR")) return ok(v.getUint32(16), v.getUint32(20));
+		if (type === "image/gif" && n >= 10 && at(0, "GIF")) return ok(v.getUint16(6, true), v.getUint16(8, true));
+		if (type === "image/jpeg") {
+			for (let i = 2; i + 9 < n;) {
+				if (bytes[i] !== 255) return null;
+				const m = bytes[i + 1];
+				if (m >= 192 && m <= 207 && m !== 196 && m !== 200 && m !== 204) return ok(v.getUint16(i + 7), v.getUint16(i + 5));
+				i += 2 + v.getUint16(i + 2);
+			}
+			return null;
+		}
+		if (type === "image/webp" && n >= 30 && at(0, "RIFF") && at(8, "WEBP")) {
+			if (at(12, "VP8 ")) return ok(v.getUint16(26, true) & 16383, v.getUint16(28, true) & 16383);
+			if (at(12, "VP8L")) {
+				const b = v.getUint32(21, true);
+				return ok((b & 16383) + 1, (b >> 14 & 16383) + 1);
+			}
+			if (at(12, "VP8X")) return ok(1 + (bytes[24] | bytes[25] << 8 | bytes[26] << 16), 1 + (bytes[27] | bytes[28] << 8 | bytes[29] << 16));
+			return null;
+		}
+		if (type === "image/svg+xml") {
+			const head = new TextDecoder().decode(bytes.subarray(0, 4096)), tag = /<svg\b[^>]*>/i.exec(head)?.[0] ?? "";
+			const attr = (name) => new RegExp(`\\s${name}\\s*=\\s*["']\\s*([\\d.]+)\\s*(px)?\\s*["']`, "i").exec(tag);
+			const w = attr("width"), h = attr("height");
+			if (w && h) return ok(Math.round(Number(w[1])), Math.round(Number(h[1])));
+			const box = /\sviewBox\s*=\s*["']\s*[-\d.]+[\s,]+[-\d.]+[\s,]+([\d.]+)[\s,]+([\d.]+)/i.exec(tag);
+			return box ? ok(Math.round(Number(box[1])), Math.round(Number(box[2]))) : null;
+		}
+	} catch {}
+	return null;
+}
+//#endregion
 //#region packages/core/src/kinds.ts
 function kindOf(type) {
 	const t = type.trim().toLowerCase();
@@ -507,6 +564,19 @@ function outwardLinks(body) {
 		}
 		seen.add(href);
 	}
+	for (const { href, embed, alt } of citeRefs(body)) {
+		if (!embed || seen.has(href)) continue;
+		const c = codeTarget(href);
+		if (!c || !pictureType(c.path)) continue;
+		out.push({
+			kind: "code",
+			href,
+			text: alt || c.path.split("/").at(-1),
+			path: c.path,
+			picture: true
+		});
+		seen.add(href);
+	}
 	return out;
 }
 //#endregion
@@ -697,7 +767,7 @@ var Bundle = class Bundle {
 			concept.links = links;
 			concept.outward = outwardLinks(concept.body);
 			for (const link of links) if (link.broken) this.issue(concept.path, "warning", "broken-link", `broken link to ${link.target}`);
-			for (const { href, title, embed } of citeRefs(concept.body)) {
+			for (const { href, title, embed, alt } of citeRefs(concept.body)) {
 				const path = this.filePath(concept, href), kind = path === null ? null : citeKind(path);
 				if (path === null || kind === null) continue;
 				const t = strip((title ?? "").toLowerCase());
@@ -707,10 +777,11 @@ var Bundle = class Bundle {
 					embed,
 					broken: !this.files.has(path),
 					rel: rating(title),
-					align: t === "left" ? "left" : t === "center" || t === "centre" ? "center" : null
+					align: t === "left" ? "left" : t === "center" || t === "centre" ? "center" : null,
+					...embed && alt ? { alt } : {}
 				};
 				concept.cites.push(cite);
-				if (cite.broken) this.issue(concept.path, "warning", "broken-link", `broken link to ${path}`);
+				if (cite.broken) this.issue(concept.path, "warning", "broken-link", kind === "image" ? `picture not in the notes: ${path}` : `broken link to ${path}`);
 			}
 		}
 		const byName = /* @__PURE__ */ new Map();
@@ -2087,13 +2158,16 @@ function mapModel(base) {
 			s
 		]);
 	}
+	const holdsFiles = /* @__PURE__ */ new Set();
+	for (const f of base.files) holdsFiles.add(f.includes("/") ? f.slice(0, f.lastIndexOf("/")) : "");
 	const dir = (id) => {
 		const d = base.directories.get(id);
-		return {
+		const children = [...[...d.children].sort().map(dir).filter((c) => c !== null), ...[...d.concepts].sort().map(note)];
+		return id && !children.length && (holdsFiles.has(id) || d.children.length) ? null : {
 			kind: "dir",
 			id: "d:" + id,
 			ref: id,
-			children: [...[...d.children].sort().map(dir), ...[...d.concepts].sort().map(note)]
+			children
 		};
 	};
 	return {
@@ -2216,4 +2290,4 @@ function ago(at, now = Date.now()) {
 /** A moment is named by its last entry: the one the note is shown at. */
 const momentKey = (m) => m.ids.at(-1);
 //#endregion
-export { ABOUT, AGENTS_FILE, Bundle, CONFIG_FILE, Concept, DEVICE_RE, DONE, DiffError, Directory, FrontmatterError, GITATTRIBUTES, ID_RE, KINDS, LearnerError, MAX_EVENT_BYTES, OKF_VERSION, OWN_DIR, OWN_FORMAT, RATINGS, SESSION_GAP_MS, SETTINGS_FILE, SNAPSHOT_EVERY, STRENGTH, STUDY_DIR, STUDY_FORMAT, SearchIndex, StudyError, agentName, ago, anchorOf, applyHunks, authors, blocks, change, citeKind, cleanEvent, cmp, cmpTuple, codeTarget, contentHash, describe, diffLines, doneOf, dumpFrontmatter, editFrontmatter, embedFor, embedRefs, findAnchor, findPassage, floatRepr, frontmatterText, hashText, headings, idsOf, impliedLinks, insertAt, iso, journalLine, journalPath, kindOf, legacyId, linkRefs, linkTexts, locate, mapModel, mergeRecords, momentKey, moments, newId, noteIds, outwardLinks, pagerank, parseSettings, parseStudyConfig, parseYaml, passageOf, pending, pyRepr, rating, reach, readJournal, readRecord, reconcile, recordPath, replay, round3, section, sessionMoments, settingsText, sha256, slugify, snippet, spliceText, splitFrontmatter, splitSource, stamp, strengthEdges, strip, stronglyConnected, text, textAt, toTime, tokenize, touched, wordAuthors, written };
+export { ABOUT, AGENTS_FILE, Bundle, CONFIG_FILE, Concept, DEVICE_RE, DONE, DiffError, Directory, FrontmatterError, GITATTRIBUTES, ID_RE, KINDS, LearnerError, MAX_EVENT_BYTES, OKF_VERSION, OWN_DIR, OWN_FORMAT, RATINGS, SESSION_GAP_MS, SETTINGS_FILE, SNAPSHOT_EVERY, STRENGTH, STUDY_DIR, STUDY_FORMAT, SearchIndex, StudyError, agentName, ago, anchorOf, applyHunks, authors, blocks, change, citeKind, cleanEvent, cmp, cmpTuple, codeTarget, contentHash, describe, diffLines, doneOf, dumpFrontmatter, editFrontmatter, embedFor, embedRefs, findAnchor, findPassage, floatRepr, frontmatterText, hashText, headings, idsOf, impliedLinks, insertAt, iso, journalLine, journalPath, kindOf, legacyId, linkRefs, linkTexts, locate, mapModel, mergeRecords, momentKey, moments, newId, noteIds, outwardLinks, pagerank, parseSettings, parseStudyConfig, parseYaml, passageOf, pending, pictureSize, pictureType, pyRepr, rating, reach, readJournal, readRecord, reconcile, recordPath, replay, round3, section, sessionMoments, settingsText, sha256, slugify, snippet, spliceText, splitFrontmatter, splitSource, stamp, strengthEdges, strip, stronglyConnected, text, textAt, toTime, tokenize, touched, wordAuthors, written };