@o2vend/theme-cli 1.0.35 → 1.0.36

package/lib/lib/mock-data.js

@@ -10,29 +10,41 @@
 function generateMockData() {
   return {
     store: {
-      id: 'mock-store-1',
+      id: 1,
+      identifier: 'mock-store',
       name: 'My O2VEND Store',
-      description: 'A beautiful e-commerce store powered by O2VEND',
       domain: 'localhost:3000',
-      email: 'store@example.com',
-      phone: '+1234567890',
-      address: {
-        address1: '123 Main Street',
-        city: 'New York',
-        state: 'NY',
-        zip: '10001',
-        country: 'US'
-      },
+      companyName: 'My O2VEND Store',
+      companyAddress: '123 Main Street, New York, NY 10001',
+      companyPhoneNumber: '+1234567890',
+      companyEmail: 'store@example.com',
       currency: 'USD',
       currencySymbol: '$',
-      locale: 'en-US',
       timezone: 'America/New_York',
+      language: 'en',
+      logoUrl: '/assets/logo.png',
+      favouriteIconUrl: '/favicon.ico',
       settings: {
+        currency: 'USD',
         currencySymbol: '$',
         currencyFormat: '#,##0.00',
         currencyDecimalDigits: 2,
         currencyGroupSeparator: ',',
-        currencyDecimalSeparator: '.'
+        currencyDecimalSeparator: '.',
+        currencyGroupSizes: [3],
+        deliveryZoneSupport: false,
+        deliveryZoneSelection: 0,
+        defaultDeliveryZoneZipCode: null,
+        loginTypes: null,
+        zipcodeSearchEnabled: false,
+        referEnabled: false,
+        shoppingCartIconType: null,
+        timezone: 'America/New_York',
+        language: 'en',
+        logo: '/assets/logo.png',
+        favicon: '/favicon.ico',
+        countries: [],
+        states: {}
       }
     },
     
@@ -50,8 +62,10 @@ function generateMockData() {
       id: 'mock-cart-1',
       items: [],
       total: 0,
-      itemCount: 0,
-      currency: 'USD'
+      subTotal: 0,
+      taxAmount: 0,
+      shippingAmount: 0,
+      itemCount: 0
     }
   };
 }
@@ -67,21 +81,21 @@ function generateMockProducts(count = 20) {
   
   // Category mapping - map category names to category IDs (matching generateMockCategories order)
   const categoryMap = {
-    'Electronics': 'category-1',
-    'Clothing': 'category-2',
-    'Accessories': 'category-3',
-    'Home & Garden': 'category-4',
-    'Home': 'category-4', // Alias for Home & Garden
-    'Sports & Fitness': 'category-5',
-    'Sports': 'category-5', // Alias for Sports & Fitness
-    'Books & Media': 'category-6',
-    'Toys & Games': 'category-7',
-    'Beauty & Health': 'category-8',
-    'Automotive': 'category-9',
-    'Food & Beverages': 'category-10',
-    'Furniture': 'category-4', // Map Furniture to Home & Garden
-    'Office': 'category-6', // Map Office to Books & Media (or could be separate)
-    'Footwear': 'category-2' // Map Footwear to Clothing
+    'Electronics': 1,
+    'Clothing': 2,
+    'Accessories': 3,
+    'Home & Garden': 4,
+    'Home': 4,
+    'Sports & Fitness': 5,
+    'Sports': 5,
+    'Books & Media': 6,
+    'Toys & Games': 7,
+    'Beauty & Health': 8,
+    'Automotive': 9,
+    'Food & Beverages': 10,
+    'Furniture': 4,
+    'Office': 6,
+    'Footwear': 2
   };
   
   // Product data with images from picsum.photos (reliable placeholder service)
@@ -140,7 +154,7 @@ function generateMockProducts(count = 20) {
     const productImageId = productTemplate.imageId;
     
     // Get categoryId from category name using categoryMap
-    const categoryId = categoryMap[productCategory] || 'category-1'; // Default to Electronics if not found
+    const categoryId = categoryMap[productCategory] || 1;
     
     // Determine stock quantity - mix of low stock, high stock, and out of stock
     const stockType = i % 5;
@@ -179,10 +193,10 @@ function generateMockProducts(count = 20) {
           const variantPrice = basePrice + (variantIndex % 3 === 0 ? 500 : 0); // Some variants slightly more expensive
           const variantMrp = Math.round(variantPrice * 1.5);
           const variantStock = Math.floor(Math.random() * stock) + (stock > 0 ? 1 : 0);
-          const variantProductId = (i + 1) * 1000 + variantIndex; // Unique productId for variant
+          const variantProductId = (i + 1) * 1000 + variantIndex;
           variants.push({
             id: `variant-${i + 1}-${variantIndex}`,
-            productId: variantProductId, // Required by product-card template
+            productId: variantProductId,
             title: `${size} / ${color}`,
             option1: size,
             option2: color,
@@ -190,14 +204,15 @@ function generateMockProducts(count = 20) {
             option2Name: 'Color',
             price: variantPrice,
             compareAtPrice: variantMrp,
-            // prices object required by product-card template
             prices: {
               price: variantPrice,
               mrp: variantMrp
             },
             sku: `SKU-${i + 1}-${size}-${color}`,
             inStock: variantStock > 0,
-            stock: variantStock,
+            stockQuantity: variantStock,
+            stockTrackingIsEnabled: true,
+            isAllowToOrder: false,
             available: variantStock > 0
           });
           variantIndex++;
@@ -206,7 +221,7 @@ function generateMockProducts(count = 20) {
     } else if (hasSizeVariations) {
       // Product with size variations only
       sizes.slice(0, 5).forEach((size, idx) => {
-        const variantPrice = basePrice + (idx * 200); // Larger sizes cost more
+        const variantPrice = basePrice + (idx * 200);
         const variantMrp = Math.round(variantPrice * 1.5);
         const variantStock = Math.floor(Math.random() * stock) + (stock > 0 ? 1 : 0);
         const variantProductId = (i + 1) * 1000 + idx + 1;
@@ -224,14 +239,16 @@ function generateMockProducts(count = 20) {
           },
           sku: `SKU-${i + 1}-${size}`,
           inStock: variantStock > 0,
-          stock: variantStock,
+          stockQuantity: variantStock,
+          stockTrackingIsEnabled: true,
+          isAllowToOrder: false,
           available: variantStock > 0
         });
       });
     } else if (hasColorVariations) {
       // Product with color variations only
       colors.slice(0, 4).forEach((color, idx) => {
-        const variantPrice = basePrice + (idx % 2 === 0 ? 300 : 0); // Some colors cost more
+        const variantPrice = basePrice + (idx % 2 === 0 ? 300 : 0);
         const variantMrp = Math.round(variantPrice * 1.5);
         const variantStock = Math.floor(Math.random() * stock) + (stock > 0 ? 1 : 0);
         const variantProductId = (i + 1) * 1000 + idx + 1;
@@ -249,7 +266,9 @@ function generateMockProducts(count = 20) {
           },
           sku: `SKU-${i + 1}-${color}`,
           inStock: variantStock > 0,
-          stock: variantStock,
+          stockQuantity: variantStock,
+          stockTrackingIsEnabled: true,
+          isAllowToOrder: false,
           available: variantStock > 0
         });
       });
@@ -268,49 +287,44 @@ function generateMockProducts(count = 20) {
         },
         sku: `SKU-${i + 1}`,
         inStock: inStock,
-        stock: stock,
+        stockQuantity: stock,
+        stockTrackingIsEnabled: true,
+        isAllowToOrder: false,
         available: inStock
       });
     }
 
-    // Calculate total stock from variants
-    const totalStock = variants.reduce((sum, v) => sum + (v.stock || 0), 0);
+    const totalStock = variants.reduce((sum, v) => sum + (v.stockQuantity || 0), 0);
     const hasAnyStock = variants.some(v => v.inStock || v.available);
 
-    const productHandle = `product-${i + 1}`.toLowerCase();
+    const productHandle = productName.toLowerCase().replace(/\s+/g, '-').replace(/[^a-z0-9-]/g, '') + (i > 0 ? `-${i + 1}` : '');
+    const productTitle = productName + (i > 0 ? ` ${i + 1}` : '');
     products.push({
-      id: productId,
-      productId: i + 1, // Numeric product ID for API compatibility
-      title: productName + (i > 0 ? ` ${i + 1}` : ''),
-      name: productName + (i > 0 ? ` ${i + 1}` : ''), // Also provide name for templates
+      id: i + 1,
+      productId: i + 1,
+      title: productTitle,
+      name: productTitle,
       handle: productHandle,
       slug: productHandle,
-      url: `/products/${productHandle}`, // URL for product detail page
-      link: `/products/${productHandle}`, // Alternative URL property
+      url: productHandle,
+      link: productHandle,
       description: `Description for ${productName}. High quality product with excellent features.${hasVariations ? ' Available in multiple options.' : ''}`,
       price: basePrice,
       compareAtPrice: comparePrice,
-      // Prices object used by product-card snippet
       prices: {
         price: basePrice,
-        mrp: comparePrice,
-        currency: 'USD'
+        mrp: comparePrice
       },
-      discountPercentage: Math.floor(((comparePrice - basePrice) / comparePrice) * 100),
-      currency: 'USD',
       inStock: hasAnyStock,
-      available: hasAnyStock, // Alternative property for availability
-      stock: totalStock,
-      stockQuantity: totalStock, // Alternative property for stock
+      available: hasAnyStock,
+      stockQuantity: totalStock,
+      stockTrackingIsEnabled: true,
+      isAllowToOrder: false,
       sku: `SKU-${i + 1}`,
-      categoryId: categoryId, // Use mapped categoryId based on product category
-      category: productCategory, // Also include category name for reference
-      brandId: `brand-${(i % 8) + 1}`,
-      // Primary thumbnail for product cards
-      thumbnailImage1: {
-        url: `https://picsum.photos/seed/${productImageId}/800/800`,
-        altText: productName
-      },
+      categoryId: categoryId,
+      category: { id: categoryId, name: productCategory },
+      brandId: (i % 8) + 1,
+      thumbnailImage: `https://picsum.photos/seed/${productImageId}/800/800`,
       imageUrl: `https://picsum.photos/seed/${productImageId}/800/800`,
       images: [
         {
@@ -351,23 +365,19 @@ function generateMockProducts(count = 20) {
         : [],
       tags: ['featured', 'new', 'sale'],
       createdAt: new Date(Date.now() - Math.random() * 365 * 24 * 60 * 60 * 1000).toISOString(),
-      // Required fields for product-detail JSON template
-      productType: 0, // 0 = simple product, 1 = variable, 2 = subscription
-      // additionalData uses | default:null without | json, so we use string 'null'
-      // This outputs as literal null in JSON (without quotes)
+      productType: 0,
       additionalData: 'null',
-      // These fields use | json filter, so they should be actual arrays
       combinations: [],
       subscriptions: [],
       shippingMethods: [],
-      variations: variants // Also expose as variations for template compatibility
+      variations: variants
     });
   }
 
   // Log summary
   const productsWithVariations = products.filter(p => (p.variants?.length || 0) > 1).length;
   const productsWithOptions = products.filter(p => (p.options?.length || 0) > 0).length;
-  const outOfStock = products.filter(p => !p.inStock || (p.stock || 0) === 0).length;
+  const outOfStock = products.filter(p => !p.inStock || (p.stockQuantity || 0) === 0).length;
   
   // Log category distribution
   const categoryDistribution = {};
@@ -410,14 +420,24 @@ function generateMockCategories(count = 10) {
 
   for (let i = 0; i < count; i++) {
     const catData = categoryData[i] || { name: `Category ${i + 1}`, imageId: 60 + i, description: `Products in Category ${i + 1}` };
+    const catHandle = catData.name.toLowerCase().replace(/\s+/g, '-').replace(/&/g, 'and');
+    const catImageUrl = `https://picsum.photos/seed/cat${catData.imageId}/400/300`;
     categories.push({
-      id: `category-${i + 1}`,
+      id: i + 1,
+      categoryId: i + 1,
       name: catData.name,
-      handle: catData.name.toLowerCase().replace(/\s+/g, '-').replace(/&/g, 'and'),
+      displayName: catData.name,
+      handle: catHandle,
+      slug: catHandle,
       description: catData.description,
-      image: `https://picsum.photos/seed/cat${catData.imageId}/400/300`,
-      productCount: Math.floor(Math.random() * 50) + 5,
-      parentId: i > 5 ? `category-${Math.floor(Math.random() * 5) + 1}` : null
+      thumbnailImage: { url: catImageUrl },
+      bannerImage: { url: catImageUrl },
+      menuImage: { url: catImageUrl },
+      displayOrder: i + 1,
+      parentCategoryId: i > 5 ? Math.floor(Math.random() * 5) + 1 : null,
+      parentName: i > 5 ? categoryData[Math.floor(Math.random() * 5)]?.name || null : null,
+      products: [],
+      productsCount: Math.floor(Math.random() * 50) + 5
     });
   }
 
@@ -447,9 +467,11 @@ function generateMockBrands(count = 10) {
   for (let i = 0; i < count; i++) {
     const brand = brandData[i] || { name: `Brand ${i + 1}`, tagline: 'Quality Products', imageId: 80 + i };
     brands.push({
-      id: `brand-${i + 1}`,
+      id: i + 1,
+      brandId: i + 1,
       name: brand.name,
       handle: brand.name.toLowerCase().replace(/\s+/g, '-'),
+      slug: brand.name.toLowerCase().replace(/\s+/g, '-'),
       description: `${brand.tagline}. Premium products from ${brand.name}`,
       logo: `https://picsum.photos/seed/brand${brand.imageId}/200/100`,
       image: `https://picsum.photos/seed/brand${brand.imageId}/400/200`,
@@ -473,6 +495,7 @@ function generateMockWidgets() {
       type: 'Header',
       section: 'header',
       sectionName: 'header',
+      pageId: 'all',
       status: 'active',
       Position: 1,
       settings: {
@@ -494,6 +517,7 @@ function generateMockWidgets() {
       type: 'HeaderMenu',
       section: 'header',
       sectionName: 'header',
+      pageId: 'all',
       status: 'active',
       Position: 2,
       settings: {
@@ -514,6 +538,7 @@ function generateMockWidgets() {
       type: 'Carousel',
       section: 'hero',
       sectionName: 'hero',
+      pageId: 'home',
       status: 'active',
       Position: 1,
       settings: {
@@ -584,6 +609,7 @@ function generateMockWidgets() {
       type: 'SpaceBar',
       section: 'hero',
       sectionName: 'hero',
+      pageId: 'home',
       status: 'active',
       Position: 2,
       settings: {
@@ -654,6 +680,7 @@ function generateMockWidgets() {
       type: 'CategoryList',
       section: 'content',
       sectionName: 'content',
+      pageId: 'home',
       status: 'active',
       Position: 1,
       Title: 'Shop by Category',
@@ -701,6 +728,7 @@ function generateMockWidgets() {
       type: 'ProductCarousel',
       section: 'content',
       sectionName: 'content',
+      pageId: 'home',
       status: 'active',
       Position: 2,
       Title: 'Featured Products',
@@ -739,6 +767,7 @@ function generateMockWidgets() {
       type: 'ProductCarousel',
       section: 'content',
       sectionName: 'content',
+      pageId: 'home',
       status: 'active',
       Position: 3,
       Title: 'Best Sellers',
@@ -775,6 +804,7 @@ function generateMockWidgets() {
       type: 'ProductCarousel',
       section: 'content',
       sectionName: 'content',
+      pageId: 'home',
       status: 'active',
       Position: 4,
       Title: 'New Arrivals',
@@ -810,6 +840,7 @@ function generateMockWidgets() {
       type: 'ProductCarousel',
       section: 'content',
       sectionName: 'content',
+      pageId: 'home',
       status: 'active',
       Position: 5,
       Title: 'On Sale',
@@ -847,6 +878,7 @@ function generateMockWidgets() {
       type: 'ProductCarousel',
       section: 'content',
       sectionName: 'content',
+      pageId: 'home',
       status: 'active',
       Position: 6,
       Title: 'Trending Now',
@@ -882,6 +914,7 @@ function generateMockWidgets() {
       type: 'ProductCarousel',
       section: 'content',
       sectionName: 'content',
+      pageId: 'home',
       status: 'active',
       Position: 7,
       Title: 'Electronics',
@@ -918,6 +951,7 @@ function generateMockWidgets() {
       type: 'ProductCarousel',
       section: 'content',
       sectionName: 'content',
+      pageId: 'home',
       status: 'active',
       Position: 8,
       Title: 'Fashion',
@@ -954,6 +988,7 @@ function generateMockWidgets() {
       type: 'ProductCarousel',
       section: 'content',
       sectionName: 'content',
+      pageId: 'product',
       status: 'active',
       Position: 9,
       Title: 'You May Also Like',
@@ -988,6 +1023,7 @@ function generateMockWidgets() {
       type: 'ProductCarousel',
       section: 'content',
       sectionName: 'content',
+      pageId: 'product',
       status: 'active',
       Position: 10,
       Title: 'Frequently Bought Together',
@@ -1023,6 +1059,7 @@ function generateMockWidgets() {
       type: 'ProductCarousel',
       section: 'content',
       sectionName: 'content',
+      pageId: 'home',
       status: 'active',
       Position: 11,
       Title: "Editor's Choice",
@@ -1060,6 +1097,7 @@ function generateMockWidgets() {
       type: 'ProductGrid',
       section: 'content',
       sectionName: 'content',
+      pageId: 'home',
       status: 'active',
       Position: 12,
       Title: 'Shop All Products',
@@ -1096,6 +1134,7 @@ function generateMockWidgets() {
       type: 'ProductGrid',
       section: 'content',
       sectionName: 'content',
+      pageId: 'home',
       status: 'active',
       Position: 13,
       Title: 'Featured Collection',
@@ -1133,6 +1172,7 @@ function generateMockWidgets() {
       type: 'Banner',
       section: 'content',
       sectionName: 'content',
+      pageId: 'home',
       status: 'active',
       Position: 4,
       Title: 'Special Offers',
@@ -1171,6 +1211,7 @@ function generateMockWidgets() {
       type: 'SimpleProduct',
       section: 'content',
       sectionName: 'content',
+      pageId: 'home',
       status: 'active',
       Position: 5,
       Title: 'Best Sellers',
@@ -1195,6 +1236,7 @@ function generateMockWidgets() {
       type: 'SingleProduct',
       section: 'content',
       sectionName: 'content',
+      pageId: 'home',
       status: 'active',
       Position: 6,
       Title: 'Deal of the Day',
@@ -1217,6 +1259,7 @@ function generateMockWidgets() {
       type: 'RecentlyViewed',
       section: 'content',
       sectionName: 'content',
+      pageId: 'product',
       status: 'active',
       Position: 7,
       Title: 'Recently Viewed',
@@ -1238,6 +1281,7 @@ function generateMockWidgets() {
       type: 'BrandCarousel',
       section: 'content',
       sectionName: 'content',
+      pageId: 'home',
       status: 'active',
       Position: 8,
       Title: 'Our Brands',
@@ -1283,6 +1327,7 @@ function generateMockWidgets() {
       type: 'Gallery',
       section: 'content',
       sectionName: 'content',
+      pageId: 'home',
       status: 'active',
       Position: 4,
       Title: 'Instagram Gallery',
@@ -1323,6 +1368,7 @@ function generateMockWidgets() {
       type: 'TestimonialCarousel',
       section: 'content',
       sectionName: 'content',
+      pageId: 'home',
       status: 'active',
       Position: 5,
       Title: 'What Our Customers Say',
@@ -1408,6 +1454,7 @@ function generateMockWidgets() {
       type: 'Footer',
       section: 'footer',
       sectionName: 'footer',
+      pageId: 'all',
       status: 'active',
       Position: 1,
       settings: {
@@ -1475,6 +1522,7 @@ function generateMockWidgets() {
       type: 'FooterMenu',
       section: 'footer',
       sectionName: 'footer',
+      pageId: 'all',
       status: 'active',
       Position: 2,
       settings: {

package/lib/lib/widget-service.js

@@ -305,6 +305,55 @@ class WidgetService {
     }
   }
 
+  /**
+   * Get widgets for a specific page and section.
+   * Matches production API: POST /pages/{pageId}/sections/{section}/widgets
+   * @param {string} pageId - Page ID (home, product, category, products, categories, brand, checkout)
+   * @param {string} section - Section name (header, hero, content, footer)
+   * @returns {Promise<Array>} Array of normalized widgets sorted by Position
+   */
+  async getPageSectionWidgets(pageId, section) {
+    try {
+      if (!this.apiClient) return [];
+
+      const response = await this.apiClient.post(`/pages/${pageId}/sections/${section}/widgets`, { status: 'active' });
+      const widgets = Array.isArray(response) ? response : (response.widgets || []);
+      return this.normalizeWidgetArray(widgets);
+    } catch (error) {
+      console.warn(`[WidgetService] Error fetching widgets for page=${pageId} section=${section}:`, error.message);
+      return [];
+    }
+  }
+
+  /**
+   * Fetch all widgets for a page, organized by section.
+   * Mirrors the production fetchPageWidgets() helper.
+   * @param {string} pageId - Page ID
+   * @returns {Promise<Object>} Widgets organized by section { header:[], hero:[], content:[], footer:[] }
+   */
+  async fetchPageWidgets(pageId) {
+    const validPageIds = ['home', 'product', 'category', 'products', 'categories', 'brand', 'checkout'];
+    if (!pageId || !validPageIds.includes(pageId)) {
+      console.warn(`[WidgetService] Invalid pageId: ${pageId}, returning empty widgets`);
+      return { header: [], hero: [], content: [], footer: [] };
+    }
+
+    const sections = ['header', 'hero', 'content', 'footer'];
+    const results = await Promise.allSettled(
+      sections.map(section => this.getPageSectionWidgets(pageId, section))
+    );
+
+    const organized = {};
+    sections.forEach((section, index) => {
+      const result = results[index];
+      organized[section] = (result.status === 'fulfilled' && Array.isArray(result.value)) ? result.value : [];
+    });
+
+    const counts = sections.map(s => `${s}:${organized[s].length}`).join(', ');
+    console.log(`[WidgetService] fetchPageWidgets(${pageId}): ${counts}`);
+    return organized;
+  }
+
   /**
    * Check if widget template exists in theme
    * @param {string} widgetType - Widget type

package/package.json

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