@tolgee/core 3.1.3 → 3.2.0

package/dist/tolgee.cjs.js

@@ -398,6 +398,9 @@ var TranslationService = /** @class */ (function () {
         this.eventService = eventService;
         this.translationsCache = new Map();
         this.fetchPromises = {};
+        // we need to distinguish which languages are in cache initially
+        // because we need to refetch them in dev mode
+        this.fetchedDev = {};
         this.updateTranslationInCache = function (data) { return __awaiter(_this, void 0, void 0, function () {
             var result;
             var _this = this;
@@ -490,8 +493,7 @@ var TranslationService = /** @class */ (function () {
     TranslationService.prototype.initStatic = function () {
         var _this = this;
         var _a;
-        if (this.properties.config.mode === 'production' &&
-            typeof ((_a = this.properties.config) === null || _a === void 0 ? void 0 : _a.staticData) === 'object') {
+        if (typeof ((_a = this.properties.config) === null || _a === void 0 ? void 0 : _a.staticData) === 'object') {
             Object.entries(this.properties.config.staticData).forEach(function (_a) {
                 var _b = __read(_a, 2), language = _b[0], data = _b[1];
                 //if not provider or promise then it is raw data
@@ -510,7 +512,7 @@ var TranslationService = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        if (!(this.translationsCache.get(lang) == undefined)) return [3 /*break*/, 2];
+                        if (!this.isFetchNeeded(lang)) return [3 /*break*/, 2];
                         if (!(this.fetchPromises[lang] instanceof Promise)) {
                             this.fetchPromises[lang] = this.fetchTranslations(lang);
                         }
@@ -529,25 +531,28 @@ var TranslationService = /** @class */ (function () {
     TranslationService.prototype.getTranslation = function (key, lang, defaultValue) {
         if (lang === void 0) { lang = this.properties.currentLanguage; }
         return __awaiter(this, void 0, void 0, function () {
-            var message;
+            var message, fallbackLang;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        message = this.getFromCache(key, lang);
-                        if (!!message) return [3 /*break*/, 3];
+                        if (!this.isFetchNeeded(lang)) return [3 /*break*/, 2];
                         return [4 /*yield*/, this.loadTranslations(lang)];
                     case 1:
                         _a.sent();
+                        _a.label = 2;
+                    case 2:
                         message = this.getFromCache(key, lang);
-                        if (!!message) return [3 /*break*/, 3];
-                        message = this.getFromCache(key, this.properties.config.fallbackLanguage);
-                        if (!!message) return [3 /*break*/, 3];
+                        if (!!message) return [3 /*break*/, 5];
+                        fallbackLang = this.properties.config.fallbackLanguage;
+                        if (!this.isFetchNeeded(fallbackLang)) return [3 /*break*/, 4];
                         return [4 /*yield*/, this.loadTranslations(this.properties.config.fallbackLanguage)];
-                    case 2:
+                    case 3:
                         _a.sent();
+                        _a.label = 4;
+                    case 4:
                         message = this.getFromCache(key, this.properties.config.fallbackLanguage);
-                        _a.label = 3;
-                    case 3: return [2 /*return*/, TranslationService.translationByValue(message, defaultValue)];
+                        _a.label = 5;
+                    case 5: return [2 /*return*/, TranslationService.translationByValue(message, defaultValue)];
                 }
             });
         });
@@ -682,12 +687,20 @@ var TranslationService = /** @class */ (function () {
             this.getFromCache(key, this.properties.config.fallbackLanguage);
         return TranslationService.translationByValue(message, defaultValue);
     };
+    TranslationService.prototype.isFetchNeeded = function (lang) {
+        var isDevMode = this.properties.config.mode === 'development';
+        var dataPresent = this.translationsCache.get(lang) !== undefined;
+        var devFetched = Boolean(this.fetchedDev[lang]);
+        return (isDevMode && !devFetched) || !dataPresent;
+    };
     TranslationService.prototype.fetchTranslations = function (lang) {
         return __awaiter(this, void 0, void 0, function () {
+            var isDevMode;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        if (!(this.properties.config.mode === 'development')) return [3 /*break*/, 2];
+                        isDevMode = this.properties.config.mode === 'development';
+                        if (!isDevMode) return [3 /*break*/, 2];
                         return [4 /*yield*/, this.fetchTranslationsDevelopment(lang)];
                     case 1: return [2 /*return*/, _a.sent()];
                     case 2: return [4 /*yield*/, this.fetchTranslationsProduction(lang)];
@@ -772,6 +785,7 @@ var TranslationService = /** @class */ (function () {
                         return [4 /*yield*/, this.apiHttpService.fetchJson("v2/projects/translations/".concat(language))];
                     case 3:
                         data = _a.sent();
+                        this.fetchedDev[language] = true;
                         this.setLanguageData(language, data[language] || {});
                         return [3 /*break*/, 5];
                     case 4:
@@ -2968,19 +2982,16 @@ var Tolgee = /** @class */ (function () {
          * fetching so initial loading is not needed at all.
          */
         get: function () {
-            var _a, _b, _c, _d;
-            if (((_b = (_a = this.properties) === null || _a === void 0 ? void 0 : _a.config) === null || _b === void 0 ? void 0 : _b.mode) !== 'production') {
-                return true;
-            }
+            var _a, _b;
             var currentLang = this.properties.currentLanguage;
             var fallbackLang = this.properties.config.fallbackLanguage;
             var fallbackPreloading = this.properties.config.preloadFallback;
             var isStaticDataProvided = function (data) {
                 return data !== undefined && typeof data !== 'function';
             };
-            return (!isStaticDataProvided((_c = this.properties.config.staticData) === null || _c === void 0 ? void 0 : _c[currentLang]) ||
+            return (!isStaticDataProvided((_a = this.properties.config.staticData) === null || _a === void 0 ? void 0 : _a[currentLang]) ||
                 (!!fallbackPreloading &&
-                    !isStaticDataProvided((_d = this.properties.config.staticData) === null || _d === void 0 ? void 0 : _d[fallbackLang])));
+                    !isStaticDataProvided((_b = this.properties.config.staticData) === null || _b === void 0 ? void 0 : _b[fallbackLang])));
         },
         enumerable: false,
         configurable: true