@swell/apps-sdk 1.0.143 → 1.0.145

package/dist/index.js

@@ -542,6 +542,12 @@
   }
 
   // src/resources.ts
+  var NOT_CACHEBLE_COLLECTIONS = Object.freeze(
+    /* @__PURE__ */ new Set(["accounts:addresses", "accounts:orders", "accounts:subscriptions"])
+  );
+  function isResourceCacheble(name) {
+    return !NOT_CACHEBLE_COLLECTIONS.has(name);
+  }
   var MAX_QUERY_PAGE_LIMIT = 100;
   var DEFAULT_QUERY_PAGE_LIMIT = 15;
   var StorefrontResource = class {
@@ -828,7 +834,8 @@
             this._swell.queryParams,
             this._getterHash
           ],
-          getter
+          getter,
+          isResourceCacheble(this._collection)
         ).then((result) => {
           this._result = result;
           if (result) {
@@ -942,7 +949,8 @@
             this._swell.queryParams,
             this._getterHash
           ],
-          getter
+          getter,
+          isResourceCacheble(this._collection)
         ).then((result) => {
           return this._transformResult(result);
         }).then((result) => {
@@ -7109,16 +7117,18 @@
      *
      * This will always return the cached value immediately if exists
      */
-    async fetchSWR(key, fetchFn, ttl = DEFAULT_SWR_TTL) {
+    async fetchSWR(key, fetchFn, ttl = DEFAULT_SWR_TTL, isCacheble = true) {
       const trace = createTraceId();
       logger.debug("[SDK] Cache fetch start", { key, trace });
-      const cacheValue = await this.client.get(key);
+      const cacheValue = isCacheble ? await this.client.get(key) : void 0;
       let promise = SWR_PROMISE_MAP.get(key);
       if (promise === void 0) {
         promise = Promise.resolve().then(fetchFn).then(resolveAsyncResources).then(async (value) => {
           const isNull = value === null || value === void 0;
-          await this.client.set(key, isNull ? NULL_VALUE : value, ttl);
-          logger.debug("[SDK] Cache update done", { key, trace });
+          if (isCacheble) {
+            await this.client.set(key, isNull ? NULL_VALUE : value, ttl);
+            logger.debug("[SDK] Cache update done", { key, trace });
+          }
           return value;
         }).finally(() => {
           SWR_PROMISE_MAP.delete(key);
@@ -7269,9 +7279,25 @@
   };
 
   // src/resources/product_helpers.ts
+  function isGiftcard(product) {
+    return product.type === "giftcard";
+  }
+  function isOptionAvailable(product, option) {
+    if (isGiftcard(product)) {
+      return true;
+    }
+    return Boolean(option.active && option.name);
+  }
+  function isProductAvailable(product, variant) {
+    if (product.stock_purchasable) {
+      return true;
+    }
+    const stockStatus = (variant || product).stock_status;
+    return !stockStatus || stockStatus === "in_stock";
+  }
   function getAvailableVariants(product) {
     return (product.variants?.results?.slice()?.reverse() || []).filter(
-      (variant) => variant.stock_status === "in_stock" || !variant.stock_status
+      (variant) => isProductAvailable(product, variant)
     );
   }
   function isOptionValueAvailable(option, value, product, availableVariants) {
@@ -7338,7 +7364,7 @@
         return acc;
       }
       const hasOptionValues = option.values.length > 0;
-      if (!option.active || !hasOptionValues) {
+      if (!isOptionAvailable(product, option) || !hasOptionValues) {
         return acc;
       }
       const value = option.values.find(
@@ -7624,9 +7650,14 @@
      * Fetches a resource.
      * First attempts to fetch from cache.
      */
-    async getCachedResource(key, args, handler) {
+    async getCachedResource(key, args, handler, isCacheble = true) {
       const cacheKey = getCacheKey(key, [this.instanceId, args]);
-      return this.getResourceCache().fetchSWR(cacheKey, handler);
+      return this.getResourceCache().fetchSWR(
+        cacheKey,
+        handler,
+        void 0,
+        isCacheble
+      );
     }
     async getAppSettings() {
       const settings = await this.get(
@@ -7638,15 +7669,16 @@
       return settings || {};
     }
     async getStorefrontSettings(force = false) {
+      const storefrontSettings = this.storefront.settings;
       try {
-        const { settings, menus, payments, subscriptions, session } = await this.storefront.request(
+        const allSettings = await this.storefront.request(
           "get",
           "/settings/all",
           void 0,
           force ? { $cache: false } : void 0,
           { force }
         );
-        const storefrontSettings = this.storefront.settings;
+        const { settings, menus, payments, subscriptions, session } = allSettings;
         storefrontSettings.localizedState = {};
         storefrontSettings.set({
           value: settings
@@ -7674,7 +7706,7 @@
         }
         logger.error(err);
       }
-      return this.storefront.settings.get();
+      return storefrontSettings;
     }
     getStorefrontMenus() {
       const menus = this.storefront.settings.getState(
@@ -14150,8 +14182,8 @@ ${formattedMessage}`;
     return new ShopifyResource({
       ...swellVariant,
       available: deferWith(
-        variant,
-        (variant2) => Boolean(variant2.stock_status === "in_stock" || !variant2.stock_status)
+        [product, variant],
+        (product2, variant2) => isProductAvailable(product2, variant2)
       ),
       barcode: void 0,
       compare_at_price: defer(() => variant.orig_price),
@@ -14240,7 +14272,7 @@ ${formattedMessage}`;
       requires_selling_plan: false,
       requires_shipping: deferWith(
         product,
-        (product2) => Boolean(product2.delivery?.contains("shipment"))
+        (product2) => Boolean(product2.delivery?.includes("shipment"))
       ),
       selected: false,
       selected_selling_plan_allocation: void 0,
@@ -14309,7 +14341,7 @@ ${formattedMessage}`;
     return new ShopifyResource({
       available: deferWith(
         product,
-        (product2) => product2.stock_status === "in_stock" || !product2.stock_status
+        (product2) => isProductAvailable(product2)
       ),
       collections: [],
       // TODO: need to support this in the resource class somehow
@@ -14334,7 +14366,7 @@ ${formattedMessage}`;
         const variant = getSelectedVariant(product2, {});
         return variant ? ShopifyVariant(instance, variant, product2, depth + 1) : void 0;
       }),
-      "gift_card?": deferWith(product, (product2) => product2.type === "giftcard"),
+      "gift_card?": deferWith(product, isGiftcard),
       handle: defer(() => product.slug),
       // indicates that product has any options
       has_only_default_variant: deferWith(
@@ -14366,7 +14398,9 @@ ${formattedMessage}`;
         if (!Array.isArray(product2.options)) {
           return [];
         }
-        return product2.options.filter((option) => option.active && option.name).map((option) => option.name);
+        return product2.options.filter(
+          (option) => isOptionAvailable(product2, option)
+        ).map((option) => option.name);
       }),
       options_by_name: deferWith(product, (product2) => {
         if (!Array.isArray(product2.options)) {
@@ -14377,7 +14411,7 @@ ${formattedMessage}`;
         const variant = getSelectedVariant(product2, queryParams);
         return product2.options.reduce(
           (acc, option, index) => {
-            if (!option.active || !option.name) {
+            if (!isOptionAvailable(product2, option)) {
               return acc;
             }
             acc[option.name.toLowerCase()] = getOption(
@@ -14403,7 +14437,7 @@ ${formattedMessage}`;
           const { queryParams } = instance.swell;
           const variants = getAvailableVariants(product2);
           const variant = getSelectedVariant(product2, queryParams);
-          return product2.options.filter((option) => option.active && option.name).map(
+          return product2.options.filter((option) => isOptionAvailable(product2, option)).map(
             (option, index) => getOption(
               option,
               index,
@@ -14576,7 +14610,7 @@ ${formattedMessage}`;
         : undefined, */
       fulfillment_service: "manual",
       // TODO
-      gift_card: item.delivery === "giftcard",
+      gift_card: isGiftcard(item.product),
       grams: item.shipment_weight,
       id: item.id,
       image: deferWith(
@@ -15106,6 +15140,9 @@ ${formattedMessage}`;
     if (address instanceof StorefrontResource) {
       address = cloneStorefrontResource(address);
     }
+    if (!address) {
+      address = {};
+    }
     return new ShopifyResource({
       address1: defer(() => address.address1),
       address2: defer(() => address.address2),
@@ -16580,6 +16617,10 @@ ${injects.join("\n")}<\/script>`;
               pageId = "account/order";
               urlParams.id = segment3;
               break;
+            case "subscriptions":
+              pageId = "account/subscription";
+              urlParams.id = segment3;
+              break;
             case "register":
               pageId = "account/login";
               break;
@@ -19327,14 +19368,15 @@ ${injects.join("\n")}<\/script>`;
       logger.debug("[SDK] Theme init start", { page: pageId, trace });
       await this.themeLoader.init(this.themeConfigs || void 0);
       logger.debug("[SDK] ThemeLoader init done", { page: pageId, trace });
-      const { store, session, menus, geo, configs } = await this.getSettingsAndConfigs();
+      const { store, session, menus, geo, configs, storefrontSettings } = await this.getSettingsAndConfigs();
       logger.debug("[SDK] Theme settings load done", { page: pageId, trace });
       const { settings, request, page, cart, account, customer } = await this.resolvePageData(store, configs, pageId, altTemplate);
       logger.debug("[SDK] Theme page data load done", { page: pageId, trace });
       this.page = page;
       const globals = {
         ...this.globalData,
-        store,
+        // return all storefront settings in the store
+        store: { ...storefrontSettings, ...store },
         settings,
         session,
         request,
@@ -19400,7 +19442,10 @@ ${injects.join("\n")}<\/script>`;
           {}
         )
       };
-      const session = await this.swell.storefront.settings.session();
+      const [session, storeSettings] = await Promise.all([
+        storefrontSettings.session(),
+        storefrontSettings.get()
+      ]);
       if (configs.translations) {
         configs.language = configs.translations;
       }
@@ -19413,11 +19458,13 @@ ${injects.join("\n")}<\/script>`;
       await this.setCompatibilityConfigs(configs);
       const menus = await this.resolveMenuSettings();
       return {
-        store: storefrontSettings?.store,
+        store: storeSettings?.store,
         session,
         menus,
         geo,
-        configs
+        configs,
+        // all settings
+        storefrontSettings
       };
     }
     async resolvePageData(store, configs, pageId, altTemplate) {
@@ -19506,7 +19553,8 @@ ${injects.join("\n")}<\/script>`;
         this.fetchSingletonResourceCached(
           "account",
           () => this.fetchAccount(),
-          () => null
+          () => null,
+          false
         )
       ]);
       if (!cart) {
@@ -19526,7 +19574,7 @@ ${injects.join("\n")}<\/script>`;
         // Shopify only
       };
     }
-    async fetchSingletonResourceCached(key, handler, defaultValue) {
+    async fetchSingletonResourceCached(key, handler, defaultValue, isCacheble = true) {
       const cacheKey = this.swell.storefront.session.getCookie();
       if (!cacheKey) {
         return defaultValue();
@@ -19534,7 +19582,8 @@ ${injects.join("\n")}<\/script>`;
       const result = await this.swell.getCachedResource(
         `${key}-${cacheKey}`,
         [],
-        handler
+        handler,
+        isCacheble
       );
       return result ?? defaultValue();
     }
@@ -21065,6 +21114,7 @@ ${this.shopifyCompatibility.getContentForHeader()}`;
   }
   function createCollection(resource, swell, path, parent_slug, parent_query) {
     const query = getResourceQuery(parent_slug, parent_query);
+    query.$resource_path = path;
     return new SwellStorefrontCollection(
       swell,
       resource,