@swell/apps-sdk 1.0.173 → 1.0.175

package/dist/index.cjs

@@ -4020,7 +4020,7 @@ var Cache = class {
   /**
    * Always fetches fresh data and updates cache
    * Deduplicates concurrent requests with the same key
-   * 
+   *
    * @param key Cache key
    * @param fetchFn Function to fetch fresh data
    * @param ttl Time to live in milliseconds (default: DEFAULT_SWR_TTL)
@@ -14766,6 +14766,14 @@ var RenderDrop = class extends import_liquidjs14.Drop {
 // src/liquid/index.ts
 var import_liquidjs34 = require("liquidjs");
 
+// src/utils/escape.ts
+function replacerUnescape(match) {
+  return match.includes('\\"') ? JSON.parse(`"${match}"`) : match;
+}
+function unescapeLiquidSyntax(template) {
+  return template.replace(/\{\{.*?\}\}/g, replacerUnescape);
+}
+
 // src/liquid/tags/assign.ts
 var import_liquidjs15 = require("liquidjs");
 function bind(_liquidSwell) {
@@ -15274,28 +15282,30 @@ var import_liquidjs24 = require("liquidjs");
 function bind10(liquidSwell) {
   return class RenderTag extends import_liquidjs24.RenderTag {
     *render(ctx, emitter) {
-      const { liquid, hash } = this;
-      const filepath = yield renderFilePath(
-        this["file"],
+      const self = this;
+      const { liquid } = this;
+      const { hash } = self;
+      const filename = yield renderFilePath(
+        self["file"],
         ctx,
         liquid
       );
-      (0, import_liquidjs24.assert)(filepath, () => `illegal file path "${filepath}"`);
-      const themeConfig = yield liquidSwell.getComponentPath(filepath).then(
-        (fileName) => liquidSwell.getThemeConfig(fileName)
+      (0, import_liquidjs24.assert)(filename, () => `illegal file path "${filename}"`);
+      const configPath = yield liquidSwell.getComponentPath(
+        filename
       );
       const childCtx = ctx.spawn();
       const scope = childCtx.bottom();
       (0, import_lodash_es9.assign)(scope, yield hash.render(ctx));
       const parentSection = yield ctx._get(["section"]);
       if (parentSection) (0, import_lodash_es9.assign)(scope, { section: parentSection });
-      if (this["with"]) {
-        const { value, alias } = this["with"];
-        const aliasName = alias || filepath;
+      if (self["with"]) {
+        const { value, alias } = self["with"];
+        const aliasName = alias || filename;
         scope[aliasName] = yield (0, import_liquidjs24.evalToken)(value, ctx);
       }
-      if (this["for"]) {
-        const { value, alias } = this["for"];
+      if (self["for"]) {
+        const { value, alias } = self["for"];
         let collection = yield (0, import_liquidjs24.evalToken)(value, ctx);
         collection = yield resolveEnumerable(collection);
         scope["forloop"] = new ForloopDrop(
@@ -15305,13 +15315,23 @@ function bind10(liquidSwell) {
         );
         for (const item of collection) {
           scope[alias] = item;
-          const output = yield liquidSwell.renderTemplate(themeConfig, scope);
-          emitter.write(output);
+          const templates = yield liquid._parseFile(
+            configPath,
+            childCtx.sync,
+            void 0,
+            self["currentFile"]
+          );
+          yield liquid.renderer.renderTemplates(templates, childCtx, emitter);
           scope["forloop"].next();
         }
       } else {
-        const output = yield liquidSwell.renderTemplate(themeConfig, scope);
-        emitter.write(output);
+        const templates = yield liquid._parseFile(
+          configPath,
+          childCtx.sync,
+          void 0,
+          self["currentFile"]
+        );
+        yield liquid.renderer.renderTemplates(templates, childCtx, emitter);
       }
     }
   };
@@ -16911,13 +16931,15 @@ var LiquidSwell30 = class extends import_liquidjs34.Liquid {
   }) {
     getThemeConfig = getThemeConfig || theme.getThemeConfig.bind(theme);
     extName = extName || "liquid";
+    const fs = new LiquidFS(extName);
     super({
-      cache: false,
+      cache: true,
       relativeReference: false,
-      fs: getLiquidFS(getThemeConfig, extName),
+      fs,
       ownPropertyOnly: false,
       operators: swellOperators
     });
+    fs.liquidSwell = this;
     this.theme = theme;
     this.getThemeConfig = getThemeConfig;
     this.getThemeTemplateConfigByType = getThemeTemplateConfigByType || theme.getThemeTemplateConfigByType.bind(theme);
@@ -16960,41 +16982,36 @@ var LiquidSwell30 = class extends import_liquidjs34.Liquid {
 function resolveFilePath(fileName, extName) {
   return `theme/${fileName}.${extName}`;
 }
-function getLiquidFS(getThemeConfig, extName) {
-  return {
-    /** read a file asynchronously */
-    async readFile(filePath) {
-      const resolvedPath = resolveFilePath(filePath, extName);
-      return getThemeConfig(resolvedPath).then(
-        (template) => template?.file_data || `<!-- theme template not found: ${resolvedPath} -->`
-      );
-    },
-    /** check if a file exists asynchronously */
-    async exists(_filePath) {
-      return true;
-    },
-    /** read a file synchronously */
-    readFileSync(_filePath) {
-      return "";
-    },
-    /** check if a file exists synchronously */
-    existsSync(_filePath) {
-      return false;
-    },
-    /** check if file is contained in `root`, always return `true` by default. Warning: not setting this could expose path traversal vulnerabilities. */
-    contains(_root, _file) {
-      return true;
-    },
-    /** resolve a file against directory, for given `ext` option */
-    resolve(_dir, file, _ext) {
-      return file;
-    },
-    /** fallback file for lookup failure */
-    fallback(_filePath) {
-      return;
-    }
-  };
-}
+var LiquidFS = class {
+  liquidSwell;
+  constructor(_extName) {
+  }
+  async readFile(filePath) {
+    const template = await this.liquidSwell.getThemeConfig(filePath);
+    return unescapeLiquidSyntax(
+      template?.file_data || `<!-- theme template not found: ${filePath} -->`
+    );
+  }
+  async exists(filePath) {
+    const template = await this.liquidSwell.getThemeConfig(filePath);
+    return Boolean(template);
+  }
+  readFileSync(_filePath) {
+    return "";
+  }
+  existsSync(_filePath) {
+    return false;
+  }
+  contains(_root, _file) {
+    return true;
+  }
+  resolve(_dir, file, _ext) {
+    return file;
+  }
+  fallback(_filePath) {
+    return;
+  }
+};
 
 // src/theme/theme-loader.ts
 var MAX_INDIVIDUAL_CONFIGS_TO_FETCH = 50;
@@ -18711,11 +18728,14 @@ ${this.shopifyCompatibility.getContentForHeader()}`;
    * Get a list of sections and section groups in a page layout.
    */
   async getPageSectionGroups(pageId, altTemplate) {
-    const pageConfig = this._getTemplateConfigByType(
+    let pageConfig = this._getTemplateConfigByType(
       "templates",
       pageId,
       altTemplate
     );
+    if (!pageConfig) {
+      pageConfig = this._getTemplateConfigByType("templates", pageId);
+    }
     if (pageConfig === null) {
       return [];
     }
@@ -19015,12 +19035,6 @@ function parseJsonConfig(config) {
     return {};
   }
 }
-function replacerUnescape(match) {
-  return match.includes('\\"') ? JSON.parse(`"${match}"`) : match;
-}
-function unescapeLiquidSyntax(template) {
-  return template.replace(/\{\{.*?\}\}/g, replacerUnescape);
-}
 function extractSchemaTag(template) {
   const list = template.match(
     /\{%-?\s*schema\s*-?%\}(.*)\{%-?\s*endschema\s*-?%\}/s
@@ -19720,6 +19734,11 @@ var HtmlCache = class {
     if (request.headers.get("swell-deployment-mode") === "editor") return false;
     if (request.headers.get("cache-control")?.includes("no-cache"))
       return false;
+    const storefrontId = request.headers.get("swell-storefront-id");
+    const themeVersionHash = request.headers.get("swell-theme-version-hash");
+    if (!storefrontId || !themeVersionHash) {
+      return false;
+    }
     return true;
   }
   isResponseCacheable(response, matchedRule) {