@thg-altitude/schemaorg 1.0.35 → 1.0.37

package/index.js

@@ -7,6 +7,7 @@ import ProductCollection from './src/components/ProductCollection.astro'
 import WebSite from './src/components/WebSite.astro'
 import EnhancedProductList from './src/components/EnhancedProductList.astro'
 import Recipe from './src/components/Recipe.astro'
+import FAQ from './src/components/FAQ.astro'
 
 export {
     Product,
@@ -17,5 +18,6 @@ export {
     ProductCollection,
     WebSite,
     EnhancedProductList,
+    FAQ,
     Recipe
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thg-altitude/schemaorg",
-  "version": "1.0.35",
+  "version": "1.0.37",
   "description": "",
   "main": "index.js",
   "scripts": {

package/src/components/CollectionPage.astro

@@ -1,9 +1,16 @@
 ---
+interface Props {
+  name: string;
+  description: string;
+}
+
+const { name, description } = Astro.props as Props;
+
 let schema = {
-    "@context": "https://schema.org",
-    "@type": "CollectionPage",
-    "name": Astro.props.name,
-    "description": Astro.props.description,
+  "@context": "https://schema.org",
+  "@type": "CollectionPage",
+  "name": name,
+  "description": description,
 };
 ---
 

package/src/components/EnhancedProduct.astro

@@ -29,6 +29,7 @@ const {
   suggestedGender,
   beauty_targetAge,
   gender,
+  weight
 } = Astro.props;
 
 // Use the enhanced mapping function to extract data from the full product data
@@ -64,7 +65,9 @@ try {
     ? Astro.url.origin
     : `${Astro.request.headers.get("X-forwarded-Proto")}://${Astro.request.headers.get("X-forwarded-Host")?.split(", ")[0]}`;
   imageUrl = image
-    ? `${import.meta.env.IMAGE_PROXY_URL}?url=${image}&format=webp&width=1500&height=1500&fit=cover`
+    ? (import.meta.env.IMAGE_PROXY_URL
+        ? `${import.meta.env.IMAGE_PROXY_URL}?url=${image}&format=webp&width=1500&height=1500&fit=cover`
+        : image)
     : null;
   pageUrl = urlPath ? `${url}${urlPath}` : url;
 
@@ -88,6 +91,40 @@ try {
   schemaError = true;
 }
 
+// Helper function to parse weight string into value and unit
+function parseWeight(weightString) {
+  if (!weightString) return null;
+  
+  // Match patterns like "5kg", "5 kg", "500g", "500 g", "10lb", "10 lb"
+  const match = weightString.match(/(\d+(?:\.\d+)?)\s*(kg|g|lb|oz)/i);
+  if (match) {
+    return {
+      value: parseFloat(match[1]),
+      unitText: match[2].toLowerCase()
+    };
+  }
+  return null;
+}
+
+// Helper function to convert date from DD-MM-YYYY to ISO-8601 (YYYY-MM-DD)
+function convertToISO8601(dateString) {
+  if (!dateString) return null;
+  
+  // Check if already in ISO format (YYYY-MM-DD)
+  if (/^\d{4}-\d{2}-\d{2}/.test(dateString)) {
+    return dateString;
+  }
+  
+  // Convert from DD-MM-YYYY to YYYY-MM-DD
+  const match = dateString.match(/^(\d{2})-(\d{2})-(\d{4})/);
+  if (match) {
+    const [, day, month, year] = match;
+    return `${year}-${month}-${day}`;
+  }
+  
+  return dateString; // Return as-is if format not recognized
+}
+
 function generateProductSchema() {
   const hasMultipleVariants = variants && variants.length > 1;
   let variantsArray = [];
@@ -160,11 +197,71 @@ function generateProductSchema() {
             sku: variant.sku.toString(),
             name: variantName,
             ...(description && { description }),
-            ...(imageUrl && { image: imageUrl }),
-            // Extract variant-specific properties from choices using correct schema.org properties
-            ...(variant.choices && variant.choices.some(c => c.optionKey === 'Weight' || (c.title && (c.title.includes('kg') || c.title.includes('lb') || /\d+\s*g\b/.test(c.title)))) && {
-              weight: variant.choices.find(c => c.optionKey === 'Weight' || (c.title && (c.title.includes('kg') || c.title.includes('lb') || /\d+\s*g\b/.test(c.title))))?.title
-            }),
+            ...(() => {
+              // Try multiple possible locations for variant image and extract URL string
+              let variantImageUrl = variant.image || variant.imageUrl || variant.images?.[0] || variant.media?.[0]?.url || image;
+              
+              // If image is an object, try to extract the URL string
+              if (variantImageUrl && typeof variantImageUrl === 'object') {
+                variantImageUrl = variantImageUrl.original || variantImageUrl.url || variantImageUrl.src || variantImageUrl.large || variantImageUrl.medium;
+              }
+              
+              if (variantImageUrl && typeof variantImageUrl === 'string') {
+                const finalImageUrl = import.meta.env.IMAGE_PROXY_URL
+                  ? `${import.meta.env.IMAGE_PROXY_URL}?url=${variantImageUrl}&format=webp&width=1500&height=1500&fit=cover`
+                  : variantImageUrl;
+                return { image: finalImageUrl };
+              }
+              return {};
+            })(),
+            // Extract weight as QuantitativeValue
+            ...(() => {
+              // First check if weight is at product level (beauty products - mediumProduct.weight)
+              const productWeight = weight || Astro.props.mediumProduct?.weight;
+              
+              if (productWeight && typeof productWeight === 'object' && productWeight.value && productWeight.unit) {
+                return {
+                  weight: {
+                    "@type": "QuantitativeValue",
+                    "value": parseFloat(productWeight.value),
+                    "unitText": productWeight.unit.toLowerCase()
+                  }
+                };
+              }
+              
+              // Check if weight is at variant level
+              if (variant.weight && typeof variant.weight === 'object' && variant.weight.value && variant.weight.unit) {
+                return {
+                  weight: {
+                    "@type": "QuantitativeValue",
+                    "value": parseFloat(variant.weight.value),
+                    "unitText": variant.weight.unit.toLowerCase()
+                  }
+                };
+              }
+              
+              // Otherwise, try to parse from choices
+              const weightChoice = variant.choices?.find(c =>
+                c.optionKey === 'Weight' ||
+                (c.optionKey === 'Size' && c.title && (c.title.includes('kg') || c.title.includes('g') || c.title.includes('lb'))) ||
+                (c.title && (c.title.includes('kg') || c.title.includes('lb') || /\d+\s*g\b/.test(c.title)))
+              );
+              
+              if (weightChoice?.title) {
+                const parsedWeight = parseWeight(weightChoice.title);
+                if (parsedWeight) {
+                  return {
+                    weight: {
+                      "@type": "QuantitativeValue",
+                      "value": parsedWeight.value,
+                      "unitText": parsedWeight.unitText
+                    }
+                  };
+                }
+              }
+              
+              return {};
+            })(),
             ...(variant.choices && variant.choices.some(c => c.optionKey === 'Size' && c.title && !c.title.includes('kg') && !c.title.includes('g') && !c.title.includes('lb')) && {
               size: variant.choices.find(c => c.optionKey === 'Size' && c.title && !c.title.includes('kg') && !c.title.includes('g') && !c.title.includes('lb'))?.title
             }),
@@ -175,20 +272,10 @@ function generateProductSchema() {
             ...(variant.choices && variant.choices.some(c => c.optionKey === 'Material') && {
               material: variant.choices.find(c => c.optionKey === 'Material')?.title
             }),
-            // Handle non-standard properties (amount, flavour) as additionalProperty
+            // Handle non-standard properties (flavour) as additionalProperty
             ...(() => {
               const additionalProperties = [];
               
-              // Amount
-              const amountChoice = variant.choices?.find(c => c.optionKey === 'Amount');
-              if (amountChoice?.title) {
-                additionalProperties.push({
-                  "@type": "PropertyValue",
-                  "name": "amount",
-                  "value": amountChoice.title
-                });
-              }
-              
               // Flavour (as additionalProperty since it doesn't exist in schema.org)
               const flavourChoice = variant.choices?.find(c => c.optionKey === 'Flavour' || c.optionKey === 'Flavor' || c.optionKey === 'Taste');
               if (flavourChoice?.title) {
@@ -224,7 +311,7 @@ function generateProductSchema() {
             offers: {
               "@type": "Offer",
               url: `${pageUrl}?variation=${variant?.sku}`,
-              price: variant.price.price.amount,
+              price: parseFloat(variant.price.price.amount),
               priceCurrency: currency,
               itemCondition: "https://schema.org/NewCondition",
               availability: variant?.inStock
@@ -240,7 +327,7 @@ function generateProductSchema() {
                 {
                   "@type": "UnitPriceSpecification",
                   priceCurrency: currency,
-                  price: variant.price.price.amount,
+                  price: parseFloat(variant.price.price.amount),
                   valueAddedTaxIncluded: true,
                 },
                 ...(variant?.price?.rrp?.amount
@@ -248,7 +335,7 @@ function generateProductSchema() {
                       {
                         "@type": "UnitPriceSpecification",
                         priceCurrency: currency,
-                        price: variant.price.rrp.amount,
+                        price: parseFloat(variant.price.rrp.amount),
                         valueAddedTaxIncluded: true,
                         priceType: "https://schema.org/StrikethroughPrice",
                       },
@@ -325,7 +412,7 @@ function generateProductSchema() {
             name: variantName,
             sku: variant.sku.toString(),
             url: pageUrl,
-            price: variant.price.price.amount,
+            price: parseFloat(variant.price.price.amount),
             priceCurrency: currency,
             itemCondition: "https://schema.org/NewCondition",
             availability: variant?.inStock
@@ -342,7 +429,7 @@ function generateProductSchema() {
               {
                 "@type": "UnitPriceSpecification",
                 priceCurrency: currency,
-                price: variant.price.price.amount,
+                price: parseFloat(variant.price.price.amount),
                 valueAddedTaxIncluded: true,
               },
               ...(variant?.price?.rrp?.amount
@@ -350,7 +437,7 @@ function generateProductSchema() {
                     {
                       "@type": "UnitPriceSpecification",
                       priceCurrency: currency,
-                      price: variant.price.rrp.amount,
+                      price: parseFloat(variant.price.rrp.amount),
                       valueAddedTaxIncluded: true,
                       priceType: "https://schema.org/StrikethroughPrice",
                     },
@@ -389,10 +476,7 @@ function generateProductSchema() {
       if (variants.some(v => v.choices && v.choices.some(c => c.optionKey === 'Material'))) {
         variesBy.push("https://schema.org/material");
       }
-      // For non-standard properties like amount, flavour, and shade, use additionalProperty
-      if (variants.some(v => v.choices && v.choices.some(c => c.optionKey === 'Amount'))) {
-        variesBy.push("https://schema.org/additionalProperty");
-      }
+      // For non-standard properties like flavour, use additionalProperty
       if (variants.some(v => v.choices && v.choices.some(c => c.optionKey === 'Flavour' || c.optionKey === 'Flavor' || c.optionKey === 'Taste'))) {
         if (!variesBy.includes("https://schema.org/additionalProperty")) {
           variesBy.push("https://schema.org/additionalProperty");
@@ -597,8 +681,8 @@ function generateSaleEventSchema() {
         name: brand,
         url: url,
       },
-      startDate: saleEventStartDate,
-      ...(saleEventEndDate && { endDate: saleEventEndDate }),
+      startDate: convertToISO8601(saleEventStartDate),
+      ...(saleEventEndDate && { endDate: convertToISO8601(saleEventEndDate) }),
     };
 
     if (streetAddress && addressLocality && postalCode && country) {
@@ -707,7 +791,7 @@ function generateReviewsSchema() {
 
 {
   schema && !schemaError && (
-    <script type="application/ld+json" set:html={(() => {
+    <script type="application/ld+json" set:html={JSON.stringify((() => {
       // Clean the schema object by removing undefined, null, and empty values
       function cleanObject(obj) {
         if (obj === null || obj === undefined || obj === '') {
@@ -734,7 +818,7 @@ function generateReviewsSchema() {
       }
       
       const cleanedSchema = cleanObject(schema);
-      return cleanedSchema ? JSON.stringify(cleanedSchema, null, 2) : '{}';
-    })()} />
+      return cleanedSchema || {};
+    })(), null, 2)} />
   )
 }

package/src/components/EnhancedProductList.astro

@@ -17,26 +17,40 @@ breadcrumbs?.length > 0 && breadcrumbs.forEach((crumb,index)=>{breadcrumbsList.p
         } )})
  
 products?.length >0 && products?.forEach((product)=>{
-    productList.push( {
-            "@type": "Product",
-            "@id":product?.url,
-            "name": product?.title,
-            "image": product?.images?.[0]?.original ,
-            "url": product?.url,
-            "sku":product?.sku,
-            "offers": {
-                "@type": "Offer",
-                "priceCurrency": product.defaultVariant?.price?.price.currency ,
-                "price": product.defaultVariant?.price?.price.amount 
-            },
-            "aggregateRating":{
-                "@type":"AggregateRating",
-                "ratingValue":product?.reviews?.averageScore,
-                "reviewCount":product?.reviews?.total
-            },
-           
-        },)
-
+    if (!product?.title || !product?.sku) return; // Skip products without required fields
+    
+    const productItem = {
+        "@type": "Product",
+        "@id": product?.url,
+        "name": product?.title,
+        "url": product?.url,
+        "sku": product?.sku
+    };
+    
+    // Add image if available
+    if (product?.images?.[0]?.original) {
+        productItem.image = product.images[0].original;
+    }
+    
+    // Add offers if price data is available
+    if (product.defaultVariant?.price?.price?.currency && product.defaultVariant?.price?.price?.amount) {
+        productItem.offers = {
+            "@type": "Offer",
+            "priceCurrency": product.defaultVariant.price.price.currency,
+            "price": product.defaultVariant.price.price.amount
+        };
+    }
+    
+    // Add aggregateRating only if review data exists
+    if (product?.reviews?.averageScore && product?.reviews?.total) {
+        productItem.aggregateRating = {
+            "@type": "AggregateRating",
+            "ratingValue": product.reviews.averageScore,
+            "reviewCount": product.reviews.total
+        };
+    }
+    
+    productList.push(productItem);
 })
 
 let schema = {
@@ -56,4 +70,17 @@ let schema = {
     ]
 };
 ---
-<script type="application/ld+json" set:html={JSON.stringify(schema)}></script>
+<script type="application/ld+json" set:html={JSON.stringify(schema, (key, value) => {
+  // Filter out undefined, null, and empty string values
+  if (value === undefined || value === null || value === '') {
+    return undefined;
+  }
+  // Filter out empty arrays and objects
+  if (Array.isArray(value) && value.length === 0) {
+    return undefined;
+  }
+  if (typeof value === 'object' && value !== null && Object.keys(value).length === 0) {
+    return undefined;
+  }
+  return value;
+})}></script>

package/src/components/FAQ.astro

@@ -0,0 +1,43 @@
+---
+interface Props {
+  faqs: { title: string; body: string }[];
+}
+
+interface faqQA {
+  "@type": "Question";
+  name: string;
+  acceptedAnswer: {
+    "@type": "Answer";
+    text: string;
+  };
+}
+
+const { faqs } = Astro.props as Props;
+
+const validFaqs = faqs.reduce((acc, faq) => {
+  if (faq?.title && faq?.body) {
+    acc.push({
+      "@type": "Question",
+      name: faq.title,
+      acceptedAnswer: {
+        "@type": "Answer",
+        text: faq.body,
+      },
+    });
+  }
+  return acc;
+}, [] as faqQA[]);
+---
+
+{
+  validFaqs.length > 0 && (
+    <script
+      type="application/ld+json"
+      set:html={JSON.stringify({
+        "@context": "https://schema.org",
+        "@type": "FAQPage",
+        mainEntity: validFaqs,
+      })}
+    />
+  )
+}

package/src/components/Product.astro

@@ -22,15 +22,50 @@ if (!suggestedAge && Astro.props.productContent?.propertyNameToValueMap?.beauty_
 }
 
 let url = import.meta.env.DEV
-    ? Astro.url.origin
-    : `${Astro.request.headers.get(
-        'X-forwarded-Proto'
-      )}://${Astro.request.headers.get('X-forwarded-Host')?.split(', ')[0]}`
+  ? Astro.url.origin
+  : `${Astro.request.headers.get(
+    'X-forwarded-Proto'
+  )}://${Astro.request.headers.get('X-forwarded-Host')?.split(', ')[0]}`
 // Check if we have multiple variants to determine if we need ProductGroup
 const hasMultipleVariants = Astro.props.variants && Astro.props.variants.length > 1;
 
+let reviewsArray: {}[] = []
+Astro.props.reviews?.forEach((review)=>{
+  reviewsArray.push({
+    "@type": "Review",
+    itemReviewed: {
+      "@id": Astro.props.sku?.toString() || "",
+      name: Astro.props.name || "",
+    },
+    reviewRating: {
+      "@type": "Rating",
+      bestRating: "5",
+      ratingValue: review?.elements?.[0]?.score,
+    },
+    author: {
+      "@type": "Person",
+      name: stripHtml(review?.authorName),
+    },
+    datePublished: review?.posted,
+    reviewBody: stripHtml(review?.elements?.[1]?.value),
+  });
+});
+
+let aggregateRating;
+if (Astro.props.reviewsCount > 0) {
+  aggregateRating = {
+    "@type": "AggregateRating",
+    "bestRating": 5,
+    "worstRating": 1
+  };
+  
+  if (Astro.props.reviewsAverage) aggregateRating.ratingValue = Astro.props.reviewsAverage;
+  if (Astro.props.reviewsCount) aggregateRating.reviewCount = Astro.props.reviewsCount;
+}
+
 let variantsArray = []
 let offersArray = []
+let schema;
 
 if (hasMultipleVariants) {
   // Create individual Product objects for each variant
@@ -40,19 +75,16 @@ if (hasMultipleVariants) {
         // Build variant name with attributes in logical order: Name + Weight + Flavor + Size + Color + Material
         let variantName = Astro.props.name || "";
         const attributes = [];
-        
+
         // Check for amount/quantity first
         if (variant.amount) attributes.push(variant.amount);
         
         // Check for weight in different possible property names
         if (variant.weight) attributes.push(variant.weight);
-        else if (variant.size && variant.size.includes('kg')) attributes.push(variant.size);
-        else if (variant.size && variant.size.includes('g')) attributes.push(variant.size);
+        else if (variant.size?.includes('kg') || variant.size?.includes('g')) attributes.push(variant.size);
         
         // Check for flavor in different possible property names
-        if (variant.flavor) attributes.push(variant.flavor);
-        else if (variant.flavour) attributes.push(variant.flavour);
-        else if (variant.taste) attributes.push(variant.taste);
+        if (variant.flavor || variant.flavour || variant.taste) attributes.push(variant.flavor || variant.flavour || variant.taste);
         else if (variant.name && variant.name !== Astro.props.name) {
           // If variant has its own name that's different from product name, use it as flavor
           const variantSpecificName = variant.name.replace(Astro.props.name, '').trim();
@@ -72,17 +104,51 @@ if (hasMultipleVariants) {
           "@type": "Product",
           "sku": variant.sku.toString()
         };
-        
+
         if (variantName) variantObj.name = variantName;
         if (Astro.props.description) variantObj.description = Astro.props.description;
-        if ((variant.image || Astro.props.image) && import.meta.env.IMAGE_PROXY_URL) {
-          variantObj.image = `${import.meta.env.IMAGE_PROXY_URL}?url=${variant.image || Astro.props.image}&format=webp&width=1500&height=1500&fit=cover`;
+        // Try multiple possible locations for variant image and extract URL string
+        let variantImageUrl = variant.image || variant.imageUrl || variant.images?.[0] || variant.media?.[0]?.url || Astro.props.image;
+        
+        // If image is an object, try to extract the URL string
+        if (variantImageUrl && typeof variantImageUrl === 'object') {
+          variantImageUrl = variantImageUrl.original || variantImageUrl.url || variantImageUrl.src || variantImageUrl.large || variantImageUrl.medium;
+        }
+        
+        if (variantImageUrl && typeof variantImageUrl === 'string') {
+          variantObj.image = import.meta.env.IMAGE_PROXY_URL
+            ? `${import.meta.env.IMAGE_PROXY_URL}?url=${variantImageUrl}&format=webp&width=1500&height=1500&fit=cover`
+            : variantImageUrl;
         }
         // Use correct schema.org properties
         if (variant.color) variantObj.color = variant.color;
         if (variant.size) variantObj.size = variant.size;
         if (variant.material) variantObj.material = variant.material;
-        if (variant.weight) variantObj.weight = variant.weight;
+        
+        // Handle weight as QuantitativeValue
+        if (variant.weight) {
+          if (typeof variant.weight === 'object' && variant.weight.value && variant.weight.unit) {
+            // Already in correct format
+            variantObj.weight = {
+              "@type": "QuantitativeValue",
+              "value": parseFloat(variant.weight.value),
+              "unitText": variant.weight.unit.toLowerCase()
+            };
+          } else if (typeof variant.weight === 'string') {
+            // Parse string like "5kg" or "5 kg"
+            const match = variant.weight.match(/(\d+(?:\.\d+)?)\s*(kg|g|lb|oz)/i);
+            if (match) {
+              variantObj.weight = {
+                "@type": "QuantitativeValue",
+                "value": parseFloat(match[1]),
+                "unitText": match[2].toLowerCase()
+              };
+            } else {
+              // Fallback to string if can't parse
+              variantObj.weight = variant.weight;
+            }
+          }
+        }
         
         // Extract color from variant.choices (Look Fantastic structure) - add as direct property
         if (!variantObj.color && variant.choices && Array.isArray(variant.choices)) {
@@ -102,19 +168,8 @@ if (hasMultipleVariants) {
         // Handle non-standard properties as additionalProperty
         const additionalProperties = [];
         
-        if (variant.amount) {
-          additionalProperties.push({
-            "@type": "PropertyValue",
-            "name": "amount",
-            "value": variant.amount
-          });
-        }
-        
         // Handle flavour as additionalProperty since it doesn't exist in schema.org
-        let flavorValue = null;
-        if (variant.flavor) flavorValue = variant.flavor;
-        else if (variant.flavour) flavorValue = variant.flavour;
-        else if (variant.taste) flavorValue = variant.taste;
+        const flavorValue = variant.flavor || variant.flavour || variant.taste || null;
         if (flavorValue) {
           additionalProperties.push({
             "@type": "PropertyValue",
@@ -135,7 +190,7 @@ if (hasMultipleVariants) {
           "availability": variant.inStock ? "https://schema.org/InStock" : "https://schema.org/OutOfStock"
         };
         
-        if (variant?.price?.price?.amount) offerObj.price = variant.price.price.amount;
+        if (variant?.price?.price?.amount) offerObj.price = parseFloat(variant.price.price.amount);
         if (Astro.props.currency) offerObj.priceCurrency = Astro.props.currency;
         
         variantObj.offers = offerObj;
@@ -143,6 +198,49 @@ if (hasMultipleVariants) {
       }
     });
   }
+
+  // Determine what properties vary between variants
+  const propertyChecks = [
+    { prop: 'weight', url: 'https://schema.org/weight' },
+    { prop: 'size', url: 'https://schema.org/size' },
+    { prop: 'color', url: 'https://schema.org/color' },
+    { prop: 'material', url: 'https://schema.org/material' },
+  ];
+
+  // Check what attributes exist across variants - ensure variants is an array
+  // For non-standard properties like amount and flavour, we use additionalProperty
+  const variesBy = propertyChecks
+    .filter(({ prop }) => Astro.props.variants?.some(v => v?.[prop]))
+    .map(({ url }) => url);
+
+  // Check for flavor with multiple possible property names - treat as additionalProperty
+  if (Astro.props.variants?.some(v => v && (v.flavor || v.flavour || v.taste))) {
+    if (!variesBy.includes("https://schema.org/additionalProperty")) {
+      variesBy.push("https://schema.org/additionalProperty");
+    }
+  }
+
+  // Check for shade/colour in variant.choices (Look Fantastic structure) - now uses color property
+  if (Astro.props.variants?.some(v => v && v.choices && Array.isArray(v.choices) &&
+      v.choices.some(c => c.optionKey === 'Shade' || c.optionKey === 'shade' ||
+                        c.optionKey === 'Colour' || c.optionKey === 'colour' ||
+                        c.optionKey === 'Color' || c.optionKey === 'color'))) {
+    if (!variesBy.includes("https://schema.org/color")) {
+      variesBy.push("https://schema.org/color");
+    }
+  }
+
+  schema = {
+    "@type": "ProductGroup",
+    "@context": "https://schema.org",
+    "@id": Astro.props.sku ? Astro.props.sku.toString() : "",
+    "url": `${url}${Astro.props.url || ""}`,
+    "productGroupID": Astro.props.sku ? Astro.props.sku.toString() : "",
+    "hasVariant": variantsArray
+  };
+
+  if (variesBy.length > 0) schema.variesBy = variesBy;
+
 } else {
   // Single variant - create offers array as before
   if (Array.isArray(Astro.props.variants)) {
@@ -156,169 +254,14 @@ if (hasMultipleVariants) {
           "availability": variant.inStock ? "https://schema.org/InStock" : "https://schema.org/OutOfStock"
         };
         
-        if (variant?.price?.price?.amount) offerObj.price = variant.price.price.amount;
+        if (variant?.price?.price?.amount) offerObj.price = parseFloat(variant.price.price.amount);
         if (Astro.props.currency) offerObj.priceCurrency = Astro.props.currency;
         
         offersArray.push(offerObj);
       }
     });
   }
-}
-
-let reviewsArray = []
-if (Astro.props.reviews && Array.isArray(Astro.props.reviews)) {
-  Astro.props.reviews.forEach((review)=>{
-    if (review && typeof review === 'object') {
-      const reviewObj = {
-        "@type": "Review",
-        "itemReviewed": {
-          "@id": Astro.props.sku ? Astro.props.sku.toString() : "",
-          "name": Astro.props.name || ""
-        },
-        "reviewRating": {
-          "@type": "Rating",
-          "bestRating": "5"
-        },
-        "author": {
-          "@type": "Person"
-        }
-      };
-      
-      if (review?.elements?.[0]?.score) reviewObj.reviewRating.ratingValue = review.elements[0].score;
-      if (review?.authorName) reviewObj.author.name = stripHtml(review.authorName);
-      if (review?.posted) reviewObj.datePublished = review.posted;
-      if (review?.elements?.[1]?.value) reviewObj.reviewBody = stripHtml(review.elements[1].value);
-      
-      reviewsArray.push(reviewObj);
-    }
-  });
-}
-
-let aggregateRating = undefined;
-if (Astro.props.reviewsCount > 0) {
-  aggregateRating = {
-    "@type": "AggregateRating",
-    "bestRating": 5,
-    "worstRating": 1
-  };
-  
-  if (Astro.props.reviewsAverage) aggregateRating.ratingValue = Astro.props.reviewsAverage;
-  if (Astro.props.reviewsCount) aggregateRating.reviewCount = Astro.props.reviewsCount;
-}
-
-let schema;
 
-if (hasMultipleVariants) {
-  // Determine what properties vary between variants
-  const variesBy = [];
-  
-  // Check what attributes exist across variants - ensure variants is an array
-  if (Array.isArray(Astro.props.variants)) {
-    if (Astro.props.variants.some(v => v && v.weight)) variesBy.push("https://schema.org/weight");
-    if (Astro.props.variants.some(v => v && v.size)) variesBy.push("https://schema.org/size");
-    if (Astro.props.variants.some(v => v && v.color)) variesBy.push("https://schema.org/color");
-    if (Astro.props.variants.some(v => v && v.material)) variesBy.push("https://schema.org/material");
-    
-    // For non-standard properties like amount, flavour, and shade, we use additionalProperty
-    if (Astro.props.variants.some(v => v && v.amount)) variesBy.push("https://schema.org/additionalProperty");
-    
-    // Check for flavor with multiple possible property names - treat as additionalProperty
-    if (Astro.props.variants.some(v => v && (v.flavor || v.flavour || v.taste))) {
-      if (!variesBy.includes("https://schema.org/additionalProperty")) {
-        variesBy.push("https://schema.org/additionalProperty");
-      }
-    }
-    
-    // Check for shade/colour in variant.choices (Look Fantastic structure) - now uses color property
-    if (Astro.props.variants.some(v => v && v.choices && Array.isArray(v.choices) &&
-        v.choices.some(c => c.optionKey === 'Shade' || c.optionKey === 'shade' ||
-                          c.optionKey === 'Colour' || c.optionKey === 'colour' ||
-                          c.optionKey === 'Color' || c.optionKey === 'color'))) {
-      if (!variesBy.includes("https://schema.org/color")) {
-        variesBy.push("https://schema.org/color");
-      }
-    }
-  }
-
-  schema = {
-    "@type": "ProductGroup",
-    "@context": "https://schema.org",
-    "@id": Astro.props.sku ? Astro.props.sku.toString() : "",
-    "url": `${url}${Astro.props.url || ""}`,
-    "productGroupID": Astro.props.sku ? Astro.props.sku.toString() : "",
-    "hasVariant": variantsArray
-  };
-  
-  if (Astro.props.name) schema.name = Astro.props.name;
-  if (Astro.props.description) schema.description = Astro.props.description;
-  if (Astro.props.image && import.meta.env.IMAGE_PROXY_URL) {
-    schema.image = `${import.meta.env.IMAGE_PROXY_URL}?url=${Astro.props.image}&format=webp&width=1500&height=1500&fit=cover`;
-  }
-  if (Astro.props.brand) {
-    schema.brand = {
-      "@type": "Brand",
-      "name": Astro.props.brand
-    };
-  }
-  if (variesBy.length > 0) schema.variesBy = variesBy;
-  
-  // Handle custom properties as additionalProperty (schema.org compliant)
-  const additionalProperties = [];
-  if (suggestedGender) {
-    additionalProperties.push({
-      "@type": "PropertyValue",
-      "name": "suggestedGender",
-      "value": suggestedGender
-    });
-  }
-  if (suggestedAge) {
-    additionalProperties.push({
-      "@type": "PropertyValue",
-      "name": "suggestedAge",
-      "value": suggestedAge
-    });
-  }
-  if (Astro.props.beauty_targetAge) {
-    additionalProperties.push({
-      "@type": "PropertyValue",
-      "name": "targetAge",
-      "value": Astro.props.beauty_targetAge
-    });
-  }
-  if (Astro.props.gender) {
-    additionalProperties.push({
-      "@type": "PropertyValue",
-      "name": "GenderType",
-      "value": Astro.props.gender
-    });
-  }
-  
-  // Add flavour as additionalProperty for ProductGroup level
-  if (Array.isArray(Astro.props.variants)) {
-    const flavourValues = Astro.props.variants.map(v => {
-      if (v && typeof v === 'object') {
-        return v.flavor || v.flavour || v.taste;
-      }
-      return null;
-    }).filter(Boolean);
-    
-    if (flavourValues.length > 0) {
-      // If multiple unique flavours, list them all; if single flavour, just that one
-      const uniqueFlavours = [...new Set(flavourValues)];
-      additionalProperties.push({
-        "@type": "PropertyValue",
-        "name": "flavour",
-        "value": uniqueFlavours.length === 1 ? uniqueFlavours[0] : uniqueFlavours.join(', ')
-      });
-    }
-  }
-  
-  if (additionalProperties.length > 0) {
-    schema.additionalProperty = additionalProperties;
-  }
-  if (aggregateRating) schema.aggregateRating = aggregateRating;
-  if (reviewsArray.length > 0) schema.review = reviewsArray;
-} else {
   // Single product schema as before
   schema = {
     "@type": "Product",
@@ -327,77 +270,80 @@ if (hasMultipleVariants) {
     "sku": Astro.props.sku ? Astro.props.sku.toString() : "",
     "offers": offersArray
   };
+}
+
+// Extract duplicate code
+if (Astro.props.name) schema.name = Astro.props.name;
+if (Astro.props.description) schema.description = Astro.props.description;
+if (Astro.props.image) {
+  schema.image = import.meta.env.IMAGE_PROXY_URL
+    ? `${import.meta.env.IMAGE_PROXY_URL}?url=${Astro.props.image}&format=webp&width=1500&height=1500&fit=cover`
+    : Astro.props.image;
+}
+if (Astro.props.brand) {
+  schema.brand = {
+    "@type": "Brand",
+    "name": Astro.props.brand
+  };
+}
+
+// Handle custom properties as additionalProperty (schema.org compliant)
+const additionalProperties: {"@type":string, name:string, value:string}[] = [];
+if (suggestedGender) {
+  additionalProperties.push({
+    "@type": "PropertyValue",
+    "name": "suggestedGender",
+    "value": suggestedGender
+  });
+}
+if (suggestedAge) {
+  additionalProperties.push({
+    "@type": "PropertyValue",
+    "name": "suggestedAge",
+    "value": suggestedAge
+  });
+}
+if (Astro.props.beauty_targetAge) {
+  additionalProperties.push({
+    "@type": "PropertyValue",
+    "name": "beauty_targetAge",
+    "value": Astro.props.beauty_targetAge
+  });
+}
+if (Astro.props.gender) {
+  additionalProperties.push({
+    "@type": "PropertyValue",
+    "name": "gender",
+    "value": Astro.props.gender
+  });
+}
+
+// Add flavour as additionalProperty for single product
+if (Array.isArray(Astro.props.variants)) {
+  const flavourValues: string[] = Astro.props.variants.map(v => {
+    if (v && typeof v === 'object') {
+      return v.flavor || v.flavour || v.taste;
+    }
+    return null;
+  }).filter(Boolean);
   
-  if (Astro.props.name) schema.name = Astro.props.name;
-  if (Astro.props.description) schema.description = Astro.props.description;
-  if (Astro.props.image && import.meta.env.IMAGE_PROXY_URL) {
-    schema.image = `${import.meta.env.IMAGE_PROXY_URL}?url=${Astro.props.image}&format=webp&width=1500&height=1500&fit=cover`;
-  }
-  if (Astro.props.brand) {
-    schema.brand = {
-      "@type": "Brand",
-      "name": Astro.props.brand
-    };
-  }
-  
-  // Handle custom properties as additionalProperty (schema.org compliant)
-  const additionalProperties = [];
-  if (suggestedGender) {
+  if (flavourValues.length > 0) {
+    // If multiple unique flavours, list them all; if single flavour, just that one
+    const uniqueFlavours = [...new Set(flavourValues)];
     additionalProperties.push({
       "@type": "PropertyValue",
-      "name": "suggestedGender",
-      "value": suggestedGender
+      "name": "flavour",
+      "value": uniqueFlavours.length === 1 ? uniqueFlavours[0] : uniqueFlavours.join(', ')
     });
   }
-  if (suggestedAge) {
-    additionalProperties.push({
-      "@type": "PropertyValue",
-      "name": "suggestedAge",
-      "value": suggestedAge
-    });
-  }
-  if (Astro.props.beauty_targetAge) {
-    additionalProperties.push({
-      "@type": "PropertyValue",
-      "name": "beauty_targetAge",
-      "value": Astro.props.beauty_targetAge
-    });
-  }
-  if (Astro.props.gender) {
-    additionalProperties.push({
-      "@type": "PropertyValue",
-      "name": "gender",
-      "value": Astro.props.gender
-    });
-  }
-  
-  // Add flavour as additionalProperty for single product
-  if (Array.isArray(Astro.props.variants)) {
-    const flavourValues = Astro.props.variants.map(v => {
-      if (v && typeof v === 'object') {
-        return v.flavor || v.flavour || v.taste;
-      }
-      return null;
-    }).filter(Boolean);
-    
-    if (flavourValues.length > 0) {
-      // If multiple unique flavours, list them all; if single flavour, just that one
-      const uniqueFlavours = [...new Set(flavourValues)];
-      additionalProperties.push({
-        "@type": "PropertyValue",
-        "name": "flavour",
-        "value": uniqueFlavours.length === 1 ? uniqueFlavours[0] : uniqueFlavours.join(', ')
-      });
-    }
-  }
-  
-  if (additionalProperties.length > 0) {
-    schema.additionalProperty = additionalProperties;
-  }
-  if (aggregateRating) schema.aggregateRating = aggregateRating;
-  if (reviewsArray.length > 0) schema.review = reviewsArray;
 }
 
+if (additionalProperties.length > 0) {
+  schema.additionalProperty = additionalProperties;
+}
+if (aggregateRating) schema.aggregateRating = aggregateRating;
+if (reviewsArray.length > 0) schema.review = reviewsArray;
+
 ---
 
 <script type="application/ld+json" set:html={JSON.stringify(schema, (key, value) => {