@bottlebooks/valid-values 2.0.1 → 3.0.0

package/dist/validValues/wineColor.d.ts

@@ -1,23 +1,12 @@
 import { ValidValueDefinition } from './types/ValidValueDefinition';
 export interface WineColor extends ValidValueDefinition {
 }
-declare const _default: {
-    list: ({
-        id: string;
-    } & WineColor & {
-        getTitle: (locale?: "bg" | "cs" | "da" | "de" | "el" | "en" | "es" | "ee" | "fi" | "fr" | "ga" | "hr" | "hu" | "it" | "lt" | "lv" | "mt" | "nl" | "pl" | "pt" | "ro" | "sk" | "se" | "si" | undefined) => string;
-        getTitles(locales?: ("bg" | "cs" | "da" | "de" | "el" | "en" | "es" | "ee" | "fi" | "fr" | "ga" | "hr" | "hu" | "it" | "lt" | "lv" | "mt" | "nl" | "pl" | "pt" | "ro" | "sk" | "se" | "si")[]): Record<"bg" | "cs" | "da" | "de" | "el" | "en" | "es" | "ee" | "fi" | "fr" | "ga" | "hr" | "hu" | "it" | "lt" | "lv" | "mt" | "nl" | "pl" | "pt" | "ro" | "sk" | "se" | "si", string>;
-        form: {} | undefined;
-    })[];
-    byId: () => {
-        [k: string]: {
-            id: string;
-        } & WineColor & {
-            getTitle: (locale?: "bg" | "cs" | "da" | "de" | "el" | "en" | "es" | "ee" | "fi" | "fr" | "ga" | "hr" | "hu" | "it" | "lt" | "lv" | "mt" | "nl" | "pl" | "pt" | "ro" | "sk" | "se" | "si" | undefined) => string;
-            getTitles(locales?: ("bg" | "cs" | "da" | "de" | "el" | "en" | "es" | "ee" | "fi" | "fr" | "ga" | "hr" | "hu" | "it" | "lt" | "lv" | "mt" | "nl" | "pl" | "pt" | "ro" | "sk" | "se" | "si")[]): Record<"bg" | "cs" | "da" | "de" | "el" | "en" | "es" | "ee" | "fi" | "fr" | "ga" | "hr" | "hu" | "it" | "lt" | "lv" | "mt" | "nl" | "pl" | "pt" | "ro" | "sk" | "se" | "si", string>;
-            form: {} | undefined;
-        };
-    };
+declare const allWineColors: {
+    readonly orange: WineColor;
+    readonly red: WineColor;
+    readonly rose: WineColor;
+    readonly white: WineColor;
 };
-export default _default;
+export declare type WineColorKey = keyof typeof allWineColors;
+export default allWineColors;
 //# sourceMappingURL=wineColor.d.ts.map

package/dist/validValues/wineColor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wineColor.d.ts","sourceRoot":"","sources":["../../src/validValues/wineColor.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,MAAM,WAAW,SAAU,SAAQ,oBAAoB;CAAG;;;;;;;;;;;;;;;;;;;AAC1D,wBAiCG"}
+{"version":3,"file":"wineColor.d.ts","sourceRoot":"","sources":["../../src/validValues/wineColor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAEpE,MAAM,WAAW,SAAU,SAAQ,oBAAoB;CAAG;AAK1D,QAAA,MAAM,aAAa;;;;;CA6BT,CAAC;AAEX,oBAAY,YAAY,GAAG,MAAM,OAAO,aAAa,CAAC;AAEtD,eAAe,aAAa,CAAC"}

package/dist/validValues/wineColor.js

@@ -3,55 +3,52 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports["default"] = void 0;
 
 var _core = require("@lingui/core");
 
-var _createValidValues = _interopRequireDefault(require("./utils/createValidValues.js"));
+/** Makes sure errors are displayed where the error is introduced. */
+var wineColor = function wineColor(value) {
+  return value;
+};
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-var _default = (0, _createValidValues.default)({
-  orange: {
+var allWineColors = {
+  orange: wineColor({
     key: 'orange',
-    title:
+    label:
     /*i18n*/
     {
       id: 'validValues.wineColor.orange',
       message: 'Orange'
-    },
-    form: {}
-  },
-  red: {
+    }
+  }),
+  red: wineColor({
     key: 'red',
-    title:
+    label:
     /*i18n*/
     {
       id: 'validValues.wineColor.red',
       message: 'Red'
-    },
-    form: {}
-  },
-  rose: {
+    }
+  }),
+  rose: wineColor({
     key: 'rose',
-    title:
+    label:
     /*i18n*/
     {
       id: 'validValues.wineColor.rose',
       message: 'Rosé'
-    },
-    form: {}
-  },
-  white: {
+    }
+  }),
+  white: wineColor({
     key: 'white',
-    title:
+    label:
     /*i18n*/
     {
       id: 'validValues.wineColor.white',
       message: 'White'
-    },
-    form: {}
-  }
-});
-
-exports.default = _default;
+    }
+  })
+};
+var _default = allWineColors;
+exports["default"] = _default;

package/dist/validValues/wineType.d.ts

@@ -1,23 +1,12 @@
 import { ValidValueDefinition } from './types/ValidValueDefinition';
 export interface WineType extends ValidValueDefinition {
 }
-declare const _default: {
-    list: ({
-        id: string;
-    } & WineType & {
-        getTitle: (locale?: "bg" | "cs" | "da" | "de" | "el" | "en" | "es" | "ee" | "fi" | "fr" | "ga" | "hr" | "hu" | "it" | "lt" | "lv" | "mt" | "nl" | "pl" | "pt" | "ro" | "sk" | "se" | "si" | undefined) => string;
-        getTitles(locales?: ("bg" | "cs" | "da" | "de" | "el" | "en" | "es" | "ee" | "fi" | "fr" | "ga" | "hr" | "hu" | "it" | "lt" | "lv" | "mt" | "nl" | "pl" | "pt" | "ro" | "sk" | "se" | "si")[]): Record<"bg" | "cs" | "da" | "de" | "el" | "en" | "es" | "ee" | "fi" | "fr" | "ga" | "hr" | "hu" | "it" | "lt" | "lv" | "mt" | "nl" | "pl" | "pt" | "ro" | "sk" | "se" | "si", string>;
-        form: {} | undefined;
-    })[];
-    byId: () => {
-        [k: string]: {
-            id: string;
-        } & WineType & {
-            getTitle: (locale?: "bg" | "cs" | "da" | "de" | "el" | "en" | "es" | "ee" | "fi" | "fr" | "ga" | "hr" | "hu" | "it" | "lt" | "lv" | "mt" | "nl" | "pl" | "pt" | "ro" | "sk" | "se" | "si" | undefined) => string;
-            getTitles(locales?: ("bg" | "cs" | "da" | "de" | "el" | "en" | "es" | "ee" | "fi" | "fr" | "ga" | "hr" | "hu" | "it" | "lt" | "lv" | "mt" | "nl" | "pl" | "pt" | "ro" | "sk" | "se" | "si")[]): Record<"bg" | "cs" | "da" | "de" | "el" | "en" | "es" | "ee" | "fi" | "fr" | "ga" | "hr" | "hu" | "it" | "lt" | "lv" | "mt" | "nl" | "pl" | "pt" | "ro" | "sk" | "se" | "si", string>;
-            form: {} | undefined;
-        };
-    };
+declare const allWineTypes: {
+    readonly fortified: WineType;
+    readonly pearlwine: WineType;
+    readonly sparkling: WineType;
+    readonly wine: WineType;
 };
-export default _default;
+export declare type WineTypeKey = keyof typeof allWineTypes;
+export default allWineTypes;
 //# sourceMappingURL=wineType.d.ts.map

package/dist/validValues/wineType.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wineType.d.ts","sourceRoot":"","sources":["../../src/validValues/wineType.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,MAAM,WAAW,QAAS,SAAQ,oBAAoB;CAAG;;;;;;;;;;;;;;;;;;;AACzD,wBAiCG"}
+{"version":3,"file":"wineType.d.ts","sourceRoot":"","sources":["../../src/validValues/wineType.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAEpE,MAAM,WAAW,QAAS,SAAQ,oBAAoB;CAAG;AAKzD,QAAA,MAAM,YAAY;;;;;CA6BR,CAAC;AAEX,oBAAY,WAAW,GAAG,MAAM,OAAO,YAAY,CAAC;AAEpD,eAAe,YAAY,CAAC"}

package/dist/validValues/wineType.js

@@ -3,55 +3,52 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports["default"] = void 0;
 
 var _core = require("@lingui/core");
 
-var _createValidValues = _interopRequireDefault(require("./utils/createValidValues.js"));
+/** Makes sure errors are displayed where the error is introduced. */
+var wineType = function wineType(value) {
+  return value;
+};
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-var _default = (0, _createValidValues.default)({
-  fortified: {
+var allWineTypes = {
+  fortified: wineType({
     key: 'fortified',
-    title:
+    label:
     /*i18n*/
     {
       id: 'validValues.wineType.fortified',
       message: 'Fortified'
-    },
-    form: {}
-  },
-  pearlwine: {
+    }
+  }),
+  pearlwine: wineType({
     key: 'pearlwine',
-    title:
+    label:
     /*i18n*/
     {
       id: 'validValues.wineType.pearlwine',
       message: 'Pearl wine'
-    },
-    form: {}
-  },
-  sparkling: {
+    }
+  }),
+  sparkling: wineType({
     key: 'sparkling',
-    title:
+    label:
     /*i18n*/
     {
       id: 'validValues.wineType.sparkling',
       message: 'Sparkling wine'
-    },
-    form: {}
-  },
-  wine: {
+    }
+  }),
+  wine: wineType({
     key: 'wine',
-    title:
+    label:
     /*i18n*/
     {
       id: 'validValues.wineType.wine',
       message: 'Still wine'
-    },
-    form: {}
-  }
-});
-
-exports.default = _default;
+    }
+  })
+};
+var _default = allWineTypes;
+exports["default"] = _default;

package/dist/validValues.js

@@ -6,115 +6,115 @@ Object.defineProperty(exports, "__esModule", {
 Object.defineProperty(exports, "award", {
   enumerable: true,
   get: function get() {
-    return _award.default;
+    return _award["default"];
   }
 });
 Object.defineProperty(exports, "awardMedal", {
   enumerable: true,
   get: function get() {
-    return _awardMedal.default;
+    return _awardMedal["default"];
   }
 });
 Object.defineProperty(exports, "beerStyle", {
   enumerable: true,
   get: function get() {
-    return _beerStyle.default;
+    return _beerStyle["default"];
   }
 });
 Object.defineProperty(exports, "certification", {
   enumerable: true,
   get: function get() {
-    return _certification.default;
+    return _certification["default"];
   }
 });
 Object.defineProperty(exports, "containerColor", {
   enumerable: true,
   get: function get() {
-    return _containerColor.default;
+    return _containerColor["default"];
   }
 });
 Object.defineProperty(exports, "containerType", {
   enumerable: true,
   get: function get() {
-    return _containerType.default;
+    return _containerType["default"];
   }
 });
 Object.defineProperty(exports, "country", {
   enumerable: true,
   get: function get() {
-    return _country.default;
+    return _country["default"];
   }
 });
 Object.defineProperty(exports, "designation", {
   enumerable: true,
   get: function get() {
-    return _designation.default;
+    return _designation["default"];
   }
 });
 Object.defineProperty(exports, "ingredient", {
   enumerable: true,
   get: function get() {
-    return _ingredient.default;
+    return _ingredient["default"];
   }
 });
 Object.defineProperty(exports, "packagingCertification", {
   enumerable: true,
   get: function get() {
-    return _packagingCertification.default;
+    return _packagingCertification["default"];
   }
 });
 Object.defineProperty(exports, "packagingMaterialType", {
   enumerable: true,
   get: function get() {
-    return _packagingMaterialType.default;
+    return _packagingMaterialType["default"];
   }
 });
 Object.defineProperty(exports, "productType", {
   enumerable: true,
   get: function get() {
-    return _productType.default;
+    return _productType["default"];
   }
 });
 Object.defineProperty(exports, "productionMethod", {
   enumerable: true,
   get: function get() {
-    return _productionMethod.default;
+    return _productionMethod["default"];
   }
 });
 Object.defineProperty(exports, "region", {
   enumerable: true,
   get: function get() {
-    return _region.default;
+    return _region["default"];
   }
 });
 Object.defineProperty(exports, "responsibleConsumptionLogo", {
   enumerable: true,
   get: function get() {
-    return _responsibleConsumptionLogo.default;
+    return _responsibleConsumptionLogo["default"];
   }
 });
 Object.defineProperty(exports, "subregion", {
   enumerable: true,
   get: function get() {
-    return _subregion.default;
+    return _subregion["default"];
   }
 });
 Object.defineProperty(exports, "varietyName", {
   enumerable: true,
   get: function get() {
-    return _varietyName.default;
+    return _varietyName["default"];
   }
 });
 Object.defineProperty(exports, "wineColor", {
   enumerable: true,
   get: function get() {
-    return _wineColor.default;
+    return _wineColor["default"];
   }
 });
 Object.defineProperty(exports, "wineType", {
   enumerable: true,
   get: function get() {
-    return _wineType.default;
+    return _wineType["default"];
   }
 });
 
@@ -156,4 +156,4 @@ var _wineColor = _interopRequireDefault(require("./validValues/wineColor.js"));
 
 var _wineType = _interopRequireDefault(require("./validValues/wineType.js"));
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }

package/lingui.config.ts

@@ -36,6 +36,10 @@ const config = {
     },
   ],
   format: 'po',
+  formatOptions: {
+    origins: true,
+    lineNumbers: false,
+  },
   compileNamespace: 'ts',
   sourceLocale: 'en',
   fallbackLocales: {

package/package.json

@@ -2,7 +2,7 @@
   "name": "@bottlebooks/valid-values",
   "description": "The Bottlebooks lookup values, defined globally.",
   "private": false,
-  "version": "2.0.1",
+  "version": "3.0.0",
   "type": "commonjs",
   "main": "dist/index.js",
   "scripts": {
@@ -32,5 +32,5 @@
     "@babel/core": "^7.15.5",
     "@lingui/core": "3.14.0"
   },
-  "gitHead": "1f06441e816dbac439bd78631d10bb5e233d388c"
+  "gitHead": "a703f01a81999640d4b57e7c9c3ccefca159a902"
 }

package/src/core/translate.ts

@@ -1,6 +1,7 @@
-import { i18n, MessageDescriptor } from '@lingui/core';
+import { i18n } from '@lingui/core';
+import { BottlebooksValidValueTitle } from '../validValues/types/ValidValueDefinition';
 
-export function translate(title: MessageDescriptor | string, locale: string) {
+export function translate(title: BottlebooksValidValueTitle, locale?: string) {
   // if (typeof title === 'string') {
   //   return title;
   // }
@@ -13,11 +14,11 @@ export function translate(title: MessageDescriptor | string, locale: string) {
     return '';
   }
 
-  i18n.activate(locale);
+  i18n.activate(locale || 'en');
 
   const translation = i18n._(messageId);
-  if (translation === messageId) {
-    if (messageId.includes('validValues.')) {
+  if (translation === messageId && messageId.includes('.validvalues.')) {
+    if (messageId.startsWith('validValues.')) {
       console.log(
         '%c' + `ERROR: translation_missing:${messageId}:${locale}`,
         'color: #d0011b;'

package/src/index.ts

@@ -1,6 +1,9 @@
-import { i18n, MessageDescriptor } from '@lingui/core';
 import { allLocaleData } from './locales/locales.js';
+import loadLocalizedData from './validValues/utils/loadLocalizedData.js';
 export { translate } from './core/translate';
 // This enables tree-shaking
 export * from './validValues';
 export const allSupportedLocales = Object.keys(allLocaleData);
+
+loadLocalizedData();
+export type Locale = keyof typeof allLocaleData;