@tolgee/core 1.4.0 → 1.6.1

package/dist/tolgee.cjs.js

@@ -547,63 +547,6 @@ var TranslationData = /** @class */ (function () {
     return TranslationData;
 }());
 
-var TextHelper = /** @class */ (function () {
-    function TextHelper() {
-    }
-    TextHelper.splitOnNonEscapedDelimiter = function (string, delimiter) {
-        var result = [];
-        var actual = '';
-        var escaped = false;
-        for (var i = 0; i < string.length; i++) {
-            var char = string[i];
-            if (char === '\\' && !escaped) {
-                escaped = true;
-                continue;
-            }
-            if (escaped) {
-                escaped = false;
-                actual += char;
-                continue;
-            }
-            if (char === delimiter) {
-                result.push(actual);
-                actual = '';
-                continue;
-            }
-            actual += char;
-        }
-        result.push(actual);
-        return result;
-    };
-    TextHelper.isCharEscaped = function (position, fullString) {
-        var escapeCharsCount = 0;
-        while (position > -1 && fullString[position - 1] === '\\') {
-            escapeCharsCount++;
-            position--;
-        }
-        return escapeCharsCount % 2 == 1;
-    };
-    TextHelper.removeEscapes = function (string) {
-        var result = '';
-        var escaped = false;
-        for (var i = 0; i < string.length; i++) {
-            var char = string[i];
-            if (char === '\\' && !escaped) {
-                escaped = true;
-                continue;
-            }
-            if (escaped) {
-                escaped = false;
-                result += char;
-                continue;
-            }
-            result += char;
-        }
-        return result;
-    };
-    return TextHelper;
-}());
-
 var TranslationService = /** @class */ (function () {
     function TranslationService(properties, coreService, apiHttpService, eventService) {
         var _this = this;
@@ -616,47 +559,48 @@ var TranslationService = /** @class */ (function () {
         this.getTranslationsOfKey = function (key, languages) {
             if (languages === void 0) { languages = new Set([_this.properties.currentLanguage]); }
             return __awaiter(_this, void 0, void 0, function () {
-                var languagesArray, languagesQuery, data, translationData_1, firstItem, fetchedData, e_1, _a;
-                var _b, _c, _d, _e, _f;
-                return __generator(this, function (_g) {
-                    switch (_g.label) {
+                var languagesArray, languagesQuery, data, translationData_1, firstItem, e_1, _a;
+                var _b, _c;
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
                         case 0:
                             this.coreService.checkScope('translations.view');
-                            _g.label = 1;
+                            _d.label = 1;
                         case 1:
-                            _g.trys.push([1, 3, , 7]);
+                            _d.trys.push([1, 3, , 7]);
                             languagesArray = __spreadArray([], __read(languages));
                             languagesQuery = languagesArray
                                 .map(function (l) { return "languages=" + l; })
                                 .join('&');
                             return [4 /*yield*/, this.apiHttpService.fetchJson("v2/projects/translations?" + languagesQuery + "&filterKeyName=" + encodeURIComponent(key))];
                         case 2:
-                            data = _g.sent();
+                            data = _d.sent();
                             translationData_1 = languagesArray.reduce(function (acc, curr) {
                                 var _a;
                                 return (__assign(__assign({}, acc), (_a = {}, _a[curr] = '', _a)));
                             }, {});
                             firstItem = (_c = (_b = data._embedded) === null || _b === void 0 ? void 0 : _b.keys) === null || _c === void 0 ? void 0 : _c[0];
-                            fetchedData = firstItem === null || firstItem === void 0 ? void 0 : firstItem.translations;
-                            if (fetchedData) {
-                                Object.entries((_f = (_e = (_d = data._embedded) === null || _d === void 0 ? void 0 : _d.keys) === null || _e === void 0 ? void 0 : _e[0]) === null || _f === void 0 ? void 0 : _f.translations).forEach(function (_a) {
+                            if (firstItem === null || firstItem === void 0 ? void 0 : firstItem.translations) {
+                                Object.entries(firstItem.translations).forEach(function (_a) {
                                     var _b = __read(_a, 2), language = _b[0], translation = _b[1];
                                     return (translationData_1[language] = translation.text);
                                 });
                             }
                             return [2 /*return*/, new TranslationData(key, translationData_1, firstItem === null || firstItem === void 0 ? void 0 : firstItem.keyId)];
                         case 3:
-                            e_1 = _g.sent();
+                            e_1 = _d.sent();
                             if (!(e_1 instanceof ApiHttpError &&
                                 e_1.response.status === 404 &&
                                 e_1.code === 'language_not_found')) return [3 /*break*/, 5];
-                            //only possible reason for this error is, that languages definition is changed, but the old value is stored in preferred languages
+                            // only possible reason for this error is, that languages definition
+                            // is changed, but the old value is stored in preferred languages
                             _a = this.properties;
                             return [4 /*yield*/, this.coreService.getLanguages()];
                         case 4:
-                            //only possible reason for this error is, that languages definition is changed, but the old value is stored in preferred languages
+                            // only possible reason for this error is, that languages definition
+                            // is changed, but the old value is stored in preferred languages
                             _a.preferredLanguages =
-                                _g.sent();
+                                _d.sent();
                             // eslint-disable-next-line no-console
                             console.error('Requested language not found, refreshing the page!');
                             location.reload();
@@ -669,15 +613,17 @@ var TranslationService = /** @class */ (function () {
             });
         };
     }
-    TranslationService.translationByValue = function (message, key, orEmpty) {
+    TranslationService.translationByValue = function (message, key, orEmpty, defaultValue) {
         if (message) {
             return message;
         }
+        if (defaultValue) {
+            return defaultValue;
+        }
         if (orEmpty) {
             return '';
         }
-        var path = TextHelper.splitOnNonEscapedDelimiter(key, '.');
-        return path[path.length - 1];
+        return key;
     };
     TranslationService.prototype.initStatic = function () {
         var _this = this;
@@ -688,7 +634,7 @@ var TranslationService = /** @class */ (function () {
                 var _b = __read(_a, 2), language = _b[0], data = _b[1];
                 //if not provider or promise then it is raw data
                 if (typeof data !== 'function') {
-                    _this.translationsCache.set(language, data);
+                    _this.setLanguageData(language, data);
                 }
             });
         }
@@ -715,7 +661,7 @@ var TranslationService = /** @class */ (function () {
             });
         });
     };
-    TranslationService.prototype.getTranslation = function (key, lang, orEmpty) {
+    TranslationService.prototype.getTranslation = function (key, lang, orEmpty, defaultValue) {
         if (lang === void 0) { lang = this.properties.currentLanguage; }
         if (orEmpty === void 0) { orEmpty = false; }
         return __awaiter(this, void 0, void 0, function () {
@@ -737,7 +683,7 @@ var TranslationService = /** @class */ (function () {
                         _a.sent();
                         message = this.getFromCache(key, this.properties.config.fallbackLanguage);
                         _a.label = 3;
-                    case 3: return [2 /*return*/, TranslationService.translationByValue(message, key, orEmpty)];
+                    case 3: return [2 /*return*/, TranslationService.translationByValue(message, key, orEmpty, defaultValue)];
                 }
             });
         });
@@ -757,21 +703,9 @@ var TranslationService = /** @class */ (function () {
                     case 1:
                         result = _a.sent();
                         Object.keys(translationData.translations).forEach(function (lang) {
-                            if (_this.translationsCache.get(lang)) {
-                                // if the language is not loaded, then ignore the change
-                                var path = TextHelper.splitOnNonEscapedDelimiter(translationData.key, '.');
-                                var root = _this.translationsCache.get(lang);
-                                for (var i = 0; i < path.length; i++) {
-                                    var item = path[i];
-                                    if (root[item] === undefined) {
-                                        root[item] = {};
-                                    }
-                                    if (i === path.length - 1) {
-                                        root[item] = translationData.translations[lang];
-                                        return;
-                                    }
-                                    root = root[item];
-                                }
+                            var data = _this.translationsCache.get(lang);
+                            if (data) {
+                                data[translationData.key] = translationData.translations[lang];
                             }
                         });
                         return [2 /*return*/, result];
@@ -796,12 +730,12 @@ var TranslationService = /** @class */ (function () {
             });
         });
     };
-    TranslationService.prototype.getFromCacheOrFallback = function (key, lang, orEmpty) {
+    TranslationService.prototype.getFromCacheOrFallback = function (key, lang, orEmpty, defaultValue) {
         if (lang === void 0) { lang = this.properties.currentLanguage; }
         if (orEmpty === void 0) { orEmpty = false; }
         var message = this.getFromCache(key, lang) ||
             this.getFromCache(key, this.properties.config.fallbackLanguage);
-        return TranslationService.translationByValue(message, key, orEmpty);
+        return TranslationService.translationByValue(message, key, orEmpty, defaultValue);
     };
     TranslationService.prototype.fetchTranslations = function (lang) {
         return __awaiter(this, void 0, void 0, function () {
@@ -829,11 +763,11 @@ var TranslationService = /** @class */ (function () {
                         return [4 /*yield*/, langStaticData()];
                     case 1:
                         data = _c.sent();
-                        this.translationsCache.set(language, data);
+                        this.setLanguageData(language, data);
                         return [2 /*return*/];
                     case 2:
                         if (langStaticData !== undefined) {
-                            this.translationsCache.set(language, langStaticData);
+                            this.setLanguageData(language, langStaticData);
                             return [2 /*return*/];
                         }
                         _c.label = 3;
@@ -849,7 +783,7 @@ var TranslationService = /** @class */ (function () {
                             //on error set language data as empty object to not break the flow
                             // eslint-disable-next-line no-console
                             console.error('Server responded with error status while loading localization data.');
-                            this.translationsCache.set(language, {});
+                            this.setLanguageData(language, {});
                             return [2 /*return*/];
                         }
                         _c.label = 6;
@@ -858,7 +792,7 @@ var TranslationService = /** @class */ (function () {
                         return [4 /*yield*/, result.json()];
                     case 7:
                         data = _c.sent();
-                        this.translationsCache.set(language, data);
+                        this.setLanguageData(language, data);
                         return [3 /*break*/, 9];
                     case 8:
                         _c.sent();
@@ -891,7 +825,7 @@ var TranslationService = /** @class */ (function () {
                         return [4 /*yield*/, this.apiHttpService.fetchJson("v2/projects/translations/" + language)];
                     case 2:
                         data = _a.sent();
-                        this.translationsCache.set(language, data[language] || {});
+                        this.setLanguageData(language, data[language] || {});
                         return [3 /*break*/, 4];
                     case 3:
                         e_4 = _a.sent();
@@ -907,38 +841,92 @@ var TranslationService = /** @class */ (function () {
     TranslationService.prototype.setEmptyLanguageData = function (language) {
         this.translationsCache.set(language, {});
     };
+    TranslationService.prototype.setLanguageData = function (language, data) {
+        // recursively walk the tree and make it flat, when tree data are provided
+        var makeFlat = function (data) {
+            var result = {};
+            Object.entries(data).forEach(function (_a) {
+                var _b = __read(_a, 2), key = _b[0], value = _b[1];
+                if (typeof value === 'object') {
+                    Object.entries(makeFlat(value)).forEach(function (_a) {
+                        var _b = __read(_a, 2), flatKey = _b[0], flatValue = _b[1];
+                        result[key + '.' + flatKey] = flatValue;
+                    });
+                    return;
+                }
+                result[key] = value;
+            });
+            return result;
+        };
+        this.translationsCache.set(language, makeFlat(data));
+    };
     TranslationService.prototype.getFromCache = function (key, lang) {
-        var e_5, _a;
         if (lang === void 0) { lang = this.properties.currentLanguage; }
-        var path = TextHelper.splitOnNonEscapedDelimiter(key, '.');
         var root = this.translationsCache.get(lang);
         //if lang is not downloaded or does not exist at all
         if (root === undefined) {
             return undefined;
         }
-        //if data contains key directly, just return it
-        if (typeof root[key] === 'string') {
-            return root[key];
-        }
-        try {
-            for (var path_1 = __values(path), path_1_1 = path_1.next(); !path_1_1.done; path_1_1 = path_1.next()) {
-                var item = path_1_1.value;
-                if (root[item] === undefined) {
-                    return undefined;
-                }
-                root = root[item];
+        return root[key];
+    };
+    return TranslationService;
+}());
+
+var TextHelper = /** @class */ (function () {
+    function TextHelper() {
+    }
+    TextHelper.splitOnNonEscapedDelimiter = function (string, delimiter) {
+        var result = [];
+        var actual = '';
+        var escaped = false;
+        for (var i = 0; i < string.length; i++) {
+            var char = string[i];
+            if (char === '\\' && !escaped) {
+                escaped = true;
+                continue;
             }
+            if (escaped) {
+                escaped = false;
+                actual += char;
+                continue;
+            }
+            if (char === delimiter) {
+                result.push(actual);
+                actual = '';
+                continue;
+            }
+            actual += char;
         }
-        catch (e_5_1) { e_5 = { error: e_5_1 }; }
-        finally {
-            try {
-                if (path_1_1 && !path_1_1.done && (_a = path_1.return)) _a.call(path_1);
+        result.push(actual);
+        return result;
+    };
+    TextHelper.isCharEscaped = function (position, fullString) {
+        var escapeCharsCount = 0;
+        while (position > -1 && fullString[position - 1] === '\\') {
+            escapeCharsCount++;
+            position--;
+        }
+        return escapeCharsCount % 2 == 1;
+    };
+    TextHelper.removeEscapes = function (string) {
+        var result = '';
+        var escaped = false;
+        for (var i = 0; i < string.length; i++) {
+            var char = string[i];
+            if (char === '\\' && !escaped) {
+                escaped = true;
+                continue;
+            }
+            if (escaped) {
+                escaped = false;
+                result += char;
+                continue;
             }
-            finally { if (e_5) throw e_5.error; }
+            result += char;
         }
-        return root;
+        return result;
     };
-    return TranslationService;
+    return TextHelper;
 }());
 
 var ErrorKind;
@@ -3369,19 +3357,81 @@ var TextService = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
-    TextService.parseUnwrapped = function (unWrappedString) {
-        var strings = unWrappedString.match(/(?:[^\\,:\n]|\\.)+/g);
+    TextService.parseUnwrapped = function (unwrappedString) {
+        var e_1, _a;
+        var escaped = false;
+        var actual = '';
+        var paramName = '';
+        var readingState = 'KEY';
         var result = {
-            key: TextHelper.removeEscapes(strings.shift()),
+            key: '',
             params: {},
+            defaultValue: undefined,
         };
-        while (strings.length) {
-            var _a = __read(strings.splice(0, 2), 2), name_1 = _a[0], value = _a[1];
-            result.params[name_1] = value;
+        try {
+            for (var unwrappedString_1 = __values(unwrappedString), unwrappedString_1_1 = unwrappedString_1.next(); !unwrappedString_1_1.done; unwrappedString_1_1 = unwrappedString_1.next()) {
+                var char = unwrappedString_1_1.value;
+                if (char === '\\' && !escaped) {
+                    escaped = true;
+                    continue;
+                }
+                if (escaped) {
+                    escaped = false;
+                    actual += char;
+                    continue;
+                }
+                if (readingState === 'KEY' && char === ',') {
+                    readingState = 'DEFAULT_VALUE';
+                    result.key = actual;
+                    actual = '';
+                    continue;
+                }
+                if (readingState === 'KEY' && char === ':') {
+                    readingState = 'PARAM_NAME';
+                    result.key = actual;
+                    actual = '';
+                    continue;
+                }
+                if (readingState === 'DEFAULT_VALUE' && char === ':') {
+                    readingState = 'PARAM_NAME';
+                    result.defaultValue = actual;
+                    actual = '';
+                    continue;
+                }
+                if (readingState === 'PARAM_NAME' && char === ':') {
+                    readingState = 'PARAM_VALUE';
+                    paramName = actual;
+                    actual = '';
+                    continue;
+                }
+                if (readingState === 'PARAM_VALUE' && char === ',') {
+                    readingState = 'PARAM_NAME';
+                    result.params[paramName] = actual;
+                    actual = '';
+                    continue;
+                }
+                actual += char;
+            }
+        }
+        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+        finally {
+            try {
+                if (unwrappedString_1_1 && !unwrappedString_1_1.done && (_a = unwrappedString_1.return)) _a.call(unwrappedString_1);
+            }
+            finally { if (e_1) throw e_1.error; }
+        }
+        if (readingState === 'KEY') {
+            result.key = actual;
+        }
+        if (readingState === 'DEFAULT_VALUE') {
+            result.defaultValue = actual;
+        }
+        if (readingState === 'PARAM_VALUE') {
+            result.params[paramName] = actual;
         }
         return result;
     };
-    TextService.prototype.translate = function (key, params, lang, orEmpty) {
+    TextService.prototype.translate = function (key, params, lang, orEmpty, defaultValue) {
         if (lang === void 0) { lang = this.properties.currentLanguage; }
         return __awaiter(this, void 0, void 0, function () {
             var _a;
@@ -3389,19 +3439,19 @@ var TextService = /** @class */ (function () {
                 switch (_b.label) {
                     case 0:
                         _a = this.format;
-                        return [4 /*yield*/, this.translationService.getTranslation(key, lang, orEmpty)];
+                        return [4 /*yield*/, this.translationService.getTranslation(key, lang, orEmpty, defaultValue)];
                     case 1: return [2 /*return*/, _a.apply(this, [_b.sent(), params])];
                 }
             });
         });
     };
-    TextService.prototype.instant = function (key, params, lang, orEmpty) {
+    TextService.prototype.instant = function (key, params, lang, orEmpty, defaultValue) {
         if (lang === void 0) { lang = this.properties.currentLanguage; }
-        return this.format(this.translationService.getFromCacheOrFallback(key, lang, orEmpty), params);
+        return this.format(this.translationService.getFromCacheOrFallback(key, lang, orEmpty, defaultValue), params);
     };
     TextService.prototype.replace = function (text) {
         return __awaiter(this, void 0, void 0, function () {
-            var matchRegexp, keysAndParams, matched, match, start, result, _a, fullMatch, pre, wrapped, unwrapped, index, input, translated, withoutEscapes;
+            var matchRegexp, keysAndParams, matched, match, start, result, pre, _a, fullMatch, wrapped, unwrapped, index, input, translated;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -3413,35 +3463,43 @@ var TextService = /** @class */ (function () {
                         _b.label = 1;
                     case 1:
                         if (!((match = matchRegexp.exec(text)) !== null)) return [3 /*break*/, 3];
-                        _a = __read(match, 4), fullMatch = _a[0], pre = _a[1], wrapped = _a[2], unwrapped = _a[3];
+                        pre = match[1];
+                        _a = __read(match, 4), fullMatch = _a[0], wrapped = _a[2], unwrapped = _a[3];
                         index = match.index, input = match.input;
                         result += input.substr(start, index - start);
                         start = index + fullMatch.length;
-                        if (pre === '\\' && !TextHelper.isCharEscaped(index, text)) {
-                            result += wrapped;
-                            return [3 /*break*/, 1];
+                        if (pre === '\\') {
+                            if (!TextHelper.isCharEscaped(index, text)) {
+                                result += wrapped;
+                                return [3 /*break*/, 1];
+                            }
+                            pre = '';
                         }
                         return [4 /*yield*/, this.getTranslatedWithMetadata(unwrapped)];
                     case 2:
                         translated = _b.sent();
-                        keysAndParams.push({ key: translated.key, params: translated.params });
+                        keysAndParams.push({
+                            key: translated.key,
+                            params: translated.params,
+                            defaultValue: translated.defaultValue,
+                        });
                         matched = true;
                         result += pre + translated.translated;
                         return [3 /*break*/, 1];
                     case 3:
                         result += text.substring(start);
-                        withoutEscapes = TextHelper.removeEscapes(result);
                         if (matched) {
-                            return [2 /*return*/, { text: withoutEscapes, keys: keysAndParams }];
+                            return [2 /*return*/, { text: result, keys: keysAndParams }];
                         }
                         return [2 /*return*/, undefined];
                 }
             });
         });
     };
-    TextService.prototype.wrap = function (key, params) {
+    TextService.prototype.wrap = function (key, params, defaultValue) {
         var _this = this;
         if (params === void 0) { params = {}; }
+        if (defaultValue === void 0) { defaultValue = undefined; }
         var paramString = Object.entries(params)
             .map(function (_a) {
             var _b = __read(_a, 2), name = _b[0], value = _b[1];
@@ -3449,19 +3507,20 @@ var TextService = /** @class */ (function () {
         })
             .join(',');
         paramString = paramString.length ? ":" + paramString : '';
-        return "" + this.properties.config.inputPrefix + this.escapeParam(key) + paramString + this.properties.config.inputSuffix;
+        var defaultString = defaultValue !== undefined ? "," + this.escapeParam(defaultValue) : '';
+        return "" + this.properties.config.inputPrefix + this.escapeParam(key) + defaultString + paramString + this.properties.config.inputSuffix;
     };
     TextService.prototype.getTranslatedWithMetadata = function (text) {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, key, params, translated;
+            var _a, key, params, defaultValue, translated;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        _a = TextService.parseUnwrapped(text), key = _a.key, params = _a.params;
-                        return [4 /*yield*/, this.translate(key, params, undefined, false)];
+                        _a = TextService.parseUnwrapped(text), key = _a.key, params = _a.params, defaultValue = _a.defaultValue;
+                        return [4 /*yield*/, this.translate(key, params, undefined, false, defaultValue)];
                     case 1:
                         translated = _b.sent();
-                        return [2 /*return*/, { translated: translated, key: key, params: params }];
+                        return [2 /*return*/, { translated: translated, key: key, params: params, defaultValue: defaultValue }];
                 }
             });
         });
@@ -4550,34 +4609,6 @@ var DependencyStore = /** @class */ (function () {
 var Tolgee = /** @class */ (function () {
     function Tolgee(config) {
         var _this = this;
-        this.translate = function (key, params, noWrap) {
-            if (params === void 0) { params = {}; }
-            if (noWrap === void 0) { noWrap = false; }
-            return __awaiter(_this, void 0, void 0, function () {
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
-                        case 0:
-                            if (!(this.properties.config.mode === 'development' && !noWrap)) return [3 /*break*/, 3];
-                            return [4 /*yield*/, this.loadScopes()];
-                        case 1:
-                            _a.sent();
-                            return [4 /*yield*/, this.translationService.loadTranslations()];
-                        case 2:
-                            _a.sent();
-                            return [2 /*return*/, this.dependencyStore.textService.wrap(key, params)];
-                        case 3: return [2 /*return*/, this.dependencyStore.textService.translate(key, params)];
-                    }
-                });
-            });
-        };
-        this.instant = function (key, params, noWrap, orEmpty) {
-            if (params === void 0) { params = {}; }
-            if (noWrap === void 0) { noWrap = false; }
-            if (_this.properties.config.mode === 'development' && !noWrap) {
-                return _this.dependencyStore.textService.wrap(key, params);
-            }
-            return _this.dependencyStore.textService.instant(key, params, undefined, orEmpty);
-        };
         this.stop = function () {
             _this.dependencyStore.observer.stopObserving();
             _this.dependencyStore.elementRegistrar.cleanAll();
@@ -4710,6 +4741,57 @@ var Tolgee = /** @class */ (function () {
             });
         });
     };
+    Tolgee.prototype.translate = function (keyOrProps, params, noWrap, defaultValue) {
+        if (params === void 0) { params = {}; }
+        if (noWrap === void 0) { noWrap = false; }
+        if (defaultValue === void 0) { defaultValue = undefined; }
+        return __awaiter(this, void 0, void 0, function () {
+            var key, props;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        key = typeof keyOrProps === 'string' ? keyOrProps : keyOrProps.key;
+                        if (typeof keyOrProps === 'object') {
+                            props = keyOrProps;
+                            // if values are not provided in props object, get them from function
+                            // params defaults
+                            params = props.params !== undefined ? props.params : params;
+                            noWrap = props.noWrap !== undefined ? props.noWrap : noWrap;
+                            defaultValue =
+                                props.defaultValue !== undefined ? props.defaultValue : defaultValue;
+                        }
+                        if (!(this.properties.config.mode === 'development' && !noWrap)) return [3 /*break*/, 3];
+                        return [4 /*yield*/, this.loadScopes()];
+                    case 1:
+                        _a.sent();
+                        return [4 /*yield*/, this.translationService.loadTranslations()];
+                    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)];
+                }
+            });
+        });
+    };
+    Tolgee.prototype.instant = function (keyOrProps, params, noWrap, orEmpty, defaultValue) {
+        if (params === void 0) { params = {}; }
+        if (noWrap === void 0) { noWrap = false; }
+        var key = typeof keyOrProps === 'string' ? keyOrProps : keyOrProps.key;
+        if (typeof keyOrProps === 'object') {
+            var props = keyOrProps;
+            // if values are not provided in props object, get them from function
+            // params defaults
+            params = props.params !== undefined ? props.params : params;
+            noWrap = props.noWrap !== undefined ? props.noWrap : noWrap;
+            defaultValue =
+                props.defaultValue !== undefined ? props.defaultValue : defaultValue;
+            orEmpty = props.orEmpty !== undefined ? props.orEmpty : orEmpty;
+        }
+        if (this.properties.config.mode === 'development' && !noWrap) {
+            return this.dependencyStore.textService.wrap(key, params, defaultValue);
+        }
+        return this.dependencyStore.textService.instant(key, params, undefined, orEmpty, defaultValue);
+    };
     Tolgee.prototype.loadScopes = function () {
         return __awaiter(this, void 0, void 0, function () {
             var _a;