@o2vend/theme-cli 1.0.33 → 1.0.34

package/lib/lib/dev-server.js

@@ -462,8 +462,8 @@ class DevServer {
     // Products listing page
     this.app.get('/products', async (req, res, next) => {
       try {
-        // Check for category filter in query parameters
-        const categoryFilter = req.query.category;
+        // Check for category filter in query parameters (handle both 'category' and 'Category')
+        const categoryFilter = req.query.category || req.query.Category;
         
         let context = await this.buildContext(req, 'products');
         
@@ -480,35 +480,55 @@ class DevServer {
           if (category) {
             console.log(`[PRODUCTS PAGE] Found category: ${category.name} (ID: ${category.id})`);
             
-            // Filter products by categoryId
-            const filteredProducts = context.products.filter(p => 
-              p.categoryId === category.id || 
-              String(p.categoryId).toLowerCase() === String(category.id).toLowerCase()
-            );
+            // Filter products by categoryId and enrich them
+            const filteredProducts = context.products
+              .filter(p => 
+                p.categoryId === category.id || 
+                String(p.categoryId).toLowerCase() === String(category.id).toLowerCase()
+              )
+              .map(p => this.enrichProductData(p)); // Enrich each product
             
+            // CRITICAL: Set both context.products and context.collection.products to the SAME enriched array
+            // This ensures they always reference the same objects (like widgets do)
             context.products = filteredProducts;
-            console.log(`[PRODUCTS PAGE] Filtered products: ${filteredProducts.length} products in category`);
-            
-            // Update collection context
             context.collection = context.collection || {};
+            context.collection.products = context.products; // Same reference as context.products
             context.collection.title = category.name || 'Products';
             context.collection.handle = category.handle || categoryFilter;
             context.collection.description = category.description;
             context.collection.totalProducts = filteredProducts.length;
+            
+            console.log(`[PRODUCTS PAGE] Filtered products: ${filteredProducts.length} products in category`);
+            console.log(`[PRODUCTS PAGE] ✅ collection.products === context.products: ${context.collection.products === context.products}`);
+            
+            console.log(`[PRODUCTS PAGE] ✅ Category filtered: ${filteredProducts.length} enriched products in collection`);
           } else {
             console.warn(`[PRODUCTS PAGE] Category not found: ${categoryFilter}, showing all products`);
           }
         }
         
-        // Ensure all products have proper URL field if missing
-        context.products = (context.products || []).map(product => {
-          if (!product.url && !product.link) {
-            const handle = product.handle || product.slug || product.id;
-            product.url = `/products/${handle}`;
-            product.link = `/products/${handle}`;
-          }
-          return product;
-        });
+        // Ensure all products have proper data: URL, name/title, price, images
+        // Only enrich if not already enriched (check if first product has url field)
+        if (context.products && context.products.length > 0 && !context.products[0].url && !context.products[0].link) {
+          console.log(`[PRODUCTS PAGE] Products need enrichment - enriching now...`);
+          context.products = this.enrichProductsData(context.products);
+        } else if (context.products && context.products.length > 0) {
+          // Products already enriched
+          console.log(`[PRODUCTS PAGE] Products already enriched, first product has URL: ${context.products[0].url || context.products[0].link}`);
+        }
+        
+        // Debug: Log sample product data to verify enrichment
+        if (context.products.length > 0) {
+          const sample = context.products[0];
+          console.log(`[PRODUCTS PAGE] Sample product data:`, {
+            title: sample.title || sample.name,
+            url: sample.url || sample.link,
+            price: sample.price || sample.sellingPrice,
+            stock: sample.stock,
+            inStock: sample.inStock,
+            hasImage: !!(sample.imageUrl || sample.thumbnailImage1)
+          });
+        }
         
         // DEBUG: Log context data for /products page
         console.log(`[PRODUCTS PAGE] Context summary:`);
@@ -537,17 +557,20 @@ class DevServer {
             const productsResponse = await this.apiClient.getProducts({ limit: 50, offset: 0, ...queryParams });
             context.products = productsResponse.products || productsResponse.data?.products || [];
             
-            // Ensure URLs are set
-            context.products = context.products.map(product => {
-              if (!product.url && !product.link) {
-                const handle = product.handle || product.slug || product.id;
-                product.url = `/products/${handle}`;
-                product.link = `/products/${handle}`;
-              }
-              return product;
-            });
+            // Ensure URLs and all product data are set
+            context.products = this.enrichProductsData(context.products);
             
             console.log(`[PRODUCTS PAGE] ✅ Reloaded ${context.products.length} products`);
+            if (context.products.length > 0) {
+              const sample = context.products[0];
+              console.log(`[PRODUCTS PAGE] Sample reloaded product:`, {
+                title: sample.title || sample.name,
+                url: sample.url || sample.link,
+                price: sample.price || sample.sellingPrice,
+                stock: sample.stock,
+                inStock: sample.inStock
+              });
+            }
           } catch (error) {
             console.error('[PRODUCTS PAGE] ❌ Failed to load products:', error.message);
           }
@@ -605,9 +628,14 @@ class DevServer {
         }
         
         // Ensure collection.products is set for products template
+        // CRITICAL: Always sync collection.products with context.products AFTER enrichment
+        // This ensures collection.products always has the same enriched objects as context.products
         if (context.products && context.products.length > 0) {
+          // Always reassign collection.products to match context.products (they should be the same)
           context.collection = context.collection || {};
-          context.collection.products = context.products;
+          context.collection.products = context.products; // Use the same enriched array
+          
+          // Update collection metadata if not set
           if (!context.collection.title) {
             context.collection.title = categoryFilter ? `${categoryFilter} Products` : 'All Products';
           }
@@ -617,6 +645,56 @@ class DevServer {
           if (!context.collection.totalProducts) {
             context.collection.totalProducts = context.products.length;
           }
+          
+          // Debug: Verify collection.products has same reference as context.products
+          const sameReference = context.collection.products === context.products;
+          console.log(`[PRODUCTS PAGE] collection.products sync: same reference=${sameReference}, length=${context.collection.products?.length || 0}`);
+          
+          // Debug: Log sample product from collection to verify enrichment
+          if (context.collection.products && context.collection.products.length > 0) {
+            const sample = context.collection.products[0];
+            console.log(`[PRODUCTS PAGE] ✅ Sample collection product before render:`, {
+              id: sample.id,
+              title: sample.title || sample.name,
+              url: sample.url || sample.link || 'MISSING',
+              price: sample.price || sample.sellingPrice || 'MISSING',
+              prices: sample.prices ? { price: sample.prices.price, mrp: sample.prices.mrp } : 'MISSING',
+              stock: sample.stock !== undefined ? sample.stock : 'MISSING',
+              stockQuantity: sample.stockQuantity !== undefined ? sample.stockQuantity : 'MISSING',
+              inStock: sample.inStock !== undefined ? sample.inStock : 'MISSING',
+              available: sample.available !== undefined ? sample.available : 'MISSING',
+              hasImage: !!(sample.imageUrl || sample.thumbnailImage1),
+              imageUrl: sample.imageUrl || sample.thumbnailImage1?.url || 'MISSING',
+              hasThumbnailImage1: !!sample.thumbnailImage1,
+              hasImagesArray: !!(sample.images && sample.images.length > 0)
+            });
+          } else {
+            console.warn(`[PRODUCTS PAGE] ⚠️  collection.products is empty or undefined!`);
+            console.warn(`[PRODUCTS PAGE] context.products.length: ${context.products?.length || 0}`);
+            console.warn(`[PRODUCTS PAGE] context.collection:`, context.collection ? Object.keys(context.collection) : 'undefined');
+          }
+        } else {
+          console.warn(`[PRODUCTS PAGE] ⚠️  No products in context!`);
+        }
+        
+        // Debug: Log final context before rendering
+        console.log(`[PRODUCTS PAGE] Final context before rendering:`);
+        console.log(`  - Products count: ${context.products?.length || 0}`);
+        if (context.products && context.products.length > 0) {
+          const firstProduct = context.products[0];
+          console.log(`  - First product:`, {
+            id: firstProduct.id,
+            title: firstProduct.title || firstProduct.name,
+            url: firstProduct.url || firstProduct.link,
+            price: firstProduct.price || firstProduct.sellingPrice,
+            stock: firstProduct.stock,
+            inStock: firstProduct.inStock,
+            hasImage: !!(firstProduct.imageUrl || firstProduct.thumbnailImage1),
+            imageUrl: firstProduct.imageUrl || firstProduct.thumbnailImage1?.url
+          });
+        }
+        if (context.collection) {
+          console.log(`  - Collection: ${context.collection.title || context.collection.name}, Products: ${context.collection.products?.length || 0}`);
         }
         
         const html = await renderWithLayout(this.liquid, 'templates/products', context, this.themePath);
@@ -804,20 +882,13 @@ class DevServer {
           context.category = category;
           context.collection = category;
           
-          // Filter products by this category
-          const filteredProducts = (context.products || []).filter(p => 
-            p.categoryId === category.id || 
-            String(p.categoryId).toLowerCase() === String(category.id).toLowerCase()
-          );
-          
-          // Ensure all products have proper URL field if missing
-          filteredProducts.forEach(product => {
-            if (!product.url && !product.link) {
-              const handle = product.handle || product.slug || product.id;
-              product.url = `/products/${handle}`;
-              product.link = `/products/${handle}`;
-            }
-          });
+          // Filter products by this category and enrich them
+          const filteredProducts = (context.products || [])
+            .filter(p => 
+              p.categoryId === category.id || 
+              String(p.categoryId).toLowerCase() === String(category.id).toLowerCase()
+            )
+            .map(p => this.enrichProductData(p));
           
           context.collection.products = filteredProducts;
           context.collection.totalProducts = filteredProducts.length;
@@ -825,21 +896,15 @@ class DevServer {
           
           console.log(`[COLLECTION PAGE] Category: ${category.name}, Products: ${filteredProducts.length}`);
         } else {
-          // No category found, use all products
-          context.products = (context.products || []).map(product => {
-            if (!product.url && !product.link) {
-              const handle = product.handle || product.slug || product.id;
-              product.url = `/products/${handle}`;
-              product.link = `/products/${handle}`;
-            }
-            return product;
-          });
+          // No category found, use all products with enrichment
+          context.products = this.enrichProductsData(context.products || []);
           context.collection = context.collection || {};
           context.collection.products = context.products;
         }
         
+        // Prioritize products template to show product list, not categories list
         let html;
-        const templateOptions = ['templates/categories', 'templates/category', 'templates/collection'];
+        const templateOptions = ['templates/products', 'templates/collection', 'templates/category', 'templates/categories'];
         for (const template of templateOptions) {
           try {
             html = await renderWithLayout(this.liquid, template, context, this.themePath);
@@ -899,20 +964,13 @@ class DevServer {
           context.category = category;
           context.collection = category;
           
-          // Filter products by this category
-          const filteredProducts = (context.products || []).filter(p => 
-            p.categoryId === category.id || 
-            String(p.categoryId).toLowerCase() === String(category.id).toLowerCase()
-          );
-          
-          // Ensure all products have proper URL field if missing
-          filteredProducts.forEach(product => {
-            if (!product.url && !product.link) {
-              const handle = product.handle || product.slug || product.id;
-              product.url = `/products/${handle}`;
-              product.link = `/products/${handle}`;
-            }
-          });
+          // Filter products by this category and enrich them
+          const filteredProducts = (context.products || [])
+            .filter(p => 
+              p.categoryId === category.id || 
+              String(p.categoryId).toLowerCase() === String(category.id).toLowerCase()
+            )
+            .map(p => this.enrichProductData(p));
           
           context.collection.products = filteredProducts;
           context.collection.totalProducts = filteredProducts.length;
@@ -920,21 +978,15 @@ class DevServer {
           
           console.log(`[CATEGORY PAGE] Category: ${category.name}, Products: ${filteredProducts.length}`);
         } else {
-          // No category found, use all products
-          context.products = (context.products || []).map(product => {
-            if (!product.url && !product.link) {
-              const handle = product.handle || product.slug || product.id;
-              product.url = `/products/${handle}`;
-              product.link = `/products/${handle}`;
-            }
-            return product;
-          });
+          // No category found, use all products with enrichment
+          context.products = this.enrichProductsData(context.products || []);
           context.collection = context.collection || {};
           context.collection.products = context.products;
         }
         
+        // Prioritize products template to show product list, not categories list
         let html;
-        const templateOptions = ['templates/categories', 'templates/category', 'templates/collection'];
+        const templateOptions = ['templates/products', 'templates/collection', 'templates/category', 'templates/categories'];
         for (const template of templateOptions) {
           try {
             html = await renderWithLayout(this.liquid, template, context, this.themePath);
@@ -1353,7 +1405,7 @@ class DevServer {
           return next();
         }
         
-        // Build context to get categories and products
+        // Build context to get categories, brands, and products
         const context = await this.buildContext(req, 'collection', { collectionHandle: handle });
         
         // Try to find category by handle (case-insensitive)
@@ -1363,34 +1415,147 @@ class DevServer {
         );
         
         if (category) {
-          // Found a category - render collection page
+          // Found a category - render products list (NOT categories list)
           context.category = category;
           context.collection = category;
           
-          // Filter products by this category
-          const filteredProducts = (context.products || []).filter(p => 
-            p.categoryId === category.id || 
-            String(p.categoryId).toLowerCase() === String(category.id).toLowerCase()
-          );
+          console.log(`[ROOT COLLECTION] Found category: ${category.name} (ID: ${category.id})`);
+          console.log(`[ROOT COLLECTION] Total products in context: ${context.products?.length || 0}`);
           
-          // Ensure all products have proper URL field if missing
-          filteredProducts.forEach(product => {
-            if (!product.url && !product.link) {
-              const productHandle = product.handle || product.slug || product.id;
-              product.url = `/products/${productHandle}`;
-              product.link = `/products/${productHandle}`;
-            }
-          });
+          // Filter products by this category and enrich them
+          const filteredProducts = (context.products || [])
+            .filter(p => {
+              const matches = p.categoryId === category.id || 
+                             String(p.categoryId).toLowerCase() === String(category.id).toLowerCase();
+              if (matches) {
+                console.log(`[ROOT COLLECTION] Product matches: ${p.title || p.name || p.id}, categoryId: ${p.categoryId}`);
+              }
+              return matches;
+            })
+            .map(p => this.enrichProductData(p)); // Enrich each product
+          
+          console.log(`[ROOT COLLECTION] Filtered products count: ${filteredProducts.length}`);
+          
+          // Log sample enriched products
+          if (filteredProducts.length > 0) {
+            filteredProducts.slice(0, 3).forEach((product, index) => {
+              console.log(`[ROOT COLLECTION] Product ${index} AFTER enrichment:`, {
+                id: product.id,
+                title: product.title || product.name,
+                url: product.url || product.link,
+                price: product.price || product.sellingPrice,
+                stock: product.stock,
+                inStock: product.inStock,
+                hasImage: !!(product.imageUrl || product.thumbnailImage1),
+                imageUrl: product.imageUrl || product.thumbnailImage1?.url
+              });
+            });
+          }
           
+          // Set products in multiple places to ensure templates can access them
           context.collection.products = filteredProducts;
           context.collection.totalProducts = filteredProducts.length;
           context.products = filteredProducts; // Also set in products array for consistency
           
-          console.log(`[ROOT COLLECTION] Category: ${category.name}, Products: ${filteredProducts.length}`);
+          // Also set in collection object for template compatibility
+          if (!context.collection.products) {
+            context.collection.products = filteredProducts;
+          }
+          
+          console.log(`[ROOT COLLECTION] Final context setup:`);
+          console.log(`  - context.products.length: ${context.products?.length || 0}`);
+          console.log(`  - context.collection.products.length: ${context.collection.products?.length || 0}`);
+          console.log(`  - context.collection.totalProducts: ${context.collection.totalProducts || 0}`);
+          
+          if (filteredProducts.length > 0) {
+            const sample = filteredProducts[0];
+            console.log(`[ROOT COLLECTION] Sample enriched product:`, {
+              id: sample.id,
+              title: sample.title || sample.name,
+              url: sample.url || sample.link,
+              price: sample.price || sample.sellingPrice,
+              stock: sample.stock,
+              inStock: sample.inStock,
+              hasImage: !!(sample.imageUrl || sample.thumbnailImage1),
+              imageUrl: sample.imageUrl || sample.thumbnailImage1?.url,
+              allKeys: Object.keys(sample).slice(0, 20)
+            });
+          } else {
+            console.warn(`[ROOT COLLECTION] ⚠️  No products found for category ${category.name}!`);
+            console.warn(`[ROOT COLLECTION] Available products in context: ${context.products?.length || 0}`);
+            if (context.products && context.products.length > 0) {
+              console.warn(`[ROOT COLLECTION] Sample product categoryIds:`, context.products.slice(0, 3).map(p => ({
+                id: p.id,
+                title: p.title || p.name,
+                categoryId: p.categoryId
+              })));
+            }
+          }
+          
+          // Debug: Log final context before rendering
+          console.log(`[ROOT COLLECTION] Final context before rendering:`);
+          console.log(`  - Products count: ${context.products?.length || 0}`);
+          if (context.products && context.products.length > 0) {
+            const firstProduct = context.products[0];
+            console.log(`  - First product:`, {
+              id: firstProduct.id,
+              title: firstProduct.title || firstProduct.name,
+              url: firstProduct.url || firstProduct.link,
+              price: firstProduct.price || firstProduct.sellingPrice,
+              stock: firstProduct.stock,
+              inStock: firstProduct.inStock,
+              hasImage: !!(firstProduct.imageUrl || firstProduct.thumbnailImage1)
+            });
+          }
+          
+          // Try to render products template first (to show product list, not categories list)
+          let html;
+          const templateOptions = ['templates/products', 'templates/collection', 'templates/category', 'templates/categories'];
+          for (const template of templateOptions) {
+            try {
+              html = await renderWithLayout(this.liquid, template, context, this.themePath);
+              break;
+            } catch (error) {
+              if (!error.message?.includes('Template not found')) {
+                throw error;
+              }
+            }
+          }
+          
+          if (html) {
+            res.setHeader('Content-Type', 'text/html; charset=utf-8');
+            res.setHeader('Cache-Control', 'no-cache');
+            return res.send(html);
+          }
+        }
+        
+        // Not a category - try to find brand by handle
+        const brand = context.brands?.find(b => 
+          (b.handle && b.handle.toLowerCase() === handle.toLowerCase()) ||
+          (b.name && b.name.toLowerCase().replace(/\s+/g, '-') === handle.toLowerCase())
+        );
+        
+        if (brand) {
+          // Found a brand - render products list
+          context.brand = brand;
+          
+          // Filter products by this brand and enrich them
+          const filteredProducts = (context.products || [])
+            .filter(p => 
+              p.brandId === brand.id || 
+              String(p.brandId).toLowerCase() === String(brand.id).toLowerCase() ||
+              (p.brand && p.brand.toLowerCase() === brand.name.toLowerCase())
+            )
+            .map(p => this.enrichProductData(p));
+          
+          context.brand.products = filteredProducts;
+          context.products = filteredProducts;
+          
+          console.log(`[ROOT BRAND] Brand: ${brand.name}, Products: ${filteredProducts.length}`);
           
-          // Try to render collection template
+          // Try to render products template
           let html;
-          const templateOptions = ['templates/categories', 'templates/category', 'templates/collection', 'templates/products'];
+          const templateOptions = ['templates/products', 'templates/brand', 'templates/collection', 'templates/brands'];
           for (const template of templateOptions) {
             try {
               html = await renderWithLayout(this.liquid, template, context, this.themePath);
@@ -1677,48 +1842,29 @@ class DevServer {
           const productsResponse = await this.apiClient.getProducts({ limit: 50, offset: 0 });
           context.products = productsResponse.products || productsResponse.data?.products || [];
           
-          // Ensure all products have proper URL, images, and stock fields
-          context.products = context.products.map((product, index) => {
-            // Ensure URL field exists
-            if (!product.url && !product.link) {
-              const handle = product.handle || product.slug || product.id;
-              product.url = `/products/${handle}`;
-              product.link = `/products/${handle}`;
-              
-              // Debug first few products to verify URL generation
-              if (index < 3) {
-                console.log(`[CONTEXT] Product ${index + 1} URL: ${product.url} (handle: ${product.handle || 'none'}, slug: ${product.slug || 'none'}, id: ${product.id || 'none'})`);
-              }
-            }
-            // Ensure stock fields exist (they should from mock-data, but double-check)
-            if (product.stock === undefined && product.stockQuantity === undefined) {
-              // Calculate from variants if available
-              if (product.variants && product.variants.length > 0) {
-                const totalStock = product.variants.reduce((sum, v) => sum + (v.stock || 0), 0);
-                product.stock = totalStock;
-                product.stockQuantity = totalStock;
-                product.inStock = totalStock > 0;
-                product.available = totalStock > 0;
-              } else {
-                // Default to in stock if no stock info
-                product.stock = 10;
-                product.stockQuantity = 10;
-                product.inStock = true;
-                product.available = true;
-              }
-            }
-            // Ensure image fields exist (they should from mock-data, but double-check)
-            if (!product.thumbnailImage1 && !product.imageUrl && (!product.images || product.images.length === 0)) {
-              // Fallback to picsum placeholder
-              const imageId = product.id ? String(product.id).replace(/\D/g, '') || '1' : '1';
-              product.imageUrl = `https://picsum.photos/seed/${imageId}/800/800`;
-              product.thumbnailImage1 = {
-                url: product.imageUrl,
-                altText: product.title || product.name || 'Product image'
-              };
-            }
-            return product;
-          });
+          // Enrich all products using the reusable enrichment function
+          // This ensures consistency with products used in widgets and pages
+          context.products = this.enrichProductsData(context.products);
+          
+          // Debug first few products to verify enrichment
+          if (context.products.length > 0) {
+            context.products.slice(0, 3).forEach((product, index) => {
+              console.log(`[CONTEXT] Product ${index + 1} after enrichment:`, {
+                id: product.id,
+                handle: product.handle || 'none',
+                url: product.url || product.link || 'MISSING',
+                title: product.title || product.name || 'MISSING',
+                price: product.price || product.sellingPrice || 'MISSING',
+                hasPrices: !!product.prices,
+                stock: product.stock !== undefined ? product.stock : 'MISSING',
+                stockQuantity: product.stockQuantity !== undefined ? product.stockQuantity : 'MISSING',
+                inStock: product.inStock !== undefined ? product.inStock : 'MISSING',
+                available: product.available !== undefined ? product.available : 'MISSING',
+                hasImage: !!(product.imageUrl || product.thumbnailImage1),
+                imageUrl: product.imageUrl || product.thumbnailImage1?.url || 'MISSING'
+              });
+            });
+          }
           
           console.log(`[CONTEXT] Loaded ${context.products.length} products`);
           
@@ -1746,6 +1892,18 @@ class DevServer {
           try {
             const categoriesResponse = await this.apiClient.getCategories({ limit: 50, offset: 0 });
             context.categories = categoriesResponse.categories || categoriesResponse.data?.categories || categoriesResponse || [];
+            
+            // Ensure all categories have proper URL fields for navigation
+            context.categories = context.categories.map(category => {
+              // Set URL to category handle (e.g., /accessories)
+              if (!category.url && !category.link) {
+                const handle = category.handle || category.name?.toLowerCase().replace(/\s+/g, '-') || category.id;
+                category.url = `/${handle}`;
+                category.link = `/${handle}`;
+              }
+              return category;
+            });
+            
             context.collections = context.categories; // Also set collections for compatibility
             console.log(`[CONTEXT] Loaded ${context.categories.length} categories`);
           } catch (error) {
@@ -1976,18 +2134,35 @@ class DevServer {
         if (type.includes('product') || type === 'featuredproducts' || type === 'bestsellerproducts' || type === 'newproducts' || type === 'simpleproduct' || type === 'singleproduct') {
           const widgetProducts = this.getProductsForWidget(widget, products);
           
+          // Products are already enriched by getProductsForWidget, but ensure they're properly formatted
+          const enrichedProducts = this.enrichProductsData(widgetProducts);
+          
           // Set products at multiple levels for template compatibility
-          widget.data.products = widgetProducts;
-          widget.data.Products = widgetProducts;
-          widget.products = widgetProducts;
+          widget.data.products = enrichedProducts;
+          widget.data.Products = enrichedProducts;
+          widget.products = enrichedProducts;
           
           // Also set in content for some template variations
           widget.data.content = widget.data.content || {};
-          widget.data.content.products = widgetProducts;
-          widget.data.content.Products = widgetProducts;
+          widget.data.content.products = enrichedProducts;
+          widget.data.content.Products = enrichedProducts;
           
           enrichedCount++;
-          console.log(`[ENRICH] ${widget.type} (${widget.id}): Added ${widgetProducts.length} products`);
+          console.log(`[ENRICH] ${widget.type} (${widget.id}): Added ${enrichedProducts.length} enriched products`);
+          
+          // Debug: Log sample product data
+          if (enrichedProducts.length > 0) {
+            const sample = enrichedProducts[0];
+            console.log(`[ENRICH] Sample widget product:`, {
+              id: sample.id,
+              title: sample.title || sample.name,
+              url: sample.url || sample.link,
+              price: sample.price || sample.sellingPrice,
+              stock: sample.stock,
+              inStock: sample.inStock,
+              hasImage: !!(sample.imageUrl || sample.thumbnailImage1)
+            });
+          }
         }
         
         // Enrich CategoryList and CategoryListCarousel widgets with categories
@@ -2024,13 +2199,18 @@ class DevServer {
         
         // Enrich RecentlyViewed widgets with products (use first 6 products as mock recent views)
         if (type === 'recentlyviewed' || type === 'recently-viewed') {
-          const recentProducts = products.slice(0, 6);
+          const recentProducts = this.enrichProductsData(products.slice(0, 6));
           widget.data.products = recentProducts;
           widget.data.Products = recentProducts;
           widget.products = recentProducts;
           
+          // Also set in content
+          widget.data.content = widget.data.content || {};
+          widget.data.content.products = recentProducts;
+          widget.data.content.Products = recentProducts;
+          
           enrichedCount++;
-          console.log(`[ENRICH] ${widget.type} (${widget.id}): Added ${recentProducts.length} recently viewed products`);
+          console.log(`[ENRICH] ${widget.type} (${widget.id}): Added ${recentProducts.length} enriched recently viewed products`);
         }
       });
     });
@@ -2038,37 +2218,268 @@ class DevServer {
     console.log(`[CONTEXT] ✅ Enriched ${enrichedCount} widgets with data`);
   }
   
+  /**
+   * Enrich a single product with all required data (URL, name/title, price, images, stock)
+   * This ensures consistency between widgets and pages
+   * @param {Object} product - Product object to enrich
+   * @returns {Object} Enriched product (creates a copy to avoid mutation)
+   */
+  enrichProductData(product) {
+    // Create a copy to avoid mutating the original
+    const enriched = { ...product };
+    
+    // CRITICAL: Ensure productId exists - it's the most reliable identifier
+    if (!enriched.productId && enriched.id) {
+      // Try to extract numeric ID from string ID (e.g., "product-1" -> 1)
+      const numericMatch = String(enriched.id).match(/\d+/);
+      if (numericMatch) {
+        enriched.productId = parseInt(numericMatch[0], 10);
+      } else {
+        // Use the ID as-is if it's already numeric
+        enriched.productId = enriched.id;
+      }
+    } else if (!enriched.productId && !enriched.id) {
+      console.warn(`[ENRICH] ⚠️  Product missing both id and productId:`, {
+        keys: Object.keys(enriched).slice(0, 15),
+        title: enriched.title || enriched.name
+      });
+    }
+    
+    // DEBUG: Log incoming product to diagnose missing fields
+    if (!product.id && !product.handle && !product.slug && !product.productId) {
+      console.warn(`[ENRICH] ⚠️  Product missing all identifiers (id/handle/slug/productId):`, {
+        keys: Object.keys(product).slice(0, 15),
+        title: product.title || product.name
+      });
+    }
+    
+    // Ensure URL field exists - CRITICAL for product navigation
+    // Treat '#' as missing URL and regenerate it
+    const hasValidUrl = enriched.url && enriched.url !== '#' && enriched.url !== '';
+    const hasValidLink = enriched.link && enriched.link !== '#' && enriched.link !== '';
+    
+    if (!hasValidUrl && !hasValidLink) {
+      const handle = enriched.handle || enriched.slug || enriched.id;
+      if (handle && handle !== '#' && handle !== '') {
+        enriched.url = `/products/${handle}`;
+        enriched.link = `/products/${handle}`;
+      } else {
+        // Last resort: use numeric ID if available
+        const numericId = enriched.productId || enriched.id;
+        if (numericId) {
+          const fallbackHandle = `product-${numericId}`.toLowerCase();
+          enriched.url = `/products/${fallbackHandle}`;
+          enriched.link = `/products/${fallbackHandle}`;
+          enriched.handle = enriched.handle || fallbackHandle; // Also set handle if missing
+          enriched.slug = enriched.slug || fallbackHandle; // Also set slug if missing
+        } else {
+          enriched.url = '#';
+          enriched.link = '#';
+          console.warn(`[ENRICH] ⚠️  Product has no id/handle/slug/productId, URL set to '#'`, {
+            productKeys: Object.keys(enriched).slice(0, 10)
+          });
+        }
+      }
+    } else if (!hasValidUrl && hasValidLink) {
+      enriched.url = enriched.link;
+    } else if (hasValidUrl && !hasValidLink) {
+      enriched.link = enriched.url;
+    } else if (enriched.url === '#' || enriched.link === '#') {
+      // If one is valid but the other is '#', update the '#' one
+      if (enriched.url === '#') enriched.url = enriched.link;
+      if (enriched.link === '#') enriched.link = enriched.url;
+    }
+    
+    // Ensure handle/slug exist if missing (for template fallback logic)
+    // Also normalize them (remove '#' or empty strings)
+    if (!enriched.handle || enriched.handle === '#' || enriched.handle === '') {
+      if (enriched.slug && enriched.slug !== '#' && enriched.slug !== '') {
+        enriched.handle = enriched.slug;
+      } else if (enriched.id && enriched.id !== '#') {
+        enriched.handle = String(enriched.id).toLowerCase();
+      } else if (enriched.productId) {
+        enriched.handle = `product-${enriched.productId}`.toLowerCase();
+      } else if (!enriched.handle) {
+        // Generate from URL if it was set above
+        if (enriched.url && enriched.url !== '#') {
+          enriched.handle = enriched.url.replace(/^\/products\//, '').toLowerCase();
+        }
+      }
+    }
+    
+    if (!enriched.slug || enriched.slug === '#' || enriched.slug === '') {
+      if (enriched.handle && enriched.handle !== '#' && enriched.handle !== '') {
+        enriched.slug = enriched.handle;
+      } else if (enriched.id && enriched.id !== '#') {
+        enriched.slug = String(enriched.id).toLowerCase();
+      } else if (enriched.productId) {
+        enriched.slug = `product-${enriched.productId}`.toLowerCase();
+      } else if (!enriched.slug) {
+        // Generate from URL if it was set above
+        if (enriched.url && enriched.url !== '#') {
+          enriched.slug = enriched.url.replace(/^\/products\//, '').toLowerCase();
+        }
+      }
+    }
+    
+    // Ensure name/title exists - CRITICAL for product display
+    if (!enriched.name && !enriched.title) {
+      enriched.name = `Product ${enriched.id || 'Unknown'}`;
+      enriched.title = enriched.name;
+    } else if (!enriched.name) {
+      enriched.name = enriched.title || `Product ${enriched.id || 'Unknown'}`;
+    } else if (!enriched.title) {
+      enriched.title = enriched.name;
+    }
+    
+    // Ensure both variations and variants exist (product-card uses variations)
+    if (enriched.variants && !enriched.variations) {
+      enriched.variations = enriched.variants;
+    } else if (enriched.variations && !enriched.variants) {
+      enriched.variants = enriched.variations;
+    }
+    
+    // Ensure price exists - CRITICAL for product display
+    if (!enriched.price && !enriched.sellingPrice) {
+      // Try to get from variants/variations first
+      const variantsOrVariations = enriched.variants || enriched.variations;
+      if (variantsOrVariations && variantsOrVariations.length > 0) {
+        enriched.price = variantsOrVariations[0].price || variantsOrVariations[0].sellingPrice || 0;
+        enriched.sellingPrice = enriched.price;
+      } else {
+        enriched.price = 0;
+        enriched.sellingPrice = 0;
+      }
+    } else if (!enriched.price) {
+      enriched.price = enriched.sellingPrice;
+    } else if (!enriched.sellingPrice) {
+      enriched.sellingPrice = enriched.price;
+    }
+    
+    // Ensure prices object exists for product-card compatibility - CRITICAL
+    // Make sure price is NOT 0 unless it's actually 0 (check if undefined/null)
+    const finalPrice = (enriched.price !== undefined && enriched.price !== null) 
+      ? enriched.price 
+      : ((enriched.sellingPrice !== undefined && enriched.sellingPrice !== null) 
+          ? enriched.sellingPrice 
+          : 0);
+    
+    if (!enriched.prices) {
+      const mrpValue = enriched.compareAtPrice || enriched.comparePrice || enriched.mrp || 0;
+      enriched.prices = {
+        price: finalPrice,
+        mrp: mrpValue,
+        currency: enriched.currency || 'USD'
+      };
+    } else {
+      // Update prices object if it exists but is missing fields
+      if (enriched.prices.price === undefined || enriched.prices.price === null) {
+        enriched.prices.price = finalPrice;
+      }
+      if (enriched.prices.mrp === undefined || enriched.prices.mrp === null) {
+        enriched.prices.mrp = enriched.compareAtPrice || enriched.comparePrice || enriched.mrp || 0;
+      }
+      if (!enriched.prices.currency) {
+        enriched.prices.currency = enriched.currency || 'USD';
+      }
+    }
+    
+    // Ensure price/sellingPrice fields also exist (not just prices object)
+    if (enriched.price === undefined || enriched.price === null) {
+      enriched.price = finalPrice;
+    }
+    if (enriched.sellingPrice === undefined || enriched.sellingPrice === null) {
+      enriched.sellingPrice = finalPrice;
+    }
+    
+    // Ensure image exists - CRITICAL for product display
+    if (!enriched.imageUrl && !enriched.thumbnailImage1 && (!enriched.images || enriched.images.length === 0)) {
+      // Fallback to picsum placeholder
+      const imageId = enriched.id ? String(enriched.id).replace(/\D/g, '') || '1' : '1';
+      enriched.imageUrl = `https://picsum.photos/seed/${imageId}/800/800`;
+      enriched.thumbnailImage1 = {
+        url: enriched.imageUrl,
+        altText: enriched.title || enriched.name || 'Product image'
+      };
+    }
+    
+    // Ensure stock/availability data exists - CRITICAL to prevent incorrect "SOLD OUT" display
+    if (enriched.stock === undefined && enriched.stockQuantity === undefined) {
+      // Calculate from variants/variations if available
+      const variantsOrVariations = enriched.variants || enriched.variations;
+      if (variantsOrVariations && variantsOrVariations.length > 0) {
+        const totalStock = variantsOrVariations.reduce((sum, v) => sum + (v.stock || v.quantity || 0), 0);
+        enriched.stock = totalStock;
+        enriched.stockQuantity = totalStock;
+        enriched.inStock = totalStock > 0;
+        enriched.available = totalStock > 0;
+      } else {
+        // Default to in stock if no stock info (prevents false "SOLD OUT" display)
+        enriched.stock = 10;
+        enriched.stockQuantity = 10;
+        enriched.inStock = true;
+        enriched.available = true;
+      }
+    } else {
+      // Ensure inStock/available flags are set based on stock value
+      // CRITICAL: Use nullish coalescing to handle 0 values correctly
+      const stockValue = enriched.stock !== undefined ? enriched.stock : (enriched.stockQuantity !== undefined ? enriched.stockQuantity : 0);
+      enriched.inStock = stockValue > 0;
+      enriched.available = stockValue > 0;
+      
+      // Also ensure stockQuantity is set if only stock is set (and vice versa)
+      if (enriched.stock !== undefined && enriched.stockQuantity === undefined) {
+        enriched.stockQuantity = enriched.stock;
+      } else if (enriched.stockQuantity !== undefined && enriched.stock === undefined) {
+        enriched.stock = enriched.stockQuantity;
+      }
+    }
+    
+    return enriched;
+  }
+  
+  /**
+   * Enrich multiple products with all required data
+   * @param {Array} products - Array of products to enrich
+   * @returns {Array} Array of enriched products
+   */
+  enrichProductsData(products) {
+    if (!Array.isArray(products)) return [];
+    return products.map(product => this.enrichProductData(product));
+  }
+
   /**
    * Get products for a specific widget based on its settings
    */
   getProductsForWidget(widget, products) {
     // Get the limit from widget settings, default to 12
-    const limit = widget.settings?.limit || widget.data?.content?.Limit || 12;
+    const limit = widget.settings?.limit || widget.data?.content?.Limit || widget.settings?.numberOfProducts || widget.settings?.NumberOfProducts || 12;
     
     // Get products based on widget type
     const type = (widget.type || '').toLowerCase();
     
+    let widgetProducts = [];
+    
     if (type.includes('featured') || type === 'featuredproducts') {
       // Featured products - filter by featured tag or just take first N
       const featured = products.filter(p => p.tags?.includes('featured') || p.featured);
-      return featured.length > 0 ? featured.slice(0, limit) : products.slice(0, limit);
-    }
-    
-    if (type.includes('bestseller') || type === 'bestsellerproducts') {
+      widgetProducts = featured.length > 0 ? featured.slice(0, limit) : products.slice(0, limit);
+    } else if (type.includes('bestseller') || type === 'bestsellerproducts') {
       // Best seller products - sort by sales or just take random N
-      return products.slice(0, limit);
-    }
-    
-    if (type.includes('new') || type === 'newproducts') {
+      widgetProducts = products.slice(0, limit);
+    } else if (type.includes('new') || type === 'newproducts') {
       // New products - sort by created date
       const sorted = [...products].sort((a, b) => 
         new Date(b.createdAt || 0) - new Date(a.createdAt || 0)
       );
-      return sorted.slice(0, limit);
+      widgetProducts = sorted.slice(0, limit);
+    } else {
+      // Default: return first N products
+      widgetProducts = products.slice(0, limit);
     }
     
-    // Default: return first N products
-    return products.slice(0, limit);
+    // Enrich all products with required data before returning
+    return this.enrichProductsData(widgetProducts);
   }
 
   /**

package/lib/lib/liquid-engine.js

@@ -280,13 +280,25 @@ function registerCustomTags(liquid, themePath) {
   };
 
   // Override the include tag to handle widget and snippet paths
+  // CRITICAL: Include tag must parse hash arguments like 'product: product' to match production behavior
   liquid.registerTag('include', {
     parse: function(tagToken, remainTokens) {
-      // Parse arguments - handle both 'snippets/pagination' and 'snippets/pagination', pagination formats
+      // Parse arguments - handle 'snippets/product-card', product: product format
       const args = tagToken.args.trim();
-      // Extract file path (first argument before comma if present)
-      const fileMatch = args.match(/^['"]([^'"]+)['"]/);
-      this.file = fileMatch ? fileMatch[1] : args.split(',')[0].trim().replace(/^['"]|['"]$/g, '');
+      
+      // Split by comma to separate file path from hash parameters
+      const commaIndex = args.indexOf(',');
+      if (commaIndex > 0) {
+        this.fileArg = args.substring(0, commaIndex).trim();
+        this.hashArgs = args.substring(commaIndex + 1).trim();
+      } else {
+        this.fileArg = args;
+        this.hashArgs = '';
+      }
+      
+      // Extract file path - remove quotes if present
+      const fileMatch = this.fileArg.match(/^['"]([^'"]+)['"]/);
+      this.file = fileMatch ? fileMatch[1] : this.fileArg.replace(/^['"]|['"]$/g, '');
     },
     render: async function(scope, hash) {
       let filePath = this.file;
@@ -298,7 +310,7 @@ function registerCustomTags(liquid, themePath) {
       // Clean up file path
       filePath = filePath.trim().replace(/^['"]|['"]$/g, '');
       
-      // Get full context for snippets/widgets
+      // Get full context for snippets/widgets - merge parent scope (for shop, settings, etc.)
       const scopeContexts = Array.isArray(scope?.contexts) ? scope.contexts : [];
       const primaryScope = scopeContexts.length > 0
         ? scopeContexts[0]
@@ -309,12 +321,37 @@ function registerCustomTags(liquid, themePath) {
         ? { ...currentRenderingContext, ...primaryScope }
         : primaryScope;
       
+      // CRITICAL: Parse hash arguments if provided (e.g., "product: product")
+      // Hash params override parent scope values, matching LiquidJS include behavior
+      const includeContext = { ...fullContext };
+      if (this.hashArgs) {
+        const hashPairs = this.hashArgs.split(',').map(pair => pair.trim());
+        for (const pair of hashPairs) {
+          const colonIndex = pair.indexOf(':');
+          if (colonIndex > 0) {
+            const key = pair.substring(0, colonIndex).trim();
+            const valueVar = pair.substring(colonIndex + 1).trim();
+            if (key && valueVar) {
+              // Use scope.get() to resolve the value variable (handles loop variables correctly!)
+              try {
+                const value = await scope.get(valueVar.split('.'));
+                if (value !== undefined && value !== null) {
+                  includeContext[key] = value;
+                }
+              } catch (error) {
+                // Silently skip unresolved hash params
+              }
+            }
+          }
+        }
+      }
+      
       // Handle widget paths
       if (filePath.startsWith('widgets/')) {
         const widgetName = filePath.replace(/^widgets\//, '').replace(/\.liquid$/, '');
         const widgetPath = path.join(themePath, 'widgets', `${widgetName}.liquid`);
         if (fs.existsSync(widgetPath)) {
-          return await liquid.parseAndRender(fs.readFileSync(widgetPath, 'utf8'), fullContext);
+          return await liquid.parseAndRender(fs.readFileSync(widgetPath, 'utf8'), includeContext);
         }
       }
       
@@ -323,7 +360,7 @@ function registerCustomTags(liquid, themePath) {
         const snippetName = filePath.replace(/^snippets\//, '').replace(/\.liquid$/, '');
         const snippetPath = path.join(themePath, 'snippets', `${snippetName}.liquid`);
         if (fs.existsSync(snippetPath)) {
-          return await liquid.parseAndRender(fs.readFileSync(snippetPath, 'utf8'), fullContext);
+          return await liquid.parseAndRender(fs.readFileSync(snippetPath, 'utf8'), includeContext);
         } else {
           console.warn(`[INCLUDE] Snippet not found: ${snippetPath}`);
         }
@@ -332,19 +369,19 @@ function registerCustomTags(liquid, themePath) {
       // Try to resolve file in snippets directory (default location)
       const snippetPath = path.join(themePath, 'snippets', `${filePath}.liquid`);
       if (fs.existsSync(snippetPath)) {
-        return await liquid.parseAndRender(fs.readFileSync(snippetPath, 'utf8'), fullContext);
+        return await liquid.parseAndRender(fs.readFileSync(snippetPath, 'utf8'), includeContext);
       }
       
       // Try direct path
       const resolvedPath = path.join(themePath, filePath);
       if (fs.existsSync(resolvedPath)) {
-        return await liquid.parseAndRender(fs.readFileSync(resolvedPath, 'utf8'), fullContext);
+        return await liquid.parseAndRender(fs.readFileSync(resolvedPath, 'utf8'), includeContext);
       }
       
       // Try with .liquid extension
       const resolvedPathWithExt = `${resolvedPath}.liquid`;
       if (fs.existsSync(resolvedPathWithExt)) {
-        return await liquid.parseAndRender(fs.readFileSync(resolvedPathWithExt, 'utf8'), fullContext);
+        return await liquid.parseAndRender(fs.readFileSync(resolvedPathWithExt, 'utf8'), includeContext);
       }
       
       console.warn(`[INCLUDE] File not found: ${filePath} (tried: ${snippetPath}, ${resolvedPath}, ${resolvedPathWithExt})`);
@@ -686,9 +723,44 @@ async function renderWithLayout(liquid, templatePath, context, themePath) {
         categories: context.categories?.length || 0,
         brands: context.brands?.length || 0,
         menus: context.menus?.length || 0,
-        cart: context.cart?.itemCount || 0
+        cart: context.cart?.itemCount || 0,
+        collection: context.collection ? {
+          title: context.collection.title || context.collection.name,
+          products: context.collection.products?.length || 0
+        } : null
       };
       console.log(`[RENDER] ${templatePath} - Context:`, JSON.stringify(contextSummary));
+      
+      // Detailed product logging
+      if (context.products && context.products.length > 0) {
+        const sampleProduct = context.products[0];
+        console.log(`[RENDER] ${templatePath} - Sample product data:`, {
+          id: sampleProduct.id,
+          title: sampleProduct.title || sampleProduct.name,
+          url: sampleProduct.url || sampleProduct.link,
+          price: sampleProduct.price || sampleProduct.sellingPrice,
+          stock: sampleProduct.stock,
+          inStock: sampleProduct.inStock,
+          hasImage: !!(sampleProduct.imageUrl || sampleProduct.thumbnailImage1),
+          imageUrl: sampleProduct.imageUrl || sampleProduct.thumbnailImage1?.url,
+          categoryId: sampleProduct.categoryId
+        });
+      } else {
+        console.warn(`[RENDER] ${templatePath} - ⚠️  No products in context!`);
+      }
+      
+      // Check collection products
+      if (context.collection && context.collection.products) {
+        console.log(`[RENDER] ${templatePath} - Collection products: ${context.collection.products.length}`);
+        if (context.collection.products.length > 0) {
+          const sample = context.collection.products[0];
+          console.log(`[RENDER] ${templatePath} - Sample collection product:`, {
+            id: sample.id,
+            title: sample.title || sample.name,
+            url: sample.url || sample.link
+          });
+        }
+      }
     
     let templateContent = fs.readFileSync(fullTemplatePath, 'utf-8');
     

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o2vend/theme-cli",
-  "version": "1.0.33",
+  "version": "1.0.34",
   "description": "O2VEND Theme Development CLI - Standalone tool for local theme development",
   "bin": {
     "o2vend": "./bin/o2vend"