@pvh-afl/core 1.1.19 → 1.1.21

package/dist/theme/theme-content.service.js

@@ -1,4 +1,5 @@
 "use strict";
+var ThemeContentService_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ThemeContentService = void 0;
 const tslib_1 = require("tslib");
@@ -42,11 +43,15 @@ const FAQ_METAOBJECT_QUERY = `
   }
 `;
 let ThemeContentService = class ThemeContentService {
+    static { ThemeContentService_1 = this; }
     cacheService;
     configService;
     shopifyThemeService;
     collectionService;
     productService;
+    // Number of filenames to resolve per Files API request when matching
+    // `shopify://` media references by filename.
+    static MEDIA_QUERY_BATCH_SIZE = 25;
     refreshInProgress = new Set();
     constructor(cacheService, configService, shopifyThemeService, collectionService, productService) {
         this.cacheService = cacheService;
@@ -77,7 +82,7 @@ let ThemeContentService = class ThemeContentService {
         let isStale = false;
         let triggeredRefresh = false;
         if (!cached) {
-            logger_1.logger.info('Theme content cache miss, fetching fresh data', {
+            logger_1.logger.info("Theme content cache miss, fetching fresh data", {
                 brand,
                 path,
                 cacheKey,
@@ -88,7 +93,7 @@ let ThemeContentService = class ThemeContentService {
             themeStructure = cached.data;
             isStale = cached.isStale;
             if (cached.isStale) {
-                logger_1.logger.info('Theme content is stale, triggering background refresh', {
+                logger_1.logger.info("Theme content is stale, triggering background refresh", {
                     brand,
                     path,
                     cacheKey,
@@ -114,7 +119,7 @@ let ThemeContentService = class ThemeContentService {
      */
     async refreshContentInBackground(brand, path, cacheKey) {
         if (this.refreshInProgress.has(cacheKey)) {
-            logger_1.logger.info('Refresh already in progress, skipping', { cacheKey });
+            logger_1.logger.info("Refresh already in progress, skipping", { cacheKey });
             return;
         }
         this.refreshInProgress.add(cacheKey);
@@ -130,7 +135,7 @@ let ThemeContentService = class ThemeContentService {
      */
     async fetchAndCacheContent(brand, path, options) {
         const cacheKey = this.buildCacheKey(brand, path);
-        logger_1.logger.info('Fetching fresh theme content', {
+        logger_1.logger.info("Fetching fresh theme content", {
             brand,
             path,
             cacheKey,
@@ -138,7 +143,7 @@ let ThemeContentService = class ThemeContentService {
         try {
             const parsed = await this.shopifyThemeService.fetchThemeFile(brand, path);
             if (!parsed) {
-                logger_1.logger.warn('No content found for theme file', { brand, path });
+                logger_1.logger.warn("No content found for theme file", { brand, path });
                 return null;
             }
             let curated = await this.curateThemeContent(brand, parsed);
@@ -147,14 +152,14 @@ let ThemeContentService = class ThemeContentService {
             const defaultTTL = options?.defaultTTL ?? configDefaultTTL;
             const staleTTL = options?.staleTTL ?? configStaleTTL;
             await this.cacheService.set(cacheKey, curated, defaultTTL, staleTTL);
-            logger_1.logger.info('Theme content cached', { brand, cacheKey });
+            logger_1.logger.info("Theme content cached", { brand, cacheKey });
             return curated;
         }
         catch (error) {
-            logger_1.logger.error('Failed to fetch and curate theme content', {
+            logger_1.logger.error("Failed to fetch and curate theme content", {
                 brand,
                 path,
-                error: error instanceof Error ? error.message : 'Unknown',
+                error: error instanceof Error ? error.message : "Unknown",
             });
             return null;
         }
@@ -166,21 +171,26 @@ let ThemeContentService = class ThemeContentService {
      * @param brand - Brand identifier
      * @param handle - Metaobject handle (default: "main")
      */
-    async getFaqMetaobject(brand, handle = 'main') {
+    async getFaqMetaobject(brand, handle = "main") {
         const cacheKey = this.buildFaqCacheKey(brand, handle);
         const cached = await this.cacheService.get(cacheKey);
         let faqData = null;
         let isStale = false;
         let triggeredRefresh = false;
         if (!cached) {
-            logger_1.logger.info('FAQ metaobject cache miss, fetching fresh data', {
+            logger_1.logger.info("FAQ metaobject cache miss, fetching fresh data", {
                 brand,
                 handle,
                 cacheKey,
             });
             const result = await this.fetchAndCacheFaqMetaobject(brand, handle);
             if (result.error) {
-                return { data: null, isStale: false, triggeredRefresh: false, error: result.error };
+                return {
+                    data: null,
+                    isStale: false,
+                    triggeredRefresh: false,
+                    error: result.error,
+                };
             }
             faqData = result.data;
         }
@@ -188,7 +198,7 @@ let ThemeContentService = class ThemeContentService {
             faqData = cached.data;
             isStale = cached.isStale;
             if (cached.isStale) {
-                logger_1.logger.info('FAQ metaobject is stale, triggering background refresh', {
+                logger_1.logger.info("FAQ metaobject is stale, triggering background refresh", {
                     brand,
                     handle,
                     cacheKey,
@@ -208,7 +218,7 @@ let ThemeContentService = class ThemeContentService {
      */
     async refreshFaqInBackground(brand, handle, cacheKey) {
         if (this.refreshInProgress.has(cacheKey)) {
-            logger_1.logger.info('FAQ refresh already in progress, skipping', { cacheKey });
+            logger_1.logger.info("FAQ refresh already in progress, skipping", { cacheKey });
             return;
         }
         this.refreshInProgress.add(cacheKey);
@@ -222,33 +232,33 @@ let ThemeContentService = class ThemeContentService {
     /**
      * Fetch FAQ metaobject from Storefront API and cache it.
      */
-    async fetchAndCacheFaqMetaobject(brand, handle = 'main') {
+    async fetchAndCacheFaqMetaobject(brand, handle = "main") {
         const cacheKey = this.buildFaqCacheKey(brand, handle);
         const storefrontToken = this.configService.getShopifyStorefrontToken(brand);
         const graphqlUrl = this.configService.getShopifyGraphqlUrl(brand);
         if (!storefrontToken || !graphqlUrl) {
-            logger_1.logger.error('Missing Storefront API configuration for FAQ metaobject', {
+            logger_1.logger.error("Missing Storefront API configuration for FAQ metaobject", {
                 brand,
                 hasToken: !!storefrontToken,
                 hasUrl: !!graphqlUrl,
             });
-            return { data: null, error: 'Missing Storefront API configuration' };
+            return { data: null, error: "Missing Storefront API configuration" };
         }
         try {
             const response = await fetch(graphqlUrl, {
-                method: 'POST',
+                method: "POST",
                 headers: {
-                    'Content-Type': 'application/json',
-                    'X-Shopify-Storefront-Access-Token': storefrontToken,
+                    "Content-Type": "application/json",
+                    "X-Shopify-Storefront-Access-Token": storefrontToken,
                 },
                 body: JSON.stringify({
                     query: FAQ_METAOBJECT_QUERY,
-                    variables: { type: 'faq_page', handle },
+                    variables: { type: "faq_page", handle },
                 }),
             });
             const result = (await response.json());
             if (result.errors?.length) {
-                logger_1.logger.error('Storefront API errors fetching FAQ metaobject', {
+                logger_1.logger.error("Storefront API errors fetching FAQ metaobject", {
                     brand,
                     handle,
                     errors: result.errors.map((e) => e.message),
@@ -257,14 +267,14 @@ let ThemeContentService = class ThemeContentService {
             }
             const faqPage = result.data?.metaobject;
             if (!faqPage) {
-                logger_1.logger.warn('No FAQ page metaobject found', { brand, handle });
-                return { data: null, error: 'FAQ page not found' };
+                logger_1.logger.warn("No FAQ page metaobject found", { brand, handle });
+                return { data: null, error: "FAQ page not found" };
             }
             const parsed = this.parseFaqMetaobject(faqPage);
             // Cache with same TTL as landing pages
             const { defaultTTL, staleTTL } = this.configService.getLandingPageCacheTTL(brand);
             await this.cacheService.set(cacheKey, parsed, defaultTTL, staleTTL);
-            logger_1.logger.info('FAQ metaobject fetched and cached', {
+            logger_1.logger.info("FAQ metaobject fetched and cached", {
                 brand,
                 handle,
                 cacheKey,
@@ -274,12 +284,15 @@ let ThemeContentService = class ThemeContentService {
             return { data: parsed };
         }
         catch (error) {
-            logger_1.logger.error('Failed to fetch FAQ metaobject', {
+            logger_1.logger.error("Failed to fetch FAQ metaobject", {
                 brand,
                 handle,
-                error: error instanceof Error ? error.message : 'Unknown',
+                error: error instanceof Error ? error.message : "Unknown",
             });
-            return { data: null, error: error instanceof Error ? error.message : 'Unknown error' };
+            return {
+                data: null,
+                error: error instanceof Error ? error.message : "Unknown error",
+            };
         }
     }
     /**
@@ -292,20 +305,24 @@ let ThemeContentService = class ThemeContentService {
     async invalidateFaqCache(brand) {
         const pattern = `faq:${brand}:*`;
         const count = await this.cacheService.markStale(pattern);
-        logger_1.logger.info('FAQ cache invalidated', { brand, pattern, keysMarkedStale: count });
+        logger_1.logger.info("FAQ cache invalidated", {
+            brand,
+            pattern,
+            keysMarkedStale: count,
+        });
         return count;
     }
     /**
      * Parse FAQ page metaobject response into structured data.
      */
     parseFaqMetaobject(faqPage) {
-        let title = '';
+        let title = "";
         const categories = [];
         for (const field of faqPage.fields) {
-            if (field.key === 'title') {
+            if (field.key === "title") {
                 title = field.value;
             }
-            else if (field.key === 'categories' && field.references?.nodes) {
+            else if (field.key === "categories" && field.references?.nodes) {
                 for (const categoryNode of field.references.nodes) {
                     const category = this.parseFaqCategory(categoryNode);
                     if (category) {
@@ -320,13 +337,13 @@ let ThemeContentService = class ThemeContentService {
      * Parse a single FAQ category from metaobject fields.
      */
     parseFaqCategory(categoryNode) {
-        let categoryTitle = '';
+        let categoryTitle = "";
         const items = [];
         for (const field of categoryNode.fields) {
-            if (field.key === 'title') {
+            if (field.key === "title") {
                 categoryTitle = field.value;
             }
-            else if (field.key === 'items' && field.references?.nodes) {
+            else if (field.key === "items" && field.references?.nodes) {
                 for (const itemNode of field.references.nodes) {
                     const item = this.parseFaqItem(itemNode.fields);
                     if (item) {
@@ -345,13 +362,13 @@ let ThemeContentService = class ThemeContentService {
      * Converts rich_text_field answer from Portable Text JSON to HTML.
      */
     parseFaqItem(fields) {
-        let question = '';
-        let answer = '';
+        let question = "";
+        let answer = "";
         for (const field of fields) {
-            if (field.key === 'question') {
+            if (field.key === "question") {
                 question = field.value;
             }
-            else if (field.key === 'answer') {
+            else if (field.key === "answer") {
                 // Rich text field - value is JSON (Portable Text format)
                 // Convert to HTML for easy frontend rendering
                 answer = this.portableTextToHtml(field.value);
@@ -371,15 +388,15 @@ let ThemeContentService = class ThemeContentService {
      */
     portableTextToHtml(jsonString) {
         if (!jsonString) {
-            return '';
+            return "";
         }
         try {
             const doc = JSON.parse(jsonString);
             return this.renderPortableTextNode(doc);
         }
         catch (error) {
-            logger_1.logger.warn('Failed to parse Portable Text JSON, returning raw value', {
-                error: error instanceof Error ? error.message : 'Unknown',
+            logger_1.logger.warn("Failed to parse Portable Text JSON, returning raw value", {
+                error: error instanceof Error ? error.message : "Unknown",
                 value: jsonString.substring(0, 100),
             });
             return jsonString;
@@ -389,34 +406,36 @@ let ThemeContentService = class ThemeContentService {
      * Recursively render a Portable Text node to HTML.
      */
     renderPortableTextNode(node) {
-        if (!node || typeof node !== 'object') {
-            return '';
+        if (!node || typeof node !== "object") {
+            return "";
         }
         const children = node.children
-            ? node.children.map((child) => this.renderPortableTextNode(child)).join('')
-            : '';
+            ? node.children
+                .map((child) => this.renderPortableTextNode(child))
+                .join("")
+            : "";
         switch (node.type) {
-            case 'root':
+            case "root":
                 return children;
-            case 'paragraph':
+            case "paragraph":
                 return `<p>${children}</p>`;
-            case 'heading': {
+            case "heading": {
                 const level = node.level || 2;
                 return `<h${level}>${children}</h${level}>`;
             }
-            case 'list': {
-                const tag = node.listType === 'ordered' ? 'ol' : 'ul';
+            case "list": {
+                const tag = node.listType === "ordered" ? "ol" : "ul";
                 return `<${tag}>${children}</${tag}>`;
             }
-            case 'list-item':
+            case "list-item":
                 return `<li>${children}</li>`;
-            case 'link': {
-                const href = node.url || node.href || '#';
-                const target = node.target || '_blank';
+            case "link": {
+                const href = node.url || node.href || "#";
+                const target = node.target || "_blank";
                 return `<a href="${this.escapeHtml(href)}" target="${target}" rel="noopener noreferrer">${children}</a>`;
             }
-            case 'text': {
-                let text = this.escapeHtml(node.value || '');
+            case "text": {
+                let text = this.escapeHtml(node.value || "");
                 // Apply marks (bold, italic, etc.)
                 if (node.bold) {
                     text = `<strong>${text}</strong>`;
@@ -436,11 +455,11 @@ let ThemeContentService = class ThemeContentService {
      */
     escapeHtml(str) {
         return str
-            .replace(/&/g, '&amp;')
-            .replace(/</g, '&lt;')
-            .replace(/>/g, '&gt;')
-            .replace(/"/g, '&quot;')
-            .replace(/'/g, '&#039;');
+            .replace(/&/g, "&amp;")
+            .replace(/</g, "&lt;")
+            .replace(/>/g, "&gt;")
+            .replace(/"/g, "&quot;")
+            .replace(/'/g, "&#039;");
     }
     /**
      * Curates parsed theme content
@@ -448,7 +467,7 @@ let ThemeContentService = class ThemeContentService {
     async curateThemeContent(brand, parsed) {
         const { sections, order } = parsed;
         if (!sections || !order) {
-            logger_1.logger.warn('Invalid theme content structure', {
+            logger_1.logger.warn("Invalid theme content structure", {
                 hasSections: !!sections,
                 hasOrder: !!order,
             });
@@ -483,7 +502,7 @@ let ThemeContentService = class ThemeContentService {
                 }
                 // Handle featured-collection section type
                 const collectionHandle = section.settings.collection;
-                if (section.type === 'featured-collection' && collectionHandle) {
+                if (section.type === "featured-collection" && collectionHandle) {
                     const productsCount = section.settings.products_to_show || 8;
                     curatedSection.collectionRef = {
                         handle: collectionHandle,
@@ -527,7 +546,7 @@ let ThemeContentService = class ThemeContentService {
      */
     async resolveCollectionReferences(brand, content) {
         if (!this.collectionService || !this.productService) {
-            logger_1.logger.warn('Collection/Product services not provided, skipping resolution');
+            logger_1.logger.warn("Collection/Product services not provided, skipping resolution");
             return content;
         }
         const sectionsWithRefs = content
@@ -538,10 +557,10 @@ let ThemeContentService = class ThemeContentService {
         }
         // Fetch all collections in parallel
         const collectionPromises = sectionsWithRefs.map(({ section }) => this.collectionService.getCollectionByHandle(brand, section.collectionRef.handle, section.collectionRef.productsCount).catch((error) => {
-            logger_1.logger.error('Failed to fetch collection for theme section', {
+            logger_1.logger.error("Failed to fetch collection for theme section", {
                 brand,
                 handle: section.collectionRef.handle,
-                error: error instanceof Error ? error.message : 'Unknown',
+                error: error instanceof Error ? error.message : "Unknown",
             });
             return null;
         }));
@@ -554,10 +573,10 @@ let ThemeContentService = class ThemeContentService {
         // Fetch all products in parallel
         const productHandleArray = Array.from(allProductHandles);
         const productPromises = productHandleArray.map((handle) => this.productService.getProductByHandle(brand, handle).catch((error) => {
-            logger_1.logger.error('Failed to fetch product for collection', {
+            logger_1.logger.error("Failed to fetch product for collection", {
                 brand,
                 handle,
-                error: error instanceof Error ? error.message : 'Unknown',
+                error: error instanceof Error ? error.message : "Unknown",
             });
             return null;
         }));
@@ -601,7 +620,7 @@ let ThemeContentService = class ThemeContentService {
      */
     async resolveProductReferences(brand, content) {
         if (!this.productService) {
-            logger_1.logger.warn('Product service not provided, skipping resolution');
+            logger_1.logger.warn("Product service not provided, skipping resolution");
             return content;
         }
         const sectionsWithRefs = content
@@ -612,10 +631,10 @@ let ThemeContentService = class ThemeContentService {
         }
         // Fetch all products in parallel
         const productPromises = sectionsWithRefs.map(({ section }) => this.productService.getProductByHandle(brand, section.productRef.handle).catch((error) => {
-            logger_1.logger.error('Failed to fetch product for theme section', {
+            logger_1.logger.error("Failed to fetch product for theme section", {
                 brand,
                 handle: section.productRef.handle,
-                error: error instanceof Error ? error.message : 'Unknown',
+                error: error instanceof Error ? error.message : "Unknown",
             });
             return null;
         }));
@@ -678,13 +697,13 @@ let ThemeContentService = class ThemeContentService {
         if (references.size === 0) {
             return curated;
         }
-        logger_1.logger.info('Resolving media references', {
+        logger_1.logger.info("Resolving media references", {
             brand,
             count: references.size,
         });
         const urlMap = await this.fetchMediaUrls(brand, Array.from(references));
         if (urlMap.size === 0) {
-            logger_1.logger.warn('No media URLs resolved');
+            logger_1.logger.warn("No media URLs resolved");
         }
         return this.replaceMediaReferences(curated, urlMap);
     }
@@ -695,13 +714,13 @@ let ThemeContentService = class ThemeContentService {
             for (const [key, value] of Object.entries(obj)) {
                 if (skipKeys.includes(key))
                     continue;
-                if (typeof value === 'string' && shopifyPattern.test(value)) {
+                if (typeof value === "string" && shopifyPattern.test(value)) {
                     references.add(value);
                 }
-                else if (typeof value === 'object' && value !== null) {
+                else if (typeof value === "object" && value !== null) {
                     if (Array.isArray(value)) {
                         value.forEach((item) => {
-                            if (typeof item === 'object' && item !== null) {
+                            if (typeof item === "object" && item !== null) {
                                 extractFromObject(item, skipKeys);
                             }
                         });
@@ -737,7 +756,7 @@ let ThemeContentService = class ThemeContentService {
         const adminToken = this.configService.getShopifyAdminToken(brand);
         const storeDomain = this.configService.getShopifyStoreDomain(brand);
         if (!adminToken || !storeDomain) {
-            logger_1.logger.warn('Missing Admin API configuration for media resolution', {
+            logger_1.logger.warn("Missing Admin API configuration for media resolution", {
                 brand,
             });
             return urlMap;
@@ -745,10 +764,10 @@ let ThemeContentService = class ThemeContentService {
         const shopImageRefs = [];
         const filesApiRefs = [];
         for (const ref of references) {
-            if (ref.startsWith('shopify://shop_images/')) {
+            if (ref.startsWith("shopify://shop_images/")) {
                 shopImageRefs.push(ref);
             }
-            else if (ref.startsWith('shopify://files/')) {
+            else if (ref.startsWith("shopify://files/")) {
                 filesApiRefs.push(ref);
             }
         }
@@ -761,15 +780,31 @@ let ThemeContentService = class ThemeContentService {
         return urlMap;
     }
     async resolveShopImages(refs, urlMap, adminToken, storeDomain) {
+        // Map lowercased filename -> original ref so returned files can be matched
+        // back to the theme reference regardless of case.
         const filenameMap = new Map();
         for (const ref of refs) {
-            const filename = ref.split('/').pop();
+            const filename = ref.split("/").pop();
             if (filename) {
-                filenameMap.set(filename, ref);
+                filenameMap.set(filename.toLowerCase(), ref);
             }
         }
-        const query = `{
-      files(first: 250, query: "media_type:IMAGE status:READY", sortKey: CREATED_AT, reverse: true) {
+        const uniqueFilenames = Array.from(new Set(refs.map((ref) => ref.split("/").pop()).filter((f) => !!f)));
+        const extractFilenameFromUrl = (url) => {
+            const urlWithoutQuery = url.split("?")[0];
+            const segments = urlWithoutQuery.split("/");
+            return segments[segments.length - 1].toLowerCase();
+        };
+        try {
+            // Query the Files API by exact filename in batches. Fetching the newest N
+            // files and matching in memory silently drops any image older than that
+            // window; a targeted `filename:` search resolves refs regardless of how
+            // many files the store has.
+            for (let i = 0; i < uniqueFilenames.length; i += ThemeContentService_1.MEDIA_QUERY_BATCH_SIZE) {
+                const batch = uniqueFilenames.slice(i, i + ThemeContentService_1.MEDIA_QUERY_BATCH_SIZE);
+                const searchQuery = this.buildFilenameSearchQuery("IMAGE", batch);
+                const query = `{
+      files(first: ${batch.length * 2}, query: ${JSON.stringify(searchQuery)}) {
         nodes {
           ... on MediaImage {
             id
@@ -782,94 +817,68 @@ let ThemeContentService = class ThemeContentService {
         }
       }
     }`;
-        try {
-            const response = await fetch(`https://${storeDomain}/admin/api/2024-01/graphql.json`, {
-                method: 'POST',
-                headers: {
-                    'Content-Type': 'application/json',
-                    'X-Shopify-Access-Token': adminToken,
-                },
-                body: JSON.stringify({ query }),
-            });
-            const result = (await response.json());
-            if (result.errors?.length) {
-                logger_1.logger.error('Shopify Files API errors for shop_images', {
-                    errors: result.errors.map((e) => e.message),
+                const response = await fetch(`https://${storeDomain}/admin/api/2024-01/graphql.json`, {
+                    method: "POST",
+                    headers: {
+                        "Content-Type": "application/json",
+                        "X-Shopify-Access-Token": adminToken,
+                    },
+                    body: JSON.stringify({ query }),
                 });
-                return;
-            }
-            const files = result.data?.files?.nodes || [];
-            const extractFilenameFromUrl = (url) => {
-                const urlWithoutQuery = url.split('?')[0];
-                const segments = urlWithoutQuery.split('/');
-                return segments[segments.length - 1].toLowerCase();
-            };
-            // First pass: exact filename match
-            for (const file of files) {
-                const image = file.image;
-                if (!image?.url)
+                const result = (await response.json());
+                if (result.errors?.length) {
+                    logger_1.logger.error("Shopify Files API errors for shop_images", {
+                        errors: result.errors.map((e) => e.message),
+                    });
                     continue;
-                const cdnFilename = extractFilenameFromUrl(image.url);
-                for (const [filename, ref] of filenameMap.entries()) {
-                    const lookupFilename = filename.toLowerCase();
-                    if (cdnFilename === lookupFilename) {
-                        urlMap.set(ref, {
-                            url: image.url,
-                            width: image.width,
-                            height: image.height,
-                        });
-                        filenameMap.delete(filename);
-                        break;
-                    }
                 }
-                if (filenameMap.size === 0)
-                    break;
-            }
-            // Second pass: fuzzy match for remaining
-            if (filenameMap.size > 0) {
+                const files = result.data?.files?.nodes || [];
                 for (const file of files) {
                     const image = file.image;
                     if (!image?.url)
                         continue;
-                    const cdnUrlLower = image.url.toLowerCase();
-                    for (const [filename, ref] of filenameMap.entries()) {
-                        const nameWithoutExt = filename.replace(/\.[^/.]+$/, '').toLowerCase();
-                        if (cdnUrlLower.includes(nameWithoutExt)) {
-                            urlMap.set(ref, {
-                                url: image.url,
-                                width: image.width,
-                                height: image.height,
-                            });
-                            filenameMap.delete(filename);
-                            break;
-                        }
+                    const cdnFilename = extractFilenameFromUrl(image.url);
+                    const ref = filenameMap.get(cdnFilename);
+                    if (ref && !urlMap.has(ref)) {
+                        urlMap.set(ref, {
+                            url: image.url,
+                            width: image.width,
+                            height: image.height,
+                        });
+                        filenameMap.delete(cdnFilename);
                     }
-                    if (filenameMap.size === 0)
-                        break;
                 }
             }
             if (filenameMap.size > 0) {
-                logger_1.logger.warn('Unresolved shop_images', {
+                logger_1.logger.warn("Unresolved shop_images", {
                     filenames: Array.from(filenameMap.keys()),
                 });
             }
         }
         catch (error) {
-            logger_1.logger.error('Failed to fetch shop_images from Files API', {
-                error: error instanceof Error ? error.message : 'Unknown',
+            logger_1.logger.error("Failed to fetch shop_images from Files API", {
+                error: error instanceof Error ? error.message : "Unknown",
             });
         }
     }
     async resolveFilesApiMedia(refs, urlMap, adminToken, storeDomain) {
+        // Map lowercased filename (and its extension-less form) -> original ref.
         const videoFilenameMap = new Map();
         for (const ref of refs) {
-            const filename = ref.split('/').pop();
+            const filename = ref.split("/").pop();
             if (filename) {
-                videoFilenameMap.set(filename, ref);
+                videoFilenameMap.set(filename.toLowerCase(), ref);
             }
         }
-        const query = `{
-      files(first: 100, query: "media_type:VIDEO status:READY", sortKey: CREATED_AT, reverse: true) {
+        const uniqueFilenames = Array.from(new Set(refs.map((ref) => ref.split("/").pop()).filter((f) => !!f)));
+        try {
+            // Query the Files API by exact filename in batches (see resolveShopImages
+            // for why the newest-N approach silently drops older media).
+            for (let i = 0; i < uniqueFilenames.length; i += ThemeContentService_1.MEDIA_QUERY_BATCH_SIZE) {
+                const batch = uniqueFilenames.slice(i, i + ThemeContentService_1.MEDIA_QUERY_BATCH_SIZE);
+                const searchQuery = this.buildFilenameSearchQuery("VIDEO", batch);
+                const query = `{
+      files(first: ${batch.length * 2}, query: ${JSON.stringify(searchQuery)}) {
         nodes {
           ... on Video {
             id
@@ -884,78 +893,85 @@ let ThemeContentService = class ThemeContentService {
         }
       }
     }`;
-        try {
-            const response = await fetch(`https://${storeDomain}/admin/api/2024-01/graphql.json`, {
-                method: 'POST',
-                headers: {
-                    'Content-Type': 'application/json',
-                    'X-Shopify-Access-Token': adminToken,
-                },
-                body: JSON.stringify({ query }),
-            });
-            const result = (await response.json());
-            if (result.errors?.length) {
-                logger_1.logger.error('Shopify Files API errors', {
-                    errors: result.errors.map((e) => e.message),
+                const response = await fetch(`https://${storeDomain}/admin/api/2024-01/graphql.json`, {
+                    method: "POST",
+                    headers: {
+                        "Content-Type": "application/json",
+                        "X-Shopify-Access-Token": adminToken,
+                    },
+                    body: JSON.stringify({ query }),
                 });
-                return;
-            }
-            const files = result.data?.files?.nodes || [];
-            for (const file of files) {
-                if (!file.sources || file.sources.length === 0)
-                    continue;
-                const mp4Source = file.sources.find((s) => s.mimeType.includes('mp4'));
-                const selectedSource = mp4Source || file.sources[0];
-                if (!selectedSource?.url)
+                const result = (await response.json());
+                if (result.errors?.length) {
+                    logger_1.logger.error("Shopify Files API errors", {
+                        errors: result.errors.map((e) => e.message),
+                    });
                     continue;
-                const videoIdentifier = (file.filename || selectedSource.url).toLowerCase();
-                for (const [filename, ref] of videoFilenameMap.entries()) {
-                    const nameWithoutExt = filename.replace(/\.[^/.]+$/, '').toLowerCase();
-                    if (videoIdentifier.includes(nameWithoutExt)) {
+                }
+                const files = result.data?.files?.nodes || [];
+                for (const file of files) {
+                    if (!file.sources || file.sources.length === 0)
+                        continue;
+                    const mp4Source = file.sources.find((s) => s.mimeType.includes("mp4"));
+                    const selectedSource = mp4Source || file.sources[0];
+                    if (!selectedSource?.url)
+                        continue;
+                    if (!file.filename)
+                        continue;
+                    const ref = videoFilenameMap.get(file.filename.toLowerCase());
+                    if (ref && !urlMap.has(ref)) {
                         urlMap.set(ref, {
                             url: selectedSource.url,
                             width: selectedSource.width,
                             height: selectedSource.height,
                         });
-                        videoFilenameMap.delete(filename);
-                        break;
+                        videoFilenameMap.delete(file.filename.toLowerCase());
                     }
                 }
-                if (videoFilenameMap.size === 0)
-                    break;
             }
             if (videoFilenameMap.size > 0) {
-                logger_1.logger.warn('Unresolved videos', {
+                logger_1.logger.warn("Unresolved videos", {
                     filenames: Array.from(videoFilenameMap.keys()),
                 });
             }
         }
         catch (error) {
-            logger_1.logger.error('Failed to fetch Files API media', {
-                error: error instanceof Error ? error.message : 'Unknown',
+            logger_1.logger.error("Failed to fetch Files API media", {
+                error: error instanceof Error ? error.message : "Unknown",
             });
         }
     }
+    /**
+     * Build a Shopify Files search query that matches any of the given filenames
+     * for a media type, e.g.
+     *   media_type:IMAGE status:READY (filename:'a.png' OR filename:'b.jpg')
+     */
+    buildFilenameSearchQuery(mediaType, filenames) {
+        const orClause = filenames
+            .map((f) => `filename:'${f.replace(/\\/g, "\\\\").replace(/'/g, "\\'")}'`)
+            .join(" OR ");
+        return `media_type:${mediaType} status:READY (${orClause})`;
+    }
     mediaFieldNames = new Set([
-        'image',
-        'image_web',
-        'image_mweb',
-        'image_mobile',
-        'video',
-        'video_web',
-        'video_mweb',
-        'video_mobile',
+        "image",
+        "image_web",
+        "image_mweb",
+        "image_mobile",
+        "video",
+        "video_web",
+        "video_mweb",
+        "video_mobile",
     ]);
     isMediaUrl(value) {
-        return (value.startsWith('https://') ||
-            value.startsWith('http://') ||
-            value.startsWith('//'));
+        return (value.startsWith("https://") ||
+            value.startsWith("http://") ||
+            value.startsWith("//"));
     }
     replaceMediaReferences(curated, urlMap) {
         const replaceInObject = (obj) => {
             const result = { ...obj };
             for (const [key, value] of Object.entries(result)) {
-                if (typeof value === 'string') {
+                if (typeof value === "string") {
                     if (urlMap.has(value)) {
                         const media = urlMap.get(value);
                         result[key] = {
@@ -972,18 +988,18 @@ let ThemeContentService = class ThemeContentService {
                         };
                     }
                     else if (this.mediaFieldNames.has(key) &&
-                        value.startsWith('shopify://')) {
-                        logger_1.logger.warn('Unresolved shopify:// media reference', {
+                        value.startsWith("shopify://")) {
+                        logger_1.logger.warn("Unresolved shopify:// media reference", {
                             key,
                             value,
                         });
                         result[key] = null;
                     }
                 }
-                else if (typeof value === 'object' && value !== null) {
+                else if (typeof value === "object" && value !== null) {
                     if (Array.isArray(value)) {
                         result[key] = value.map((item) => {
-                            if (typeof item === 'object' && item !== null) {
+                            if (typeof item === "object" && item !== null) {
                                 return replaceInObject(item);
                             }
                             return item;
@@ -1019,7 +1035,7 @@ let ThemeContentService = class ThemeContentService {
     }
 };
 exports.ThemeContentService = ThemeContentService;
-exports.ThemeContentService = ThemeContentService = tslib_1.__decorate([
+exports.ThemeContentService = ThemeContentService = ThemeContentService_1 = tslib_1.__decorate([
     (0, common_1.Injectable)(),
     tslib_1.__param(3, (0, common_1.Optional)()),
     tslib_1.__param(3, (0, common_1.Inject)(theme_content_interfaces_1.THEME_COLLECTION_SERVICE)),