@tolgee/core 2.0.0 → 2.4.0

package/dist/tolgee.umd.js

@@ -1332,11 +1332,17 @@
         return unit.replace(/^(.*?)-/, '');
     }
     var FRACTION_PRECISION_REGEX = /^\.(?:(0+)(\*)?|(#+)|(0+)(#+))$/g;
-    var SIGNIFICANT_PRECISION_REGEX = /^(@+)?(\+|#+)?$/g;
+    var SIGNIFICANT_PRECISION_REGEX = /^(@+)?(\+|#+)?[rs]?$/g;
     var INTEGER_WIDTH_REGEX = /(\*)(0+)|(#+)(0+)|(0+)/g;
     var CONCISE_INTEGER_WIDTH_REGEX = /^(0+)$/;
     function parseSignificantPrecision(str) {
         var result = {};
+        if (str[str.length - 1] === 'r') {
+            result.roundingPriority = 'morePrecision';
+        }
+        else if (str[str.length - 1] === 's') {
+            result.roundingPriority = 'lessPrecision';
+        }
         str.replace(SIGNIFICANT_PRECISION_REGEX, function (_, g1, g2) {
             // @@@ case
             if (typeof g2 !== 'string') {
@@ -1563,8 +1569,13 @@
                     }
                     return '';
                 });
-                if (token.options.length) {
-                    result = __assign(__assign({}, result), parseSignificantPrecision(token.options[0]));
+                var opt = token.options[0];
+                // https://unicode-org.github.io/icu/userguide/format_parse/numbers/skeletons.html#trailing-zero-display
+                if (opt === 'w') {
+                    result = __assign(__assign({}, result), { trailingZeroDisplay: 'stripIfInteger' });
+                }
+                else if (opt) {
+                    result = __assign(__assign({}, result), parseSignificantPrecision(opt));
                 }
                 continue;
             }
@@ -3235,7 +3246,7 @@
                 for (var _i = 0; _i < arguments.length; _i++) {
                     args[_i] = arguments[_i];
                 }
-                return new ((_a = Intl.NumberFormat).bind.apply(_a, __spreadArray([void 0], args)))();
+                return new ((_a = Intl.NumberFormat).bind.apply(_a, __spreadArray([void 0], args, false)))();
             }, {
                 cache: createFastMemoizeCache(cache.number),
                 strategy: strategies.variadic,
@@ -3246,7 +3257,7 @@
                 for (var _i = 0; _i < arguments.length; _i++) {
                     args[_i] = arguments[_i];
                 }
-                return new ((_a = Intl.DateTimeFormat).bind.apply(_a, __spreadArray([void 0], args)))();
+                return new ((_a = Intl.DateTimeFormat).bind.apply(_a, __spreadArray([void 0], args, false)))();
             }, {
                 cache: createFastMemoizeCache(cache.dateTime),
                 strategy: strategies.variadic,
@@ -3257,7 +3268,7 @@
                 for (var _i = 0; _i < arguments.length; _i++) {
                     args[_i] = arguments[_i];
                 }
-                return new ((_a = Intl.PluralRules).bind.apply(_a, __spreadArray([void 0], args)))();
+                return new ((_a = Intl.PluralRules).bind.apply(_a, __spreadArray([void 0], args, false)))();
             }, {
                 cache: createFastMemoizeCache(cache.pluralRules),
                 strategy: strategies.variadic,
@@ -3781,11 +3792,11 @@
                     switch (_a.label) {
                         case 0:
                             if (!(typeof this.renderer === 'object')) return [3 /*break*/, 2];
-                            return [4 /*yield*/, this.getKey(e, element)];
+                            return [4 /*yield*/, this.getKeyAndDefault(e, element)];
                         case 1:
                             key = _a.sent();
                             if (key) {
-                                this.renderer.renderViewer(key);
+                                this.renderer.renderViewer(key.key, key.defaultValue);
                                 return [2 /*return*/];
                             }
                             return [2 /*return*/];
@@ -3812,8 +3823,10 @@
         });
         TranslationHighlighter.getKeyOptions = function (node) {
             var nodes = Array.from(node._tolgee.nodes);
-            var keys = nodes.reduce(function (acc, curr) { return __spreadArray(__spreadArray([], __read(acc), false), __read(curr._tolgee.keys.map(function (k) { return k.key; })), false); }, []);
-            return new Set(keys);
+            return nodes.reduce(function (acc, curr) { return __spreadArray(__spreadArray([], __read(acc), false), __read(curr._tolgee.keys.map(function (k) { return ({
+                key: k.key,
+                defaultValue: k.defaultValue,
+            }); })), false); }, []);
         };
         TranslationHighlighter.prototype.listen = function (element) {
             var _this = this;
@@ -3825,22 +3838,35 @@
                 }
             }); }); });
         };
-        TranslationHighlighter.prototype.getKey = function (mouseEvent, element) {
+        TranslationHighlighter.prototype.getKeyAndDefault = function (mouseEvent, element) {
             return __awaiter(this, void 0, void 0, function () {
-                var keys;
+                var keysWithDefaults, keySet, selectedKey_1, found;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
                             if (element._tolgee.wrappedWithElementOnlyKey) {
-                                return [2 /*return*/, element._tolgee.wrappedWithElementOnlyKey];
+                                return [2 /*return*/, {
+                                        key: element._tolgee.wrappedWithElementOnlyKey,
+                                        defaultValue: element._tolgee.wrappedWithElementOnlyDefaultHtml,
+                                    }];
                             }
-                            keys = TranslationHighlighter.getKeyOptions(element);
-                            if (!(keys.size > 1)) return [3 /*break*/, 2];
-                            return [4 /*yield*/, this.renderer.getKey({ keys: keys, openEvent: mouseEvent })];
-                        case 1: return [2 /*return*/, _a.sent()];
+                            keysWithDefaults = TranslationHighlighter.getKeyOptions(element);
+                            keySet = new Set(keysWithDefaults.map(function (keyWithDefault) { return keyWithDefault.key; }));
+                            if (!(keySet.size > 1)) return [3 /*break*/, 2];
+                            return [4 /*yield*/, this.renderer.getKey({
+                                    keys: keySet,
+                                    openEvent: mouseEvent,
+                                })];
+                        case 1:
+                            selectedKey_1 = _a.sent();
+                            found = keysWithDefaults.find(function (kwd) { return kwd.key === selectedKey_1; });
+                            if (found) {
+                                return [2 /*return*/, found];
+                            }
+                            _a.label = 2;
                         case 2:
-                            if (keys.size === 1) {
-                                return [2 /*return*/, Array.from(keys)[0]];
+                            if (keySet.size === 1) {
+                                return [2 /*return*/, keysWithDefaults[0]];
                             }
                             // eslint-disable-next-line no-console
                             console.error('No key to translate. This seems like a bug in tolgee.');
@@ -4519,6 +4545,8 @@
                     filtered.forEach(function (element) {
                         var elementWithMeta = AbstractHandler.initParentElement(element);
                         elementWithMeta._tolgee.wrappedWithElementOnlyKey = element.getAttribute(TOLGEE_WRAPPED_ONLY_DATA_ATTRIBUTE);
+                        elementWithMeta._tolgee.wrappedWithElementOnlyDefaultHtml =
+                            element.innerHTML;
                         _this.elementRegistrar.register(elementWithMeta);
                     });
                     return [2 /*return*/];
@@ -4902,11 +4930,12 @@
             if (noWrap === void 0) { noWrap = false; }
             if (defaultValue === void 0) { defaultValue = undefined; }
             return __awaiter(this, void 0, void 0, function () {
-                var key, props;
+                var key, orEmpty, props;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
                             key = typeof keyOrProps === 'string' ? keyOrProps : keyOrProps.key;
+                            orEmpty = undefined;
                             if (typeof keyOrProps === 'object') {
                                 props = keyOrProps;
                                 // if values are not provided in props object, get them from function
@@ -4915,6 +4944,7 @@
                                 noWrap = props.noWrap !== undefined ? props.noWrap : noWrap;
                                 defaultValue =
                                     props.defaultValue !== undefined ? props.defaultValue : defaultValue;
+                                orEmpty = props.orEmpty;
                             }
                             if (!(this.properties.config.mode === 'development' && !noWrap)) return [3 /*break*/, 3];
                             return [4 /*yield*/, this.loadScopes()];
@@ -4924,7 +4954,7 @@
                         case 2:
                             _a.sent();
                             return [2 /*return*/, this.dependencyStore.textService.wrap(key, params, defaultValue)];
-                        case 3: return [2 /*return*/, this.dependencyStore.textService.translate(key, params, undefined, undefined, defaultValue)];
+                        case 3: return [2 /*return*/, this.dependencyStore.textService.translate(key, params, undefined, orEmpty, defaultValue)];
                     }
                 });
             });