@bottlebooks/valid-values 1.2.0 → 1.2.1

package/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.1](https://github.com/bottlebooks/bottlebooks/compare/@bottlebooks/valid-values@1.2.0...@bottlebooks/valid-values@1.2.1) (2022-11-23)
+
+### Bug Fixes
+
+- valid-values translate logic ([8aa9b48](https://github.com/bottlebooks/bottlebooks/commit/8aa9b486193f6bdc9711e92a81373069fa7016e6))
+
 # [1.2.0](https://github.com/bottlebooks/bottlebooks/compare/@bottlebooks/valid-values@1.1.0...@bottlebooks/valid-values@1.2.0) (2022-11-23)
 
 ### Features

package/dist/core/translate.d.ts

@@ -1,3 +1,3 @@
 import { MessageDescriptor } from '@lingui/core';
-export declare function translate(message: MessageDescriptor, locale: string): string;
+export declare function translate(title: MessageDescriptor | string, locale?: string): string;
 //# sourceMappingURL=translate.d.ts.map

package/dist/core/translate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"translate.d.ts","sourceRoot":"","sources":["../../src/core/translate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEvD,wBAAgB,SAAS,CAAC,OAAO,EAAE,iBAAiB,EAAE,MAAM,EAAE,MAAM,UAYjE"}
+{"version":3,"file":"translate.d.ts","sourceRoot":"","sources":["../../src/core/translate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEvD,wBAAgB,SAAS,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,UAqC3E"}

package/dist/core/translate.js

@@ -7,17 +7,35 @@ exports.translate = translate;
 
 var _core = require("@lingui/core");
 
-function translate(message, locale) {
-  _core.i18n.activate(locale);
+function translate(title, locale) {
+  // if (typeof title === 'string') {
+  //   return title;
+  // }
+  var messageId = typeof title === 'string' ? title : title === null || title === void 0 ? void 0 : title.id;
+
+  if (!messageId) {
+    console.log('%c' + "ERROR: messageId_missing:".concat(JSON.stringify(title)), 'color: #d0011b;');
+    return '';
+  }
+
+  if (!locale) {
+    locale = 'en';
+  } //  else {
+  //   i18n.activate('en');
+  // }
 
-  var translation = _core.i18n._(message);
 
-  if (translation === message.id) {
-    console.log('%c' + "WARNING: translation_missing:".concat(message.id, ":").concat(locale), 'color: #d0011b;');
+  _core.i18n.activate(locale);
+
+  var translation = _core.i18n._(messageId);
 
-    _core.i18n.activate('en');
+  if (translation === messageId) {
+    if (messageId.includes('validValues.')) {
+      console.log('%c' + "ERROR: translation_missing:".concat(messageId, ":").concat(locale), 'color: #d0011b;');
+      return '';
+    }
 
-    return _core.i18n._(message) || '';
+    console.log('%c' + "WARNING: translation==messageId:".concat(messageId, ":").concat(locale), 'color: #d0011b;');
   }
 
   return translation;

package/dist/main.js

@@ -32,27 +32,27 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 document.querySelector('#app').innerHTML = "\n  <div>\n    <h1>ValidValues</h1>\n    ".concat(Object.entries(validValues).map(function (_ref) {
   var _ref2 = _slicedToArray(_ref, 2),
-      key = _ref2[0],
+      validValueCategory = _ref2[0],
       values = _ref2[1];
 
-  if (values.list) {
-    var list = values.list;
-    return "<h2>".concat(key, "</h2>\n          <pre>").concat(list.map(function (item, i) {
-      var _item$getTitle, _item$getTitle2;
-
-      var message = {
-        id: item.id
-      };
-      return i === 0 ? JSON.stringify(_objectSpread(_objectSpread({
-        // @ts-ignore
-        id: item.id,
-        'title(en)': (0, _translate.translate)(message, 'en') || ((_item$getTitle = item.getTitle) === null || _item$getTitle === void 0 ? void 0 : _item$getTitle.call(item, 'en')),
-        'title(de)': (0, _translate.translate)(message, 'de') || ((_item$getTitle2 = item.getTitle) === null || _item$getTitle2 === void 0 ? void 0 : _item$getTitle2.call(item, 'de'))
-      }, item), {}, {
-        form: item.form ? item.form && _objectSpread({}, item.form) : null
-      }), undefined, 2) : '';
-    }), "</pre>\n          ");
-  }
-
-  return "<h2>".concat(key, "</h2>\n          <pre>").concat(JSON.stringify(values, undefined, 2), "</pre>\n        ");
+  var list = values.list;
+  var content = "<h2>".concat(validValueCategory, "</h2>"); // if (['designation'].includes(validValueCategory)) {
+  //   return '';
+  // }
+
+  return "".concat(content, "\n          <pre>").concat(list.map(function (item, i) {
+    var key = item.key,
+        title = item.title,
+        form = item.form; // const message = { id: item.id } as MessageDescriptor;
+
+    return i === 0 ? JSON.stringify(_objectSpread(_objectSpread({
+      // @ts-ignore
+      id: item.id,
+      'title(en)': (0, _translate.translate)(title, 'en'),
+      'title(de)': (0, _translate.translate)(title, 'de')
+    }, item), {}, {
+      form: item.form ? item.form && _objectSpread({}, item.form) : null
+    }), undefined, 2) : '';
+  }), "</pre>\n          ");
+  return "<h2>".concat(validValueCategory, "</h2>\n          <pre>").concat(JSON.stringify(values, undefined, 2), "</pre>\n        ");
 }).join(''), "</pre></code>\n  </div>\n");

package/dist/validValues/country.d.ts

@@ -1,4 +1,9 @@
-import { Country } from './types/Country';
+import { MessageDescriptor } from '@lingui/core';
+export interface Country {
+    key: string;
+    title: MessageDescriptor;
+    regions?: string[];
+}
 declare const _default: {
     list: ({
         id: string;

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

@@ -1 +1 @@
-{"version":3,"file":"country.d.ts","sourceRoot":"","sources":["../../src/validValues/country.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;;;;;;;;;;;;;;;;;;;AAC1C,wBAgzDG"}
+{"version":3,"file":"country.d.ts","sourceRoot":"","sources":["../../src/validValues/country.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,MAAM,WAAW,OAAO;IACtB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,iBAAiB,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB;;;;;;;;;;;;;;;;;;;AAED,wBA6pDG"}