@tolgee/core 2.8.1 → 2.8.2

package/dist/tolgee.cjs.js

@@ -522,7 +522,7 @@ var ApiHttpService = /** @class */ (function () {
     };
     ApiHttpService.prototype.getUrl = function (path) {
         var querySeparator = path.indexOf('?') < 0 ? '?' : '&';
-        return this.properties.config.apiUrl + "/" + path + querySeparator + "ak=" + this.properties.config.apiKey;
+        return "".concat(this.properties.config.apiUrl, "/").concat(path).concat(querySeparator, "ak=").concat(this.properties.config.apiKey);
     };
     return ApiHttpService;
 }());
@@ -581,9 +581,9 @@ var TranslationService = /** @class */ (function () {
                             _e.trys.push([1, 3, , 7]);
                             languagesArray = __spreadArray([], __read(languages), false);
                             languagesQuery = languagesArray
-                                .map(function (l) { return "languages=" + l; })
+                                .map(function (l) { return "languages=".concat(l); })
                                 .join('&');
-                            return [4 /*yield*/, this.apiHttpService.fetchJson("v2/projects/translations?" + languagesQuery + "&filterKeyName=" + encodeURIComponent(key))];
+                            return [4 /*yield*/, this.apiHttpService.fetchJson("v2/projects/translations?".concat(languagesQuery, "&filterKeyName=").concat(encodeURIComponent(key)))];
                         case 2:
                             data = _e.sent();
                             translationData_1 = languagesArray.reduce(function (acc, curr) {
@@ -708,7 +708,7 @@ var TranslationService = /** @class */ (function () {
                 switch (_c.label) {
                     case 0:
                         this.coreService.checkScope('translations.edit');
-                        return [4 /*yield*/, this.apiHttpService.postJson("v2/projects/keys/" + id + "/complex-update", __assign(__assign({}, data), { screenshotUploadedImageIds: ((_a = data.screenshotUploadedImageIds) === null || _a === void 0 ? void 0 : _a.length)
+                        return [4 /*yield*/, this.apiHttpService.postJson("v2/projects/keys/".concat(id, "/complex-update"), __assign(__assign({}, data), { screenshotUploadedImageIds: ((_a = data.screenshotUploadedImageIds) === null || _a === void 0 ? void 0 : _a.length)
                                     ? data.screenshotUploadedImageIds
                                     : undefined, screenshotIdsToDelete: ((_b = data.screenshotIdsToDelete) === null || _b === void 0 ? void 0 : _b.length)
                                     ? data.screenshotIdsToDelete
@@ -866,7 +866,7 @@ var TranslationService = /** @class */ (function () {
                         }
                         _c.label = 3;
                     case 3:
-                        url = "" + (this.properties.config.filesUrlPrefix || '/') + language + ".json";
+                        url = "".concat(this.properties.config.filesUrlPrefix || '/').concat(language, ".json");
                         _c.label = 4;
                     case 4:
                         _c.trys.push([4, 10, , 11]);
@@ -891,14 +891,14 @@ var TranslationService = /** @class */ (function () {
                     case 8:
                         _c.sent();
                         // eslint-disable-next-line no-console
-                        console.error("Error parsing json retrieved from " + url + ".");
+                        console.error("Error parsing json retrieved from ".concat(url, "."));
                         this.setEmptyLanguageData(language);
                         return [3 /*break*/, 9];
                     case 9: return [3 /*break*/, 11];
                     case 10:
                         _c.sent();
                         // eslint-disable-next-line no-console
-                        console.error("Error fetching localization data from " + url + ".");
+                        console.error("Error fetching localization data from ".concat(url, "."));
                         this.setEmptyLanguageData(language);
                         return [3 /*break*/, 11];
                     case 11: return [2 /*return*/];
@@ -916,7 +916,7 @@ var TranslationService = /** @class */ (function () {
                         _a.label = 1;
                     case 1:
                         _a.trys.push([1, 3, , 4]);
-                        return [4 /*yield*/, this.apiHttpService.fetchJson("v2/projects/translations/" + language)];
+                        return [4 /*yield*/, this.apiHttpService.fetchJson("v2/projects/translations/".concat(language))];
                     case 2:
                         data = _a.sent();
                         this.setLanguageData(language, data[language] || {});
@@ -3458,7 +3458,7 @@ var TextService = /** @class */ (function () {
         get: function () {
             var escapedPrefix = this.escapeForRegExp(this.properties.config.inputPrefix);
             var escapedSuffix = this.escapeForRegExp(this.properties.config.inputSuffix);
-            return "(\\\\?)(" + escapedPrefix + "(.*?)" + escapedSuffix + ")";
+            return "(\\\\?)(".concat(escapedPrefix, "(.*?)").concat(escapedSuffix, ")");
         },
         enumerable: false,
         configurable: true
@@ -3618,12 +3618,12 @@ var TextService = /** @class */ (function () {
         var paramString = Object.entries(params)
             .map(function (_a) {
             var _b = __read(_a, 2), name = _b[0], value = _b[1];
-            return _this.escapeParam(name) + ":" + _this.escapeParam(value);
+            return "".concat(_this.escapeParam(name), ":").concat(_this.escapeParam(value));
         })
             .join(',');
-        paramString = paramString.length ? ":" + paramString : '';
-        var defaultString = defaultValue !== undefined ? "," + this.escapeParam(defaultValue) : '';
-        return "" + this.properties.config.inputPrefix + this.escapeParam(key) + defaultString + paramString + this.properties.config.inputSuffix;
+        paramString = paramString.length ? ":".concat(paramString) : '';
+        var defaultString = defaultValue !== undefined ? ",".concat(this.escapeParam(defaultValue)) : '';
+        return "".concat(this.properties.config.inputPrefix).concat(this.escapeParam(key)).concat(defaultString).concat(paramString).concat(this.properties.config.inputSuffix);
     };
     TextService.prototype.getTranslatedWithMetadata = function (text) {
         return __awaiter(this, void 0, void 0, function () {
@@ -4102,7 +4102,7 @@ var AbstractHandler = /** @class */ (function () {
         return nodes.filter(function (n) {
             var e = NodeHelper.closestElement(n);
             return (restrictedElements.indexOf(e.tagName.toLowerCase()) === -1 &&
-                e.closest("[" + RESTRICTED_ASCENDANT_ATTRIBUTE + "=\"true\"]") === null);
+                e.closest("[".concat(RESTRICTED_ASCENDANT_ATTRIBUTE, "=\"true\"]")) === null);
         });
     };
     AbstractHandler.prototype.handleNodes = function (nodes) {
@@ -4228,7 +4228,7 @@ var TextHandler = /** @class */ (function (_super) {
                     case 0:
                         inputPrefix = this.properties.config.inputPrefix;
                         inputSuffix = this.properties.config.inputSuffix;
-                        xPath = "./descendant-or-self::text()[contains(., '" + inputPrefix + "') and contains(., '" + inputSuffix + "')]";
+                        xPath = "./descendant-or-self::text()[contains(., '".concat(inputPrefix, "') and contains(., '").concat(inputSuffix, "')]");
                         nodes = NodeHelper.evaluate(xPath, node);
                         filtered = this.filterRestricted(nodes);
                         return [4 /*yield*/, this.handleNodes(filtered)];
@@ -4277,7 +4277,7 @@ var AttributeHandler = /** @class */ (function (_super) {
                     case 4:
                         if (!!attributes_1_1.done) return [3 /*break*/, 7];
                         attribute = attributes_1_1.value;
-                        expression = "descendant-or-self::" + tag + "/@" + attribute + "[contains(., '" + inputPrefix + "') and contains(., '" + inputSuffix + "')]";
+                        expression = "descendant-or-self::".concat(tag, "/@").concat(attribute, "[contains(., '").concat(inputPrefix, "') and contains(., '").concat(inputSuffix, "')]");
                         nodes = NodeHelper.evaluate(expression, node);
                         return [4 /*yield*/, this.handleNodes(nodes)];
                     case 5:
@@ -4547,7 +4547,7 @@ var CoreService = /** @class */ (function () {
             });
         });
     };
-    CoreService.prototype.getScopes = function () {
+    CoreService.prototype.getApiKeyDetails = function () {
         return __awaiter(this, void 0, void 0, function () {
             var e_1;
             return __generator(this, function (_a) {
@@ -4555,8 +4555,7 @@ var CoreService = /** @class */ (function () {
                     case 0:
                         _a.trys.push([0, 2, , 3]);
                         return [4 /*yield*/, this.apiHttpService.fetchJson("v2/api-keys/current")];
-                    case 1: return [2 /*return*/, (_a.sent())
-                            .scopes];
+                    case 1: return [2 /*return*/, _a.sent()];
                     case 2:
                         e_1 = _a.sent();
                         // eslint-disable-next-line no-console
@@ -4596,7 +4595,7 @@ var WrappedHandler = /** @class */ (function (_super) {
             var xPath, nodes, filtered;
             var _this = this;
             return __generator(this, function (_a) {
-                xPath = "./descendant-or-self::*[@" + TOLGEE_WRAPPED_ONLY_DATA_ATTRIBUTE + "]";
+                xPath = "./descendant-or-self::*[@".concat(TOLGEE_WRAPPED_ONLY_DATA_ATTRIBUTE, "]");
                 nodes = NodeHelper.evaluate(xPath, node);
                 filtered = this.filterRestricted(nodes);
                 filtered.forEach(function (element) {
@@ -4810,7 +4809,7 @@ var ScreenshotService = /** @class */ (function () {
     ScreenshotService.prototype.deleteImages = function (ids) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
-                return [2 /*return*/, this.apiHttpService.post("v2/image-upload/" + ids.join(','), undefined, {
+                return [2 /*return*/, this.apiHttpService.post("v2/image-upload/".concat(ids.join(',')), undefined, {
                         method: 'delete',
                     })];
             });
@@ -4949,7 +4948,7 @@ var Tolgee = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         if (!(this.properties.config.mode === 'development')) return [3 /*break*/, 2];
-                        return [4 /*yield*/, this.loadScopes()];
+                        return [4 /*yield*/, this.loadApiKeyDetails()];
                     case 1:
                         _a.sent();
                         _a.label = 2;
@@ -5004,7 +5003,7 @@ var Tolgee = /** @class */ (function () {
                             orEmpty = props.orEmpty;
                         }
                         if (!(this.properties.config.mode === 'development' && !noWrap)) return [3 /*break*/, 3];
-                        return [4 /*yield*/, this.loadScopes()];
+                        return [4 /*yield*/, this.loadApiKeyDetails()];
                     case 1:
                         _a.sent();
                         return [4 /*yield*/, this.translationService.loadTranslations()];
@@ -5035,19 +5034,19 @@ var Tolgee = /** @class */ (function () {
         }
         return this.dependencyStore.textService.instant(key, params, undefined, orEmpty, defaultValue);
     };
-    Tolgee.prototype.loadScopes = function () {
+    Tolgee.prototype.loadApiKeyDetails = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var _a;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            var details;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
                     case 0:
                         if (!(this.properties.scopes === undefined)) return [3 /*break*/, 2];
-                        _a = this.properties;
-                        return [4 /*yield*/, this.dependencyStore.coreService.getScopes()];
+                        return [4 /*yield*/, this.dependencyStore.coreService.getApiKeyDetails()];
                     case 1:
-                        _a.scopes =
-                            _b.sent();
-                        _b.label = 2;
+                        details = _a.sent();
+                        this.properties.scopes = details.scopes;
+                        this.properties.projectId = details.projectId;
+                        _a.label = 2;
                     case 2: return [2 /*return*/];
                 }
             });