@occluze/tether 0.7.0 → 0.7.2

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,16 +523,30 @@
     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) {
+  function graphQLFailure(res, errors, conf, code) {
     const message = errors.map((error) => error.message).filter(Boolean).join(" | ");
     let text2 = message || "Storefront API error";
     if (!res.ok) text2 = res.status === 401 || res.status === 403 || !message ? statusText(res.status, conf) : message;
-    return new TetherError(text2, { status: res.status, errors });
+    return new TetherError(text2, { status: res.status, errors, code });
+  }
+  function networkFailure(error, retry) {
+    if (retry === "any") return { kind: "retry", backoffMs: RETRY_BACKOFF_MS };
+    throw new TetherError(`Network error: ${messageOf(error)}`, { code: "NETWORK" });
+  }
+  function graphQLOutcome(res, conf, query2, errors, data, retry, operation) {
+    if (query2.includes(INVENTORY_FIELD) && errors.some((error) => error.message.includes(INVENTORY_FIELD))) {
+      return { kind: "inventory-refused", error: graphQLFailure(res, errors, conf) };
+    }
+    const codes = errors.map((error) => error.extensions?.code);
+    if (retry !== "none" && codes.includes("THROTTLED")) return { kind: "retry", backoffMs: THROTTLE_BACKOFF_MS };
+    const serverError = codes.includes("INTERNAL_SERVER_ERROR");
+    if (retry === "any" && serverError) return { kind: "retry", backoffMs: RETRY_BACKOFF_MS };
+    const unclear = res.ok && (serverError || operation === "mutation" && data == null);
+    throw graphQLFailure(res, errors, conf, unclear ? "SERVER_ERROR" : void 0);
   }
-  async function attempt(conf, query2, variables, isData, canRetry) {
+  async function attempt(conf, query2, variables, isData, retry, operation) {
     let res;
     try {
       res = await (conf.fetch ?? fetch)(endpoint(conf), {
@@ -538,53 +555,46 @@
         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);
     const { data, errors = [] } = body;
-    if (errors.length) {
-      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")) {
-        return { kind: "retry", backoffMs: THROTTLE_BACKOFF_MS };
-      }
-      throw graphQLFailure(res, errors, conf);
-    }
+    if (errors.length) return graphQLOutcome(res, conf, query2, errors, data, retry, operation);
     if (!res.ok) throw new TetherError(statusText(res.status, conf), { status: res.status });
     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 access = { inventory: !storesWithoutInventory.has(store) };
+      const sent = queryText(conf, query2, access, { context, operation });
+      const retry = retries < conf.retries ? retryWhileLeft : "none";
+      const outcome = await attempt(conf, sent, variables, isData, retry, operation);
       switch (outcome.kind) {
         case "data":
           return outcome.data;
         case "inventory-refused":
-          if (typeof query2 === "string") throw outcome.error;
+          if (typeof query2 === "string" || !access.inventory) throw outcome.error;
           log(`the token can't read inventory: ${INVENTORY_FIELD} is left out from now on`);
           storesWithoutInventory.add(store);
           break;
@@ -600,8 +610,11 @@
     return request(cfg, query2, variables, isData, options);
   }
   var hasData = (data) => typeof data === "object" && data !== null;
-  function query(text2, variables = {}, options) {
-    return gql(text2, variables, hasData, options);
+  function untypedQuery(conf, text2, variables = {}, options) {
+    return request(conf, text2, variables, hasData, { ...options, operation: operationOf(text2) });
+  }
+  function query(text2, variables, options) {
+    return untypedQuery(cfg, text2, variables, options);
   }
   function unwrap(payload, name) {
     if (!payload) throw new TetherError(`${name}: empty response`);
@@ -1354,7 +1367,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));
 
@@ -1670,6 +1686,160 @@
     return list;
   }
 
+  // src/product-render.ts
+  var NTH_IMAGE_BIND = /^image:(\d+)$/;
+  var METAFIELD_BIND = "metafield:";
+  var MULTI_LINE_METAFIELD = /^(rich_text|multi_line_text)_field$/;
+  var ALL_PLAN_GROUPS = ["", "true", "all", "*"];
+  var isSelect = (el) => el.tagName === "SELECT";
+  var selectsIn = (scope, selector) => scope.$(`select${selector}`).filter(isSelect);
+  function renderGallery(el, product) {
+    const images = product.images.nodes;
+    const rendered = [...el.children].map((node) => node.tagName === "IMG" ? node : node.querySelector("img"));
+    const same = !hasTemplate(el) && rendered.length === images.length && rendered.every((img, index) => sameImage(img?.getAttribute("src"), images[index]?.url));
+    if (same) return;
+    repeat(el, images, (node, image) => {
+      const target = node.matches(`img,${sel("bind", "image")}`) ? node : qsa(node, "img")[0] ?? node;
+      setImage(target, image.url, image.altText || product.title);
+    });
+  }
+  function renderMetafield(el, product, ref) {
+    const dot = ref.indexOf(".");
+    const namespace = ref.slice(0, dot);
+    const key = ref.slice(dot + 1);
+    const metafield = (product.metafields ?? []).find((field2) => field2?.namespace === namespace && field2.key === key);
+    if (!metafield) {
+      setText(el, "");
+      return;
+    }
+    const image = metafield.reference?.image;
+    if (image) {
+      setImage(el, image.url, image.altText);
+      return;
+    }
+    if (MULTI_LINE_METAFIELD.test(metafield.type)) el.style.whiteSpace = "pre-line";
+    setText(el, metafield.value);
+  }
+  var PRODUCT_TEXTS = new Map(
+    Object.entries({
+      title: (product) => product.title,
+      "description-text": (product) => product.description,
+      vendor: (product) => product.vendor,
+      type: (product) => product.productType,
+      handle: (product) => product.handle,
+      "published-at": (product) => formatDate(product.publishedAt),
+      "min-price": (product) => formatMoney2(product.priceRange.minVariantPrice),
+      "max-price": (product) => formatMoney2(product.priceRange.maxVariantPrice)
+    })
+  );
+  function renderTags(el, product) {
+    const exclude = (el.getAttribute("exclude") ?? "").split(",").map((tag) => tag.trim()).filter(Boolean);
+    const tags = product.tags.filter((tag) => !exclude.includes(tag));
+    repeat(el, tags, (node, tag) => {
+      setText(node, tag);
+    });
+  }
+  function renderProductBind(el, key, product) {
+    const text2 = PRODUCT_TEXTS.get(key);
+    if (text2) {
+      setText(el, text2(product));
+      return;
+    }
+    switch (key) {
+      case "description":
+        setStoreHtml(el, product.descriptionHtml);
+        break;
+      case "featured-image":
+        setImage(el, product.featuredImage?.url, product.featuredImage?.altText || product.title);
+        break;
+      case "url":
+      case "link": {
+        const url2 = productUrl2(product.handle, product.id);
+        if (url2) el.setAttribute("href", url2);
+        if (key === "url" && !el.firstElementChild && !el.textContent.trim()) setText(el, product.title);
+        break;
+      }
+      case "images":
+        renderGallery(el, product);
+        break;
+      case "tags":
+        renderTags(el, product);
+        break;
+      default:
+        renderIndexedBind(el, key, product);
+    }
+  }
+  function renderIndexedBind(el, key, product) {
+    const nth = NTH_IMAGE_BIND.exec(key);
+    if (nth) {
+      const image = product.images.nodes[Number(nth[1]) - 1] ?? product.featuredImage;
+      setImage(el, image?.url, image?.altText || product.title);
+    } else if (key.startsWith(METAFIELD_BIND)) {
+      renderMetafield(el, product, key.slice(METAFIELD_BIND.length));
+    }
+  }
+  function renderOptionLists(scope) {
+    const { product } = scope;
+    scope.$(sel("option-list")).forEach((container) => {
+      const name = scope.optName(get(container, "option-list"));
+      const option = product.options.find((candidate) => candidate.name === name);
+      if (!option || option.optionValues.length <= 1 && has(container, "hide-single")) {
+        show(container, false);
+        return;
+      }
+      repeat(container, option.optionValues, (node, value) => {
+        node.setAttribute(attr("option-value"), value.name);
+        const text2 = qsa(node, sel("bind", "option-value"))[0];
+        if (text2) setText(text2, value.name);
+        else if (!node.firstElementChild) setText(node, value.name);
+        const swatchEl = qsa(node, sel("bind", "swatch"))[0];
+        const { swatch } = value;
+        if (!swatchEl || !swatch) return;
+        if (swatch.color) swatchEl.style.backgroundColor = swatch.color;
+        if (swatch.image?.previewImage) setImage(swatchEl, swatch.image.previewImage.url, value.name);
+      });
+    });
+  }
+  function renderSelects(scope) {
+    const { product } = scope;
+    selectsIn(scope, sel("option")).forEach((select) => {
+      const option = product.options.find((candidate) => candidate.name === scope.optName(get(select, "option")));
+      if (!option) {
+        show(select, false);
+        return;
+      }
+      select.replaceChildren(...option.optionValues.map((value) => new Option(value.name, value.name)));
+    });
+    selectsIn(scope, sel("variant-select")).forEach((select) => {
+      select.replaceChildren(...product.variants.nodes.map((variant) => new Option(variant.title, variant.id)));
+    });
+    selectsIn(scope, sel("plan")).forEach((select) => {
+      const plans = scope.plans.map((plan) => new Option(plan.name, plan.id));
+      const oneTime = !product.requiresSellingPlan && get(select, "plan") !== "subscription-only";
+      const oneTimeLabel = select.getAttribute(attr("one-time-label")) || "One-time purchase";
+      select.replaceChildren(...oneTime ? [new Option(oneTimeLabel, "")] : [], ...plans);
+    });
+  }
+  function renderPlanLists(scope) {
+    scope.$(sel("plan-list")).forEach((container) => {
+      const raw = (get(container, "plan-list") ?? "").trim();
+      const group = ALL_PLAN_GROUPS.includes(raw.toLowerCase()) ? null : raw;
+      const plans = scope.plans.filter((plan) => !group || plan.group.name === group);
+      repeat(container, plans, (node, plan) => {
+        node.setAttribute(attr("plan-value"), plan.id);
+        if (!node.firstElementChild && !node.querySelector(sel("plan-bind"))) setText(node, plan.name);
+      });
+    });
+  }
+  function writeProduct(scope) {
+    scope.$(sel("bind")).forEach((el) => {
+      renderProductBind(el, get(el, "bind") ?? "", scope.product);
+    });
+    renderOptionLists(scope);
+    renderSelects(scope);
+    renderPlanLists(scope);
+  }
+
   // src/cart/render.ts
   var DEFAULT_TITLE = "Default Title";
   var quantityOf = (line, pending2) => pending2.get(line.id)?.quantity ?? line.quantity;
@@ -1771,7 +1941,8 @@
       if (value !== void 0) setTextTracked(el, value);
     });
     renderLineState(node, line, view);
-    qsa(node, `select${sel("line-plan")}`).forEach((select) => {
+    const planSelects = qsa(node, sel("line-plan")).filter(isSelect);
+    planSelects.forEach((select) => {
       getProduct(variant.product.handle).then((product) => {
         fillPlanSelect(select, line, product);
       }).catch((error) => {
@@ -1876,6 +2047,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 +2068,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 +2176,11 @@
     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) {
+    if (!(error instanceof TetherError)) return false;
+    const { code, status: status2 = 0 } = error;
+    return code === "NETWORK" || code === "INVALID_RESPONSE" || code === "SERVER_ERROR" || status2 >= 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 +2197,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 +2324,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 +2351,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 +2459,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,23 +2483,26 @@
       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"));
     },
+    /** Removes the lines the cart has when the change runs, so one queued just before it is cleared too. */
     clear() {
-      const ids = currentLines().map((line) => line.id);
-      if (!ids.length) return Promise.resolve(currentCart());
-      return Cart.removeLine(ids);
+      return runChange(async () => {
+        const ids = currentLines().map((line) => line.id);
+        if (!ids.length) return currentCart();
+        return commit(await removeLines(ids), "remove");
+      });
     },
     setNote(note) {
       const variables = { note: note ?? "" };
-      return enqueue(
+      return runChange(
         async () => commit(
           await mutateCart({
             name: "cartNoteUpdate",
@@ -2314,7 +2521,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 +2535,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 +2574,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!",
@@ -2541,170 +2748,18 @@
     return new Map(Object.entries(texts));
   }
 
-  // src/product-render.ts
-  var NTH_IMAGE_BIND = /^image:(\d+)$/;
-  var METAFIELD_BIND = "metafield:";
-  var MULTI_LINE_METAFIELD = /^(rich_text|multi_line_text)_field$/;
-  var ALL_PLAN_GROUPS = ["", "true", "all", "*"];
-  var isSelect = (el) => el.tagName === "SELECT";
-  var selectsIn = (scope, selector) => scope.$(`select${selector}`).filter(isSelect);
-  function renderGallery(el, product) {
-    const images = product.images.nodes;
-    const rendered = [...el.children].map((node) => node.tagName === "IMG" ? node : node.querySelector("img"));
-    const same = !hasTemplate(el) && rendered.length === images.length && rendered.every((img, index) => sameImage(img?.getAttribute("src"), images[index]?.url));
-    if (same) return;
-    repeat(el, images, (node, image) => {
-      const target = node.matches(`img,${sel("bind", "image")}`) ? node : qsa(node, "img")[0] ?? node;
-      setImage(target, image.url, image.altText || product.title);
-    });
-  }
-  function renderMetafield(el, product, ref) {
-    const dot = ref.indexOf(".");
-    const namespace = ref.slice(0, dot);
-    const key = ref.slice(dot + 1);
-    const metafield = (product.metafields ?? []).find((field2) => field2?.namespace === namespace && field2.key === key);
-    if (!metafield) {
-      setText(el, "");
-      return;
-    }
-    const image = metafield.reference?.image;
-    if (image) {
-      setImage(el, image.url, image.altText);
-      return;
-    }
-    if (MULTI_LINE_METAFIELD.test(metafield.type)) el.style.whiteSpace = "pre-line";
-    setText(el, metafield.value);
-  }
-  var PRODUCT_TEXTS = new Map(
-    Object.entries({
-      title: (product) => product.title,
-      "description-text": (product) => product.description,
-      vendor: (product) => product.vendor,
-      type: (product) => product.productType,
-      handle: (product) => product.handle,
-      "published-at": (product) => formatDate(product.publishedAt),
-      "min-price": (product) => formatMoney2(product.priceRange.minVariantPrice),
-      "max-price": (product) => formatMoney2(product.priceRange.maxVariantPrice)
-    })
-  );
-  function renderTags(el, product) {
-    const exclude = (el.getAttribute("exclude") ?? "").split(",").map((tag) => tag.trim()).filter(Boolean);
-    const tags = product.tags.filter((tag) => !exclude.includes(tag));
-    repeat(el, tags, (node, tag) => {
-      setText(node, tag);
-    });
-  }
-  function renderProductBind(el, key, product) {
-    const text2 = PRODUCT_TEXTS.get(key);
-    if (text2) {
-      setText(el, text2(product));
-      return;
-    }
-    switch (key) {
-      case "description":
-        setStoreHtml(el, product.descriptionHtml);
-        break;
-      case "featured-image":
-        setImage(el, product.featuredImage?.url, product.featuredImage?.altText || product.title);
-        break;
-      case "url":
-      case "link": {
-        const url2 = productUrl2(product.handle, product.id);
-        if (url2) el.setAttribute("href", url2);
-        if (key === "url" && !el.firstElementChild && !el.textContent.trim()) setText(el, product.title);
-        break;
-      }
-      case "images":
-        renderGallery(el, product);
-        break;
-      case "tags":
-        renderTags(el, product);
-        break;
-      default:
-        renderIndexedBind(el, key, product);
-    }
-  }
-  function renderIndexedBind(el, key, product) {
-    const nth = NTH_IMAGE_BIND.exec(key);
-    if (nth) {
-      const image = product.images.nodes[Number(nth[1]) - 1] ?? product.featuredImage;
-      setImage(el, image?.url, image?.altText || product.title);
-    } else if (key.startsWith(METAFIELD_BIND)) {
-      renderMetafield(el, product, key.slice(METAFIELD_BIND.length));
-    }
-  }
-  function renderOptionLists(scope) {
-    const { product } = scope;
-    scope.$(sel("option-list")).forEach((container) => {
-      const name = scope.optName(get(container, "option-list"));
-      const option = product.options.find((candidate) => candidate.name === name);
-      if (!option || option.optionValues.length <= 1 && has(container, "hide-single")) {
-        show(container, false);
-        return;
-      }
-      repeat(container, option.optionValues, (node, value) => {
-        node.setAttribute(attr("option-value"), value.name);
-        const text2 = qsa(node, sel("bind", "option-value"))[0];
-        if (text2) setText(text2, value.name);
-        else if (!node.firstElementChild) setText(node, value.name);
-        const swatchEl = qsa(node, sel("bind", "swatch"))[0];
-        const { swatch } = value;
-        if (!swatchEl || !swatch) return;
-        if (swatch.color) swatchEl.style.backgroundColor = swatch.color;
-        if (swatch.image?.previewImage) setImage(swatchEl, swatch.image.previewImage.url, value.name);
-      });
-    });
-  }
-  function renderSelects(scope) {
-    const { product } = scope;
-    selectsIn(scope, sel("option")).forEach((select) => {
-      const option = product.options.find((candidate) => candidate.name === scope.optName(get(select, "option")));
-      if (!option) {
-        show(select, false);
-        return;
-      }
-      select.replaceChildren(...option.optionValues.map((value) => new Option(value.name, value.name)));
-    });
-    selectsIn(scope, sel("variant-select")).forEach((select) => {
-      select.replaceChildren(...product.variants.nodes.map((variant) => new Option(variant.title, variant.id)));
-    });
-    selectsIn(scope, sel("plan")).forEach((select) => {
-      const plans = scope.plans.map((plan) => new Option(plan.name, plan.id));
-      const oneTime = !product.requiresSellingPlan && get(select, "plan") !== "subscription-only";
-      const oneTimeLabel = select.getAttribute(attr("one-time-label")) || "One-time purchase";
-      select.replaceChildren(...oneTime ? [new Option(oneTimeLabel, "")] : [], ...plans);
-    });
-  }
-  function renderPlanLists(scope) {
-    scope.$(sel("plan-list")).forEach((container) => {
-      const raw = (get(container, "plan-list") ?? "").trim();
-      const group = ALL_PLAN_GROUPS.includes(raw.toLowerCase()) ? null : raw;
-      const plans = scope.plans.filter((plan) => !group || plan.group.name === group);
-      repeat(container, plans, (node, plan) => {
-        node.setAttribute(attr("plan-value"), plan.id);
-        if (!node.firstElementChild && !node.querySelector(sel("plan-bind"))) setText(node, plan.name);
-      });
-    });
-  }
-  function writeProduct(scope) {
-    scope.$(sel("bind")).forEach((el) => {
-      renderProductBind(el, get(el, "bind") ?? "", scope.product);
-    });
-    renderOptionLists(scope);
-    renderSelects(scope);
-    renderPlanLists(scope);
-  }
-
-  // src/status.ts
-  var URL_SOURCE = "url:";
-  function decodePathSegment(segment) {
+  // src/uri.ts
+  function decodeOrKeep(text2) {
     try {
-      return decodeURIComponent(segment);
+      return decodeURIComponent(text2);
     } catch (error) {
-      if (error instanceof URIError) return segment;
+      if (error instanceof URIError) return text2;
       throw error;
     }
   }
+
+  // src/status.ts
+  var URL_SOURCE = "url:";
   function resolveProductKey(el, location2 = window.location, name = "product") {
     const raw = (get(el, name) ?? "").trim();
     if (!raw.toLowerCase().startsWith(URL_SOURCE)) return { key: raw || null, fromUrl: false, raw };
@@ -2713,7 +2768,7 @@
     if (source.toLowerCase() === "path") {
       const segments = location2.pathname.split("/").filter(Boolean);
       const segment = segments[segments.length - 1];
-      key = segment === void 0 ? null : decodePathSegment(segment);
+      key = segment === void 0 ? null : decodeOrKeep(segment);
     } else {
       key = new URLSearchParams(location2.search).get(source || "handle");
     }
@@ -3447,8 +3502,92 @@
     });
   }
 
+  // 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
+    };
+  }
+  var parseSavedMarket = (text2) => toMarket(parseJsonOrNull(text2));
+  function readSavedMarket(storage = pageStorage) {
+    const text2 = storage.getItem(storageKey());
+    return text2 ? parseSavedMarket(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-exWttcEw4tQTiJ4OU0r/Y+0T5vVIYIo3kcmieqDPkUUmJQGr2HZzWxZCOmMhsvaY", "tether.markets.js": "sha384-hn9741hCQun49mIj7A2bazMG2wXxTpMDScOQK+8wMeY6KT1p+ovXcKDi3m6BK04C", "tether.search.js": "sha384-ZrByfRsWNOHbbWOocY4WOD2RWe4QI2qQRZ4Eb+fM5v/UHIQ8mlWxbSwrxJt8yLbc", "tether.extras.js": "sha384-lt7I8DOnCx8wwVHQM4ZT39+Jlv95WVED5eVDezUKchNXo4+j1oBXYtxzPFiPyxgm", "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 +3643,9 @@
     get "market-codes.ts"() {
       return [toCountry, toLanguage];
     },
+    get "page-market.ts"() {
+      return [setCountry];
+    },
     get "shopify-values.ts"() {
       return [isHttpsUrl];
     },
@@ -3533,14 +3675,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 +3717,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 +4016,7 @@
   }
 
   // src/index.ts
-  var VERSION = "0.7.0";
+  var VERSION = "0.7.2";
   var OBSERVE_DEBOUNCE_MS = 50;
   function pageConfig() {
     const config = pageGlobal("TETHER_CONFIG");