@bottlebooks/valid-values 7.3.2 → 7.4.0-alpha.0

package/src/validValues/productType/productType.ts

@@ -1,7 +1,12 @@
 import { defineMessage } from '@lingui/macro';
 import type { ValidValueDefinition } from '../types/ValidValueDefinition';
 
-export type ProductType = ValidValueDefinition;
+const categories = ['wine', 'wine_aromatised', 'beer', 'spirit'] as const;
+export type ProductCategory = typeof categories[number];
+
+interface ProductType extends ValidValueDefinition {
+  category: ProductCategory;
+}
 
 /** Makes sure errors are displayed where the error is introduced. */
 const productType = (value: ProductType) => value;
@@ -13,6 +18,7 @@ const allProductTypes = {
       id: 'validValues.productType.beer',
       message: 'Beer',
     }),
+    category: 'beer',
   }),
   spirit_absinthe: productType({
     key: 'spirit_absinthe',
@@ -20,6 +26,7 @@ const allProductTypes = {
       id: 'validValues.productType.spirit_absinthe',
       message: 'Absinthe',
     }),
+    category: 'spirit',
   }),
   spirit_anise: productType({
     key: 'spirit_anise',
@@ -27,6 +34,7 @@ const allProductTypes = {
       id: 'validValues.productType.spirit_anise',
       message: 'Anise',
     }),
+    category: 'spirit',
   }),
   spirit_aquavit: productType({
     key: 'spirit_aquavit',
@@ -34,6 +42,7 @@ const allProductTypes = {
       id: 'validValues.productType.spirit_aquavit',
       message: 'Aquavit',
     }),
+    category: 'spirit',
   }),
   spirit_arak: productType({
     key: 'spirit_arak',
@@ -41,6 +50,7 @@ const allProductTypes = {
       id: 'validValues.productType.spirit_arak',
       message: 'Arak',
     }),
+    category: 'spirit',
   }),
   spirit_armagnac: productType({
     key: 'spirit_armagnac',
@@ -48,6 +58,7 @@ const allProductTypes = {
       id: 'validValues.productType.spirit_armagnac',
       message: 'Armagnac',
     }),
+    category: 'spirit',
   }),
   spirit_asianspirit: productType({
     key: 'spirit_asianspirit',
@@ -55,6 +66,7 @@ const allProductTypes = {
       id: 'validValues.productType.spirit_asianspirit',
       message: 'Asian Spirit',
     }),
+    category: 'spirit',
   }),
   spirit_bitter: productType({
     key: 'spirit_bitter',
@@ -62,6 +74,7 @@ const allProductTypes = {
       id: 'validValues.productType.spirit_bitter',
       message: 'Bitter',
     }),
+    category: 'spirit',
   }),
   spirit_cachaca: productType({
     key: 'spirit_cachaca',
@@ -69,6 +82,7 @@ const allProductTypes = {
       id: 'validValues.productType.spirit_cachaca',
       message: 'Cachaca',
     }),
+    category: 'spirit',
   }),
   spirit_calvados: productType({
     key: 'spirit_calvados',
@@ -76,6 +90,7 @@ const allProductTypes = {
       id: 'validValues.productType.spirit_calvados',
       message: 'Calvados',
     }),
+    category: 'spirit',
   }),
   spirit_cocktail: productType({
     key: 'spirit_cocktail',
@@ -83,6 +98,7 @@ const allProductTypes = {
       id: 'validValues.productType.spirit_cocktail',
       message: 'Cocktail',
     }),
+    category: 'spirit',
   }),
   spirit_cognac: productType({
     key: 'spirit_cognac',
@@ -90,6 +106,7 @@ const allProductTypes = {
       id: 'validValues.productType.spirit_cognac',
       message: 'Cognac',
     }),
+    category: 'spirit',
   }),
   spirit_fruitspirit: productType({
     key: 'spirit_fruitspirit',
@@ -97,6 +114,7 @@ const allProductTypes = {
       id: 'validValues.productType.spirit_fruitspirit',
       message: 'Fruit Spirit',
     }),
+    category: 'spirit',
   }),
   spirit_genever: productType({
     key: 'spirit_genever',
@@ -104,6 +122,7 @@ const allProductTypes = {
       id: 'validValues.productType.spirit_genever',
       message: 'Genever',
     }),
+    category: 'spirit',
   }),
   spirit_gin: productType({
     key: 'spirit_gin',
@@ -111,6 +130,7 @@ const allProductTypes = {
       id: 'validValues.productType.spirit_gin',
       message: 'Gin',
     }),
+    category: 'spirit',
   }),
   spirit_grainspirit: productType({
     key: 'spirit_grainspirit',
@@ -118,6 +138,7 @@ const allProductTypes = {
       id: 'validValues.productType.spirit_grainspirit',
       message: 'Grain spirit',
     }),
+    category: 'spirit',
   }),
   spirit_grapebrandy: productType({
     key: 'spirit_grapebrandy',
@@ -125,6 +146,7 @@ const allProductTypes = {
       id: 'validValues.productType.spirit_grapebrandy',
       message: 'Grape Brandy',
     }),
+    category: 'spirit',
   }),
   spirit_grappa: productType({
     key: 'spirit_grappa',
@@ -132,6 +154,7 @@ const allProductTypes = {
       id: 'validValues.productType.spirit_grappa',
       message: 'Grappa',
     }),
+    category: 'spirit',
   }),
   spirit_liqueur: productType({
     key: 'spirit_liqueur',
@@ -139,6 +162,7 @@ const allProductTypes = {
       id: 'validValues.productType.spirit_liqueur',
       message: 'Liqueurs',
     }),
+    category: 'spirit',
   }),
   spirit_marc: productType({
     key: 'spirit_marc',
@@ -146,6 +170,7 @@ const allProductTypes = {
       id: 'validValues.productType.spirit_marc',
       message: 'Marc',
     }),
+    category: 'spirit',
   }),
   spirit_mezcal: productType({
     key: 'spirit_mezcal',
@@ -153,6 +178,7 @@ const allProductTypes = {
       id: 'validValues.productType.spirit_mezcal',
       message: 'Mezcal',
     }),
+    category: 'spirit',
   }),
   spirit_miscspririt: productType({
     key: 'spirit_miscspririt',
@@ -160,6 +186,7 @@ const allProductTypes = {
       id: 'validValues.productType.spirit_miscspririt',
       message: 'Miscellaneous',
     }),
+    category: 'spirit',
   }),
   spirit_ouzo: productType({
     key: 'spirit_ouzo',
@@ -167,6 +194,7 @@ const allProductTypes = {
       id: 'validValues.productType.spirit_ouzo',
       message: 'Ouzo',
     }),
+    category: 'spirit',
   }),
   spirit_pastis: productType({
     key: 'spirit_pastis',
@@ -174,6 +202,7 @@ const allProductTypes = {
       id: 'validValues.productType.spirit_pastis',
       message: 'Pastis',
     }),
+    category: 'spirit',
   }),
   spirit_pisco: productType({
     key: 'spirit_pisco',
@@ -181,6 +210,7 @@ const allProductTypes = {
       id: 'validValues.productType.spirit_pisco',
       message: 'Pisco',
     }),
+    category: 'spirit',
   }),
   spirit_raki: productType({
     key: 'spirit_raki',
@@ -188,6 +218,7 @@ const allProductTypes = {
       id: 'validValues.productType.spirit_raki',
       message: 'Raki',
     }),
+    category: 'spirit',
   }),
   spirit_rum: productType({
     key: 'spirit_rum',
@@ -195,6 +226,7 @@ const allProductTypes = {
       id: 'validValues.productType.spirit_rum',
       message: 'Rum',
     }),
+    category: 'spirit',
   }),
   spirit_sambuca: productType({
     key: 'spirit_sambuca',
@@ -202,6 +234,7 @@ const allProductTypes = {
       id: 'validValues.productType.spirit_sambuca',
       message: 'Sambuca',
     }),
+    category: 'spirit',
   }),
   spirit_schnaps: productType({
     key: 'spirit_schnaps',
@@ -209,6 +242,7 @@ const allProductTypes = {
       id: 'validValues.productType.spirit_schnaps',
       message: 'Edelbrand/Schnaps',
     }),
+    category: 'spirit',
   }),
   spirit_shochu: productType({
     key: 'spirit_shochu',
@@ -216,6 +250,7 @@ const allProductTypes = {
       id: 'validValues.productType.spirit_shochu',
       message: 'Shochu',
     }),
+    category: 'spirit',
   }),
   spirit_tequila: productType({
     key: 'spirit_tequila',
@@ -223,6 +258,7 @@ const allProductTypes = {
       id: 'validValues.productType.spirit_tequila',
       message: 'Tequila',
     }),
+    category: 'spirit',
   }),
   spirit_vermouth: productType({
     key: 'spirit_vermouth',
@@ -230,6 +266,7 @@ const allProductTypes = {
       id: 'validValues.productType.spirit_vermouth',
       message: 'Vermouth',
     }),
+    category: 'spirit',
   }),
   spirit_vodka: productType({
     key: 'spirit_vodka',
@@ -237,6 +274,7 @@ const allProductTypes = {
       id: 'validValues.productType.spirit_vodka',
       message: 'Vodka',
     }),
+    category: 'spirit',
   }),
   spirit_whisky: productType({
     key: 'spirit_whisky',
@@ -244,20 +282,211 @@ const allProductTypes = {
       id: 'validValues.productType.spirit_whisky',
       message: 'Whisky',
     }),
+    category: 'spirit',
+  }),
+  // Aromatised Wines Categories
+  wine_aromatised: productType({
+    key: 'wine_aromatised',
+    label: defineMessage({
+      id: 'validValues.productType.wine_aromatised',
+      message: 'Aromatised wine',
+    }),
+    category: 'wine_aromatised',
+  }),
+  wine_aromatised_wineBasedDrink: productType({
+    key: 'wine_aromatised_wineBasedDrink',
+    label: defineMessage({
+      id: 'validValues.productType.wine_aromatised_wineBasedDrink',
+      message: 'Aromatised wine-based drink',
+    }),
+    category: 'wine_aromatised',
+  }),
+  wine_aromatised_wineProductCocktail: productType({
+    key: 'wine_aromatised_wineProductCocktail',
+    label: defineMessage({
+      id: 'validValues.productType.wine_aromatised_wineProductCocktail',
+      message: 'Aromatised wine-product cocktail',
+    }),
+    category: 'wine_aromatised',
+  }),
+  // Aromatised Wines Sub Categories
+  wine_aromatised_aromatizovanyDezert: productType({
+    key: 'wine_aromatised_aromatizovanyDezert',
+    label: defineMessage({
+      id: 'validValues.productType.wine_aromatised_aromatizovanyDezert',
+      message: 'Aromatizovaný dezert',
+    }),
+    category: 'wine_aromatised',
+  }),
+  wine_aromatised_fortifiedWineBasedDrink: productType({
+    key: 'wine_aromatised_fortifiedWineBasedDrink',
+    label: defineMessage({
+      id: 'validValues.productType.wine_aromatised_fortifiedWineBasedDrink',
+      message: 'Aromatised fortified wine-based drink',
+    }),
+    category: 'wine_aromatised',
+  }),
+  wine_aromatised_semiSparklingGrapeBasedCocktail: productType({
+    key: 'wine_aromatised_semiSparklingGrapeBasedCocktail',
+    label: defineMessage({
+      id: 'validValues.productType.wine_aromatised_semiSparklingGrapeBasedCocktail',
+      message: 'Aromatised semi-sparkling grape-based cocktail',
+    }),
+    category: 'wine_aromatised',
+  }),
+  wine_aromatised_bitter: productType({
+    key: 'wine_aromatised_bitter',
+    label: defineMessage({
+      id: 'validValues.productType.wine_aromatised_bitter',
+      message: 'Bitter aromatised wine',
+    }),
+    category: 'wine_aromatised',
+  }),
+  wine_aromatised_bitterSoda: productType({
+    key: 'wine_aromatised_bitterSoda',
+    label: defineMessage({
+      id: 'validValues.productType.wine_aromatised_bitterSoda',
+      message: 'Bitter soda',
+    }),
+    category: 'wine_aromatised',
+  }),
+  wine_aromatised_clarea: productType({
+    key: 'wine_aromatised_clarea',
+    label: defineMessage({
+      id: 'validValues.productType.wine_aromatised_clarea',
+      message: 'Clarea',
+    }),
+    category: 'wine_aromatised',
+  }),
+  wine_aromatised_eggBased: productType({
+    key: 'wine_aromatised_eggBased',
+    label: defineMessage({
+      id: 'validValues.productType.wine_aromatised_eggBased',
+      message: 'Egg-based aromatised wine',
+    }),
+    category: 'wine_aromatised',
+  }),
+
+  wine_aromatised_gluhwein: productType({
+    key: 'wine_aromatised_gluhwein',
+    label: defineMessage({
+      id: 'validValues.productType.wine_aromatised_gluhwein',
+      message: 'Glühwein',
+    }),
+    category: 'wine_aromatised',
+  }),
+  wine_aromatised_kalteEnte: productType({
+    key: 'wine_aromatised_kalteEnte',
+    label: defineMessage({
+      id: 'validValues.productType.wine_aromatised_kalteEnte',
+      message: 'Kalte ente',
+    }),
+    category: 'wine_aromatised',
+  }),
+  wine_aromatised_maiwein: productType({
+    key: 'wine_aromatised_maiwein',
+    label: defineMessage({
+      id: 'validValues.productType.wine_aromatised_maiwein',
+      message: 'Maiwein',
+    }),
+    category: 'wine_aromatised',
+  }),
+  wine_aromatised_maitrank: productType({
+    key: 'wine_aromatised_maitrank',
+    label: defineMessage({
+      id: 'validValues.productType.wine_aromatised_maitrank',
+      message: 'Maitrank',
+    }),
+    category: 'wine_aromatised',
+  }),
+  wine_aromatised_pelin: productType({
+    key: 'wine_aromatised_pelin',
+    label: defineMessage({
+      id: 'validValues.productType.wine_aromatised_pelin',
+      message: 'Pelin',
+    }),
+    category: 'wine_aromatised',
+  }),
+  wine_aromatised_sangria: productType({
+    key: 'wine_aromatised_sangria',
+    label: defineMessage({
+      id: 'validValues.productType.wine_aromatised_sangria',
+      message: 'Sangría',
+    }),
+    category: 'wine_aromatised',
+  }),
+  wine_aromatised_sparklingWineCocktail: productType({
+    key: 'wine_aromatised_sparklingWineCocktail',
+    label: defineMessage({
+      id: 'validValues.productType.wine_aromatised_sparklingWineCocktail',
+      message: 'Sparkling wine cocktail',
+    }),
+    category: 'wine_aromatised',
+  }),
+  wine_aromatised_zurra: productType({
+    key: 'wine_aromatised_zurra',
+    label: defineMessage({
+      id: 'validValues.productType.wine_aromatised_zurra',
+      message: 'Zurra',
+    }),
+    category: 'wine_aromatised',
+  }),
+  wine_aromatised_vakevaViiniglogi: productType({
+    key: 'wine_aromatised_vakevaViiniglogi',
+    label: defineMessage({
+      id: 'validValues.productType.wine_aromatised_vakevaViiniglogi',
+      message: 'Väkevä viiniglögi/Starkvinsglögg',
+    }),
+    category: 'wine_aromatised',
+  }),
+  wine_aromatised_vermouth: productType({
+    key: 'wine_aromatised_vermouth',
+    label: defineMessage({
+      id: 'validValues.productType.wine_aromatised_vermouth',
+      message: 'Vermouth',
+    }),
+    category: 'wine_aromatised',
+  }),
+  wine_aromatised_viiniglogiVingloggKarstasVynas: productType({
+    key: 'wine_aromatised_viiniglogiVingloggKarstasVynas',
+    label: defineMessage({
+      id: 'validValues.productType.wine_aromatised_viiniglogiVingloggKarstasVynas',
+      message: 'Viiniglögi/Vinglögg/Karštas vynas',
+    }),
+    category: 'wine_aromatised',
+  }),
+  wine_aromatised_wineBasedAperitif: productType({
+    key: 'wine_aromatised_wineBasedAperitif',
+    label: defineMessage({
+      id: 'validValues.productType.wine_aromatised_wineBasedAperitif',
+      message: 'Wine-based aperitif',
+    }),
+    category: 'wine_aromatised',
+  }),
+  wine_aromatised_winoZiolowe: productType({
+    key: 'wine_aromatised_winoZiolowe',
+    label: defineMessage({
+      id: 'validValues.productType.wine_aromatised_winoZiolowe',
+      message: 'Wino ziołowe',
+    }),
+    category: 'wine_aromatised',
   }),
-  wine_aromatized: productType({
-    key: 'wine_aromatized',
+  wine_aromatised_wineBasedCocktail: productType({
+    key: 'wine_aromatised_wineBasedCocktail',
     label: defineMessage({
-      id: 'validValues.productType.wine_aromatized',
-      message: 'Aromatized wine',
+      id: 'validValues.productType.wine_aromatised_wineBasedCocktail',
+      message: 'Wine-based cocktail',
     }),
+    category: 'wine_aromatised',
   }),
+  // Wine Categories
   wine_stillwine: productType({
     key: 'wine_stillwine',
     label: defineMessage({
       id: 'validValues.productType.wine_stillwine',
       message: 'Wine',
     }),
+    category: 'wine',
   }),
   wine_sparkling: productType({
     key: 'wine_sparkling',
@@ -265,6 +494,7 @@ const allProductTypes = {
       id: 'validValues.productType.wine_sparkling',
       message: 'Sparkling wine',
     }),
+    category: 'wine',
   }),
   wine_fortified: productType({
     key: 'wine_fortified',
@@ -272,6 +502,7 @@ const allProductTypes = {
       id: 'validValues.productType.wine_fortified',
       message: 'Fortified wine',
     }),
+    category: 'wine',
   }),
   wine_pearlwine: productType({
     key: 'wine_pearlwine',
@@ -279,6 +510,7 @@ const allProductTypes = {
       id: 'validValues.productType.wine_pearlwine',
       message: 'Pearl wine',
     }),
+    category: 'wine',
   }),
   wine_liqueur: productType({
     key: 'wine_liqueur',
@@ -286,6 +518,7 @@ const allProductTypes = {
       id: 'validValues.productType.wine_liqueur',
       message: 'Liqueur wine',
     }),
+    category: 'wine',
   }),
   wine_qualitysparkling: productType({
     key: 'wine_qualitysparkling',
@@ -293,6 +526,7 @@ const allProductTypes = {
       id: 'validValues.productType.wine_qualitysparkling',
       message: 'Quality sparkling wine',
     }),
+    category: 'wine',
   }),
   wine_qualityaromaticsparkling: productType({
     key: 'wine_qualityaromaticsparkling',
@@ -300,6 +534,7 @@ const allProductTypes = {
       id: 'validValues.productType.wine_qualityaromaticsparkling',
       message: 'Quality aromatic sparkling wine',
     }),
+    category: 'wine',
   }),
   wine_aeratedsparkling: productType({
     key: 'wine_aeratedsparkling',
@@ -307,6 +542,7 @@ const allProductTypes = {
       id: 'validValues.productType.wine_aeratedsparkling',
       message: 'Aerated sparkling wine',
     }),
+    category: 'wine',
   }),
   wine_semisparkling: productType({
     key: 'wine_semisparkling',
@@ -314,6 +550,7 @@ const allProductTypes = {
       id: 'validValues.productType.wine_semisparkling',
       message: 'Semi-sparkling wine',
     }),
+    category: 'wine',
   }),
   wine_aeratedsemisparkling: productType({
     key: 'wine_aeratedsemisparkling',
@@ -321,6 +558,7 @@ const allProductTypes = {
       id: 'validValues.productType.wine_aeratedsemisparkling',
       message: 'Aerated semi-sparkling wine',
     }),
+    category: 'wine',
   }),
   // This is probably for bulk wine. For now we don't support it in elabels
   // wine_newwinestillinfermentation: productType({

package/src/validValues/types/ProductTypeKey.ts

@@ -3,7 +3,29 @@ export type ProductType =
   | 'wine_fortified'
   | 'wine_pearlwine'
   | 'wine_sparkling'
-  | 'wine_aromatized'
+  | 'wine_aromatised'
+  | 'wine_aromatised_wineBasedAperitif'
+  | 'wine_aromatised_vermouth'
+  | 'wine_aromatised_bitter'
+  | 'wine_aromatised_eggBased'
+  | 'wine_aromatised_vakevaViiniglogi'
+  | 'wine_aromatised_wineBasedDrink'
+  | 'wine_aromatised_fortifiedWineBasedDrink'
+  | 'wine_aromatised_sangria'
+  | 'wine_aromatised_clarea'
+  | 'wine_aromatised_zurra'
+  | 'wine_aromatised_bitterSoda'
+  | 'wine_aromatised_kalteEnte'
+  | 'wine_aromatised_gluhwein'
+  | 'wine_aromatised_viiniglogiVingloggKarstasVynas'
+  | 'wine_aromatised_maiwein'
+  | 'wine_aromatised_maitrank'
+  | 'wine_aromatised_pelin'
+  | 'wine_aromatised_aromatizovanyDezert'
+  | 'wine_aromatised_winoZiolowe'
+  | 'wine_aromatised_wineBasedCocktail'
+  | 'wine_aromatised_semiSparklingGrapeBasedCocktail'
+  | 'wine_aromatised_sparklingWineCocktail'
   | 'wine_aeratedsparkling'
   | 'wine_aeratedsemisparkling'
   | 'wine_liqueur'

package/src/validValues/types/productTypesAromatisedWine.ts

@@ -0,0 +1,28 @@
+import type { ProductType } from './ProductTypeKey';
+
+const PRODUCT_TYPE_AROMATISED_WINE: Array<ProductType> = [
+  'wine_aromatised',
+  'wine_aromatised_wineBasedAperitif',
+  'wine_aromatised_vermouth',
+  'wine_aromatised_bitter',
+  'wine_aromatised_eggBased',
+  'wine_aromatised_vakevaViiniglogi',
+  'wine_aromatised_wineBasedDrink',
+  'wine_aromatised_fortifiedWineBasedDrink',
+  'wine_aromatised_sangria',
+  'wine_aromatised_clarea',
+  'wine_aromatised_zurra',
+  'wine_aromatised_bitterSoda',
+  'wine_aromatised_kalteEnte',
+  'wine_aromatised_gluhwein',
+  'wine_aromatised_viiniglogiVingloggKarstasVynas',
+  'wine_aromatised_maiwein',
+  'wine_aromatised_maitrank',
+  'wine_aromatised_pelin',
+  'wine_aromatised_aromatizovanyDezert',
+  'wine_aromatised_winoZiolowe',
+  'wine_aromatised_wineBasedCocktail',
+  'wine_aromatised_semiSparklingGrapeBasedCocktail',
+  'wine_aromatised_sparklingWineCocktail',
+];
+export default PRODUCT_TYPE_AROMATISED_WINE;

package/src/validValues/types/productTypesWine.ts

@@ -5,7 +5,6 @@ const PRODUCT_TYPE_WINES: Array<ProductType> = [
   'wine_fortified',
   'wine_pearlwine',
   'wine_sparkling',
-  'wine_aromatized',
   'wine_aeratedsparkling',
   'wine_aeratedsemisparkling',
   'wine_liqueur',

package/src/validValues/varietyName/varietyName.ts

@@ -408,6 +408,10 @@ const allVarietyNames = {
     key: 'César',
     label: 'César',
   }),
+  Romano: varietyName({
+    key: 'Romano',
+    label: 'Romano',
+  }),
   Cetinja: varietyName({
     key: 'Cetinja',
     label: 'Cetinja',
@@ -696,6 +700,10 @@ const allVarietyNames = {
     key: 'Dišeća Ranina',
     label: 'Dišeća Ranina',
   }),
+  Divico: varietyName({
+    key: 'Divico',
+    label: 'Divico',
+  }),
   'Dnestrovsky Rozovy': varietyName({
     key: 'Dnestrovsky Rozovy',
     label: 'Dnestrovsky Rozovy',