@thg-altitude/schemaorg 1.0.33 → 1.0.34

package/package.json

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

package/src/components/EnhancedProduct.astro

@@ -118,7 +118,7 @@ function generateProductSchema() {
             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('g') || c.title.includes('lb')))
+              (c.title && (c.title.includes('kg') || c.title.includes('lb') || /\d+\s*g\b/.test(c.title)))
             );
             if (weightChoice && weightChoice.title) attributes.push(weightChoice.title);
             
@@ -142,8 +142,8 @@ function generateProductSchema() {
             // Color
             const colorChoice = variant.choices.find(c => c.optionKey === 'Color' || c.optionKey === 'Colour' || c.colour);
             if (colorChoice) {
-              if (colorChoice.colour) attributes.push(colorChoice.colour);
-              else if (colorChoice.title) attributes.push(colorChoice.title);
+              if (colorChoice.title) attributes.push(colorChoice.title);
+              else if (colorChoice.colour) attributes.push(colorChoice.colour);
             }
             
             // Material
@@ -162,20 +162,20 @@ function generateProductSchema() {
             ...(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('g') || c.title.includes('lb')))) && {
-              weight: variant.choices.find(c => c.optionKey === 'Weight' || (c.title && (c.title.includes('kg') || c.title.includes('g') || c.title.includes('lb'))))?.title
+            ...(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
             }),
             ...(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
             }),
             ...(variant.choices && variant.choices.some(c => c.optionKey === 'Color' || c.optionKey === 'Colour' || c.colour) && {
-              color: variant.choices.find(c => c.optionKey === 'Color' || c.optionKey === 'Colour' || c.colour)?.colour ||
-                     variant.choices.find(c => c.optionKey === 'Color' || c.optionKey === 'Colour')?.title
+              color: variant.choices.find(c => c.optionKey === 'Color' || c.optionKey === 'Colour')?.title ||
+                     variant.choices.find(c => c.optionKey === 'Color' || c.optionKey === 'Colour' || c.colour)?.colour
             }),
             ...(variant.choices && variant.choices.some(c => c.optionKey === 'Material') && {
               material: variant.choices.find(c => c.optionKey === 'Material')?.title
             }),
-            // Handle non-standard properties (amount, flavor) as additionalProperty
+            // Handle non-standard properties (amount, flavour) as additionalProperty
             ...(() => {
               const additionalProperties = [];
               
@@ -189,13 +189,13 @@ function generateProductSchema() {
                 });
               }
               
-              // Flavor
-              const flavorChoice = variant.choices?.find(c => c.optionKey === 'Flavour' || c.optionKey === 'Flavor' || c.optionKey === 'Taste');
-              if (flavorChoice?.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) {
                 additionalProperties.push({
                   "@type": "PropertyValue",
-                  "name": "flavor",
-                  "value": flavorChoice.title
+                  "name": "flavour",
+                  "value": flavourChoice.title
                 });
               }
               
@@ -264,7 +264,7 @@ function generateProductSchema() {
             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('g') || c.title.includes('lb')))
+              (c.title && (c.title.includes('kg') || c.title.includes('lb') || /\d+\s*g\b/.test(c.title)))
             );
             if (weightChoice && weightChoice.title) attributes.push(weightChoice.title);
             
@@ -288,8 +288,8 @@ function generateProductSchema() {
             // Color
             const colorChoice = variant.choices.find(c => c.optionKey === 'Color' || c.optionKey === 'Colour' || c.colour);
             if (colorChoice) {
-              if (colorChoice.colour) attributes.push(colorChoice.colour);
-              else if (colorChoice.title) attributes.push(colorChoice.title);
+              if (colorChoice.title) attributes.push(colorChoice.title);
+              else if (colorChoice.colour) attributes.push(colorChoice.colour);
             }
             
             // Material
@@ -358,7 +358,7 @@ function generateProductSchema() {
       const variesBy = [];
       
       // Check what attributes exist across variants based on choices using correct schema.org properties
-      if (variants.some(v => v.choices && v.choices.some(c => c.optionKey === 'Weight' || (c.title && (c.title.includes('kg') || c.title.includes('g') || c.title.includes('lb')))))) {
+      if (variants.some(v => v.choices && v.choices.some(c => c.optionKey === 'Weight' || (c.title && (c.title.includes('kg') || c.title.includes('lb') || /\d+\s*g\b/.test(c.title)))))) {
         variesBy.push("https://schema.org/weight");
       }
       if (variants.some(v => v.choices && v.choices.some(c => c.optionKey === 'Size' && c.title && !c.title.includes('kg') && !c.title.includes('g') && !c.title.includes('lb')))) {
@@ -370,10 +370,11 @@ 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 and flavor, use additionalProperty
-      if (variants.some(v => v.choices && v.choices.some(c => c.optionKey === 'Amount')) ||
-          variants.some(v => v.choices && v.choices.some(c => c.optionKey === 'Flavour' || c.optionKey === 'Flavor' || c.optionKey === 'Taste'))) {
+      // For non-standard properties like amount and flavour, use additionalProperty
+      if (variants.some(v => v.choices && v.choices.some(c => c.optionKey === 'Amount'))) {
+        variesBy.push("https://schema.org/additionalProperty");
+      }
+      if (variants.some(v => v.choices && v.choices.some(c => c.optionKey === 'Flavour' || c.optionKey === 'Flavor' || c.optionKey === 'Taste'))) {
         variesBy.push("https://schema.org/additionalProperty");
       }
 
@@ -438,6 +439,22 @@ function generateProductSchema() {
               "value": gender
             });
           }
+          
+          // Add flavour as additionalProperty for ProductGroup level
+          const flavourValues = variants?.map(v =>
+            v.choices?.find(c => c.optionKey === 'Flavour' || c.optionKey === 'Flavor' || c.optionKey === 'Taste')?.title
+          ).filter(Boolean);
+          
+          if (flavourValues && 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(', ')
+            });
+          }
+          
           return additionalProperties.length > 0 ? { additionalProperty: additionalProperties } : {};
         })(),
       };
@@ -504,6 +521,22 @@ function generateProductSchema() {
               "value": gender
             });
           }
+          
+          // Add flavour as additionalProperty for single product
+          const flavourValues = variants?.map(v =>
+            v.choices?.find(c => c.optionKey === 'Flavour' || c.optionKey === 'Flavor' || c.optionKey === 'Taste')?.title
+          ).filter(Boolean);
+          
+          if (flavourValues && 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(', ')
+            });
+          }
+          
           return additionalProperties.length > 0 ? { additionalProperty: additionalProperties } : {};
         })(),
         ...(offersArray.length > 0 && { offers: offersArray }),

package/src/components/Product.astro

@@ -84,7 +84,7 @@ if (hasMultipleVariants) {
         if (variant.material) variantObj.material = variant.material;
         if (variant.weight) variantObj.weight = variant.weight;
         
-        // Handle amount and flavor as additionalProperty since they're not standard schema.org properties
+        // Handle non-standard properties as additionalProperty
         const additionalProperties = [];
         
         if (variant.amount) {
@@ -95,16 +95,15 @@ if (hasMultipleVariants) {
           });
         }
         
-        // Handle flavor with multiple possible property names
+        // 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;
-        
         if (flavorValue) {
           additionalProperties.push({
             "@type": "PropertyValue",
-            "name": "flavor",
+            "name": "flavour",
             "value": flavorValue
           });
         }
@@ -205,16 +204,12 @@ if (hasMultipleVariants) {
     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 and flavor, we use additionalProperty
-    // but still include them in variesBy for semantic meaning
+    // For non-standard properties like amount and flavour, 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
+    // Check for flavor with multiple possible property names - treat as additionalProperty
     if (Astro.props.variants.some(v => v && (v.flavor || v.flavour || v.taste))) {
-      // Only add additionalProperty once even if we have multiple non-standard properties
-      if (!variesBy.includes("https://schema.org/additionalProperty")) {
-        variesBy.push("https://schema.org/additionalProperty");
-      }
+      variesBy.push("https://schema.org/additionalProperty");
     }
   }
 
@@ -270,6 +265,27 @@ if (hasMultipleVariants) {
       "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;
   }
@@ -327,6 +343,27 @@ if (hasMultipleVariants) {
       "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;
   }