@swell/apps-sdk 1.0.138 → 1.0.139

package/dist/index.mjs

@@ -18111,10 +18111,10 @@ var svgs = {
     src: "https://cdn.swell.store/schema/685ef581b79e3e0012cf3222/fba884c7fe8122c472e130355fb52db7/collection-6.png"
   },
   "lifestyle-1": {
-    src: "https://cdn.swell.store/schema/685ef58bb79e3e0012cf3256/1da0da57ea80d90038fcf6b100a16fe6/lifestyle-1.png"
+    src: "https://cdn.swell.store/schema/6870eddc1657130012643fc6/1777bcff40736610093833ef858b5936/lifestyle-1.png"
   },
   "lifestyle-2": {
-    src: "https://cdn.swell.store/schema/685ef58cb79e3e0012cf3259/f963448f1a6f4d6588fcd283b5c00c7c/lifestyle-2.png"
+    src: "https://cdn.swell.store/schema/6870eddc1657130012643fcb/4d29197e3fa0b6d8255c1b7770f8dc12/lifestyle-2.png"
   },
   "product-apparel-1": {
     src: "https://cdn.swell.store/schema/685ef58eb79e3e0012cf3276/37c3c973a01287a580ab9db2e05dd36d/product-apparel-1.png"
@@ -18712,12 +18712,11 @@ var ThemeLoader = class _ThemeLoader {
     this.configPaths = [];
   }
   async init(themeConfigs) {
-    const { swellHeaders } = this.swell;
     if (themeConfigs) {
       this.setConfigs(themeConfigs);
       return;
     }
-    if (!swellHeaders["theme-id"]) {
+    if (!this.getThemeId()) {
       return;
     }
     await this.fetchManifest();
@@ -18756,46 +18755,74 @@ var ThemeLoader = class _ThemeLoader {
    */
   setConfigs(themeConfigs) {
     this.configs = new Map(themeConfigs);
+    this.manifest = /* @__PURE__ */ new Map();
+    for (const { file_path, hash } of this.configs.values()) {
+      this.manifest.set(file_path, hash);
+    }
     this.configPaths = Array.from(this.configs.keys());
-    this.manifest = this.configPaths.reduce((manifest, path) => {
-      manifest[path] = this.configs.get(path)?.hash;
-      return manifest;
-    }, {});
   }
   /**
    * Preloads a theme version and configs. This is used to optimize initial theme load.
    */
-  async preloadTheme(version, configs) {
+  async preloadTheme(payload) {
+    const { version, configs } = payload;
     console.log(
       `ThemeLoader.preloadTheme${version?.hash ? ` - manifest: ${version.hash}` : ""}${configs?.length ? ` - configs: ${configs.length}` : ""}`
     );
-    await Promise2.all([
-      version && this.cacheManifest(version),
-      configs && Promise2.map(configs, (config) => this.cacheThemeConfig(config), {
-        concurrency: 10
-      })
-    ]);
+    const promises = [];
+    if (version) {
+      promises.push(this.cacheManifest(version));
+    }
+    if (configs) {
+      const themeId = this.getThemeId();
+      promises.push(
+        Promise2.map(
+          configs,
+          async (config) => {
+            const promises2 = [
+              this.cacheThemeConfig(config)
+            ];
+            if (themeId && config.file?.url) {
+              promises2.push(
+                this.cacheThemeFileUrl(themeId, config.hash, config.file.url)
+              );
+            }
+            await Promise2.all(promises2);
+          },
+          { concurrency: 10 }
+        )
+      );
+    }
+    await Promise2.all(promises);
   }
   /**
    * Fetches a theme config by file path.
    */
   async fetchThemeConfig(filePath) {
-    const config = this.configs.get(filePath);
-    if (config !== void 0) {
-      return config;
+    const themeConfig = this.configs.get(filePath);
+    if (themeConfig !== void 0) {
+      return themeConfig;
     }
-    const hash = this.manifest?.[filePath];
-    if (hash) {
-      const config2 = await this.getCache().get(
-        `config:${hash}`
-      );
-      if (config2) {
-        this.configs.set(filePath, config2);
-        return config2;
+    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 } };
+        }
       }
-      return this.fetchThemeConfigsFromSourceByPath(filePath, hash);
+      this.configs.set(filePath, config);
+      return config;
     }
-    return null;
+    return this.fetchThemeConfigsFromSourceByPath(filePath, hash);
   }
   async fetchThemeConfigsByPath(pathPrefix, pathSuffix) {
     const paths = this.configPaths.filter(
@@ -18804,9 +18831,7 @@ var ThemeLoader = class _ThemeLoader {
     const configs = await Promise2.map(
       paths,
       (path) => this.fetchThemeConfig(path),
-      {
-        concurrency: 10
-      }
+      { concurrency: 10 }
     );
     return configs.filter((config) => config !== null);
   }
@@ -18839,17 +18864,26 @@ var ThemeLoader = class _ThemeLoader {
     }
     const configHashesUnresolved = [];
     const configsByHash = /* @__PURE__ */ new Map();
+    const themeId = this.getThemeId();
+    const cache = this.getCache();
     await Promise2.map(
-      Object.values(manifest),
-      (configHash) => {
-        return this.getCache().get(`config:${configHash}`).then((config) => {
-          if (config) {
-            configsByHash.set(config.hash, config);
-            this.configs.set(config.file_path, config);
-          } else {
-            configHashesUnresolved.push(configHash);
+      manifest.values(),
+      async (configHash) => {
+        let config = await cache.get(`config:${configHash}`);
+        if (!config) {
+          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 } };
           }
-        });
+        }
+        configsByHash.set(config.hash, config);
+        this.configs.set(config.file_path, config);
       },
       { concurrency: 10 }
     );
@@ -18864,9 +18898,19 @@ var ThemeLoader = class _ThemeLoader {
         configsByHash.set(config.hash, config);
         this.configs.set(config.file_path, config);
       }
-      await Promise2.map(newConfigs, (config) => this.cacheThemeConfig(config), {
-        concurrency: 10
-      });
+      await Promise2.map(
+        newConfigs,
+        async (config) => {
+          const promises = [this.cacheThemeConfig(config)];
+          if (themeId && config.file?.url) {
+            promises.push(
+              this.cacheThemeFileUrl(themeId, config.hash, config.file.url)
+            );
+          }
+          await Promise2.all(promises);
+        },
+        { concurrency: 10 }
+      );
     }
     return Array.from(configsByHash.values());
   }
@@ -18886,6 +18930,12 @@ var ThemeLoader = class _ThemeLoader {
       await this.getCache().set(`config:${config.hash}`, config);
     }
   }
+  /**
+   * Caches a CDN file url by config hash.
+   */
+  async cacheThemeFileUrl(themeId, configHash, fileUrl) {
+    await this.getCache().set(`file:${themeId}:${configHash}`, fileUrl);
+  }
   /**
    * Fetches the manifest (set of config hashes) for a theme version.
    */
@@ -18909,8 +18959,10 @@ var ThemeLoader = class _ThemeLoader {
         manifest = themeVersion.manifest;
       }
     }
-    this.manifest = manifest;
-    this.configPaths = Object.keys(manifest || {});
+    if (manifest) {
+      this.manifest = new Map(Object.entries(manifest));
+      this.configPaths = [...this.manifest.keys()];
+    }
     return this.manifest;
   }
   /**
@@ -18928,7 +18980,7 @@ var ThemeLoader = class _ThemeLoader {
       "/:themes:configs",
       {
         ...this.themeVersionQueryFilter(),
-        ...fetchAll ? {} : { hash: { $in: configHashes } },
+        ...fetchAll ? void 0 : { hash: { $in: configHashes } },
         // TODO: paginate to support more than 1000 configs
         limit: 1e3,
         type: "theme",
@@ -18964,10 +19016,20 @@ var ThemeLoader = class _ThemeLoader {
       if (hash) {
         config.hash = hash;
       }
-      await this.cacheThemeConfig(config);
+      const themeId = this.getThemeId();
+      const promises = [this.cacheThemeConfig(config)];
+      if (themeId && config.file?.url) {
+        promises.push(
+          this.cacheThemeFileUrl(themeId, config.hash, config.file.url)
+        );
+      }
+      await Promise2.all(promises);
     }
     return config ?? null;
   }
+  getThemeId() {
+    return this.swell.swellHeaders["theme-id"];
+  }
   /**
    * Generates a Swell API query filter for this theme version.
    */
@@ -19578,8 +19640,8 @@ var SwellTheme3 = class {
   /**
    * Preloads updated theme configs. Used to optimize initial theme load.
    */
-  async preloadThemeConfigs(version, configs) {
-    await this.themeLoader.preloadTheme(version, configs);
+  async preloadThemeConfigs(payload) {
+    await this.themeLoader.preloadTheme(payload);
   }
   getPageConfigPath(pageId, altTemplate) {
     if (this.shopifyCompatibility) {