@bongos/core 1.21.112 → 1.21.114

package/tests/hall_street_inside.mjs

@@ -73,6 +73,28 @@ const floorRow = (key, over = {}) => ({ key, building: key.split('.')[0], status
 
 // ── the drawing is the prototype's ───────────────────────────────────────────
 
+// The one place the hall departs from the prototype's section (task 1004718): the
+// chosen floor lit in the prototype's warm wash, salmon frame, salmon sign and
+// salmon level number, which spends salmon on a floor that may need nothing.
+// The hall lights it in ink. inked() turns the prototype's chosen floor into
+// the hall's, colour for colour and nothing else, so every shape, path and
+// position still has to match the prototype exactly.
+const INKED = {
+  dark: { '#2b2219': '#202025', '#ffd9a8': '#e6e6ea', 'rgba(255,217,168,0.10)': 'rgba(255,255,255,0.07)', 'rgba(255,214,170,0.55)': 'rgba(220,224,240,0.40)', ink: '#ffffff' },
+  light: { '#fdf0e2': '#ebeaee', '#f0a86a': '#55565a', 'rgba(240,168,106,0.12)': 'rgba(23,24,26,0.06)', 'rgba(240,168,106,0.45)': 'rgba(23,24,26,0.22)', ink: '#17181a' },
+};
+function inked(view, mode) {
+  const M = INKED[mode], accentText = S.theme(mode).accentText;
+  const v = j(view);
+  v.shapes = v.shapes.map((s) => Object.assign(s, {
+    f: M[s.f] || s.f,
+    s: s.s === '#fb9569' && s.dash === 'none' && s.w === 1.5 ? M.ink : s.s,
+  }));
+  v.texts = v.texts.map((t) => (/^\d\d$/.test(t.v) && t.c === accentText ? Object.assign(t, { c: M.ink }) : t));
+  v.syms = v.syms.map((s) => (s.c === '#fb9569' ? Object.assign(s, { c: M.ink }) : s));
+  return v;
+}
+
 const SECTION_KEYS = ['kicker', 'name', 'holds', 'whoText', 'howText', 'seats', 'fill', 'fillColor', 'growth', 'openKicker', 'sym', 'flipA', 'flipB', 'openTitle', 'openLines', 'drawerItems', 'onFile', 'shapes', 'texts', 'syms', 'lift', 'hasAnnex', 'annex'];
 
 test('every building in section is the prototype\'s, to the path, in both modes, before and after a pick', () => {
@@ -81,7 +103,7 @@ test('every building in section is the prototype\'s, to the path, in both modes,
     for (const st of [{}, { reviewHeld: true, floor: 1, drawer: 1, picks: 3 }, { floor: 99, drawer: 7, picks: 2 }]) {
       for (const key of S.CIVIC_KEYS) {
         const p = proto(mode, { view: key, ...st });
-        const want = p.buildingView(p.theme(mode), key, p.matters());
+        const want = inked(p.buildingView(p.theme(mode), key, p.matters()), mode);
         const vacant = key === 'review' && !p.state.reviewHeld;
         const got = I.buildingView(S.theme(mode), key, p.civicInfo(key), { floor: p.state.floor, drawer: p.state.drawer, picks: p.state.picks, vacant, reviewHeld: p.state.reviewHeld, evening: false });
         for (const k of SECTION_KEYS) assert.deepEqual(j(got[k]), j(want[k]), `${mode} ${key} ${JSON.stringify(st)} ${k}`);
@@ -385,9 +407,11 @@ test('the lift runs to the chosen floor, and the chosen block flips on every pic
   assert.equal(b.selFloor, 7, 'a pick past the top is the top floor');
   assert.deepEqual([b.flipA, b.flipB], [true, false]);
   assert.ok(b.floors[7].selected && !b.floors[2].selected);
-  assert.ok(a.shapes.some((s) => s.s === '#fb9569' && s.w === 1.5), 'the orange frame');
-  assert.equal(a.syms[2].c, '#fb9569', 'and the orange sign on the chosen floor only');
-  assert.ok(a.syms.filter((s, i) => i !== 2).every((s) => s.c !== '#fb9569'));
+  // the chosen floor is framed and signed in ink: salmon is only what needs you (task 1004718)
+  assert.ok(a.shapes.some((s) => s.s === '#ffffff' && s.w === 1.5 && s.dash === 'none'), 'the ink frame');
+  assert.ok(!a.shapes.some((s) => s.s === '#fb9569' && s.dash === 'none'), 'no solid salmon frame');
+  assert.equal(a.syms[2].c, '#ffffff', 'and the ink sign on the chosen floor only');
+  assert.ok(a.syms.filter((s, i) => i !== 2).every((s) => s.c !== '#ffffff' && s.c !== '#fb9569'));
 });
 
 // ── districts ──────────────────────────────────────────────────────────────
@@ -508,7 +532,7 @@ async function bootPage({ hash = '', feeds = {}, innerWidth = 1440 } = {}) {
   };
   const ctx = vm.createContext({ window, document, fetch, Promise, Math, String, Number, Array, Object, JSON, Date, console, encodeURIComponent, decodeURIComponent, isNaN, isFinite, Map });
   ctx.globalThis = ctx;
-  for (const f of ['city-draw.js', 'street-draw.js', 'street-card.js', 'street-inside.js', 'street-desk.js', 'street.js']) vm.runInContext(read(f), ctx);
+  for (const f of ['city-draw.js', 'street-draw.js', 'street-card.js', 'street-inside.js', 'street-depth.js', 'street-desk.js', 'street.js']) vm.runInContext(read(f), ctx);
   await window.GovStreetPage.ready;
   await new Promise((r) => setTimeout(r, 0));
   const fireWin = (t, e) => (listeners[t] || []).forEach((fn) => fn(e));

package/tests/hall_tweak_editor.mjs

@@ -651,7 +651,10 @@ try {
     assert.match(HTML, /<body data-page="tweak-editor"[^>]*data-fullscreen-switch/);
     assert.equal((HTML.match(/<h1\b/g) || []).length, 1);
     assert.ok(HTML.indexOf('tweak-editor-lib.js') < HTML.indexOf('tweak-editor.js?'), 'the lib loads first');
-    assert.match(HTML, /shell\.js\?v=2026-10-08-glyph-fix/);
+    // the page carries the shell's current cache-bust, the one every hall page carries
+    // (read off the index, so a bump of the shell's stamp moves this pin with it)
+    const stamp = /shell\.js\?v=([\w.-]+)/.exec(fs.readFileSync(path.join(ROOT, 'modules/hall-ui/public/index.html'), 'utf8'))[1];
+    assert.ok(HTML.includes('shell.js?v=' + stamp), 'shell.js?v=' + stamp);
     assert.equal(/fonts\.googleapis\.com\/css/.test(HTML), false);
     for (const id of ['tw-bar', 'tw-counter', 'tw-open', 'tw-open-more', 'tw-divider', 'tw-openwrap', 'tw-open-menu', 'tw-open-tab', 'tw-open-split', 'tw-frame', 'tw-frame-view', 'tw-split-close', 'tw-download', 'tw-upload', 'tw-file', 'tw-submit', 'tw-paper', 'tw-doc', 'tw-notice', 'tw-done', 'tw-take', 'tw-pick', 'tw-picks', 'tw-refused', 'tw-refused-title', 'tw-refused-list', 'tw-refused-next', 'tw-refused-download', 'tw-refused-close']) {
       assert.ok(new RegExp(`id="${id}"`).test(HTML), `#${id} is in the markup`);

package/tests/hub_account_page.mjs

@@ -14,6 +14,9 @@
 //      the builders/status hosts, and never on a child instance;
 //   5. the hall's side: the two privacy sections are gone, one link-out row
 //      remains, and its hub origin is a bare https origin or nothing;
+//   7. the guild notice (task 1004260, ADR 0337 D4.4): under Private and under
+//      Hide, for the choice as it stands, the sentence that a guild counts your
+//      numbers and a link to each of your guilds' own switch — never the switch;
 //   6. the bar (task 1004455): the hub's own bar and two bands rather than a
 //      header of its own — the same markup as projects.html, cosmos.css's rules,
 //      no map search, links into /projects, Account as the current place — and
@@ -81,7 +84,7 @@ test('the script builds no markup from strings, and the controls are real markup
 test('the door returns here, and the page calls only its own-scoped routes', () => {
   assert.match(PAGE, /href="\/api\/bongos\/auth\/web\/start\?return=\/account&repos=1"/, 'sign-in lands back on /account, asking for repo access once (task 1004549)');
   const calls = [...SCRIPT.matchAll(/request\('(GET|PATCH|POST)', '([^']+)'/g)].map((m) => `${m[1]} ${m[2]}`);
-  assert.deepEqual([...new Set(calls)].sort(), ['GET /me/cross-project', 'PATCH /me/cross-project', 'PATCH /me/handle', 'PATCH /me/profile', 'GET /my-projects', 'POST /my-projects/'].sort());
+  assert.deepEqual([...new Set(calls)].sort(), ['GET /me/cross-project', 'PATCH /me/cross-project', 'PATCH /me/handle', 'PATCH /me/profile', 'GET /my-projects', 'POST /my-projects/', 'GET /me/guilds'].sort());
   // the bar's two calls live in the shared asset: the identity read and sign out
   const barCalls = [...BAR.matchAll(/fetch\(API \+ '([^']+)', \{ method: '(GET|POST)'/g)].map((m) => `${m[2]} ${m[1]}`);
   assert.deepEqual(barCalls.sort(), ['GET /me', 'POST /auth/logout']);
@@ -134,7 +137,7 @@ test('the bands say what the hub’s say and lead into /projects; Account is the
     ['Your projects', '/projects?view=mine'], ['New project', '/projects?view=new'],
   ], 'this page has no views of its own, so every item names /projects in full');
   assert.deepEqual(bandLinks(bandOf(PAGE, 'menuProfile')), [
-    ['My projects', '/projects?view=mine'], ['Invitations', '/invitations'], ['Account', '/account'], ['Sign out', '/api/bongos/auth/logout'],
+    ['My projects', '/projects?view=mine'], ['Invitations', '/invitations'], ['Connections', '/connections'], ['Account', '/account'], ['Sign out', '/api/bongos/auth/logout'],
   ]);
   assert.deepEqual(PAGE.match(/<a [^>]*aria-current="page"[^>]*>[^<]+/g), ['<a class="bandT" href="/account" aria-current="page">Account']);
 });
@@ -488,7 +491,7 @@ test('the section ships inside the signed-in body, last, as a list with an empty
 test('signed in: the list is read once, after the account, and each row names its project and host with its own Leave', async () => {
   const dom = boot(building(BUILDING));
   await settle();
-  assert.deepEqual(dom.calls.filter((c) => c.method === 'GET' && c.path !== '/me').map((c) => c.path), ['/me/cross-project', '/my-projects']);
+  assert.deepEqual(dom.calls.filter((c) => c.method === 'GET' && c.path !== '/me').map((c) => c.path), ['/me/cross-project', '/my-projects', '/me/guilds']);
   assert.equal(dom.els.get('buildingLoading').hidden, true);
   assert.equal(dom.els.get('buildingEmpty').hidden, true);
   const rows = rowsOf(dom);
@@ -566,6 +569,94 @@ test('/projects keeps no copy: the mine view points here, and nothing there read
   assert.match(SCRIPT, /if \(target && typeof target\.scrollIntoView === 'function'\) target\.scrollIntoView\(\);/, 'and #aBuilding lands on the section once the body shows');
 });
 
+// ── 3c. the guilds that count your numbers (task 1004260, ADR 0337 D4.4) ─────
+// Every guild counts a member's numbers in its rounded totals unless they leave
+// them out on that guild's page — a private account and a hidden record included.
+// So Private and Hide each say so, for the choice as it stands, and list the
+// builder's guilds with a link to each one's switch. The switch is the guild
+// page's: this page reads GET /me/guilds and writes nothing to a guild.
+
+const GUILDS = [
+  { slug: 'forge-crew', name: 'Forge Crew', visibility: 'public', membership_kind: 'member', shown_publicly: false, counted_in_totals: true },
+  { slug: 'night-shift', name: 'Night Shift', visibility: 'unlisted', membership_kind: 'owner', shown_publicly: false, counted_in_totals: false },
+];
+const GUILD_PAGE = fs.readFileSync(path.join(LANDING, 'guild.html'), 'utf8').replace(/\r\n/g, '\n');
+const withGuilds = (rows, acct = ACCOUNT) => (m, p) => {
+  if (m === 'GET' && p === '/me/cross-project') return { status: 200, data: acct() };
+  if (m === 'GET' && p === '/me/guilds') return rows ? { status: 200, data: { guilds: rows, count: rows.length } } : { status: 500, data: null };
+  return m === 'GET' ? { status: 500, data: null } : { status: 200, data: {} };
+};
+const guildLinks = (dom, key) => dom.els.get(key + 'GuildList').children.map((li) => ({
+  href: li.children[0].href, name: li.children[0].textContent, state: li.children[1].textContent,
+}));
+
+test('the notice ships hidden under each choice, as real markup, and the guild page is the only place a switch lives', () => {
+  for (const key of ['vis', 'record']) {
+    assert.match(PAGE, new RegExp(`<div class="aGuilds" id="${key}Guilds" hidden><p class="aWhat" id="${key}GuildsWhat"></p><ul class="aGuildList" id="${key}GuildList"></ul></div>`));
+  }
+  assert.ok(PAGE.indexOf('id="visGuilds"') < PAGE.indexOf('id="recLabel"'), 'under the profile-page choice, before recruiters');
+  assert.ok(PAGE.indexOf('id="recordGuilds"') > PAGE.indexOf('name="record" value="hide"'), 'under the show/hide choice');
+  assert.doesNotMatch(SCRIPT, /counted_in_totals:|\/membership|name="counted"/, 'no switch drawn or written here');
+});
+
+test('the notice speaks the guild page’s words: rounded to a band, counted weekly, never shown on its own', () => {
+  for (const words of ['They are never shown on their own: only inside totals rounded down to a band (10+, 20+, 50+ …) and counted once a week. ']) {
+    assert.ok(GUILD_PAGE.includes(words) && SCRIPT.includes(words), `"${words}" on both pages`);
+  }
+});
+
+test('public and shown: no notice; picking Private or Hide shows it under that choice alone, before any save', async () => {
+  const dom = boot(withGuilds(GUILDS));
+  await settle();
+  assert.equal(dom.els.get('visGuilds').hidden, true, 'a public page says nothing about guilds');
+  assert.equal(dom.els.get('recordGuilds').hidden, true);
+  dom.pick('visibility', 'private');
+  assert.equal(dom.els.get('visGuilds').hidden, false);
+  assert.equal(dom.els.get('recordGuilds').hidden, true, 'only the choice that applies');
+  assert.equal(dom.text('visGuildsWhat'), 'Every guild you belong to counts your numbers in its rounded totals unless you leave them out — even while your profile page is private. ' +
+    'They are never shown on their own: only inside totals rounded down to a band (10+, 20+, 50+ …) and counted once a week. Each guild’s page has the switch:');
+  dom.pick('record', 'hide');
+  assert.equal(dom.els.get('recordGuilds').hidden, false);
+  assert.match(dom.text('recordGuildsWhat'), /unless you leave them out — even while your record is hidden\. /);
+  dom.pick('visibility', 'public');
+  assert.equal(dom.els.get('visGuilds').hidden, true, 'and goes again with the choice');
+  assert.equal(dom.calls.filter((c) => c.method !== 'GET').length, 0, 'picking sends nothing');
+});
+
+test('each guild links to its own page, with its current answer beside it', async () => {
+  const dom = boot(withGuilds([...GUILDS, { slug: 'a b', name: null, counted_in_totals: true }]));
+  await settle();
+  dom.pick('record', 'hide');
+  assert.deepEqual(guildLinks(dom, 'record'), [
+    { href: '/g/forge-crew', name: 'Forge Crew', state: ' · counted' },
+    { href: '/g/night-shift', name: 'Night Shift', state: ' · left out' },
+    { href: '/g/a%20b', name: 'a b', state: ' · counted' },
+  ], 'the slug is encoded, never spliced raw, and a missing name falls back to it');
+});
+
+test('a private, hidden account sees both notices on load; in no guild, neither', async () => {
+  const hiddenPrivate = () => ({ ...ACCOUNT(), account_visibility: 'private', hide_stats: true });
+  const dom = boot(withGuilds(GUILDS, hiddenPrivate));
+  await settle();
+  assert.equal(dom.els.get('visGuilds').hidden, false);
+  assert.equal(dom.els.get('recordGuilds').hidden, false);
+  assert.equal(guildLinks(dom, 'vis').length, 2);
+  const none = boot(withGuilds([], hiddenPrivate));
+  await settle();
+  assert.equal(none.els.get('visGuilds').hidden, true, 'no guild, nothing to say');
+  assert.equal(none.els.get('recordGuilds').hidden, true);
+});
+
+test('a failed guild read still says the sentence, with no list, and keeps the rest of the page', async () => {
+  const dom = boot(withGuilds(null));
+  await settle();
+  assert.equal(dom.els.get('acctBody').hidden, false);
+  dom.pick('visibility', 'private');
+  assert.equal(dom.els.get('visGuilds').hidden, false, 'not knowing your guilds is no reason to stay quiet');
+  assert.match(dom.text('visGuildsWhat'), /Each guild’s page has the switch\.$/);
+  assert.equal(dom.els.get('visGuildList').children.length, 0);
+});
+
 // ── 3b. the bar, executed (task 1004455) ─────────────────────────────────────
 
 const ME = { builder: { id: '1', github_login: 'octocat', avatar_url: 'https://avatars.example/u/1' } };