@flyingrobots/bijou 4.4.1 → 7.0.0

package/dist/core/layout/geometry.js

@@ -0,0 +1,201 @@
+import { sanitizeNonNegativeInt } from '../numeric.js';
+export function solveSplitPaneRects(options) {
+    const direction = options.direction ?? 'row';
+    const width = sanitizeNonNegativeInt(options.width, 0);
+    const height = sanitizeNonNegativeInt(options.height, 0);
+    const dividerSize = sanitizeNonNegativeInt(options.dividerSize, 1);
+    if (direction === 'row') {
+        const available = Math.max(0, width - dividerSize);
+        const { paneA: a, paneB: b } = solveSplitAxisSizes({
+            available,
+            ratio: options.ratio,
+            minA: options.minA,
+            minB: options.minB,
+        });
+        return {
+            paneA: { x: 0, y: 0, width: a, height },
+            divider: { x: a, y: 0, width: dividerSize, height },
+            paneB: { x: a + dividerSize, y: 0, width: b, height },
+        };
+    }
+    const available = Math.max(0, height - dividerSize);
+    const { paneA: a, paneB: b } = solveSplitAxisSizes({
+        available,
+        ratio: options.ratio,
+        minA: options.minA,
+        minB: options.minB,
+    });
+    return {
+        paneA: { x: 0, y: 0, width, height: a },
+        divider: { x: 0, y: a, width, height: dividerSize },
+        paneB: { x: 0, y: a + dividerSize, width, height: b },
+    };
+}
+export function solveSplitAxisSizes(options) {
+    const available = sanitizeNonNegativeInt(options.available, 0);
+    const minA = sanitizeNonNegativeInt(options.minA, 0);
+    const minB = sanitizeNonNegativeInt(options.minB, 0);
+    const [paneA, paneB] = solveSplitAxis(available, options.ratio, minA, minB);
+    return { paneA, paneB };
+}
+export function solveGridRects(options) {
+    const width = sanitizeNonNegativeInt(options.width, 0);
+    const height = sanitizeNonNegativeInt(options.height, 0);
+    const gap = sanitizeNonNegativeInt(options.gap, 0);
+    if (options.columns.length === 0 || options.rows.length === 0) {
+        throw new Error('solveGridRects: columns and rows must be non-empty');
+    }
+    if (options.areas.length !== options.rows.length) {
+        throw new Error(`solveGridRects: areas row count (${options.areas.length}) must match rows track count (${options.rows.length})`);
+    }
+    const matrix = options.areas.map((row, rowIndex) => {
+        const tokens = row.trim().length === 0 ? [] : row.trim().split(/\s+/);
+        if (tokens.length !== options.columns.length) {
+            throw new Error(`solveGridRects: area row ${rowIndex} has ${tokens.length} columns, expected ${options.columns.length}`);
+        }
+        return tokens;
+    });
+    const colSizes = solveTracks(width, options.columns, gap);
+    const rowSizes = solveTracks(height, options.rows, gap);
+    const colStarts = trackStarts(colSizes, gap);
+    const rowStarts = trackStarts(rowSizes, gap);
+    const areaCells = new Map();
+    for (let rowIndex = 0; rowIndex < matrix.length; rowIndex++) {
+        for (let colIndex = 0; colIndex < matrix[rowIndex].length; colIndex++) {
+            const area = matrix[rowIndex][colIndex];
+            if (area === '.')
+                continue;
+            const cells = areaCells.get(area) ?? [];
+            cells.push({ row: rowIndex, col: colIndex });
+            areaCells.set(area, cells);
+        }
+    }
+    const rects = new Map();
+    for (const [name, cells] of areaCells) {
+        const rows = cells.map((cell) => cell.row);
+        const cols = cells.map((cell) => cell.col);
+        const minRow = Math.min(...rows);
+        const maxRow = Math.max(...rows);
+        const minCol = Math.min(...cols);
+        const maxCol = Math.max(...cols);
+        for (let rowIndex = minRow; rowIndex <= maxRow; rowIndex++) {
+            for (let colIndex = minCol; colIndex <= maxCol; colIndex++) {
+                if (matrix[rowIndex][colIndex] !== name) {
+                    throw new Error(`solveGridRects: area "${name}" must form a contiguous rectangle; gap at row ${rowIndex}, column ${colIndex}`);
+                }
+            }
+        }
+        const colSpan = maxCol - minCol + 1;
+        const rowSpan = maxRow - minRow + 1;
+        const rectWidth = Math.min(width, sum(colSizes.slice(minCol, maxCol + 1)) + gap * Math.max(0, colSpan - 1));
+        const rectHeight = Math.min(height, sum(rowSizes.slice(minRow, maxRow + 1)) + gap * Math.max(0, rowSpan - 1));
+        rects.set(name, {
+            x: colStarts[minCol] ?? 0,
+            y: rowStarts[minRow] ?? 0,
+            width: rectWidth,
+            height: rectHeight,
+        });
+    }
+    return rects;
+}
+function solveSplitAxis(available, ratio, minA, minB) {
+    if (available <= 0)
+        return [0, 0];
+    const maxAFromMinB = Math.max(0, available - Math.min(minB, available));
+    const clampedMinA = Math.min(minA, maxAFromMinB);
+    let desiredA = Math.round(clampRatio(ratio) * available);
+    desiredA = clamp(desiredA, clampedMinA, maxAFromMinB);
+    const desiredB = available - desiredA;
+    if (desiredB < Math.min(minB, available)) {
+        desiredA = Math.max(clampedMinA, available - Math.min(minB, available));
+    }
+    const a = clamp(desiredA, 0, available);
+    const b = Math.max(0, available - a);
+    return [a, b];
+}
+function solveTracks(total, tracks, gap) {
+    const available = Math.max(0, total - gap * Math.max(0, tracks.length - 1));
+    const sizes = new Array(tracks.length).fill(0);
+    let fixed = 0;
+    let frTotal = 0;
+    for (let i = 0; i < tracks.length; i++) {
+        const track = tracks[i];
+        if (typeof track === 'number') {
+            const size = Math.max(0, Math.floor(track));
+            sizes[i] = size;
+            fixed += size;
+        }
+        else {
+            frTotal += parseFr(track);
+        }
+    }
+    if (fixed > available) {
+        let remainingBudget = available;
+        for (let i = 0; i < tracks.length; i++) {
+            if (typeof tracks[i] !== 'number')
+                continue;
+            const next = Math.min(sizes[i] ?? 0, remainingBudget);
+            sizes[i] = next;
+            remainingBudget -= next;
+            if (remainingBudget <= 0)
+                remainingBudget = 0;
+        }
+        return sizes.map((size) => Math.max(0, size));
+    }
+    const remaining = Math.max(0, available - fixed);
+    if (frTotal > 0) {
+        let assigned = 0;
+        const fractionalShares = [];
+        for (let i = 0; i < tracks.length; i++) {
+            const track = tracks[i];
+            if (typeof track === 'number')
+                continue;
+            const fr = parseFr(track);
+            const rawShare = (remaining * fr) / frTotal;
+            const size = Math.floor(rawShare);
+            sizes[i] = size;
+            assigned += size;
+            fractionalShares.push({ index: i, remainder: rawShare - size });
+        }
+        let leftover = remaining - assigned;
+        fractionalShares.sort((left, right) => right.remainder - left.remainder || left.index - right.index);
+        for (let i = 0; i < fractionalShares.length && leftover > 0; i++) {
+            const index = fractionalShares[i].index;
+            sizes[index] = (sizes[index] ?? 0) + 1;
+            leftover -= 1;
+        }
+    }
+    return sizes.map((size) => Math.max(0, size));
+}
+function parseFr(track) {
+    const raw = track.slice(0, -2);
+    const parsed = Number(raw);
+    if (!Number.isFinite(parsed) || !Number.isInteger(parsed) || parsed <= 0) {
+        throw new Error(`solveGridRects: invalid fr track "${track}"`);
+    }
+    return parsed;
+}
+function trackStarts(sizes, gap) {
+    const starts = [];
+    let cursor = 0;
+    for (let i = 0; i < sizes.length; i++) {
+        starts.push(cursor);
+        cursor += sizes[i] + (i < sizes.length - 1 ? gap : 0);
+    }
+    return starts;
+}
+function sum(values) {
+    let acc = 0;
+    for (const value of values)
+        acc += value;
+    return acc;
+}
+function clampRatio(value) {
+    if (!Number.isFinite(value))
+        return 0.5;
+    return Math.max(0, Math.min(1, value));
+}
+function clamp(value, min, max) {
+    return Math.max(min, Math.min(max, value));
+}
+//# sourceMappingURL=geometry.js.map

package/dist/core/layout/geometry.js.map

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

package/dist/core/mode-lowering.d.ts

@@ -0,0 +1,48 @@
+import type { OutputMode } from './detect/tty.js';
+export type ModeLoweringFactKind = 'entity' | 'edge' | 'count' | 'label' | 'state' | 'custom';
+export type ModeLoweringFactValue = string | number | boolean;
+export interface ModeLoweringFact {
+    readonly kind: ModeLoweringFactKind;
+    readonly key: string;
+    readonly value?: ModeLoweringFactValue;
+    readonly label?: string;
+    readonly required?: boolean;
+}
+export interface ModeLoweringModeFacts {
+    readonly mode: OutputMode;
+    readonly facts: readonly ModeLoweringFact[];
+}
+export type ModeLoweringSeverity = 'warning' | 'error';
+export type ModeLoweringIssueKind = 'missing-required-fact' | 'mismatched-fact-value' | 'duplicate-fact' | 'custom-assertion-failed';
+export interface ModeLoweringIssue {
+    readonly kind: ModeLoweringIssueKind;
+    readonly severity: ModeLoweringSeverity;
+    readonly mode?: OutputMode;
+    readonly baselineMode?: OutputMode;
+    readonly factKind?: ModeLoweringFactKind;
+    readonly key?: string;
+    readonly expected?: ModeLoweringFactValue;
+    readonly actual?: ModeLoweringFactValue;
+    readonly message: string;
+}
+export interface ModeLoweringAssertionResult {
+    readonly passed: boolean;
+    readonly message: string;
+    readonly mode?: OutputMode;
+    readonly key?: string;
+    readonly severity?: ModeLoweringSeverity;
+}
+export interface ModeLoweringOptions {
+    readonly baselineMode?: OutputMode;
+    readonly modes: readonly ModeLoweringModeFacts[];
+    readonly assertions?: readonly ModeLoweringAssertionResult[];
+}
+export interface ModeLoweringReport {
+    readonly baselineMode: OutputMode;
+    readonly checkedModes: readonly OutputMode[];
+    readonly issues: readonly ModeLoweringIssue[];
+    readonly passed: boolean;
+}
+export declare function lintModeLowering(options: ModeLoweringOptions): ModeLoweringReport;
+export declare function modeLoweringReportText(report: ModeLoweringReport): string;
+//# sourceMappingURL=mode-lowering.d.ts.map

package/dist/core/mode-lowering.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mode-lowering.d.ts","sourceRoot":"","sources":["../../src/core/mode-lowering.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAElD,MAAM,MAAM,oBAAoB,GAC5B,QAAQ,GACR,MAAM,GACN,OAAO,GACP,OAAO,GACP,OAAO,GACP,QAAQ,CAAC;AAEb,MAAM,MAAM,qBAAqB,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;AAE9D,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,IAAI,EAAE,oBAAoB,CAAC;IACpC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,KAAK,CAAC,EAAE,qBAAqB,CAAC;IACvC,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;IAC1B,QAAQ,CAAC,KAAK,EAAE,SAAS,gBAAgB,EAAE,CAAC;CAC7C;AAED,MAAM,MAAM,oBAAoB,GAAG,SAAS,GAAG,OAAO,CAAC;AAEvD,MAAM,MAAM,qBAAqB,GAC7B,uBAAuB,GACvB,uBAAuB,GACvB,gBAAgB,GAChB,yBAAyB,CAAC;AAE9B,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,IAAI,EAAE,qBAAqB,CAAC;IACrC,QAAQ,CAAC,QAAQ,EAAE,oBAAoB,CAAC;IACxC,QAAQ,CAAC,IAAI,CAAC,EAAE,UAAU,CAAC;IAC3B,QAAQ,CAAC,YAAY,CAAC,EAAE,UAAU,CAAC;IACnC,QAAQ,CAAC,QAAQ,CAAC,EAAE,oBAAoB,CAAC;IACzC,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,QAAQ,CAAC,EAAE,qBAAqB,CAAC;IAC1C,QAAQ,CAAC,MAAM,CAAC,EAAE,qBAAqB,CAAC;IACxC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,2BAA2B;IAC1C,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,IAAI,CAAC,EAAE,UAAU,CAAC;IAC3B,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,QAAQ,CAAC,EAAE,oBAAoB,CAAC;CAC1C;AAED,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,YAAY,CAAC,EAAE,UAAU,CAAC;IACnC,QAAQ,CAAC,KAAK,EAAE,SAAS,qBAAqB,EAAE,CAAC;IACjD,QAAQ,CAAC,UAAU,CAAC,EAAE,SAAS,2BAA2B,EAAE,CAAC;CAC9D;AAED,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,YAAY,EAAE,UAAU,CAAC;IAClC,QAAQ,CAAC,YAAY,EAAE,SAAS,UAAU,EAAE,CAAC;IAC7C,QAAQ,CAAC,MAAM,EAAE,SAAS,iBAAiB,EAAE,CAAC;IAC9C,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;CAC1B;AAQD,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,mBAAmB,GAAG,kBAAkB,CAgDjF;AAED,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,kBAAkB,GAAG,MAAM,CAiBzE"}

package/dist/core/mode-lowering.js

@@ -0,0 +1,176 @@
+const DEFAULT_BASELINE_MODE = 'interactive';
+const MODE_ORDER = ['interactive', 'static', 'pipe', 'accessible'];
+const FACT_SEPARATOR = ':';
+const LIST_SEPARATOR = ',';
+const EMPTY_LABEL = '-';
+export function lintModeLowering(options) {
+    const modes = [...options.modes].sort(compareModeFacts);
+    const modeNames = modes.map((modeFacts) => modeFacts.mode);
+    const modeFactsByMode = new Map();
+    for (const modeFacts of modes) {
+        modeFactsByMode.set(modeFacts.mode, modeFacts);
+    }
+    const baselineMode = resolveBaselineMode(options.baselineMode, modeFactsByMode, modes);
+    const baselineFacts = modeFactsByMode.get(baselineMode)?.facts ?? [];
+    const issues = [];
+    for (const modeFacts of modes) {
+        issues.push(...duplicateFactIssues(modeFacts));
+    }
+    for (const modeFacts of modes) {
+        if (modeFacts.mode === baselineMode) {
+            continue;
+        }
+        issues.push(...compareAgainstBaseline({
+            baselineMode,
+            baselineFacts,
+            modeFacts,
+        }));
+    }
+    for (const assertion of options.assertions ?? []) {
+        if (assertion.passed) {
+            continue;
+        }
+        issues.push({
+            kind: 'custom-assertion-failed',
+            severity: assertion.severity ?? 'error',
+            mode: assertion.mode,
+            key: assertion.key,
+            message: assertion.message,
+        });
+    }
+    return {
+        baselineMode,
+        checkedModes: modeNames,
+        issues,
+        passed: issues.length === 0,
+    };
+}
+export function modeLoweringReportText(report) {
+    const status = report.passed ? 'passed' : 'failed';
+    const checked = report.checkedModes.length === 0
+        ? EMPTY_LABEL
+        : report.checkedModes.join(LIST_SEPARATOR);
+    const lines = [`mode lowering: ${status} baseline=${report.baselineMode} checked=${checked}`];
+    if (report.issues.length === 0) {
+        return lines.join('\n');
+    }
+    lines.push('issues:');
+    for (const issue of report.issues) {
+        lines.push(`- ${issue.severity} ${issue.kind}${issueModeText(issue)}${issueFactText(issue)}: ${issue.message}`);
+    }
+    return lines.join('\n');
+}
+function compareAgainstBaseline(options) {
+    const issues = [];
+    const factsByIdentity = firstFactsByIdentity(options.modeFacts.facts);
+    for (const baselineFact of options.baselineFacts) {
+        if (baselineFact.required === false) {
+            continue;
+        }
+        const candidate = factsByIdentity.get(factIdentity(baselineFact));
+        if (candidate === undefined) {
+            issues.push(missingFactIssue(options.baselineMode, options.modeFacts.mode, baselineFact));
+            continue;
+        }
+        if (factValueDiffers(baselineFact, candidate)) {
+            issues.push(mismatchedFactIssue(options.baselineMode, options.modeFacts.mode, baselineFact, candidate));
+        }
+    }
+    return issues;
+}
+function duplicateFactIssues(modeFacts) {
+    const seenIdentities = new Set();
+    const duplicateIdentities = new Set();
+    const issues = [];
+    for (const fact of modeFacts.facts) {
+        const identity = factIdentity(fact);
+        if (!seenIdentities.has(identity)) {
+            seenIdentities.add(identity);
+            continue;
+        }
+        if (duplicateIdentities.has(identity)) {
+            continue;
+        }
+        duplicateIdentities.add(identity);
+        issues.push({
+            kind: 'duplicate-fact',
+            severity: 'warning',
+            mode: modeFacts.mode,
+            factKind: fact.kind,
+            key: fact.key,
+            message: `${modeFacts.mode} has duplicate ${fact.kind} ${fact.key}`,
+        });
+    }
+    return issues;
+}
+function missingFactIssue(baselineMode, mode, fact) {
+    return {
+        kind: 'missing-required-fact',
+        severity: 'error',
+        mode,
+        baselineMode,
+        factKind: fact.kind,
+        key: fact.key,
+        message: `${mode} is missing required ${fact.kind} ${fact.key} from ${baselineMode}`,
+    };
+}
+function mismatchedFactIssue(baselineMode, mode, expected, actual) {
+    return {
+        kind: 'mismatched-fact-value',
+        severity: 'error',
+        mode,
+        baselineMode,
+        factKind: expected.kind,
+        key: expected.key,
+        expected: expected.value,
+        actual: actual.value,
+        message: `${mode} ${expected.kind} ${expected.key} differs from ${baselineMode}: expected ${formatFactValue(expected.value)}, got ${formatFactValue(actual.value)}`,
+    };
+}
+function firstFactsByIdentity(facts) {
+    const factsByIdentity = new Map();
+    for (const fact of facts) {
+        const identity = factIdentity(fact);
+        if (!factsByIdentity.has(identity)) {
+            factsByIdentity.set(identity, fact);
+        }
+    }
+    return factsByIdentity;
+}
+function factIdentity(fact) {
+    return `${fact.kind}${FACT_SEPARATOR}${fact.key}`;
+}
+function factValueDiffers(expected, actual) {
+    if (expected.value === undefined) {
+        return false;
+    }
+    return expected.value !== actual.value;
+}
+function resolveBaselineMode(requestedMode, modeFactsByMode, modes) {
+    if (requestedMode !== undefined) {
+        return requestedMode;
+    }
+    if (modeFactsByMode.has(DEFAULT_BASELINE_MODE)) {
+        return DEFAULT_BASELINE_MODE;
+    }
+    return modes[0]?.mode ?? DEFAULT_BASELINE_MODE;
+}
+function compareModeFacts(a, b) {
+    return modeRank(a.mode) - modeRank(b.mode);
+}
+function modeRank(mode) {
+    return MODE_ORDER.indexOf(mode);
+}
+function issueModeText(issue) {
+    return issue.mode === undefined ? '' : ` mode=${issue.mode}`;
+}
+function issueFactText(issue) {
+    if (issue.factKind === undefined || issue.key === undefined) {
+        return '';
+    }
+    return ` fact=${issue.factKind}${FACT_SEPARATOR}${issue.key}`;
+}
+function formatFactValue(value) {
+    return value === undefined ? EMPTY_LABEL : String(value);
+}
+//# sourceMappingURL=mode-lowering.js.map

package/dist/core/mode-lowering.js.map

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

package/dist/core/numeric.d.ts

@@ -0,0 +1,16 @@
+/**
+ * Shared numeric sanitizers for user-facing option boundaries.
+ *
+ * Bijou internals want whole, finite numbers. These helpers normalize
+ * nullish, non-finite, negative, and fractional inputs at the boundary so
+ * components do not each reinvent slightly different guards.
+ */
+/** Clamp to a finite whole number greater than or equal to zero. */
+export declare function sanitizeNonNegativeInt(value: number | undefined, fallback?: number): number;
+/** Clamp to a finite whole number greater than or equal to one. */
+export declare function sanitizePositiveInt(value: number | undefined, fallback?: number): number;
+/** Normalize an optional finite whole number greater than or equal to zero. */
+export declare function sanitizeOptionalNonNegativeInt(value: number | undefined): number | undefined;
+/** Normalize an optional finite whole number greater than or equal to one. */
+export declare function sanitizeOptionalPositiveInt(value: number | undefined): number | undefined;
+//# sourceMappingURL=numeric.d.ts.map

package/dist/core/numeric.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"numeric.d.ts","sourceRoot":"","sources":["../../src/core/numeric.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAcH,oEAAoE;AACpE,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,EAAE,QAAQ,SAAI,GAAG,MAAM,CAEtF;AAED,mEAAmE;AACnE,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,EAAE,QAAQ,SAAI,GAAG,MAAM,CAEnF;AAED,+EAA+E;AAC/E,wBAAgB,8BAA8B,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAG5F;AAED,8EAA8E;AAC9E,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAGzF"}

package/dist/core/numeric.js

@@ -0,0 +1,37 @@
+/**
+ * Shared numeric sanitizers for user-facing option boundaries.
+ *
+ * Bijou internals want whole, finite numbers. These helpers normalize
+ * nullish, non-finite, negative, and fractional inputs at the boundary so
+ * components do not each reinvent slightly different guards.
+ */
+function normalizeFiniteInt(value) {
+    if (value == null || !Number.isFinite(value))
+        return undefined;
+    return Math.floor(value);
+}
+function sanitizeInt(value, fallback, min) {
+    const safeMin = normalizeFiniteInt(min) ?? 0;
+    const safeFallback = Math.max(safeMin, normalizeFiniteInt(fallback) ?? safeMin);
+    const safeValue = normalizeFiniteInt(value);
+    return safeValue == null ? safeFallback : Math.max(safeMin, safeValue);
+}
+/** Clamp to a finite whole number greater than or equal to zero. */
+export function sanitizeNonNegativeInt(value, fallback = 0) {
+    return sanitizeInt(value, fallback, 0);
+}
+/** Clamp to a finite whole number greater than or equal to one. */
+export function sanitizePositiveInt(value, fallback = 1) {
+    return sanitizeInt(value, fallback, 1);
+}
+/** Normalize an optional finite whole number greater than or equal to zero. */
+export function sanitizeOptionalNonNegativeInt(value) {
+    const safeValue = normalizeFiniteInt(value);
+    return safeValue == null ? undefined : Math.max(0, safeValue);
+}
+/** Normalize an optional finite whole number greater than or equal to one. */
+export function sanitizeOptionalPositiveInt(value) {
+    const safeValue = normalizeFiniteInt(value);
+    return safeValue == null ? undefined : Math.max(1, safeValue);
+}
+//# sourceMappingURL=numeric.js.map

package/dist/core/numeric.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"numeric.js","sourceRoot":"","sources":["../../src/core/numeric.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,SAAS,kBAAkB,CAAC,KAAyB;IACnD,IAAI,KAAK,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC;QAAE,OAAO,SAAS,CAAC;IAC/D,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;AAC3B,CAAC;AAED,SAAS,WAAW,CAAC,KAAyB,EAAE,QAAgB,EAAE,GAAW;IAC3E,MAAM,OAAO,GAAG,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAC7C,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,kBAAkB,CAAC,QAAQ,CAAC,IAAI,OAAO,CAAC,CAAC;IAChF,MAAM,SAAS,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;IAC5C,OAAO,SAAS,IAAI,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;AACzE,CAAC;AAED,oEAAoE;AACpE,MAAM,UAAU,sBAAsB,CAAC,KAAyB,EAAE,QAAQ,GAAG,CAAC;IAC5E,OAAO,WAAW,CAAC,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;AACzC,CAAC;AAED,mEAAmE;AACnE,MAAM,UAAU,mBAAmB,CAAC,KAAyB,EAAE,QAAQ,GAAG,CAAC;IACzE,OAAO,WAAW,CAAC,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;AACzC,CAAC;AAED,+EAA+E;AAC/E,MAAM,UAAU,8BAA8B,CAAC,KAAyB;IACtE,MAAM,SAAS,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;IAC5C,OAAO,SAAS,IAAI,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC;AAChE,CAAC;AAED,8EAA8E;AAC9E,MAAM,UAAU,2BAA2B,CAAC,KAAyB;IACnE,MAAM,SAAS,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;IAC5C,OAAO,SAAS,IAAI,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC;AAChE,CAAC"}

package/dist/core/render/differ.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"differ.d.ts","sourceRoot":"","sources":["../../../src/core/render/differ.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,KAAK,OAAO,EAAsB,KAAK,IAAI,EAAE,KAAK,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACrH,OAAO,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AA0BjE;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAgBpF;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAqFvF;AAkCD;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,GAAG,MAAM,CAgB1E;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,GAAG,IAAI,CAQvE;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,IAAI,GAAG,OAAO,CAkBpD;AAUD;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAgB,UAAU,CACxB,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,OAAO,EACf,EAAE,EAAE,SAAS,EACb,KAAK,EAAE,SAAS,EAChB,MAAM,CAAC,EAAE,UAAU,GAClB,IAAI,CAON"}
+{"version":3,"file":"differ.d.ts","sourceRoot":"","sources":["../../../src/core/render/differ.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkC,KAAK,OAAO,EAAsB,KAAK,IAAI,EAAE,KAAK,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACtI,OAAO,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAuBjE;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAgBpF;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAyFvF;AAkCD;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,GAAG,MAAM,CAgB1E;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,GAAG,IAAI,CAQvE;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,IAAI,GAAG,OAAO,CAkBpD;AAUD;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAgB,UAAU,CACxB,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,OAAO,EACf,EAAE,EAAE,SAAS,EACb,KAAK,EAAE,SAAS,EAChB,MAAM,CAAC,EAAE,UAAU,GAClB,IAAI,CAON"}

package/dist/core/render/differ.js

@@ -1,11 +1,9 @@
-import { createSurface } from '../../ports/surface.js';
-import { ANSI_OSC8_RE, graphemeClusterWidth, stripAnsi, segmentGraphemes } from '../text/index.js';
-import { CELL_STRIDE, OFF_FG_R, OFF_BG_R, OFF_BG_G, OFF_BG_B, FLAG_BOLD, FLAG_DIM, FLAG_STRIKETHROUGH, FLAG_INVERSE, FLAG_FG_SET, FLAG_BG_SET, FLAG_EMPTY, FLAG_DASHED, SIDE_TABLE_THRESHOLD, decodeChar, parseHex, } from './packed-cell.js';
+import { createSurface, isPackedSurface } from '../../ports/surface.js';
+import { colorHex, colorRgb } from '../theme/color.js';
+import { ANSI_OSC8_RE, graphemeClusterWidth, sanitizeTerminalText, segmentGraphemes } from '../text/index.js';
+import { CELL_STRIDE, OFF_FG_R, OFF_BG_R, OFF_BG_G, OFF_BG_B, FLAG_BOLD, FLAG_DIM, FLAG_STRIKETHROUGH, FLAG_INVERSE, FLAG_FG_SET, FLAG_BG_SET, FLAG_EMPTY, FLAG_DASHED, SIDE_TABLE_THRESHOLD, decodeChar, } from './packed-cell.js';
 const EMPTY_CELL = { char: ' ', empty: true };
 const EMPTY_MODIFIERS = [];
-function isPackedSurface(s) {
-    return 'buffer' in s && s.buffer instanceof Uint8Array;
-}
 function hasVisibleStyle(cell) {
     return cell.fg !== undefined
         || cell.bg !== undefined
@@ -19,8 +17,8 @@ function hasVisibleStyle(cell) {
  */
 export function stringToSurface(text, width, height) {
     const surface = createSurface(width, height);
-    const plainText = stripAnsi(text);
-    const lines = plainText.split(/\r?\n/);
+    const plainText = sanitizeTerminalText(text);
+    const lines = plainText.split('\n');
     for (let y = 0; y < Math.min(height, lines.length); y++) {
         const line = lines[y];
         const gs = segmentGraphemes(line);
@@ -38,7 +36,11 @@ export function stringToSurface(text, width, height) {
  */
 export function parseAnsiToSurface(text, width, height) {
     const surface = createSurface(width, height);
-    const lines = text.replace(ANSI_OSC8_RE, '').split(/\r?\n/);
+    const safeText = sanitizeTerminalText(text, {
+        allowAnsiStyling: true,
+        allowHyperlinks: true,
+    });
+    const lines = safeText.replace(ANSI_OSC8_RE, '').split('\n');
     const ANSI_RE = /\x1b\[([0-9;]*)m/g;
     for (let y = 0; y < Math.min(height, lines.length); y++) {
         const line = lines[y];
@@ -136,14 +138,14 @@ function writeSurfaceGrapheme(surface, x, y, char, style) {
         return 0;
     const width = Math.max(1, graphemeClusterWidth(char));
     if (isPackedSurface(surface) && (style?.fg || style?.bg)) {
-        const fg = style?.fg ? parseHex(style.fg) : undefined;
+        const fg = colorRgb(style?.fg);
         let fR = -1, fG = 0, fB = 0;
         if (fg) {
             fR = fg[0];
             fG = fg[1];
             fB = fg[2];
         }
-        const bg = style?.bg ? parseHex(style.bg) : undefined;
+        const bg = colorRgb(style?.bg);
         let bR = -1, bG = 0, bB = 0;
         if (bg) {
             bR = bg[0];
@@ -810,8 +812,8 @@ function renderDiffCells(current, target, io, style) {
                 batchX++;
             }
             if (hasVisibleStyle(targetCell)) {
-                token.hex = targetCell.fg;
-                token.bg = targetCell.bg;
+                token.hex = colorHex(targetCell.fg) ?? token.hex;
+                token.bg = colorHex(targetCell.bg);
                 token.modifiers = targetCell.modifiers;
                 output += style.styled(token, batchText);
             }