@tokenoftrust/storefront-runner 4.11.13 → 4.11.15

package/apps/storefront/src/lib/orders/admin/services/orders.ts

@@ -25,6 +25,7 @@ import type {
   ProviderOutcome,
   PublicCommerceEvent,
   StockState,
+  TenantConfig,
 } from "@tot/public-runtime";
 import {
   actorMayCommand,
@@ -53,11 +54,30 @@ import type {
   OrdersViewModel,
 } from "../viewmodels/orders";
 import type { CheckoutOrderClient } from "../orderClient";
-import { DEFAULT_TIMEZONE } from "@tot/public-runtime/declared-tenant-config";
+import { DEFAULT_TIMEZONE, resolveStoreTimeZone } from "@tot/public-runtime/declared-tenant-config";
+import { DeclaredTenantConfigUnreadError, withDeclaredTenantConfig } from "@/config/declaredTenantConfig";
 
 const EVIDENCE_STATES: readonly EvidenceState[] = ["fresh", "not-required", "UNKNOWN", "stale", "unreadable", "absent"];
 const REFUND_PAYMENTS: ReadonlySet<PaymentState> = new Set(["refunded", "refund_requested", "refund_unknown"]);
 
+/** Read the selected store's declared clock from its actual Orders scope's channel. */
+export async function readOrdersTimeZone(
+  target: TenantConfig | null,
+  kvGet: (key: string) => Promise<string | null>,
+  scope: CommerceScope | null,
+): Promise<string> {
+  if (!target || !scope) return DEFAULT_TIMEZONE;
+  try {
+    const env = scope.stage === "publication" ? "live" : "test";
+    const declared = await withDeclaredTenantConfig(target, kvGet, { env });
+    return resolveStoreTimeZone(declared.timezone);
+  } catch (error) {
+    // An unreadable declaration cannot establish the store's clock. The formatter labels UTC.
+    if (error instanceof DeclaredTenantConfigUnreadError) return DEFAULT_TIMEZONE;
+    throw error;
+  }
+}
+
 /** `YYYY-MM-DD` of an instant on the store's calendar. `null` when the instant does not parse. */
 export function storeDay(instant: string | Date, timeZone: string): string | null {
   const at = typeof instant === "string" ? new Date(instant) : instant;
@@ -67,18 +87,18 @@ export function storeDay(instant: string | Date, timeZone: string): string | nul
   return `${part("year")}-${part("month")}-${part("day")}`;
 }
 
-/** An instant's clock time on the store's clock, e.g. `12:03 PM`. */
+/** An instant's clock time and zone on the store's clock, e.g. `12:03 PM PDT`. */
 export function formatStoreTime(instant: string, timeZone: string): string {
   const at = new Date(instant);
   if (Number.isNaN(at.getTime())) return "";
-  return new Intl.DateTimeFormat("en-US", { timeZone, hour: "numeric", minute: "2-digit" }).format(at);
+  return new Intl.DateTimeFormat("en-US", { timeZone, hour: "numeric", minute: "2-digit", timeZoneName: "short" }).format(at);
 }
 
-/** An instant's date and clock time on the store's clock, e.g. `Oct 27, 12:03 PM`. */
+/** An instant's date, clock time and zone on the store's clock, e.g. `Oct 27, 12:03 PM PDT`. */
 export function formatStoreDateTime(instant: string, timeZone: string): string {
   const at = new Date(instant);
   if (Number.isNaN(at.getTime())) return "";
-  return new Intl.DateTimeFormat("en-US", { timeZone, month: "short", day: "numeric", hour: "numeric", minute: "2-digit" }).format(at);
+  return new Intl.DateTimeFormat("en-US", { timeZone, month: "short", day: "numeric", hour: "numeric", minute: "2-digit", timeZoneName: "short" }).format(at);
 }
 
 /** An instant's date on the store's calendar, e.g. `Oct 27`. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tokenoftrust/storefront-runner",
-  "version": "4.11.13",
+  "version": "4.11.15",
   "license": "SEE LICENSE IN LICENSE",
   "description": "World-shareable storefront runner: multi-tenant renderer on Astro/Cloudflare. No control plane.",
   "packageManager": "pnpm@11.9.0",