@tolgee/core 3.0.1 → 3.1.1

package/dist/tolgee.cjs.js

@@ -762,23 +762,25 @@ var TranslationService = /** @class */ (function () {
             var data, e_4;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0:
-                        this.coreService.checkScope('translations.view');
-                        _a.label = 1;
+                    case 0: return [4 /*yield*/, this.coreService.loadApiKeyDetails()];
                     case 1:
-                        _a.trys.push([1, 3, , 4]);
-                        return [4 /*yield*/, this.apiHttpService.fetchJson("v2/projects/translations/".concat(language))];
+                        _a.sent();
+                        this.coreService.checkScope('translations.view');
+                        _a.label = 2;
                     case 2:
+                        _a.trys.push([2, 4, , 5]);
+                        return [4 /*yield*/, this.apiHttpService.fetchJson("v2/projects/translations/".concat(language))];
+                    case 3:
                         data = _a.sent();
                         this.setLanguageData(language, data[language] || {});
-                        return [3 /*break*/, 4];
-                    case 3:
+                        return [3 /*break*/, 5];
+                    case 4:
                         e_4 = _a.sent();
                         // eslint-disable-next-line no-console
                         console.error('Error while fetching localization data from API.', e_4);
                         this.setEmptyLanguageData(language);
                         return [2 /*return*/];
-                    case 4: return [2 /*return*/];
+                    case 5: return [2 /*return*/];
                 }
             });
         });
@@ -1575,6 +1577,24 @@ var CoreService = /** @class */ (function () {
             throw new Error("Api key not permitted to do this, please add 'translations.view' scope.");
         }
     };
+    CoreService.prototype.loadApiKeyDetails = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var details;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (!(this.properties.scopes === undefined)) return [3 /*break*/, 2];
+                        return [4 /*yield*/, this.getApiKeyDetails()];
+                    case 1:
+                        details = _a.sent();
+                        this.properties.scopes = details.scopes;
+                        this.properties.projectId = details.projectId;
+                        _a.label = 2;
+                    case 2: return [2 /*return*/];
+                }
+            });
+        });
+    };
     return CoreService;
 }());
 
@@ -2224,51 +2244,39 @@ var Coder$1 = /** @class */ (function () {
         return result;
     };
     Coder.prototype.unwrap = function (text) {
-        return __awaiter(this, void 0, void 0, function () {
-            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:
-                        matchRegexp = new RegExp(this.rawUnWrapRegex, 'gs');
-                        keysAndParams = [];
-                        matched = false;
-                        start = 0;
-                        result = '';
-                        _b.label = 1;
-                    case 1:
-                        if (!((match = matchRegexp.exec(text)) !== null)) return [3 /*break*/, 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 === '\\') {
-                            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,
-                            defaultValue: translated.defaultValue,
-                        });
-                        matched = true;
-                        result += pre + translated.translated;
-                        return [3 /*break*/, 1];
-                    case 3:
-                        result += text.substring(start);
-                        if (matched) {
-                            return [2 /*return*/, { text: result, keys: keysAndParams }];
-                        }
-                        return [2 /*return*/, undefined];
+        var matchRegexp = new RegExp(this.rawUnWrapRegex, 'gs');
+        var keysAndParams = [];
+        var matched = false;
+        var match;
+        var start = 0;
+        var result = '';
+        while ((match = matchRegexp.exec(text)) !== null) {
+            var pre = match[1];
+            var _a = __read(match, 4), fullMatch = _a[0]; _a[1]; var wrapped = _a[2], unwrapped = _a[3];
+            var index = match.index, input = match.input;
+            result += input.substr(start, index - start);
+            start = index + fullMatch.length;
+            if (pre === '\\') {
+                if (!TextHelper.isCharEscaped(index, text)) {
+                    result += wrapped;
+                    continue;
                 }
+                pre = '';
+            }
+            var translated = this.getTranslatedWithMetadata(unwrapped);
+            keysAndParams.push({
+                key: translated.key,
+                params: translated.params,
+                defaultValue: translated.defaultValue,
             });
-        });
+            matched = true;
+            result += pre + translated.translated;
+        }
+        result += text.substring(start);
+        if (matched) {
+            return { text: result, keys: keysAndParams };
+        }
+        return undefined;
     };
     Coder.prototype.wrap = function (key, params, defaultValue) {
         var _this = this;
@@ -2285,19 +2293,9 @@ var Coder$1 = /** @class */ (function () {
         return "".concat(this.properties.config.inputPrefix).concat(this.escapeParam(key)).concat(defaultString).concat(paramString).concat(this.properties.config.inputSuffix);
     };
     Coder.prototype.getTranslatedWithMetadata = function (text) {
-        return __awaiter(this, void 0, void 0, function () {
-            var _a, key, params, defaultValue, translated;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        _a = Coder.parseUnwrapped(text), key = _a.key, params = _a.params, defaultValue = _a.defaultValue;
-                        return [4 /*yield*/, this.textService.translate(key, params, undefined, false, defaultValue)];
-                    case 1:
-                        translated = _b.sent();
-                        return [2 /*return*/, { translated: translated, key: key, params: params, defaultValue: defaultValue }];
-                }
-            });
-        });
+        var _a = Coder.parseUnwrapped(text), key = _a.key, params = _a.params, defaultValue = _a.defaultValue;
+        var translated = this.textService.instant(key, params, undefined, false, defaultValue);
+        return { translated: translated, key: key, params: params, defaultValue: defaultValue };
     };
     return Coder;
 }());
@@ -2732,31 +2730,26 @@ var Coder = /** @class */ (function () {
         this.defaultMemory = new ValueMemory();
     }
     Coder.prototype.unwrap = function (text) {
-        return __awaiter(this, void 0, void 0, function () {
-            var keysAndParams, messages, result;
-            var _this = this;
-            return __generator(this, function (_a) {
-                keysAndParams = [];
-                messages = decodeFromText(text);
-                messages.forEach(function (msg) {
-                    var _a = __read(stringToCodePoints(msg), 2), keyCode = _a[0], defaultCode = _a[1];
-                    var key = _this.keyMemory.numberToValue(keyCode);
-                    var defaultValue = defaultCode !== undefined
-                        ? _this.defaultMemory.numberToValue(defaultCode)
-                        : undefined;
-                    keysAndParams.push({
-                        key: key,
-                        params: undefined,
-                        defaultValue: defaultValue,
-                    });
-                });
-                result = removeSecrets(text);
-                if (keysAndParams.length) {
-                    return [2 /*return*/, { text: result, keys: keysAndParams }];
-                }
-                return [2 /*return*/, undefined];
+        var _this = this;
+        var keysAndParams = [];
+        var messages = decodeFromText(text);
+        messages.forEach(function (msg) {
+            var _a = __read(stringToCodePoints(msg), 2), keyCode = _a[0], defaultCode = _a[1];
+            var key = _this.keyMemory.numberToValue(keyCode);
+            var defaultValue = defaultCode !== undefined
+                ? _this.defaultMemory.numberToValue(defaultCode)
+                : undefined;
+            keysAndParams.push({
+                key: key,
+                params: undefined,
+                defaultValue: defaultValue,
             });
         });
+        var result = removeSecrets(text);
+        if (keysAndParams.length) {
+            return { text: result, keys: keysAndParams };
+        }
+        return undefined;
     };
     Coder.prototype.wrap = function (key, _params, defaultValue, translation) {
         if (defaultValue === void 0) { defaultValue = undefined; }
@@ -2904,20 +2897,6 @@ var Tolgee = /** @class */ (function () {
         };
         this.dependencyService = new DependencyService();
     }
-    Tolgee.use = function (module) {
-        return new Tolgee().use(module);
-    };
-    Tolgee.init = function (config) {
-        return new Tolgee().init(config);
-    };
-    Tolgee.prototype.use = function (module) {
-        this.dependencyService.moduleService.addModule(module);
-        return this;
-    };
-    Tolgee.prototype.init = function (config) {
-        this.dependencyService.init(config);
-        return this;
-    };
     Object.defineProperty(Tolgee.prototype, "properties", {
         get: function () {
             return this.dependencyService.properties;
@@ -2932,21 +2911,24 @@ var Tolgee = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(Tolgee.prototype, "coreService", {
-        get: function () {
-            return this.dependencyService.coreService;
-        },
-        enumerable: false,
-        configurable: true
-    });
     Object.defineProperty(Tolgee.prototype, "lang", {
         get: function () {
             return this.properties.currentLanguage;
         },
-        set: function (value) {
-            this.properties.currentLanguage = value;
-            this.dependencyService.eventService
-                .LANGUAGE_CHANGED.emit(value);
+        /**
+         * This sets a new language.
+         *
+         * Using this setter can behave buggy when you change languages
+         * too fast, since it changes the language property before
+         * translations are actually loaded.
+         * @Deprecated use asynchronous changeLanguage method.
+         */
+        set: function (newLanguage) {
+            var _this = this;
+            this.properties.currentLanguage = newLanguage;
+            this.translationService.loadTranslations(newLanguage).then(function () {
+                _this.emitLangChangeEvent(newLanguage);
+            });
         },
         enumerable: false,
         configurable: true
@@ -2973,6 +2955,10 @@ var Tolgee = /** @class */ (function () {
         configurable: true
     });
     Object.defineProperty(Tolgee.prototype, "onLangLoaded", {
+        /**
+         * Is emitted when language translations are loaded for the first time.
+         * It is not emitted when language is changed and translations were loaded before.
+         */
         get: function () {
             return this.dependencyService.eventService.LANGUAGE_LOADED;
         },
@@ -3004,6 +2990,49 @@ var Tolgee = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
+    Object.defineProperty(Tolgee.prototype, "coreService", {
+        get: function () {
+            return this.dependencyService.coreService;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Tolgee.use = function (module) {
+        return new Tolgee().use(module);
+    };
+    Tolgee.init = function (config) {
+        return new Tolgee().init(config);
+    };
+    /**
+     * Sets the new language.
+     *
+     * Emits the onLangChange and onLangChangeAndLoad events after
+     * the translations are loaded.
+     *
+     * @return Promise<void> Resolves when translations are loaded
+     */
+    Tolgee.prototype.changeLanguage = function (newLanguage) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.translationService.loadTranslations(newLanguage)];
+                    case 1:
+                        _a.sent();
+                        this.properties.currentLanguage = newLanguage;
+                        this.emitLangChangeEvent(newLanguage);
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
+    Tolgee.prototype.use = function (module) {
+        this.dependencyService.moduleService.addModule(module);
+        return this;
+    };
+    Tolgee.prototype.init = function (config) {
+        this.dependencyService.init(config);
+        return this;
+    };
     Tolgee.prototype.run = function () {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
@@ -3011,7 +3040,7 @@ var Tolgee = /** @class */ (function () {
                     case 0:
                         this.dependencyService.run();
                         if (!(this.properties.config.mode === 'development')) return [3 /*break*/, 2];
-                        return [4 /*yield*/, this.loadApiKeyDetails()];
+                        return [4 /*yield*/, this.coreService.loadApiKeyDetails()];
                     case 1:
                         _a.sent();
                         _a.label = 2;
@@ -3065,18 +3094,15 @@ var Tolgee = /** @class */ (function () {
                                 props.defaultValue !== undefined ? props.defaultValue : defaultValue;
                             orEmpty = props.orEmpty;
                         }
-                        if (!(this.properties.config.mode === 'development' && !noWrap)) return [3 /*break*/, 4];
-                        return [4 /*yield*/, this.loadApiKeyDetails()];
+                        return [4 /*yield*/, this.dependencyService.textService.translate(key, params, undefined, orEmpty, defaultValue)];
                     case 1:
-                        _a.sent();
-                        return [4 /*yield*/, this.translationService.loadTranslations()];
+                        translation = _a.sent();
+                        if (!(this.properties.config.mode === 'development' && !noWrap)) return [3 /*break*/, 3];
+                        return [4 /*yield*/, this.coreService.loadApiKeyDetails()];
                     case 2:
                         _a.sent();
-                        return [4 /*yield*/, this.dependencyService.textService.translate(key, params, undefined, orEmpty, defaultValue)];
-                    case 3:
-                        translation = _a.sent();
                         return [2 /*return*/, this.dependencyService.wrapper.wrap(key, params, defaultValue, translation)];
-                    case 4: return [2 /*return*/, this.dependencyService.textService.translate(key, params, undefined, orEmpty, defaultValue)];
+                    case 3: return [2 /*return*/, translation];
                 }
             });
         });
@@ -3109,23 +3135,9 @@ var Tolgee = /** @class */ (function () {
         }
         return translation;
     };
-    Tolgee.prototype.loadApiKeyDetails = function () {
-        return __awaiter(this, void 0, void 0, function () {
-            var details;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        if (!(this.properties.scopes === undefined)) return [3 /*break*/, 2];
-                        return [4 /*yield*/, this.dependencyService.coreService.getApiKeyDetails()];
-                    case 1:
-                        details = _a.sent();
-                        this.properties.scopes = details.scopes;
-                        this.properties.projectId = details.projectId;
-                        _a.label = 2;
-                    case 2: return [2 /*return*/];
-                }
-            });
-        });
+    Tolgee.prototype.emitLangChangeEvent = function (value) {
+        var langChangedEmitter = this.onLangChange;
+        langChangedEmitter.emit(value);
     };
     return Tolgee;
 }());