@bottlebooks/valid-values 3.1.0 → 4.0.0

package/dist/validValues/wineType/locales/ro.js

@@ -0,0 +1,15 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.messages = void 0;
+
+/*eslint-disable*/
+var messages = {
+  "validValues.wineType.fortified": "Vin alcoolizat",
+  "validValues.wineType.pearlwine": "Vin de perlă",
+  "validValues.wineType.sparkling": "Vin spumant",
+  "validValues.wineType.wine": "Vin liniștit"
+};
+exports.messages = messages;

package/dist/validValues/wineType/locales/se.d.js

@@ -0,0 +1,5 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/dist/validValues/wineType/locales/se.d.ts

@@ -0,0 +1,7 @@
+export declare const messages: {
+    "validValues.wineType.fortified": string;
+    "validValues.wineType.pearlwine": string;
+    "validValues.wineType.sparkling": string;
+    "validValues.wineType.wine": string;
+};
+//# sourceMappingURL=se.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"se.d.ts","sourceRoot":"","sources":["../../../../src/validValues/wineType/locales/se.ts"],"names":[],"mappings":"AAAkB,eAAO,MAAM,QAAQ;;;;;CAAgL,CAAC"}

package/dist/validValues/wineType/locales/se.js

@@ -0,0 +1,15 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.messages = void 0;
+
+/*eslint-disable*/
+var messages = {
+  "validValues.wineType.fortified": "Stärkt vin",
+  "validValues.wineType.pearlwine": "Pärlvin",
+  "validValues.wineType.sparkling": "Mousserande vin",
+  "validValues.wineType.wine": "Vin"
+};
+exports.messages = messages;

package/dist/validValues/wineType/locales/si.d.js

@@ -0,0 +1,5 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/dist/validValues/wineType/locales/si.d.ts

@@ -0,0 +1,7 @@
+export declare const messages: {
+    "validValues.wineType.fortified": string;
+    "validValues.wineType.pearlwine": string;
+    "validValues.wineType.sparkling": string;
+    "validValues.wineType.wine": string;
+};
+//# sourceMappingURL=si.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"si.d.ts","sourceRoot":"","sources":["../../../../src/validValues/wineType/locales/si.ts"],"names":[],"mappings":"AAAkB,eAAO,MAAM,QAAQ;;;;;CAAuL,CAAC"}

package/dist/validValues/wineType/locales/si.js

@@ -0,0 +1,15 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.messages = void 0;
+
+/*eslint-disable*/
+var messages = {
+  "validValues.wineType.fortified": "Okrepljeno vino",
+  "validValues.wineType.pearlwine": "Biserno vino",
+  "validValues.wineType.sparkling": "Peneče vino",
+  "validValues.wineType.wine": "Vino"
+};
+exports.messages = messages;

package/dist/validValues/wineType/locales/sk.d.js

@@ -0,0 +1,5 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/dist/validValues/wineType/locales/sk.d.ts

@@ -0,0 +1,7 @@
+export declare const messages: {
+    "validValues.wineType.fortified": string;
+    "validValues.wineType.pearlwine": string;
+    "validValues.wineType.sparkling": string;
+    "validValues.wineType.wine": string;
+};
+//# sourceMappingURL=sk.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"sk.d.ts","sourceRoot":"","sources":["../../../../src/validValues/wineType/locales/sk.ts"],"names":[],"mappings":"AAAkB,eAAO,MAAM,QAAQ;;;;;CAA2L,CAAC"}

package/dist/validValues/wineType/locales/sk.js

@@ -0,0 +1,15 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.messages = void 0;
+
+/*eslint-disable*/
+var messages = {
+  "validValues.wineType.fortified": "Opevnené víno",
+  "validValues.wineType.pearlwine": "Perlové víno",
+  "validValues.wineType.sparkling": "Šumivé víno",
+  "validValues.wineType.wine": "Tiché víno"
+};
+exports.messages = messages;

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

@@ -0,0 +1,12 @@
+import { ValidValueDefinition } from '../types/ValidValueDefinition';
+export interface WineType extends ValidValueDefinition {
+}
+declare const allWineTypes: {
+    readonly fortified: WineType;
+    readonly pearlwine: WineType;
+    readonly sparkling: WineType;
+    readonly wine: WineType;
+};
+export declare type WineTypeKey = keyof typeof allWineTypes;
+export default allWineTypes;
+//# sourceMappingURL=wineType.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"wineType.d.ts","sourceRoot":"","sources":["../../../src/validValues/wineType/wineType.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AAErE,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/wineType.js

@@ -0,0 +1,54 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _core = require("@lingui/core");
+
+/** Makes sure errors are displayed where the error is introduced. */
+var wineType = function wineType(value) {
+  return value;
+};
+
+var allWineTypes = {
+  fortified: wineType({
+    key: 'fortified',
+    label:
+    /*i18n*/
+    {
+      id: 'validValues.wineType.fortified',
+      message: 'Fortified'
+    }
+  }),
+  pearlwine: wineType({
+    key: 'pearlwine',
+    label:
+    /*i18n*/
+    {
+      id: 'validValues.wineType.pearlwine',
+      message: 'Pearl wine'
+    }
+  }),
+  sparkling: wineType({
+    key: 'sparkling',
+    label:
+    /*i18n*/
+    {
+      id: 'validValues.wineType.sparkling',
+      message: 'Sparkling wine'
+    }
+  }),
+  wine: wineType({
+    key: 'wine',
+    label:
+    /*i18n*/
+    {
+      id: 'validValues.wineType.wine',
+      message: 'Still wine'
+    }
+  })
+};
+var _default = allWineTypes;
+exports["default"] = _default;

package/dist/validValues.d.ts

@@ -1,20 +1,20 @@
-export { default as award } from './validValues/award';
-export { default as awardMedal } from './validValues/awardMedal';
-export { default as beerStyle } from './validValues/beerStyle.js';
-export { default as certification } from './validValues/certification.js';
-export { default as containerType } from './validValues/containerType.js';
-export { default as containerColor } from './validValues/containerColor.js';
-export { default as country } from './validValues/country.js';
-export { default as designation } from './validValues/designation.js';
-export { default as ingredient } from './validValues/ingredient.js';
-export { default as packagingCertification } from './validValues/packagingCertification.js';
-export { default as packagingMaterialType } from './validValues/packagingMaterialType';
-export { default as productionMethod } from './validValues/productionMethod.js';
-export { default as productType } from './validValues/productType.js';
-export { default as region } from './validValues/region.js';
-export { default as responsibleConsumptionLogo } from './validValues/responsibleConsumptionLogo';
-export { default as subregion } from './validValues/subregion.js';
-export { default as varietyName } from './validValues/varietyName.js';
-export { default as wineColor } from './validValues/wineColor.js';
-export { default as wineType } from './validValues/wineType.js';
+export { default as award } from './validValues/award/award';
+export { default as awardMedal } from './validValues/awardMedal/awardMedal';
+export { default as beerStyle } from './validValues/beerStyle/beerStyle';
+export { default as certification } from './validValues/certification/certification';
+export { default as containerType } from './validValues/containerType/containerType';
+export { default as containerColor } from './validValues/containerColor/containerColor';
+export { default as country } from './validValues/country/country';
+export { default as designation } from './validValues/designation/designation';
+export { default as ingredient } from './validValues/ingredient/ingredient';
+export { default as packagingCertification } from './validValues/packagingCertification/packagingCertification';
+export { default as packagingMaterialType } from './validValues/packagingMaterialType/packagingMaterialType';
+export { default as productionMethod } from './validValues/productionMethod/productionMethod';
+export { default as productType } from './validValues/productType/productType';
+export { default as region } from './validValues/region/region';
+export { default as responsibleConsumptionLogo } from './validValues/responsibleConsumptionLogo/responsibleConsumptionLogo';
+export { default as subregion } from './validValues/subregion/subregion';
+export { default as varietyName } from './validValues/varietyName/varietyName';
+export { default as wineColor } from './validValues/wineColor/wineColor';
+export { default as wineType } from './validValues/wineType/wineType';
 //# sourceMappingURL=validValues.d.ts.map

package/dist/validValues.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validValues.d.ts","sourceRoot":"","sources":["../src/validValues.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,IAAI,KAAK,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAAE,OAAO,IAAI,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC1E,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC1E,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAC5E,OAAO,EAAE,OAAO,IAAI,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,8BAA8B,CAAC;AACtE,OAAO,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACpE,OAAO,EAAE,OAAO,IAAI,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AAC5F,OAAO,EAAE,OAAO,IAAI,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AACvF,OAAO,EAAE,OAAO,IAAI,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAChF,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,8BAA8B,CAAC;AACtE,OAAO,EAAE,OAAO,IAAI,MAAM,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,OAAO,IAAI,0BAA0B,EAAE,MAAM,0CAA0C,CAAC;AACjG,OAAO,EAAE,OAAO,IAAI,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,8BAA8B,CAAC;AACtE,OAAO,EAAE,OAAO,IAAI,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,EAAE,OAAO,IAAI,QAAQ,EAAE,MAAM,2BAA2B,CAAC"}
+{"version":3,"file":"validValues.d.ts","sourceRoot":"","sources":["../src/validValues.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,IAAI,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,qCAAqC,CAAC;AAC5E,OAAO,EAAE,OAAO,IAAI,SAAS,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,2CAA2C,CAAC;AACrF,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,2CAA2C,CAAC;AACrF,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,6CAA6C,CAAC;AACxF,OAAO,EAAE,OAAO,IAAI,OAAO,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,qCAAqC,CAAC;AAC5E,OAAO,EAAE,OAAO,IAAI,sBAAsB,EAAE,MAAM,6DAA6D,CAAC;AAChH,OAAO,EAAE,OAAO,IAAI,qBAAqB,EAAE,MAAM,2DAA2D,CAAC;AAC7G,OAAO,EAAE,OAAO,IAAI,gBAAgB,EAAE,MAAM,iDAAiD,CAAC;AAC9F,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,EAAE,OAAO,IAAI,MAAM,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,OAAO,IAAI,0BAA0B,EAAE,MAAM,qEAAqE,CAAC;AAC5H,OAAO,EAAE,OAAO,IAAI,SAAS,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,EAAE,OAAO,IAAI,SAAS,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,OAAO,IAAI,QAAQ,EAAE,MAAM,iCAAiC,CAAC"}

package/dist/validValues.js

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

package/lingui.config.ts

@@ -27,11 +27,18 @@ const config = {
   ],
   catalogs: [
     {
-      path: '<rootDir>/src/locales/po/{locale}',
-      include: ['<rootDir>/src/'],
+      path: '<rootDir>/src/validValues/{name}/locales/{locale}',
+      include: ['<rootDir>/src/validValues/{name}'],
       exclude: [
-        '<rootDir>/src/validValues/regionNew.ts',
+        // Valid values that don't have any localizable strings
+        '<rootDir>/src/validValues/award/**',
+        '<rootDir>/src/validValues/certification/**',
+        '<rootDir>/src/validValues/varietyName/**',
+        '<rootDir>/src/validValues/locales.ts',
+
         '<rootDir>/src/validValues/json/**',
+        '<rootDir>/src/validValues/types/**',
+        '<rootDir>/src/validValues/utils/**',
       ],
     },
   ],

package/package.json

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

package/scripts/convertClassicValidValuesToCurrent.ts

@@ -0,0 +1,74 @@
+import fs from 'fs';
+import z from 'zod';
+
+/**
+ * This script takes valid value files from classic and converts them to a single key-value object per language.
+ * It also adjusts the keys to be compatible with the new valid values structure. (validValues.[category].[key])
+ *
+ * This requires ts-node to run. prowein-datamapping can use this script.
+ * The command to invoke it is:
+ *         "convertClassicValidValuesToCurrent": "ts-node --skipProject ./scripts/convertClassicValidValuesToCurrent.ts",
+ */
+async function convertClassicValidValuesToCurrent() {
+  const validValues = await loadValidValuesFromServer();
+  // Unwind and combined contents of languages
+  const validValuesArray = Object.entries(validValues).reduce(
+    (acc, [category, value]: [string, any]) => {
+      Object.entries(value).forEach(([language, literals]) => {
+        // @ts-ignore
+        const convertedLiterals = Object.entries(literals).reduce(
+          (acc, [key, value]) => {
+            const newKey = `validValues.${category}.${key}`;
+            acc[newKey] = value;
+            return acc;
+          },
+          {} as Record<string, any>
+        );
+        acc[language] = { ...acc[language], ...convertedLiterals };
+      });
+      return acc;
+    },
+    {} as Record<string, any>
+  );
+
+  // Output each language to a file
+  Object.entries(validValuesArray).forEach(([language, literals]) => {
+    const output = `${JSON.stringify(literals)}`;
+    fs.writeFileSync(`./scripts/out/${language}.json`, output);
+  });
+}
+
+extractValidValues();
+
+async function loadValidValuesFromServer() {
+  const { default: fetch } = await import('node-fetch');
+
+  const response = await fetch(
+    'https://app.bottlebooks.me/ajax/common/validvalues',
+    {
+      method: 'GET',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+    }
+  );
+  const result = await response.json();
+  return schema.parse(result);
+}
+
+const localizedValidValue = z.object({
+  en_US: z.any(),
+  de_DE: z.any(),
+  fr_FR: z.any(),
+  sk_SK: z.any(),
+  it_IT: z.any(),
+  es_ES: z.any(),
+  pt_PT: z.any(),
+});
+
+// Specify which categories to extract
+const schema = z.object({
+  designation: localizedValidValue,
+  wineColor: localizedValidValue,
+  wineType: localizedValidValue,
+});

package/src/__tests__/translate.test.js

@@ -0,0 +1,18 @@
+const { translate, allSupportedLocales } = require('../../dist/index');
+describe('validValues translate', () => {
+  jest.setTimeout(30000);
+  process.env.NODE_ENV = 'unittestenv';
+  it('ingredients', async () => {
+    // const translations = allSupportedLocales.reduce((acc, locale) => {
+    //   acc[locale] = translate('validValues.ingredient.grape', locale);
+    //   return acc;
+    // }, {});
+    for (const locale of allSupportedLocales) {
+      const t = translate('validValues.ingredient.grape', locale);
+      expect(t.includes('validValues')).toBeFalsy();
+      expect(t).not.toEqual(
+        translate('validValues.ingredient.grape', locale === 'en' ? 'pt' : 'en')
+      );
+    }
+  });
+});

package/src/index.ts

@@ -1,5 +1,5 @@
-import { allLocaleData } from './locales/locales.js';
-import loadLocalizedData from './validValues/utils/loadLocalizedData.js';
+import { allLocaleData } from './validValues/locales';
+import loadLocalizedData from './validValues/utils/loadLocalizedData';
 export { translate } from './core/translate';
 // This enables tree-shaking
 export * from './validValues';