@flyingrobots/bijou 3.0.0 → 3.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +17 -9
- package/dist/adapters/test/clock.d.ts +36 -0
- package/dist/adapters/test/clock.d.ts.map +1 -0
- package/dist/adapters/test/clock.js +132 -0
- package/dist/adapters/test/clock.js.map +1 -0
- package/dist/adapters/test/index.d.ts +8 -1
- package/dist/adapters/test/index.d.ts.map +1 -1
- package/dist/adapters/test/index.js +20 -2
- package/dist/adapters/test/index.js.map +1 -1
- package/dist/adapters/test/io.d.ts +3 -0
- package/dist/adapters/test/io.d.ts.map +1 -1
- package/dist/adapters/test/io.js +5 -4
- package/dist/adapters/test/io.js.map +1 -1
- package/dist/core/ansi.d.ts +2 -0
- package/dist/core/ansi.d.ts.map +1 -1
- package/dist/core/ansi.js +2 -0
- package/dist/core/ansi.js.map +1 -1
- package/dist/core/clock.d.ts +12 -0
- package/dist/core/clock.d.ts.map +1 -0
- package/dist/core/clock.js +59 -0
- package/dist/core/clock.js.map +1 -0
- package/dist/core/components/alert-v3.d.ts +7 -0
- package/dist/core/components/alert-v3.d.ts.map +1 -0
- package/dist/core/components/alert-v3.js +37 -0
- package/dist/core/components/alert-v3.js.map +1 -0
- package/dist/core/components/alert.d.ts +2 -0
- package/dist/core/components/alert.d.ts.map +1 -1
- package/dist/core/components/alert.js +1 -1
- package/dist/core/components/alert.js.map +1 -1
- package/dist/core/components/box-v3.d.ts +10 -2
- package/dist/core/components/box-v3.d.ts.map +1 -1
- package/dist/core/components/box-v3.js +79 -21
- package/dist/core/components/box-v3.js.map +1 -1
- package/dist/core/components/box.d.ts +7 -0
- package/dist/core/components/box.d.ts.map +1 -1
- package/dist/core/components/box.js +13 -7
- package/dist/core/components/box.js.map +1 -1
- package/dist/core/components/index.d.ts +6 -0
- package/dist/core/components/index.d.ts.map +1 -1
- package/dist/core/components/index.js +4 -0
- package/dist/core/components/index.js.map +1 -1
- package/dist/core/components/log.d.ts.map +1 -1
- package/dist/core/components/log.js +4 -3
- package/dist/core/components/log.js.map +1 -1
- package/dist/core/components/overflow.d.ts +3 -0
- package/dist/core/components/overflow.d.ts.map +1 -0
- package/dist/core/components/overflow.js +33 -0
- package/dist/core/components/overflow.js.map +1 -0
- package/dist/core/components/progress.d.ts.map +1 -1
- package/dist/core/components/progress.js +3 -1
- package/dist/core/components/progress.js.map +1 -1
- package/dist/core/components/separator-v3.d.ts +7 -0
- package/dist/core/components/separator-v3.d.ts.map +1 -0
- package/dist/core/components/separator-v3.js +46 -0
- package/dist/core/components/separator-v3.js.map +1 -0
- package/dist/core/components/spinner.d.ts.map +1 -1
- package/dist/core/components/spinner.js +3 -1
- package/dist/core/components/spinner.js.map +1 -1
- package/dist/core/components/surface-text.d.ts +14 -0
- package/dist/core/components/surface-text.d.ts.map +1 -0
- package/dist/core/components/surface-text.js +95 -0
- package/dist/core/components/surface-text.js.map +1 -0
- package/dist/core/components/table-v3.d.ts +11 -0
- package/dist/core/components/table-v3.d.ts.map +1 -0
- package/dist/core/components/table-v3.js +148 -0
- package/dist/core/components/table-v3.js.map +1 -0
- package/dist/core/components/table.d.ts +2 -1
- package/dist/core/components/table.d.ts.map +1 -1
- package/dist/core/components/table.js +40 -11
- package/dist/core/components/table.js.map +1 -1
- package/dist/core/components/timer.d.ts.map +1 -1
- package/dist/core/components/timer.js +11 -9
- package/dist/core/components/timer.js.map +1 -1
- package/dist/core/components/types.d.ts +4 -0
- package/dist/core/components/types.d.ts.map +1 -1
- package/dist/core/runtime-viewport.d.ts +34 -0
- package/dist/core/runtime-viewport.d.ts.map +1 -0
- package/dist/core/runtime-viewport.js +74 -0
- package/dist/core/runtime-viewport.js.map +1 -0
- package/dist/core/text/index.d.ts +1 -0
- package/dist/core/text/index.d.ts.map +1 -1
- package/dist/core/text/index.js +1 -0
- package/dist/core/text/index.js.map +1 -1
- package/dist/core/text/wrap.d.ts +11 -0
- package/dist/core/text/wrap.d.ts.map +1 -0
- package/dist/core/text/wrap.js +90 -0
- package/dist/core/text/wrap.js.map +1 -0
- package/dist/factory.d.ts +3 -0
- package/dist/factory.d.ts.map +1 -1
- package/dist/factory.js +3 -0
- package/dist/factory.js.map +1 -1
- package/dist/index.d.ts +5 -4
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +4 -3
- package/dist/index.js.map +1 -1
- package/dist/ports/clock.d.ts +29 -0
- package/dist/ports/clock.d.ts.map +1 -0
- package/dist/ports/clock.js +2 -0
- package/dist/ports/clock.js.map +1 -0
- package/dist/ports/context.d.ts +3 -0
- package/dist/ports/context.d.ts.map +1 -1
- package/dist/ports/index.d.ts +1 -0
- package/dist/ports/index.d.ts.map +1 -1
- package/dist/ports/index.js.map +1 -1
- package/package.json +2 -2
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
import { createSurface } from '../../ports/surface.js';
|
|
2
|
+
import { resolveSafeCtx as resolveCtx } from '../resolve-ctx.js';
|
|
3
|
+
import { segmentSurfaceText, tokenToCellStyle } from './surface-text.js';
|
|
4
|
+
/**
|
|
5
|
+
* Render a horizontal separator as a Surface for V3-native composition.
|
|
6
|
+
*/
|
|
7
|
+
export function separatorSurface(options = {}) {
|
|
8
|
+
const ctx = resolveCtx(options.ctx);
|
|
9
|
+
const label = options.label ?? '';
|
|
10
|
+
const token = options.borderToken ?? ctx?.border('muted');
|
|
11
|
+
const borderStyle = tokenToCellStyle(token);
|
|
12
|
+
const labelGraphemes = label.length > 0 ? segmentSurfaceText(` ${label} `, 'separatorSurface label') : [];
|
|
13
|
+
const fallbackWidth = labelGraphemes.length > 0 ? labelGraphemes.length : 3;
|
|
14
|
+
const width = Math.max(0, Math.floor(options.width ?? ctx?.runtime.columns ?? fallbackWidth));
|
|
15
|
+
const surface = createSurface(width, 1);
|
|
16
|
+
if (width === 0)
|
|
17
|
+
return surface;
|
|
18
|
+
const setBorder = (x, char) => {
|
|
19
|
+
surface.set(x, 0, { char, ...borderStyle, empty: false });
|
|
20
|
+
};
|
|
21
|
+
const setPlain = (x, char) => {
|
|
22
|
+
surface.set(x, 0, { char, empty: false });
|
|
23
|
+
};
|
|
24
|
+
if (label.length === 0) {
|
|
25
|
+
for (let x = 0; x < width; x++)
|
|
26
|
+
setBorder(x, '\u2500');
|
|
27
|
+
return surface;
|
|
28
|
+
}
|
|
29
|
+
if (labelGraphemes.length >= width) {
|
|
30
|
+
for (let x = 0; x < width; x++) {
|
|
31
|
+
setPlain(x, labelGraphemes[x] ?? ' ');
|
|
32
|
+
}
|
|
33
|
+
return surface;
|
|
34
|
+
}
|
|
35
|
+
const remaining = width - labelGraphemes.length;
|
|
36
|
+
const left = Math.floor(remaining / 2);
|
|
37
|
+
const right = remaining - left;
|
|
38
|
+
for (let x = 0; x < left; x++)
|
|
39
|
+
setBorder(x, '\u2500');
|
|
40
|
+
for (let i = 0; i < labelGraphemes.length; i++)
|
|
41
|
+
setPlain(left + i, labelGraphemes[i]);
|
|
42
|
+
for (let x = 0; x < right; x++)
|
|
43
|
+
setBorder(left + labelGraphemes.length + x, '\u2500');
|
|
44
|
+
return surface;
|
|
45
|
+
}
|
|
46
|
+
//# sourceMappingURL=separator-v3.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"separator-v3.js","sourceRoot":"","sources":["../../../src/core/components/separator-v3.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spinner.d.ts","sourceRoot":"","sources":["../../../src/core/components/spinner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"spinner.d.ts","sourceRoot":"","sources":["../../../src/core/components/spinner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAS3D,wDAAwD;AACxD,MAAM,WAAW,cAAc;IAC7B,iEAAiE;IACjE,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,kDAAkD;IAClD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,2DAA2D;IAC3D,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,0DAA0D;IAC1D,GAAG,CAAC,EAAE,YAAY,CAAC;CACpB;AAKD;;;;;;;;;;;;GAYG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,GAAE,cAAmB,GAAG,MAAM,CAc/E;AAED,gFAAgF;AAChF,MAAM,WAAW,iBAAiB;IAChC,2FAA2F;IAC3F,KAAK,IAAI,IAAI,CAAC;IACd;;OAEG;IACH,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B;;;OAGG;IACH,IAAI,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACnC;AAED;;;;;;;;;GASG;AACH,wBAAgB,aAAa,CAAC,OAAO,GAAE,cAAmB,GAAG,iBAAiB,CAoD7E"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { resolveClock } from '../clock.js';
|
|
1
2
|
import { resolveCtx } from '../resolve-ctx.js';
|
|
2
3
|
import { renderByMode } from '../mode-render.js';
|
|
3
4
|
import { cursorGuard } from './cursor-guard.js';
|
|
@@ -43,6 +44,7 @@ export function spinnerFrame(tick, options = {}) {
|
|
|
43
44
|
*/
|
|
44
45
|
export function createSpinner(options = {}) {
|
|
45
46
|
const ctx = resolveCtx(options.ctx);
|
|
47
|
+
const clock = resolveClock(ctx);
|
|
46
48
|
const frames = options.frames ?? DOTS;
|
|
47
49
|
const interval = options.interval ?? 80;
|
|
48
50
|
let label = options.label ?? 'Loading';
|
|
@@ -65,7 +67,7 @@ export function createSpinner(options = {}) {
|
|
|
65
67
|
cursorHandle?.dispose();
|
|
66
68
|
cursorHandle = cursorGuard(ctx.io).hide();
|
|
67
69
|
render();
|
|
68
|
-
timer =
|
|
70
|
+
timer = clock.setInterval(render, interval);
|
|
69
71
|
},
|
|
70
72
|
update(newLabel) {
|
|
71
73
|
label = newLabel;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spinner.js","sourceRoot":"","sources":["../../../src/core/components/spinner.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,WAAW,EAAyB,MAAM,mBAAmB,CAAC;AACvE,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAc/C,0CAA0C;AAC1C,MAAM,IAAI,GAAG,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;AAElH;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,YAAY,CAAC,IAAY,EAAE,UAA0B,EAAE;IACrE,MAAM,GAAG,GAAG,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACpC,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,IAAI,CAAC;IACtC,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,IAAI,SAAS,CAAC;IAEzC,OAAO,YAAY,CAAC,GAAG,CAAC,IAAI,EAAE;QAC5B,WAAW,EAAE,GAAG,EAAE;YAChB,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,IAAI,QAAQ,CAAC;YACpE,OAAO,GAAG,KAAK,IAAI,KAAK,EAAE,CAAC;QAC7B,CAAC;QACD,MAAM,EAAE,GAAG,EAAE,CAAC,OAAO,KAAK,EAAE;QAC5B,IAAI,EAAE,GAAG,EAAE,CAAC,GAAG,KAAK,KAAK;QACzB,UAAU,EAAE,GAAG,EAAE,CAAC,GAAG,KAAK,gBAAgB;KAC3C,EAAE,OAAO,CAAC,CAAC;AACd,CAAC;AAiBD;;;;;;;;;GASG;AACH,MAAM,UAAU,aAAa,CAAC,UAA0B,EAAE;IACxD,MAAM,GAAG,GAAG,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACpC,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,IAAI,CAAC;IACtC,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,EAAE,CAAC;IACxC,IAAI,KAAK,GAAG,OAAO,CAAC,KAAK,IAAI,SAAS,CAAC;IACvC,IAAI,KAAK,GAAuB,IAAI,CAAC;IACrC,IAAI,YAAY,GAA4B,IAAI,CAAC;IACjD,IAAI,IAAI,GAAG,CAAC,CAAC;IAEb,MAAM,IAAI,GAAe,GAAG,CAAC,IAAI,CAAC;IAElC,8EAA8E;IAC9E,SAAS,MAAM;QACb,MAAM,IAAI,GAAG,YAAY,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC;QACxD,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,iBAAiB,GAAG,IAAI,EAAE,CAAC,CAAC;QAC5C,IAAI,EAAE,CAAC;IACT,CAAC;IAED,OAAO;QACL,KAAK;YACH,IAAI,IAAI,KAAK,aAAa,EAAE,CAAC;gBAC3B,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC;gBAC7D,OAAO;YACT,CAAC;YACD,YAAY,EAAE,OAAO,EAAE,CAAC;YACxB,YAAY,GAAG,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;YAC1C,MAAM,EAAE,CAAC;YACT,KAAK,GAAG,
|
|
1
|
+
{"version":3,"file":"spinner.js","sourceRoot":"","sources":["../../../src/core/components/spinner.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import { type Cell, type Surface } from '../../ports/surface.js';
|
|
2
|
+
import type { TokenValue } from '../theme/tokens.js';
|
|
3
|
+
export type CellTextStyle = Pick<Cell, 'fg' | 'bg' | 'modifiers'>;
|
|
4
|
+
export interface SurfaceTextSegment {
|
|
5
|
+
readonly text: string;
|
|
6
|
+
readonly style?: CellTextStyle;
|
|
7
|
+
}
|
|
8
|
+
export declare function segmentSurfaceText(text: string, purpose?: string): string[];
|
|
9
|
+
export declare function tokenToCellStyle(token: TokenValue | undefined): CellTextStyle;
|
|
10
|
+
export declare function createTextSurface(text: string, style?: CellTextStyle): Surface;
|
|
11
|
+
export declare function createSegmentSurface(segments: readonly SurfaceTextSegment[]): Surface;
|
|
12
|
+
export declare function padSurface(surface: Surface, width: number, height: number, fill?: CellTextStyle): Surface;
|
|
13
|
+
export declare function wrapSurfaceToWidth(surface: Surface, width: number): Surface;
|
|
14
|
+
//# sourceMappingURL=surface-text.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"surface-text.d.ts","sourceRoot":"","sources":["../../../src/core/components/surface-text.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,KAAK,IAAI,EAAE,KAAK,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAChF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAGrD,MAAM,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,GAAG,WAAW,CAAC,CAAC;AAElE,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,KAAK,CAAC,EAAE,aAAa,CAAC;CAChC;AAID,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,GAAE,MAAuB,GAAG,MAAM,EAAE,CAS3F;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,UAAU,GAAG,SAAS,GAAG,aAAa,CAO7E;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,GAAE,aAAkB,GAAG,OAAO,CAgBlF;AAED,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,SAAS,kBAAkB,EAAE,GAAG,OAAO,CAmBrF;AAED,wBAAgB,UAAU,CACxB,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,EACd,IAAI,CAAC,EAAE,aAAa,GACnB,OAAO,CAMT;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAqC3E"}
|
|
@@ -0,0 +1,95 @@
|
|
|
1
|
+
import { createSurface } from '../../ports/surface.js';
|
|
2
|
+
import { graphemeClusterWidth, segmentGraphemes } from '../text/grapheme.js';
|
|
3
|
+
const SURFACE_NARROW_OVERRIDES = new Set(['✓', '✗']);
|
|
4
|
+
export function segmentSurfaceText(text, purpose = 'Surface text') {
|
|
5
|
+
const graphemes = segmentGraphemes(text ?? '');
|
|
6
|
+
const wide = graphemes.find((grapheme) => graphemeClusterWidth(grapheme) !== 1 && !SURFACE_NARROW_OVERRIDES.has(grapheme));
|
|
7
|
+
if (wide) {
|
|
8
|
+
throw new Error(`${purpose} does not yet support wide graphemes like "${wide}" in surface rendering.`);
|
|
9
|
+
}
|
|
10
|
+
return graphemes;
|
|
11
|
+
}
|
|
12
|
+
export function tokenToCellStyle(token) {
|
|
13
|
+
if (token == null)
|
|
14
|
+
return {};
|
|
15
|
+
return {
|
|
16
|
+
fg: token.hex,
|
|
17
|
+
bg: token.bg,
|
|
18
|
+
modifiers: token.modifiers,
|
|
19
|
+
};
|
|
20
|
+
}
|
|
21
|
+
export function createTextSurface(text, style = {}) {
|
|
22
|
+
const safeText = text ?? '';
|
|
23
|
+
const lines = safeText.split(/\r?\n/);
|
|
24
|
+
const lineGraphemes = lines.map((line) => segmentSurfaceText(line, 'createTextSurface'));
|
|
25
|
+
const width = lineGraphemes.reduce((max, graphemes) => Math.max(max, graphemes.length), 0);
|
|
26
|
+
const height = Math.max(1, lines.length);
|
|
27
|
+
const surface = createSurface(width, height);
|
|
28
|
+
for (let y = 0; y < lines.length; y++) {
|
|
29
|
+
const graphemes = lineGraphemes[y];
|
|
30
|
+
for (let x = 0; x < graphemes.length; x++) {
|
|
31
|
+
surface.set(x, y, { char: graphemes[x], ...style, empty: false });
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
return surface;
|
|
35
|
+
}
|
|
36
|
+
export function createSegmentSurface(segments) {
|
|
37
|
+
if (segments.length === 0)
|
|
38
|
+
return createTextSurface('');
|
|
39
|
+
const segmented = segments.map((segment) => ({
|
|
40
|
+
style: segment.style,
|
|
41
|
+
graphemes: segmentSurfaceText(segment.text ?? '', 'createSegmentSurface'),
|
|
42
|
+
}));
|
|
43
|
+
const width = segmented.reduce((sum, segment) => sum + segment.graphemes.length, 0);
|
|
44
|
+
const surface = createSurface(width, 1);
|
|
45
|
+
let x = 0;
|
|
46
|
+
for (const segment of segmented) {
|
|
47
|
+
for (const char of segment.graphemes) {
|
|
48
|
+
surface.set(x, 0, { char, ...segment.style, empty: false });
|
|
49
|
+
x++;
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
return surface;
|
|
53
|
+
}
|
|
54
|
+
export function padSurface(surface, width, height, fill) {
|
|
55
|
+
const result = fill == null
|
|
56
|
+
? createSurface(width, height)
|
|
57
|
+
: createSurface(width, height, { char: ' ', ...fill, empty: false });
|
|
58
|
+
result.blit(surface, 0, 0);
|
|
59
|
+
return result;
|
|
60
|
+
}
|
|
61
|
+
export function wrapSurfaceToWidth(surface, width) {
|
|
62
|
+
if (width <= 0)
|
|
63
|
+
return createSurface(0, Math.max(1, surface.height));
|
|
64
|
+
if (surface.width <= width)
|
|
65
|
+
return surface;
|
|
66
|
+
const rows = [];
|
|
67
|
+
for (let y = 0; y < surface.height; y++) {
|
|
68
|
+
let effectiveWidth = 0;
|
|
69
|
+
for (let x = surface.width - 1; x >= 0; x--) {
|
|
70
|
+
if (!surface.get(x, y).empty) {
|
|
71
|
+
effectiveWidth = x + 1;
|
|
72
|
+
break;
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
if (effectiveWidth === 0) {
|
|
76
|
+
rows.push([]);
|
|
77
|
+
continue;
|
|
78
|
+
}
|
|
79
|
+
const cells = [];
|
|
80
|
+
for (let x = 0; x < effectiveWidth; x++) {
|
|
81
|
+
cells.push({ ...surface.get(x, y) });
|
|
82
|
+
}
|
|
83
|
+
for (let offset = 0; offset < cells.length; offset += width) {
|
|
84
|
+
rows.push(cells.slice(offset, offset + width));
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
const result = createSurface(width, Math.max(1, rows.length));
|
|
88
|
+
rows.forEach((row, y) => {
|
|
89
|
+
row.forEach((cell, x) => {
|
|
90
|
+
result.set(x, y, cell);
|
|
91
|
+
});
|
|
92
|
+
});
|
|
93
|
+
return result;
|
|
94
|
+
}
|
|
95
|
+
//# sourceMappingURL=surface-text.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"surface-text.js","sourceRoot":"","sources":["../../../src/core/components/surface-text.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import { type Surface } from '../../ports/surface.js';
|
|
2
|
+
import type { TableOptions } from './table.js';
|
|
3
|
+
export type TableSurfaceCell = string | Surface;
|
|
4
|
+
export interface TableSurfaceOptions extends Omit<TableOptions, 'rows'> {
|
|
5
|
+
readonly rows: TableSurfaceCell[][];
|
|
6
|
+
}
|
|
7
|
+
/**
|
|
8
|
+
* Render a bordered data table as a Surface for V3-native composition.
|
|
9
|
+
*/
|
|
10
|
+
export declare function tableSurface(options: TableSurfaceOptions): Surface;
|
|
11
|
+
//# sourceMappingURL=table-v3.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"table-v3.d.ts","sourceRoot":"","sources":["../../../src/core/components/table-v3.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,KAAK,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAErE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAI/C,MAAM,MAAM,gBAAgB,GAAG,MAAM,GAAG,OAAO,CAAC;AAEhD,MAAM,WAAW,mBAAoB,SAAQ,IAAI,CAAC,YAAY,EAAE,MAAM,CAAC;IACrE,QAAQ,CAAC,IAAI,EAAE,gBAAgB,EAAE,EAAE,CAAC;CACrC;AAkBD;;GAEG;AACH,wBAAgB,YAAY,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAoIlE"}
|
|
@@ -0,0 +1,148 @@
|
|
|
1
|
+
import { createSurface } from '../../ports/surface.js';
|
|
2
|
+
import { resolveSafeCtx as resolveCtx } from '../resolve-ctx.js';
|
|
3
|
+
import { createTextSurface, tokenToCellStyle, wrapSurfaceToWidth } from './surface-text.js';
|
|
4
|
+
import { resolveOverflowBehavior } from './overflow.js';
|
|
5
|
+
function normalizeColumnWidth(width) {
|
|
6
|
+
if (width == null)
|
|
7
|
+
return undefined;
|
|
8
|
+
if (!Number.isFinite(width))
|
|
9
|
+
return 0;
|
|
10
|
+
return Math.max(0, Math.floor(width));
|
|
11
|
+
}
|
|
12
|
+
function resolveColumns(columns, rows) {
|
|
13
|
+
if (columns.length > 0)
|
|
14
|
+
return [...columns];
|
|
15
|
+
const inferredCount = rows.reduce((max, row) => Math.max(max, row.length), 0);
|
|
16
|
+
return Array.from({ length: inferredCount }, () => ({ header: '' }));
|
|
17
|
+
}
|
|
18
|
+
/**
|
|
19
|
+
* Render a bordered data table as a Surface for V3-native composition.
|
|
20
|
+
*/
|
|
21
|
+
export function tableSurface(options) {
|
|
22
|
+
const ctx = resolveCtx(options.ctx);
|
|
23
|
+
const overflow = resolveOverflowBehavior(options.overflow, ctx?.resolveBCSS({ type: 'Table', id: options.id, classes: options.class?.split(' ') }) ?? {});
|
|
24
|
+
const rawRows = (options.rows ?? []).map((row) => (row ?? []).map((cell) => cell ?? ''));
|
|
25
|
+
const columns = resolveColumns(options.columns ?? [], rawRows);
|
|
26
|
+
const rows = rawRows;
|
|
27
|
+
const headerToken = options.headerToken ?? ctx?.ui('tableHeader');
|
|
28
|
+
const headerStyle = tokenToCellStyle(headerToken);
|
|
29
|
+
const borderStyle = tokenToCellStyle(options.borderToken ?? ctx?.border('muted'));
|
|
30
|
+
const headerBg = options.headerBgToken == null ? undefined : tokenToCellStyle(options.headerBgToken);
|
|
31
|
+
const headerSurfaces = columns.map((column) => createTextSurface(column.header ?? '', {
|
|
32
|
+
...headerStyle,
|
|
33
|
+
bg: headerBg?.bg ?? headerStyle.bg,
|
|
34
|
+
}));
|
|
35
|
+
const cellSurfaces = rows.map((row) => row.map((cell) => typeof cell === 'string' ? createTextSurface(cell) : cell));
|
|
36
|
+
const colWidths = columns.map((column, index) => {
|
|
37
|
+
const normalizedWidth = normalizeColumnWidth(column.width);
|
|
38
|
+
if (normalizedWidth !== undefined)
|
|
39
|
+
return normalizedWidth;
|
|
40
|
+
let maxWidth = headerSurfaces[index]?.width ?? 0;
|
|
41
|
+
for (const row of cellSurfaces) {
|
|
42
|
+
maxWidth = Math.max(maxWidth, row[index]?.width ?? 0);
|
|
43
|
+
}
|
|
44
|
+
return maxWidth;
|
|
45
|
+
});
|
|
46
|
+
const fittedHeaderSurfaces = headerSurfaces.map((cell, index) => {
|
|
47
|
+
const cellWidth = colWidths[index] ?? 0;
|
|
48
|
+
if (columns[index]?.width === undefined || overflow === 'truncate')
|
|
49
|
+
return cell;
|
|
50
|
+
return wrapSurfaceToWidth(cell, cellWidth);
|
|
51
|
+
});
|
|
52
|
+
const headerHeight = fittedHeaderSurfaces.reduce((max, cell) => Math.max(max, cell.height), 1);
|
|
53
|
+
const fittedCellSurfaces = cellSurfaces.map((row) => row.map((cell, index) => {
|
|
54
|
+
const cellWidth = colWidths[index] ?? 0;
|
|
55
|
+
if (columns[index]?.width === undefined || overflow === 'truncate')
|
|
56
|
+
return cell;
|
|
57
|
+
return wrapSurfaceToWidth(cell, cellWidth);
|
|
58
|
+
}));
|
|
59
|
+
const rowHeights = fittedCellSurfaces.map((row) => row.reduce((max, cell, index) => {
|
|
60
|
+
const cellWidth = colWidths[index] ?? 0;
|
|
61
|
+
if (cellWidth <= 0)
|
|
62
|
+
return max;
|
|
63
|
+
return Math.max(max, cell.height);
|
|
64
|
+
}, 1));
|
|
65
|
+
const totalWidth = columns.length === 0
|
|
66
|
+
? 2
|
|
67
|
+
: colWidths.reduce((sum, width) => sum + width + 2, 0) + columns.length + 1;
|
|
68
|
+
const totalHeight = 1 + headerHeight + 1 + rowHeights.reduce((sum, height) => sum + height, 0) + 1;
|
|
69
|
+
const surface = createSurface(totalWidth, totalHeight, { char: ' ', empty: false });
|
|
70
|
+
const setBorder = (x, y, char, bg) => {
|
|
71
|
+
surface.set(x, y, { char, ...borderStyle, bg: bg ?? borderStyle.bg, empty: false });
|
|
72
|
+
};
|
|
73
|
+
const setSpace = (x, y, bg, fg) => {
|
|
74
|
+
surface.set(x, y, {
|
|
75
|
+
char: ' ',
|
|
76
|
+
fg: fg ?? headerBg?.fg,
|
|
77
|
+
bg: bg ?? headerBg?.bg,
|
|
78
|
+
modifiers: headerBg?.modifiers,
|
|
79
|
+
empty: false,
|
|
80
|
+
});
|
|
81
|
+
};
|
|
82
|
+
const drawBorderRow = (y, left, mid, right) => {
|
|
83
|
+
if (columns.length === 0) {
|
|
84
|
+
setBorder(0, y, left);
|
|
85
|
+
setBorder(1, y, right);
|
|
86
|
+
return;
|
|
87
|
+
}
|
|
88
|
+
let x = 0;
|
|
89
|
+
setBorder(x++, y, left);
|
|
90
|
+
for (let i = 0; i < colWidths.length; i++) {
|
|
91
|
+
for (let j = 0; j < colWidths[i] + 2; j++)
|
|
92
|
+
setBorder(x++, y, '\u2500');
|
|
93
|
+
setBorder(x++, y, i === colWidths.length - 1 ? right : mid);
|
|
94
|
+
}
|
|
95
|
+
};
|
|
96
|
+
drawBorderRow(0, '\u250c', '\u252c', '\u2510');
|
|
97
|
+
if (columns.length === 0) {
|
|
98
|
+
for (let headerY = 0; headerY < headerHeight; headerY++) {
|
|
99
|
+
setBorder(0, 1 + headerY, '\u2502', headerBg?.bg);
|
|
100
|
+
setBorder(1, 1 + headerY, '\u2502', headerBg?.bg);
|
|
101
|
+
}
|
|
102
|
+
drawBorderRow(1 + headerHeight, '\u251c', '\u253c', '\u2524');
|
|
103
|
+
drawBorderRow(totalHeight - 1, '\u2514', '\u2534', '\u2518');
|
|
104
|
+
return surface;
|
|
105
|
+
}
|
|
106
|
+
for (let headerLine = 0; headerLine < headerHeight; headerLine++) {
|
|
107
|
+
let headerX = 1;
|
|
108
|
+
for (let i = 0; i < columns.length; i++) {
|
|
109
|
+
const cellWidth = colWidths[i];
|
|
110
|
+
const headerSurface = fittedHeaderSurfaces[i];
|
|
111
|
+
for (let x = headerX; x < headerX + cellWidth + 2; x++)
|
|
112
|
+
setSpace(x, 1 + headerLine);
|
|
113
|
+
setBorder(headerX - 1, 1 + headerLine, '\u2502', headerBg?.bg);
|
|
114
|
+
surface.blit(headerSurface, headerX + 1, 1 + headerLine, 0, headerLine, cellWidth, 1);
|
|
115
|
+
headerX += cellWidth + 3;
|
|
116
|
+
}
|
|
117
|
+
setBorder(totalWidth - 1, 1 + headerLine, '\u2502', headerBg?.bg);
|
|
118
|
+
}
|
|
119
|
+
drawBorderRow(1 + headerHeight, '\u251c', '\u253c', '\u2524');
|
|
120
|
+
let y = 2 + headerHeight;
|
|
121
|
+
for (let rowIndex = 0; rowIndex < fittedCellSurfaces.length; rowIndex++) {
|
|
122
|
+
const row = fittedCellSurfaces[rowIndex];
|
|
123
|
+
const rowHeight = rowHeights[rowIndex];
|
|
124
|
+
for (let line = 0; line < rowHeight; line++) {
|
|
125
|
+
let x = 1;
|
|
126
|
+
for (let colIndex = 0; colIndex < columns.length; colIndex++) {
|
|
127
|
+
const cellWidth = colWidths[colIndex];
|
|
128
|
+
setBorder(x - 1, y + line, '\u2502');
|
|
129
|
+
for (let fillX = x; fillX < x + cellWidth + 2; fillX++) {
|
|
130
|
+
surface.set(fillX, y + line, { char: ' ', empty: false });
|
|
131
|
+
}
|
|
132
|
+
x += cellWidth + 3;
|
|
133
|
+
}
|
|
134
|
+
setBorder(totalWidth - 1, y + line, '\u2502');
|
|
135
|
+
}
|
|
136
|
+
let x = 1;
|
|
137
|
+
for (let colIndex = 0; colIndex < columns.length; colIndex++) {
|
|
138
|
+
const cellWidth = colWidths[colIndex];
|
|
139
|
+
const cellSurface = row[colIndex] ?? createTextSurface('');
|
|
140
|
+
surface.blit(cellSurface, x + 1, y, 0, 0, cellWidth, rowHeight);
|
|
141
|
+
x += cellWidth + 3;
|
|
142
|
+
}
|
|
143
|
+
y += rowHeight;
|
|
144
|
+
}
|
|
145
|
+
drawBorderRow(totalHeight - 1, '\u2514', '\u2534', '\u2518');
|
|
146
|
+
return surface;
|
|
147
|
+
}
|
|
148
|
+
//# sourceMappingURL=table-v3.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"table-v3.js","sourceRoot":"","sources":["../../../src/core/components/table-v3.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { BijouContext } from '../../ports/context.js';
|
|
2
2
|
import type { TokenValue } from '../theme/tokens.js';
|
|
3
|
+
import type { BijouNodeOptions } from './types.js';
|
|
3
4
|
/** Definition for a single table column. */
|
|
4
5
|
export interface TableColumn {
|
|
5
6
|
/** Column header text. */
|
|
@@ -8,7 +9,7 @@ export interface TableColumn {
|
|
|
8
9
|
width?: number;
|
|
9
10
|
}
|
|
10
11
|
/** Configuration for rendering a table. */
|
|
11
|
-
export interface TableOptions {
|
|
12
|
+
export interface TableOptions extends BijouNodeOptions {
|
|
12
13
|
/** Column definitions (headers and optional widths). */
|
|
13
14
|
columns: TableColumn[];
|
|
14
15
|
/** Two-dimensional array of cell strings, one inner array per row. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"table.d.ts","sourceRoot":"","sources":["../../../src/core/components/table.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"table.d.ts","sourceRoot":"","sources":["../../../src/core/components/table.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAKrD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAEnD,4CAA4C;AAC5C,MAAM,WAAW,WAAW;IAC1B,0BAA0B;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,6FAA6F;IAC7F,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,2CAA2C;AAC3C,MAAM,WAAW,YAAa,SAAQ,gBAAgB;IACpD,wDAAwD;IACxD,OAAO,EAAE,WAAW,EAAE,CAAC;IACvB,sEAAsE;IACtE,IAAI,EAAE,MAAM,EAAE,EAAE,CAAC;IACjB,0CAA0C;IAC1C,WAAW,CAAC,EAAE,UAAU,CAAC;IACzB,gDAAgD;IAChD,WAAW,CAAC,EAAE,UAAU,CAAC;IACzB,0EAA0E;IAC1E,aAAa,CAAC,EAAE,UAAU,CAAC;IAC3B,0DAA0D;IAC1D,GAAG,CAAC,EAAE,YAAY,CAAC;CACpB;AA4CD;;;;;;;;;;GAUG;AACH,wBAAgB,KAAK,CAAC,OAAO,EAAE,YAAY,GAAG,MAAM,CAsFnD"}
|
|
@@ -1,7 +1,10 @@
|
|
|
1
|
+
import { graphemeWidth } from '../text/grapheme.js';
|
|
2
|
+
import { clipToWidth } from '../text/clip.js';
|
|
3
|
+
import { wrapToWidth } from '../text/wrap.js';
|
|
1
4
|
import { resolveCtx } from '../resolve-ctx.js';
|
|
2
5
|
import { renderByMode } from '../mode-render.js';
|
|
3
6
|
import { makeBgFill } from '../bg-fill.js';
|
|
4
|
-
import {
|
|
7
|
+
import { resolveOverflowBehavior } from './overflow.js';
|
|
5
8
|
/**
|
|
6
9
|
* Calculate the visible (non-ANSI) character length of a string.
|
|
7
10
|
*
|
|
@@ -9,7 +12,7 @@ import { stripAnsi } from '../text/grapheme.js';
|
|
|
9
12
|
* @returns The number of visible characters.
|
|
10
13
|
*/
|
|
11
14
|
function visibleLength(str) {
|
|
12
|
-
return
|
|
15
|
+
return graphemeWidth(str);
|
|
13
16
|
}
|
|
14
17
|
/**
|
|
15
18
|
* Right-pad a string to a target width, accounting for ANSI escape sequences.
|
|
@@ -22,6 +25,22 @@ function padRight(str, width) {
|
|
|
22
25
|
const visible = visibleLength(str);
|
|
23
26
|
return visible >= width ? str : str + ' '.repeat(width - visible);
|
|
24
27
|
}
|
|
28
|
+
function normalizeColumnWidth(width) {
|
|
29
|
+
if (width == null)
|
|
30
|
+
return undefined;
|
|
31
|
+
if (!Number.isFinite(width))
|
|
32
|
+
return 0;
|
|
33
|
+
return Math.max(0, Math.floor(width));
|
|
34
|
+
}
|
|
35
|
+
function formatCellLines(value, width, overflow, fixedWidth) {
|
|
36
|
+
const safeValue = value ?? '';
|
|
37
|
+
if (!fixedWidth)
|
|
38
|
+
return safeValue.split('\n');
|
|
39
|
+
if (overflow === 'truncate') {
|
|
40
|
+
return safeValue.split('\n').map((line) => clipToWidth(line, width));
|
|
41
|
+
}
|
|
42
|
+
return safeValue.split('\n').flatMap((line) => wrapToWidth(line, width));
|
|
43
|
+
}
|
|
25
44
|
/**
|
|
26
45
|
* Render a table with unicode box-drawing borders.
|
|
27
46
|
*
|
|
@@ -55,10 +74,12 @@ export function table(options) {
|
|
|
55
74
|
interactive: () => {
|
|
56
75
|
const headerToken = options.headerToken ?? ctx.ui('tableHeader');
|
|
57
76
|
const borderToken = options.borderToken ?? ctx.border('muted');
|
|
77
|
+
const overflow = resolveOverflowBehavior(options.overflow, ctx.resolveBCSS({ type: 'Table', id: options.id, classes: options.class?.split(' ') }));
|
|
58
78
|
const bc = (s) => ctx.style.styled(borderToken, s);
|
|
59
79
|
const colWidths = columns.map((col, i) => {
|
|
60
|
-
|
|
61
|
-
|
|
80
|
+
const normalizedWidth = normalizeColumnWidth(col.width);
|
|
81
|
+
if (normalizedWidth !== undefined)
|
|
82
|
+
return normalizedWidth;
|
|
62
83
|
let max = visibleLength(col.header ?? '');
|
|
63
84
|
for (const row of rows) {
|
|
64
85
|
const cell = row[i] ?? '';
|
|
@@ -76,14 +97,22 @@ export function table(options) {
|
|
|
76
97
|
const midSep = hLine('\u251c', '\u253c', '\u2524');
|
|
77
98
|
const bottom = hLine('\u2514', '\u2534', '\u2518');
|
|
78
99
|
const hdrBgFill = makeBgFill(options.headerBgToken, ctx);
|
|
79
|
-
const
|
|
80
|
-
const
|
|
81
|
-
const
|
|
82
|
-
|
|
83
|
-
const
|
|
84
|
-
return
|
|
100
|
+
const headerLinesByColumn = columns.map((col, i) => formatCellLines(ctx.style.styled(headerToken, col.header ?? ''), colWidths[i], overflow, col.width !== undefined));
|
|
101
|
+
const headerHeight = headerLinesByColumn.reduce((max, lines) => Math.max(max, lines.length), 1);
|
|
102
|
+
const headerRows = Array.from({ length: headerHeight }, (_row, rowIndex) => {
|
|
103
|
+
const headerCells = columns.map((_col, i) => ' ' + padRight(headerLinesByColumn[i][rowIndex] ?? '', colWidths[i]) + ' ');
|
|
104
|
+
const rawHeaderRow = bc(v) + headerCells.join(bc(v)) + bc(v);
|
|
105
|
+
return hdrBgFill ? hdrBgFill(rawHeaderRow) : rawHeaderRow;
|
|
106
|
+
});
|
|
107
|
+
const dataRows = rows.flatMap((row) => {
|
|
108
|
+
const cellLines = colWidths.map((w, i) => formatCellLines(row[i] ?? '', w, overflow, columns[i]?.width !== undefined));
|
|
109
|
+
const rowHeight = cellLines.reduce((max, lines) => Math.max(max, lines.length), 1);
|
|
110
|
+
return Array.from({ length: rowHeight }, (_line, lineIndex) => {
|
|
111
|
+
const cells = colWidths.map((w, i) => ' ' + padRight(cellLines[i][lineIndex] ?? '', w) + ' ');
|
|
112
|
+
return bc(v) + cells.join(bc(v)) + bc(v);
|
|
113
|
+
});
|
|
85
114
|
});
|
|
86
|
-
const lines = [top,
|
|
115
|
+
const lines = [top, ...headerRows, midSep, ...dataRows, bottom];
|
|
87
116
|
return lines.join('\n');
|
|
88
117
|
},
|
|
89
118
|
}, options);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"table.js","sourceRoot":"","sources":["../../../src/core/components/table.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"table.js","sourceRoot":"","sources":["../../../src/core/components/table.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"timer.d.ts","sourceRoot":"","sources":["../../../src/core/components/timer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"timer.d.ts","sourceRoot":"","sources":["../../../src/core/components/timer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAQ3D,yCAAyC;AACzC,MAAM,WAAW,YAAY;IAC3B,wEAAwE;IACxE,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,4DAA4D;IAC5D,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,qDAAqD;IACrD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,0DAA0D;IAC1D,GAAG,CAAC,EAAE,YAAY,CAAC;CACpB;AAED,gDAAgD;AAChD,MAAM,WAAW,eAAe;IAC9B,uBAAuB;IACvB,KAAK,IAAI,IAAI,CAAC;IACd,gDAAgD;IAChD,KAAK,IAAI,IAAI,CAAC;IACd,6BAA6B;IAC7B,MAAM,IAAI,IAAI,CAAC;IACf;;;OAGG;IACH,IAAI,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,mCAAmC;IACnC,OAAO,IAAI,MAAM,CAAC;CACnB;AAED,uCAAuC;AACvC,MAAM,WAAW,kBAAmB,SAAQ,YAAY;IACtD,+FAA+F;IAC/F,QAAQ,EAAE,MAAM,CAAC;IACjB,qDAAqD;IACrD,UAAU,CAAC,EAAE,MAAM,IAAI,CAAC;IACxB,uEAAuE;IACvE,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,2CAA2C;AAC3C,MAAM,WAAW,sBAAuB,SAAQ,YAAY;IAC1D,uEAAuE;IACvE,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,KAAK,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,GAAE,YAAiB,GAAG,MAAM,CAmBpE;AAoID;;;;;;;;;GASG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE,kBAAkB,GAAG,eAAe,CAsBxE;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,OAAO,GAAE,sBAA2B,GAAG,eAAe,CAUrF"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { resolveClock } from '../clock.js';
|
|
1
2
|
import { resolveCtx } from '../resolve-ctx.js';
|
|
2
3
|
import { renderByMode } from '../mode-render.js';
|
|
3
4
|
import { cursorGuard } from './cursor-guard.js';
|
|
@@ -33,10 +34,10 @@ export function timer(ms, options = {}) {
|
|
|
33
34
|
},
|
|
34
35
|
}, options);
|
|
35
36
|
}
|
|
36
|
-
function computeElapsed(s) {
|
|
37
|
+
function computeElapsed(s, nowMs) {
|
|
37
38
|
switch (s.kind) {
|
|
38
39
|
case 'idle': return 0;
|
|
39
|
-
case 'running': return s.pausedElapsed + (
|
|
40
|
+
case 'running': return s.pausedElapsed + (nowMs - s.startTime);
|
|
40
41
|
case 'paused': return s.pausedElapsed;
|
|
41
42
|
case 'stopped': return s.elapsedMs;
|
|
42
43
|
}
|
|
@@ -44,12 +45,13 @@ function computeElapsed(s) {
|
|
|
44
45
|
/** Shared controller logic for createTimer and createStopwatch. */
|
|
45
46
|
function createLiveController(config) {
|
|
46
47
|
const { ctx, interval, timerOpts, displayMs, initialDisplayMs, onTick, onComplete } = config;
|
|
48
|
+
const clock = resolveClock(ctx);
|
|
47
49
|
const mode = ctx.mode;
|
|
48
50
|
let state = { kind: 'idle' };
|
|
49
51
|
function tick() {
|
|
50
52
|
if (state.kind !== 'running')
|
|
51
53
|
return;
|
|
52
|
-
const elapsed = state.pausedElapsed + (
|
|
54
|
+
const elapsed = state.pausedElapsed + (clock.now() - state.startTime);
|
|
53
55
|
if (onTick?.(elapsed)) {
|
|
54
56
|
state.handle.dispose();
|
|
55
57
|
if (mode === 'interactive') {
|
|
@@ -88,26 +90,26 @@ function createLiveController(config) {
|
|
|
88
90
|
onComplete?.();
|
|
89
91
|
return;
|
|
90
92
|
}
|
|
91
|
-
const now =
|
|
93
|
+
const now = clock.now();
|
|
92
94
|
const line = timer(displayMs(0), { ...timerOpts, ctx });
|
|
93
95
|
ctx.io.write(`${CLEAR_LINE_RETURN}${line}`);
|
|
94
|
-
const handle =
|
|
96
|
+
const handle = clock.setInterval(tick, interval);
|
|
95
97
|
state = { kind: 'running', startTime: now, pausedElapsed: 0, handle, cursor };
|
|
96
98
|
},
|
|
97
99
|
pause() {
|
|
98
100
|
if (state.kind !== 'running')
|
|
99
101
|
return;
|
|
100
|
-
const elapsed = state.pausedElapsed + (
|
|
102
|
+
const elapsed = state.pausedElapsed + (clock.now() - state.startTime);
|
|
101
103
|
state = { kind: 'paused', pausedElapsed: elapsed, handle: state.handle, cursor: state.cursor };
|
|
102
104
|
},
|
|
103
105
|
resume() {
|
|
104
106
|
if (state.kind !== 'paused')
|
|
105
107
|
return;
|
|
106
|
-
state = { kind: 'running', startTime:
|
|
108
|
+
state = { kind: 'running', startTime: clock.now(), pausedElapsed: state.pausedElapsed,
|
|
107
109
|
handle: state.handle, cursor: state.cursor };
|
|
108
110
|
},
|
|
109
111
|
stop(finalMessage) {
|
|
110
|
-
const elapsed = computeElapsed(state);
|
|
112
|
+
const elapsed = computeElapsed(state, clock.now());
|
|
111
113
|
if (state.kind === 'running' || state.kind === 'paused') {
|
|
112
114
|
state.handle.dispose();
|
|
113
115
|
if (mode === 'interactive') {
|
|
@@ -123,7 +125,7 @@ function createLiveController(config) {
|
|
|
123
125
|
}
|
|
124
126
|
},
|
|
125
127
|
elapsed() {
|
|
126
|
-
return computeElapsed(state);
|
|
128
|
+
return computeElapsed(state, clock.now());
|
|
127
129
|
},
|
|
128
130
|
};
|
|
129
131
|
}
|