@bottlebooks/valid-values 2.1.0 → 3.1.0

package/src/validValues/productType.ts

@@ -1,285 +1,287 @@
 import { defineMessage } from '@lingui/macro';
-import createValidValues from './utils/createValidValues.js';
-
-import type { MessageDescriptor } from '@lingui/core';
 import { ValidValueDefinition } from './types/ValidValueDefinition.js';
-interface ProductType {
-  key: string;
-  title: MessageDescriptor;
-}
 
-export default createValidValues<ProductType>({
-  beer: {
+export interface ProductType extends ValidValueDefinition {}
+
+/** Makes sure errors are displayed where the error is introduced. */
+const productType = (value: ProductType) => value;
+
+const allProductTypes = {
+  beer: productType({
     key: 'beer',
-    title: defineMessage({
+    label: defineMessage({
       id: 'validValues.productType.beer',
       message: 'Beer',
     }),
-  },
-  spirit_absinthe: {
+  }),
+  spirit_absinthe: productType({
     key: 'spirit_absinthe',
-    title: defineMessage({
+    label: defineMessage({
       id: 'validValues.productType.spirit_absinthe',
       message: 'Absinthe',
     }),
-  },
-  spirit_anise: {
+  }),
+  spirit_anise: productType({
     key: 'spirit_anise',
-    title: defineMessage({
+    label: defineMessage({
       id: 'validValues.productType.spirit_anise',
       message: 'Anise',
     }),
-  },
-  spirit_aquavit: {
+  }),
+  spirit_aquavit: productType({
     key: 'spirit_aquavit',
-    title: defineMessage({
+    label: defineMessage({
       id: 'validValues.productType.spirit_aquavit',
       message: 'Aquavit',
     }),
-  },
-  spirit_arak: {
+  }),
+  spirit_arak: productType({
     key: 'spirit_arak',
-    title: defineMessage({
+    label: defineMessage({
       id: 'validValues.productType.spirit_arak',
       message: 'Arak',
     }),
-  },
-  spirit_armagnac: {
+  }),
+  spirit_armagnac: productType({
     key: 'spirit_armagnac',
-    title: defineMessage({
+    label: defineMessage({
       id: 'validValues.productType.spirit_armagnac',
       message: 'Armagnac',
     }),
-  },
-  spirit_asianspirit: {
+  }),
+  spirit_asianspirit: productType({
     key: 'spirit_asianspirit',
-    title: defineMessage({
+    label: defineMessage({
       id: 'validValues.productType.spirit_asianspirit',
       message: 'Asian Spirit',
     }),
-  },
-  spirit_bitter: {
+  }),
+  spirit_bitter: productType({
     key: 'spirit_bitter',
-    title: defineMessage({
+    label: defineMessage({
       id: 'validValues.productType.spirit_bitter',
       message: 'Bitter',
     }),
-  },
-  spirit_cachaca: {
+  }),
+  spirit_cachaca: productType({
     key: 'spirit_cachaca',
-    title: defineMessage({
+    label: defineMessage({
       id: 'validValues.productType.spirit_cachaca',
       message: 'Cachaca',
     }),
-  },
-  spirit_calvados: {
+  }),
+  spirit_calvados: productType({
     key: 'spirit_calvados',
-    title: defineMessage({
+    label: defineMessage({
       id: 'validValues.productType.spirit_calvados',
       message: 'Calvados',
     }),
-  },
-  spirit_cocktail: {
+  }),
+  spirit_cocktail: productType({
     key: 'spirit_cocktail',
-    title: defineMessage({
+    label: defineMessage({
       id: 'validValues.productType.spirit_cocktail',
       message: 'Cocktail',
     }),
-  },
-  spirit_cognac: {
+  }),
+  spirit_cognac: productType({
     key: 'spirit_cognac',
-    title: defineMessage({
+    label: defineMessage({
       id: 'validValues.productType.spirit_cognac',
       message: 'Cognac',
     }),
-  },
-  spirit_fruitspirit: {
+  }),
+  spirit_fruitspirit: productType({
     key: 'spirit_fruitspirit',
-    title: defineMessage({
+    label: defineMessage({
       id: 'validValues.productType.spirit_fruitspirit',
       message: 'Fruit Spirit',
     }),
-  },
-  spirit_genever: {
+  }),
+  spirit_genever: productType({
     key: 'spirit_genever',
-    title: defineMessage({
+    label: defineMessage({
       id: 'validValues.productType.spirit_genever',
       message: 'Genever',
     }),
-  },
-  spirit_gin: {
+  }),
+  spirit_gin: productType({
     key: 'spirit_gin',
-    title: defineMessage({
+    label: defineMessage({
       id: 'validValues.productType.spirit_gin',
       message: 'Gin',
     }),
-  },
-  spirit_grainspirit: {
+  }),
+  spirit_grainspirit: productType({
     key: 'spirit_grainspirit',
-    title: defineMessage({
+    label: defineMessage({
       id: 'validValues.productType.spirit_grainspirit',
       message: 'Grain spirit',
     }),
-  },
-  spirit_grapebrandy: {
+  }),
+  spirit_grapebrandy: productType({
     key: 'spirit_grapebrandy',
-    title: defineMessage({
+    label: defineMessage({
       id: 'validValues.productType.spirit_grapebrandy',
       message: 'Grape Brandy',
     }),
-  },
-  spirit_grappa: {
+  }),
+  spirit_grappa: productType({
     key: 'spirit_grappa',
-    title: defineMessage({
+    label: defineMessage({
       id: 'validValues.productType.spirit_grappa',
       message: 'Grappa',
     }),
-  },
-  spirit_liqueur: {
+  }),
+  spirit_liqueur: productType({
     key: 'spirit_liqueur',
-    title: defineMessage({
+    label: defineMessage({
       id: 'validValues.productType.spirit_liqueur',
       message: 'Liqueurs',
     }),
-  },
-  spirit_marc: {
+  }),
+  spirit_marc: productType({
     key: 'spirit_marc',
-    title: defineMessage({
+    label: defineMessage({
       id: 'validValues.productType.spirit_marc',
       message: 'Marc',
     }),
-  },
-  spirit_mezcal: {
+  }),
+  spirit_mezcal: productType({
     key: 'spirit_mezcal',
-    title: defineMessage({
+    label: defineMessage({
       id: 'validValues.productType.spirit_mezcal',
       message: 'Mezcal',
     }),
-  },
-  spirit_miscspririt: {
+  }),
+  spirit_miscspririt: productType({
     key: 'spirit_miscspririt',
-    title: defineMessage({
+    label: defineMessage({
       id: 'validValues.productType.spirit_miscspririt',
       message: 'Miscellaneous',
     }),
-  },
-  spirit_ouzo: {
+  }),
+  spirit_ouzo: productType({
     key: 'spirit_ouzo',
-    title: defineMessage({
+    label: defineMessage({
       id: 'validValues.productType.spirit_ouzo',
       message: 'Ouzo',
     }),
-  },
-  spirit_pastis: {
+  }),
+  spirit_pastis: productType({
     key: 'spirit_pastis',
-    title: defineMessage({
+    label: defineMessage({
       id: 'validValues.productType.spirit_pastis',
       message: 'Pastis',
     }),
-  },
-  spirit_pisco: {
+  }),
+  spirit_pisco: productType({
     key: 'spirit_pisco',
-    title: defineMessage({
+    label: defineMessage({
       id: 'validValues.productType.spirit_pisco',
       message: 'Pisco',
     }),
-  },
-  spirit_raki: {
+  }),
+  spirit_raki: productType({
     key: 'spirit_raki',
-    title: defineMessage({
+    label: defineMessage({
       id: 'validValues.productType.spirit_raki',
       message: 'Raki',
     }),
-  },
-  spirit_rum: {
+  }),
+  spirit_rum: productType({
     key: 'spirit_rum',
-    title: defineMessage({
+    label: defineMessage({
       id: 'validValues.productType.spirit_rum',
       message: 'Rum',
     }),
-  },
-  spirit_sambuca: {
+  }),
+  spirit_sambuca: productType({
     key: 'spirit_sambuca',
-    title: defineMessage({
+    label: defineMessage({
       id: 'validValues.productType.spirit_sambuca',
       message: 'Sambuca',
     }),
-  },
-  spirit_schnaps: {
+  }),
+  spirit_schnaps: productType({
     key: 'spirit_schnaps',
-    title: defineMessage({
+    label: defineMessage({
       id: 'validValues.productType.spirit_schnaps',
       message: 'Edelbrand/Schnaps',
     }),
-  },
-  spirit_shochu: {
+  }),
+  spirit_shochu: productType({
     key: 'spirit_shochu',
-    title: defineMessage({
+    label: defineMessage({
       id: 'validValues.productType.spirit_shochu',
       message: 'Shochu',
     }),
-  },
-  spirit_tequila: {
+  }),
+  spirit_tequila: productType({
     key: 'spirit_tequila',
-    title: defineMessage({
+    label: defineMessage({
       id: 'validValues.productType.spirit_tequila',
       message: 'Tequila',
     }),
-  },
-  spirit_vermouth: {
+  }),
+  spirit_vermouth: productType({
     key: 'spirit_vermouth',
-    title: defineMessage({
+    label: defineMessage({
       id: 'validValues.productType.spirit_vermouth',
       message: 'Vermouth',
     }),
-  },
-  spirit_vodka: {
+  }),
+  spirit_vodka: productType({
     key: 'spirit_vodka',
-    title: defineMessage({
+    label: defineMessage({
       id: 'validValues.productType.spirit_vodka',
       message: 'Vodka',
     }),
-  },
-  spirit_whisky: {
+  }),
+  spirit_whisky: productType({
     key: 'spirit_whisky',
-    title: defineMessage({
+    label: defineMessage({
       id: 'validValues.productType.spirit_whisky',
       message: 'Whisky',
     }),
-  },
-  wine_aromatized: {
+  }),
+  wine_aromatized: productType({
     key: 'wine_aromatized',
-    title: defineMessage({
+    label: defineMessage({
       id: 'validValues.productType.wine_aromatized',
       message: 'Aromatized wine',
     }),
-  },
-  wine_fortified: {
+  }),
+  wine_fortified: productType({
     key: 'wine_fortified',
-    title: defineMessage({
+    label: defineMessage({
       id: 'validValues.productType.wine_fortified',
       message: 'Fortified wine',
     }),
-  },
-  wine_pearlwine: {
+  }),
+  wine_pearlwine: productType({
     key: 'wine_pearlwine',
-    title: defineMessage({
+    label: defineMessage({
       id: 'validValues.productType.wine_pearlwine',
       message: 'Pearl wine',
     }),
-  },
-  wine_sparkling: {
+  }),
+  wine_sparkling: productType({
     key: 'wine_sparkling',
-    title: defineMessage({
+    label: defineMessage({
       id: 'validValues.productType.wine_sparkling',
       message: 'Sparkling wine',
     }),
-  },
-  wine_stillwine: {
+  }),
+  wine_stillwine: productType({
     key: 'wine_stillwine',
-    title: defineMessage({
+    label: defineMessage({
       id: 'validValues.productType.wine_stillwine',
       message: 'Still wine',
     }),
-  },
-});
+  }),
+} as const;
+
+export type ProductTypeKey = keyof typeof allProductTypes;
+
+export default allProductTypes;

package/src/validValues/productionMethod.ts

@@ -1,102 +1,98 @@
 import { defineMessage } from '@lingui/macro';
-import createValidValues from './utils/createValidValues.js';
 import { ValidValueDefinition } from './types/ValidValueDefinition';
+
 export interface ProductionMethod extends ValidValueDefinition {}
-export default createValidValues<ProductionMethod>({
-  barrelAged: {
+
+/** Makes sure errors are displayed where the error is introduced. */
+const productionMethod = (value: ProductionMethod) => value;
+
+const allProductionMethods = {
+  barrelAged: productionMethod({
     key: 'barrelAged',
-    title: defineMessage({
+    label: defineMessage({
       id: 'validValues.productionMethod.barrelAged',
       message: 'Barrel aged',
     }),
-    form: {},
-  },
-  barrelFermented: {
+  }),
+  barrelFermented: productionMethod({
     key: 'barrelFermented',
-    title: defineMessage({
+    label: defineMessage({
       id: 'validValues.productionMethod.barrelFermented',
       message: 'Barrel fermented',
     }),
-    form: {},
-  },
-  barrelMatured: {
+  }),
+  barrelMatured: productionMethod({
     key: 'barrelMatured',
-    title: defineMessage({
+    label: defineMessage({
       id: 'validValues.productionMethod.barrelMatured',
       message: 'Barrel matured',
     }),
-    form: {},
-  },
-  bottleFermented: {
+  }),
+  bottleFermented: productionMethod({
     key: 'bottleFermented',
-    title: defineMessage({
+    label: defineMessage({
       id: 'validValues.productionMethod.bottleFermented',
       message: 'Bottle fermented',
     }),
-    form: {},
-  },
-  bottleFermentedTraditionalMethod: {
+  }),
+  bottleFermentedTraditionalMethod: productionMethod({
     key: 'bottleFermentedTraditionalMethod',
-    title: defineMessage({
+    label: defineMessage({
       id: 'validValues.productionMethod.bottleFermentedTraditionalMethod',
       message: 'Bottle fermented by the traditional method',
     }),
-    form: {},
-  },
-  caskAged: {
+  }),
+  caskAged: productionMethod({
     key: 'caskAged',
-    title: defineMessage({
+    label: defineMessage({
       id: 'validValues.productionMethod.caskAged',
       message: 'Cask aged',
     }),
-    form: {},
-  },
-  caskFermented: {
+  }),
+  caskFermented: productionMethod({
     key: 'caskFermented',
-    title: defineMessage({
+    label: defineMessage({
       id: 'validValues.productionMethod.caskFermented',
       message: 'Cask fermented',
     }),
-    form: {},
-  },
-  caskMatured: {
+  }),
+  caskMatured: productionMethod({
     key: 'caskMatured',
-    title: defineMessage({
+    label: defineMessage({
       id: 'validValues.productionMethod.caskMatured',
       message: 'Cask matured',
     }),
-    form: {},
-  },
-  classicalMethod: {
+  }),
+  classicalMethod: productionMethod({
     key: 'classicalMethod',
-    title: defineMessage({
+    label: defineMessage({
       id: 'validValues.productionMethod.classicalMethod',
       message: 'Classical method',
     }),
-    form: {},
-  },
-  classicalTraditionalMethod: {
+  }),
+  classicalTraditionalMethod: productionMethod({
     key: 'classicalTraditionalMethod',
-    title: defineMessage({
+    label: defineMessage({
       id: 'validValues.productionMethod.classicalTraditionalMethod',
       message: 'Classical traditional method',
     }),
-    form: {},
-  },
-  cremant: {
+  }),
+  cremant: productionMethod({
     key: 'cremant',
-    title: defineMessage({
+    label: defineMessage({
       id: 'validValues.productionMethod.cremant',
       message: 'Crémant',
     }),
-    form: {},
-  },
-  traditionalMethod: {
+  }),
+  traditionalMethod: productionMethod({
     key: 'traditionalMethod',
-    title: defineMessage({
+    label: defineMessage({
       id: 'validValues.productionMethod.traditionalMethod',
       message: 'Traditional method',
     }),
-    form: {},
-  },
-});
+  }),
+} as const;
+
+export type ProductionMethodKey = keyof typeof allProductionMethods;
+
+export default allProductionMethods;