@binaryandthread/cli 0.1.9 → 0.2.1

package/dist/{chunk-RGXH3EZ6.js → chunk-AP5ARNWU.js}

@@ -286,25 +286,45 @@ var StoreClient = class {
     return this.regionsCache;
   }
   /**
-   * Resolve a region by country code, falling back to region #1.
-   * SEK is region #1 by configuration — NEVER a hardcoded literal.
+   * Resolve a region by country code, WITH provenance (matched / home / requested), so callers on
+   * the money path can fail closed on an unmatched explicit country instead of silently pricing in
+   * the wrong currency (F-A2). Region #1 is the launch/home default — SEK today, derived, never a
+   * hardcoded literal.
+   *
+   * Semantics:
+   *  - country given AND a region ships there → { matched: true, home: false }.
+   *  - country given, none ships there        → { matched: false, home: false } (money surfaces MUST
+   *    refuse; discovery may show the home region + a warning). We still return a region so a
+   *    discovery command can render *something*, but `matched:false` is the signal to fail closed.
+   *  - no country given                         → { matched: false, home: true } (the legitimate
+   *    launch default — not a "wrong" currency).
    */
-  async resolveRegion(countryCode) {
+  async resolveRegionResult(countryCode) {
     const regions = this.regionsCache ?? await this.getRegions();
     if (regions.length === 0) {
       throw new Error("no regions configured \u2014 cannot resolve a region for pricing");
     }
+    const home = regions[0];
     if (countryCode) {
       const cc = countryCode.toLowerCase();
       const match = regions.find(
         (r) => (r.countries ?? []).some((c) => (c.iso_2 ?? "").toLowerCase() === cc)
       );
       if (match) {
-        return match;
+        return { region: match, matched: true, requested: cc, home: false };
       }
-      this.logWarn("store.region.unmatched", { countryCode: cc, fallback: regions[0].id });
+      this.logWarn("store.region.unmatched", { countryCode: cc, fallback: home.id });
+      return { region: home, matched: false, requested: cc, home: false };
     }
-    return regions[0];
+    return { region: home, matched: false, requested: void 0, home: true };
+  }
+  /**
+   * Resolve a region by country code, falling back to region #1. A thin wrapper over
+   * resolveRegionResult for callers that only need the region (back-compat).
+   * SEK is region #1 by configuration — NEVER a hardcoded literal.
+   */
+  async resolveRegion(countryCode) {
+    return (await this.resolveRegionResult(countryCode)).region;
   }
   // ----- products (region resolved BEFORE pricing) ---------------------------
   async listProducts(opts) {
@@ -658,6 +678,9 @@ function productLore(p) {
   ).map((s) => ({ url: s.url, label: s.label }));
   return { text, sources };
 }
+function isCartTaxInclusive(cart) {
+  return (cart?.items ?? []).some((i) => i.is_tax_inclusive === true);
+}
 
 // src/voice.ts
 var GLYPH = {
@@ -806,12 +829,15 @@ var BOX = {
   ml: "\u251C",
   mr: "\u2524"
 };
+function cursor(style) {
+  return cyan(style, "_");
+}
 function header(style, title, width = 56) {
   const label = ` ${title} `;
   const lead = BOX.h.repeat(2);
   const used = lead.length + label.length;
-  const tail = BOX.h.repeat(Math.max(2, width - used));
-  return `${lead}${cyan(style, label)}${tail}`;
+  const tail = BOX.h.repeat(Math.max(2, width - used - 2));
+  return `${lead}${cyan(style, label)}${tail} ${cursor(style)}`;
 }
 function rule(width = 56) {
   return BOX.h.repeat(width);
@@ -860,6 +886,20 @@ function colourMarker(colours) {
 }
 
 // src/commands/shared.ts
+function regionLine(rr, style) {
+  const cc = (rr.requested ?? rr.region.countries?.[0]?.iso_2 ?? "").toLowerCase();
+  const loc = cc ? `${cc} \xB7 ` : "";
+  const nudge = rr.home ? " \xB7 not you? \u2192 bt region" : "";
+  return dim(style, `${GLYPH.gear}  region: ${loc}${rr.region.currency_code}${nudge}`);
+}
+var SIZE_ORDER = ["xxs", "xs", "s", "m", "l", "xl", "2xl", "xxl", "3xl", "xxxl", "4xl", "5xl"];
+function sortSizes(sizes) {
+  const rank = (s) => {
+    const i = SIZE_ORDER.indexOf(s.trim().toLowerCase());
+    return i === -1 ? SIZE_ORDER.length : i;
+  };
+  return [...sizes].sort((a, b) => rank(a) - rank(b) || a.localeCompare(b));
+}
 function brandOf(args) {
   return args?.brand ?? PLAIN;
 }
@@ -870,11 +910,15 @@ function fmtPrice(amount, currency) {
   const cur = (currency ?? "").toUpperCase();
   return cur ? `${amount} ${cur}` : `${amount}`;
 }
+function taxSuffix(isTaxInclusive) {
+  return isTaxInclusive ? " incl. VAT" : "";
+}
 function firstPrice(p) {
   const v = (p.variants ?? [])[0];
   return {
     amount: v?.calculated_price?.calculated_amount ?? null,
-    currency: v?.calculated_price?.currency_code ?? null
+    currency: v?.calculated_price?.currency_code ?? null,
+    taxInclusive: v?.calculated_price?.is_calculated_price_tax_inclusive ?? null
   };
 }
 function stageMarker(channelStage) {
@@ -987,12 +1031,32 @@ function resolveOutput(program) {
   const brand = json ? makeBrand({ noColor: true }) : makeBrand({ noColor: opts.color === false });
   return { json, brand };
 }
+function failResult(spec) {
+  const numericCode = typeof spec.code === "number" && spec.code >= 1 && spec.code <= 255;
+  const exitCode = spec.exit ?? (numericCode ? spec.code : EXIT.GENERIC);
+  return {
+    lines: [fail(spec)],
+    exitCode,
+    json: {
+      error: {
+        code: exitCode,
+        message: spec.what,
+        ...spec.fix ? { fix: spec.fix } : {},
+        ...spec.link ? { link: spec.link } : {}
+      }
+    }
+  };
+}
 function printResult(res, json) {
   if (res.exitCode) {
     process.exitCode = res.exitCode;
   }
-  if (json && res.json !== void 0) {
-    process.stdout.write(JSON.stringify(res.json, null, 2) + "\n");
+  if (json) {
+    if (res.json !== void 0) {
+      process.stdout.write(JSON.stringify(res.json, null, 2) + "\n");
+    } else {
+      process.stderr.write(res.lines.join("\n") + "\n");
+    }
     return;
   }
   process.stdout.write(res.lines.join("\n") + "\n");
@@ -1030,6 +1094,14 @@ ${urlFloor(blobUrl)}`;
 }
 var IMAGE_FETCH_TIMEOUT_MS = 5e3;
 var IMAGE_BYTE_CAP = 2 * 1024 * 1024;
+function isWebp(buf) {
+  return buf.length >= 12 && buf.toString("ascii", 0, 4) === "RIFF" && buf.toString("ascii", 8, 12) === "WEBP";
+}
+async function toPng(buf) {
+  if (!isWebp(buf)) return buf;
+  const sharp = (await import("sharp")).default;
+  return sharp(buf).png().toBuffer();
+}
 async function defaultRender(url, opts) {
   const mod = await import("terminal-image");
   const terminalImage = mod.default ?? mod;
@@ -1053,10 +1125,11 @@ async function defaultRender(url, opts) {
   if (Number.isFinite(declaredLen) && declaredLen > cap) {
     throw new Error("blob exceeds byte cap (declared)");
   }
-  const buf = Buffer.from(await res.arrayBuffer());
-  if (buf.byteLength === 0 || buf.byteLength > cap) {
+  const rawBuf = Buffer.from(await res.arrayBuffer());
+  if (rawBuf.byteLength === 0 || rawBuf.byteLength > cap) {
     throw new Error("blob empty or exceeds byte cap");
   }
+  const buf = await toPng(rawBuf);
   return bufferFn(buf, {
     height: opts.height ?? DEFAULT_RENDER_HEIGHT,
     preserveAspectRatio: true,
@@ -1067,30 +1140,21 @@ async function defaultRender(url, opts) {
 // src/commands/view.ts
 async function runView(client, config, args) {
   const style = brandOf(args);
-  const region = await client.resolveRegion(config.region);
+  const rr = await client.resolveRegionResult(config.region);
+  const region = rr.region;
   const picked = await resolveProduct(client, region, args.handle);
   const product = picked.product;
   if (!product) {
     if (picked.candidates && picked.candidates.length > 1) {
-      return {
-        lines: [
-          fail({ code: EXIT.DATAERR, what: `"${args.handle}" matches ${picked.candidates.length} designs \u2014 pick one:` }),
-          ...picked.candidates.map((p) => `     ${p.handle ?? p.id}`),
-          "   or be exact \u2192 bt view <slug>"
-        ],
-        exitCode: EXIT.DATAERR
-      };
+      const r = failResult({ code: EXIT.DATAERR, what: `"${args.handle}" matches ${picked.candidates.length} designs \u2014 pick one:` });
+      r.lines.push(...picked.candidates.map((p) => `     ${p.handle ?? p.id}`), "   or be exact \u2192 bt view <slug>");
+      return r;
     }
-    return {
-      lines: [
-        fail({
-          code: EXIT.UNAVAILABLE,
-          what: `no design here called "${args.handle}".`,
-          fix: "bt browse   (to see what's in stock)"
-        })
-      ],
-      exitCode: EXIT.UNAVAILABLE
-    };
+    return failResult({
+      code: EXIT.UNAVAILABLE,
+      what: `no design here called "${args.handle}".`,
+      fix: "bt browse   (to see what's in stock)"
+    });
   }
   const { title, handle } = displayName(product);
   const colours = productColours(product);
@@ -1111,18 +1175,19 @@ async function runView(client, config, args) {
   if (colours.length > 0) {
     lines.push(`   colours  ${colours.map((c) => `${colourSwatch(c)} ${c}`).join(" \xB7 ")}`);
     for (const c of colours) {
-      const sizes = sizesForColour(product, c);
+      const sizes = sortSizes(sizesForColour(product, c));
       lines.push(`   ${colourSwatch(c)} ${c.padEnd(6)} ${sizes.join("  ")}`);
     }
   } else {
-    const sizes = (product.variants ?? []).map((v) => v.title ?? "?");
+    const sizes = sortSizes((product.variants ?? []).map((v) => v.title ?? "?"));
     lines.push(`   sizes    ${sizes.join("  ")}`);
   }
   const v0 = (product.variants ?? [])[0];
   if (v0?.calculated_price) {
     lines.push(
-      `   price    ${cyan(style, fmtPrice(v0.calculated_price.calculated_amount, v0.calculated_price.currency_code))} incl. VAT`
+      `   price    ${cyan(style, fmtPrice(v0.calculated_price.calculated_amount, v0.calculated_price.currency_code))}${taxSuffix(v0.calculated_price.is_calculated_price_tax_inclusive)}`
     );
+    lines.push(`   ${regionLine(rr, style)}`);
   }
   let imageUrl = product.thumbnail ?? null;
   let blackNote = null;
@@ -1186,27 +1251,24 @@ function registerView(program, makeClient, loadConfig) {
 // src/commands/stage.ts
 async function runStage(client, config, args) {
   const style = brandOf(args);
-  const region = await client.resolveRegion(config.region);
+  const rr = await client.resolveRegionResult(config.region);
+  if (rr.requested && !rr.matched) {
+    return failResult({
+      code: EXIT.DATAERR,
+      what: `we don't ship to ${rr.requested} yet.`,
+      money: "nothing staged, nothing charged.",
+      fix: "bt region --list   (see where we ship, then bt region <cc>)"
+    });
+  }
+  const region = rr.region;
   const resolved = await resolveProduct(client, region, args.handle);
   if (!resolved.product) {
     if (resolved.candidates && resolved.candidates.length > 1) {
-      return {
-        lines: [
-          fail({ code: EXIT.DATAERR, what: `"${args.handle}" matches ${resolved.candidates.length} designs \u2014 pick one:` }),
-          ...resolved.candidates.map((p) => `     ${p.handle ?? p.id}`),
-          "   or be exact \u2192 bt stage <slug>"
-        ],
-        exitCode: EXIT.DATAERR
-        // ambiguous input → non-zero so `bt stage x && bt checkout` halts (d10)
-      };
+      const r = failResult({ code: EXIT.DATAERR, what: `"${args.handle}" matches ${resolved.candidates.length} designs \u2014 pick one:` });
+      r.lines.push(...resolved.candidates.map((p) => `     ${p.handle ?? p.id}`), "   or be exact \u2192 bt stage <slug>");
+      return r;
     }
-    return {
-      lines: [
-        fail({ code: EXIT.UNAVAILABLE, what: `no design here called "${args.handle}".`, fix: "bt browse" })
-      ],
-      exitCode: EXIT.UNAVAILABLE
-      // not-found → non-zero (d10)
-    };
+    return failResult({ code: EXIT.UNAVAILABLE, what: `no design here called "${args.handle}".`, fix: "bt browse" });
   }
   const product = resolved.product;
   const matchNote = resolved.fuzzy && (product.handle ?? "") !== args.handle.trim() ? working(`matched "${product.handle}" from "${args.handle}"`) : null;
@@ -1216,17 +1278,11 @@ async function runStage(client, config, args) {
   const variant = findVariant(product, { size, colour });
   if (!variant) {
     const have = colours.length ? `  available colours: ${colours.join(", ")}.` : "";
-    return {
-      lines: [
-        fail({
-          code: EXIT.DATAERR,
-          what: `no variant for ${args.handle}${size ? `#size=${size}` : ""}${colour ? ` (${colour})` : ""}.`,
-          fix: `bt view ${args.handle}   (to see available sizes + colours)${have}`
-        })
-      ],
-      exitCode: EXIT.DATAERR
-      // unprocessable size+colour combo → non-zero (d10)
-    };
+    return failResult({
+      code: EXIT.DATAERR,
+      what: `no variant for ${args.handle}${size ? `#size=${size}` : ""}${colour ? ` (${colour})` : ""}.`,
+      fix: `bt view ${args.handle}   (to see available sizes + colours)${have}`
+    });
   }
   if (args.dryRun) {
     const colourSuffix2 = colour ? ` (${colour})` : "";
@@ -1325,6 +1381,7 @@ export {
   sizesForColour,
   findVariant,
   productLore,
+  isCartTaxInclusive,
   GLYPH,
   ok,
   warn,
@@ -1343,8 +1400,10 @@ export {
   contributionBar,
   colourSwatch,
   colourMarker,
+  regionLine,
   brandOf,
   fmtPrice,
+  taxSuffix,
   firstPrice,
   stageMarker,
   displayName,
@@ -1353,10 +1412,11 @@ export {
   resolveLineItemRef,
   resolveProduct,
   resolveOutput,
+  failResult,
   printResult,
   runView,
   registerView,
   runStage,
   registerStage
 };
-//# sourceMappingURL=chunk-RGXH3EZ6.js.map
+//# sourceMappingURL=chunk-AP5ARNWU.js.map