@occluze/tether 0.7.0 → 0.7.1

package/dist/tether.extras.js

@@ -29,6 +29,10 @@
   var m4 = window.Tether.__core["cart.ts"];
   var [Cart] = m4;
 
+  // tether-core:page-market.ts
+  var m5 = window.Tether.__core["page-market.ts"];
+  var [setCountry] = m5;
+
   // server/src/shared/json.ts
   function isRecord(value) {
     return value !== null && typeof value === "object" && !Array.isArray(value);
@@ -88,10 +92,9 @@
     }
     if (event.key !== `${cfg.prefix}:market:${cfg.domain}` || !event.newValue) return;
     const market = parseStoredMarket(event.newValue);
-    const tether = Reflect.get(window, "Tether");
-    if (!market || !tether) return;
+    if (!market) return;
     const options = { language: market.language, locale: market.locale, remember: false };
-    tether.setCountry(market.country, options).catch((error) => {
+    setCountry(market.country, options).catch((error) => {
       reportError(error, "market from another tab");
     });
   }
@@ -117,8 +120,18 @@
     replaceUrlIfAllowed(url);
   }
 
+  // src/part-registry.ts
+  function isTetherInternals(value) {
+    return isRecord(value) && isRecord(value["__core"]) && isRecord(value["__parts"]);
+  }
+  function registerPart(name, part) {
+    const tether = Reflect.get(window, "Tether");
+    if (!isTetherInternals(tether)) {
+      throw new Error(`tether.${name}.js runs after the Tether script, which loads it, and needs its window.Tether`);
+    }
+    tether.__parts[name] = part;
+  }
+
   // src/parts/extras.ts
-  var { Tether } = window;
-  if (!Tether) throw new Error("tether.extras.js runs after the Tether script, which loads it");
-  Tether.__parts.extras = extras_exports;
+  registerPart("extras", extras_exports);
 })();

package/dist/tether.extras.min.js

@@ -1 +1 @@
-(()=>{var E=Object.defineProperty;var A=(t,r)=>{for(var n in r)E(t,n,{get:r[n],enumerable:!0})};var f={};A(f,{addGroup:()=>U,onStorage:()=>I,writeVariantUrl:()=>P});var C=window.Tether.__core["config.ts"],[i,q,F,K,V,u,d]=C;var O=window.Tether.__core["dom.ts"],[z,D,g,m,G,W,w,y,Y,Z,h,v,k,B,l,H,Q,X]=O;var M=window.Tether.__core["product.ts"],[x]=M;var N=window.Tether.__core["cart.ts"],[p]=N;function T(t){return t!==null&&typeof t=="object"&&!Array.isArray(t)}function R(t,r){let n=g(h(t,"line-attributes"));return r?[{key:"_group",value:r},...n]:n}async function U(t){let r=t.closest(l("group"));if(!r)return null;let n=w(r,"group"),o=R(r,n),e=k(r,l("product")).flatMap(a=>{let s=x.get(a);if(!s?.variant?.availableForSale||s.quantity<=0)return[];let c=s.getLine();return c?[{...c,attributes:[...c.attributes??[],...o]}]:[]});if(!e.length)return d("group-add: nothing selected"),null;try{let a=await p.add(e);return m("group-added",{group:n,lines:e},r),a}catch(a){return u(a,"group add"),null}}function L(t){let r;try{r=JSON.parse(t)}catch{return null}if(!T(r))return null;let{country:n,language:o,locale:e}=r;return typeof n!="string"||!n?null:{country:n,language:typeof o=="string"?o:null,locale:typeof e=="string"?e:void 0}}function I(t){if(t.key===i.storageKey||t.key===`${i.storageKey}:seen`){p.init().catch(e=>{u(e,"cart from another tab")});return}if(t.key!==`${i.prefix}:market:${i.domain}`||!t.newValue)return;let r=L(t.newValue),n=Reflect.get(window,"Tether");if(!r||!n)return;let o={language:r.language,locale:r.locale,remember:!1};n.setCountry(r.country,o).catch(e=>{u(e,"market from another tab")})}var b=new WeakMap,S=t=>t.split("/").pop()??t;function J(t){try{window.history.replaceState(window.history.state,"",t)}catch{}}function P(t,{variant:r,sellingPlanId:n}){let o=`${r.id}|${n??""}`,e=b.get(t);if(b.set(t,o),!e||e===o)return;let a=i.variantUrl&&document.querySelector(l("product"))===t;if(!y(t,"variant-url")&&!a)return;let s=new URL(window.location.href);s.searchParams.set("variant",S(r.id)),n?s.searchParams.set("selling_plan",S(n)):s.searchParams.delete("selling_plan"),J(s)}var{Tether:_}=window;if(!_)throw new Error("tether.extras.js runs after the Tether script, which loads it");_.__parts.extras=f;})();
+(()=>{var N=Object.defineProperty;var A=(t,r)=>{for(var e in r)N(t,e,{get:r[e],enumerable:!0})};var m={};A(m,{addGroup:()=>I,onStorage:()=>$,writeVariantUrl:()=>q});var O=window.Tether.__core["config.ts"],[i,V,j,z,D,c,d]=O;var P=window.Tether.__core["dom.ts"],[W,Y,g,w,Z,v,h,y,B,H,k,Q,x,X,l,tt,rt,et]=P;var C=window.Tether.__core["product.ts"],[T]=C;var M=window.Tether.__core["cart.ts"],[f]=M;var R=window.Tether.__core["page-market.ts"],[_]=R;function u(t){return t!==null&&typeof t=="object"&&!Array.isArray(t)}function U(t,r){let e=g(k(t,"line-attributes"));return r?[{key:"_group",value:r},...e]:e}async function I(t){let r=t.closest(l("group"));if(!r)return null;let e=h(r,"group"),n=U(r,e),o=x(r,l("product")).flatMap(a=>{let s=T.get(a);if(!s?.variant?.availableForSale||s.quantity<=0)return[];let p=s.getLine();return p?[{...p,attributes:[...p.attributes??[],...n]}]:[]});if(!o.length)return d("group-add: nothing selected"),null;try{let a=await f.add(o);return w("group-added",{group:e,lines:o},r),a}catch(a){return c(a,"group add"),null}}function L(t){let r;try{r=JSON.parse(t)}catch{return null}if(!u(r))return null;let{country:e,language:n,locale:o}=r;return typeof e!="string"||!e?null:{country:e,language:typeof n=="string"?n:null,locale:typeof o=="string"?o:void 0}}function $(t){if(t.key===i.storageKey||t.key===`${i.storageKey}:seen`){f.init().catch(n=>{c(n,"cart from another tab")});return}if(t.key!==`${i.prefix}:market:${i.domain}`||!t.newValue)return;let r=L(t.newValue);if(!r)return;let e={language:r.language,locale:r.locale,remember:!1};_(r.country,e).catch(n=>{c(n,"market from another tab")})}var b=new WeakMap,S=t=>t.split("/").pop()??t;function J(t){try{window.history.replaceState(window.history.state,"",t)}catch{}}function q(t,{variant:r,sellingPlanId:e}){let n=`${r.id}|${e??""}`,o=b.get(t);if(b.set(t,n),!o||o===n)return;let a=i.variantUrl&&document.querySelector(l("product"))===t;if(!y(t,"variant-url")&&!a)return;let s=new URL(window.location.href);s.searchParams.set("variant",S(r.id)),e?s.searchParams.set("selling_plan",S(e)):s.searchParams.delete("selling_plan"),J(s)}function F(t){return u(t)&&u(t.__core)&&u(t.__parts)}function E(t,r){let e=Reflect.get(window,"Tether");if(!F(e))throw new Error(`tether.${t}.js runs after the Tether script, which loads it, and needs its window.Tether`);e.__parts[t]=r}E("extras",m);})();

package/dist/tether.js

@@ -452,7 +452,7 @@
     if (typeof shape === "function") return shape(value);
     if (typeof shape === "string") return shape === "object" ? isRecord(value) : typeof value === shape;
     if (isShapeList(shape)) return Array.isArray(value) && value.every((item) => matches(item, shape[0]));
-    return isRecord(value) && Object.entries(shape).every(([key, inner]) => matches(value[key], inner));
+    return isRecord(value) && Object.entries(shape).every(([key, inner]) => inner === void 0 || matches(value[key], inner));
   }
   var isShapeList = (shape) => Array.isArray(shape);
   var orNull = (shape) => (value) => value === null || matches(value, shape);
@@ -462,6 +462,9 @@
   }
   var STRINGS_AND_COMMENTS = /"(?:\\.|[^"\\\n])*"|#[^\n]*/g;
   var OPERATION_START = /^\s*(?:query|mutation)(?:\s+\w+)?\s*(?:\([^)]*\))?/;
+  function operationOf(document2) {
+    return /\bmutation\b/.test(document2.replace(STRINGS_AND_COMMENTS, "")) ? "mutation" : "query";
+  }
   function inContext(query2, { country, language }) {
     const args = [];
     if (country) args.push(`country: ${country}`);
@@ -489,10 +492,10 @@
   var INVENTORY_FIELD = "quantityAvailable";
   var storesWithoutInventory = /* @__PURE__ */ new Set();
   var storeOf = (conf) => `${conf.domain} ${conf.apiVersion} ${conf.token}`;
-  function queryText(conf, query2, access, context) {
+  function queryText(conf, query2, access, { context, operation }) {
     const written = typeof query2 === "string" ? query2 : query2(access);
     const text2 = context ? inContext(written, conf) : written;
-    if (conf.maxAge <= 0 || /^\s*mutation\b/.test(text2)) return text2;
+    if (conf.maxAge <= 0 || operation === "mutation") return text2;
     return `${text2} #${Math.floor(Date.now() / (conf.maxAge * MS_PER_SECOND))}`;
   }
   var sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
@@ -520,8 +523,7 @@
     return { data, errors: errors.map(toGraphQLError) };
   }
   function invalidResponse(res, conf) {
-    const text2 = res.ok ? `Invalid response (${res.status})` : statusText(res.status, conf);
-    return new TetherError(text2, { status: res.status });
+    return res.ok ? new TetherError(`Invalid response (${res.status})`, { code: "INVALID_RESPONSE", status: res.status }) : new TetherError(statusText(res.status, conf), { status: res.status });
   }
   function graphQLFailure(res, errors, conf) {
     const message = errors.map((error) => error.message).filter(Boolean).join(" | ");
@@ -529,7 +531,11 @@
     if (!res.ok) text2 = res.status === 401 || res.status === 403 || !message ? statusText(res.status, conf) : message;
     return new TetherError(text2, { status: res.status, errors });
   }
-  async function attempt(conf, query2, variables, isData, canRetry) {
+  function networkFailure(error, retry) {
+    if (retry === "any") return { kind: "retry", backoffMs: RETRY_BACKOFF_MS };
+    throw new TetherError(`Network error: ${messageOf(error)}`, { code: "NETWORK" });
+  }
+  async function attempt(conf, query2, variables, isData, retry) {
     let res;
     try {
       res = await (conf.fetch ?? fetch)(endpoint(conf), {
@@ -538,22 +544,20 @@
         body: JSON.stringify({ query: query2, variables })
       });
     } catch (error) {
-      if (canRetry) return { kind: "retry", backoffMs: RETRY_BACKOFF_MS };
-      throw new TetherError(`Network error: ${messageOf(error)}`, {
-        code: "NETWORK"
-      });
+      return networkFailure(error, retry);
     }
     if (res.status === SECURITY_REJECTION) {
       throw new TetherError("Shopify security rejection (430)", { status: SECURITY_REJECTION });
     }
-    if (canRetry && (res.status === 429 || res.status >= 500)) {
+    if (retry !== "none" && res.status === 429 || retry === "any" && res.status >= 500) {
       return { kind: "retry", backoffMs: RETRY_BACKOFF_MS };
     }
     let json;
     try {
       json = await res.json();
-    } catch {
-      throw invalidResponse(res, conf);
+    } catch (error) {
+      if (error instanceof SyntaxError) throw invalidResponse(res, conf);
+      return networkFailure(error, retry);
     }
     const body = toGraphQLResponse(json);
     if (!body) throw invalidResponse(res, conf);
@@ -562,7 +566,7 @@
       if (query2.includes(INVENTORY_FIELD) && errors.some((error) => error.message.includes(INVENTORY_FIELD))) {
         return { kind: "inventory-refused", error: graphQLFailure(res, errors, conf) };
       }
-      if (canRetry && errors.some((error) => error.extensions?.code === "THROTTLED")) {
+      if (retry !== "none" && errors.some((error) => error.extensions?.code === "THROTTLED")) {
         return { kind: "retry", backoffMs: THROTTLE_BACKOFF_MS };
       }
       throw graphQLFailure(res, errors, conf);
@@ -571,15 +575,17 @@
     if (!isData(data)) throw invalidResponse(res, conf);
     return { kind: "data", data };
   }
-  async function request(conf, query2, variables, isData, { context = true } = {}) {
+  async function request(conf, query2, variables, isData, { context = true, operation = "query" } = {}) {
     if (!conf.domain || !conf.token) {
       throw new TetherError("Tether is not configured: domain and token are required", { code: "NOT_CONFIGURED" });
     }
     const store = storeOf(conf);
+    const retryWhileLeft = operation === "mutation" ? "not-run" : "any";
     let retries = 0;
     for (; ; ) {
-      const sent = queryText(conf, query2, { inventory: !storesWithoutInventory.has(store) }, context);
-      const outcome = await attempt(conf, sent, variables, isData, retries < conf.retries);
+      const sent = queryText(conf, query2, { inventory: !storesWithoutInventory.has(store) }, { context, operation });
+      const retry = retries < conf.retries ? retryWhileLeft : "none";
+      const outcome = await attempt(conf, sent, variables, isData, retry);
       switch (outcome.kind) {
         case "data":
           return outcome.data;
@@ -601,7 +607,8 @@
   }
   var hasData = (data) => typeof data === "object" && data !== null;
   function query(text2, variables = {}, options) {
-    return gql(text2, variables, hasData, options);
+    const operation = operationOf(typeof text2 === "string" ? text2 : text2({ inventory: true }));
+    return gql(text2, variables, hasData, { ...options, operation });
   }
   function unwrap(payload, name) {
     if (!payload) throw new TetherError(`${name}: empty response`);
@@ -1354,7 +1361,10 @@
     priceRange: { minVariantPrice: MONEY2, maxVariantPrice: MONEY2 },
     variants: { nodes: [{ id: "string", price: MONEY2, selectedOptions: ["object"] }] }
   };
-  var PRODUCT_CONNECTION = { nodes: [PRODUCT], pageInfo: { hasNextPage: "boolean" } };
+  var PRODUCT_CONNECTION = {
+    nodes: [PRODUCT],
+    pageInfo: { hasNextPage: "boolean" }
+  };
   var isProductShape = (value) => field(value, "id") !== "" && field(value, "handle") !== "" && matches(value, PRODUCT);
   var PRODUCT_NODE = (node) => isRecord(node) && (node["id"] === void 0 || matches(node, PRODUCT));
 
@@ -1876,6 +1886,9 @@
     }
   }
 
+  // server/src/shared/cart-id.ts
+  var CART_ID = /^gid:\/\/shopify\/Cart\/[\w-]+(\?key=[\w-]+)?$/;
+
   // src/cart/store.ts
   var status = { kind: "unknown" };
   var warnings = [];
@@ -1894,7 +1907,13 @@
   var currentWarnings = () => warnings;
   var statusOf = (cart) => cart ? { kind: "ready", cart } : { kind: "empty" };
   var seenKey = () => `${cfg.storageKey}:seen`;
-  var savedCartId = () => getStored(cfg.storageKey) || null;
+  function savedCartId() {
+    const stored = getStored(cfg.storageKey);
+    if (!stored) return null;
+    if (CART_ID.test(stored)) return stored;
+    forgetSavedCart();
+    return null;
+  }
   function forgetSavedCart() {
     removeStored(cfg.storageKey);
   }
@@ -1996,6 +2015,9 @@
     if (error.userErrors?.some((userError) => userError.field?.[0] === "cartId")) return true;
     return (error.errors ?? []).some((graphQLError) => UNKNOWN_CART_MESSAGE.test(graphQLError.message));
   }
+  function isUnclearFailure(error) {
+    return error instanceof TetherError && (error.code === "NETWORK" || error.code === "INVALID_RESPONSE" || (error.status ?? 0) >= 500);
+  }
   function toLineInput(input, quantity = 1, options = {}) {
     const spec = typeof input === "object" && input !== null ? input : { ...options, quantity, ...input === null || input === void 0 ? {} : { variantId: input } };
     const merchandiseId = GID.variant(spec.merchandiseId || spec.variantId || spec.id);
@@ -2012,7 +2034,7 @@
     return (access) => `mutation Tether_${name}(${args}){${name}(${inner}){cart{...TetherCart}userErrors{field message}warnings{code message target}}}${cartFragment(access)}`;
   }
   async function send(name, args, inner, variables) {
-    const data = await gql(mutationText(name, args, inner), variables, isPayloadOf(name));
+    const data = await gql(mutationText(name, args, inner), variables, isPayloadOf(name), { operation: "mutation" });
     const payload = unwrap(data[name], name);
     setWarnings(payload.warnings ?? []);
     return payload.cart;
@@ -2139,6 +2161,25 @@
 
   // src/cart.ts
   var currentLines = () => currentCart()?.lines.nodes ?? [];
+  async function reloadAfterUnclearFailure() {
+    const id = savedCartId();
+    if (!id) return;
+    try {
+      const cart = await fetchCart(id);
+      if (!cart) forgetSavedCart();
+      commit(cart, "load");
+    } catch (error) {
+      reportError(error, "cart reload after a failed change");
+    }
+  }
+  function runChange(task) {
+    return enqueue(
+      () => task().catch(async (error) => {
+        if (isUnclearFailure(error)) await reloadAfterUnclearFailure();
+        throw error;
+      })
+    );
+  }
   function changeQuantity(lineId, delta) {
     const line = currentLines().find((candidate) => candidate.id === lineId);
     if (!line) return Promise.resolve(currentCart());
@@ -2147,7 +2188,7 @@
     pendingQuantities.set(lineId, job);
     announce("pending");
     const isLatest = () => pendingQuantities.get(lineId) === job;
-    const sent = enqueue(async () => {
+    const sent = runChange(async () => {
       if (!isLatest()) return currentCart();
       const now = currentLines().find((candidate) => candidate.id === lineId);
       if (now?.quantity === target) return currentCart();
@@ -2255,7 +2296,7 @@
       const lines = (Array.isArray(input) ? input : [input]).map(
         (line) => toLineInput(line, quantity, options)
       );
-      return enqueue(async () => {
+      return runChange(async () => {
         const cart = await mutateCart({
           name: "cartLinesAdd",
           args: "$lines: [CartLineInput!]!",
@@ -2279,14 +2320,14 @@
       const quantity = typeof patch === "number" ? patch : patch.quantity;
       if (quantity !== void 0 && quantity <= 0) return Cart.removeLine(lineId);
       const line = toLineUpdate(lineId, patch);
-      return enqueue(async () => commit(await updateLines([line]), "update"));
+      return runChange(async () => commit(await updateLines([line]), "update"));
     },
     changeQuantity,
     /** The quantity to show: the one asked for while an update is on its way. */
     quantityOf: pendingQuantityOf,
     removeLine(lineIds) {
       const ids = Array.isArray(lineIds) ? lineIds : [lineIds];
-      return enqueue(async () => commit(await removeLines(ids), "remove"));
+      return runChange(async () => commit(await removeLines(ids), "remove"));
     },
     clear() {
       const ids = currentLines().map((line) => line.id);
@@ -2295,7 +2336,7 @@
     },
     setNote(note) {
       const variables = { note: note ?? "" };
-      return enqueue(
+      return runChange(
         async () => commit(
           await mutateCart({
             name: "cartNoteUpdate",
@@ -2314,7 +2355,7 @@
      * @param attributes The value `''` removes a key.
      */
     setAttributes(attributes) {
-      return enqueue(async () => {
+      return runChange(async () => {
         const variables = { attributes: mergedAttributes(attributes) };
         const cart = await mutateCart({
           name: "cartAttributesUpdate",
@@ -2328,7 +2369,7 @@
     },
     /** Replaces the discount codes; `[]` removes them all. */
     setDiscountCodes(codes) {
-      return enqueue(async () => {
+      return runChange(async () => {
         const variables = { discountCodes: discountCodesFrom(codes) };
         const cart = await mutateCart({
           name: "cartDiscountCodesUpdate",
@@ -2367,7 +2408,7 @@
      * @param options `create: false` forgets an expired cart instead of creating an empty one.
      */
     setBuyerIdentity(buyerIdentity, { create = true } = {}) {
-      return enqueue(async () => {
+      return runChange(async () => {
         const cart = await mutateCart({
           name: "cartBuyerIdentityUpdate",
           args: "$buyerIdentity: CartBuyerIdentityInput!",
@@ -3447,8 +3488,91 @@
     });
   }
 
+  // src/markets.ts
+  var storageKey = () => `${cfg.prefix}:market:${cfg.domain}`;
+  var pageStorage = { getItem: (key) => getStored(key) };
+  function parseJsonOrNull(text2) {
+    try {
+      return JSON.parse(text2);
+    } catch (error) {
+      if (error instanceof SyntaxError) return null;
+      throw error;
+    }
+  }
+  function toMarket(value) {
+    if (typeof value !== "object" || value === null) return null;
+    const country = toCountry(Reflect.get(value, "country"));
+    if (!country) return null;
+    const locale = Reflect.get(value, "locale");
+    return {
+      country,
+      language: toLanguage(Reflect.get(value, "language")) ?? void 0,
+      locale: typeof locale === "string" && locale ? locale : void 0
+    };
+  }
+  function readSavedMarket(storage = pageStorage) {
+    const text2 = storage.getItem(storageKey());
+    return text2 ? toMarket(parseJsonOrNull(text2)) : null;
+  }
+
+  // src/page-market.ts
+  var configuredMarket = { country: void 0, language: void 0, locale: void 0 };
+  var lastPageHadOwnMarket = false;
+  function pageMarket() {
+    const meta2 = (name) => document.querySelector(`meta[name="${cfg.prefix}-page-${name}"]`)?.getAttribute("content") || void 0;
+    const country = toCountry(meta2("country"));
+    if (!country) return null;
+    return { country, language: toLanguage(meta2("language")) ?? void 0, locale: meta2("locale") };
+  }
+  async function visitorMarket() {
+    const markets = cfg.markets ?? {};
+    if (markets.detect === false) return null;
+    if (!markets.detect) return markets.remember === false ? null : readSavedMarket();
+    try {
+      return (await loadPart("markets")).detectMarket(markets);
+    } catch (error) {
+      reportError(error, "markets");
+      return null;
+    }
+  }
+  async function applyStartMarket(overrides) {
+    configuredMarket = { country: cfg.country, language: cfg.language, locale: cfg.locale };
+    const page = pageMarket();
+    lastPageHadOwnMarket = page !== null;
+    if (page) {
+      cfg.country = page.country;
+      cfg.language = page.language;
+      if (page.locale) cfg.locale = page.locale;
+      return;
+    }
+    const market = await visitorMarket();
+    if (!market) return;
+    if (market.country) cfg.country = market.country;
+    if (market.language) cfg.language = market.language;
+    if (market.locale && !overrides.locale) cfg.locale = market.locale;
+    log("market", market);
+  }
+  var sameCode = (a, b) => (a ?? "").toUpperCase() === (b ?? "").toUpperCase();
+  function marketForArrival() {
+    const page = pageMarket();
+    const leftOwnMarket = page === null && lastPageHadOwnMarket;
+    lastPageHadOwnMarket = page !== null;
+    const target = page ?? (leftOwnMarket ? readSavedMarket() ?? configuredMarket : null);
+    if (!target?.country) return null;
+    if (sameCode(target.country, cfg.country) && sameCode(target.language, cfg.language)) return null;
+    return { country: target.country, language: target.language, locale: target.locale };
+  }
+  function setCountry(code, options) {
+    return loadPart("markets").then((part) => part.setCountry(code, options));
+  }
+
   // src/part-integrity.ts
-  var PART_INTEGRITY = { "tether.diagnose.js": "sha384-OKLlZJrSZ5IF9SOjKnEe485fi5xZlb4oLLvSfGjAssABzqd3h9JH1yA/hDczhkjJ", "tether.markets.js": "sha384-QVvTGiZJKx2hOPIpQPrGycWnKVTfDMEJ8z9heHIYSqib+6WyUoTmzKf2oBiFE3le", "tether.search.js": "sha384-P63pnKFjWTIVS8kEbBr4sfZZI91u1tImDTe+y50l2pdOM+W/KQsMymB6YRH801Dc", "tether.extras.js": "sha384-DJwYPZWf7o63ooQuDRvvhLrl5quZwhWO1YQ9RpySNQKjlDIS3uCwxDpDfZYiEjla", "tether.account.js": "sha384-q3UfPH5vDMbKm05wkvEPTDoA/aaIPmRQBDrqmXA4cNF4VFZAo4dgt61TmrNM69mi", "tether.account-pages.js": "sha384-YiSgDwM6qeHXJBcbWLRuk50h2ntAamNadS0MrZByc3cl5PKXZO297l38zYWm0lLe", "tether.analytics.js": "sha384-I93erLFdRG9uy3t+mnaDk/MgECoYOSG3q+9TfIQ39NROWZLvFjYrpHOAnBfsXaJc" };
+  var PART_INTEGRITY = { "tether.diagnose.js": "sha384-My35ltXsPvspuBHm0xCTu7wl6C4ORwigmKQMCaTKI6VP9ELMCCLYCETpAYW3Fus+", "tether.markets.js": "sha384-m9u+yVeYzqljJYufGt6C6E2xCgqgBSJstvmjU5a2lXZLK3q2saH19EYgP/EC5ox3", "tether.search.js": "sha384-ZrByfRsWNOHbbWOocY4WOD2RWe4QI2qQRZ4Eb+fM5v/UHIQ8mlWxbSwrxJt8yLbc", "tether.extras.js": "sha384-sE3c2fclN/3LKtuYUtC4CjVk76Zu0Mv/jR3p8YYLisAvyDvqJxpx4nj8PbJ3KzXH", "tether.account.js": "sha384-UF36poTg1vnXE7Pg+FYFGMJ4qjKhx9mbOug9bqTYhzgqRppOKS9M/1uY5D/cz9KF", "tether.account-pages.js": "sha384-jJYvZswrRw+pGDYrk0FswWcYqGpZkbR6ooxJGFu0lTYkUlVOcsCXuLLLU6M5kO54", "tether.analytics.js": "sha384-10v5pBMzgfF7BuLGQBg3cdbgMk701Uto5rGjhByiRD2jI9+/WF8DFcSWplIcdRNg" };
+
+  // src/part-registry.ts
+  function isTetherInternals(value) {
+    return isRecord(value) && isRecord(value["__core"]) && isRecord(value["__parts"]);
+  }
 
   // src/lazy-iife.ts
   var coreModules = {
@@ -3504,6 +3628,9 @@
     get "market-codes.ts"() {
       return [toCountry, toLanguage];
     },
+    get "page-market.ts"() {
+      return [setCountry];
+    },
     get "shopify-values.ts"() {
       return [isHttpsUrl];
     },
@@ -3533,14 +3660,15 @@
       script.async = true;
       applyIntegrity(script, integrity);
       script.onload = () => {
-        const { Tether } = window;
-        const part = Tether?.__parts[name];
+        const tether = Reflect.get(window, "Tether");
+        const part = isTetherInternals(tether) ? tether.__parts[name] : void 0;
         if (part) {
           resolve(part);
           return;
         }
         parts.delete(name);
-        reject(new Error(`${url2} did not register`));
+        const problem = isTetherInternals(tether) ? "did not register" : "can't register: window.Tether is no longer this Tether script's, another script replaced it";
+        reject(new Error(`${url2} ${problem}`));
       };
       script.onerror = () => {
         parts.delete(name);
@@ -3574,84 +3702,6 @@
     return loading;
   }
 
-  // src/markets.ts
-  var storageKey = () => `${cfg.prefix}:market:${cfg.domain}`;
-  var pageStorage = { getItem: (key) => getStored(key) };
-  function parseJsonOrNull(text2) {
-    try {
-      return JSON.parse(text2);
-    } catch (error) {
-      if (error instanceof SyntaxError) return null;
-      throw error;
-    }
-  }
-  function toMarket(value) {
-    if (typeof value !== "object" || value === null) return null;
-    const country = toCountry(Reflect.get(value, "country"));
-    if (!country) return null;
-    const locale = Reflect.get(value, "locale");
-    return {
-      country,
-      language: toLanguage(Reflect.get(value, "language")) ?? void 0,
-      locale: typeof locale === "string" && locale ? locale : void 0
-    };
-  }
-  function readSavedMarket(storage = pageStorage) {
-    const text2 = storage.getItem(storageKey());
-    return text2 ? toMarket(parseJsonOrNull(text2)) : null;
-  }
-
-  // src/page-market.ts
-  var configuredMarket = { country: void 0, language: void 0, locale: void 0 };
-  var lastPageHadOwnMarket = false;
-  function pageMarket() {
-    const meta2 = (name) => document.querySelector(`meta[name="${cfg.prefix}-page-${name}"]`)?.getAttribute("content") || void 0;
-    const country = toCountry(meta2("country"));
-    if (!country) return null;
-    return { country, language: toLanguage(meta2("language")) ?? void 0, locale: meta2("locale") };
-  }
-  async function visitorMarket() {
-    const markets = cfg.markets ?? {};
-    if (markets.detect === false) return null;
-    if (!markets.detect) return markets.remember === false ? null : readSavedMarket();
-    try {
-      return (await loadPart("markets")).detectMarket(markets);
-    } catch (error) {
-      reportError(error, "markets");
-      return null;
-    }
-  }
-  async function applyStartMarket(overrides) {
-    configuredMarket = { country: cfg.country, language: cfg.language, locale: cfg.locale };
-    const page = pageMarket();
-    lastPageHadOwnMarket = page !== null;
-    if (page) {
-      cfg.country = page.country;
-      cfg.language = page.language;
-      if (page.locale) cfg.locale = page.locale;
-      return;
-    }
-    const market = await visitorMarket();
-    if (!market) return;
-    if (market.country) cfg.country = market.country;
-    if (market.language) cfg.language = market.language;
-    if (market.locale && !overrides.locale) cfg.locale = market.locale;
-    log("market", market);
-  }
-  var sameCode = (a, b) => (a ?? "").toUpperCase() === (b ?? "").toUpperCase();
-  function marketForArrival() {
-    const page = pageMarket();
-    const leftOwnMarket = page === null && lastPageHadOwnMarket;
-    lastPageHadOwnMarket = page !== null;
-    const target = page ?? (leftOwnMarket ? readSavedMarket() ?? configuredMarket : null);
-    if (!target?.country) return null;
-    if (sameCode(target.country, cfg.country) && sameCode(target.language, cfg.language)) return null;
-    return { country: target.country, language: target.language, locale: target.locale };
-  }
-  function setCountry(code, options) {
-    return loadPart("markets").then((part) => part.setCountry(code, options));
-  }
-
   // src/account-marks.ts
   var hintKey = () => `${cfg.prefix}:account-hint:${cfg.domain}`;
   function removeFromBothAreas(key) {
@@ -3951,7 +4001,7 @@
   }
 
   // src/index.ts
-  var VERSION = "0.7.0";
+  var VERSION = "0.7.1";
   var OBSERVE_DEBOUNCE_MS = 50;
   function pageConfig() {
     const config = pageGlobal("TETHER_CONFIG");

package/dist/tether.markets.js

@@ -294,8 +294,23 @@
     return Cart.state;
   }
 
+  // server/src/shared/json.ts
+  function isRecord(value) {
+    return value !== null && typeof value === "object" && !Array.isArray(value);
+  }
+
+  // src/part-registry.ts
+  function isTetherInternals(value) {
+    return isRecord(value) && isRecord(value["__core"]) && isRecord(value["__parts"]);
+  }
+  function registerPart(name, part) {
+    const tether = Reflect.get(window, "Tether");
+    if (!isTetherInternals(tether)) {
+      throw new Error(`tether.${name}.js runs after the Tether script, which loads it, and needs its window.Tether`);
+    }
+    tether.__parts[name] = part;
+  }
+
   // src/parts/markets.ts
-  var { Tether } = window;
-  if (!Tether) throw new Error("tether.markets.js runs after the Tether script, which loads it");
-  Tether.__parts.markets = markets_ui_exports;
+  registerPart("markets", markets_ui_exports);
 })();

package/dist/tether.markets.min.js

@@ -1 +1 @@
-(()=>{var K=Object.defineProperty;var W=(e,t)=>{for(var n in t)K(e,n,{get:t[n],enumerable:!0})};var L={};W(L,{detectMarket:()=>F,getLocalization:()=>$,renderCountrySelects:()=>h,setCountry:()=>be});var G=window.Tether.__core["config.ts"],[c,Te,ve,M,S,p,xe]=G;var V=window.Tether.__core["client.ts"],[Pe,b,Ae,E,T]=V;var Q=window.Tether.__core["cart.ts"],[g]=Q;var Z=window.Tether.__core["collection.ts"],[v]=Z;var X=window.Tether.__core["loader.ts"],[x,Oe]=X;var ee=window.Tether.__core["dom.ts"],[Ue,m,He,_,De,Fe,P,je,qe,$e,Je,Ye,Be,Ke,C,We,Ge,Ve]=ee;var te=window.Tether.__core["mounting.ts"],[A,I,z,N,O,w]=te;var ne=window.Tether.__core["market-codes.ts"],[s,d]=ne;function R(e,t="localStorage"){try{return window[t].getItem(e)}catch{return null}}function U(e,t,n="localStorage"){try{window[n].setItem(e,t)}catch{}}var oe="tether_country",H=()=>`${c.prefix}:market:${c.domain}`,D={getItem:e=>R(e)};function re(){let e=typeof window<"u";return{document:typeof document<"u"?document:null,location:e?window.location:null,storage:D,global:e?window:{}}}function ae(e){try{return JSON.parse(e)}catch(t){if(t instanceof SyntaxError)return null;throw t}}function ce(e){if(typeof e!="object"||e===null)return null;let t=s(Reflect.get(e,"country"));if(!t)return null;let n=Reflect.get(e,"locale");return{country:t,language:d(Reflect.get(e,"language"))??void 0,locale:typeof n=="string"&&n?n:void 0}}function ie(e=D){let t=e.getItem(H());return t?ce(ae(t)):null}function le(e,t){if(!e||!t)return null;let n=e.cookie.split(";").map(a=>a.trim()).find(a=>a.startsWith(`${t}=`));return n?decodeURIComponent(n.slice(t.length+1)):null}function k(e,t){if(!e||!t)return null;let n=t.toLowerCase(),a=Object.keys(e).find(o=>o.toLowerCase()===n);return a?e[a]??null:null}function ue(e,t){let n=r=>t.document?.querySelector(`meta[name="${r}"]`)?.getAttribute("content"),a=Reflect.get(t.global,"TETHER_COUNTRY"),o=Reflect.get(t.global,"TETHER_LANGUAGE"),i=n("tether-country")||le(t.document,e.cookie||oe);return{country:a||i,language:o||n("tether-language")}}function se(e,t){let n=(t.location?.pathname??"/").split("/").find(l=>l!==""),a=k(e.locales,n);if(a)return a;let o=t.document?.documentElement.getAttribute("lang");if(!o)return null;let i=k(e.locales,o)??k(e.locales,o.split("-")[0]);if(i)return{locale:o,...i};if(e.locales&&e.strict)return null;let r=o.split("-")[1];return{language:o,country:r?.length===2?r:null,locale:o}}function de(e,t,n){switch(e){case"saved":return t.remember===!1?null:ie(n.storage);case"server":return ue(t,n);case"webflow":return se(t,n)}}function ge(e){return e?e===!0?M:e:["saved"]}function F(e=c.markets,t=re()){let n=(e===c.markets?e:S(e))??{};if(n.detect===!1)return{};let a={},o={sources:a};for(let i of ge(n.detect)){let r=de(i,n,t);if(!r)continue;let l=s(r.country),u=d(r.language),f=typeof r.locale=="string"&&r.locale?r.locale:null;l&&!o.country&&(o.country=l,a.country=i),u&&!o.language&&(o.language=u,a.language=i),f&&!o.locale&&(o.locale=f,a.locale=i)}return o}function j(e){if(c.markets?.remember===!1)return;let t={country:e.country,language:e.language||void 0,locale:e.locale||void 0};U(H(),JSON.stringify(t))}var fe="{name} ({currency})",me="name",y=null;function ye(){y=null}var pe="query TetherLocalization{localization{country{isoCode name currency{isoCode symbol}}language{isoCode name}availableCountries{isoCode name currency{isoCode symbol}availableLanguages{isoCode name}}}}",q={isoCode:"string",name:"string",currency:"object"},Ce=E({localization:{country:q,availableCountries:[q]}});function $(){return y??(y=b(pe,{},Ce).then(e=>e.localization,e=>{throw y=null,e})),y}function J(e,t){switch(t){case"name":return e.name;case"code":return e.isoCode;case"currency":return e.currency.isoCode;case"symbol":return e.currency.symbol;default:return""}}var we=(e,t)=>e.replace(/\{(name|code|currency|symbol)\}/g,(n,a)=>J(t,a));function ke(e,t,n){let a=e.getAttribute(m("country-label"))||fe,o=(e.getAttribute(m("countries"))||"").toUpperCase().split(/[\s,]+/).filter(Boolean),i=o.length?o.map(r=>t.find(l=>l.isoCode===r)).filter(r=>r!==void 0):t;e.replaceChildren(...i.map(r=>new Option(we(a,r),r.isoCode))),e.value=n,e.value!==n&&(e.selectedIndex=-1),e.disabled=i.length<2&&!e.hasAttribute(m("always-enabled"))}function he(e,t,n){let a=(c.country||n.country.isoCode).toUpperCase(),o=[...n.availableCountries].sort((r,l)=>r.name.localeCompare(l.name,c.locale||void 0)),i=o.find(r=>r.isoCode===a)??n.country;e.forEach(r=>{ke(r,o,a)}),t.forEach(r=>{r.textContent=J(i,P(r,"country-bind")||me)})}function h(e=document){let t=w(e,`select${C("country-select")}`),n=w(e,C("country-bind"));return!t.length&&!n.length?Promise.resolve():$().then(a=>{he(t,n,a)}).catch(a=>{p(a,"country select")})}var Le=e=>Object.values(c.markets?.locales??{}).find(t=>s(t.country)===e);function Me(e,t){return e!==void 0?d(e):t?t.language?d(t.language):void 0:c.language}function Se(e){x();let t=[];return g.id()&&t.push(g.setBuyerIdentity({countryCode:e},{create:!1}).catch(n=>{p(n,"cart country")})),O(),A.forEach(n=>t.push(n.load())),I.forEach(n=>{n.closest(v())||(z.delete(n),N(n))}),t}async function be(e,{language:t,locale:n,remember:a=!0}={}){let o=s(e);if(!o)throw new T(`Not a country code: ${e}`,{code:"INVALID_COUNTRY"});let i=Le(o),r=n||i?.locale,l=r||c.locale,u=Me(t,i),f=o!==c.country||u!==c.language||l!==c.locale;if(c.country=o,c.language=u||void 0,c.locale=l,a&&j({country:o,language:u,locale:r}),!f)return h(),g.state;t!==void 0&&ye();let B=Se(o);return h(),_("country-changed",{country:o,language:c.language}),await Promise.all(B),g.state}var{Tether:Y}=window;if(!Y)throw new Error("tether.markets.js runs after the Tether script, which loads it");Y.__parts.markets=L;})();
+(()=>{var W=Object.defineProperty;var G=(e,t)=>{for(var n in t)W(e,n,{get:t[n],enumerable:!0})};var b={};G(b,{detectMarket:()=>j,getLocalization:()=>J,renderCountrySelects:()=>L,setCountry:()=>xe});var V=window.Tether.__core["config.ts"],[c,_e,Pe,M,S,C,Ae]=V;var Z=window.Tether.__core["client.ts"],[ve,x,Oe,T,E]=Z;var Q=window.Tether.__core["cart.ts"],[g]=Q;var X=window.Tether.__core["collection.ts"],[_]=X;var ee=window.Tether.__core["loader.ts"],[P,Ue]=ee;var te=window.Tether.__core["dom.ts"],[De,m,Fe,A,je,$e,N,qe,Je,Ye,Be,Ke,We,Ge,w,Ve,Ze,Qe]=te;var ne=window.Tether.__core["mounting.ts"],[v,O,I,z,R,k]=ne;var oe=window.Tether.__core["market-codes.ts"],[s,d]=oe;function U(e,t="localStorage"){try{return window[t].getItem(e)}catch{return null}}function H(e,t,n="localStorage"){try{window[n].setItem(e,t)}catch{}}var re="tether_country",D=()=>`${c.prefix}:market:${c.domain}`,F={getItem:e=>U(e)};function ae(){let e=typeof window<"u";return{document:typeof document<"u"?document:null,location:e?window.location:null,storage:F,global:e?window:{}}}function ce(e){try{return JSON.parse(e)}catch(t){if(t instanceof SyntaxError)return null;throw t}}function ie(e){if(typeof e!="object"||e===null)return null;let t=s(Reflect.get(e,"country"));if(!t)return null;let n=Reflect.get(e,"locale");return{country:t,language:d(Reflect.get(e,"language"))??void 0,locale:typeof n=="string"&&n?n:void 0}}function ue(e=F){let t=e.getItem(D());return t?ie(ce(t)):null}function le(e,t){if(!e||!t)return null;let n=e.cookie.split(";").map(a=>a.trim()).find(a=>a.startsWith(`${t}=`));return n?decodeURIComponent(n.slice(t.length+1)):null}function h(e,t){if(!e||!t)return null;let n=t.toLowerCase(),a=Object.keys(e).find(o=>o.toLowerCase()===n);return a?e[a]??null:null}function se(e,t){let n=r=>t.document?.querySelector(`meta[name="${r}"]`)?.getAttribute("content"),a=Reflect.get(t.global,"TETHER_COUNTRY"),o=Reflect.get(t.global,"TETHER_LANGUAGE"),i=n("tether-country")||le(t.document,e.cookie||re);return{country:a||i,language:o||n("tether-language")}}function de(e,t){let n=(t.location?.pathname??"/").split("/").find(u=>u!==""),a=h(e.locales,n);if(a)return a;let o=t.document?.documentElement.getAttribute("lang");if(!o)return null;let i=h(e.locales,o)??h(e.locales,o.split("-")[0]);if(i)return{locale:o,...i};if(e.locales&&e.strict)return null;let r=o.split("-")[1];return{language:o,country:r?.length===2?r:null,locale:o}}function ge(e,t,n){switch(e){case"saved":return t.remember===!1?null:ue(n.storage);case"server":return se(t,n);case"webflow":return de(t,n)}}function fe(e){return e?e===!0?M:e:["saved"]}function j(e=c.markets,t=ae()){let n=(e===c.markets?e:S(e))??{};if(n.detect===!1)return{};let a={},o={sources:a};for(let i of fe(n.detect)){let r=ge(i,n,t);if(!r)continue;let u=s(r.country),l=d(r.language),f=typeof r.locale=="string"&&r.locale?r.locale:null;u&&!o.country&&(o.country=u,a.country=i),l&&!o.language&&(o.language=l,a.language=i),f&&!o.locale&&(o.locale=f,a.locale=i)}return o}function $(e){if(c.markets?.remember===!1)return;let t={country:e.country,language:e.language||void 0,locale:e.locale||void 0};H(D(),JSON.stringify(t))}var me="{name} ({currency})",pe="name",p=null;function ye(){p=null}var Ce="query TetherLocalization{localization{country{isoCode name currency{isoCode symbol}}language{isoCode name}availableCountries{isoCode name currency{isoCode symbol}availableLanguages{isoCode name}}}}",q={isoCode:"string",name:"string",currency:"object"},we=T({localization:{country:q,availableCountries:[q]}});function J(){return p??(p=x(Ce,{},we).then(e=>e.localization,e=>{throw p=null,e})),p}function Y(e,t){switch(t){case"name":return e.name;case"code":return e.isoCode;case"currency":return e.currency.isoCode;case"symbol":return e.currency.symbol;default:return""}}var ke=(e,t)=>e.replace(/\{(name|code|currency|symbol)\}/g,(n,a)=>Y(t,a));function he(e,t,n){let a=e.getAttribute(m("country-label"))||me,o=(e.getAttribute(m("countries"))||"").toUpperCase().split(/[\s,]+/).filter(Boolean),i=o.length?o.map(r=>t.find(u=>u.isoCode===r)).filter(r=>r!==void 0):t;e.replaceChildren(...i.map(r=>new Option(ke(a,r),r.isoCode))),e.value=n,e.value!==n&&(e.selectedIndex=-1),e.disabled=i.length<2&&!e.hasAttribute(m("always-enabled"))}function Le(e,t,n){let a=(c.country||n.country.isoCode).toUpperCase(),o=[...n.availableCountries].sort((r,u)=>r.name.localeCompare(u.name,c.locale||void 0)),i=o.find(r=>r.isoCode===a)??n.country;e.forEach(r=>{he(r,o,a)}),t.forEach(r=>{r.textContent=Y(i,N(r,"country-bind")||pe)})}function L(e=document){let t=k(e,`select${w("country-select")}`),n=k(e,w("country-bind"));return!t.length&&!n.length?Promise.resolve():J().then(a=>{Le(t,n,a)}).catch(a=>{C(a,"country select")})}var be=e=>Object.values(c.markets?.locales??{}).find(t=>s(t.country)===e);function Me(e,t){return e!==void 0?d(e):t?t.language?d(t.language):void 0:c.language}function Se(e){P();let t=[];return g.id()&&t.push(g.setBuyerIdentity({countryCode:e},{create:!1}).catch(n=>{C(n,"cart country")})),R(),v.forEach(n=>t.push(n.load())),O.forEach(n=>{n.closest(_())||(I.delete(n),z(n))}),t}async function xe(e,{language:t,locale:n,remember:a=!0}={}){let o=s(e);if(!o)throw new E(`Not a country code: ${e}`,{code:"INVALID_COUNTRY"});let i=be(o),r=n||i?.locale,u=r||c.locale,l=Me(t,i),f=o!==c.country||l!==c.language||u!==c.locale;if(c.country=o,c.language=l||void 0,c.locale=u,a&&$({country:o,language:l,locale:r}),!f)return L(),g.state;t!==void 0&&ye();let K=Se(o);return L(),A("country-changed",{country:o,language:c.language}),await Promise.all(K),g.state}function y(e){return e!==null&&typeof e=="object"&&!Array.isArray(e)}function Te(e){return y(e)&&y(e.__core)&&y(e.__parts)}function B(e,t){let n=Reflect.get(window,"Tether");if(!Te(n))throw new Error(`tether.${e}.js runs after the Tether script, which loads it, and needs its window.Tether`);n.__parts[e]=t}B("markets",b);})();