@tolgee/core 2.1.1 → 2.7.0

package/README.md

@@ -1,10 +1,11 @@
+# Tolgee core library
 ![test workflow](https://github.com/tolgee/tolgee-js/actions/workflows/test.yml/badge.svg)
 ![@tolgee/core version](https://img.shields.io/npm/v/@tolgee/core?label=%40tolgee%2Fcore)
 ![types typescript](https://img.shields.io/badge/Types-Typescript-blue)
 [![twitter](https://img.shields.io/twitter/follow/Tolgee_i18n?style=social)](https://twitter.com/Tolgee_i18n)
 [![github stars](https://img.shields.io/github/stars/tolgee/tolgee-js?style=social)](https://github.com/tolgee/tolgee-js)
 
-# Tolgee core library
+
 
 [<img src="https://raw.githubusercontent.com/tolgee/documentation/main/tolgee_logo_text.svg" alt="Tolgee" width="200" />](https://tolgee.io)
 

package/dist/tolgee.cjs.js

@@ -3785,40 +3785,26 @@ var TranslationHighlighter = /** @class */ (function () {
         var _this = this;
         this.dependencies = dependencies;
         this.translationEdit = function (e, element) { return __awaiter(_this, void 0, void 0, function () {
-            var key;
+            var renderer, key;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0:
-                        if (!(typeof this.renderer === 'object')) return [3 /*break*/, 2];
-                        return [4 /*yield*/, this.getKeyAndDefault(e, element)];
+                    case 0: return [4 /*yield*/, this.getRenderer()];
                     case 1:
+                        renderer = _a.sent();
+                        if (!(typeof renderer === 'object')) return [3 /*break*/, 3];
+                        return [4 /*yield*/, this.getKeyAndDefault(e, element)];
+                    case 2:
                         key = _a.sent();
                         if (key) {
-                            this.renderer.renderViewer(key.key, key.defaultValue);
+                            renderer.renderViewer(key.key, key.defaultValue);
                             return [2 /*return*/];
                         }
                         return [2 /*return*/];
-                    case 2:
-                        // eslint-disable-next-line no-console
-                        console.warn('Tolgee UI is not provided. To translate interactively provide tolgee ui constructor to "ui" configuration property. ' +
-                            'To disable highlighting use production mode.');
-                        return [2 /*return*/];
+                    case 3: return [2 /*return*/];
                 }
             });
         }); };
     }
-    Object.defineProperty(TranslationHighlighter.prototype, "renderer", {
-        get: function () {
-            if (this._renderer === undefined) {
-                if (typeof this.dependencies.properties.config.ui === 'function') {
-                    this._renderer = new this.dependencies.properties.config.ui(this.dependencies);
-                }
-            }
-            return this._renderer;
-        },
-        enumerable: false,
-        configurable: true
-    });
     TranslationHighlighter.getKeyOptions = function (node) {
         var nodes = Array.from(node._tolgee.nodes);
         return nodes.reduce(function (acc, curr) { return __spreadArray(__spreadArray([], __read(acc), false), __read(curr._tolgee.keys.map(function (k) { return ({
@@ -3836,9 +3822,70 @@ var TranslationHighlighter = /** @class */ (function () {
             }
         }); }); });
     };
+    TranslationHighlighter.prototype.getRenderer = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var possibleProviders, possibleProviders_1, possibleProviders_1_1, possibleProvider, constructorProvider, constructor, constructor, e_2_1;
+            var e_2, _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        if (!(this._renderer === undefined)) return [3 /*break*/, 11];
+                        possibleProviders = [
+                            this.dependencies.properties.config.ui,
+                            window['@tolgee/ui'],
+                        ];
+                        _b.label = 1;
+                    case 1:
+                        _b.trys.push([1, 8, 9, 10]);
+                        possibleProviders_1 = __values(possibleProviders), possibleProviders_1_1 = possibleProviders_1.next();
+                        _b.label = 2;
+                    case 2:
+                        if (!!possibleProviders_1_1.done) return [3 /*break*/, 7];
+                        possibleProvider = possibleProviders_1_1.value;
+                        if (!(typeof possibleProvider === 'function')) return [3 /*break*/, 6];
+                        _b.label = 3;
+                    case 3:
+                        _b.trys.push([3, 5, , 6]);
+                        constructorProvider = possibleProvider;
+                        return [4 /*yield*/, constructorProvider()];
+                    case 4:
+                        constructor = _b.sent();
+                        this._renderer = new constructor(this.dependencies);
+                        return [3 /*break*/, 6];
+                    case 5:
+                        _b.sent();
+                        constructor = possibleProvider;
+                        this._renderer = new constructor(this.dependencies);
+                        return [3 /*break*/, 6];
+                    case 6:
+                        possibleProviders_1_1 = possibleProviders_1.next();
+                        return [3 /*break*/, 2];
+                    case 7: return [3 /*break*/, 10];
+                    case 8:
+                        e_2_1 = _b.sent();
+                        e_2 = { error: e_2_1 };
+                        return [3 /*break*/, 10];
+                    case 9:
+                        try {
+                            if (possibleProviders_1_1 && !possibleProviders_1_1.done && (_a = possibleProviders_1.return)) _a.call(possibleProviders_1);
+                        }
+                        finally { if (e_2) throw e_2.error; }
+                        return [7 /*endfinally*/];
+                    case 10:
+                        if (this._renderer === undefined) {
+                            // eslint-disable-next-line no-console
+                            console.warn('Tolgee UI is not provided. To translate interactively provide tolgee ui constructor to "ui" configuration property. ' +
+                                'To disable highlighting use production mode.');
+                        }
+                        _b.label = 11;
+                    case 11: return [2 /*return*/, this._renderer];
+                }
+            });
+        });
+    };
     TranslationHighlighter.prototype.getKeyAndDefault = function (mouseEvent, element) {
         return __awaiter(this, void 0, void 0, function () {
-            var keysWithDefaults, keySet, selectedKey_1, found;
+            var keysWithDefaults, keySet, renderer, selectedKey_1, found;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -3850,19 +3897,22 @@ var TranslationHighlighter = /** @class */ (function () {
                         }
                         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({
+                        if (!(keySet.size > 1)) return [3 /*break*/, 3];
+                        return [4 /*yield*/, this.getRenderer()];
+                    case 1:
+                        renderer = _a.sent();
+                        return [4 /*yield*/, renderer.getKey({
                                 keys: keySet,
                                 openEvent: mouseEvent,
                             })];
-                    case 1:
+                    case 2:
                         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:
+                        _a.label = 3;
+                    case 3:
                         if (keySet.size === 1) {
                             return [2 /*return*/, keysWithDefaults[0]];
                         }
@@ -4271,8 +4321,10 @@ var CoreHandler = /** @class */ (function () {
         this.attributeHandler = attributeHandler;
         this.textService = textService;
         this.wrappedHandler = wrappedHandler;
-        eventService.LANGUAGE_CHANGED.subscribe(this.refresh.bind(this));
-        eventService.TRANSLATION_CHANGED.subscribe(this.refresh.bind(this));
+        if (typeof window !== 'undefined') {
+            eventService.LANGUAGE_CHANGED.subscribe(this.refresh.bind(this));
+            eventService.TRANSLATION_CHANGED.subscribe(this.refresh.bind(this));
+        }
     }
     CoreHandler.prototype.handleSubtree = function (target) {
         return __awaiter(this, void 0, void 0, function () {
@@ -4928,11 +4980,12 @@ var Tolgee = /** @class */ (function () {
         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
@@ -4941,6 +4994,7 @@ var Tolgee = /** @class */ (function () {
                             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()];
@@ -4950,7 +5004,7 @@ var Tolgee = /** @class */ (function () {
                     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)];
                 }
             });
         });