@bridge-ds/cli 0.8.0 → 0.9.0

package/dist/index.js

@@ -1813,10 +1813,10 @@ ${" ".repeat(column - 1)}${expr}${suffix}` : `${prefix}${expr}${suffix}`;
       out.themeRefs += r.themeRefs;
       return;
     }
-    const str = /^(\s*)([`'"])([\s\S]*)\2\s*$/.exec(a.value);
-    if (str) {
-      const body = str[3].replace(/\$\{[^}]*\}/g, (m) => " ".repeat(m.length));
-      const r = auditCssText(body, "css", ds, { pos, offset: a.valueStart + str[1].length + 1, source: "style" });
+    const str2 = /^(\s*)([`'"])([\s\S]*)\2\s*$/.exec(a.value);
+    if (str2) {
+      const body = str2[3].replace(/\$\{[^}]*\}/g, (m) => " ".repeat(m.length));
+      const r = auditCssText(body, "css", ds, { pos, offset: a.valueStart + str2[1].length + 1, source: "style" });
       out.findings.push(...r.findings);
       out.tokenUsages += r.tokenUsages;
       out.themeRefs += r.themeRefs;
@@ -2176,8 +2176,8 @@ function parseOwnerEntry(raw) {
 var teamKey = (org, slug) => `@${org.toLowerCase()}/${slug.toLowerCase()}`;
 function ownerEntryProblems(raw) {
   if (raw === void 0) return [];
-  const isObj2 = (x) => Boolean(x) && typeof x === "object" && !Array.isArray(x);
-  if (!isObj2(raw)) return ['"governance.owners" must be { "design": [people or teams], "tech": [people or teams] }'];
+  const isObj3 = (x) => Boolean(x) && typeof x === "object" && !Array.isArray(x);
+  if (!isObj3(raw)) return ['"governance.owners" must be { "design": [people or teams], "tech": [people or teams] }'];
   const out = [];
   for (const [k, v] of Object.entries(raw)) {
     if (k !== "design" && k !== "tech") {
@@ -2562,7 +2562,8 @@ function defineConfig(input) {
           minReasonLength: g.override.minReasonLength ?? DEFAULT_OVERRIDE.minReasonLength
         }
       } : {},
-      ...g.rights ? { rights: normalizeRights(g.rights) } : {}
+      ...g.rights ? { rights: normalizeRights(g.rights) } : {},
+      ...g.soloOwnerCanApproveBoth === true ? { soloOwnerCanApproveBoth: true } : {}
     },
     products: input.products?.length ? input.products.map((p) => ({ ...p })) : DEFAULT_PRODUCTS.map((p) => ({ ...p })),
     changes: input.changes === "direct" ? "direct" : DEFAULT_CHANGES_MODE,
@@ -2686,6 +2687,7 @@ function loadConfig(source) {
         }
       }
       problems.push(...rightsProblems(gov.rights));
+      if (gov.soloOwnerCanApproveBoth !== void 0 && typeof gov.soloOwnerCanApproveBoth !== "boolean") problems.push('"governance.soloOwnerCanApproveBoth" must be true or false');
     }
   }
   problems.push(...visualImpactProblems(d.visualImpact));
@@ -4251,6 +4253,81 @@ function planReferences(file) {
   );
 }
 
+// ../core/src/storybook.ts
+var StorybookIndexError = class extends Error {
+  constructor(code, message, status) {
+    super(message);
+    this.code = code;
+    this.status = status;
+    this.name = "StorybookIndexError";
+  }
+  code;
+  status;
+};
+var isObj2 = (v) => typeof v === "object" && v !== null && !Array.isArray(v);
+var str = (v) => typeof v === "string" && v.trim() ? v : void 0;
+function entryFrom(key, raw, v3) {
+  if (!isObj2(raw)) return null;
+  const id = str(raw.id) ?? key;
+  const title = str(raw.title) ?? str(raw.kind);
+  const name = str(raw.name) ?? str(raw.story);
+  if (!id || !title || !name) return null;
+  const params = isObj2(raw.parameters) ? raw.parameters : {};
+  const type = raw.type === "docs" || raw.type === "story" ? raw.type : v3 && params.docsOnly === true ? "docs" : "story";
+  const e = {
+    id,
+    title,
+    name,
+    type,
+    importPath: str(raw.importPath) ?? str(params.fileName) ?? "",
+    tags: Array.isArray(raw.tags) ? raw.tags.filter((t) => typeof t === "string") : []
+  };
+  const subtype = str(raw.subtype);
+  if (subtype) e.subtype = subtype;
+  const exportName2 = str(raw.exportName);
+  if (exportName2) e.exportName = exportName2;
+  const componentPath = str(raw.componentPath);
+  if (componentPath) e.componentPath = componentPath;
+  return e;
+}
+function groupStorybookComponents(entries) {
+  const byTitle = /* @__PURE__ */ new Map();
+  for (const e of entries) {
+    let c = byTitle.get(e.title);
+    if (!c) {
+      const parts = e.title.split("/").map((p) => p.trim()).filter(Boolean);
+      c = { title: e.title, name: parts[parts.length - 1] ?? e.title, group: parts.slice(0, -1), stories: [], docs: [], tags: [] };
+      byTitle.set(e.title, c);
+    }
+    if (e.type === "docs") c.docs.push(e);
+    else if (e.subtype !== "test") c.stories.push(e);
+    for (const t of e.tags) if (!c.tags.includes(t)) c.tags.push(t);
+  }
+  const out = [...byTitle.values()].filter((c) => c.stories.length || c.docs.length);
+  for (const c of out) c.tags.sort();
+  return out.sort((a, b) => a.title.localeCompare(b.title));
+}
+function parseStorybookIndex(json, source) {
+  if (!isObj2(json)) throw new StorybookIndexError("not-json", "The Storybook index is not a JSON object.");
+  if (typeof json.loginUrl === "string" && !("entries" in json) && !("stories" in json)) {
+    throw new StorybookIndexError("private", "This Storybook is private: it asks for a sign-in before showing its index.");
+  }
+  const map = isObj2(json.entries) ? json.entries : isObj2(json.stories) ? json.stories : null;
+  if (!map) throw new StorybookIndexError("empty", "This file has no Storybook entries.");
+  const v3 = !isObj2(json.entries);
+  const entries = Object.entries(map).map(([k, raw]) => entryFrom(k, raw, v3)).filter((e) => e !== null);
+  if (!entries.length) throw new StorybookIndexError("empty", "This Storybook index lists no stories or docs.");
+  const version = typeof json.v === "number" ? json.v : v3 ? 3 : 4;
+  return { version, source: source ?? (v3 ? "stories.json" : "index.json"), entries, components: groupStorybookComponents(entries) };
+}
+var pairs = (o) => Object.entries(o).map(([k, v]) => `${encodeURIComponent(k)}:${encodeURIComponent(v)}`).join(";");
+function storybookIframeUrl(base, id, o = {}) {
+  let url = `${base.replace(/\/+$/, "")}/iframe.html?id=${encodeURIComponent(id)}&viewMode=${o.viewMode ?? "story"}`;
+  if (o.globals && Object.keys(o.globals).length) url += `&globals=${pairs(o.globals)}`;
+  if (o.args && Object.keys(o.args).length) url += `&args=${pairs(o.args)}`;
+  return url;
+}
+
 // ../visual/src/capture.ts
 import { mkdir, writeFile } from "node:fs/promises";
 import { dirname as dirname2 } from "node:path";
@@ -4645,7 +4722,7 @@ function routeUrl(base, route, tenant, theme) {
   return `${base.replace(/\/$/, "")}/?tenant=${encodeURIComponent(tenant)}&theme=${encodeURIComponent(theme)}&density=comfortable&lang=en#${route.pathByTenant?.[tenant] ?? route.path}`;
 }
 function storyUrl(base, id, brand2, theme) {
-  return `${base.replace(/\/$/, "")}/iframe.html?id=${encodeURIComponent(id)}&viewMode=story&globals=brand:${brand2};theme:${theme};density:comfortable`;
+  return storybookIframeUrl(base, id, { globals: { brand: brand2, theme, density: "comfortable" } });
 }
 var shotKey = (...parts) => parts.map((p) => p.toLowerCase().replace(/[^a-z0-9-]+/g, "-").replace(/^-|-$/g, "")).join("__");
 
@@ -4936,8 +5013,8 @@ function changedTokens(before, after) {
   return [...modes.entries()].map(([path, m]) => ({ path, kind: direct.has(path) ? "direct" : "alias", modes: m })).sort((a, b) => Number(a.kind === "alias") - Number(b.kind === "alias") || a.path.localeCompare(b.path));
 }
 async function readIndexJson(dir) {
-  const raw = JSON.parse(await readFile3(join4(dir, "index.json"), "utf8"));
-  return Object.values(raw.entries).filter((e) => e.type === "story").map(({ id, title, name, importPath }) => ({ id, title, name, importPath }));
+  const index = parseStorybookIndex(JSON.parse(await readFile3(join4(dir, "index.json"), "utf8")), "index.json");
+  return index.entries.filter((e) => e.type === "story").map(({ id, title, name, importPath }) => ({ id, title, name, importPath }));
 }
 async function planImpact(o) {
   const root = resolve2(o.root);
@@ -5824,6 +5901,7 @@ ${r.summary}`);
 Version ${r.version}${r.edited ? ` (${r.edited})` : ""}`);
       io.print(`Approved by: ${r.approvals.approvedBy.map((l) => `@${l}`).join(", ") || "nobody yet"}`);
       if (r.approvals.missing.length) io.print(`Missing: ${r.approvals.missing.join(" and ")}`);
+      if (r.approvals.soloOwner) io.print(r.approvals.soloOwner);
       if (r.approvals.changesRequestedBy.length) io.print(`Changes requested by: ${r.approvals.changesRequestedBy.map((l) => `@${l}`).join(", ")}`);
       for (const p of r.linkedPrs ?? []) io.print(`Pull request: #${p.number} ${p.merged ? "merged" : p.state}  ${p.url}`);
       io.print(`
@@ -5960,7 +6038,7 @@ function number(a, at, usage) {
   if (!raw) throw new RequestUsageError(`Usage: ${usage}`);
   return branches.branchNumber(raw);
 }
-function pairs(list2, what) {
+function pairs2(list2, what) {
   const out = {};
   for (const s of list2 ?? []) {
     const i = s.lastIndexOf("=");
@@ -5993,6 +6071,7 @@ async function runBranch(a, root, io = defaultIO()) {
       return out(r, () => {
         io.print(`#${r.pr} ${r.title} (${r.product.name})`);
         io.print(`${r.status.label}. ${r.approvalNeeded} needed; approved by ${r.approvals.approvedBy.map((x) => `@${x}`).join(", ") || "nobody yet"}.`);
+        if (r.approvals.soloOwner) io.print(r.approvals.soloOwner);
         if (r.merge.blockedBy?.length) for (const x of r.merge.blockedBy) io.print(`  ${x}`);
         io.print(`Next: ${r.next}`);
         io.print(r.url);
@@ -6049,7 +6128,7 @@ async function runBranch(a, root, io = defaultIO()) {
     }
     case "update": {
       const n = number(a, 2, "bridge branch update <n> [--choice key=mine|theirs] [--dry-run]");
-      const choices = pairs(a.flags.choice, "choice");
+      const choices = pairs2(a.flags.choice, "choice");
       for (const [k, v] of Object.entries(choices)) if (v !== "mine" && v !== "theirs") throw new RequestUsageError(`--choice ${k}= takes mine or theirs, got "${v}".`);
       const r = await branches.updateFromMain(ctx, { pr: n, ...Object.keys(choices).length ? { choices } : {}, dryRun: has4(a, "dry-run") });
       return out(r, () => {
@@ -6067,7 +6146,7 @@ Share with a product team: ${r.share.install ? r.share.install : r.share.sentenc
     }
     case "combine": {
       const prs = a._.slice(2);
-      const picks = Object.fromEntries(Object.entries(pairs(a.flags.pick, "pick")).map(([k, v]) => [k, branches.branchNumber(v)]));
+      const picks = Object.fromEntries(Object.entries(pairs2(a.flags.pick, "pick")).map(([k, v]) => [k, branches.branchNumber(v)]));
       const r = await branches.combineBranches(ctx, { prs, ...Object.keys(picks).length ? { picks } : {} });
       return out(r, () => {
         io.print(`${r.tokens} tokens change together.`);
@@ -6098,6 +6177,7 @@ This folder: ${r2.current.name}. Pick another with --product <key>.`);
     if (json) return io.print(JSON.stringify(r2, null, 2)), 0;
     io.print(`Design approval: ${r2.roles.designApproval.join(", ") || "any reviewer"}`);
     io.print(`Tech approval: ${r2.roles.techApproval.join(", ") || "any reviewer"}`);
+    if (r2.roles.soloOwner) io.print(r2.roles.soloOwner);
     io.print(`Merge: ${r2.roles.ship}`);
     io.print(`Owner override: ${r2.ownerOverride.on ? `${r2.ownerOverride.who.join(", ")}. ${r2.ownerOverride.reason}` : r2.ownerOverride.reason}`);
     io.print(`Protection: ${r2.protection}`);
@@ -6590,8 +6670,8 @@ async function diff(a, root) {
   const before = await core.loadTokenSet(new GitRefSource(root, base), config);
   const after = await ctx.tokens();
   const changes = core.diff(before, after);
-  const pairs2 = await core.readContrastPairs(ctx.source, config).catch(() => []);
-  const delta2 = pairs2.length ? core.contrastDelta(core.runContrast(before, pairs2, config.contrast?.modes), core.runContrast(after, pairs2, config.contrast?.modes)) : [];
+  const pairs3 = await core.readContrastPairs(ctx.source, config).catch(() => []);
+  const delta2 = pairs3.length ? core.contrastDelta(core.runContrast(before, pairs3, config.contrast?.modes), core.runContrast(after, pairs3, config.contrast?.modes)) : [];
   const tier = core.classify(changes, [], config);
   const imp = core.impact(before, after, changes, 30);
   if (has7(a, "json")) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bridge-ds/cli",
-  "version": "0.8.0",
+  "version": "0.9.0",
   "type": "module",
   "description": "bridge CLI: set up Bridge in a design system repo, check tokens in CI, search and diff tokens, propose changes, start the MCP server.",
   "license": "MIT",
@@ -43,8 +43,8 @@
     "build:package": "node ../../scripts/build-packages.mjs cli"
   },
   "dependencies": {
-    "@bridge-ds/mcp": "^0.7.0",
-    "@bridge-ds/visual": "^0.3.4",
+    "@bridge-ds/mcp": "^0.8.0",
+    "@bridge-ds/visual": "^0.3.7",
     "typescript": "5.9.3"
   },
   "devDependencies": {