@swell/apps-sdk 1.0.181 → 1.0.183

package/dist/index.js

@@ -915,7 +915,10 @@
       }
       return this._resolve().then(() => this.makeIterator());
     }
-    makeIterator() {
+    async makeIterator() {
+      if (isLikePromise(this.results)) {
+        await this.results;
+      }
       return (this.results || []).values();
     }
     _clone(newProps) {
@@ -3667,11 +3670,11 @@
     );
   }
   function getCountryCodeFromLocale(locale) {
-    const split = locale.split(/-|_/);
-    const country = split.pop()?.toUpperCase();
-    const lang = split.join("-");
-    const code = country ? country : LANG_TO_COUNTRY_CODES[lang] || "";
-    return code.toLowerCase();
+    const [lang, country] = locale.split(/-|_/);
+    if (country) {
+      return country.toLowerCase();
+    }
+    return (LANG_TO_COUNTRY_CODES[lang] || "").toLowerCase();
   }
   function getCountryByCurrency(currencyCode) {
     if (currencyCode in CURRENCY_COUNTRIES) {
@@ -6279,11 +6282,11 @@ ${formattedMessage}`;
   }
 
   // src/menus.ts
-  var import_lodash_es14 = __require("lodash-es");
+  var import_lodash_es15 = __require("lodash-es");
 
   // src/theme.ts
   var import_json56 = __toESM(__require("json5"), 1);
-  var import_lodash_es13 = __require("lodash-es");
+  var import_lodash_es14 = __require("lodash-es");
 
   // src/compatibility/shopify.ts
   var import_lodash_es7 = __require("lodash-es");
@@ -10243,6 +10246,9 @@ ${formattedMessage}`;
 
   // src/compatibility/shopify-fonts.ts
   function shopifyFontToThemeFront(shopifyFontSetting) {
+    if (typeof shopifyFontSetting !== "string") {
+      return null;
+    }
     const pos = shopifyFontSetting.lastIndexOf("_");
     const familyId = shopifyFontSetting.substring(0, pos);
     const variantId = shopifyFontSetting.substring(pos + 1);
@@ -12670,7 +12676,7 @@ ${formattedMessage}`;
         );
       }),
       items_subtotal_price: defer(() => instance.toShopifyPrice(cart.sub_total)),
-      note: defer(() => cart.comments),
+      note: deferWith(cart, (cart2) => cart2.comments),
       original_total_price: deferWith(
         cart,
         (cart2) => instance.toShopifyPrice(cart2.sub_total)
@@ -13755,15 +13761,10 @@ ${formattedMessage}`;
       switch (typeof key) {
         case "string": {
           if (key === "all") {
-            let resource = this.#map.get(key);
-            if (resource === void 0) {
-              resource = ShopifyCollection(
-                this.#instance,
-                new AllCategoryResource(this.#instance)
-              );
-              this.#map.set(key, resource);
-            }
-            return resource;
+            return this.getAllCollection();
+          }
+          if (key === "size") {
+            return this.getAllCollectionsSize();
           }
           return this.getCollection(key);
         }
@@ -13793,6 +13794,21 @@ ${formattedMessage}`;
       }
       return resource;
     }
+    getAllCollection() {
+      let resource = this.#map.get("all");
+      if (resource === void 0) {
+        resource = ShopifyCollection(
+          this.#instance,
+          new AllCategoryResource(this.#instance)
+        );
+        this.#map.set("all", resource);
+      }
+      return resource;
+    }
+    getAllCollectionsSize() {
+      const count = this.#instance.theme.globals.shop?.collections_count;
+      return count || 0;
+    }
   };
   var Collections = class extends SwellStorefrontCollection {
     #drop;
@@ -15562,7 +15578,7 @@ ${injects.join("\n")}<\/script>`;
   };
   function bindTags(liquidSwell) {
     Object.entries(tags).forEach(
-      ([tag, bind66]) => liquidSwell.registerTag(tag, bind66(liquidSwell))
+      ([tag, bind67]) => liquidSwell.registerTag(tag, bind67(liquidSwell))
     );
   }
 
@@ -15830,8 +15846,22 @@ ${injects.join("\n")}<\/script>`;
     };
   }
 
-  // src/liquid/filters/font_face.ts
+  // src/liquid/filters/escape.ts
+  var import_lodash_es11 = __require("lodash-es");
   function bind38(_liquidSwell) {
+    return function escapeTag(input) {
+      if (!input?.startsWith) {
+        return input;
+      }
+      if (input.startsWith("<img") || input.startsWith("<video")) {
+        return input;
+      }
+      return (0, import_lodash_es11.escape)(input);
+    };
+  }
+
+  // src/liquid/filters/font_face.ts
+  function bind39(_liquidSwell) {
     return (fontSetting, ...params) => {
       if (!fontSetting) {
         return null;
@@ -15843,14 +15873,14 @@ ${injects.join("\n")}<\/script>`;
   }
 
   // src/liquid/filters/font_modify.ts
-  function bind39(_liquidSwell) {
+  function bind40(_liquidSwell) {
     return (fontSetting, prop, value) => {
       return ThemeFont.clone(fontSetting).modify(prop, value);
     };
   }
 
   // src/liquid/filters/font_url.ts
-  function bind40(_liquidSwell) {
+  function bind41(_liquidSwell) {
     return (fontSetting) => {
       return ThemeFont.get(fontSetting).url();
     };
@@ -15899,15 +15929,15 @@ ${injects.join("\n")}<\/script>`;
   };
 
   // src/liquid/filters/handleize.ts
-  var import_lodash_es11 = __require("lodash-es");
-  function bind41(_liquidSwell) {
+  var import_lodash_es12 = __require("lodash-es");
+  function bind42(_liquidSwell) {
     return function filterHandleize(handle) {
-      return (0, import_lodash_es11.kebabCase)(handle);
+      return (0, import_lodash_es12.kebabCase)(handle);
     };
   }
 
   // src/liquid/filters/image_tag.ts
-  function bind42(_liquidSwell) {
+  function bind43(_liquidSwell) {
     return function filterImageTag(imageUrl, ...params) {
       imageUrl = String(imageUrl || "");
       let {
@@ -16071,7 +16101,7 @@ ${injects.join("\n")}<\/script>`;
   var image_url_default = filterDefinition;
 
   // src/liquid/filters/inline_asset_content.ts
-  function bind43(liquidSwell) {
+  function bind44(liquidSwell) {
     return async (assetPath) => {
       const config = await liquidSwell.theme.getThemeConfig(
         `theme/assets/${assetPath}`
@@ -16081,14 +16111,14 @@ ${injects.join("\n")}<\/script>`;
   }
 
   // src/liquid/filters/json.ts
-  function bind44(_liquidSwell) {
+  function bind45(_liquidSwell) {
     return async function filterJson(input, space = 0) {
       return jsonStringifyAsync(input, space);
     };
   }
 
   // src/liquid/filters/json_pretty.ts
-  function bind45(_liquidSwell) {
+  function bind46(_liquidSwell) {
     return async function filterJsonPretty(input, space = 2) {
       const output = await jsonStringifyAsync(input, space);
       return `<pre>${output}</pre>`;
@@ -16098,25 +16128,18 @@ ${injects.join("\n")}<\/script>`;
   // src/liquid/filters/locale_flag.ts
   var import_country_flag_icons = __require("country-flag-icons");
   var flags = __toESM(__require("country-flag-icons/string/1x1"), 1);
-  function getCountryCode(localCode) {
-    if (localCode.includes("-")) {
-      return localCode.split("-")[1].toUpperCase();
-    } else {
-      return localCode.toUpperCase();
-    }
-  }
-  function bind46(_liquidSwell) {
+  function bind47(_liquidSwell) {
     return (localeCode) => {
       if (typeof localeCode !== "string") {
         return flags.US;
       }
-      const countryCode = getCountryCode(localeCode);
+      const countryCode = getCountryCodeFromLocale(localeCode).toUpperCase();
       return (0, import_country_flag_icons.hasFlag)(countryCode) ? flags[countryCode] : flags.US;
     };
   }
 
   // src/liquid/filters/minus.ts
-  function bind47(_liquidSwell) {
+  function bind48(_liquidSwell) {
     return (first, second) => {
       const firstValue = isNumber(first) ? first : 0;
       const secondValue = isNumber(second) ? second : 0;
@@ -16125,7 +16148,7 @@ ${injects.join("\n")}<\/script>`;
   }
 
   // src/liquid/filters/money.ts
-  function bind48(liquidSwell) {
+  function bind49(liquidSwell) {
     return function filterMoney(value) {
       const amount = getMoneyAmount(liquidSwell, value);
       return liquidSwell.renderCurrency(amount);
@@ -16142,7 +16165,7 @@ ${injects.join("\n")}<\/script>`;
   }
 
   // src/liquid/filters/money_with_currency.ts
-  function bind49(liquidSwell) {
+  function bind50(liquidSwell) {
     return function filterMoneyWithCurrency(value) {
       const { currency } = liquidSwell.theme.swell.getStorefrontLocalization();
       const amount = getMoneyAmount(liquidSwell, value);
@@ -16151,7 +16174,7 @@ ${injects.join("\n")}<\/script>`;
   }
 
   // src/liquid/filters/money_without_currency.ts
-  function bind50(liquidSwell) {
+  function bind51(liquidSwell) {
     return function filterMoneyWithoutCurrency(value) {
       const amount = getMoneyAmount(liquidSwell, value);
       return liquidSwell.renderCurrency(amount).replace(/[^0-9.,]/g, "");
@@ -16159,7 +16182,7 @@ ${injects.join("\n")}<\/script>`;
   }
 
   // src/liquid/filters/money_without_trailing_zeros.ts
-  function bind51(liquidSwell) {
+  function bind52(liquidSwell) {
     return function filterMoneyWithoutTrailingZeros(value) {
       const amount = getMoneyAmount(liquidSwell, value);
       return liquidSwell.renderCurrency(amount).split(".")[0].split(",")[0];
@@ -16167,21 +16190,21 @@ ${injects.join("\n")}<\/script>`;
   }
 
   // src/liquid/filters/script_tag.ts
-  function bind52(_liquidSwell) {
+  function bind53(_liquidSwell) {
     return function filterScriptTag(assetUrl) {
       return `<script src="${assetUrl}" type="text/javascript"><\/script>`;
     };
   }
 
   // src/liquid/filters/stylesheet_tag.ts
-  function bind53(_liquidSwell) {
+  function bind54(_liquidSwell) {
     return function filterStyleSheetTag(assetUrl) {
       return `<link href="${assetUrl}" rel="stylesheet" type="text/css" media="all" />`;
     };
   }
 
   // src/liquid/filters/time_tag.ts
-  function bind54(_liquidSwell) {
+  function bind55(_liquidSwell) {
     const dateFilter = bind33(_liquidSwell);
     return (dateValue, ...params) => {
       const date = ensureDate(dateValue);
@@ -16192,7 +16215,7 @@ ${injects.join("\n")}<\/script>`;
   }
 
   // src/liquid/filters/translate.ts
-  function bind55(liquidSwell) {
+  function bind56(liquidSwell) {
     return async function filterTranslate(key, params) {
       const props = params && paramsToProps(params);
       const str = await liquidSwell.renderTranslation(key, props);
@@ -16201,7 +16224,7 @@ ${injects.join("\n")}<\/script>`;
   }
 
   // src/liquid/filters/where.ts
-  function bind56(_liquidSwell) {
+  function bind57(_liquidSwell) {
     return function* filterWhere(arr, property, expected) {
       const results = [];
       const list = yield resolveEnumerable(arr);
@@ -16255,7 +16278,7 @@ ${injects.join("\n")}<\/script>`;
       height: height ? Number(height) : void 0
     };
   }
-  function bind57(liquidSwell) {
+  function bind58(liquidSwell) {
     return async function filterAssetImgUrl(assetPath, size = "small") {
       const imageUrl = await liquidSwell.getAssetUrl(assetPath).then((url) => url || "");
       const sizes = getSizesFromParam(size);
@@ -16271,14 +16294,14 @@ ${injects.join("\n")}<\/script>`;
   }
 
   // src/liquid/filters/shopify/hex_to_rgba.ts
-  function bind58(_liquidSwell) {
+  function bind59(_liquidSwell) {
     return (color, alpha) => {
       return ThemeColor.get(color).rgba(alpha || 1);
     };
   }
 
   // src/liquid/filters/shopify/img_url.ts
-  function bind59(liquidSwell) {
+  function bind60(liquidSwell) {
     return async function filterImgUrl(input, ...params) {
       const url = await getImageUrlFromInput(input, liquidSwell);
       if (typeof url !== "string" || url === "") {
@@ -16316,14 +16339,14 @@ ${injects.join("\n")}<\/script>`;
   };
 
   // src/liquid/filters/shopify/payment_button.ts
-  function bind60(_liquidSwell) {
+  function bind61(_liquidSwell) {
     return (form) => {
-      return null;
+      return `<button style="display: block; visibility: hidden;"></button>`;
     };
   }
 
   // src/liquid/filters/shopify/payment_terms.ts
-  function bind61(_liquidSwell) {
+  function bind62(_liquidSwell) {
     return (form) => {
       return null;
     };
@@ -16425,7 +16448,7 @@ ${injects.join("\n")}<\/script>`;
   var placeholder_svgs_default = svgs;
 
   // src/liquid/filters/shopify/placeholder_svg_tag.ts
-  function bind62(_liquidSwell) {
+  function bind63(_liquidSwell) {
     return function filterPlaceholderSvgTag(name, className) {
       const svg = placeholder_svgs_default[name];
       if (typeof svg === "object" && svg !== null) {
@@ -16436,7 +16459,7 @@ ${injects.join("\n")}<\/script>`;
   }
 
   // src/liquid/filters/shopify/shopify_asset_url.ts
-  function bind63(_liquidSwell) {
+  function bind64(_liquidSwell) {
     return function filterShopifyAssetUrl(input) {
       if (typeof input === "string") {
         switch (input) {
@@ -16461,7 +16484,7 @@ ${injects.join("\n")}<\/script>`;
   }
 
   // src/liquid/filters/shopify/structured_data.ts
-  function bind64(_liquidSwell) {
+  function bind65(_liquidSwell) {
     return async function filterStructuredData(input) {
       let value = input;
       if (value instanceof StorefrontResource) {
@@ -16539,7 +16562,7 @@ ${injects.join("\n")}<\/script>`;
   }
 
   // src/liquid/filters/inline_editable.ts
-  function bind65(_liquidSwell) {
+  function bind66(_liquidSwell) {
     return (value, key) => {
       if (typeof value === "object" && "value" in value) {
         value = value.value;
@@ -16570,43 +16593,44 @@ ${injects.join("\n")}<\/script>`;
     default_errors: bind35,
     divided_by: bind36,
     embedded_content: bind37,
-    font_face: bind38,
-    font_modify: bind39,
-    font_url: bind40,
+    escape: bind38,
+    font_face: bind39,
+    font_modify: bind40,
+    font_url: bind41,
     format_address: format_address_default,
-    handle: bind41,
+    handle: bind42,
     // alias
-    handleize: bind41,
-    image_tag: bind42,
+    handleize: bind42,
+    image_tag: bind43,
     image_url: image_url_default,
-    inline_asset_content: bind43,
-    json: bind44,
-    json_pretty: bind45,
-    locale_flag: bind46,
-    minus: bind47,
-    money: bind48,
-    money_with_currency: bind49,
-    money_without_currency: bind50,
-    money_without_trailing_zeros: bind51,
-    script_tag: bind52,
-    stylesheet_tag: bind53,
-    time_tag: bind54,
-    translate: bind55,
-    t: bind55,
+    inline_asset_content: bind44,
+    json: bind45,
+    json_pretty: bind46,
+    locale_flag: bind47,
+    minus: bind48,
+    money: bind49,
+    money_with_currency: bind50,
+    money_without_currency: bind51,
+    money_without_trailing_zeros: bind52,
+    script_tag: bind53,
+    stylesheet_tag: bind54,
+    time_tag: bind55,
+    translate: bind56,
+    t: bind56,
     // alias
-    where: bind56,
+    where: bind57,
     // Shopify compatibility only
-    asset_img_url: bind57,
-    hex_to_rgba: bind58,
-    img_url: bind59,
+    asset_img_url: bind58,
+    hex_to_rgba: bind59,
+    img_url: bind60,
     item_count_for_variant: item_count_for_variant_default,
-    payment_button: bind60,
-    payment_terms: bind61,
-    placeholder_svg_tag: bind62,
-    shopify_asset_url: bind63,
-    structured_data: bind64,
+    payment_button: bind61,
+    payment_terms: bind62,
+    placeholder_svg_tag: bind63,
+    shopify_asset_url: bind64,
+    structured_data: bind65,
     // Swell only
-    inline_editable: bind65
+    inline_editable: bind66
   };
   function bindFilters(liquidSwell) {
     for (const [tag, handler] of Object.entries(filters)) {
@@ -16620,8 +16644,8 @@ ${injects.join("\n")}<\/script>`;
       }
     }
   }
-  function bindWithResolvedProps(liquidSwell, bind66, resolve = []) {
-    const handler = bind66(liquidSwell);
+  function bindWithResolvedProps(liquidSwell, bind67, resolve = []) {
+    const handler = bind67(liquidSwell);
     if (!Array.isArray(resolve)) {
       return handler;
     }
@@ -17323,7 +17347,7 @@ ${injects.join("\n")}<\/script>`;
   };
 
   // src/globals.ts
-  var import_lodash_es12 = __require("lodash-es");
+  var import_lodash_es13 = __require("lodash-es");
 
   // src/compatibility/drops/robots-rule.ts
   var import_liquidjs35 = __require("liquidjs");
@@ -17423,7 +17447,7 @@ ${injects.join("\n")}<\/script>`;
     }).filter(Boolean).join("\n");
   }
   function getRobotsGlobals(canonicalUrl) {
-    const sitemapUrl = `${(0, import_lodash_es12.trimEnd)(canonicalUrl, "/")}/sitemap.xml`;
+    const sitemapUrl = `${(0, import_lodash_es13.trimEnd)(canonicalUrl, "/")}/sitemap.xml`;
     const defaultRules = [
       { directive: "Disallow", value: "/admin" },
       { directive: "Disallow", value: "/cart" },
@@ -17918,7 +17942,7 @@ ${injects.join("\n")}<\/script>`;
         return languageConfig;
       }
       const localeShortCode = locale.split("-")[0];
-      return (0, import_lodash_es13.reduce)(
+      return (0, import_lodash_es14.reduce)(
         languageConfig,
         (acc, value, key) => {
           if (isObject2(value)) {
@@ -17942,15 +17966,15 @@ ${injects.join("\n")}<\/script>`;
               const translationEnd = translationParts.pop();
               const translationPath = translationParts.join(".");
               const translationConfigGlobal = this.globals.language;
-              acc[key] = (0, import_lodash_es13.get)(
+              acc[key] = (0, import_lodash_es14.get)(
                 translationConfigGlobal,
                 `${translationPath}.$locale.${locale}.${translationEnd}`
-              ) || (0, import_lodash_es13.get)(
+              ) || (0, import_lodash_es14.get)(
                 translationConfigGlobal,
                 `${translationPath}.$locale.${localeShortCode}.${translationEnd}`
-              ) || (0, import_lodash_es13.get)(translationConfigGlobal, translationKey) || value;
+              ) || (0, import_lodash_es14.get)(translationConfigGlobal, translationKey) || value;
             } else {
-              acc[key] = (0, import_lodash_es13.get)(languageConfig, `$locale.${locale}.${key}`) || (0, import_lodash_es13.get)(languageConfig, `$locale.${localeShortCode}.${key}`) || value;
+              acc[key] = (0, import_lodash_es14.get)(languageConfig, `$locale.${locale}.${key}`) || (0, import_lodash_es14.get)(languageConfig, `$locale.${localeShortCode}.${key}`) || value;
             }
           }
           return acc;
@@ -18786,8 +18810,8 @@ ${this.shopifyCompatibility.getContentForHeader()}`;
       const keyParts = key?.split(".") || [];
       const keyName = keyParts.pop() || "";
       const keyPath = keyParts.join(".");
-      const langObject = (0, import_lodash_es13.get)(langConfig, keyPath);
-      let localeValue = (0, import_lodash_es13.get)(langObject?.[localeCode], keyName) || (0, import_lodash_es13.get)(langObject?.[localeCode.split("-")[0]], keyName) || langObject?.[keyName];
+      const langObject = (0, import_lodash_es14.get)(langConfig, keyPath);
+      let localeValue = (0, import_lodash_es14.get)(langObject?.[localeCode], keyName) || (0, import_lodash_es14.get)(langObject?.[localeCode.split("-")[0]], keyName) || langObject?.[keyName];
       if (data?.count !== void 0 && localeValue?.one) {
         localeValue = data.count === 1 ? localeValue.one : localeValue.other;
       }
@@ -18832,7 +18856,7 @@ ${this.shopifyCompatibility.getContentForHeader()}`;
     let blocks = settings.section.blocks?.filter(
       (block) => block.disabled !== true
     );
-    blocks = blocks?.map((block) => ({
+    blocks = blocks?.filter((block) => Boolean(block.type)).map((block) => ({
       ...block,
       ...getBlockAttributes(theme, block),
       settings: resolveThemeSettings(
@@ -18867,7 +18891,7 @@ ${this.shopifyCompatibility.getContentForHeader()}`;
     }
   }
   function resolveThemeSettings(theme, themeSettings, editorSchemaSettings) {
-    const settings = (0, import_lodash_es13.cloneDeep)(themeSettings);
+    const settings = (0, import_lodash_es14.cloneDeep)(themeSettings);
     if (settings.$locale) {
       const { locale } = theme.swell.getStorefrontLocalization();
       const localeConfig = settings.$locale[locale] || {};
@@ -18877,16 +18901,16 @@ ${this.shopifyCompatibility.getContentForHeader()}`;
         }
       }
     }
-    (0, import_lodash_es13.each)(settings, (value, key) => {
+    (0, import_lodash_es14.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_es13.each)(value, (scheme, schemeId) => {
+            (0, import_lodash_es14.each)(value, (scheme, schemeId) => {
               if (isObject2(scheme) && typeof scheme.settings === "object" && scheme.settings) {
                 const settings2 = scheme.settings;
-                (0, import_lodash_es13.each)(settings2, (colorValue, colorId) => {
-                  const fieldDef = (0, import_lodash_es13.find)(setting.fields, { id: colorId });
+                (0, import_lodash_es14.each)(settings2, (colorValue, colorId) => {
+                  const fieldDef = (0, import_lodash_es14.find)(setting.fields, { id: colorId });
                   if (fieldDef?.type === "color" && colorValue) {
                     scheme.id = schemeId;
                     settings2[colorId] = new ThemeColor(colorValue);
@@ -18937,7 +18961,7 @@ ${this.shopifyCompatibility.getContentForHeader()}`;
   }
   function findThemeSettingsByType(type, themeSettings, editorSchemaSettings) {
     const foundSettings = [];
-    (0, import_lodash_es13.each)(themeSettings, (value, key) => {
+    (0, import_lodash_es14.each)(themeSettings, (value, key) => {
       if (isObject2(value) && !(value instanceof ThemeFont) && !(value instanceof StorefrontResource)) {
         foundSettings.push(
           ...findThemeSettingsByType(type, value, editorSchemaSettings)
@@ -19111,7 +19135,7 @@ ${this.shopifyCompatibility.getContentForHeader()}`;
   }
   function getMenuItemValueId(value) {
     const fallback = typeof value === "string" ? value : "";
-    const slug = (0, import_lodash_es14.get)(value, "id", (0, import_lodash_es14.get)(value, "slug", fallback)) || "";
+    const slug = (0, import_lodash_es15.get)(value, "id", (0, import_lodash_es15.get)(value, "slug", fallback)) || "";
     return slug;
   }
   async function getMenuItemUrlAndResource(theme, menuItem) {