@swell/apps-sdk 1.0.139 → 1.0.141

package/dist/index.cjs

@@ -149,31 +149,44 @@ var import_cache_manager = require("cache-manager");
 
 // src/cache/cf-worker-kv-keyv-adapter.ts
 var CFWorkerKVKeyvAdapter = class {
+  store;
   namespace;
   // magically passed in from Keyv
-  store;
+  opts;
   constructor(store) {
     this.store = store;
+    this.opts = null;
     this.namespace = "dummy";
   }
   async has(key) {
-    return this.get(key) !== void 0;
+    const stream = await this.store.get(key, "stream");
+    if (stream !== null) {
+      await stream.cancel();
+      return true;
+    }
+    return false;
   }
   async get(key) {
-    return this.store.get(key);
+    const value = await this.store.get(key);
+    return value !== null ? value : void 0;
   }
-  async set(key, value) {
-    return this.store.put(key, value);
+  set(key, value, ttl) {
+    if (typeof ttl === "number") {
+      ttl = Math.max(60, ttl / 1e3);
+    }
+    return this.store.put(key, value, { expirationTtl: ttl });
   }
   async delete(key) {
     await this.store.delete(key);
+    return true;
   }
   async clear() {
     let cursor = "";
     let complete = false;
-    while (!complete) {
+    const prefix = `${this.namespace}:`;
+    do {
       const response = await this.store.list({
-        prefix: `${this.namespace}:`,
+        prefix,
         cursor: cursor || void 0
       });
       cursor = response.cursor ?? "";
@@ -185,7 +198,10 @@ var CFWorkerKVKeyvAdapter = class {
           })
         );
       }
-    }
+    } while (!complete);
+  }
+  on(_event, _listener) {
+    return this;
   }
 };
 
@@ -7089,23 +7105,25 @@ var Cache = class {
       ...options
     });
   }
-  async fetch(key, fetchFn) {
-    return this.client.wrap(key, fetchFn);
+  async fetch(key, fetchFn, ttl) {
+    return this.client.wrap(key, fetchFn, ttl);
   }
-  // Fetch cache using SWR (stale-while-revalidate)
-  // This will always return the cached value immediately if exists
+  /**
+   * Fetch cache using SWR (stale-while-revalidate)
+   *
+   * This will always return the cached value immediately if exists
+   */
   async fetchSWR(key, fetchFn, ttl = DEFAULT_SWR_TTL) {
     const cacheValue = await this.client.get(key);
-    const promiseValue = Promise.resolve().then(() => fetchFn()).then(async (value) => {
+    const promiseValue = Promise.resolve().then(fetchFn).then(resolveAsyncResources).then(async (value) => {
       const isNull = value === null || value === void 0;
-      const valueResolved = await resolveAsyncResources(value);
-      await this.client.set(key, isNull ? NULL_VALUE : valueResolved, ttl);
+      await this.client.set(key, isNull ? NULL_VALUE : value, ttl);
       return value;
     });
     if (this.workerCtx?.waitUntil) {
       this.workerCtx.waitUntil(promiseValue);
     }
-    if (cacheValue !== null) {
+    if (cacheValue !== void 0) {
       return cacheValue === NULL_VALUE ? null : cacheValue;
     }
     const result = await promiseValue;
@@ -7122,8 +7140,9 @@ var Cache = class {
   }
   /**
    * Flushes the entire cache.
-   * WARNING: If the cache store is shared among many cache clients,
-   *          this will flush entries for other clients.
+   *
+   * __WARNING__: If the cache store is shared among many cache clients,
+   *              this will flush entries for other clients.
    */
   async flushAll() {
     await this.client.clear();
@@ -7166,7 +7185,7 @@ var ResourceCache = class extends Cache {
 function buildStores2() {
   return [
     new import_keyv2.Keyv({
-      // Disabling serialization allows for pure memo-ization of class instances
+      // Disabling serialization allows for pure memoization of class instances
       // at the tradeoff of no support for compression.
       serialize: void 0,
       deserialize: void 0
@@ -8706,11 +8725,11 @@ function getRandomId() {
 }
 
 // src/menus.ts
-var import_lodash_es11 = require("lodash-es");
+var import_lodash_es12 = require("lodash-es");
 
 // src/theme.ts
 var import_json56 = __toESM(require("json5"), 1);
-var import_lodash_es10 = require("lodash-es");
+var import_lodash_es11 = require("lodash-es");
 
 // src/compatibility/shopify.ts
 var import_lodash_es7 = require("lodash-es");
@@ -17530,7 +17549,7 @@ var tags = {
 };
 function bindTags(liquidSwell) {
   Object.entries(tags).forEach(
-    ([tag, bind62]) => liquidSwell.registerTag(tag, bind62(liquidSwell))
+    ([tag, bind63]) => liquidSwell.registerTag(tag, bind63(liquidSwell))
   );
 }
 
@@ -17814,8 +17833,16 @@ var format_address_default = {
   ]
 };
 
-// src/liquid/filters/image_tag.ts
+// src/liquid/filters/handleize.ts
+var import_lodash_es10 = require("lodash-es");
 function bind40(_liquidSwell) {
+  return function filterHandleize(handle) {
+    return (0, import_lodash_es10.kebabCase)(handle);
+  };
+}
+
+// src/liquid/filters/image_tag.ts
+function bind41(_liquidSwell) {
   return function filterImageTag(imageUrl, ...params) {
     imageUrl = String(imageUrl || "");
     let {
@@ -17979,7 +18006,7 @@ var filterDefinition = {
 var image_url_default = filterDefinition;
 
 // src/liquid/filters/inline_asset_content.ts
-function bind41(liquidSwell) {
+function bind42(liquidSwell) {
   return async (assetPath) => {
     const config = await liquidSwell.theme.getThemeConfig(
       `theme/assets/${assetPath}`
@@ -17989,14 +18016,14 @@ function bind41(liquidSwell) {
 }
 
 // src/liquid/filters/json.ts
-function bind42(_liquidSwell) {
+function bind43(_liquidSwell) {
   return async function filterJson(input, space = 0) {
     return jsonStringifyAsync(input, space);
   };
 }
 
 // src/liquid/filters/json_pretty.ts
-function bind43(_liquidSwell) {
+function bind44(_liquidSwell) {
   return async function filterJsonPretty(input, space = 2) {
     const output = await jsonStringifyAsync(input, space);
     return `<pre>${output}</pre>`;
@@ -18013,7 +18040,7 @@ function getCountryCode(localCode) {
     return localCode.toUpperCase();
   }
 }
-function bind44(_liquidSwell) {
+function bind45(_liquidSwell) {
   return (localeCode) => {
     if (typeof localeCode !== "string") {
       return flags.US;
@@ -18024,7 +18051,7 @@ function bind44(_liquidSwell) {
 }
 
 // src/liquid/filters/money.ts
-function bind45(liquidSwell) {
+function bind46(liquidSwell) {
   return function filterMoney(value) {
     const amount = value instanceof MoneyDrop ? value.toFloat() : Number(value || 0);
     return liquidSwell.renderCurrency(amount);
@@ -18032,7 +18059,7 @@ function bind45(liquidSwell) {
 }
 
 // src/liquid/filters/money_with_currency.ts
-function bind46(liquidSwell) {
+function bind47(liquidSwell) {
   return function filterMoneyWithCurrency(value) {
     const { currency } = liquidSwell.theme.swell.getStorefrontLocalization();
     const amount = value instanceof MoneyDrop ? value.toFloat() : Number(value || 0);
@@ -18041,7 +18068,7 @@ function bind46(liquidSwell) {
 }
 
 // src/liquid/filters/money_without_currency.ts
-function bind47(liquidSwell) {
+function bind48(liquidSwell) {
   return function filterMoneyWithoutCurrency(value) {
     const amount = value instanceof MoneyDrop ? value.toFloat() : Number(value || 0);
     return liquidSwell.renderCurrency(amount).replace(/[^0-9.,]/g, "");
@@ -18049,7 +18076,7 @@ function bind47(liquidSwell) {
 }
 
 // src/liquid/filters/money_without_trailing_zeros.ts
-function bind48(liquidSwell) {
+function bind49(liquidSwell) {
   return function filterMoneyWithoutTrailingZeros(value) {
     const amount = value instanceof MoneyDrop ? value.toFloat() : Number(value || 0);
     return liquidSwell.renderCurrency(amount).split(".")[0].split(",")[0];
@@ -18057,21 +18084,21 @@ function bind48(liquidSwell) {
 }
 
 // src/liquid/filters/script_tag.ts
-function bind49(_liquidSwell) {
+function bind50(_liquidSwell) {
   return function filterScriptTag(assetUrl) {
     return `<script src="${assetUrl}" type="text/javascript"></script>`;
   };
 }
 
 // src/liquid/filters/stylesheet_tag.ts
-function bind50(_liquidSwell) {
+function bind51(_liquidSwell) {
   return function filterStyleSheetTag(assetUrl) {
     return `<link href="${assetUrl}" rel="stylesheet" type="text/css" media="all" />`;
   };
 }
 
 // src/liquid/filters/time_tag.ts
-function bind51(_liquidSwell) {
+function bind52(_liquidSwell) {
   const dateFilter = bind33(_liquidSwell);
   return (dateValue, ...params) => {
     const date = ensureDate(dateValue);
@@ -18082,7 +18109,7 @@ function bind51(_liquidSwell) {
 }
 
 // src/liquid/filters/translate.ts
-function bind52(liquidSwell) {
+function bind53(liquidSwell) {
   return async function filterTranslate(key, params) {
     const props = params && paramsToProps(params);
     const str = await liquidSwell.renderTranslation(key, props);
@@ -18091,7 +18118,7 @@ function bind52(liquidSwell) {
 }
 
 // src/liquid/filters/where.ts
-function bind53(_liquidSwell) {
+function bind54(_liquidSwell) {
   return function* filterWhere(arr, property, expected) {
     const results = [];
     const list = yield resolveEnumerable(arr);
@@ -18145,7 +18172,7 @@ function getSizesFromParam(param) {
     height: height ? Number(height) : void 0
   };
 }
-function bind54(liquidSwell) {
+function bind55(liquidSwell) {
   return async function filterAssetImgUrl(assetPath, size = "small") {
     const imageUrl = await liquidSwell.getAssetUrl(assetPath).then((url) => url || "");
     const sizes = getSizesFromParam(size);
@@ -18161,7 +18188,7 @@ function bind54(liquidSwell) {
 }
 
 // src/liquid/filters/shopify/hex_to_rgba.ts
-function bind55(_liquidSwell) {
+function bind56(_liquidSwell) {
   return (color, alpha) => {
     return ThemeColor.get(color).rgba(alpha || 1);
   };
@@ -18181,14 +18208,14 @@ var item_count_for_variant_default = {
 };
 
 // src/liquid/filters/shopify/payment_button.ts
-function bind56(_liquidSwell) {
+function bind57(_liquidSwell) {
   return (form) => {
     return null;
   };
 }
 
 // src/liquid/filters/shopify/payment_terms.ts
-function bind57(_liquidSwell) {
+function bind58(_liquidSwell) {
   return (form) => {
     return null;
   };
@@ -18290,7 +18317,7 @@ var svgs = {
 var placeholder_svgs_default = svgs;
 
 // src/liquid/filters/shopify/placeholder_svg_tag.ts
-function bind58(_liquidSwell) {
+function bind59(_liquidSwell) {
   return function filterPlaceholderSvgTag(name, className) {
     const svg = placeholder_svgs_default[name];
     if (typeof svg === "object" && svg !== null) {
@@ -18301,7 +18328,7 @@ function bind58(_liquidSwell) {
 }
 
 // src/liquid/filters/shopify/shopify_asset_url.ts
-function bind59(_liquidSwell) {
+function bind60(_liquidSwell) {
   return function filterShopifyAssetUrl(input) {
     if (typeof input === "string") {
       switch (input) {
@@ -18326,7 +18353,7 @@ function bind59(_liquidSwell) {
 }
 
 // src/liquid/filters/shopify/structured_data.ts
-function bind60(_liquidSwell) {
+function bind61(_liquidSwell) {
   return async function filterStructuredData(input) {
     let value = input;
     if (value instanceof StorefrontResource) {
@@ -18404,7 +18431,7 @@ function convertToSchemaOrgProductGroup(product) {
 }
 
 // src/liquid/filters/inline_editable.ts
-function bind61(_liquidSwell) {
+function bind62(_liquidSwell) {
   return (value, key) => {
     if (typeof value === "object" && "value" in value) {
       value = value.value;
@@ -18438,34 +18465,37 @@ var filters = {
   font_modify: bind38,
   font_url: bind39,
   format_address: format_address_default,
-  image_tag: bind40,
+  handle: bind40,
+  // alias
+  handleize: bind40,
+  image_tag: bind41,
   image_url: image_url_default,
-  inline_asset_content: bind41,
-  json: bind42,
-  json_pretty: bind43,
-  locale_flag: bind44,
-  money: bind45,
-  money_with_currency: bind46,
-  money_without_currency: bind47,
-  money_without_trailing_zeros: bind48,
-  script_tag: bind49,
-  stylesheet_tag: bind50,
-  time_tag: bind51,
-  translate: bind52,
-  t: bind52,
+  inline_asset_content: bind42,
+  json: bind43,
+  json_pretty: bind44,
+  locale_flag: bind45,
+  money: bind46,
+  money_with_currency: bind47,
+  money_without_currency: bind48,
+  money_without_trailing_zeros: bind49,
+  script_tag: bind50,
+  stylesheet_tag: bind51,
+  time_tag: bind52,
+  translate: bind53,
+  t: bind53,
   // alias
-  where: bind53,
+  where: bind54,
   // Shopify compatibility only
-  asset_img_url: bind54,
-  hex_to_rgba: bind55,
+  asset_img_url: bind55,
+  hex_to_rgba: bind56,
   item_count_for_variant: item_count_for_variant_default,
-  payment_button: bind56,
-  payment_terms: bind57,
-  placeholder_svg_tag: bind58,
-  shopify_asset_url: bind59,
-  structured_data: bind60,
+  payment_button: bind57,
+  payment_terms: bind58,
+  placeholder_svg_tag: bind59,
+  shopify_asset_url: bind60,
+  structured_data: bind61,
   // Swell only
-  inline_editable: bind61
+  inline_editable: bind62
 };
 function bindFilters(liquidSwell) {
   for (const [tag, handler] of Object.entries(filters)) {
@@ -18479,8 +18509,8 @@ function bindFilters(liquidSwell) {
     }
   }
 }
-function bindWithResolvedProps(liquidSwell, bind62, resolve = []) {
-  const handler = bind62(liquidSwell);
+function bindWithResolvedProps(liquidSwell, bind63, resolve = []) {
+  const handler = bind63(liquidSwell);
   if (!Array.isArray(resolve)) {
     return handler;
   }
@@ -18924,28 +18954,30 @@ var ThemeLoader = class _ThemeLoader {
    * Fetches a theme config by file path.
    */
   async fetchThemeConfig(filePath) {
-    const themeConfig = this.configs.get(filePath);
-    if (themeConfig !== void 0) {
-      return themeConfig;
+    const config = this.configs.get(filePath);
+    if (config !== void 0) {
+      return config;
     }
     const hash = this.manifest?.get(filePath);
     if (!hash) {
       return null;
     }
     const cache = this.getCache();
-    let config = await cache.get(`config:${hash}`);
-    if (config) {
-      const themeId = this.getThemeId();
-      if (themeId && config.file?.url) {
-        const fileUrl = await cache.get(
-          `file:${themeId}:${config.hash}`
-        );
-        if (fileUrl) {
-          config = { ...config, file: { ...config.file, url: fileUrl } };
-        }
+    const themeId = this.getThemeId();
+    const [themeConfig, fileUrl] = await Promise2.all([
+      cache.get(`config:${hash}`),
+      themeId ? cache.get(`file:${themeId}:${hash}`) : void 0
+    ]);
+    if (themeConfig) {
+      let config2 = themeConfig;
+      if (fileUrl && themeConfig.file?.url) {
+        config2 = {
+          ...themeConfig,
+          file: { ...themeConfig.file, url: fileUrl }
+        };
       }
-      this.configs.set(filePath, config);
-      return config;
+      this.configs.set(filePath, config2);
+      return config2;
     }
     return this.fetchThemeConfigsFromSourceByPath(filePath, hash);
   }
@@ -18994,18 +19026,20 @@ var ThemeLoader = class _ThemeLoader {
     await Promise2.map(
       manifest.values(),
       async (configHash) => {
-        let config = await cache.get(`config:${configHash}`);
-        if (!config) {
+        const [themeConfig, fileUrl] = await Promise2.all([
+          cache.get(`config:${configHash}`),
+          themeId ? cache.get(`file:${themeId}:${configHash}`) : void 0
+        ]);
+        if (!themeConfig) {
           configHashesUnresolved.push(configHash);
           return;
         }
-        if (themeId && config.file?.url) {
-          const fileUrl = await cache.get(
-            `file:${themeId}:${configHash}`
-          );
-          if (fileUrl) {
-            config = { ...config, file: { ...config.file, url: fileUrl } };
-          }
+        let config = themeConfig;
+        if (fileUrl && themeConfig.file?.url) {
+          config = {
+            ...themeConfig,
+            file: { ...themeConfig.file, url: fileUrl }
+          };
         }
         configsByHash.set(config.hash, config);
         this.configs.set(config.file_path, config);
@@ -19389,13 +19423,15 @@ var SwellTheme3 = class {
     const [cart, account] = await Promise.all([
       this.fetchSingletonResourceCached(
         "cart",
+        // The cached cart may be null, but we need the StorefrontResource
         () => this.fetchCart(),
-        {}
+        // Default value (always StorefrontResource)
+        () => this.fetchCart()
       ),
       this.fetchSingletonResourceCached(
         "account",
         () => this.fetchAccount(),
-        null
+        () => null
       )
     ]);
     if (!cart) {
@@ -19418,13 +19454,14 @@ var SwellTheme3 = class {
   async fetchSingletonResourceCached(key, handler, defaultValue) {
     const cacheKey = this.swell.storefront.session.getCookie();
     if (!cacheKey) {
-      return defaultValue;
+      return defaultValue();
     }
-    return this.swell.getCachedResource(
+    const result = await this.swell.getCachedResource(
       `${key}-${cacheKey}`,
       [],
-      () => handler()
+      handler
     );
+    return result ?? defaultValue();
   }
   async fetchCart() {
     const CartResource = this.resources?.singletons?.cart;
@@ -19565,7 +19602,7 @@ var SwellTheme3 = class {
       return languageConfig;
     }
     const localeShortCode = locale.split("-")[0];
-    return (0, import_lodash_es10.reduce)(
+    return (0, import_lodash_es11.reduce)(
       languageConfig,
       (acc, value, key) => {
         if (isObject2(value)) {
@@ -19589,15 +19626,15 @@ var SwellTheme3 = class {
             const translationEnd = translationParts.pop();
             const translationPath = translationParts.join(".");
             const translationConfigGlobal = this.globals.language;
-            acc[key] = (0, import_lodash_es10.get)(
+            acc[key] = (0, import_lodash_es11.get)(
               translationConfigGlobal,
               `${translationPath}.$locale.${locale}.${translationEnd}`
-            ) || (0, import_lodash_es10.get)(
+            ) || (0, import_lodash_es11.get)(
               translationConfigGlobal,
               `${translationPath}.$locale.${localeShortCode}.${translationEnd}`
-            ) || (0, import_lodash_es10.get)(translationConfigGlobal, translationKey) || value;
+            ) || (0, import_lodash_es11.get)(translationConfigGlobal, translationKey) || value;
           } else {
-            acc[key] = (0, import_lodash_es10.get)(languageConfig, `$locale.${locale}.${key}`) || (0, import_lodash_es10.get)(languageConfig, `$locale.${localeShortCode}.${key}`) || value;
+            acc[key] = (0, import_lodash_es11.get)(languageConfig, `$locale.${locale}.${key}`) || (0, import_lodash_es11.get)(languageConfig, `$locale.${localeShortCode}.${key}`) || value;
           }
         }
         return acc;
@@ -20385,8 +20422,8 @@ ${this.shopifyCompatibility.getContentForHeader()}`;
     const keyParts = key?.split(".") || [];
     const keyName = keyParts.pop() || "";
     const keyPath = keyParts.join(".");
-    const langObject = (0, import_lodash_es10.get)(langConfig, keyPath);
-    let localeValue = (0, import_lodash_es10.get)(langObject?.[localeCode], keyName) || (0, import_lodash_es10.get)(langObject?.[localeCode.split("-")[0]], keyName) || langObject?.[keyName];
+    const langObject = (0, import_lodash_es11.get)(langConfig, keyPath);
+    let localeValue = (0, import_lodash_es11.get)(langObject?.[localeCode], keyName) || (0, import_lodash_es11.get)(langObject?.[localeCode.split("-")[0]], keyName) || langObject?.[keyName];
     if (data?.count !== void 0 && localeValue?.one) {
       localeValue = data.count === 1 ? localeValue.one : localeValue.other;
     }
@@ -20465,7 +20502,7 @@ function fillDefaultThemeSettings(themeSettings, editorSchemaSettings) {
   }
 }
 function resolveThemeSettings(theme, themeSettings, editorSchemaSettings) {
-  const settings = (0, import_lodash_es10.cloneDeep)(themeSettings);
+  const settings = (0, import_lodash_es11.cloneDeep)(themeSettings);
   if (settings.$locale) {
     const { locale } = theme.swell.getStorefrontLocalization();
     const localeConfig = settings.$locale[locale] || {};
@@ -20475,16 +20512,16 @@ function resolveThemeSettings(theme, themeSettings, editorSchemaSettings) {
       }
     }
   }
-  (0, import_lodash_es10.each)(settings, (value, key) => {
+  (0, import_lodash_es11.each)(settings, (value, key) => {
     const setting = (editorSchemaSettings && findEditorSetting(editorSchemaSettings, key)) ?? null;
     if (isObject2(value) && !(value instanceof StorefrontResource)) {
       switch (setting?.type) {
         case "color_scheme_group": {
-          (0, import_lodash_es10.each)(value, (scheme, schemeId) => {
+          (0, import_lodash_es11.each)(value, (scheme, schemeId) => {
             if (isObject2(scheme) && typeof scheme.settings === "object" && scheme.settings) {
               const settings2 = scheme.settings;
-              (0, import_lodash_es10.each)(settings2, (colorValue, colorId) => {
-                const fieldDef = (0, import_lodash_es10.find)(setting.fields, { id: colorId });
+              (0, import_lodash_es11.each)(settings2, (colorValue, colorId) => {
+                const fieldDef = (0, import_lodash_es11.find)(setting.fields, { id: colorId });
                 if (fieldDef?.type === "color" && colorValue) {
                   scheme.id = schemeId;
                   settings2[colorId] = new ThemeColor(colorValue);
@@ -20535,7 +20572,7 @@ function resolveThemeSettings(theme, themeSettings, editorSchemaSettings) {
 }
 function findThemeSettingsByType(type, themeSettings, editorSchemaSettings) {
   const foundSettings = [];
-  (0, import_lodash_es10.each)(themeSettings, (value, key) => {
+  (0, import_lodash_es11.each)(themeSettings, (value, key) => {
     if (isObject2(value) && !(value instanceof ThemeFont) && !(value instanceof StorefrontResource)) {
       foundSettings.push(
         ...findThemeSettingsByType(type, value, editorSchemaSettings)
@@ -20666,13 +20703,20 @@ async function resolveMenuItems(theme, menuItems, options) {
 async function resolveMenuItemUrlAndResource(theme, item, options) {
   if (!item) return { url: "#invalid-link-item" };
   if (typeof item === "object" && item !== null) {
-    let { url, resource } = await getMenuItemUrlAndResource(theme, item);
-    const endsWithSlash = url.slice(-1) === "/";
-    if (options?.trailingSlash && !endsWithSlash && url.length > 1) {
-      url = url + "/";
-    }
-    if (!options?.trailingSlash && endsWithSlash && url.length > 1) {
-      url = url.slice(0, -1);
+    const { url: itemUrl, resource } = await getMenuItemUrlAndResource(
+      theme,
+      item
+    );
+    let url = itemUrl;
+    if (url.length > 1) {
+      const endsWithSlash = url.endsWith("/");
+      if (options?.trailingSlash) {
+        if (!endsWithSlash) {
+          url = url + "/";
+        }
+      } else if (endsWithSlash) {
+        url = url.slice(0, -1);
+      }
     }
     return { url, resource };
   } else {
@@ -20697,7 +20741,7 @@ function isChildItemActive(items) {
 }
 function getMenuItemValueId(value) {
   const fallback = typeof value === "string" ? value : "";
-  const slug = (0, import_lodash_es11.get)(value, "id", (0, import_lodash_es11.get)(value, "slug", fallback)) || "";
+  const slug = (0, import_lodash_es12.get)(value, "id", (0, import_lodash_es12.get)(value, "slug", fallback)) || "";
   return slug;
 }
 async function getMenuItemUrlAndResource(theme, menuItem) {
@@ -20714,43 +20758,40 @@ async function getMenuItemUrlAndResource(theme, menuItem) {
       return {
         url: getMenuItemStorefrontUrl(theme, "index")
       };
-    case "category" /* Category */:
+    case "category" /* Category */: {
       if (!id) {
         return {
           url: getMenuItemStorefrontUrl(theme, "categories/index")
         };
       }
-      return await deferMenuItemUrlAndResource(
-        theme,
-        "categories/category",
-        id
-      );
-    case "product" /* Product */:
+      return deferMenuItemUrlAndResource(theme, "categories/category", id);
+    }
+    case "product" /* Product */: {
       if (!id) {
         return {
           url: getMenuItemStorefrontUrl(theme, "products/index")
         };
       }
-      return await deferMenuItemUrlAndResource(theme, "products/product", id);
+      return deferMenuItemUrlAndResource(theme, "products/product", id);
+    }
+    case "product_list" /* ProductList */:
+      return {
+        url: getMenuItemStorefrontUrl(theme, "products/index")
+      };
     case "page" /* Page */:
-      return await deferMenuItemUrlAndResource(theme, "pages/page", id);
+      return deferMenuItemUrlAndResource(theme, "pages/page", id);
     case "blog" /* Blog */:
-      return await deferMenuItemUrlAndResource(
-        theme,
-        "blogs/blog",
-        id,
-        async (blog) => {
-          const blogCategory = new SwellStorefrontRecord(
-            theme.swell,
-            "content/blog-categories",
-            blog.category_id
-          );
-          return blogCategory.slug;
-        }
-      );
+      return deferMenuItemUrlAndResource(theme, "blogs/blog", id, (blog) => {
+        const blogCategory = new SwellStorefrontRecord(
+          theme.swell,
+          "content/blog-categories",
+          blog.category_id
+        );
+        return blogCategory.slug;
+      });
     case "blog_category" /* BlogCategory */:
-      return await deferMenuItemUrlAndResource(theme, "blogs/category", id);
-    case "content_list" /* ContentList */:
+      return deferMenuItemUrlAndResource(theme, "blogs/category", id);
+    case "content_list" /* ContentList */: {
       if (model) {
         const slug = model?.replace("content/", "");
         return {
@@ -20759,10 +20800,11 @@ async function getMenuItemUrlAndResource(theme, menuItem) {
         };
       }
       break;
-    case "content" /* Content */:
+    }
+    case "content" /* Content */: {
       if (model) {
         const collectionSlug = model?.replace("content/", "");
-        return await deferMenuItemUrlAndResource(
+        return deferMenuItemUrlAndResource(
           theme,
           "content/content",
           id,
@@ -20770,6 +20812,7 @@ async function getMenuItemUrlAndResource(theme, menuItem) {
         );
       }
       break;
+    }
     case "search" /* Search */:
       return {
         url: getMenuItemStorefrontUrl(theme, "search")