@binaryandthread/cli 0.4.5 → 0.4.6

package/dist/bin.js

@@ -36,6 +36,7 @@ import {
   isCartTaxInclusive,
   lineColour,
   ok,
+  orderStage,
   priceLine,
   printResult,
   productColours,
@@ -55,7 +56,7 @@ import {
   versionLine,
   warn,
   working
-} from "./chunk-PG7YCPAN.js";
+} from "./chunk-5W5O6G6Y.js";
 import {
   __require
 } from "./chunk-7OCVIDC7.js";
@@ -104,7 +105,7 @@ function makeLogger(debug, write = (s) => process.stderr.write(s)) {
 }
 
 // src/version.ts
-var VERSION = "0.4.5";
+var VERSION = "0.4.6";
 
 // src/eggs.ts
 function teapot() {
@@ -524,7 +525,7 @@ function registerBrowse(program, makeClient2, loadConfig2) {
   program.command("browse").alias("ls").description("list what's in stock on a branch.").option("--branch <branch>", "main (live) or next (terminal-only drops)").option("--pick", "opt into the arrow-key picker (default is the numbered table \u2014 use bt stage <n>)").option("--plain", "force the static table (the default; kept for back-compat)").action(async (opts) => {
     const { json, brand } = resolveOutput(program);
     if (opts.pick && !json && brand.color && process.stdout.isTTY && process.stdin.isTTY) {
-      const { runInteractiveBrowse } = await import("./interactive-HI3LDK5U.js");
+      const { runInteractiveBrowse } = await import("./interactive-I6KDKLEO.js");
       const handled = await runInteractiveBrowse(makeClient2(), loadConfig2(), { branch: opts.branch, brand });
       if (handled) return;
     }
@@ -1093,11 +1094,8 @@ function registerCheckout(program, makeClient2, loadConfig2) {
 // src/commands/order.ts
 var STAGES = ["staged", "committed", "printed", "shipped", "delivered"];
 function stageIndex(o) {
-  const f = (o.fulfillment_status ?? "").toLowerCase();
-  if (f.includes("delivered")) return 4;
-  if (f.includes("shipped")) return 3;
-  if (f.includes("fulfilled") || f.includes("printed") || f.includes("partially_shipped")) return 2;
-  return 1;
+  const stage = orderStage(o);
+  return stage === "reverted" ? -1 : STAGES.indexOf(stage);
 }
 function timelineGraph(idx) {
   const dots = STAGES.map((_s, i) => i <= idx ? "\u25CF" : "\u25CB").join("\u2500\u2500");
@@ -1130,12 +1128,18 @@ async function runOrder(client, config, args) {
   const itemLabel = first ? `${first.title ?? "item"}${first.variant_title ? ` \xB7 ${first.variant_title}` : ""}` : "your order";
   const style = brandOf(args);
   const lines = [];
-  lines.push(`${display}  ${itemLabel}   ${cyan(style, timelineGraph(idx))}  ${STAGES[idx]}`);
-  lines.push(`      ${STAGES.join(" \u2192 ")}${idx === 4 ? " \u{1F389}" : ""}`);
+  const stageWord = idx < 0 ? "reverted" : STAGES[idx];
+  if (idx < 0) {
+    lines.push(`${display}  ${itemLabel}   reverted`);
+    lines.push(`      this order was canceled or refunded. nothing ships.`);
+  } else {
+    lines.push(`${display}  ${itemLabel}   ${cyan(style, timelineGraph(idx))}  ${stageWord}`);
+    lines.push(`      ${STAGES.join(" \u2192 ")}${idx === 4 ? " \u{1F389}" : ""}`);
+  }
   lines.push(`      total ${cyan(style, total)}${taxSuffix(orderTaxInclusive)}`);
   return {
     lines,
-    json: args.json ? { display_id: display, stage: STAGES[idx], total: o.total ?? null, currency: o.currency_code ?? null } : void 0
+    json: args.json ? { display_id: display, stage: stageWord, total: o.total ?? null, currency: o.currency_code ?? null } : void 0
   };
 }
 function registerOrder(program, makeClient2, loadConfig2) {
@@ -1192,16 +1196,8 @@ function registerToken(program) {
 }
 
 // src/commands/log-graph.ts
-function orderStage(o) {
-  const status = (o.status ?? "").toLowerCase();
-  if (status.includes("cancel") || status.includes("refund") || status.includes("revert")) {
-    return "reverted";
-  }
-  const f = (o.fulfillment_status ?? "").toLowerCase();
-  if (f.includes("delivered")) return "delivered";
-  if (f.includes("shipped")) return "shipped";
-  if (f.includes("fulfilled") || f.includes("printed") || f.includes("partially")) return "printed";
-  return "committed";
+function orderStage2(o) {
+  return orderStage(o);
 }
 function shortHash(o) {
   const seed = `${o.display_id ?? ""}:${o.created_at ?? ""}`;
@@ -1219,19 +1215,19 @@ function label(o) {
   return `${first.title ?? "order"}${first.variant_title ? ` \xB7 ${first.variant_title}` : ""}`;
 }
 function hasLiveHead(orders) {
-  return orders.some((o) => orderStage(o) !== "reverted");
+  return orders.some((o) => orderStage2(o) !== "reverted");
 }
 function renderOneline(orders, style) {
   if (orders.length === 0) return [];
   const live = hasLiveHead(orders);
-  const headIdx = live ? orders.findIndex((o) => orderStage(o) !== "reverted") : -1;
+  const headIdx = live ? orders.findIndex((o) => orderStage2(o) !== "reverted") : -1;
   const lines = [];
   if (!live) {
     lines.push(dim(style, "(detached HEAD)  you have no committed fits. literally nothing to wear. we don't judge."));
   }
   orders.forEach((o, i) => {
     const hash = shortHash(o);
-    const stage = orderStage(o);
+    const stage = orderStage2(o);
     const ref = i === headIdx ? "(HEAD -> main) " : "";
     const tail = stage === "delivered" ? "delivered \u{1F389}" : stage;
     lines.push(`${hash}  ${ref}${label(o).padEnd(34)}  ${tail}`);
@@ -1241,14 +1237,14 @@ function renderOneline(orders, style) {
 function renderGraph(orders, style) {
   if (orders.length === 0) return [];
   const live = hasLiveHead(orders);
-  const headIdx = live ? orders.findIndex((o) => orderStage(o) !== "reverted") : -1;
+  const headIdx = live ? orders.findIndex((o) => orderStage2(o) !== "reverted") : -1;
   const lines = [];
   if (!live) {
     lines.push(dim(style, "(detached HEAD)  no committed fits. literally nothing to wear. we don't judge."));
   }
   orders.forEach((o, i) => {
     const hash = shortHash(o);
-    const stage = orderStage(o);
+    const stage = orderStage2(o);
     const ref = i === headIdx ? " (HEAD -> main)" : "";
     const node = stage === "delivered" ? green(style, "*") : "*";
     const tail = stage === "delivered" ? `${stage} ${green(style, "\u{1F389}")}` : stage;
@@ -1262,7 +1258,7 @@ function renderGraph(orders, style) {
 function renderFlat(orders) {
   return orders.map((o) => {
     const display = String(o.display_id ?? "");
-    return `${display.padEnd(8)}  ${label(o).padEnd(36)}  ${orderStage(o)}`;
+    return `${display.padEnd(8)}  ${label(o).padEnd(36)}  ${orderStage2(o)}`;
   });
 }