@bottlebooks/valid-values 1.1.0 → 1.2.1

package/src/validValues/designation.ts

@@ -5,11 +5,6 @@ import type { ProductType as ProductTypeKey } from './types/ProductTypeKey.js';
 // I copied the original definition here because the one in the /types folder has diverged and doesn't follow the original idea.
 // I'd rather recommend keeping this a simple baseline than putting any possible option into it.
 interface ValidValueDefinition {
-  /**
-   * The translatable title of the valid value.
-   *
-   * Define it using `defineMessage()` from @lingui/macro.
-   */
   title: MessageDescriptor;
   /**
    * Fields that will never be stored in the database,

package/src/validValues/ingredient.ts

@@ -4,6 +4,8 @@ import { MessageDescriptor } from '@lingui/core';
 import { ProductType } from './types/ProductTypeKey.js';
 import { IngredientTag } from './types/IngredientTag.js';
 import { ValidValueDefinition } from './types/ValidValueDefinition.js';
+import PRODUCT_TYPE_WINES from './types/productTypesWine.js';
+import PRODUCT_TYPE_SPIRITS from './types/productTypesSpirit.js';
 
 export interface Ingredient extends ValidValueDefinition {
   /**
@@ -27,13 +29,7 @@ export default createValidValues<Ingredient>({
     }),
     form: {
       tags: ['OTHER_INGREDIENT'],
-      productType: [
-        'wine_stillwine',
-        'wine_fortified',
-        'wine_pearlwine',
-        'wine_sparkling',
-        'wine_aromatized',
-      ],
+      productType: PRODUCT_TYPE_WINES,
     },
   },
   ammoniaCaramel: {
@@ -55,13 +51,7 @@ export default createValidValues<Ingredient>({
     }),
     form: {
       tags: ['PROCESSING_AID', 'ALLERGEN'],
-      productType: [
-        'wine_stillwine',
-        'wine_fortified',
-        'wine_pearlwine',
-        'wine_sparkling',
-        'wine_aromatized',
-      ],
+      productType: PRODUCT_TYPE_WINES,
     },
   },
   argon: {
@@ -72,13 +62,7 @@ export default createValidValues<Ingredient>({
     }),
     form: {
       tags: ['ANTIOXIDANT'],
-      productType: [
-        'wine_stillwine',
-        'wine_fortified',
-        'wine_pearlwine',
-        'wine_sparkling',
-        'wine_aromatized',
-      ],
+      productType: PRODUCT_TYPE_WINES,
     },
   },
   ascorbicAcid: {
@@ -89,13 +73,7 @@ export default createValidValues<Ingredient>({
     }),
     form: {
       tags: ['ANTIOXIDANT'],
-      productType: [
-        'wine_stillwine',
-        'wine_fortified',
-        'wine_pearlwine',
-        'wine_sparkling',
-        'wine_aromatized',
-      ],
+      productType: PRODUCT_TYPE_WINES,
     },
   },
   burnedSugar: {
@@ -117,13 +95,7 @@ export default createValidValues<Ingredient>({
     }),
     form: {
       tags: ['ACIDITY_REGULATOR', 'ALLERGEN'],
-      productType: [
-        'wine_stillwine',
-        'wine_fortified',
-        'wine_pearlwine',
-        'wine_sparkling',
-        'wine_aromatized',
-      ],
+      productType: PRODUCT_TYPE_WINES,
     },
   },
   carbonDioxide: {
@@ -134,13 +106,7 @@ export default createValidValues<Ingredient>({
     }),
     form: {
       tags: ['ANTIOXIDANT', 'OTHER_INGREDIENT'],
-      productType: [
-        'wine_stillwine',
-        'wine_fortified',
-        'wine_pearlwine',
-        'wine_sparkling',
-        'wine_aromatized',
-      ],
+      productType: PRODUCT_TYPE_WINES,
     },
   },
   carboxymethylcellulose: {
@@ -151,13 +117,7 @@ export default createValidValues<Ingredient>({
     }),
     form: {
       tags: ['STABILISER'],
-      productType: [
-        'wine_stillwine',
-        'wine_fortified',
-        'wine_pearlwine',
-        'wine_sparkling',
-        'wine_aromatized',
-      ],
+      productType: PRODUCT_TYPE_WINES,
     },
   },
   carobSyrup: {
@@ -190,41 +150,7 @@ export default createValidValues<Ingredient>({
     }),
     form: {
       tags: ['RAW_MATERIAL'],
-      productType: [
-        'spirit_absinthe',
-        'spirit_anise',
-        'spirit_aquavit',
-        'spirit_arak',
-        'spirit_armagnac',
-        'spirit_asianspirit',
-        'spirit_bitter',
-        'spirit_cachaca',
-        'spirit_calvados',
-        'spirit_cocktail',
-        'spirit_cognac',
-        'spirit_fruitspirit',
-        'spirit_genever',
-        'spirit_gin',
-        'spirit_grainspirit',
-        'spirit_grapebrandy',
-        'spirit_grappa',
-        'spirit_liqueur',
-        'spirit_marc',
-        'spirit_mezcal',
-        'spirit_miscspririt',
-        'spirit_ouzo',
-        'spirit_pastis',
-        'spirit_pisco',
-        'spirit_raki',
-        'spirit_rum',
-        'spirit_sambuca',
-        'spirit_shochu',
-        'spirit_schnaps',
-        'spirit_tequila',
-        'spirit_vermouth',
-        'spirit_vodka',
-        'spirit_whisky',
-      ],
+      productType: PRODUCT_TYPE_SPIRITS,
     },
   },
   citricAcid: {
@@ -235,13 +161,7 @@ export default createValidValues<Ingredient>({
     }),
     form: {
       tags: ['NATURALLY_ADDED_ACID'],
-      productType: [
-        'wine_stillwine',
-        'wine_fortified',
-        'wine_pearlwine',
-        'wine_sparkling',
-        'wine_aromatized',
-      ],
+      productType: PRODUCT_TYPE_WINES,
     },
   },
   concentratedGrapeMust: {
@@ -252,13 +172,7 @@ export default createValidValues<Ingredient>({
     }),
     form: {
       tags: ['ENRICHMENT_SUBSTANCE', 'SWEETENER'],
-      productType: [
-        'wine_stillwine',
-        'wine_fortified',
-        'wine_pearlwine',
-        'wine_sparkling',
-        'wine_aromatized',
-      ],
+      productType: PRODUCT_TYPE_WINES,
     },
   },
   dimethyldicarbonate: {
@@ -269,13 +183,7 @@ export default createValidValues<Ingredient>({
     }),
     form: {
       tags: ['PRESERVATIVE'],
-      productType: [
-        'wine_stillwine',
-        'wine_fortified',
-        'wine_pearlwine',
-        'wine_sparkling',
-        'wine_aromatized',
-      ],
+      productType: PRODUCT_TYPE_WINES,
     },
   },
   distillateOfAgriculturalOrigin: {
@@ -319,13 +227,7 @@ export default createValidValues<Ingredient>({
     }),
     form: {
       tags: ['PROCESSING_AID', 'ALLERGEN'],
-      productType: [
-        'wine_stillwine',
-        'wine_fortified',
-        'wine_pearlwine',
-        'wine_sparkling',
-        'wine_aromatized',
-      ],
+      productType: PRODUCT_TYPE_WINES,
     },
   },
   eggLysozyme: {
@@ -336,13 +238,7 @@ export default createValidValues<Ingredient>({
     }),
     form: {
       tags: ['PRESERVATIVE'],
-      productType: [
-        'wine_stillwine',
-        'wine_fortified',
-        'wine_pearlwine',
-        'wine_sparkling',
-        'wine_aromatized',
-      ],
+      productType: PRODUCT_TYPE_WINES,
     },
   },
   ethylAlcoholOfAgriculturalOrigin: {
@@ -403,41 +299,7 @@ export default createValidValues<Ingredient>({
     }),
     form: {
       tags: ['RAW_MATERIAL'],
-      productType: [
-        'spirit_absinthe',
-        'spirit_anise',
-        'spirit_aquavit',
-        'spirit_arak',
-        'spirit_armagnac',
-        'spirit_asianspirit',
-        'spirit_bitter',
-        'spirit_cachaca',
-        'spirit_calvados',
-        'spirit_cocktail',
-        'spirit_cognac',
-        'spirit_fruitspirit',
-        'spirit_genever',
-        'spirit_gin',
-        'spirit_grainspirit',
-        'spirit_grapebrandy',
-        'spirit_grappa',
-        'spirit_liqueur',
-        'spirit_marc',
-        'spirit_mezcal',
-        'spirit_miscspririt',
-        'spirit_ouzo',
-        'spirit_pastis',
-        'spirit_pisco',
-        'spirit_raki',
-        'spirit_rum',
-        'spirit_sambuca',
-        'spirit_shochu',
-        'spirit_schnaps',
-        'spirit_tequila',
-        'spirit_vermouth',
-        'spirit_vodka',
-        'spirit_whisky',
-      ],
+      productType: PRODUCT_TYPE_SPIRITS,
     },
   },
   grape: {
@@ -448,13 +310,7 @@ export default createValidValues<Ingredient>({
     }),
     form: {
       tags: ['RAW_MATERIAL'],
-      productType: [
-        'wine_stillwine',
-        'wine_fortified',
-        'wine_pearlwine',
-        'wine_sparkling',
-        'wine_aromatized',
-      ],
+      productType: PRODUCT_TYPE_WINES,
     },
   },
   grapeMarcSpirit: {
@@ -476,13 +332,7 @@ export default createValidValues<Ingredient>({
     }),
     form: {
       tags: ['STABILISER'],
-      productType: [
-        'wine_stillwine',
-        'wine_fortified',
-        'wine_pearlwine',
-        'wine_sparkling',
-        'wine_aromatized',
-      ],
+      productType: PRODUCT_TYPE_WINES,
     },
   },
   honey: {
@@ -504,13 +354,7 @@ export default createValidValues<Ingredient>({
     }),
     form: {
       tags: ['ACIDITY_REGULATOR'],
-      productType: [
-        'wine_stillwine',
-        'wine_fortified',
-        'wine_pearlwine',
-        'wine_sparkling',
-        'wine_aromatized',
-      ],
+      productType: PRODUCT_TYPE_WINES,
     },
   },
   malicAcid: {
@@ -521,13 +365,7 @@ export default createValidValues<Ingredient>({
     }),
     form: {
       tags: ['ACIDITY_REGULATOR'],
-      productType: [
-        'wine_stillwine',
-        'wine_fortified',
-        'wine_pearlwine',
-        'wine_sparkling',
-        'wine_aromatized',
-      ],
+      productType: PRODUCT_TYPE_WINES,
     },
   },
   maltDistillateAndWater: {
@@ -538,41 +376,7 @@ export default createValidValues<Ingredient>({
     }),
     form: {
       tags: ['RAW_MATERIAL'],
-      productType: [
-        'spirit_absinthe',
-        'spirit_anise',
-        'spirit_aquavit',
-        'spirit_arak',
-        'spirit_armagnac',
-        'spirit_asianspirit',
-        'spirit_bitter',
-        'spirit_cachaca',
-        'spirit_calvados',
-        'spirit_cocktail',
-        'spirit_cognac',
-        'spirit_fruitspirit',
-        'spirit_genever',
-        'spirit_gin',
-        'spirit_grainspirit',
-        'spirit_grapebrandy',
-        'spirit_grappa',
-        'spirit_liqueur',
-        'spirit_marc',
-        'spirit_mezcal',
-        'spirit_miscspririt',
-        'spirit_ouzo',
-        'spirit_pastis',
-        'spirit_pisco',
-        'spirit_raki',
-        'spirit_rum',
-        'spirit_sambuca',
-        'spirit_shochu',
-        'spirit_schnaps',
-        'spirit_tequila',
-        'spirit_vermouth',
-        'spirit_vodka',
-        'spirit_whisky',
-      ],
+      productType: PRODUCT_TYPE_SPIRITS,
     },
   },
   metatartaricAcid: {
@@ -583,13 +387,7 @@ export default createValidValues<Ingredient>({
     }),
     form: {
       tags: ['STABILISER'],
-      productType: [
-        'wine_stillwine',
-        'wine_fortified',
-        'wine_pearlwine',
-        'wine_sparkling',
-        'wine_aromatized',
-      ],
+      productType: PRODUCT_TYPE_WINES,
     },
   },
   milkCasein: {
@@ -600,13 +398,7 @@ export default createValidValues<Ingredient>({
     }),
     form: {
       tags: ['PROCESSING_AID', 'ALLERGEN'],
-      productType: [
-        'wine_stillwine',
-        'wine_fortified',
-        'wine_pearlwine',
-        'wine_sparkling',
-        'wine_aromatized',
-      ],
+      productType: PRODUCT_TYPE_WINES,
     },
   },
   nitrogen: {
@@ -617,13 +409,7 @@ export default createValidValues<Ingredient>({
     }),
     form: {
       tags: ['ANTIOXIDANT'],
-      productType: [
-        'wine_stillwine',
-        'wine_fortified',
-        'wine_pearlwine',
-        'wine_sparkling',
-        'wine_aromatized',
-      ],
+      productType: PRODUCT_TYPE_WINES,
     },
   },
   plainCaramel: {
@@ -645,13 +431,7 @@ export default createValidValues<Ingredient>({
     }),
     form: {
       tags: ['PRESERVATIVE', 'ALLERGEN'],
-      productType: [
-        'wine_stillwine',
-        'wine_fortified',
-        'wine_pearlwine',
-        'wine_sparkling',
-        'wine_aromatized',
-      ],
+      productType: PRODUCT_TYPE_WINES,
     },
   },
   potassiumMetabisulphite: {
@@ -662,13 +442,7 @@ export default createValidValues<Ingredient>({
     }),
     form: {
       tags: ['PRESERVATIVE', 'ALLERGEN'],
-      productType: [
-        'wine_stillwine',
-        'wine_fortified',
-        'wine_pearlwine',
-        'wine_sparkling',
-        'wine_aromatized',
-      ],
+      productType: PRODUCT_TYPE_WINES,
     },
   },
   potassiumPolyaspartate: {
@@ -679,13 +453,7 @@ export default createValidValues<Ingredient>({
     }),
     form: {
       tags: ['STABILISER'],
-      productType: [
-        'wine_stillwine',
-        'wine_fortified',
-        'wine_pearlwine',
-        'wine_sparkling',
-        'wine_aromatized',
-      ],
+      productType: PRODUCT_TYPE_WINES,
     },
   },
   potassiumSorbate: {
@@ -696,13 +464,7 @@ export default createValidValues<Ingredient>({
     }),
     form: {
       tags: ['PRESERVATIVE'],
-      productType: [
-        'wine_stillwine',
-        'wine_fortified',
-        'wine_pearlwine',
-        'wine_sparkling',
-        'wine_aromatized',
-      ],
+      productType: PRODUCT_TYPE_WINES,
     },
   },
   ryeDistillateAndWater: {
@@ -713,41 +475,7 @@ export default createValidValues<Ingredient>({
     }),
     form: {
       tags: ['RAW_MATERIAL'],
-      productType: [
-        'spirit_absinthe',
-        'spirit_anise',
-        'spirit_aquavit',
-        'spirit_arak',
-        'spirit_armagnac',
-        'spirit_asianspirit',
-        'spirit_bitter',
-        'spirit_cachaca',
-        'spirit_calvados',
-        'spirit_cocktail',
-        'spirit_cognac',
-        'spirit_fruitspirit',
-        'spirit_genever',
-        'spirit_gin',
-        'spirit_grainspirit',
-        'spirit_grapebrandy',
-        'spirit_grappa',
-        'spirit_liqueur',
-        'spirit_marc',
-        'spirit_mezcal',
-        'spirit_miscspririt',
-        'spirit_ouzo',
-        'spirit_pastis',
-        'spirit_pisco',
-        'spirit_raki',
-        'spirit_rum',
-        'spirit_sambuca',
-        'spirit_shochu',
-        'spirit_schnaps',
-        'spirit_tequila',
-        'spirit_vermouth',
-        'spirit_vodka',
-        'spirit_whisky',
-      ],
+      productType: PRODUCT_TYPE_SPIRITS,
     },
   },
   sucrose: {
@@ -758,13 +486,7 @@ export default createValidValues<Ingredient>({
     }),
     form: {
       tags: ['ENRICHMENT_SUBSTANCE'],
-      productType: [
-        'wine_stillwine',
-        'wine_fortified',
-        'wine_pearlwine',
-        'wine_sparkling',
-        'wine_aromatized',
-      ],
+      productType: PRODUCT_TYPE_WINES,
     },
   },
   sugar: {
@@ -797,13 +519,7 @@ export default createValidValues<Ingredient>({
     }),
     form: {
       tags: ['PRESERVATIVE', 'ALLERGEN'],
-      productType: [
-        'wine_stillwine',
-        'wine_fortified',
-        'wine_pearlwine',
-        'wine_sparkling',
-        'wine_aromatized',
-      ],
+      productType: PRODUCT_TYPE_WINES,
     },
   },
   sulphurDioxide: {
@@ -814,13 +530,7 @@ export default createValidValues<Ingredient>({
     }),
     form: {
       tags: ['PRESERVATIVE', 'ALLERGEN'],
-      productType: [
-        'wine_stillwine',
-        'wine_fortified',
-        'wine_pearlwine',
-        'wine_sparkling',
-        'wine_aromatized',
-      ],
+      productType: PRODUCT_TYPE_WINES,
     },
   },
   tartaricAcid: {
@@ -831,13 +541,7 @@ export default createValidValues<Ingredient>({
     }),
     form: {
       tags: ['ACIDITY_REGULATOR'],
-      productType: [
-        'wine_stillwine',
-        'wine_fortified',
-        'wine_pearlwine',
-        'wine_sparkling',
-        'wine_aromatized',
-      ],
+      productType: PRODUCT_TYPE_WINES,
     },
   },
   water: {
@@ -859,13 +563,7 @@ export default createValidValues<Ingredient>({
     }),
     form: {
       tags: ['PROCESSING_AID'],
-      productType: [
-        'wine_stillwine',
-        'wine_fortified',
-        'wine_pearlwine',
-        'wine_sparkling',
-        'wine_aromatized',
-      ],
+      productType: PRODUCT_TYPE_WINES,
     },
   },
   wine: {
@@ -920,13 +618,7 @@ export default createValidValues<Ingredient>({
     }),
     form: {
       tags: ['STABILISER'],
-      productType: [
-        'wine_stillwine',
-        'wine_fortified',
-        'wine_pearlwine',
-        'wine_sparkling',
-        'wine_aromatized',
-      ],
+      productType: PRODUCT_TYPE_WINES,
     },
   },
 });