@bongos/core 1.24.55 → 1.24.56

package/tests/hall_sky.mjs

@@ -559,65 +559,62 @@ const skyBlocks = () => {
   return { dark: dark && dark[1], light: light && light[1], twin: twin && twin[1] };
 };
 
+// What the stage's computed style answers in each theme: the two blocks above,
+// read the way the browser would.
+const stageStyles = (body) => Object.fromEntries([...body.matchAll(/(--[\w-]+)\s*:\s*([^;]+);/g)].map((m) => [m[1], m[2].trim()]));
+
 await test('LIGHT IS WRITTEN TWICE AND THE TWO ARE ONE — the data-theme block and its first-paint twin declare the same lines', () => {
   const { dark, light, twin } = skyBlocks();
-  assert.ok(dark, 'the dark (template) token block is found');
+  assert.ok(dark, 'the stage token block is found');
   assert.ok(light, 'the html[data-theme="light"] block is found');
   assert.ok(twin, 'the prefers-color-scheme: light twin is found');
   same(declLines(twin), declLines(light), 'the twin is the data-theme block, line for line');
-  assert.ok(declLines(light).length >= 6, 'and the block is not vacuously empty');
-});
-
-await test('light re-declares every colour the dark set declares, and every channel is three bytes', () => {
-  const { dark, light } = skyBlocks();
-  const type = new Set(['--label', '--mono', '--face']); // the faces are not a theme
-  const want = [...declNames(dark)].filter((n) => !type.has(n));
-  assert.ok(want.length >= 15, `the dark set names its colours (${want.length})`);
-  const have = declNames(light);
-  same(want.filter((n) => !have.has(n)), [], 'no dark colour is left for light to inherit');
-  for (const [name, body] of [['dark', dark], ['light', light]]) {
-    const chans = [...body.matchAll(/(--sky-[\w-]+-rgb)\s*:\s*([^;]+);/g)];
-    assert.ok(chans.length >= 5, `${name} declares the canvas's channels`);
-    for (const [, n, v] of chans) {
-      const parts = v.split(',').map((x) => Number(x.trim()));
-      assert.ok(parts.length === 3 && parts.every((x) => Number.isInteger(x) && x >= 0 && x <= 255), `${name} ${n} is r,g,b (got "${v}")`);
-    }
-  }
+  same([...declNames(light)].sort(), ['--sky-drop', '--sky-temp', 'color-scheme'], 'and it carries only what the hall\'s own tier cannot: the card shadow and the canvas warmth');
 });
 
-// What the stage's computed style answers in each theme: the two blocks above,
-// read the way the browser would.
-const stageStyles = (body) => Object.fromEntries([...body.matchAll(/(--[\w-]+)\s*:\s*([^;]+);/g)].map((m) => [m[1], m[2].trim()]));
+// task 1005087: the sky's colours are the HALL's tokens, which already flip with the theme and
+// follow the pack, so a re-branded instance's sky wears its colours. No literal, no rgb channel.
+await test('the stage mixes the hall\'s tokens only: every colour is a var() or a color-mix of them', () => {
+  const { dark } = skyBlocks();
+  const type = new Set(['--label', '--mono', '--face', '--sky-temp', '--sky-drop']);
+  const colours = Object.entries(stageStyles(dark)).filter(([n]) => !type.has(n));
+  assert.ok(colours.length >= 10, `the stage names its colours (${colours.length})`);
+  for (const [n, v] of colours) assert.match(v, /^(var\(--[\w-]+\)|color-mix\(in srgb, var\(--[\w-]+\) [\d.]+%, (transparent|var\(--[\w-]+\))\))$/, `${n}: ${v}`);
+  assert.doesNotMatch(SKY_CSS.replace(/\/\*[\s\S]*?\*\//g, ''), /--sky-[\w-]+-rgb/, 'no rgb channel is left');
+});
+
+// The stage's computed colours in each theme, as the browser answers the probe sky-draw.js reads.
+const DARK = { '--ink': 'rgb(255, 255, 255)', '--void': 'rgb(0, 0, 0)', '--sky-cold': 'color(srgb 0.08 0.08 0.08)', '--accent': 'rgb(251, 149, 105)', '--chart': 'rgb(251, 191, 36)', '--sky-temp': '1' };
+const LIGHT = { '--ink': 'rgb(23, 24, 26)', '--void': 'rgb(237, 236, 238)', '--sky-cold': 'color(srgb 0.88 0.88 0.89)', '--accent': 'rgb(163, 72, 26)', '--chart': 'rgb(180, 83, 9)', '--sky-temp': '.42' };
 
 await test('THE CANVAS FOLLOWS THE TOGGLE — a theme flip re-reads the stage and repaints, with no reload', async () => {
-  const { dark, light } = skyBlocks();
-  const styles = stageStyles(dark);
+  const styles = { ...DARK };
   const p = await boot({ mine: mine(FIVE()), sky: sky([well()]), versions: versions(), styles });
   const SKY = p.SKY(); const acc = SKY.ACC;
   assert.ok(p.themeObservers() >= 1, 'the page watches html[data-theme]');
   p.frame();
-  same(SKY.INK, [255, 255, 255], 'dark: the ink is the template white');
+  same(SKY.INK, [255, 255, 255], 'dark: the ink is the hall\'s white');
   same(SKY.VOID, [0, 0, 0], 'dark: the void is black');
   same(SKY.tone([255, 238, 222]), [255, 238, 222], 'dark: a thought keeps its temperature');
 
-  Object.assign(styles, stageStyles(light));
+  Object.assign(styles, LIGHT);
   p.S().dirty = false;
   p.setTheme('light');
   assert.equal(!!p.S().dirty, true, 'the flip marks the sky for a redraw');
   p.frame();
-  same(SKY.INK, stageStyles(light)['--sky-ink-rgb'].split(',').map(Number), 'light: the ink is the stage\'s');
-  same(SKY.VOID, stageStyles(light)['--sky-void-rgb'].split(',').map(Number), 'light: the void is paper');
-  same(SKY.ACC, stageStyles(light)['--sky-accent-rgb'].split(',').map(Number), 'light: the accent darkens');
+  same(SKY.INK, [23, 24, 26], 'light: the ink is the stage\'s');
+  same(SKY.VOID, [237, 236, 238], 'light: the void is paper');
+  same(SKY.ACC, [163, 72, 26], 'light: the accent darkens');
   assert.equal(SKY.ACC === acc, true, 'refilled in place, so SKY.ACC is still the object every file holds');
-  const k = Number(stageStyles(light)['--sky-temp']);
-  same(SKY.tone([255, 238, 222]), [255, 238, 222].map((v) => Math.round(v * k)), 'light: a near-white thought darkens to read on paper');
+  same(SKY.tone([255, 238, 222]), [255, 238, 222].map((v) => Math.round(v * 0.42)), 'light: a near-white thought darkens to read on paper');
   assert.equal(SKY.ink(0.5), `rgba(${SKY.INK.join(',')},0.5)`, 'ink() paints in the new ink');
 
-  Object.assign(styles, stageStyles(dark));
+  Object.assign(styles, DARK);
   p.setTheme('dark');
   p.frame();
   same(SKY.INK, [255, 255, 255], 'and back: the white returns');
   assert.equal(SKY.ink(0.5), 'rgba(255,255,255,0.5)', 'ink() forgot the light strings');
 });
 
+
 summary();

package/tests/hall_street.mjs

@@ -26,6 +26,7 @@ import path from 'node:path';
 import vm from 'node:vm';
 import { createRequire } from 'node:module';
 import { fileURLToPath } from 'node:url';
+import { cityTokens } from './helpers.mjs';
 
 const ROOT = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..');
 const PUB = path.join(ROOT, 'modules/hall-ui/public');
@@ -83,7 +84,7 @@ test('the street palette is the prototype theme() (less the iso half city-draw.j
     const t = new Proto({ mode }).theme(mode);
     delete t.iso;
     assert.deepEqual(S.theme(mode), t, mode);
-    assert.deepEqual(City.isoTheme(mode), new Proto({ mode }).theme(mode).iso, 'and the iso half is still city-draw.js\'s');
+    assert.deepEqual(City.isoTheme(mode), cityTokens(new Proto({ mode }).theme(mode).iso), 'and the iso half is still city-draw.js\'s');
   }
 });
 
@@ -123,7 +124,7 @@ test('a task not started is the prototype\'s workItem "ready" slab, and the more
   const a = []; const b = [];
   p.workItem(a, T, 'engineer', 'ready', 660, 19, 0);
   S.work(b, S.theme('dark'), 'slab', 660, 0, 19, 6, false);
-  assert.deepEqual(b, a, 'the slab, at a base of 0 as workItem draws it');
+  assert.deepEqual(b, cityTokens(a), 'the slab, at a base of 0 as workItem draws it');
   const c = []; const d = [];
   p.workItem(c, T, 'engineer', 'backlog', 660, 40, 0);
   S.work(d, S.theme('dark'), 'stakes', 660, 0, 40, 0, false);

package/tests/helpers.mjs

@@ -980,7 +980,12 @@ export function bootSkyPage({
     setTimeout: windowObj.setTimeout, clearTimeout: windowObj.clearTimeout,
     MutationObserver, console, Event, URLSearchParams, Math, Number, Date, JSON, Map, Set, Promise, Object, Array, String, Infinity, NaN,
   };
-  if (styles) sandbox.getComputedStyle = (el) => ({ getPropertyValue: (name) => (el && String(el.className || '').split(/\s+/).includes('sky-stage') && name in styles ? styles[name] : '') });
+  if (styles) sandbox.getComputedStyle = (el) => ({
+    getPropertyValue: (name) => (el && String(el.className || '').split(/\s+/).includes('sky-stage') && name in styles ? styles[name] : ''),
+    // task 1005087: sky-draw.js resolves a colour token by computing it on a probe
+    // (style.color = 'var(--ink)'); `styles` answers it with the computed colour.
+    get color() { const m = /var\((--[\w-]+)\)/.exec(String((el && el.style && el.style.color) || '')); return (m && styles[m[1]]) || ''; },
+  });
   sandbox.globalThis = sandbox;
   vm.createContext(sandbox);
   for (const [name, src] of SKY_SRC) vm.runInContext(src, sandbox, { filename: name });
@@ -1355,3 +1360,22 @@ export async function insertTestBuilders(db, rows, { onConflict = 'ON CONFLICT (
   );
   return out;
 }
+
+// The governor city's iso palette moved onto the pack's tokens (task 1005087): city-draw.js
+// writes var(--bg-card), var(--accent) and color-mix()es of --ink / --sea / --accent where
+// docs/design/mocks/governor-city/Street.dc.html (the design of record) has the neutral pack's
+// literals. Mapping the prototype's output through the same substitution keeps the "draws
+// exactly the prototype's paths" tests honest: every path, every other colour, unchanged.
+export function cityTokens(x) {
+  const pct = (a) => `${Math.round(parseFloat(a) * 1000) / 10}%`;
+  const one = (s) => s
+    .replace(/^rgba\(23,24,26,([.\d]+)\)$/, (m, a) => `color-mix(in srgb, var(--ink) ${pct(a)}, transparent)`)
+    .replace(/^rgba\(91,111,208,([.\d]+)\)$/, (m, a) => `color-mix(in srgb, var(--sea) ${pct(a)}, transparent)`)
+    .replace(/^rgba\(251,149,105,([.\d]+)\)$/, (m, a) => `color-mix(in srgb, var(--accent) ${pct(a)}, transparent)`)
+    .replace(/^#fbfafc$/, 'var(--bg-card)')
+    .replace(/^#fb9569$/, 'var(--accent)');
+  if (typeof x === 'string') return one(x);
+  if (Array.isArray(x)) return x.map(cityTokens);
+  if (x && typeof x === 'object') return Object.fromEntries(Object.entries(x).map(([k, v]) => [k, cityTokens(v)]));
+  return x;
+}

package/tests/welcome_boot.mjs

@@ -62,7 +62,7 @@ test('both paintings ship, as WebP, in the one shape the motion is laid out for'
 
 test('every light sits inside the painting, and every pulse climbs inside its tower', () => {
   const inside = ([x, y]) => x >= 0 && x <= W.AW && y >= 0 && y <= W.AH;
-  for (const b of W.BEACONS) assert.ok(inside(b), 'beacon ' + b);
+  assert.equal(W.BEACONS, undefined, 'the blinking mast lights are gone (task 1005087)');
   for (const t of W.TOWERS) assert.ok(inside([t.x, t.y]) && inside([t.x + t.w, t.y + t.h]), 'tower inside the painting');
   const runs = W.pulseRuns(W.TOWERS, 3, 7);
   assert.equal(runs.length, W.TOWERS.length * 3);

package/tests/welcome_boot_browser.mjs

@@ -264,7 +264,7 @@ const look = (page) => page.evaluate(() => {
 test('by day the day painting opens from a white veil; by night the night one from black, with its lights', { skip }, async () => {
   for (const [time, want] of [
     [new Date(2026, 9, 23, 10, 0), { day: true, night: false, veil: 'rgb(255, 255, 255)', art: '/builders/welcome-day.webp', beacons: 0 }],
-    [new Date(2026, 9, 23, 22, 0), { day: false, night: true, veil: 'rgb(0, 0, 0)', art: '/builders/welcome-night.webp', beacons: 4 }],
+    [new Date(2026, 9, 23, 22, 0), { day: false, night: true, veil: 'rgb(0, 0, 0)', art: '/builders/welcome-night.webp', beacons: 0 }], // task 1005087 took the beacons out
   ]) {
     const ctx = await hall({ time });
     const { page } = await open(ctx);