@swell/apps-sdk 1.0.141 → 1.0.143

package/dist/index.mjs

@@ -80,6 +80,97 @@ import JSON52 from "json5";
 // src/resources.ts
 import { cloneDeep as cloneDeep2 } from "lodash-es";
 
+// src/utils/logger.ts
+var logLevels = {
+  error: 0,
+  warn: 1,
+  info: 2,
+  debug: 3
+};
+var currentLogLevel = "warn";
+var currentTimestampFormat = "off";
+var isStructured = false;
+function configureSdkLogger(config = {}) {
+  if (config.level && logLevels[config.level] !== void 0) {
+    currentLogLevel = config.level;
+  }
+  if (config.timestamp) {
+    currentTimestampFormat = config.timestamp;
+  }
+  if (typeof config.structured === "boolean") {
+    isStructured = config.structured;
+  }
+}
+function getTimestamp() {
+  if (currentTimestampFormat === "iso") {
+    return (/* @__PURE__ */ new Date()).toISOString();
+  }
+  if (currentTimestampFormat === "unix") {
+    return Date.now();
+  }
+  return void 0;
+}
+function formatArgs(args) {
+  const timestamp = getTimestamp();
+  if (!isStructured) {
+    return timestamp !== void 0 ? [...args, `(${timestamp})`] : args;
+  }
+  let message = "";
+  let context = {};
+  const messageParts = [];
+  for (const arg of args) {
+    if (arg instanceof Error) {
+      context.error = {
+        name: arg.name,
+        message: arg.message,
+        stack: arg.stack
+      };
+    } else if (typeof arg === "object" && arg !== null && !Array.isArray(arg) && Object.getPrototypeOf(arg) === Object.prototype) {
+      Object.assign(context, arg);
+    } else {
+      messageParts.push(arg);
+    }
+  }
+  message = messageParts.map((part) => typeof part === "object" ? JSON.stringify(part) : part).join(" ");
+  const finalLogObject = {
+    message,
+    ...context,
+    ...timestamp && { timestamp }
+  };
+  return [finalLogObject];
+}
+var logger = {
+  error: (...args) => {
+    console.error(...formatArgs(args));
+  },
+  warn: (...args) => {
+    if (logLevels[currentLogLevel] >= logLevels.warn) {
+      console.warn(...formatArgs(args));
+    }
+  },
+  info: (...args) => {
+    if (logLevels[currentLogLevel] >= logLevels.info) {
+      console.info(...formatArgs(args));
+    }
+  },
+  debug: (...args) => {
+    if (logLevels[currentLogLevel] >= logLevels.debug) {
+      console.debug(...formatArgs(args));
+    }
+  }
+};
+function createTraceId(data) {
+  if (data === void 0) {
+    return Math.random().toString(36).substring(2, 10);
+  }
+  let hash = 5381;
+  for (let i = 0; i < data.length; i++) {
+    const char = data.charCodeAt(i);
+    hash = (hash << 5) + hash + char;
+  }
+  return (hash >>> 0).toString(16);
+}
+
 // src/liquid/utils.ts
 import { Drop } from "liquidjs";
 
@@ -475,7 +566,7 @@ var StorefrontResource = class {
             return instance[prop];
           }
           instance._result = instance._get().catch((err) => {
-            console.log(err);
+            logger.error(err);
             return instance._getCollectionResultOrProp(instance, prop);
           });
         }
@@ -483,7 +574,7 @@ var StorefrontResource = class {
           return instance._result.then(() => {
             return instance._getCollectionResultOrProp(instance, prop);
           }).catch((err) => {
-            console.log(err);
+            logger.error(err);
             return null;
           });
         }
@@ -542,7 +633,7 @@ var StorefrontResource = class {
         }
         return result;
       }).catch((err) => {
-        console.log(err);
+        logger.error(err);
         return null;
       });
     }
@@ -720,7 +811,7 @@ var SwellStorefrontCollection = class _SwellStorefrontCollection extends SwellSt
         }
         return result;
       }).catch((err) => {
-        console.log(err);
+        logger.error(err);
         return null;
       });
     }
@@ -834,7 +925,7 @@ var SwellStorefrontRecord = class extends SwellStorefrontResource {
         }
         return result;
       }).catch((err) => {
-        console.log(err);
+        logger.error(err);
         return null;
       });
     }
@@ -868,15 +959,25 @@ var SwellStorefrontSingleton = class extends SwellStorefrontResource {
   }
   async _get() {
     if (this._getter) {
+      const trace = createTraceId();
+      logger.debug("[SDK] Resource fetch start", {
+        resource: this.constructor.name,
+        hash: this._getterHash,
+        trace
+      });
       const getter = this._getter.bind(this);
       this._result = Promise.resolve().then(getter).then((result) => {
+        logger.debug("[SDK] Resource fetch end", {
+          hash: this._getterHash,
+          trace
+        });
         this._result = result;
         if (result) {
           Object.assign(this, result);
         }
         return result;
       }).catch((err) => {
-        console.log(err);
+        logger.error(err, { trace });
         return null;
       });
     }
@@ -6960,6 +7061,7 @@ var DEFAULT_OPTIONS = Object.freeze({
   ttl: DEFAULT_TTL
 });
 var NULL_VALUE = "__NULL__";
+var SWR_PROMISE_MAP = /* @__PURE__ */ new Map();
 var Cache = class {
   client;
   workerCtx;
@@ -6981,19 +7083,31 @@ var Cache = class {
    * This will always return the cached value immediately if exists
    */
   async fetchSWR(key, fetchFn, ttl = DEFAULT_SWR_TTL) {
+    const trace = createTraceId();
+    logger.debug("[SDK] Cache fetch start", { key, trace });
     const cacheValue = await this.client.get(key);
-    const promiseValue = 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);
-      return value;
-    });
-    if (this.workerCtx?.waitUntil) {
-      this.workerCtx.waitUntil(promiseValue);
+    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 });
+        return value;
+      }).finally(() => {
+        SWR_PROMISE_MAP.delete(key);
+      });
+      SWR_PROMISE_MAP.set(key, promise);
+    }
+    if (typeof this.workerCtx?.waitUntil === "function") {
+      this.workerCtx.waitUntil(promise);
     }
     if (cacheValue !== void 0) {
+      logger.debug("[SDK] Cache check done", { status: "HIT", key, trace });
       return cacheValue === NULL_VALUE ? null : cacheValue;
     }
-    const result = await promiseValue;
+    logger.debug("[SDK] Cache check done", { status: "MISS", key, trace });
+    const result = await promise;
+    logger.debug("[SDK] Cache fetch end", { key, trace });
     return result;
   }
   async get(key) {
@@ -7288,6 +7402,16 @@ function transformSwellVariant(params, product, variant) {
 }
 
 // src/resources/product.ts
+var SORT_OPTIONS = [
+  { value: "", name: "Featured" },
+  { value: "popularity", name: "Popularity", query: "popularity desc" },
+  { value: "price_asc", name: "Price, low to high", query: "price asc" },
+  { value: "price_desc", name: "Price, high to low", query: "price desc" },
+  { value: "date_asc", name: "Date, old to new", query: "date asc" },
+  { value: "date_desc", name: "Date, new to old", query: "date desc" },
+  { value: "name_asc", name: "Product name, A-Z", query: "name asc" },
+  { value: "name_desc", name: "Product name, Z-A", query: "name desc" }
+];
 function transformSwellProduct(params, product) {
   if (!product) {
     return product;
@@ -7324,6 +7448,28 @@ var SwellProduct = class extends SwellStorefrontRecord {
     return res;
   }
 };
+function productQueryWithFilters(swell, query = {}) {
+  const sortBy = swell.queryParams.sort || "";
+  const filters2 = Object.entries(swell.queryParams).reduce(
+    (acc, [key, value]) => {
+      if (key.startsWith("filter_")) {
+        const qkey = key.replace("filter_", "");
+        if (value?.gte !== void 0 || value?.lte !== void 0) {
+          acc[qkey] = [value.gte || 0, value.lte || void 0];
+        } else {
+          acc[qkey] = value;
+        }
+      }
+      return acc;
+    },
+    {}
+  );
+  return {
+    sort: SORT_OPTIONS.find((option) => option.value === sortBy)?.query || void 0,
+    $filters: filters2,
+    ...query
+  };
+}
 
 // src/api.ts
 var DEFAULT_API_HOST = "https://api.schema.io";
@@ -7368,8 +7514,12 @@ var Swell = class _Swell {
       queryParams,
       workerEnv,
       workerCtx,
+      logger: loggerConfig,
       ...clientProps
     } = params;
+    if (loggerConfig) {
+      configureSdkLogger(loggerConfig);
+    }
     this.url = url instanceof URL ? url : new URL(url || "");
     this.config = config;
     this.shopifyCompatibilityConfig = shopifyCompatibilityConfig;
@@ -7379,7 +7529,9 @@ var Swell = class _Swell {
     this.workerCtx = workerCtx;
     this.workerEnv = workerEnv;
     this.resourceLoadingIndicator = params.resourceLoadingIndicator;
-    console.log(`KV cache: ${this.workerEnv?.THEME ? "enabled" : "disabled"}`);
+    logger.info(
+      `[SDK] KV cache: ${this.workerEnv?.THEME ? "enabled" : "disabled"}`
+    );
     if (serverHeaders) {
       const { headers: headers2, swellHeaders: swellHeaders2 } = _Swell.formatHeaders(serverHeaders);
       this.headers = headers2;
@@ -7493,7 +7645,7 @@ var Swell = class _Swell {
       if (err instanceof Error) {
         err.message = `Swell: unable to load settings (${err.message})`;
       }
-      console.error(err);
+      logger.error(err);
     }
     return this.storefront.settings.get();
   }
@@ -7576,7 +7728,9 @@ var Swell = class _Swell {
           decodeURIComponent(this.swellHeaders["storefront-context"])
         );
       } catch (error) {
-        console.error("Failed to parse swell-storefront-context. Ignoring...");
+        logger.error(
+          "[SDK] Failed to parse swell-storefront-context. Ignoring..."
+        );
       }
     }
     return storefrontContext;
@@ -7606,7 +7760,7 @@ var Swell = class _Swell {
         return this.getRequestCache().fetchSWR(
           getCacheKey("request", [this.instanceId, method, url, id, data, opt]),
           () => {
-            console.log("Storefront request", { method, url, id, data });
+            logger.info("[SDK] Storefront request", { method, url, id, data });
             return storefrontRequest(method, url, id, data, opt);
           }
         );
@@ -7630,7 +7784,7 @@ var Swell = class _Swell {
    */
   getResourceCache() {
     let cache = resourceCaches.get(this.instanceId);
-    if (!cache) {
+    if (cache === void 0) {
       cache = new ResourceCache({
         kvStore: this.workerEnv?.THEME,
         workerCtx: this.workerCtx
@@ -7644,7 +7798,7 @@ var Swell = class _Swell {
    */
   getRequestCache() {
     let cache = requestCaches.get(this.instanceId);
-    if (!cache) {
+    if (cache === void 0) {
       cache = new RequestCache({
         kvStore: this.workerEnv?.THEME,
         workerCtx: this.workerCtx
@@ -7697,6 +7851,11 @@ var SwellBackendAPI = class {
     }
     const endpointUrl = String(url).startsWith("/") ? url.substring(1) : url;
     const requestUrl = `${this.apiHost}/${endpointUrl}${query}`;
+    const trace = createTraceId();
+    logger.debug("[SDK] Backend request start", {
+      query: `/${endpointUrl}${query}`,
+      trace
+    });
     const response = await fetch(requestUrl, requestOptions);
     const responseText = await response.text();
     let result;
@@ -7705,6 +7864,10 @@ var SwellBackendAPI = class {
     } catch {
       result = String(responseText || "").trim();
     }
+    logger.debug("[SDK] Backend request end", {
+      status: response.status,
+      trace
+    });
     if (response.status > 299) {
       throw new SwellError(result, {
         status: response.status,
@@ -14747,9 +14910,11 @@ function ShopifyCollection(instance, category) {
   if (category instanceof StorefrontResource) {
     category = cloneStorefrontResource(category);
   }
+  const productMapper = (product) => ShopifyProduct(instance, product);
   const resolveProducts = makeProductsCollectionResolve(
+    instance,
     category,
-    (product) => ShopifyProduct(instance, product)
+    productMapper
   );
   return new ShopifyResource({
     all_products_count: defer(
@@ -14801,8 +14966,9 @@ function ShopifyCollection(instance, category) {
       category,
       (category2) => getFirstImage(instance, category2)
     ),
-    filters: defer(
-      async () => ((await resolveProducts())?.filter_options ?? []).map(
+    filters: deferWith(
+      category,
+      (category2) => (category2?.filter_options ?? []).map(
         (filter) => ShopifyFilter(instance, filter)
       )
     ),
@@ -14812,9 +14978,7 @@ function ShopifyCollection(instance, category) {
     metafields: {},
     next_product: void 0,
     previous_product: void 0,
-    products: defer(async () => {
-      return (await resolveProducts())?.results ?? [];
-    }),
+    products: getProducts(instance, category, productMapper),
     products_count: defer(
       async () => (await resolveProducts())?.results?.length || 0
     ),
@@ -14853,28 +15017,35 @@ function convertToShopifySorting(value) {
       return "manual";
   }
 }
-function makeProductsCollectionResolve(object, mapper) {
-  const productResults = deferWith(object, (object2) => {
-    if (object2.products) {
-      if (object2.products instanceof SwellStorefrontCollection) {
-        return object2.products._cloneWithCompatibilityResult((products) => {
-          return {
-            ...products,
-            results: products.results.map(mapper)
-          };
-        });
+function getProducts(instance, object, mapper) {
+  return deferWith(object, (object2) => {
+    const { page, limit: limit2 } = instance.swell.queryParams;
+    const categoryFilter = object2.id && object2.id !== "all" ? object2.id : void 0;
+    const productQuery = categoryFilter ? { category: categoryFilter, $variants: true } : { $variants: true };
+    const filterQuery = productQueryWithFilters(instance.swell, productQuery);
+    const products = new SwellStorefrontCollection(
+      instance.swell,
+      "products",
+      {
+        page,
+        limit: limit2,
+        ...filterQuery
+      },
+      async function() {
+        return this._defaultGetter().call(this);
       }
-      if (Array.isArray(object2.products?.results)) {
-        return {
-          ...object2.products,
-          results: object2.products.results.map(mapper)
-        };
+    );
+    return products._cloneWithCompatibilityResult(
+      (products2) => {
+        return { ...products2, results: products2.results.map(mapper) };
       }
-    }
-    return null;
+    );
   });
+}
+function makeProductsCollectionResolve(instance, object, mapper) {
+  const products = getProducts(instance, object, mapper);
   async function resolveProducts() {
-    const resolved = await productResults.resolve();
+    const resolved = await products.resolve();
     if (resolved && "_resolve" in resolved) {
       return resolved._resolve();
     }
@@ -15638,11 +15809,15 @@ function ShopifySearch(instance, search) {
   if (search instanceof ShopifyResource) {
     return search.clone();
   }
-  const resolveProducts = makeProductsCollectionResolve(search, (product) => {
-    const shopifyProduct = ShopifyProduct(instance, product);
-    shopifyProduct.object_type = "product";
-    return shopifyProduct;
-  });
+  const resolveProducts = makeProductsCollectionResolve(
+    instance,
+    search,
+    (product) => {
+      const shopifyProduct = ShopifyProduct(instance, product);
+      shopifyProduct.object_type = "product";
+      return shopifyProduct;
+    }
+  );
   return new ShopifyResource({
     default_sort_by: deferWith(
       search,
@@ -19129,9 +19304,14 @@ var SwellTheme3 = class {
   }
   async initGlobals(pageId, altTemplate) {
     this.pageId = pageId;
+    const trace = createTraceId();
+    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();
+    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,
@@ -19158,6 +19338,7 @@ var SwellTheme3 = class {
     if (this.shopifyCompatibility) {
       this.shopifyCompatibility.adaptQueryParams();
     }
+    logger.debug("[SDK] Theme init end", { page: pageId, trace });
   }
   setGlobals(globals) {
     if (this.shopifyCompatibility) {
@@ -19190,7 +19371,7 @@ var SwellTheme3 = class {
             try {
               configValue = JSON56.parse(config.file_data);
             } catch (err) {
-              console.error(`Error parsing ${configName} config: ${err}`);
+              logger.error(`Error parsing config`, err, { configName });
               configValue = {};
             }
             acc[configName] = configValue;
@@ -19277,7 +19458,7 @@ var SwellTheme3 = class {
           templateConfig?.file_data || "{}"
         );
       } catch (err) {
-        console.warn(err);
+        logger.warn(err);
       }
       if (pageSchema?.page) {
         const {
@@ -19582,7 +19763,7 @@ var SwellTheme3 = class {
       try {
         return JSON56.parse(localeConfig?.file_data || "{}");
       } catch (err) {
-        console.warn(err);
+        logger.warn(err);
       }
     }
     return {};
@@ -19751,10 +19932,20 @@ var SwellTheme3 = class {
       return "";
     }
     template = unescapeLiquidSyntax(template);
+    const trace = createTraceId();
     try {
-      return await this.liquidSwell.parseAndRender(template, data);
+      logger.debug("[SDK] Render template start", {
+        config: config.name,
+        trace
+      });
+      const result = await this.liquidSwell.parseAndRender(template, data);
+      logger.debug("[SDK] Render template end", {
+        config: config.name,
+        trace
+      });
+      return result;
     } catch (err) {
-      console.error(err);
+      logger.error(err);
       return `<!-- template render error: ${err.message} -->`;
     }
   }
@@ -19762,7 +19953,7 @@ var SwellTheme3 = class {
     try {
       return await this.liquidSwell.parseAndRender(templateString, data);
     } catch (err) {
-      console.error(err);
+      logger.error(err);
       return "";
     }
   }
@@ -19786,7 +19977,7 @@ var SwellTheme3 = class {
           );
         }
       } catch (err) {
-        console.warn(err);
+        logger.warn(err);
         return void 0;
       }
     } else if (config?.file_path?.endsWith(".liquid")) {
@@ -19839,11 +20030,10 @@ var SwellTheme3 = class {
       try {
         return JSON56.parse(content);
       } catch (err) {
-        console.log(
-          "Unable to render theme template",
-          config.file_path,
+        logger.error("[SDK] Unable to render theme template", {
+          file: config.file_path,
           content
-        );
+        });
         throw new PageError(err);
       }
     }
@@ -20100,7 +20290,7 @@ ${this.shopifyCompatibility.getContentForHeader()}`;
       try {
         schema = JSON56.parse(resolvedConfig?.file_data) || void 0;
       } catch (err) {
-        console.warn(err);
+        logger.warn(err);
       }
     }
     return schema;
@@ -20490,7 +20680,7 @@ function parseJsonConfig(config) {
   try {
     return JSON56.parse(config?.file_data || "{}");
   } catch (err) {
-    console.warn(err);
+    logger.warn(err);
     return {};
   }
 }
@@ -20966,6 +21156,7 @@ export {
   adaptShopifyMenuData,
   arrayToObject,
   cloneStorefrontResource,
+  configureSdkLogger,
   deferMenuItemUrlAndResource,
   dehydrateSwellRefsInStorefrontResources,
   extractSettingsFromForm,