@kensio/colophon 2.5.0 → 2.6.0

package/dist/stamp.js

@@ -1,198 +0,0 @@
-import { createHash } from "node:crypto";
-import { open, readFile } from "node:fs/promises";
-import { crc32 } from "node:zlib";
-/**
- * PNG `tEXt` keyword the stamp is stored under. Keeping it in the image means
- * there is no sidecar file to fall out of sync, and deleting an image deletes
- * its stamp with it.
- */
-const stampKeyword = "colophon";
-/**
- * How much of a PNG to read when looking for a stamp. The stamp goes in
- * immediately after `IHDR`, so this only has to cover the header — reading
- * whole images just to compare a hash would defeat the point of skipping them.
- */
-const headBytes = 4096;
-const pngSignature = Buffer.from([
-    0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-]);
-/** Signature + the whole `IHDR` chunk: length, type, 13 bytes of data, CRC. */
-const afterHeader = pngSignature.length + 4 + 4 + 13 + 4;
-function sha256(value) {
-    return createHash("sha256").update(value).digest("hex");
-}
-function isRecord(value) {
-    return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-/**
- * `JSON.stringify` with object keys sorted, so that reordering frontmatter
- * without changing it does not look like a change.
- */
-function stableStringify(value) {
-    return JSON.stringify(value, (_key, raw) => isRecord(raw)
-        ? Object.fromEntries(Object.keys(raw)
-            .toSorted((a, b) => a.localeCompare(b))
-            .map((key) => [key, raw[key]]))
-        : raw);
-}
-/**
- * The installed Colophon version. The built-in templates ship in this package,
- * so an upgrade can change what an image looks like without anything in the
- * project changing; folding the version into the stamp makes that upgrade
- * re-render rather than leave the old images in place.
- */
-async function packageVersion() {
-    const manifest = await readFile(new URL("../package.json", import.meta.url), "utf8");
-    return JSON.parse(manifest).version;
-}
-/**
- * Digest one configured font by its contents, not its path: replacing the file
- * at the same path changes every image drawn with it.
- */
-async function fontDigest(font) {
-    const bytes = "data" in font ? font.data : await readFile(font.path);
-    return sha256(stableStringify({ family: font.family, bytes: sha256(bytes) }));
-}
-/**
- * Digest the config fields that affect what an image looks like.
- *
- * `onWarning` is left out because it cannot change a pixel. So are `sizes` and
- * `templates`: the one size and the one template an image actually uses go into
- * its own stamp, so adding a third size or an unrelated custom template does
- * not invalidate everything already on disk.
- */
-async function configDigest(config) {
-    const fonts = await Promise.all(config.fonts.map(async (font) => fontDigest(font)));
-    return sha256(stableStringify({
-        version: await packageVersion(),
-        colors: config.colors,
-        background: config.background,
-        fonts,
-        systemFonts: config.systemFonts,
-        fontFamily: config.fontFamily,
-        footer: config.footer,
-        badge: config.badge,
-        code: config.code,
-    }));
-}
-/**
- * Build a {@link Stamper} for a resolved config. Asynchronous because it reads
- * the configured font files; do it once per run rather than once per image.
- */
-export async function createStamper(config) {
-    const base = await configDigest(config);
-    const templateDigests = new Map();
-    // A custom template is config the project controls, so its source counts as
-    // part of the input. Built-in templates are covered by the package version.
-    // Source text is all there is to go on: a template that reads something its
-    // own code does not name — a closed-over value, a file — can change without
-    // the stamp noticing, and needs `overwrite` to pick it up.
-    const templateDigest = (name) => {
-        const cached = templateDigests.get(name);
-        if (cached !== undefined) {
-            return cached;
-        }
-        const template = config.templates[name];
-        const digest = template === undefined ? "" : sha256(template.render.toString());
-        templateDigests.set(name, digest);
-        return digest;
-    };
-    return {
-        stamp(props, size) {
-            return sha256(stableStringify([
-                base,
-                templateDigest(props.template),
-                // The whole size, not just its dimensions: a size carries its own
-                // config overrides, and changing one has to re-render that image.
-                size,
-                props,
-            ]));
-        },
-    };
-}
-/**
- * A PNG `tEXt` chunk: length, type, `keyword\0text`, CRC over type and data.
- */
-function textChunk(keyword, text) {
-    const data = Buffer.concat([
-        Buffer.from(keyword, "latin1"),
-        Buffer.from([0]),
-        Buffer.from(text, "latin1"),
-    ]);
-    const chunk = Buffer.alloc(4 + 4 + data.length + 4);
-    chunk.writeUInt32BE(data.length, 0);
-    chunk.write("tEXt", 4, "latin1");
-    data.copy(chunk, 8);
-    chunk.writeUInt32BE(crc32(chunk.subarray(4, 8 + data.length)), 8 + data.length);
-    return chunk;
-}
-/**
- * Return `png` with the stamp embedded as a `tEXt` chunk, inserted straight
- * after the header so it can be read back without decoding the image.
- */
-export function stampPng(png, stamp) {
-    if (png.length < afterHeader ||
-        !png.subarray(0, pngSignature.length).equals(pngSignature) ||
-        png.toString("latin1", 12, 16) !== "IHDR") {
-        throw new Error("Cannot stamp: not a PNG image.");
-    }
-    return Buffer.concat([
-        png.subarray(0, afterHeader),
-        textChunk(stampKeyword, stamp),
-        png.subarray(afterHeader),
-    ]);
-}
-/**
- * Find the stamp in the leading bytes of a PNG, or `undefined` if there is
- * none — the image was written by something else, or by a Colophon that did
- * not stamp yet.
- */
-function findStamp(head) {
-    if (!head.subarray(0, pngSignature.length).equals(pngSignature)) {
-        return undefined;
-    }
-    let offset = pngSignature.length;
-    while (offset + 8 <= head.length) {
-        const length = head.readUInt32BE(offset);
-        const type = head.toString("latin1", offset + 4, offset + 8);
-        const start = offset + 8;
-        const end = start + length;
-        // Image data starts here; anything past it is not worth reading for a hash.
-        if (type === "IDAT" || type === "IEND" || end > head.length) {
-            return undefined;
-        }
-        if (type === "tEXt") {
-            const data = head.subarray(start, end);
-            const separator = data.indexOf(0);
-            if (separator !== -1 &&
-                data.toString("latin1", 0, separator) === stampKeyword) {
-                return data.toString("latin1", separator + 1);
-            }
-        }
-        offset = end + 4;
-    }
-    return undefined;
-}
-/**
- * Read the stamp out of a PNG file. Returns `undefined` when the file is
- * missing, unreadable, not a PNG, or carries no stamp — all of which mean the
- * image cannot be shown to be up to date, so it should be rendered again.
- */
-export async function readPngStamp(file) {
-    let handle;
-    try {
-        handle = await open(file, "r");
-    }
-    catch {
-        return undefined;
-    }
-    try {
-        const buffer = Buffer.alloc(headBytes);
-        const { bytesRead } = await handle.read(buffer, 0, headBytes, 0);
-        return findStamp(buffer.subarray(0, bytesRead));
-    }
-    finally {
-        await handle.close();
-    }
-}
-//# sourceMappingURL=stamp.js.map

package/dist/stamp.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"stamp.js","sourceRoot":"","sources":["../src/stamp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;AASlC;;;;GAIG;AACH,MAAM,YAAY,GAAG,UAAU,CAAC;AAEhC;;;;GAIG;AACH,MAAM,SAAS,GAAG,IAAI,CAAC;AAEvB,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC;IAC/B,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI;CAC/C,CAAC,CAAC;AAEH,+EAA+E;AAC/E,MAAM,WAAW,GAAG,YAAY,CAAC,MAAM,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AAEzD,SAAS,MAAM,CAAC,KAA0B;IACxC,OAAO,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AAC1D,CAAC;AAED,SAAS,QAAQ,CAAC,KAAc;IAC9B,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAC9E,CAAC;AAED;;;GAGG;AACH,SAAS,eAAe,CAAC,KAAc;IACrC,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,GAAY,EAAE,EAAE,CAClD,QAAQ,CAAC,GAAG,CAAC;QACX,CAAC,CAAC,MAAM,CAAC,WAAW,CAChB,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC;aACb,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;aACtC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CACjC;QACH,CAAC,CAAC,GAAG,CACR,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,KAAK,UAAU,cAAc;IAC3B,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAC7B,IAAI,GAAG,CAAC,iBAAiB,EAAE,OAAO,IAAI,CAAC,GAAG,CAAC,EAC3C,MAAM,CACP,CAAC;IACF,OAAQ,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAyB,CAAC,OAAO,CAAC;AAC/D,CAAC;AAED;;;GAGG;AACH,KAAK,UAAU,UAAU,CAAC,IAAgB;IACxC,MAAM,KAAK,GAAG,MAAM,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACrE,OAAO,MAAM,CAAC,eAAe,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;AAChF,CAAC;AAED;;;;;;;GAOG;AACH,KAAK,UAAU,YAAY,CAAC,MAAsB;IAChD,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,GAAG,CAC7B,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CACnD,CAAC;IAEF,OAAO,MAAM,CACX,eAAe,CAAC;QACd,OAAO,EAAE,MAAM,cAAc,EAAE;QAC/B,MAAM,EAAE,MAAM,CAAC,MAAM;QACrB,UAAU,EAAE,MAAM,CAAC,UAAU;QAC7B,KAAK;QACL,WAAW,EAAE,MAAM,CAAC,WAAW;QAC/B,UAAU,EAAE,MAAM,CAAC,UAAU;QAC7B,MAAM,EAAE,MAAM,CAAC,MAAM;QACrB,KAAK,EAAE,MAAM,CAAC,KAAK;QACnB,IAAI,EAAE,MAAM,CAAC,IAAI;KAClB,CAAC,CACH,CAAC;AACJ,CAAC;AAcD;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,MAAsB;IACxD,MAAM,IAAI,GAAG,MAAM,YAAY,CAAC,MAAM,CAAC,CAAC;IACxC,MAAM,eAAe,GAAG,IAAI,GAAG,EAAkB,CAAC;IAElD,4EAA4E;IAC5E,4EAA4E;IAC5E,4EAA4E;IAC5E,4EAA4E;IAC5E,2DAA2D;IAC3D,MAAM,cAAc,GAAG,CAAC,IAAY,EAAU,EAAE;QAC9C,MAAM,MAAM,GAAG,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAEzC,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACzB,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,MAAM,QAAQ,GAAG,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QACxC,MAAM,MAAM,GACV,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;QACnE,eAAe,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAClC,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC;IAEF,OAAO;QACL,KAAK,CAAC,KAAK,EAAE,IAAI;YACf,OAAO,MAAM,CACX,eAAe,CAAC;gBACd,IAAI;gBACJ,cAAc,CAAC,KAAK,CAAC,QAAQ,CAAC;gBAC9B,kEAAkE;gBAClE,kEAAkE;gBAClE,IAAI;gBACJ,KAAK;aACN,CAAC,CACH,CAAC;QACJ,CAAC;KACF,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,SAAS,SAAS,CAAC,OAAe,EAAE,IAAY;IAC9C,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC;QACzB,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC;QAC9B,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QAChB,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC;KAC5B,CAAC,CAAC;IACH,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAEpD,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IACpC,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAC;IACjC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IACpB,KAAK,CAAC,aAAa,CACjB,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,EACzC,CAAC,GAAG,IAAI,CAAC,MAAM,CAChB,CAAC;IAEF,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,QAAQ,CAAC,GAAW,EAAE,KAAa;IACjD,IACE,GAAG,CAAC,MAAM,GAAG,WAAW;QACxB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC;QAC1D,GAAG,CAAC,QAAQ,CAAC,QAAQ,EAAE,EAAE,EAAE,EAAE,CAAC,KAAK,MAAM,EACzC,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;IACpD,CAAC;IAED,OAAO,MAAM,CAAC,MAAM,CAAC;QACnB,GAAG,CAAC,QAAQ,CAAC,CAAC,EAAE,WAAW,CAAC;QAC5B,SAAS,CAAC,YAAY,EAAE,KAAK,CAAC;QAC9B,GAAG,CAAC,QAAQ,CAAC,WAAW,CAAC;KAC1B,CAAC,CAAC;AACL,CAAC;AAED;;;;GAIG;AACH,SAAS,SAAS,CAAC,IAAY;IAC7B,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC;QAChE,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,IAAI,MAAM,GAAG,YAAY,CAAC,MAAM,CAAC;IAEjC,OAAO,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;QACjC,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;QACzC,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,CAAC;QAC7D,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,CAAC;QACzB,MAAM,GAAG,GAAG,KAAK,GAAG,MAAM,CAAC;QAE3B,4EAA4E;QAC5E,IAAI,IAAI,KAAK,MAAM,IAAI,IAAI,KAAK,MAAM,IAAI,GAAG,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;YAC5D,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;YACpB,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;YACvC,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YAElC,IACE,SAAS,KAAK,CAAC,CAAC;gBAChB,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,EAAE,SAAS,CAAC,KAAK,YAAY,EACtD,CAAC;gBACD,OAAO,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,SAAS,GAAG,CAAC,CAAC,CAAC;YAChD,CAAC;QACH,CAAC;QAED,MAAM,GAAG,GAAG,GAAG,CAAC,CAAC;IACnB,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,IAAY;IAC7C,IAAI,MAAkB,CAAC;IAEvB,IAAI,CAAC;QACH,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IACjC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACvC,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC;QACjE,OAAO,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC;IAClD,CAAC;YAAS,CAAC;QACT,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;IACvB,CAAC;AACH,CAAC"}

package/dist/templates/banner.d.ts

@@ -1,9 +0,0 @@
-import type { Template } from "../types.js";
-/**
- * Generalised "banner" template: a left-aligned title with an optional
- * version and wrapped subtitle, an optional corner badge, and an optional
- * footer. This is the configurable descendant of the original `npm_package`
- * layout.
- */
-export declare const bannerTemplate: Template;
-//# sourceMappingURL=banner.d.ts.map

package/dist/templates/banner.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"banner.d.ts","sourceRoot":"","sources":["../../src/templates/banner.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAS,QAAQ,EAAmB,MAAM,aAAa,CAAC;AA2CpE;;;;;GAKG;AACH,eAAO,MAAM,cAAc,EAAE,QAwH5B,CAAC"}

package/dist/templates/banner.js

@@ -1,115 +0,0 @@
-import { estimateCharsPerLine, layoutStack, textElement, wrapText, } from "../text.js";
-import { optionalString } from "./props.js";
-const maxTitleLines = 3;
-const maxSubtitleLines = 4;
-function renderBadge(badge, fontFamily, brand, pad, height) {
-    const fontSize = Math.round(height * 0.6);
-    const padX = Math.round(height * 0.36);
-    const width = Math.round(badge.text.length * fontSize * 0.64 + padX * 2);
-    const radius = Math.round(height * 0.1);
-    const rect = `<rect x="${String(pad)}" y="${String(pad)}"` +
-        ` width="${String(width)}" height="${String(height)}"` +
-        ` rx="${String(radius)}" fill="${badge.background ?? "#ffffff"}"/>`;
-    const text = textElement(badge.text, {
-        x: pad + padX,
-        y: pad + Math.round(height * 0.72),
-        fontFamily,
-        fontSize,
-        fontWeight: 900,
-        fill: badge.color ?? brand,
-    });
-    return rect + text;
-}
-/**
- * Generalised "banner" template: a left-aligned title with an optional
- * version and wrapped subtitle, an optional corner badge, and an optional
- * footer. This is the configurable descendant of the original `npm_package`
- * layout.
- */
-export const bannerTemplate = {
-    name: "banner",
-    render({ props, config, dimensions }) {
-        const { width, height } = dimensions;
-        const { fontFamily } = config;
-        const fg = config.colors.foreground;
-        const pad = Math.round(width * 0.075);
-        const contentWidth = width - pad * 2;
-        const title = optionalString(props.title) ?? "";
-        const subtitle = optionalString(props.subtitle);
-        const version = optionalString(props.version);
-        const hasSubtitle = subtitle !== undefined && subtitle !== "";
-        const titleFs = Math.round(height * (hasSubtitle ? 0.078 : 0.092));
-        const versionFs = Math.round(height * 0.04);
-        const subFs = Math.round(height * 0.05);
-        const footerFs = Math.round(height * 0.034);
-        const badgeHeight = Math.round(height * 0.072);
-        const titleLines = wrapText(title, estimateCharsPerLine(contentWidth, titleFs, 0.6)).slice(0, maxTitleLines);
-        const subtitleLines = hasSubtitle
-            ? wrapText(subtitle, estimateCharsPerLine(contentWidth, subFs, 0.55)).slice(0, maxSubtitleLines)
-            : [];
-        // Extra breathing room between the title, version and subtitle groups so
-        // they don't read as one squashed block.
-        const versionGap = Math.round(height * 0.03);
-        const subtitleGap = Math.round(height * 0.045);
-        const lines = titleLines.map((text) => ({
-            text,
-            fontSize: titleFs,
-            fontWeight: 800,
-            opacity: 0.98,
-        }));
-        if (version !== undefined && version !== "") {
-            lines.push({
-                text: `v${version}`,
-                fontSize: versionFs,
-                fontWeight: 700,
-                opacity: 0.85,
-                gapBefore: versionGap,
-            });
-        }
-        for (const [index, text] of subtitleLines.entries()) {
-            lines.push({
-                text,
-                fontSize: subFs,
-                fontWeight: 500,
-                opacity: 0.86,
-                ...(index === 0 && { gapBefore: subtitleGap }),
-            });
-        }
-        const hasBadge = config.badge !== undefined;
-        const hasFooter = config.footer !== undefined && config.footer !== "";
-        const top = pad + (hasBadge ? badgeHeight + Math.round(height * 0.03) : 0);
-        const bottom = height - pad - (hasFooter ? footerFs + Math.round(height * 0.02) : 0);
-        const placed = layoutStack(lines.map((line) => ({
-            fontSize: line.fontSize,
-            lineHeight: 1.15,
-            ...(line.gapBefore !== undefined && { gapBefore: line.gapBefore }),
-        })), top, bottom);
-        const body = lines
-            .map((line, index) => textElement(line.text, {
-            x: pad,
-            y: placed[index]?.y ?? top,
-            fontFamily,
-            fontSize: line.fontSize,
-            fontWeight: line.fontWeight,
-            fill: fg,
-            fillOpacity: line.opacity,
-        }))
-            .join("");
-        const badge = config.badge === undefined
-            ? ""
-            : renderBadge(config.badge, fontFamily, config.colors.brand, pad, badgeHeight);
-        const footer = config.footer !== undefined && config.footer !== ""
-            ? textElement(config.footer, {
-                x: pad,
-                y: height - pad,
-                fontFamily,
-                fontSize: footerFs,
-                fontWeight: 500,
-                fill: fg,
-                fillOpacity: 0.78,
-            })
-            : "";
-        return badge + body + footer;
-    },
-};
-//# sourceMappingURL=banner.js.map

package/dist/templates/banner.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"banner.js","sourceRoot":"","sources":["../../src/templates/banner.ts"],"names":[],"mappings":"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"}

package/dist/templates/card.d.ts

@@ -1,7 +0,0 @@
-import type { Template } from "../types.js";
-/**
- * Minimal "card" template: a centred title with an optional subtitle. No
- * badge or version — a clean, quieter alternative to `banner`.
- */
-export declare const cardTemplate: Template;
-//# sourceMappingURL=card.d.ts.map

package/dist/templates/card.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"card.d.ts","sourceRoot":"","sources":["../../src/templates/card.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,QAAQ,EAAmB,MAAM,aAAa,CAAC;AAa7D;;;GAGG;AACH,eAAO,MAAM,YAAY,EAAE,QAsF1B,CAAC"}

package/dist/templates/card.js

@@ -1,72 +0,0 @@
-import { estimateCharsPerLine, layoutStack, textElement, wrapText, } from "../text.js";
-import { optionalString } from "./props.js";
-const maxTitleLines = 3;
-const maxSubtitleLines = 3;
-/**
- * Minimal "card" template: a centred title with an optional subtitle. No
- * badge or version — a clean, quieter alternative to `banner`.
- */
-export const cardTemplate = {
-    name: "card",
-    render({ props, config, dimensions }) {
-        const { width, height } = dimensions;
-        const { fontFamily } = config;
-        const fg = config.colors.foreground;
-        const pad = Math.round(width * 0.09);
-        const contentWidth = width - pad * 2;
-        const centreX = Math.round(width / 2);
-        const title = optionalString(props.title) ?? "";
-        const subtitle = optionalString(props.subtitle);
-        const hasSubtitle = subtitle !== undefined && subtitle !== "";
-        const titleFs = Math.round(height * 0.1);
-        const subFs = Math.round(height * 0.045);
-        const footerFs = Math.round(height * 0.032);
-        const titleLines = wrapText(title, estimateCharsPerLine(contentWidth, titleFs, 0.58)).slice(0, maxTitleLines);
-        const subtitleLines = hasSubtitle
-            ? wrapText(subtitle, estimateCharsPerLine(contentWidth, subFs, 0.52)).slice(0, maxSubtitleLines)
-            : [];
-        const lines = [
-            ...titleLines.map((text) => ({
-                text,
-                fontSize: titleFs,
-                fontWeight: 800,
-                opacity: 1,
-            })),
-            ...subtitleLines.map((text) => ({
-                text,
-                fontSize: subFs,
-                fontWeight: 500,
-                opacity: 0.85,
-            })),
-        ];
-        const hasFooter = config.footer !== undefined && config.footer !== "";
-        const bottom = height - pad - (hasFooter ? footerFs + Math.round(height * 0.02) : 0);
-        const placed = layoutStack(lines.map((line) => ({ fontSize: line.fontSize, lineHeight: 1.2 })), pad, bottom);
-        const body = lines
-            .map((line, index) => textElement(line.text, {
-            x: centreX,
-            y: placed[index]?.y ?? pad,
-            fontFamily,
-            fontSize: line.fontSize,
-            fontWeight: line.fontWeight,
-            fill: fg,
-            fillOpacity: line.opacity,
-            anchor: "middle",
-        }))
-            .join("");
-        const footer = config.footer !== undefined && config.footer !== ""
-            ? textElement(config.footer, {
-                x: centreX,
-                y: height - pad,
-                fontFamily,
-                fontSize: footerFs,
-                fontWeight: 500,
-                fill: fg,
-                fillOpacity: 0.75,
-                anchor: "middle",
-            })
-            : "";
-        return body + footer;
-    },
-};
-//# sourceMappingURL=card.js.map

package/dist/templates/card.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"card.js","sourceRoot":"","sources":["../../src/templates/card.ts"],"names":[],"mappings":"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"}

package/dist/templates/code.d.ts

@@ -1,12 +0,0 @@
-import type { Template } from "../types.js";
-/**
- * Syntax-highlighted code snippet on a rounded panel over the configured
- * background. Reads `code` and `language` from the props (as the original
- * `image_text` / `image_lexer` frontmatter did), with an optional `title`
- * above the panel and the configured footer below it.
- *
- * Highlighting uses Shiki, so token colours come from a real VS Code theme
- * rather than being approximated.
- */
-export declare const codeTemplate: Template;
-//# sourceMappingURL=code.d.ts.map

package/dist/templates/code.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"code.d.ts","sourceRoot":"","sources":["../../src/templates/code.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAA8B,QAAQ,EAAE,MAAM,aAAa,CAAC;AA2PxE;;;;;;;;GAQG;AACH,eAAO,MAAM,YAAY,EAAE,QA6J1B,CAAC"}