@zappie/sdk 0.1.6 → 0.1.8

package/dist/server/storefront-url/build-v1.js

@@ -21,20 +21,12 @@ var routePathV1 = (route, options = {}) => {
       return `/order/${encode(route.business)}${route.branch ? `/${encode(route.branch)}` : ""}/pages/${encode(route.slug)}`;
     case "dine-in":
       return `/dine-in/${encode(route.order)}`;
-    case "dine-in-menus":
-      return "/dine-in/menus";
-    case "self-service-menus":
-      return "/self-service/menus";
     case "pay-point":
       return `/pay-point/${encode(route.payPoint)}`;
     case "beacon":
       return `/beacons/${encode(route.beacon)}`;
     case "link":
       return `/links/${encode(route.link)}`;
-    case "collect-payment":
-      return "/collect-payment";
-    case "reservation":
-      return "/reservation";
     case "pay-session":
       return `/pay/${encode(route.session)}`;
     case "payment-step":
@@ -47,6 +39,13 @@ var routePathV1 = (route, options = {}) => {
       return route.home ? "/" : "/explore";
     case "unknown":
       return route.pathname || "/";
+    case "dine-in-menus":
+      return "/dine-in/menus";
+    case "self-service-menus":
+      return "/self-service/menus";
+    case "collect-payment":
+    case "reservation":
+      return `/${route.type}`;
   }
 };
 var buildV1 = (route, options = {}) => {
@@ -58,15 +57,7 @@ var buildV1 = (route, options = {}) => {
     options.installation
   );
   const query = v1Params(route).toString();
-  const value = `${pathname}${query ? `?${query}` : ""}`;
-  if (!options.origin) {
-    return value;
-  }
-  try {
-    return new URL(value, options.origin).toString();
-  } catch {
-    return value;
-  }
+  return `${pathname}${query ? `?${query}` : ""}`;
 };
 export {
   buildV1,

package/dist/server/storefront-url/build-v1.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/server/storefront-url/build-v1.ts"],
-  "sourcesContent": ["import { menuRoute } from \"./contract\";\nimport { publicInstallationPath } from \"./installation\";\nimport { v1Params } from \"./params\";\nimport { type StorefrontRoute, type StorefrontUrlOptions } from \"./types\";\nimport { encode } from \"./url\";\n\nexport const routePathV1 = (\n  route: StorefrontRoute,\n  options: StorefrontUrlOptions = {},\n): string => {\n  switch (route.type) {\n    case \"order-menu\":\n      return `/order/${encode(route.business)}${route.branch ? `/${encode(route.branch)}` : \"\"}${route.cataloguePath ? \"/products\" : \"\"}`;\n    case \"item\": {\n      const branch = route.branch ?? options.installation?.defaultBranch;\n      return branch\n        ? `/order/${encode(route.business)}/${encode(branch)}/products/${encode(route.item)}`\n        : `/order/${encode(route.business)}`;\n    }\n    case \"cart\":\n    case \"checkout\":\n    case \"checkout-return\":\n    case \"sign-in\":\n      return routePathV1(menuRoute(route), options);\n    case \"content-page\":\n      return `/order/${encode(route.business)}${route.branch ? `/${encode(route.branch)}` : \"\"}/pages/${encode(route.slug)}`;\n    case \"dine-in\":\n      return `/dine-in/${encode(route.order)}`;\n    case \"dine-in-menus\":\n      return \"/dine-in/menus\";\n    case \"self-service-menus\":\n      return \"/self-service/menus\";\n    case \"pay-point\":\n      return `/pay-point/${encode(route.payPoint)}`;\n    case \"beacon\":\n      return `/beacons/${encode(route.beacon)}`;\n    case \"link\":\n      return `/links/${encode(route.link)}`;\n    case \"collect-payment\":\n      return \"/collect-payment\";\n    case \"reservation\":\n      return \"/reservation\";\n    case \"pay-session\":\n      return `/pay/${encode(route.session)}`;\n    case \"payment-step\":\n      return `/payment/${encode(route.payment)}${route.step === \"payment\" ? \"\" : `/${route.step}`}`;\n    case \"payment-card\":\n      return `/payment/card/${encode(route.transaction)}`;\n    case \"profile\":\n      return `/profile/${route.page}${route.order ? `/${encode(route.order)}` : \"\"}`;\n    case \"explore\":\n      return route.home ? \"/\" : \"/explore\";\n    case \"unknown\":\n      return route.pathname || \"/\";\n  }\n};\n\nexport const buildV1 = (\n  route: StorefrontRoute,\n  options: StorefrontUrlOptions = {},\n) => {\n  const internal = routePathV1(route, options);\n  const publicRoute =\n    route.type === \"item\" &&\n    route.branch === undefined &&\n    options.installation?.defaultBranch\n      ? { ...route, branch: options.installation.defaultBranch }\n      : route;\n  const pathname = publicInstallationPath(\n    internal,\n    publicRoute,\n    options.installation,\n  );\n  const query = v1Params(route).toString();\n  const value = `${pathname}${query ? `?${query}` : \"\"}`;\n  if (!options.origin) {\n    return value;\n  }\n  try {\n    return new URL(value, options.origin).toString();\n  } catch {\n    return value;\n  }\n};\n"],
-  "mappings": ";AAAA,SAAS,iBAAiB;AAC1B,SAAS,8BAA8B;AACvC,SAAS,gBAAgB;AACzB,OAAgE;AAChE,SAAS,cAAc;AAEhB,IAAM,cAAc,CACzB,OACA,UAAgC,CAAC,MACtB;AACX,UAAQ,MAAM,MAAM;AAAA,IAClB,KAAK;AACH,aAAO,UAAU,OAAO,MAAM,QAAQ,CAAC,GAAG,MAAM,SAAS,IAAI,OAAO,MAAM,MAAM,CAAC,KAAK,EAAE,GAAG,MAAM,gBAAgB,cAAc,EAAE;AAAA,IACnI,KAAK,QAAQ;AACX,YAAM,SAAS,MAAM,UAAU,QAAQ,cAAc;AACrD,aAAO,SACH,UAAU,OAAO,MAAM,QAAQ,CAAC,IAAI,OAAO,MAAM,CAAC,aAAa,OAAO,MAAM,IAAI,CAAC,KACjF,UAAU,OAAO,MAAM,QAAQ,CAAC;AAAA,IACtC;AAAA,IACA,KAAK;AAAA,IACL,KAAK;AAAA,IACL,KAAK;AAAA,IACL,KAAK;AACH,aAAO,YAAY,UAAU,KAAK,GAAG,OAAO;AAAA,IAC9C,KAAK;AACH,aAAO,UAAU,OAAO,MAAM,QAAQ,CAAC,GAAG,MAAM,SAAS,IAAI,OAAO,MAAM,MAAM,CAAC,KAAK,EAAE,UAAU,OAAO,MAAM,IAAI,CAAC;AAAA,IACtH,KAAK;AACH,aAAO,YAAY,OAAO,MAAM,KAAK,CAAC;AAAA,IACxC,KAAK;AACH,aAAO;AAAA,IACT,KAAK;AACH,aAAO;AAAA,IACT,KAAK;AACH,aAAO,cAAc,OAAO,MAAM,QAAQ,CAAC;AAAA,IAC7C,KAAK;AACH,aAAO,YAAY,OAAO,MAAM,MAAM,CAAC;AAAA,IACzC,KAAK;AACH,aAAO,UAAU,OAAO,MAAM,IAAI,CAAC;AAAA,IACrC,KAAK;AACH,aAAO;AAAA,IACT,KAAK;AACH,aAAO;AAAA,IACT,KAAK;AACH,aAAO,QAAQ,OAAO,MAAM,OAAO,CAAC;AAAA,IACtC,KAAK;AACH,aAAO,YAAY,OAAO,MAAM,OAAO,CAAC,GAAG,MAAM,SAAS,YAAY,KAAK,IAAI,MAAM,IAAI,EAAE;AAAA,IAC7F,KAAK;AACH,aAAO,iBAAiB,OAAO,MAAM,WAAW,CAAC;AAAA,IACnD,KAAK;AACH,aAAO,YAAY,MAAM,IAAI,GAAG,MAAM,QAAQ,IAAI,OAAO,MAAM,KAAK,CAAC,KAAK,EAAE;AAAA,IAC9E,KAAK;AACH,aAAO,MAAM,OAAO,MAAM;AAAA,IAC5B,KAAK;AACH,aAAO,MAAM,YAAY;AAAA,EAC7B;AACF;AAEO,IAAM,UAAU,CACrB,OACA,UAAgC,CAAC,MAC9B;AACH,QAAM,WAAW,YAAY,OAAO,OAAO;AAC3C,QAAM,cACJ,MAAM,SAAS,UACf,MAAM,WAAW,UACjB,QAAQ,cAAc,gBAClB,EAAE,GAAG,OAAO,QAAQ,QAAQ,aAAa,cAAc,IACvD;AACN,QAAM,WAAW;AAAA,IACf;AAAA,IACA;AAAA,IACA,QAAQ;AAAA,EACV;AACA,QAAM,QAAQ,SAAS,KAAK,EAAE,SAAS;AACvC,QAAM,QAAQ,GAAG,QAAQ,GAAG,QAAQ,IAAI,KAAK,KAAK,EAAE;AACpD,MAAI,CAAC,QAAQ,QAAQ;AACnB,WAAO;AAAA,EACT;AACA,MAAI;AACF,WAAO,IAAI,IAAI,OAAO,QAAQ,MAAM,EAAE,SAAS;AAAA,EACjD,QAAQ;AACN,WAAO;AAAA,EACT;AACF;",
+  "sourcesContent": ["import { menuRoute } from \"./contract\";\nimport { publicInstallationPath } from \"./installation\";\nimport { v1Params } from \"./params\";\nimport { type StorefrontRoute, type StorefrontUrlOptions } from \"./types\";\nimport { encode } from \"./url\";\n\nexport const routePathV1 = (\n  route: StorefrontRoute,\n  options: StorefrontUrlOptions = {},\n): string => {\n  switch (route.type) {\n    case \"order-menu\":\n      return `/order/${encode(route.business)}${route.branch ? `/${encode(route.branch)}` : \"\"}${route.cataloguePath ? \"/products\" : \"\"}`;\n    case \"item\": {\n      const branch = route.branch ?? options.installation?.defaultBranch;\n      return branch\n        ? `/order/${encode(route.business)}/${encode(branch)}/products/${encode(route.item)}`\n        : `/order/${encode(route.business)}`;\n    }\n    case \"cart\":\n    case \"checkout\":\n    case \"checkout-return\":\n    case \"sign-in\":\n      return routePathV1(menuRoute(route), options);\n    case \"content-page\":\n      return `/order/${encode(route.business)}${route.branch ? `/${encode(route.branch)}` : \"\"}/pages/${encode(route.slug)}`;\n    case \"dine-in\":\n      return `/dine-in/${encode(route.order)}`;\n    case \"pay-point\":\n      return `/pay-point/${encode(route.payPoint)}`;\n    case \"beacon\":\n      return `/beacons/${encode(route.beacon)}`;\n    case \"link\":\n      return `/links/${encode(route.link)}`;\n    case \"pay-session\":\n      return `/pay/${encode(route.session)}`;\n    case \"payment-step\":\n      return `/payment/${encode(route.payment)}${route.step === \"payment\" ? \"\" : `/${route.step}`}`;\n    case \"payment-card\":\n      return `/payment/card/${encode(route.transaction)}`;\n    case \"profile\":\n      return `/profile/${route.page}${route.order ? `/${encode(route.order)}` : \"\"}`;\n    case \"explore\":\n      return route.home ? \"/\" : \"/explore\";\n    case \"unknown\":\n      return route.pathname || \"/\";\n    case \"dine-in-menus\":\n      return \"/dine-in/menus\";\n    case \"self-service-menus\":\n      return \"/self-service/menus\";\n    case \"collect-payment\":\n    case \"reservation\":\n      return `/${route.type}`;\n  }\n};\n\nexport const buildV1 = (\n  route: StorefrontRoute,\n  options: StorefrontUrlOptions = {},\n) => {\n  const internal = routePathV1(route, options);\n  const publicRoute =\n    route.type === \"item\" &&\n    route.branch === undefined &&\n    options.installation?.defaultBranch\n      ? { ...route, branch: options.installation.defaultBranch }\n      : route;\n  const pathname = publicInstallationPath(\n    internal,\n    publicRoute,\n    options.installation,\n  );\n  const query = v1Params(route).toString();\n  return `${pathname}${query ? `?${query}` : \"\"}`;\n};\n"],
+  "mappings": ";AAAA,SAAS,iBAAiB;AAC1B,SAAS,8BAA8B;AACvC,SAAS,gBAAgB;AACzB,OAAgE;AAChE,SAAS,cAAc;AAEhB,IAAM,cAAc,CACzB,OACA,UAAgC,CAAC,MACtB;AACX,UAAQ,MAAM,MAAM;AAAA,IAClB,KAAK;AACH,aAAO,UAAU,OAAO,MAAM,QAAQ,CAAC,GAAG,MAAM,SAAS,IAAI,OAAO,MAAM,MAAM,CAAC,KAAK,EAAE,GAAG,MAAM,gBAAgB,cAAc,EAAE;AAAA,IACnI,KAAK,QAAQ;AACX,YAAM,SAAS,MAAM,UAAU,QAAQ,cAAc;AACrD,aAAO,SACH,UAAU,OAAO,MAAM,QAAQ,CAAC,IAAI,OAAO,MAAM,CAAC,aAAa,OAAO,MAAM,IAAI,CAAC,KACjF,UAAU,OAAO,MAAM,QAAQ,CAAC;AAAA,IACtC;AAAA,IACA,KAAK;AAAA,IACL,KAAK;AAAA,IACL,KAAK;AAAA,IACL,KAAK;AACH,aAAO,YAAY,UAAU,KAAK,GAAG,OAAO;AAAA,IAC9C,KAAK;AACH,aAAO,UAAU,OAAO,MAAM,QAAQ,CAAC,GAAG,MAAM,SAAS,IAAI,OAAO,MAAM,MAAM,CAAC,KAAK,EAAE,UAAU,OAAO,MAAM,IAAI,CAAC;AAAA,IACtH,KAAK;AACH,aAAO,YAAY,OAAO,MAAM,KAAK,CAAC;AAAA,IACxC,KAAK;AACH,aAAO,cAAc,OAAO,MAAM,QAAQ,CAAC;AAAA,IAC7C,KAAK;AACH,aAAO,YAAY,OAAO,MAAM,MAAM,CAAC;AAAA,IACzC,KAAK;AACH,aAAO,UAAU,OAAO,MAAM,IAAI,CAAC;AAAA,IACrC,KAAK;AACH,aAAO,QAAQ,OAAO,MAAM,OAAO,CAAC;AAAA,IACtC,KAAK;AACH,aAAO,YAAY,OAAO,MAAM,OAAO,CAAC,GAAG,MAAM,SAAS,YAAY,KAAK,IAAI,MAAM,IAAI,EAAE;AAAA,IAC7F,KAAK;AACH,aAAO,iBAAiB,OAAO,MAAM,WAAW,CAAC;AAAA,IACnD,KAAK;AACH,aAAO,YAAY,MAAM,IAAI,GAAG,MAAM,QAAQ,IAAI,OAAO,MAAM,KAAK,CAAC,KAAK,EAAE;AAAA,IAC9E,KAAK;AACH,aAAO,MAAM,OAAO,MAAM;AAAA,IAC5B,KAAK;AACH,aAAO,MAAM,YAAY;AAAA,IAC3B,KAAK;AACH,aAAO;AAAA,IACT,KAAK;AACH,aAAO;AAAA,IACT,KAAK;AAAA,IACL,KAAK;AACH,aAAO,IAAI,MAAM,IAAI;AAAA,EACzB;AACF;AAEO,IAAM,UAAU,CACrB,OACA,UAAgC,CAAC,MAC9B;AACH,QAAM,WAAW,YAAY,OAAO,OAAO;AAC3C,QAAM,cACJ,MAAM,SAAS,UACf,MAAM,WAAW,UACjB,QAAQ,cAAc,gBAClB,EAAE,GAAG,OAAO,QAAQ,QAAQ,aAAa,cAAc,IACvD;AACN,QAAM,WAAW;AAAA,IACf;AAAA,IACA;AAAA,IACA,QAAQ;AAAA,EACV;AACA,QAAM,QAAQ,SAAS,KAAK,EAAE,SAAS;AACvC,SAAO,GAAG,QAAQ,GAAG,QAAQ,IAAI,KAAK,KAAK,EAAE;AAC/C;",
   "names": []
 }

package/dist/server/storefront-url/build-v2.js

@@ -1,39 +1,12 @@
 // src/server/storefront-url/build-v2.ts
-import { routePathV1 } from "./build-v1.js";
-import { CART_MODAL, CHECKOUT_MODAL, SIGN_IN_MODALS } from "./contract.js";
+import { buildV1 } from "./build-v1.js";
+import { canonicalRoute } from "./canonical.js";
 import { v2Params } from "./params.js";
-import { signInFromOverlay } from "./sign-in.js";
-import { encode, ITEM_MODAL_PREFIX } from "./url.js";
-var canonicalRoute = (route, installation) => {
-  if (route.type !== "order-menu") {
-    return route;
-  }
-  const common = {
-    business: route.business,
-    ...route.branch !== void 0 ? { branch: route.branch } : {},
-    state: route.state
-  };
-  if (route.state.authModalId && SIGN_IN_MODALS.has(route.state.authModalId)) {
-    return signInFromOverlay(route, installation);
-  }
-  if (route.state.modalId?.startsWith(ITEM_MODAL_PREFIX)) {
-    return {
-      type: "item",
-      ...common,
-      item: route.state.modalId.slice(ITEM_MODAL_PREFIX.length)
-    };
-  }
-  if (route.state.modalId === CART_MODAL) {
-    return { type: "cart", ...common };
-  }
-  if (route.state.modalId === CHECKOUT_MODAL) {
-    return { type: "checkout", ...common };
-  }
-  return route;
-};
+import { categoryHash, publicId } from "./public-id.js";
+import { encode } from "./url.js";
 var profilePath = (route) => {
   if (route.page === "orders") {
-    return `/orders${route.order ? `/${encode(route.order)}` : ""}`;
+    return `/orders${route.order ? `/${encode(publicId(route.order, "ord"))}` : ""}`;
   }
   if (route.page === "edit") {
     return "/account";
@@ -41,12 +14,12 @@ var profilePath = (route) => {
   const page = route.page === "add-store-credit" ? "store-credit" : route.page;
   return `/account/${page}`;
 };
-var routePathV2 = (route, options) => {
+var routePathV2 = (route) => {
   switch (route.type) {
     case "order-menu":
       return "/";
     case "item":
-      return `/item/${encode(route.item)}`;
+      return `/item/${encode(publicId(route.item, "item"))}`;
     case "cart":
       return "/cart";
     case "checkout":
@@ -59,19 +32,18 @@ var routePathV2 = (route, options) => {
       return `/pages/${encode(route.slug)}`;
     case "profile":
       return profilePath(route);
-    default:
-      return routePathV1(route, options);
   }
 };
 var buildV2 = (route, options) => {
   const installation = options.installation;
-  if (!installation) {
-    return "";
-  }
   const canonical = canonicalRoute(route, installation);
-  const pathname = routePathV2(canonical, options);
+  if (!("business" in canonical) && canonical.type !== "profile") {
+    return buildV1(canonical, options);
+  }
+  const pathname = routePathV2(canonical);
   const query = v2Params(canonical, installation).toString();
-  return `${pathname}${query ? `?${query}` : ""}`;
+  const hash = categoryHash(canonical.state.categoryId);
+  return `${pathname}${query ? `?${query}` : ""}${hash}`;
 };
 export {
   buildV2

package/dist/server/storefront-url/build-v2.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/server/storefront-url/build-v2.ts"],
-  "sourcesContent": ["import { routePathV1 } from \"./build-v1\";\nimport { CART_MODAL, CHECKOUT_MODAL, SIGN_IN_MODALS } from \"./contract\";\nimport { v2Params } from \"./params\";\nimport { signInFromOverlay } from \"./sign-in\";\nimport type {\n  StorefrontInstallation,\n  StorefrontRoute,\n  StorefrontUrlOptions,\n} from \"./types\";\nimport { encode, ITEM_MODAL_PREFIX } from \"./url\";\n\nconst canonicalRoute = (\n  route: StorefrontRoute,\n  installation: StorefrontInstallation,\n): StorefrontRoute => {\n  if (route.type !== \"order-menu\") {\n    return route;\n  }\n  const common = {\n    business: route.business,\n    ...(route.branch !== undefined ? { branch: route.branch } : {}),\n    state: route.state,\n  };\n  if (route.state.authModalId && SIGN_IN_MODALS.has(route.state.authModalId)) {\n    return signInFromOverlay(route, installation);\n  }\n  if (route.state.modalId?.startsWith(ITEM_MODAL_PREFIX)) {\n    return {\n      type: \"item\",\n      ...common,\n      item: route.state.modalId.slice(ITEM_MODAL_PREFIX.length),\n    };\n  }\n  if (route.state.modalId === CART_MODAL) {\n    return { type: \"cart\", ...common };\n  }\n  if (route.state.modalId === CHECKOUT_MODAL) {\n    return { type: \"checkout\", ...common };\n  }\n  return route;\n};\n\nconst profilePath = (route: Extract<StorefrontRoute, { type: \"profile\" }>) => {\n  if (route.page === \"orders\") {\n    return `/orders${route.order ? `/${encode(route.order)}` : \"\"}`;\n  }\n  if (route.page === \"edit\") {\n    return \"/account\";\n  }\n  const page = route.page === \"add-store-credit\" ? \"store-credit\" : route.page;\n  return `/account/${page}`;\n};\n\nconst routePathV2 = (route: StorefrontRoute, options: StorefrontUrlOptions) => {\n  switch (route.type) {\n    case \"order-menu\":\n      return \"/\";\n    case \"item\":\n      return `/item/${encode(route.item)}`;\n    case \"cart\":\n      return \"/cart\";\n    case \"checkout\":\n      return \"/checkout\";\n    case \"checkout-return\":\n      return \"/checkout/return\";\n    case \"sign-in\":\n      return \"/sign-in\";\n    case \"content-page\":\n      return `/pages/${encode(route.slug)}`;\n    case \"profile\":\n      return profilePath(route);\n    default:\n      return routePathV1(route, options);\n  }\n};\n\nexport const buildV2 = (\n  route: StorefrontRoute,\n  options: StorefrontUrlOptions,\n) => {\n  const installation = options.installation;\n  if (!installation) {\n    return \"\";\n  }\n  const canonical = canonicalRoute(route, installation);\n  const pathname = routePathV2(canonical, options);\n  const query = v2Params(canonical, installation).toString();\n  return `${pathname}${query ? `?${query}` : \"\"}`;\n};\n"],
-  "mappings": ";AAAA,SAAS,mBAAmB;AAC5B,SAAS,YAAY,gBAAgB,sBAAsB;AAC3D,SAAS,gBAAgB;AACzB,SAAS,yBAAyB;AAMlC,SAAS,QAAQ,yBAAyB;AAE1C,IAAM,iBAAiB,CACrB,OACA,iBACoB;AACpB,MAAI,MAAM,SAAS,cAAc;AAC/B,WAAO;AAAA,EACT;AACA,QAAM,SAAS;AAAA,IACb,UAAU,MAAM;AAAA,IAChB,GAAI,MAAM,WAAW,SAAY,EAAE,QAAQ,MAAM,OAAO,IAAI,CAAC;AAAA,IAC7D,OAAO,MAAM;AAAA,EACf;AACA,MAAI,MAAM,MAAM,eAAe,eAAe,IAAI,MAAM,MAAM,WAAW,GAAG;AAC1E,WAAO,kBAAkB,OAAO,YAAY;AAAA,EAC9C;AACA,MAAI,MAAM,MAAM,SAAS,WAAW,iBAAiB,GAAG;AACtD,WAAO;AAAA,MACL,MAAM;AAAA,MACN,GAAG;AAAA,MACH,MAAM,MAAM,MAAM,QAAQ,MAAM,kBAAkB,MAAM;AAAA,IAC1D;AAAA,EACF;AACA,MAAI,MAAM,MAAM,YAAY,YAAY;AACtC,WAAO,EAAE,MAAM,QAAQ,GAAG,OAAO;AAAA,EACnC;AACA,MAAI,MAAM,MAAM,YAAY,gBAAgB;AAC1C,WAAO,EAAE,MAAM,YAAY,GAAG,OAAO;AAAA,EACvC;AACA,SAAO;AACT;AAEA,IAAM,cAAc,CAAC,UAAyD;AAC5E,MAAI,MAAM,SAAS,UAAU;AAC3B,WAAO,UAAU,MAAM,QAAQ,IAAI,OAAO,MAAM,KAAK,CAAC,KAAK,EAAE;AAAA,EAC/D;AACA,MAAI,MAAM,SAAS,QAAQ;AACzB,WAAO;AAAA,EACT;AACA,QAAM,OAAO,MAAM,SAAS,qBAAqB,iBAAiB,MAAM;AACxE,SAAO,YAAY,IAAI;AACzB;AAEA,IAAM,cAAc,CAAC,OAAwB,YAAkC;AAC7E,UAAQ,MAAM,MAAM;AAAA,IAClB,KAAK;AACH,aAAO;AAAA,IACT,KAAK;AACH,aAAO,SAAS,OAAO,MAAM,IAAI,CAAC;AAAA,IACpC,KAAK;AACH,aAAO;AAAA,IACT,KAAK;AACH,aAAO;AAAA,IACT,KAAK;AACH,aAAO;AAAA,IACT,KAAK;AACH,aAAO;AAAA,IACT,KAAK;AACH,aAAO,UAAU,OAAO,MAAM,IAAI,CAAC;AAAA,IACrC,KAAK;AACH,aAAO,YAAY,KAAK;AAAA,IAC1B;AACE,aAAO,YAAY,OAAO,OAAO;AAAA,EACrC;AACF;AAEO,IAAM,UAAU,CACrB,OACA,YACG;AACH,QAAM,eAAe,QAAQ;AAC7B,MAAI,CAAC,cAAc;AACjB,WAAO;AAAA,EACT;AACA,QAAM,YAAY,eAAe,OAAO,YAAY;AACpD,QAAM,WAAW,YAAY,WAAW,OAAO;AAC/C,QAAM,QAAQ,SAAS,WAAW,YAAY,EAAE,SAAS;AACzD,SAAO,GAAG,QAAQ,GAAG,QAAQ,IAAI,KAAK,KAAK,EAAE;AAC/C;",
+  "sourcesContent": ["import { buildV1 } from \"./build-v1\";\nimport { canonicalRoute } from \"./canonical\";\nimport { v2Params } from \"./params\";\nimport { categoryHash, publicId } from \"./public-id\";\nimport type {\n  StorefrontInstallation,\n  StorefrontRoute,\n  StorefrontUrlOptions,\n} from \"./types\";\nimport { encode } from \"./url\";\n\nconst profilePath = (route: Extract<StorefrontRoute, { type: \"profile\" }>) => {\n  if (route.page === \"orders\") {\n    return `/orders${route.order ? `/${encode(publicId(route.order, \"ord\"))}` : \"\"}`;\n  }\n  if (route.page === \"edit\") {\n    return \"/account\";\n  }\n  const page = route.page === \"add-store-credit\" ? \"store-credit\" : route.page;\n  return `/account/${page}`;\n};\n\nconst routePathV2 = (\n  route: Extract<StorefrontRoute, { business: string } | { type: \"profile\" }>,\n) => {\n  switch (route.type) {\n    case \"order-menu\":\n      return \"/\";\n    case \"item\":\n      return `/item/${encode(publicId(route.item, \"item\"))}`;\n    case \"cart\":\n      return \"/cart\";\n    case \"checkout\":\n      return \"/checkout\";\n    case \"checkout-return\":\n      return \"/checkout/return\";\n    case \"sign-in\":\n      return \"/sign-in\";\n    case \"content-page\":\n      return `/pages/${encode(route.slug)}`;\n    case \"profile\":\n      return profilePath(route);\n  }\n};\n\nexport const buildV2 = (\n  route: StorefrontRoute,\n  options: StorefrontUrlOptions & { installation: StorefrontInstallation },\n) => {\n  const installation = options.installation;\n  const canonical = canonicalRoute(route, installation);\n  if (!(\"business\" in canonical) && canonical.type !== \"profile\") {\n    return buildV1(canonical, options);\n  }\n  const pathname = routePathV2(canonical);\n  const query = v2Params(canonical, installation).toString();\n  const hash = categoryHash(canonical.state.categoryId);\n  return `${pathname}${query ? `?${query}` : \"\"}${hash}`;\n};\n"],
+  "mappings": ";AAAA,SAAS,eAAe;AACxB,SAAS,sBAAsB;AAC/B,SAAS,gBAAgB;AACzB,SAAS,cAAc,gBAAgB;AAMvC,SAAS,cAAc;AAEvB,IAAM,cAAc,CAAC,UAAyD;AAC5E,MAAI,MAAM,SAAS,UAAU;AAC3B,WAAO,UAAU,MAAM,QAAQ,IAAI,OAAO,SAAS,MAAM,OAAO,KAAK,CAAC,CAAC,KAAK,EAAE;AAAA,EAChF;AACA,MAAI,MAAM,SAAS,QAAQ;AACzB,WAAO;AAAA,EACT;AACA,QAAM,OAAO,MAAM,SAAS,qBAAqB,iBAAiB,MAAM;AACxE,SAAO,YAAY,IAAI;AACzB;AAEA,IAAM,cAAc,CAClB,UACG;AACH,UAAQ,MAAM,MAAM;AAAA,IAClB,KAAK;AACH,aAAO;AAAA,IACT,KAAK;AACH,aAAO,SAAS,OAAO,SAAS,MAAM,MAAM,MAAM,CAAC,CAAC;AAAA,IACtD,KAAK;AACH,aAAO;AAAA,IACT,KAAK;AACH,aAAO;AAAA,IACT,KAAK;AACH,aAAO;AAAA,IACT,KAAK;AACH,aAAO;AAAA,IACT,KAAK;AACH,aAAO,UAAU,OAAO,MAAM,IAAI,CAAC;AAAA,IACrC,KAAK;AACH,aAAO,YAAY,KAAK;AAAA,EAC5B;AACF;AAEO,IAAM,UAAU,CACrB,OACA,YACG;AACH,QAAM,eAAe,QAAQ;AAC7B,QAAM,YAAY,eAAe,OAAO,YAAY;AACpD,MAAI,EAAE,cAAc,cAAc,UAAU,SAAS,WAAW;AAC9D,WAAO,QAAQ,WAAW,OAAO;AAAA,EACnC;AACA,QAAM,WAAW,YAAY,SAAS;AACtC,QAAM,QAAQ,SAAS,WAAW,YAAY,EAAE,SAAS;AACzD,QAAM,OAAO,aAAa,UAAU,MAAM,UAAU;AACpD,SAAO,GAAG,QAAQ,GAAG,QAAQ,IAAI,KAAK,KAAK,EAAE,GAAG,IAAI;AACtD;",
   "names": []
 }

package/dist/server/storefront-url/canonical.js

@@ -0,0 +1,36 @@
+// src/server/storefront-url/canonical.ts
+import { CART_MODAL, CHECKOUT_MODAL, SIGN_IN_MODALS } from "./contract.js";
+import { signInFromOverlay } from "./sign-in.js";
+import { ITEM_MODAL_PREFIX } from "./url.js";
+var canonicalRoute = (route, installation) => {
+  if (route.type !== "order-menu") {
+    return route;
+  }
+  const { authModalId, modalId } = route.state;
+  if (authModalId && SIGN_IN_MODALS.includes(authModalId)) {
+    return signInFromOverlay(route, installation);
+  }
+  const common = {
+    business: route.business,
+    ...route.branch !== void 0 ? { branch: route.branch } : {},
+    state: route.state
+  };
+  if (modalId?.startsWith(ITEM_MODAL_PREFIX)) {
+    return {
+      type: "item",
+      ...common,
+      item: modalId.slice(ITEM_MODAL_PREFIX.length)
+    };
+  }
+  if (modalId === CART_MODAL || modalId === CHECKOUT_MODAL) {
+    return {
+      type: modalId === CART_MODAL ? "cart" : "checkout",
+      ...common
+    };
+  }
+  return route;
+};
+export {
+  canonicalRoute
+};
+//# sourceMappingURL=canonical.js.map

package/dist/server/storefront-url/canonical.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/server/storefront-url/canonical.ts"],
+  "sourcesContent": ["import { CART_MODAL, CHECKOUT_MODAL, SIGN_IN_MODALS } from \"./contract\";\nimport { signInFromOverlay } from \"./sign-in\";\nimport type { StorefrontRoute, StorefrontUrlOptions } from \"./types\";\nimport { ITEM_MODAL_PREFIX } from \"./url\";\n\nexport const canonicalRoute = (\n  route: StorefrontRoute,\n  installation: NonNullable<StorefrontUrlOptions[\"installation\"]>,\n): StorefrontRoute => {\n  if (route.type !== \"order-menu\") {\n    return route;\n  }\n  const { authModalId, modalId } = route.state;\n  if (authModalId && SIGN_IN_MODALS.includes(authModalId)) {\n    return signInFromOverlay(route, installation);\n  }\n  const common = {\n    business: route.business,\n    ...(route.branch !== undefined ? { branch: route.branch } : {}),\n    state: route.state,\n  };\n  if (modalId?.startsWith(ITEM_MODAL_PREFIX)) {\n    return {\n      type: \"item\",\n      ...common,\n      item: modalId.slice(ITEM_MODAL_PREFIX.length),\n    };\n  }\n  if (modalId === CART_MODAL || modalId === CHECKOUT_MODAL) {\n    return {\n      type: modalId === CART_MODAL ? \"cart\" : \"checkout\",\n      ...common,\n    };\n  }\n  return route;\n};\n"],
+  "mappings": ";AAAA,SAAS,YAAY,gBAAgB,sBAAsB;AAC3D,SAAS,yBAAyB;AAElC,SAAS,yBAAyB;AAE3B,IAAM,iBAAiB,CAC5B,OACA,iBACoB;AACpB,MAAI,MAAM,SAAS,cAAc;AAC/B,WAAO;AAAA,EACT;AACA,QAAM,EAAE,aAAa,QAAQ,IAAI,MAAM;AACvC,MAAI,eAAe,eAAe,SAAS,WAAW,GAAG;AACvD,WAAO,kBAAkB,OAAO,YAAY;AAAA,EAC9C;AACA,QAAM,SAAS;AAAA,IACb,UAAU,MAAM;AAAA,IAChB,GAAI,MAAM,WAAW,SAAY,EAAE,QAAQ,MAAM,OAAO,IAAI,CAAC;AAAA,IAC7D,OAAO,MAAM;AAAA,EACf;AACA,MAAI,SAAS,WAAW,iBAAiB,GAAG;AAC1C,WAAO;AAAA,MACL,MAAM;AAAA,MACN,GAAG;AAAA,MACH,MAAM,QAAQ,MAAM,kBAAkB,MAAM;AAAA,IAC9C;AAAA,EACF;AACA,MAAI,YAAY,cAAc,YAAY,gBAAgB;AACxD,WAAO;AAAA,MACL,MAAM,YAAY,aAAa,SAAS;AAAA,MACxC,GAAG;AAAA,IACL;AAAA,EACF;AACA,SAAO;AACT;",
+  "names": []
+}

package/dist/server/storefront-url/contract.js

@@ -2,11 +2,11 @@
 var CART_MODAL = "review-menu";
 var CHECKOUT_MODAL = "payment";
 var SIGN_IN_MODAL = "send-otp";
-var SIGN_IN_MODALS = /* @__PURE__ */ new Set([
+var SIGN_IN_MODALS = [
   SIGN_IN_MODAL,
   "verify-otp",
   "update-profile"
-]);
+];
 var usesV2 = (options) => options.contract !== "v1" && options.installation !== void 0;
 var menuRoute = (route) => ({
   type: "order-menu",

package/dist/server/storefront-url/contract.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/server/storefront-url/contract.ts"],
-  "sourcesContent": ["import type { StorefrontRoute, StorefrontUrlOptions } from \"./types\";\n\nexport const CART_MODAL = \"review-menu\";\nexport const CHECKOUT_MODAL = \"payment\";\nexport const SIGN_IN_MODAL = \"send-otp\";\nexport const SIGN_IN_MODALS = new Set([\n  SIGN_IN_MODAL,\n  \"verify-otp\",\n  \"update-profile\",\n]);\n\nexport const usesV2 = (options: StorefrontUrlOptions) =>\n  options.contract !== \"v1\" && options.installation !== undefined;\n\nexport const menuRoute = (\n  route: Extract<\n    StorefrontRoute,\n    { type: \"cart\" | \"checkout\" | \"checkout-return\" | \"sign-in\" }\n  >,\n): Extract<StorefrontRoute, { type: \"order-menu\" }> => ({\n  type: \"order-menu\",\n  business: route.business,\n  ...(route.branch !== undefined ? { branch: route.branch } : {}),\n  state: route.state,\n});\n"],
-  "mappings": ";AAEO,IAAM,aAAa;AACnB,IAAM,iBAAiB;AACvB,IAAM,gBAAgB;AACtB,IAAM,iBAAiB,oBAAI,IAAI;AAAA,EACpC;AAAA,EACA;AAAA,EACA;AACF,CAAC;AAEM,IAAM,SAAS,CAAC,YACrB,QAAQ,aAAa,QAAQ,QAAQ,iBAAiB;AAEjD,IAAM,YAAY,CACvB,WAIsD;AAAA,EACtD,MAAM;AAAA,EACN,UAAU,MAAM;AAAA,EAChB,GAAI,MAAM,WAAW,SAAY,EAAE,QAAQ,MAAM,OAAO,IAAI,CAAC;AAAA,EAC7D,OAAO,MAAM;AACf;",
+  "sourcesContent": ["import type {\n  StorefrontInstallation,\n  StorefrontRoute,\n  StorefrontUrlOptions,\n} from \"./types\";\n\nexport const CART_MODAL = \"review-menu\";\nexport const CHECKOUT_MODAL = \"payment\";\nexport const SIGN_IN_MODAL = \"send-otp\";\nexport const SIGN_IN_MODALS: readonly string[] = [\n  SIGN_IN_MODAL,\n  \"verify-otp\",\n  \"update-profile\",\n];\n\nexport const usesV2 = (\n  options: StorefrontUrlOptions,\n): options is StorefrontUrlOptions & { installation: StorefrontInstallation } =>\n  options.contract !== \"v1\" && options.installation !== undefined;\n\nexport const menuRoute = (\n  route: Extract<\n    StorefrontRoute,\n    { type: \"cart\" | \"checkout\" | \"checkout-return\" | \"sign-in\" }\n  >,\n): Extract<StorefrontRoute, { type: \"order-menu\" }> => ({\n  type: \"order-menu\",\n  business: route.business,\n  ...(route.branch !== undefined ? { branch: route.branch } : {}),\n  state: route.state,\n});\n"],
+  "mappings": ";AAMO,IAAM,aAAa;AACnB,IAAM,iBAAiB;AACvB,IAAM,gBAAgB;AACtB,IAAM,iBAAoC;AAAA,EAC/C;AAAA,EACA;AAAA,EACA;AACF;AAEO,IAAM,SAAS,CACpB,YAEA,QAAQ,aAAa,QAAQ,QAAQ,iBAAiB;AAEjD,IAAM,YAAY,CACvB,WAIsD;AAAA,EACtD,MAAM;AAAA,EACN,UAAU,MAAM;AAAA,EAChB,GAAI,MAAM,WAAW,SAAY,EAAE,QAAQ,MAAM,OAAO,IAAI,CAAC;AAAA,EAC7D,OAAO,MAAM;AACf;",
   "names": []
 }

package/dist/server/storefront-url/params.js

@@ -1,25 +1,19 @@
 // src/server/storefront-url/params.ts
 import { CART_MODAL, CHECKOUT_MODAL, SIGN_IN_MODAL } from "./contract.js";
+import { publicId } from "./public-id.js";
+import { STATE_FIELDS } from "./url.js";
 var stateParams = (route) => {
   const params = new URLSearchParams(route.state.query);
   const state = route.state;
-  const values = [
-    ["menu_id", state.menuId],
-    ["category_id", state.categoryId],
-    ["menu_layout", state.menuLayout],
-    ["pickup", state.mode ? String(state.mode === "pickup") : void 0],
-    ["modal_id", state.modalId],
-    ["auth_modal_id", state.authModalId],
-    ["payment_id", state.paymentId],
-    ["lightbox", state.lightbox],
-    ["catalogue_search", state.catalogueSearch],
-    ["catalogue_categories", state.catalogueCategories]
-  ];
-  values.forEach(([key, value]) => {
+  for (const [key, field] of Object.entries(STATE_FIELDS)) {
+    const value = state[field];
     if (value !== void 0) {
       params.set(key, value);
     }
-  });
+  }
+  if (state.mode) {
+    params.set("pickup", String(state.mode === "pickup"));
+  }
   return params;
 };
 var v1Params = (route) => {
@@ -43,16 +37,39 @@ var v1Params = (route) => {
 };
 var v2Params = (route, installation) => {
   const params = stateParams(route);
-  if (route.type === "order-menu" || route.type === "item" || route.type === "cart" || route.type === "checkout" || route.type === "checkout-return" || route.type === "sign-in" || route.type === "content-page") {
+  const menu = params.get("menu_id");
+  if (menu) {
+    params.set("menu", publicId(menu, "menu"));
+  }
+  for (const key of [
+    "menu_id",
+    "category_id",
+    "pickup",
+    "menu_layout",
+    "catalogue_search",
+    "catalogue_categories",
+    "template",
+    "catalog_rendering",
+    "prefetch",
+    "ws",
+    "env",
+    "business",
+    "business_tag",
+    "switched_branch",
+    "success",
+    "auto_scroll",
+    "preview",
+    "modal_id"
+  ]) {
+    params.delete(key);
+  }
+  if ("business" in route) {
     if (route.branch && route.branch !== installation.defaultBranch) {
       params.set("branch", route.branch);
     } else {
       params.delete("branch");
     }
   }
-  if (route.type === "item" || route.type === "cart" || route.type === "checkout" || route.type === "checkout-return") {
-    params.delete("modal_id");
-  }
   if (route.type === "sign-in") {
     params.delete("auth_modal_id");
     if (route.returnTo !== void 0) {

package/dist/server/storefront-url/params.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/server/storefront-url/params.ts"],
-  "sourcesContent": ["import { CART_MODAL, CHECKOUT_MODAL, SIGN_IN_MODAL } from \"./contract\";\nimport type { StorefrontInstallation, StorefrontRoute } from \"./types\";\n\nconst stateParams = (route: StorefrontRoute) => {\n  const params = new URLSearchParams(route.state.query);\n  const state = route.state;\n  const values: ReadonlyArray<[string, string | undefined]> = [\n    [\"menu_id\", state.menuId],\n    [\"category_id\", state.categoryId],\n    [\"menu_layout\", state.menuLayout],\n    [\"pickup\", state.mode ? String(state.mode === \"pickup\") : undefined],\n    [\"modal_id\", state.modalId],\n    [\"auth_modal_id\", state.authModalId],\n    [\"payment_id\", state.paymentId],\n    [\"lightbox\", state.lightbox],\n    [\"catalogue_search\", state.catalogueSearch],\n    [\"catalogue_categories\", state.catalogueCategories],\n  ];\n  values.forEach(([key, value]) => {\n    if (value !== undefined) {\n      params.set(key, value);\n    }\n  });\n  return params;\n};\n\nexport const v1Params = (route: StorefrontRoute) => {\n  const params = stateParams(route);\n  if (route.type === \"item\") {\n    params.delete(\"modal_id\");\n  } else if (route.type === \"cart\") {\n    params.set(\"modal_id\", CART_MODAL);\n  } else if (route.type === \"checkout\") {\n    params.set(\"modal_id\", CHECKOUT_MODAL);\n  } else if (route.type === \"sign-in\") {\n    params.set(\"auth_modal_id\", SIGN_IN_MODAL);\n    if (route.returnTo !== undefined) {\n      params.set(\"return\", route.returnTo);\n    }\n  } else if (route.type === \"checkout-return\" && route.session !== undefined) {\n    params.set(\"session\", route.session);\n  }\n  params.sort();\n  return params;\n};\n\nexport const v2Params = (\n  route: StorefrontRoute,\n  installation: StorefrontInstallation,\n) => {\n  const params = stateParams(route);\n  if (\n    route.type === \"order-menu\" ||\n    route.type === \"item\" ||\n    route.type === \"cart\" ||\n    route.type === \"checkout\" ||\n    route.type === \"checkout-return\" ||\n    route.type === \"sign-in\" ||\n    route.type === \"content-page\"\n  ) {\n    if (route.branch && route.branch !== installation.defaultBranch) {\n      params.set(\"branch\", route.branch);\n    } else {\n      params.delete(\"branch\");\n    }\n  }\n  if (\n    route.type === \"item\" ||\n    route.type === \"cart\" ||\n    route.type === \"checkout\" ||\n    route.type === \"checkout-return\"\n  ) {\n    params.delete(\"modal_id\");\n  }\n  if (route.type === \"sign-in\") {\n    params.delete(\"auth_modal_id\");\n    if (route.returnTo !== undefined) {\n      params.set(\"return\", route.returnTo);\n    }\n  }\n  if (route.type === \"checkout-return\" && route.session !== undefined) {\n    params.set(\"session\", route.session);\n  }\n  params.sort();\n  return params;\n};\n"],
-  "mappings": ";AAAA,SAAS,YAAY,gBAAgB,qBAAqB;AAG1D,IAAM,cAAc,CAAC,UAA2B;AAC9C,QAAM,SAAS,IAAI,gBAAgB,MAAM,MAAM,KAAK;AACpD,QAAM,QAAQ,MAAM;AACpB,QAAM,SAAsD;AAAA,IAC1D,CAAC,WAAW,MAAM,MAAM;AAAA,IACxB,CAAC,eAAe,MAAM,UAAU;AAAA,IAChC,CAAC,eAAe,MAAM,UAAU;AAAA,IAChC,CAAC,UAAU,MAAM,OAAO,OAAO,MAAM,SAAS,QAAQ,IAAI,MAAS;AAAA,IACnE,CAAC,YAAY,MAAM,OAAO;AAAA,IAC1B,CAAC,iBAAiB,MAAM,WAAW;AAAA,IACnC,CAAC,cAAc,MAAM,SAAS;AAAA,IAC9B,CAAC,YAAY,MAAM,QAAQ;AAAA,IAC3B,CAAC,oBAAoB,MAAM,eAAe;AAAA,IAC1C,CAAC,wBAAwB,MAAM,mBAAmB;AAAA,EACpD;AACA,SAAO,QAAQ,CAAC,CAAC,KAAK,KAAK,MAAM;AAC/B,QAAI,UAAU,QAAW;AACvB,aAAO,IAAI,KAAK,KAAK;AAAA,IACvB;AAAA,EACF,CAAC;AACD,SAAO;AACT;AAEO,IAAM,WAAW,CAAC,UAA2B;AAClD,QAAM,SAAS,YAAY,KAAK;AAChC,MAAI,MAAM,SAAS,QAAQ;AACzB,WAAO,OAAO,UAAU;AAAA,EAC1B,WAAW,MAAM,SAAS,QAAQ;AAChC,WAAO,IAAI,YAAY,UAAU;AAAA,EACnC,WAAW,MAAM,SAAS,YAAY;AACpC,WAAO,IAAI,YAAY,cAAc;AAAA,EACvC,WAAW,MAAM,SAAS,WAAW;AACnC,WAAO,IAAI,iBAAiB,aAAa;AACzC,QAAI,MAAM,aAAa,QAAW;AAChC,aAAO,IAAI,UAAU,MAAM,QAAQ;AAAA,IACrC;AAAA,EACF,WAAW,MAAM,SAAS,qBAAqB,MAAM,YAAY,QAAW;AAC1E,WAAO,IAAI,WAAW,MAAM,OAAO;AAAA,EACrC;AACA,SAAO,KAAK;AACZ,SAAO;AACT;AAEO,IAAM,WAAW,CACtB,OACA,iBACG;AACH,QAAM,SAAS,YAAY,KAAK;AAChC,MACE,MAAM,SAAS,gBACf,MAAM,SAAS,UACf,MAAM,SAAS,UACf,MAAM,SAAS,cACf,MAAM,SAAS,qBACf,MAAM,SAAS,aACf,MAAM,SAAS,gBACf;AACA,QAAI,MAAM,UAAU,MAAM,WAAW,aAAa,eAAe;AAC/D,aAAO,IAAI,UAAU,MAAM,MAAM;AAAA,IACnC,OAAO;AACL,aAAO,OAAO,QAAQ;AAAA,IACxB;AAAA,EACF;AACA,MACE,MAAM,SAAS,UACf,MAAM,SAAS,UACf,MAAM,SAAS,cACf,MAAM,SAAS,mBACf;AACA,WAAO,OAAO,UAAU;AAAA,EAC1B;AACA,MAAI,MAAM,SAAS,WAAW;AAC5B,WAAO,OAAO,eAAe;AAC7B,QAAI,MAAM,aAAa,QAAW;AAChC,aAAO,IAAI,UAAU,MAAM,QAAQ;AAAA,IACrC;AAAA,EACF;AACA,MAAI,MAAM,SAAS,qBAAqB,MAAM,YAAY,QAAW;AACnE,WAAO,IAAI,WAAW,MAAM,OAAO;AAAA,EACrC;AACA,SAAO,KAAK;AACZ,SAAO;AACT;",
+  "sourcesContent": ["import { CART_MODAL, CHECKOUT_MODAL, SIGN_IN_MODAL } from \"./contract\";\nimport { publicId } from \"./public-id\";\nimport type { StorefrontInstallation, StorefrontRoute } from \"./types\";\nimport { STATE_FIELDS } from \"./url\";\n\nconst stateParams = (route: StorefrontRoute) => {\n  const params = new URLSearchParams(route.state.query);\n  const state = route.state;\n  for (const [key, field] of Object.entries(STATE_FIELDS)) {\n    const value = state[field];\n    if (value !== undefined) {\n      params.set(key, value);\n    }\n  }\n  if (state.mode) {\n    params.set(\"pickup\", String(state.mode === \"pickup\"));\n  }\n  return params;\n};\n\nexport const v1Params = (route: StorefrontRoute) => {\n  const params = stateParams(route);\n  if (route.type === \"item\") {\n    params.delete(\"modal_id\");\n  } else if (route.type === \"cart\") {\n    params.set(\"modal_id\", CART_MODAL);\n  } else if (route.type === \"checkout\") {\n    params.set(\"modal_id\", CHECKOUT_MODAL);\n  } else if (route.type === \"sign-in\") {\n    params.set(\"auth_modal_id\", SIGN_IN_MODAL);\n    if (route.returnTo !== undefined) {\n      params.set(\"return\", route.returnTo);\n    }\n  } else if (route.type === \"checkout-return\" && route.session !== undefined) {\n    params.set(\"session\", route.session);\n  }\n  params.sort();\n  return params;\n};\n\nexport const v2Params = (\n  route: StorefrontRoute,\n  installation: StorefrontInstallation,\n) => {\n  const params = stateParams(route);\n  const menu = params.get(\"menu_id\");\n  if (menu) {\n    params.set(\"menu\", publicId(menu, \"menu\"));\n  }\n  for (const key of [\n    \"menu_id\",\n    \"category_id\",\n    \"pickup\",\n    \"menu_layout\",\n    \"catalogue_search\",\n    \"catalogue_categories\",\n    \"template\",\n    \"catalog_rendering\",\n    \"prefetch\",\n    \"ws\",\n    \"env\",\n    \"business\",\n    \"business_tag\",\n    \"switched_branch\",\n    \"success\",\n    \"auto_scroll\",\n    \"preview\",\n    \"modal_id\",\n  ]) {\n    params.delete(key);\n  }\n\n  if (\"business\" in route) {\n    if (route.branch && route.branch !== installation.defaultBranch) {\n      params.set(\"branch\", route.branch);\n    } else {\n      params.delete(\"branch\");\n    }\n  }\n  if (route.type === \"sign-in\") {\n    params.delete(\"auth_modal_id\");\n    if (route.returnTo !== undefined) {\n      params.set(\"return\", route.returnTo);\n    }\n  }\n  if (route.type === \"checkout-return\" && route.session !== undefined) {\n    params.set(\"session\", route.session);\n  }\n  params.sort();\n  return params;\n};\n"],
+  "mappings": ";AAAA,SAAS,YAAY,gBAAgB,qBAAqB;AAC1D,SAAS,gBAAgB;AAEzB,SAAS,oBAAoB;AAE7B,IAAM,cAAc,CAAC,UAA2B;AAC9C,QAAM,SAAS,IAAI,gBAAgB,MAAM,MAAM,KAAK;AACpD,QAAM,QAAQ,MAAM;AACpB,aAAW,CAAC,KAAK,KAAK,KAAK,OAAO,QAAQ,YAAY,GAAG;AACvD,UAAM,QAAQ,MAAM,KAAK;AACzB,QAAI,UAAU,QAAW;AACvB,aAAO,IAAI,KAAK,KAAK;AAAA,IACvB;AAAA,EACF;AACA,MAAI,MAAM,MAAM;AACd,WAAO,IAAI,UAAU,OAAO,MAAM,SAAS,QAAQ,CAAC;AAAA,EACtD;AACA,SAAO;AACT;AAEO,IAAM,WAAW,CAAC,UAA2B;AAClD,QAAM,SAAS,YAAY,KAAK;AAChC,MAAI,MAAM,SAAS,QAAQ;AACzB,WAAO,OAAO,UAAU;AAAA,EAC1B,WAAW,MAAM,SAAS,QAAQ;AAChC,WAAO,IAAI,YAAY,UAAU;AAAA,EACnC,WAAW,MAAM,SAAS,YAAY;AACpC,WAAO,IAAI,YAAY,cAAc;AAAA,EACvC,WAAW,MAAM,SAAS,WAAW;AACnC,WAAO,IAAI,iBAAiB,aAAa;AACzC,QAAI,MAAM,aAAa,QAAW;AAChC,aAAO,IAAI,UAAU,MAAM,QAAQ;AAAA,IACrC;AAAA,EACF,WAAW,MAAM,SAAS,qBAAqB,MAAM,YAAY,QAAW;AAC1E,WAAO,IAAI,WAAW,MAAM,OAAO;AAAA,EACrC;AACA,SAAO,KAAK;AACZ,SAAO;AACT;AAEO,IAAM,WAAW,CACtB,OACA,iBACG;AACH,QAAM,SAAS,YAAY,KAAK;AAChC,QAAM,OAAO,OAAO,IAAI,SAAS;AACjC,MAAI,MAAM;AACR,WAAO,IAAI,QAAQ,SAAS,MAAM,MAAM,CAAC;AAAA,EAC3C;AACA,aAAW,OAAO;AAAA,IAChB;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF,GAAG;AACD,WAAO,OAAO,GAAG;AAAA,EACnB;AAEA,MAAI,cAAc,OAAO;AACvB,QAAI,MAAM,UAAU,MAAM,WAAW,aAAa,eAAe;AAC/D,aAAO,IAAI,UAAU,MAAM,MAAM;AAAA,IACnC,OAAO;AACL,aAAO,OAAO,QAAQ;AAAA,IACxB;AAAA,EACF;AACA,MAAI,MAAM,SAAS,WAAW;AAC5B,WAAO,OAAO,eAAe;AAC7B,QAAI,MAAM,aAAa,QAAW;AAChC,aAAO,IAAI,UAAU,MAAM,QAAQ;AAAA,IACrC;AAAA,EACF;AACA,MAAI,MAAM,SAAS,qBAAqB,MAAM,YAAY,QAAW;AACnE,WAAO,IAAI,WAAW,MAAM,OAAO;AAAA,EACrC;AACA,SAAO,KAAK;AACZ,SAAO;AACT;",
   "names": []
 }

package/dist/server/storefront-url/parse-v1.js

@@ -9,13 +9,12 @@ var FIXED_ROUTES = {
   "/reservation": "reservation"
 };
 var ID_ROUTES = {
-  "dine-in": (order, state) => ({ type: "dine-in", order, state }),
-  "pay-point": (payPoint, state) => ({ type: "pay-point", payPoint, state }),
-  beacons: (beacon, state) => ({ type: "beacon", beacon, state }),
-  links: (link, state) => ({ type: "link", link, state }),
-  pay: (session, state) => ({ type: "pay-session", session, state })
+  "dine-in": ["dine-in", "order"],
+  "pay-point": ["pay-point", "payPoint"],
+  beacons: ["beacon", "beacon"],
+  links: ["link", "link"],
+  pay: ["pay-session", "session"]
 };
-var isKeyOf = (table, key) => Object.hasOwn(table, key);
 var parseV1 = (input, options = {}) => {
   try {
     const url = inputUrl(input);
@@ -74,23 +73,27 @@ var parseV1 = (input, options = {}) => {
         };
       }
     }
-    if (isKeyOf(FIXED_ROUTES, pathname)) {
-      return { type: FIXED_ROUTES[pathname], state };
+    if (Object.hasOwn(FIXED_ROUTES, pathname)) {
+      return {
+        type: FIXED_ROUTES[pathname],
+        state
+      };
     }
     const [prefix = "", id] = parts;
-    if (parts.length === 2 && id && isKeyOf(ID_ROUTES, prefix)) {
-      return ID_ROUTES[prefix](segment(parts, 1), state);
+    if (parts.length === 2 && id && Object.hasOwn(ID_ROUTES, prefix)) {
+      const [type, field] = ID_ROUTES[prefix];
+      return { type, [field]: segment(parts, 1), state };
     }
     if (parts[0] === "payment" && parts[1] === "card" && parts[2] && parts.length === 3) {
       return { type: "payment-card", transaction: segment(parts, 2), state };
     }
     if (parts[0] === "payment" && parts[1] && parts.length <= 3) {
       const step = parts[2];
-      if (!step || step === "successful" || step === "failed" || step === "refunded") {
+      if (!step || ["successful", "failed", "refunded"].includes(step)) {
         return {
           type: "payment-step",
           payment: segment(parts, 1),
-          step: step === "successful" || step === "failed" || step === "refunded" ? step : "payment",
+          step: step || "payment",
           state
         };
       }

package/dist/server/storefront-url/parse-v1.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/server/storefront-url/parse-v1.ts"],
-  "sourcesContent": ["import { installationPath, normalizedPath, segment } from \"./installation\";\nimport {\n  type StorefrontPageState,\n  type StorefrontRoute,\n  type StorefrontUrlInput,\n  type StorefrontUrlOptions,\n} from \"./types\";\nimport { ITEM_MODAL_PREFIX, inputUrl, pageState } from \"./url\";\n\n/** Paths with no variable segment. Checked before ID_ROUTES: `/dine-in/menus` is not a dine-in order. */\nconst FIXED_ROUTES = {\n  \"/dine-in/menus\": \"dine-in-menus\",\n  \"/self-service/menus\": \"self-service-menus\",\n  \"/collect-payment\": \"collect-payment\",\n  \"/reservation\": \"reservation\",\n} as const;\n\n/** `/<prefix>/<id>` routes, where the one segment after the prefix names the resource. */\nconst ID_ROUTES = {\n  \"dine-in\": (order, state) => ({ type: \"dine-in\", order, state }),\n  \"pay-point\": (payPoint, state) => ({ type: \"pay-point\", payPoint, state }),\n  beacons: (beacon, state) => ({ type: \"beacon\", beacon, state }),\n  links: (link, state) => ({ type: \"link\", link, state }),\n  pay: (session, state) => ({ type: \"pay-session\", session, state }),\n} satisfies Record<\n  string,\n  (id: string, state: StorefrontPageState) => StorefrontRoute\n>;\n\nconst isKeyOf = <T extends object>(\n  table: T,\n  key: string,\n): key is Extract<keyof T, string> => Object.hasOwn(table, key);\n\nexport const parseV1 = (\n  input: StorefrontUrlInput,\n  options: StorefrontUrlOptions = {},\n): StorefrontRoute => {\n  try {\n    const url = inputUrl(input);\n    const state = pageState(url, \"v1\");\n    const pathname = installationPath(\n      normalizedPath(url.pathname),\n      options.installation,\n    );\n    const parts = pathname.split(\"/\").filter(Boolean);\n\n    if (parts[0] === \"order\" && parts[1]) {\n      const business = segment(parts, 1);\n      if (parts[2] === \"pages\" && parts.length === 4) {\n        return {\n          type: \"content-page\",\n          business,\n          slug: segment(parts, 3),\n          state,\n        };\n      }\n      const branch = parts[2] ? segment(parts, 2) : undefined;\n      if (branch && parts[3] === \"pages\" && parts.length === 5) {\n        return {\n          type: \"content-page\",\n          business,\n          branch,\n          slug: segment(parts, 4),\n          state,\n        };\n      }\n      if (branch && parts[3] === \"products\" && parts[4] && parts.length === 5) {\n        return {\n          type: \"item\",\n          business,\n          branch,\n          item: segment(parts, 4),\n          state,\n        };\n      }\n      if (\n        parts.length <= 3 ||\n        (parts.length === 4 && parts[3] === \"products\")\n      ) {\n        const modalItem = state.modalId?.startsWith(ITEM_MODAL_PREFIX)\n          ? state.modalId.slice(ITEM_MODAL_PREFIX.length)\n          : \"\";\n        if (branch && modalItem) {\n          return {\n            type: \"item\",\n            business,\n            branch,\n            item: modalItem,\n            state,\n          };\n        }\n        return {\n          type: \"order-menu\",\n          business,\n          ...(branch ? { branch } : {}),\n          ...(parts[3] === \"products\" ? { cataloguePath: true } : {}),\n          state,\n        };\n      }\n    }\n\n    if (isKeyOf(FIXED_ROUTES, pathname)) {\n      return { type: FIXED_ROUTES[pathname], state };\n    }\n    const [prefix = \"\", id] = parts;\n    if (parts.length === 2 && id && isKeyOf(ID_ROUTES, prefix)) {\n      return ID_ROUTES[prefix](segment(parts, 1), state);\n    }\n    if (\n      parts[0] === \"payment\" &&\n      parts[1] === \"card\" &&\n      parts[2] &&\n      parts.length === 3\n    ) {\n      return { type: \"payment-card\", transaction: segment(parts, 2), state };\n    }\n    if (parts[0] === \"payment\" && parts[1] && parts.length <= 3) {\n      const step = parts[2];\n      if (\n        !step ||\n        step === \"successful\" ||\n        step === \"failed\" ||\n        step === \"refunded\"\n      ) {\n        return {\n          type: \"payment-step\",\n          payment: segment(parts, 1),\n          step:\n            step === \"successful\" || step === \"failed\" || step === \"refunded\"\n              ? step\n              : \"payment\",\n          state,\n        };\n      }\n    }\n    if (parts[0] === \"orders\" && parts.length <= 2) {\n      return {\n        type: \"profile\",\n        page: \"orders\",\n        ...(parts[1] ? { order: segment(parts, 1) } : {}),\n        state,\n      };\n    }\n    if (parts[0] === \"profile\" && parts[1] && parts.length <= 3) {\n      const page = parts[1];\n      if (\n        page === \"add-store-credit\" ||\n        page === \"edit\" ||\n        page === \"payment-methods\" ||\n        page === \"transactions\"\n      ) {\n        return { type: \"profile\", page, state };\n      }\n      if (page === \"orders\") {\n        return {\n          type: \"profile\",\n          page,\n          ...(parts[2] ? { order: segment(parts, 2) } : {}),\n          state,\n        };\n      }\n    }\n    if (pathname === \"/\" || pathname === \"/explore\") {\n      return {\n        type: \"explore\",\n        ...(pathname === \"/\" ? { home: true } : {}),\n        state,\n      };\n    }\n    return { type: \"unknown\", pathname, state };\n  } catch {\n    return { type: \"unknown\", pathname: \"\", state: { query: {} } };\n  }\n};\n"],
-  "mappings": "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",
+  "sourcesContent": ["import { installationPath, normalizedPath, segment } from \"./installation\";\nimport {\n  type StorefrontRoute,\n  type StorefrontUrlInput,\n  type StorefrontUrlOptions,\n} from \"./types\";\nimport { ITEM_MODAL_PREFIX, inputUrl, pageState } from \"./url\";\n\n/** Paths with no variable segment. Checked before ID_ROUTES: `/dine-in/menus` is not a dine-in order. */\nconst FIXED_ROUTES = {\n  \"/dine-in/menus\": \"dine-in-menus\",\n  \"/self-service/menus\": \"self-service-menus\",\n  \"/collect-payment\": \"collect-payment\",\n  \"/reservation\": \"reservation\",\n} as const;\n\n/** `/<prefix>/<id>` routes, where the one segment after the prefix names the resource. */\nconst ID_ROUTES = {\n  \"dine-in\": [\"dine-in\", \"order\"],\n  \"pay-point\": [\"pay-point\", \"payPoint\"],\n  beacons: [\"beacon\", \"beacon\"],\n  links: [\"link\", \"link\"],\n  pay: [\"pay-session\", \"session\"],\n} as const;\n\nexport const parseV1 = (\n  input: StorefrontUrlInput,\n  options: StorefrontUrlOptions = {},\n): StorefrontRoute => {\n  try {\n    const url = inputUrl(input);\n    const state = pageState(url, \"v1\");\n    const pathname = installationPath(\n      normalizedPath(url.pathname),\n      options.installation,\n    );\n    const parts = pathname.split(\"/\").filter(Boolean);\n\n    if (parts[0] === \"order\" && parts[1]) {\n      const business = segment(parts, 1);\n      if (parts[2] === \"pages\" && parts.length === 4) {\n        return {\n          type: \"content-page\",\n          business,\n          slug: segment(parts, 3),\n          state,\n        };\n      }\n      const branch = parts[2] ? segment(parts, 2) : undefined;\n      if (branch && parts[3] === \"pages\" && parts.length === 5) {\n        return {\n          type: \"content-page\",\n          business,\n          branch,\n          slug: segment(parts, 4),\n          state,\n        };\n      }\n      if (branch && parts[3] === \"products\" && parts[4] && parts.length === 5) {\n        return {\n          type: \"item\",\n          business,\n          branch,\n          item: segment(parts, 4),\n          state,\n        };\n      }\n      if (\n        parts.length <= 3 ||\n        (parts.length === 4 && parts[3] === \"products\")\n      ) {\n        const modalItem = state.modalId?.startsWith(ITEM_MODAL_PREFIX)\n          ? state.modalId.slice(ITEM_MODAL_PREFIX.length)\n          : \"\";\n        if (branch && modalItem) {\n          return {\n            type: \"item\",\n            business,\n            branch,\n            item: modalItem,\n            state,\n          };\n        }\n        return {\n          type: \"order-menu\",\n          business,\n          ...(branch ? { branch } : {}),\n          ...(parts[3] === \"products\" ? { cataloguePath: true } : {}),\n          state,\n        };\n      }\n    }\n\n    if (Object.hasOwn(FIXED_ROUTES, pathname)) {\n      return {\n        type: FIXED_ROUTES[pathname as keyof typeof FIXED_ROUTES],\n        state,\n      };\n    }\n    const [prefix = \"\", id] = parts;\n    if (parts.length === 2 && id && Object.hasOwn(ID_ROUTES, prefix)) {\n      const [type, field] = ID_ROUTES[prefix as keyof typeof ID_ROUTES];\n      return { type, [field]: segment(parts, 1), state } as StorefrontRoute;\n    }\n    if (\n      parts[0] === \"payment\" &&\n      parts[1] === \"card\" &&\n      parts[2] &&\n      parts.length === 3\n    ) {\n      return { type: \"payment-card\", transaction: segment(parts, 2), state };\n    }\n    if (parts[0] === \"payment\" && parts[1] && parts.length <= 3) {\n      const step = parts[2];\n      if (!step || [\"successful\", \"failed\", \"refunded\"].includes(step)) {\n        return {\n          type: \"payment-step\",\n          payment: segment(parts, 1),\n          step: (step || \"payment\") as Extract<\n            StorefrontRoute,\n            { type: \"payment-step\" }\n          >[\"step\"],\n          state,\n        };\n      }\n    }\n    if (parts[0] === \"orders\" && parts.length <= 2) {\n      return {\n        type: \"profile\",\n        page: \"orders\",\n        ...(parts[1] ? { order: segment(parts, 1) } : {}),\n        state,\n      };\n    }\n    if (parts[0] === \"profile\" && parts[1] && parts.length <= 3) {\n      const page = parts[1];\n      if (\n        page === \"add-store-credit\" ||\n        page === \"edit\" ||\n        page === \"payment-methods\" ||\n        page === \"transactions\"\n      ) {\n        return { type: \"profile\", page, state };\n      }\n      if (page === \"orders\") {\n        return {\n          type: \"profile\",\n          page,\n          ...(parts[2] ? { order: segment(parts, 2) } : {}),\n          state,\n        };\n      }\n    }\n    if (pathname === \"/\" || pathname === \"/explore\") {\n      return {\n        type: \"explore\",\n        ...(pathname === \"/\" ? { home: true } : {}),\n        state,\n      };\n    }\n    return { type: \"unknown\", pathname, state };\n  } catch {\n    return { type: \"unknown\", pathname: \"\", state: { query: {} } };\n  }\n};\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/server/storefront-url/parse-v2.js

@@ -1,69 +1,43 @@
 // src/server/storefront-url/parse-v2.ts
-import { CART_MODAL, CHECKOUT_MODAL, SIGN_IN_MODALS } from "./contract.js";
+import { canonicalRoute } from "./canonical.js";
 import { normalizedPath, segment } from "./installation.js";
 import { parseV1 } from "./parse-v1.js";
-import { signInFromOverlay } from "./sign-in.js";
-import { ITEM_MODAL_PREFIX, inputUrl, pageState } from "./url.js";
-var branch = (url) => url.searchParams.has("branch") ? { branch: url.searchParams.get("branch") ?? "" } : {};
+import { inputUrl, pageState } from "./url.js";
 var canonical = (url, state, business) => {
   const pathname = normalizedPath(url.pathname);
   const parts = pathname.split("/").filter(Boolean);
-  const scoped = branch(url);
+  const branch = url.searchParams.get("branch");
+  const common = { business, ...branch !== null ? { branch } : {}, state };
   if (pathname === "/") {
-    return { type: "order-menu", business, ...scoped, state };
+    return { type: "order-menu", ...common };
   }
   if (parts[0] === "item" && parts[1] && parts.length === 2) {
     return {
       type: "item",
-      business,
-      ...scoped,
-      item: segment(parts, 1),
-      state
+      ...common,
+      item: segment(parts, 1)
     };
   }
   if (pathname === "/cart" || pathname === "/checkout") {
     return {
       type: pathname === "/cart" ? "cart" : "checkout",
-      business,
-      ...scoped,
-      state
+      ...common
     };
   }
-  if (pathname === "/checkout/return") {
-    const session = url.searchParams.get("session");
+  if (pathname === "/checkout/return" || pathname === "/sign-in") {
+    const signIn = pathname === "/sign-in";
+    const value = url.searchParams.get(signIn ? "return" : "session");
     return {
-      type: "checkout-return",
-      business,
-      ...scoped,
-      ...session !== null ? { session } : {},
-      state
-    };
-  }
-  if (pathname === "/sign-in") {
-    const returnTo = url.searchParams.get("return");
-    return {
-      type: "sign-in",
-      business,
-      ...scoped,
-      ...returnTo !== null ? { returnTo } : {},
-      state
+      type: signIn ? "sign-in" : "checkout-return",
+      ...common,
+      ...value !== null ? { [signIn ? "returnTo" : "session"]: value } : {}
     };
   }
   if (parts[0] === "pages" && parts[1] && parts.length === 2) {
     return {
       type: "content-page",
-      business,
-      ...scoped,
-      slug: segment(parts, 1),
-      state
-    };
-  }
-  if (parts[0] === "orders" && parts.length <= 2) {
-    return {
-      type: "profile",
-      page: "orders",
-      ...parts[1] ? { order: segment(parts, 1) } : {},
-      state
+      ...common,
+      slug: segment(parts, 1)
     };
   }
   if (parts[0] === "account" && parts.length <= 2) {
@@ -86,49 +60,13 @@ var canonical = (url, state, business) => {
   }
   return null;
 };
-var overlay = (route, installation) => {
-  if (route.type !== "order-menu") {
-    return route;
-  }
-  const { authModalId, modalId } = route.state;
-  if (authModalId && SIGN_IN_MODALS.has(authModalId)) {
-    return signInFromOverlay(route, installation);
-  }
-  if (modalId?.startsWith(ITEM_MODAL_PREFIX)) {
-    return {
-      type: "item",
-      business: route.business,
-      ...route.branch !== void 0 ? { branch: route.branch } : {},
-      item: modalId.slice(ITEM_MODAL_PREFIX.length),
-      state: route.state
-    };
-  }
-  if (modalId === CART_MODAL || modalId === CHECKOUT_MODAL) {
-    return {
-      type: modalId === CART_MODAL ? "cart" : "checkout",
-      business: route.business,
-      ...route.branch !== void 0 ? { branch: route.branch } : {},
-      state: route.state
-    };
-  }
-  return route;
-};
 var parseV2 = (input, options) => {
   try {
     const url = inputUrl(input);
     const state = pageState(url);
     const installation = options.installation;
-    if (!installation) {
-      return parseV1(input, options);
-    }
     const route = canonical(url, state, installation.business);
-    if (route) {
-      return route.type === "order-menu" ? overlay(route, installation) : route;
-    }
-    return overlay(
-      parseV1(input, { ...options, contract: "v1" }),
-      installation
-    );
+    return canonicalRoute(route ?? parseV1(input, options), installation);
   } catch {
     return { type: "unknown", pathname: "", state: { query: {} } };
   }