@bottlebooks/valid-values 2.1.0 → 3.1.0

package/src/main.ts

@@ -1,40 +1,33 @@
-import createValidValues from './validValues/utils/createValidValues.js';
 import './style.css';
 import * as validValues from './validValues.js';
-import { designation } from './validValues.js';
 import { translate } from './core/translate';
-import { MessageDescriptor } from '@lingui/core';
+import loadLocalizedData from './validValues/utils/loadLocalizedData';
+
+loadLocalizedData();
 
 document.querySelector<HTMLDivElement>('#app')!.innerHTML = `
   <div>
     <h1>ValidValues</h1>
     ${Object.entries(validValues)
       .map(([validValueCategory, values]) => {
-        const list = values.list as ReturnType<
-          typeof createValidValues
-        >['list'];
+        const list = Object.values(values);
         let content: string = `<h2>${validValueCategory}</h2>`;
-        // if (['designation'].includes(validValueCategory)) {
-        //   return '';
-        // }
+
         return `${content}
           <pre>${list.map((item, i) => {
-            const { key, title, form } = item;
-            // const message = { id: item.id } as MessageDescriptor;
+            //@ts-ignore
+            const { label, data } = item;
             return i === 0
               ? JSON.stringify(
                   {
                     // @ts-ignore
                     id: item.id,
-                    'title(en)': translate(title, 'en'),
-                    'title(de)': translate(title, 'de'),
-                    // titles: item.getTitles(['de', 'en', 'es', 'fr']),
+                    'title(en)': translate(label, 'en'),
+                    'title(de)': translate(label, 'de'),
                     ...item,
-                    form: item.form
-                      ? item.form && {
-                          ...item.form,
-                          // 'description(en)': item.form?.getDescription('en'),
-                          // 'description(de)': item.form?.getDescription('de'),
+                    data: data
+                      ? data && {
+                          ...data,
                         }
                       : null,
                   },
@@ -44,10 +37,6 @@ document.querySelector<HTMLDivElement>('#app')!.innerHTML = `
               : '';
           })}</pre>
           `;
-
-        return `<h2>${validValueCategory}</h2>
-          <pre>${JSON.stringify(values, undefined, 2)}</pre>
-        `;
       })
       .join('')}</pre></code>
   </div>

package/src/scripts/transformArchitectureVV.js

@@ -5,43 +5,47 @@ const all = {
   // awards: {
   //   _json: require('../../../../bottlebooks-server/architecture/validvalues/validvalues/awards.json'),
   //   _mapping: { medals: mappings['awards-awardsMedals'] },
-  //   props: { addForm: false },
+  //   props: { addMetadata: false },
   // },
   // awardsMedals: {
   //   _json: require('../../../../bottlebooks-server/architecture/validvalues/validvalues/awardsMedals.json'),
-  //   props: { addForm: false },
+  //   props: { addMetadata: false },
   // },
   // wineColor: {
   //   _json: require('../../../../bottlebooks-server/architecture/validvalues/validvalues/wineColor.json'),
-  //   props: { addForm: false },
+  //   props: { addMetadata: false },
   // },
   // wineType: {
   //   _json: require('../../../../bottlebooks-server/architecture/validvalues/validvalues/wineType.json'),
-  //   props: { addForm: false },
+  //   props: { addMetadata: false },
   // },
   // designation: require('../../../../bottlebooks-server/architecture/validvalues/validvalues/designation.json'),
   // country: {
   //   _json: require('../../../../bottlebooks-server/architecture/validvalues/validvalues/country.json'),
   //   _mapping: { regions: mappings['country-appelation'] },
-  //   props: { addForm: false },
+  //   props: { addMetadata: false },
   // },
   // region: {
   //   _json: require('../../../../bottlebooks-server/architecture/validvalues/validvalues/appelation'),
   //   _mapping: { subregions: mappings['appelation-subregion'] },
-  //   props: { addForm: true },
+  //   props: { addMetadata: true },
   // },
   // subregion: {
   //   _json: require('../../../../bottlebooks-server/architecture/validvalues/validvalues/subregion'),
-  //   props: { addForm: true },
+  //   props: { addMetadata: true },
   // },
   // beerStyle: {
   //   _json: require('../../../../bottlebooks-server/architecture/validvalues/validvalues/beerStyle.json'),
-  //   props: { addForm: false },
+  //   props: { addMetadata: false },
   // },
   // varietyName: {
   //   _json: require('../../../../bottlebooks-server/architecture/validvalues/validvalues/grapes.json'),
-  //   props: { addForm: false },
+  //   props: { addMetadata: false },
   // },
+  aromas: {
+    _json: require('../../../../bottlebooks-server/architecture/validvalues/validvalues/aromas.json'),
+    props: { addMetadata: false },
+  },
 };
 module.exports = extractAll;
 
@@ -50,14 +54,14 @@ function extractAll() {
     .sort()
     .map(([validValueCategory, vv]) => {
       const _mapping = vv._mapping;
-      let addForm = true;
+      let addMetadata = true;
       const withoutTranslations = ['varietyName', 'awards'].find(
         (category) => category === validValueCategory
       );
       const keyIsTitle = ['varietyName'].includes(validValueCategory);
       if (vv._json) {
         vv = vv._json;
-        addForm = vv.props?.addForm;
+        addMetadata = vv.props?.addMetadata;
       }
       const i18n = {};
       const _all = vv._all || {};
@@ -85,32 +89,27 @@ function extractAll() {
           .sort()
           .reduce((acc, key) => {
             const newKey = `validValues.${validValueCategory}.${key}`;
-            const title = oneLocaleValidValues[key];
+            const localizedValue = oneLocaleValidValues[key];
             i18n[locale] = i18n[locale] || {};
-            i18n[locale][newKey] = title;
+            i18n[locale][newKey] = localizedValue;
             if (locale === 'en') {
               const logo = null;
               let newValidValue = {
                 key,
-                title: {
+                label: {
                   id: newKey,
-                  message: title,
+                  message: localizedValue,
                 },
-                frontend: logo ? { logo } : undefined,
-                form: addForm
-                  ? {
-                      tags: [],
-                      productType: [],
-                      //
-                      // description:
-                      //   // 'defineMessage(' +
-                      //   {
-                      //     comment: 'Description for ingredient, used in edit forms.',
-                      //     message: '',
-                      //   },
-                    }
-                  : {},
               };
+              if (logo) {
+                newValidValue.data = { logo };
+              }
+              if (addMetadata) {
+                newValidValue.metadata = {
+                  tags: [],
+                  // productType: [],
+                };
+              }
               if (_mapping) {
                 const prop = Object.keys(_mapping)[0];
                 newValidValue = {
@@ -122,9 +121,13 @@ function extractAll() {
               acc = acc || {};
               if (withoutTranslations) {
                 if (keyIsTitle) {
-                  acc[title] = { ...newValidValue, title: title, key: title };
+                  acc[localizedValue] = {
+                    ...newValidValue,
+                    label: localizedValue,
+                    key: localizedValue,
+                  };
                 } else {
-                  acc[key] = { ...newValidValue, title: title };
+                  acc[key] = { ...newValidValue, label: localizedValue };
                 }
               } else {
                 acc[key] = newValidValue;

package/src/scripts/transformServerVV.js

@@ -36,12 +36,12 @@ function extractAll() {
           const validValue = {
             key,
             // name: locales.en,
-            title: {
+            label: {
               id: newKey,
               message: locales.en,
             },
-            frontend: logo ? { logo } : undefined,
-            form: {
+            data: logo ? { logo } : undefined,
+            metadata: {
               tags,
               productType,
               //

package/src/scripts/writeFields.not.test.js

@@ -13,7 +13,6 @@ describe('Transform bottlebooks-server/** legacy format valid values', () => {
     for (const { name, tsVV, i18n } of allValidValues) {
       expect(tsVV).not.toBeUndefined();
       expect(i18n).not.toBeUndefined();
-
       // Building content for i18n json files.
       for (const locale in i18n) {
         i18All[locale] = { ...i18All[locale], ...i18n[locale] };
@@ -23,11 +22,43 @@ describe('Transform bottlebooks-server/** legacy format valid values', () => {
         "import { defineMessage } from '@lingui/macro';\n" +
           'const validValues = \n' +
           JSON.stringify(tsVV, null, 2).replace(
-            /"title": \{(.*?(.|[\n])*?)\}/g,
-            '"title": defineMessage({$1})'
+            /"label": \{(.*?(.|[\n])*?)\}/g,
+            '"label": defineMessage({$1})'
           ),
         { encoding: 'utf8' }
       );
+
+      // Building content for valid value .ts file.
+      fs.writeFileSync(
+        path.resolve(__dirname, `../validValues/${name}.ts`),
+        "import { defineMessage } from '@lingui/macro';\n" +
+          "import { ValidValueDefinition } from './types/ValidValueDefinition';\n\n" +
+          `export interface ${capitalizeFirstLetter(
+            name
+          )} extends ValidValueDefinition {} \n\n` +
+          '/** Makes sure errors are displayed where the error is introduced. */\n' +
+          `const ${name} = (value: ${capitalizeFirstLetter(
+            name
+          )}) => value; \n\n` +
+          `const all${capitalizeFirstLetter(name)} = \n` +
+          '{' +
+          Object.entries(tsVV)?.reduce((acc, [key, vv]) => {
+            acc +=
+              `${key}: ${name}(` +
+              JSON.stringify(vv, null, 2).replace(
+                /"label": \{(.*?(.|[\n])*?)\}/g,
+                '"label": defineMessage({$1})'
+              ) +
+              `),`;
+            return acc;
+          }, '') +
+          '}' +
+          `as const;\n\n` +
+          `export type ${capitalizeFirstLetter(
+            name
+          )}Key = keyof typeof all${capitalizeFirstLetter(name)};\n\n` +
+          `export default all${capitalizeFirstLetter(name)};`
+      );
     }
     for (const locale in i18All) {
       fs.writeFileSync(
@@ -58,3 +89,7 @@ describe('Transform bottlebooks-server/** legacy format valid values', () => {
     }
   });
 });
+
+function capitalizeFirstLetter(string) {
+  return string.charAt(0).toUpperCase() + string.slice(1);
+}