@tramvai/module-child-app 5.9.2 → 5.14.9

package/lib/browser/loader.browser.js

@@ -36,10 +36,9 @@ class BrowserLoader extends Loader {
                 moduleName,
             });
             const promise = (async () => {
-                var _a;
                 // `resolveOnCssFailed: true` - allow to load module without server preloading on the client-side
                 await loadModule(config.client.entry, {
-                    cssUrl: (_a = config.css) === null || _a === void 0 ? void 0 : _a.entry,
+                    cssUrl: config.css?.entry,
                     resolveOnCssFailed: true,
                 });
                 container = getModuleFromGlobal(config.client.entry);

package/lib/browser/preload.browser.js

@@ -182,7 +182,7 @@ class PreloadManager {
     // preload child app page component - we need to register page actions before running all child app actions
     async resolveComponent(config, route) {
         const di = this.diManager.getChildDi(config);
-        const childAppPageService = di === null || di === void 0 ? void 0 : di.get(optional(CHILD_APP_PAGE_SERVICE_TOKEN));
+        const childAppPageService = di?.get(optional(CHILD_APP_PAGE_SERVICE_TOKEN));
         if (childAppPageService) {
             await childAppPageService.resolveComponent(route);
         }

package/lib/browser/providers.browser.js

@@ -33,7 +33,7 @@ const browserProviders = [
     }),
     provide({
         provide: CHILD_APP_COMMON_INITIAL_STATE_TOKEN,
-        useFactory: () => { var _a, _b; return JSON.parse((_b = (_a = document.getElementById(GLOBAL_CHILD_STATE)) === null || _a === void 0 ? void 0 : _a.textContent) !== null && _b !== void 0 ? _b : '{}'); },
+        useFactory: () => JSON.parse(document.getElementById(GLOBAL_CHILD_STATE)?.textContent ?? '{}'),
     }),
     provide({
         provide: CHILD_APP_RENDER_MANAGER_TOKEN,

package/lib/contracts/contractManager.base.browser.js

@@ -7,15 +7,14 @@ import { CHILD_APP_INTERNAL_CONFIG_TOKEN, IS_CHILD_APP_CONTRACTS_COMPATIBLE_TOKE
 class BaseChildAppContractManager {
     constructor({ appDi, hostProvidedContracts, hostRequiredContracts, logger, }) {
         this.appDi = appDi;
-        this.hostProvidedContracts = hostProvidedContracts !== null && hostProvidedContracts !== void 0 ? hostProvidedContracts : [];
-        this.hostRequiredContracts = hostRequiredContracts !== null && hostRequiredContracts !== void 0 ? hostRequiredContracts : [];
+        this.hostProvidedContracts = hostProvidedContracts ?? [];
+        this.hostRequiredContracts = hostRequiredContracts ?? [];
         this.log = logger('child-app:contract-manager');
     }
     registerChildContracts(childDi) {
-        var _a, _b;
         const childAppConfig = childDi.get(CHILD_APP_INTERNAL_CONFIG_TOKEN);
         const childHasContractsSupport = childDi.get(optional(IS_CHILD_APP_CONTRACTS_COMPATIBLE_TOKEN));
-        const childRequiredContracts = flatten((_a = childDi.get(optional(CHILD_REQUIRED_CONTRACTS))) !== null && _a !== void 0 ? _a : []);
+        const childRequiredContracts = flatten(childDi.get(optional(CHILD_REQUIRED_CONTRACTS)) ?? []);
         const hostProvidedContracts = this.getHostProvidedContracts(childAppConfig.name);
         const hostProvidedContractsKeys = hostProvidedContracts.map((c) => c.toString());
         // if contracts unsupported, it is a legacy child app, and we need to register all possible contracts
@@ -44,7 +43,7 @@ class BaseChildAppContractManager {
                     message: `Missed contracts for "${childAppConfig.name}" Child App`,
                     missedContracts,
                 });
-                const fallbacks = (_b = childDi.get(optional(CHILD_CONTRACTS_FALLBACK))) !== null && _b !== void 0 ? _b : [];
+                const fallbacks = childDi.get(optional(CHILD_CONTRACTS_FALLBACK)) ?? [];
                 fallbacks.forEach((fallback) => {
                     fallback({
                         childDi,
@@ -55,7 +54,6 @@ class BaseChildAppContractManager {
         }
     }
     validateChildProvidedContracts(childDi) {
-        var _a;
         const childAppConfig = childDi.get(CHILD_APP_INTERNAL_CONFIG_TOKEN);
         const hostDi = this.getRequestHostDi();
         const childProvidedContracts = this.getChildProvidedContracts(childDi);
@@ -73,7 +71,7 @@ class BaseChildAppContractManager {
                 message: `Missed contracts for application, required from "${childAppConfig.name}" Child App`,
                 missedContracts,
             });
-            const fallbacks = (_a = hostDi.get(optional(HOST_CONTRACTS_FALLBACK))) !== null && _a !== void 0 ? _a : [];
+            const fallbacks = hostDi.get(optional(HOST_CONTRACTS_FALLBACK)) ?? [];
             fallbacks.forEach((fallback) => {
                 fallback({
                     hostDi,
@@ -83,7 +81,6 @@ class BaseChildAppContractManager {
         }
     }
     async getChildProvidedContract(childAppName, contract) {
-        var _a, _b, _c, _d;
         try {
             // Resolve CHILD_APP_PRELOAD_MANAGER_TOKEN from DI to prevent circular dependency error
             const childAppPreloadManager = this.appDi.get(CHILD_APP_PRELOAD_MANAGER_TOKEN);
@@ -105,23 +102,24 @@ class BaseChildAppContractManager {
         if (!childProvidedContractsKeys.includes(contract.toString())) {
             this.log.warn(`Contract "${contract}" is not provided in the "${childAppName}" Child App`);
         }
-        const result = ((_d = (_c = (_a = childAppDi === null || childAppDi === void 0 ? void 0 : childAppDi.get(optional(contract))) !== null && _a !== void 0 ? _a : 
-        // contract can be registered in host DI in fallback
-        (_b = this.getRequestHostDi()) === null || _b === void 0 ? void 0 : _b.get(optional(contract))) !== null && _c !== void 0 ? _c : this.appDi.get(optional(contract))) !== null && _d !== void 0 ? _d : null);
+        const result = (childAppDi?.get(optional(contract)) ??
+            // contract can be registered in host DI in fallback
+            this.getRequestHostDi()?.get(optional(contract)) ??
+            this.appDi.get(optional(contract)) ??
+            null);
         if (isNil(result)) {
             this.log.warn(`Contract "${contract}" is declared but not provided in the "${childAppName}" Child App or application contracts fallback`);
         }
         return result;
     }
     getChildDi(childAppName) {
-        var _a;
         // Resolve CHILD_APP_RESOLVE_CONFIG_TOKEN from DI to prevent scope conflict warning
-        const resolveChildAppConfig = ((_a = this.getRequestHostDi()) !== null && _a !== void 0 ? _a : this.appDi).get(CHILD_APP_RESOLVE_CONFIG_TOKEN);
+        const resolveChildAppConfig = (this.getRequestHostDi() ?? this.appDi).get(CHILD_APP_RESOLVE_CONFIG_TOKEN);
         const childAppConfig = resolveChildAppConfig({ name: childAppName });
         // ContractManager has Singleton scope, and we need to get Request scope Child App DI container.
         // At server-side it will be resolved from Async Local Storage, at client-side everything is Singleton
         const childAppDiManager = this.getRequestChildDiManager();
-        const childAppDi = childAppDiManager === null || childAppDiManager === void 0 ? void 0 : childAppDiManager.getChildDi(childAppConfig);
+        const childAppDi = childAppDiManager?.getChildDi(childAppConfig);
         return childAppDi;
     }
     /**
@@ -130,9 +128,8 @@ class BaseChildAppContractManager {
      * - `string` is used in case when `getChildProvidedContract` call this method
      */
     getChildProvidedContracts(childAppNameOrDi) {
-        var _a;
         const childAppDi = typeof childAppNameOrDi === 'string' ? this.getChildDi(childAppNameOrDi) : childAppNameOrDi;
-        const childProvidedContracts = flatten((_a = childAppDi === null || childAppDi === void 0 ? void 0 : childAppDi.get(optional(CHILD_PROVIDED_CONTRACTS))) !== null && _a !== void 0 ? _a : []);
+        const childProvidedContracts = flatten(childAppDi?.get(optional(CHILD_PROVIDED_CONTRACTS)) ?? []);
         return childProvidedContracts;
     }
     getHostProvidedContracts(childAppName) {

package/lib/contracts/contractManager.base.es.js

@@ -7,15 +7,14 @@ import { CHILD_APP_INTERNAL_CONFIG_TOKEN, IS_CHILD_APP_CONTRACTS_COMPATIBLE_TOKE
 class BaseChildAppContractManager {
     constructor({ appDi, hostProvidedContracts, hostRequiredContracts, logger, }) {
         this.appDi = appDi;
-        this.hostProvidedContracts = hostProvidedContracts !== null && hostProvidedContracts !== void 0 ? hostProvidedContracts : [];
-        this.hostRequiredContracts = hostRequiredContracts !== null && hostRequiredContracts !== void 0 ? hostRequiredContracts : [];
+        this.hostProvidedContracts = hostProvidedContracts ?? [];
+        this.hostRequiredContracts = hostRequiredContracts ?? [];
         this.log = logger('child-app:contract-manager');
     }
     registerChildContracts(childDi) {
-        var _a, _b;
         const childAppConfig = childDi.get(CHILD_APP_INTERNAL_CONFIG_TOKEN);
         const childHasContractsSupport = childDi.get(optional(IS_CHILD_APP_CONTRACTS_COMPATIBLE_TOKEN));
-        const childRequiredContracts = flatten((_a = childDi.get(optional(CHILD_REQUIRED_CONTRACTS))) !== null && _a !== void 0 ? _a : []);
+        const childRequiredContracts = flatten(childDi.get(optional(CHILD_REQUIRED_CONTRACTS)) ?? []);
         const hostProvidedContracts = this.getHostProvidedContracts(childAppConfig.name);
         const hostProvidedContractsKeys = hostProvidedContracts.map((c) => c.toString());
         // if contracts unsupported, it is a legacy child app, and we need to register all possible contracts
@@ -44,7 +43,7 @@ class BaseChildAppContractManager {
                     message: `Missed contracts for "${childAppConfig.name}" Child App`,
                     missedContracts,
                 });
-                const fallbacks = (_b = childDi.get(optional(CHILD_CONTRACTS_FALLBACK))) !== null && _b !== void 0 ? _b : [];
+                const fallbacks = childDi.get(optional(CHILD_CONTRACTS_FALLBACK)) ?? [];
                 fallbacks.forEach((fallback) => {
                     fallback({
                         childDi,
@@ -55,7 +54,6 @@ class BaseChildAppContractManager {
         }
     }
     validateChildProvidedContracts(childDi) {
-        var _a;
         const childAppConfig = childDi.get(CHILD_APP_INTERNAL_CONFIG_TOKEN);
         const hostDi = this.getRequestHostDi();
         const childProvidedContracts = this.getChildProvidedContracts(childDi);
@@ -73,7 +71,7 @@ class BaseChildAppContractManager {
                 message: `Missed contracts for application, required from "${childAppConfig.name}" Child App`,
                 missedContracts,
             });
-            const fallbacks = (_a = hostDi.get(optional(HOST_CONTRACTS_FALLBACK))) !== null && _a !== void 0 ? _a : [];
+            const fallbacks = hostDi.get(optional(HOST_CONTRACTS_FALLBACK)) ?? [];
             fallbacks.forEach((fallback) => {
                 fallback({
                     hostDi,
@@ -83,7 +81,6 @@ class BaseChildAppContractManager {
         }
     }
     async getChildProvidedContract(childAppName, contract) {
-        var _a, _b, _c, _d;
         try {
             // Resolve CHILD_APP_PRELOAD_MANAGER_TOKEN from DI to prevent circular dependency error
             const childAppPreloadManager = this.appDi.get(CHILD_APP_PRELOAD_MANAGER_TOKEN);
@@ -105,23 +102,24 @@ class BaseChildAppContractManager {
         if (!childProvidedContractsKeys.includes(contract.toString())) {
             this.log.warn(`Contract "${contract}" is not provided in the "${childAppName}" Child App`);
         }
-        const result = ((_d = (_c = (_a = childAppDi === null || childAppDi === void 0 ? void 0 : childAppDi.get(optional(contract))) !== null && _a !== void 0 ? _a : 
-        // contract can be registered in host DI in fallback
-        (_b = this.getRequestHostDi()) === null || _b === void 0 ? void 0 : _b.get(optional(contract))) !== null && _c !== void 0 ? _c : this.appDi.get(optional(contract))) !== null && _d !== void 0 ? _d : null);
+        const result = (childAppDi?.get(optional(contract)) ??
+            // contract can be registered in host DI in fallback
+            this.getRequestHostDi()?.get(optional(contract)) ??
+            this.appDi.get(optional(contract)) ??
+            null);
         if (isNil(result)) {
             this.log.warn(`Contract "${contract}" is declared but not provided in the "${childAppName}" Child App or application contracts fallback`);
         }
         return result;
     }
     getChildDi(childAppName) {
-        var _a;
         // Resolve CHILD_APP_RESOLVE_CONFIG_TOKEN from DI to prevent scope conflict warning
-        const resolveChildAppConfig = ((_a = this.getRequestHostDi()) !== null && _a !== void 0 ? _a : this.appDi).get(CHILD_APP_RESOLVE_CONFIG_TOKEN);
+        const resolveChildAppConfig = (this.getRequestHostDi() ?? this.appDi).get(CHILD_APP_RESOLVE_CONFIG_TOKEN);
         const childAppConfig = resolveChildAppConfig({ name: childAppName });
         // ContractManager has Singleton scope, and we need to get Request scope Child App DI container.
         // At server-side it will be resolved from Async Local Storage, at client-side everything is Singleton
         const childAppDiManager = this.getRequestChildDiManager();
-        const childAppDi = childAppDiManager === null || childAppDiManager === void 0 ? void 0 : childAppDiManager.getChildDi(childAppConfig);
+        const childAppDi = childAppDiManager?.getChildDi(childAppConfig);
         return childAppDi;
     }
     /**
@@ -130,9 +128,8 @@ class BaseChildAppContractManager {
      * - `string` is used in case when `getChildProvidedContract` call this method
      */
     getChildProvidedContracts(childAppNameOrDi) {
-        var _a;
         const childAppDi = typeof childAppNameOrDi === 'string' ? this.getChildDi(childAppNameOrDi) : childAppNameOrDi;
-        const childProvidedContracts = flatten((_a = childAppDi === null || childAppDi === void 0 ? void 0 : childAppDi.get(optional(CHILD_PROVIDED_CONTRACTS))) !== null && _a !== void 0 ? _a : []);
+        const childProvidedContracts = flatten(childAppDi?.get(optional(CHILD_PROVIDED_CONTRACTS)) ?? []);
         return childProvidedContracts;
     }
     getHostProvidedContracts(childAppName) {

package/lib/contracts/contractManager.base.js

@@ -16,15 +16,14 @@ var isNil__default = /*#__PURE__*/_interopDefaultLegacy(isNil);
 class BaseChildAppContractManager {
     constructor({ appDi, hostProvidedContracts, hostRequiredContracts, logger, }) {
         this.appDi = appDi;
-        this.hostProvidedContracts = hostProvidedContracts !== null && hostProvidedContracts !== void 0 ? hostProvidedContracts : [];
-        this.hostRequiredContracts = hostRequiredContracts !== null && hostRequiredContracts !== void 0 ? hostRequiredContracts : [];
+        this.hostProvidedContracts = hostProvidedContracts ?? [];
+        this.hostRequiredContracts = hostRequiredContracts ?? [];
         this.log = logger('child-app:contract-manager');
     }
     registerChildContracts(childDi) {
-        var _a, _b;
         const childAppConfig = childDi.get(tokensChildApp.CHILD_APP_INTERNAL_CONFIG_TOKEN);
         const childHasContractsSupport = childDi.get(dippy.optional(tokensChildApp.IS_CHILD_APP_CONTRACTS_COMPATIBLE_TOKEN));
-        const childRequiredContracts = flatten__default["default"]((_a = childDi.get(dippy.optional(tokensChildApp.CHILD_REQUIRED_CONTRACTS))) !== null && _a !== void 0 ? _a : []);
+        const childRequiredContracts = flatten__default["default"](childDi.get(dippy.optional(tokensChildApp.CHILD_REQUIRED_CONTRACTS)) ?? []);
         const hostProvidedContracts = this.getHostProvidedContracts(childAppConfig.name);
         const hostProvidedContractsKeys = hostProvidedContracts.map((c) => c.toString());
         // if contracts unsupported, it is a legacy child app, and we need to register all possible contracts
@@ -53,7 +52,7 @@ class BaseChildAppContractManager {
                     message: `Missed contracts for "${childAppConfig.name}" Child App`,
                     missedContracts,
                 });
-                const fallbacks = (_b = childDi.get(dippy.optional(tokensChildApp.CHILD_CONTRACTS_FALLBACK))) !== null && _b !== void 0 ? _b : [];
+                const fallbacks = childDi.get(dippy.optional(tokensChildApp.CHILD_CONTRACTS_FALLBACK)) ?? [];
                 fallbacks.forEach((fallback) => {
                     fallback({
                         childDi,
@@ -64,7 +63,6 @@ class BaseChildAppContractManager {
         }
     }
     validateChildProvidedContracts(childDi) {
-        var _a;
         const childAppConfig = childDi.get(tokensChildApp.CHILD_APP_INTERNAL_CONFIG_TOKEN);
         const hostDi = this.getRequestHostDi();
         const childProvidedContracts = this.getChildProvidedContracts(childDi);
@@ -82,7 +80,7 @@ class BaseChildAppContractManager {
                 message: `Missed contracts for application, required from "${childAppConfig.name}" Child App`,
                 missedContracts,
             });
-            const fallbacks = (_a = hostDi.get(dippy.optional(tokensChildApp.HOST_CONTRACTS_FALLBACK))) !== null && _a !== void 0 ? _a : [];
+            const fallbacks = hostDi.get(dippy.optional(tokensChildApp.HOST_CONTRACTS_FALLBACK)) ?? [];
             fallbacks.forEach((fallback) => {
                 fallback({
                     hostDi,
@@ -92,7 +90,6 @@ class BaseChildAppContractManager {
         }
     }
     async getChildProvidedContract(childAppName, contract) {
-        var _a, _b, _c, _d;
         try {
             // Resolve CHILD_APP_PRELOAD_MANAGER_TOKEN from DI to prevent circular dependency error
             const childAppPreloadManager = this.appDi.get(tokensChildApp.CHILD_APP_PRELOAD_MANAGER_TOKEN);
@@ -114,23 +111,24 @@ class BaseChildAppContractManager {
         if (!childProvidedContractsKeys.includes(contract.toString())) {
             this.log.warn(`Contract "${contract}" is not provided in the "${childAppName}" Child App`);
         }
-        const result = ((_d = (_c = (_a = childAppDi === null || childAppDi === void 0 ? void 0 : childAppDi.get(dippy.optional(contract))) !== null && _a !== void 0 ? _a : 
-        // contract can be registered in host DI in fallback
-        (_b = this.getRequestHostDi()) === null || _b === void 0 ? void 0 : _b.get(dippy.optional(contract))) !== null && _c !== void 0 ? _c : this.appDi.get(dippy.optional(contract))) !== null && _d !== void 0 ? _d : null);
+        const result = (childAppDi?.get(dippy.optional(contract)) ??
+            // contract can be registered in host DI in fallback
+            this.getRequestHostDi()?.get(dippy.optional(contract)) ??
+            this.appDi.get(dippy.optional(contract)) ??
+            null);
         if (isNil__default["default"](result)) {
             this.log.warn(`Contract "${contract}" is declared but not provided in the "${childAppName}" Child App or application contracts fallback`);
         }
         return result;
     }
     getChildDi(childAppName) {
-        var _a;
         // Resolve CHILD_APP_RESOLVE_CONFIG_TOKEN from DI to prevent scope conflict warning
-        const resolveChildAppConfig = ((_a = this.getRequestHostDi()) !== null && _a !== void 0 ? _a : this.appDi).get(tokensChildApp.CHILD_APP_RESOLVE_CONFIG_TOKEN);
+        const resolveChildAppConfig = (this.getRequestHostDi() ?? this.appDi).get(tokensChildApp.CHILD_APP_RESOLVE_CONFIG_TOKEN);
         const childAppConfig = resolveChildAppConfig({ name: childAppName });
         // ContractManager has Singleton scope, and we need to get Request scope Child App DI container.
         // At server-side it will be resolved from Async Local Storage, at client-side everything is Singleton
         const childAppDiManager = this.getRequestChildDiManager();
-        const childAppDi = childAppDiManager === null || childAppDiManager === void 0 ? void 0 : childAppDiManager.getChildDi(childAppConfig);
+        const childAppDi = childAppDiManager?.getChildDi(childAppConfig);
         return childAppDi;
     }
     /**
@@ -139,9 +137,8 @@ class BaseChildAppContractManager {
      * - `string` is used in case when `getChildProvidedContract` call this method
      */
     getChildProvidedContracts(childAppNameOrDi) {
-        var _a;
         const childAppDi = typeof childAppNameOrDi === 'string' ? this.getChildDi(childAppNameOrDi) : childAppNameOrDi;
-        const childProvidedContracts = flatten__default["default"]((_a = childAppDi === null || childAppDi === void 0 ? void 0 : childAppDi.get(dippy.optional(tokensChildApp.CHILD_PROVIDED_CONTRACTS))) !== null && _a !== void 0 ? _a : []);
+        const childProvidedContracts = flatten__default["default"](childAppDi?.get(dippy.optional(tokensChildApp.CHILD_PROVIDED_CONTRACTS)) ?? []);
         return childProvidedContracts;
     }
     getHostProvidedContracts(childAppName) {

package/lib/contracts/contractManager.server.es.js

@@ -17,8 +17,8 @@ class ChildAppContractManager extends BaseChildAppContractManager {
         childDi.register(provide({
             provide: contract,
             useFactory: () => {
-                var _a, _b, _c;
-                const value = (_c = (_b = (_a = this.asyncLocalStorage.getStore()) === null || _a === void 0 ? void 0 : _a.tramvaiRequestDi) === null || _b === void 0 ? void 0 : _b.get(optional(contract))) !== null && _c !== void 0 ? _c : this.appDi.get(optional(contract));
+                const value = this.asyncLocalStorage.getStore()?.tramvaiRequestDi?.get(optional(contract)) ??
+                    this.appDi.get(optional(contract));
                 if (isNil(value)) {
                     const { name } = childDi.get(CHILD_APP_INTERNAL_CONFIG_TOKEN);
                     this.log.warn(`Contract "${contract}" for "${name}" Child App is declared but not provided in the application or contracts fallback`);
@@ -29,13 +29,12 @@ class ChildAppContractManager extends BaseChildAppContractManager {
         }));
     }
     getRequestHostDi() {
-        var _a, _b;
-        return (_b = (_a = this.asyncLocalStorage.getStore()) === null || _a === void 0 ? void 0 : _a.tramvaiRequestDi) !== null && _b !== void 0 ? _b : null;
+        return this.asyncLocalStorage.getStore()?.tramvaiRequestDi ?? null;
     }
     getRequestChildDiManager() {
-        var _a, _b, _c;
-        return ((_c = (_b = (_a = this.asyncLocalStorage
-            .getStore()) === null || _a === void 0 ? void 0 : _a.tramvaiRequestDi) === null || _b === void 0 ? void 0 : _b.get(optional(CHILD_APP_DI_MANAGER_TOKEN))) !== null && _c !== void 0 ? _c : null);
+        return (this.asyncLocalStorage
+            .getStore()
+            ?.tramvaiRequestDi?.get(optional(CHILD_APP_DI_MANAGER_TOKEN)) ?? null);
     }
 }
 

package/lib/contracts/contractManager.server.js

@@ -25,8 +25,8 @@ class ChildAppContractManager extends contractManager_base.BaseChildAppContractM
         childDi.register(dippy.provide({
             provide: contract,
             useFactory: () => {
-                var _a, _b, _c;
-                const value = (_c = (_b = (_a = this.asyncLocalStorage.getStore()) === null || _a === void 0 ? void 0 : _a.tramvaiRequestDi) === null || _b === void 0 ? void 0 : _b.get(dippy.optional(contract))) !== null && _c !== void 0 ? _c : this.appDi.get(dippy.optional(contract));
+                const value = this.asyncLocalStorage.getStore()?.tramvaiRequestDi?.get(dippy.optional(contract)) ??
+                    this.appDi.get(dippy.optional(contract));
                 if (isNil__default["default"](value)) {
                     const { name } = childDi.get(tokensChildApp.CHILD_APP_INTERNAL_CONFIG_TOKEN);
                     this.log.warn(`Contract "${contract}" for "${name}" Child App is declared but not provided in the application or contracts fallback`);
@@ -37,13 +37,12 @@ class ChildAppContractManager extends contractManager_base.BaseChildAppContractM
         }));
     }
     getRequestHostDi() {
-        var _a, _b;
-        return (_b = (_a = this.asyncLocalStorage.getStore()) === null || _a === void 0 ? void 0 : _a.tramvaiRequestDi) !== null && _b !== void 0 ? _b : null;
+        return this.asyncLocalStorage.getStore()?.tramvaiRequestDi ?? null;
     }
     getRequestChildDiManager() {
-        var _a, _b, _c;
-        return ((_c = (_b = (_a = this.asyncLocalStorage
-            .getStore()) === null || _a === void 0 ? void 0 : _a.tramvaiRequestDi) === null || _b === void 0 ? void 0 : _b.get(dippy.optional(tokensChildApp.CHILD_APP_DI_MANAGER_TOKEN))) !== null && _c !== void 0 ? _c : null);
+        return (this.asyncLocalStorage
+            .getStore()
+            ?.tramvaiRequestDi?.get(dippy.optional(tokensChildApp.CHILD_APP_DI_MANAGER_TOKEN)) ?? null);
     }
 }
 

package/lib/server/preload.es.js

@@ -32,7 +32,7 @@ class PreloadManager {
             .then(async () => {
             // preload child app page component - we need to register page actions before running all child app actions
             const di = this.diManager.getChildDi(config);
-            const childAppPageService = di === null || di === void 0 ? void 0 : di.get(optional(CHILD_APP_PAGE_SERVICE_TOKEN));
+            const childAppPageService = di?.get(optional(CHILD_APP_PAGE_SERVICE_TOKEN));
             if (childAppPageService) {
                 await childAppPageService.resolveComponent();
             }

package/lib/server/preload.js

@@ -36,7 +36,7 @@ class PreloadManager {
             .then(async () => {
             // preload child app page component - we need to register page actions before running all child app actions
             const di = this.diManager.getChildDi(config);
-            const childAppPageService = di === null || di === void 0 ? void 0 : di.get(dippy.optional(tokensChildApp.CHILD_APP_PAGE_SERVICE_TOKEN));
+            const childAppPageService = di?.get(dippy.optional(tokensChildApp.CHILD_APP_PAGE_SERVICE_TOKEN));
             if (childAppPageService) {
                 await childAppPageService.resolveComponent();
             }

package/lib/server/render-slots.es.js

@@ -90,23 +90,24 @@ const registerChildAppRenderSlots = ({ logger, diManager, resolveFullConfig, pre
     }
     // eslint-disable-next-line max-statements
     preloadedList.forEach((requestConfig) => {
-        var _a, _b, _c, _d;
         const config = resolveFullConfig(requestConfig);
         if (!config) {
             return;
         }
         const stats = 'getStats' in loader ? loader.getStats(config) : undefined;
         const di = diManager.getChildDi(config);
-        const loadableAssets = (_a = di === null || di === void 0 ? void 0 : di.get(CHILD_APP_INTERNAL_CHUNK_EXTRACTOR)) === null || _a === void 0 ? void 0 : _a.getMainAssets();
+        const loadableAssets = di?.get(CHILD_APP_INTERNAL_CHUNK_EXTRACTOR)?.getMainAssets();
         addChunk(config.client.entry, true);
         if (config.css) {
             addChunk(config.css.entry);
         }
-        loadableAssets === null || loadableAssets === void 0 ? void 0 : loadableAssets.map((asset) => resolve(config.client.baseUrl, asset.filename)).filter((file) => {
-            var _a;
+        loadableAssets
+            ?.map((asset) => resolve(config.client.baseUrl, asset.filename))
+            .filter((file) => {
             // filter entry js and css chunks
-            return config.client.entry !== file && ((_a = config.css) === null || _a === void 0 ? void 0 : _a.entry) !== file;
-        }).forEach((file) => {
+            return config.client.entry !== file && config.css?.entry !== file;
+        })
+            .forEach((file) => {
             addChunk(file);
         });
         if (stats && stats.federatedModules) {
@@ -114,7 +115,7 @@ const registerChildAppRenderSlots = ({ logger, diManager, resolveFullConfig, pre
                 // entries are duplicated in the `exposes` field of federated stats for some reason
                 // for now there anyway should be only one exposed entry so took the first available
                 const files = new Set();
-                (_c = (_b = federatedModule === null || federatedModule === void 0 ? void 0 : federatedModule.exposes) === null || _b === void 0 ? void 0 : _b.entry) === null || _c === void 0 ? void 0 : _c.forEach((entry) => {
+                federatedModule?.exposes?.entry?.forEach((entry) => {
                     for (const key in entry) {
                         entry[key].forEach((file) => files.add(file));
                     }
@@ -123,10 +124,10 @@ const registerChildAppRenderSlots = ({ logger, diManager, resolveFullConfig, pre
                     addChunk(resolve(config.client.baseUrl, file));
                 }
                 for (const sharedModule of federatedModule.sharedModules) {
-                    const { shareKey } = (_d = sharedModule.provides) === null || _d === void 0 ? void 0 : _d[0];
+                    const { shareKey } = sharedModule.provides?.[0];
                     const { chunks } = sharedModule;
                     const bestShared = mapSharedToChildApp.get(shareKey);
-                    if (!(bestShared === null || bestShared === void 0 ? void 0 : bestShared.eager) && (bestShared === null || bestShared === void 0 ? void 0 : bestShared.name) === config.name) {
+                    if (!bestShared?.eager && bestShared?.name === config.name) {
                         for (const chunk of chunks) {
                             addChunk(resolve(config.client.baseUrl, chunk));
                         }

package/lib/server/render-slots.js

@@ -98,23 +98,24 @@ const registerChildAppRenderSlots = ({ logger, diManager, resolveFullConfig, pre
     }
     // eslint-disable-next-line max-statements
     preloadedList.forEach((requestConfig) => {
-        var _a, _b, _c, _d;
         const config = resolveFullConfig(requestConfig);
         if (!config) {
             return;
         }
         const stats = 'getStats' in loader ? loader.getStats(config) : undefined;
         const di = diManager.getChildDi(config);
-        const loadableAssets = (_a = di === null || di === void 0 ? void 0 : di.get(tokensChildApp.CHILD_APP_INTERNAL_CHUNK_EXTRACTOR)) === null || _a === void 0 ? void 0 : _a.getMainAssets();
+        const loadableAssets = di?.get(tokensChildApp.CHILD_APP_INTERNAL_CHUNK_EXTRACTOR)?.getMainAssets();
         addChunk(config.client.entry, true);
         if (config.css) {
             addChunk(config.css.entry);
         }
-        loadableAssets === null || loadableAssets === void 0 ? void 0 : loadableAssets.map((asset) => url.resolve(config.client.baseUrl, asset.filename)).filter((file) => {
-            var _a;
+        loadableAssets
+            ?.map((asset) => url.resolve(config.client.baseUrl, asset.filename))
+            .filter((file) => {
             // filter entry js and css chunks
-            return config.client.entry !== file && ((_a = config.css) === null || _a === void 0 ? void 0 : _a.entry) !== file;
-        }).forEach((file) => {
+            return config.client.entry !== file && config.css?.entry !== file;
+        })
+            .forEach((file) => {
             addChunk(file);
         });
         if (stats && stats.federatedModules) {
@@ -122,7 +123,7 @@ const registerChildAppRenderSlots = ({ logger, diManager, resolveFullConfig, pre
                 // entries are duplicated in the `exposes` field of federated stats for some reason
                 // for now there anyway should be only one exposed entry so took the first available
                 const files = new Set();
-                (_c = (_b = federatedModule === null || federatedModule === void 0 ? void 0 : federatedModule.exposes) === null || _b === void 0 ? void 0 : _b.entry) === null || _c === void 0 ? void 0 : _c.forEach((entry) => {
+                federatedModule?.exposes?.entry?.forEach((entry) => {
                     for (const key in entry) {
                         entry[key].forEach((file) => files.add(file));
                     }
@@ -131,10 +132,10 @@ const registerChildAppRenderSlots = ({ logger, diManager, resolveFullConfig, pre
                     addChunk(url.resolve(config.client.baseUrl, file));
                 }
                 for (const sharedModule of federatedModule.sharedModules) {
-                    const { shareKey } = (_d = sharedModule.provides) === null || _d === void 0 ? void 0 : _d[0];
+                    const { shareKey } = sharedModule.provides?.[0];
                     const { chunks } = sharedModule;
                     const bestShared = mapSharedToChildApp.get(shareKey);
-                    if (!(bestShared === null || bestShared === void 0 ? void 0 : bestShared.eager) && (bestShared === null || bestShared === void 0 ? void 0 : bestShared.name) === config.name) {
+                    if (!bestShared?.eager && bestShared?.name === config.name) {
                         for (const chunk of chunks) {
                             addChunk(url.resolve(config.client.baseUrl, chunk));
                         }

package/lib/server/stateManager.es.js

@@ -9,7 +9,7 @@ const executeRootStateSubscriptions = ({ store, diManager, }) => {
                 token: CHILD_APP_INTERNAL_ROOT_STATE_SUBSCRIPTION_TOKEN,
                 optional: true,
             });
-            subscriptions === null || subscriptions === void 0 ? void 0 : subscriptions.forEach((sub) => {
+            subscriptions?.forEach((sub) => {
                 sub.listener(state);
             });
         });

package/lib/server/stateManager.js

@@ -13,7 +13,7 @@ const executeRootStateSubscriptions = ({ store, diManager, }) => {
                 token: tokensChildApp.CHILD_APP_INTERNAL_ROOT_STATE_SUBSCRIPTION_TOKEN,
                 optional: true,
             });
-            subscriptions === null || subscriptions === void 0 ? void 0 : subscriptions.forEach((sub) => {
+            subscriptions?.forEach((sub) => {
                 sub.listener(state);
             });
         });

package/lib/shared/child/extractorProviders.es.js

@@ -7,7 +7,7 @@ const extractorProviders = (loadableStats) => [
         provide: CHILD_APP_INTERNAL_CHUNK_EXTRACTOR,
         scope: Scope.REQUEST,
         useFactory: () => {
-            return new ChunkExtractor({ stats: loadableStats !== null && loadableStats !== void 0 ? loadableStats : {}, entrypoints: [] });
+            return new ChunkExtractor({ stats: loadableStats ?? {}, entrypoints: [] });
         },
     }),
 ];

package/lib/shared/child/extractorProviders.js

@@ -11,7 +11,7 @@ const extractorProviders = (loadableStats) => [
         provide: tokensChildApp.CHILD_APP_INTERNAL_CHUNK_EXTRACTOR,
         scope: core.Scope.REQUEST,
         useFactory: () => {
-            return new server.ChunkExtractor({ stats: loadableStats !== null && loadableStats !== void 0 ? loadableStats : {}, entrypoints: [] });
+            return new server.ChunkExtractor({ stats: loadableStats ?? {}, entrypoints: [] });
         },
     }),
 ];

package/lib/shared/child/singletonProviders.browser.js

@@ -71,14 +71,16 @@ const getChildProviders = (appDi, loadableStats) => {
             provide: DISPATCHER_CONTEXT_TOKEN,
             scope: Scope.REQUEST,
             useFactory: ({ dispatcher, middlewares, initialState, parentAllowedStores }) => {
-                var _a, _b, _c, _d;
-                const parentDispatcherContext = (_d = (_c = (_b = (_a = appDi
-                    .get(optional(ASYNC_LOCAL_STORAGE_TOKEN))) === null || _a === void 0 ? void 0 : _a.getStore()) === null || _b === void 0 ? void 0 : _b.tramvaiRequestDi) === null || _c === void 0 ? void 0 : _c.get(DISPATCHER_CONTEXT_TOKEN)) !== null && _d !== void 0 ? _d : appDi.get(DISPATCHER_CONTEXT_TOKEN);
+                const parentDispatcherContext = appDi
+                    .get(optional(ASYNC_LOCAL_STORAGE_TOKEN))
+                    ?.getStore()
+                    ?.tramvaiRequestDi?.get(DISPATCHER_CONTEXT_TOKEN) ??
+                    appDi.get(DISPATCHER_CONTEXT_TOKEN);
                 return new ChildDispatcherContext({
                     dispatcher,
                     // context will be set later by the CONTEXT_TOKEN
                     context: {},
-                    initialState: initialState !== null && initialState !== void 0 ? initialState : { stores: [] },
+                    initialState: initialState ?? { stores: [] },
                     middlewares: flatten(middlewares || []),
                     parentDispatcherContext,
                     parentAllowedStores: flatten(parentAllowedStores || []),

package/lib/shared/child/singletonProviders.es.js

@@ -71,14 +71,16 @@ const getChildProviders = (appDi, loadableStats) => {
             provide: DISPATCHER_CONTEXT_TOKEN,
             scope: Scope.REQUEST,
             useFactory: ({ dispatcher, middlewares, initialState, parentAllowedStores }) => {
-                var _a, _b, _c, _d;
-                const parentDispatcherContext = (_d = (_c = (_b = (_a = appDi
-                    .get(optional(ASYNC_LOCAL_STORAGE_TOKEN))) === null || _a === void 0 ? void 0 : _a.getStore()) === null || _b === void 0 ? void 0 : _b.tramvaiRequestDi) === null || _c === void 0 ? void 0 : _c.get(DISPATCHER_CONTEXT_TOKEN)) !== null && _d !== void 0 ? _d : appDi.get(DISPATCHER_CONTEXT_TOKEN);
+                const parentDispatcherContext = appDi
+                    .get(optional(ASYNC_LOCAL_STORAGE_TOKEN))
+                    ?.getStore()
+                    ?.tramvaiRequestDi?.get(DISPATCHER_CONTEXT_TOKEN) ??
+                    appDi.get(DISPATCHER_CONTEXT_TOKEN);
                 return new ChildDispatcherContext({
                     dispatcher,
                     // context will be set later by the CONTEXT_TOKEN
                     context: {},
-                    initialState: initialState !== null && initialState !== void 0 ? initialState : { stores: [] },
+                    initialState: initialState ?? { stores: [] },
                     middlewares: flatten(middlewares || []),
                     parentDispatcherContext,
                     parentAllowedStores: flatten(parentAllowedStores || []),

package/lib/shared/child/singletonProviders.js

@@ -79,14 +79,16 @@ const getChildProviders = (appDi, loadableStats) => {
             provide: tokensCommon.DISPATCHER_CONTEXT_TOKEN,
             scope: core.Scope.REQUEST,
             useFactory: ({ dispatcher, middlewares, initialState, parentAllowedStores }) => {
-                var _a, _b, _c, _d;
-                const parentDispatcherContext = (_d = (_c = (_b = (_a = appDi
-                    .get(core.optional(tokensCommon.ASYNC_LOCAL_STORAGE_TOKEN))) === null || _a === void 0 ? void 0 : _a.getStore()) === null || _b === void 0 ? void 0 : _b.tramvaiRequestDi) === null || _c === void 0 ? void 0 : _c.get(tokensCommon.DISPATCHER_CONTEXT_TOKEN)) !== null && _d !== void 0 ? _d : appDi.get(tokensCommon.DISPATCHER_CONTEXT_TOKEN);
+                const parentDispatcherContext = appDi
+                    .get(core.optional(tokensCommon.ASYNC_LOCAL_STORAGE_TOKEN))
+                    ?.getStore()
+                    ?.tramvaiRequestDi?.get(tokensCommon.DISPATCHER_CONTEXT_TOKEN) ??
+                    appDi.get(tokensCommon.DISPATCHER_CONTEXT_TOKEN);
                 return new state.ChildDispatcherContext({
                     dispatcher,
                     // context will be set later by the CONTEXT_TOKEN
                     context: {},
-                    initialState: initialState !== null && initialState !== void 0 ? initialState : { stores: [] },
+                    initialState: initialState ?? { stores: [] },
                     middlewares: flatten__default["default"](middlewares || []),
                     parentDispatcherContext,
                     parentAllowedStores: flatten__default["default"](parentAllowedStores || []),

package/lib/shared/pagePreload.browser.js

@@ -10,7 +10,7 @@ const pagePreload = async ({ pageService, preloadManager, }, mode, isSpaNavigati
         resolveLazyComponent(pageService.resolveComponentFromConfig('page', route)),
     ]);
     await Promise.all(components.map(async (component) => {
-        if (component === null || component === void 0 ? void 0 : component.childApps) {
+        if (component?.childApps) {
             await Promise.all(component.childApps.map((request) => {
                 // for first preload on SPA-navigation, we need to prevent double action execution,
                 // and need to mark this Child App as not preloaded, to prevent running `spa` and `afterSpa` commands for it

package/lib/shared/pagePreload.es.js

@@ -10,7 +10,7 @@ const pagePreload = async ({ pageService, preloadManager, }, mode, isSpaNavigati
         resolveLazyComponent(pageService.resolveComponentFromConfig('page', route)),
     ]);
     await Promise.all(components.map(async (component) => {
-        if (component === null || component === void 0 ? void 0 : component.childApps) {
+        if (component?.childApps) {
             await Promise.all(component.childApps.map((request) => {
                 // for first preload on SPA-navigation, we need to prevent double action execution,
                 // and need to mark this Child App as not preloaded, to prevent running `spa` and `afterSpa` commands for it

package/lib/shared/pagePreload.js

@@ -14,7 +14,7 @@ const pagePreload = async ({ pageService, preloadManager, }, mode, isSpaNavigati
         react.resolveLazyComponent(pageService.resolveComponentFromConfig('page', route)),
     ]);
     await Promise.all(components.map(async (component) => {
-        if (component === null || component === void 0 ? void 0 : component.childApps) {
+        if (component?.childApps) {
             await Promise.all(component.childApps.map((request) => {
                 // for first preload on SPA-navigation, we need to prevent double action execution,
                 // and need to mark this Child App as not preloaded, to prevent running `spa` and `afterSpa` commands for it

package/lib/shared/pageService.browser.js

@@ -50,9 +50,8 @@ class ChildAppPageService {
         ];
     }
     getPageComponentName(route) {
-        var _a;
-        const config = (_a = route === null || route === void 0 ? void 0 : route.config) !== null && _a !== void 0 ? _a : this.pageService.getConfig();
-        return config === null || config === void 0 ? void 0 : config.unstable_childAppPageComponent;
+        const config = route?.config ?? this.pageService.getConfig();
+        return config?.unstable_childAppPageComponent;
     }
     getComponentsGroupName() {
         return `${this.config.name}@${this.config.version}`;

package/lib/shared/pageService.es.js

@@ -50,9 +50,8 @@ class ChildAppPageService {
         ];
     }
     getPageComponentName(route) {
-        var _a;
-        const config = (_a = route === null || route === void 0 ? void 0 : route.config) !== null && _a !== void 0 ? _a : this.pageService.getConfig();
-        return config === null || config === void 0 ? void 0 : config.unstable_childAppPageComponent;
+        const config = route?.config ?? this.pageService.getConfig();
+        return config?.unstable_childAppPageComponent;
     }
     getComponentsGroupName() {
         return `${this.config.name}@${this.config.version}`;

package/lib/shared/pageService.js

@@ -58,9 +58,8 @@ class ChildAppPageService {
         ];
     }
     getPageComponentName(route) {
-        var _a;
-        const config = (_a = route === null || route === void 0 ? void 0 : route.config) !== null && _a !== void 0 ? _a : this.pageService.getConfig();
-        return config === null || config === void 0 ? void 0 : config.unstable_childAppPageComponent;
+        const config = route?.config ?? this.pageService.getConfig();
+        return config?.unstable_childAppPageComponent;
     }
     getComponentsGroupName() {
         return `${this.config.name}@${this.config.version}`;

package/lib/shared/providers.browser.js

@@ -1,6 +1,6 @@
 import { Scope, DI_TOKEN, optional } from '@tinkoff/dippy';
 import { provide, commandLineListTokens, COMMAND_LINE_RUNNER_TOKEN } from '@tramvai/core';
-import { CHILD_APP_RESOLUTION_CONFIG_MANAGER_TOKEN, CHILD_APP_RESOLUTION_CONFIGS_TOKEN, CHILD_APP_RESOLVE_CONFIG_TOKEN, CHILD_APP_RESOLVE_BASE_URL_TOKEN, CHILD_APP_SINGLETON_DI_MANAGER_TOKEN, CHILD_APP_LOADER_TOKEN, CHILD_APP_ROOT_DI_ACCESS_MODE_TOKEN, CHILD_APP_CONTRACT_MANAGER, CHILD_APP_DI_MANAGER_TOKEN, CHILD_APP_COMMAND_LINE_RUNNER_TOKEN, CHILD_APP_PRELOAD_MANAGER_TOKEN, CHILD_APP_RENDER_MANAGER_TOKEN, HOST_PROVIDED_CONTRACTS } from '@tramvai/tokens-child-app';
+import { CHILD_APP_RESOLUTION_CONFIG_MANAGER_TOKEN, CHILD_APP_RESOLUTION_CONFIGS_TOKEN, CHILD_APP_RESOLVE_CONFIG_TOKEN, CHILD_APP_RESOLVE_BASE_URL_TOKEN, CHILD_APP_SINGLETON_DI_MANAGER_TOKEN, CHILD_APP_LOADER_TOKEN, CHILD_APP_ROOT_DI_ACCESS_MODE_TOKEN, CHILD_APP_CONTRACT_MANAGER, CHILD_APP_DI_MANAGER_TOKEN, CHILD_APP_COMMAND_LINE_RUNNER_TOKEN, CHILD_APP_PRELOAD_MANAGER_TOKEN, CHILD_APP_RENDER_MANAGER_TOKEN, HOST_PROVIDED_CONTRACTS, CHILD_APP_ERROR_BOUNDARY_TOKEN } from '@tramvai/tokens-child-app';
 import { COMBINE_REDUCERS, LOGGER_TOKEN, ENV_MANAGER_TOKEN, REGISTER_CLEAR_CACHE_TOKEN, CLEAR_CACHE_TOKEN, ENV_USED_TOKEN, COMPONENT_REGISTRY_TOKEN, LIMIT_ACTION_GLOBAL_TIME_RUN, ACTION_CONDITIONALS } from '@tramvai/tokens-common';
 import { EXTEND_RENDER } from '@tramvai/tokens-render';
 import { ROUTER_TOKEN, PAGE_SERVICE_TOKEN, LINK_PREFETCH_MANAGER_TOKEN, ROUTER_SPA_ACTIONS_RUN_MODE_TOKEN } from '@tramvai/tokens-router';
@@ -51,12 +51,11 @@ const sharedProviders = [
             const rawEnv = envManager.get('CHILD_APP_DEBUG');
             const log = logger('child-app:resolve-config');
             const debug = new Map();
-            rawEnv === null || rawEnv === void 0 ? void 0 : rawEnv.split(';').reduce((acc, entry) => {
+            rawEnv?.split(';').reduce((acc, entry) => {
                 const [name, url] = entry.split('=');
                 return acc.set(name, url);
             }, debug);
             return (request) => {
-                var _a, _b;
                 const { name, tag = debug.has(name) ? 'debug' : 'latest' } = request;
                 const req = { name, tag, version: request.version };
                 const config = resolutionConfigManager.resolve(req);
@@ -65,7 +64,7 @@ const sharedProviders = [
                     return;
                 }
                 const { version, baseUrl: configBaseUrl, client, server, css, withoutCss } = config;
-                const baseUrl = (_b = (_a = debug.get(name)) !== null && _a !== void 0 ? _a : configBaseUrl) !== null && _b !== void 0 ? _b : rootBaseUrl;
+                const baseUrl = debug.get(name) ?? configBaseUrl ?? rootBaseUrl;
                 if (!baseUrl) {
                     throw new Error('CHILD_APP_EXTERNAL_URL was not defined');
                 }
@@ -173,17 +172,16 @@ const sharedProviders = [
         useFactory: ({ diManager }) => {
             return (type) => {
                 diManager.forEachChildDi((di) => {
-                    var _a;
                     const clearCache = di.get({ token: CLEAR_CACHE_TOKEN, optional: true });
                     if (clearCache) {
                         // first if child-app has its own CLEAR_CACHE_TOKEN implementation use only it
                         return clearCache(type);
                     }
                     // otherwise pick up any REGISTER_CLEAR_CACHE_TOKEN hooks and call it
-                    const registeredClearCache = (_a = di.get({
+                    const registeredClearCache = di.get({
                         token: REGISTER_CLEAR_CACHE_TOKEN,
                         optional: true,
-                    })) !== null && _a !== void 0 ? _a : [];
+                    }) ?? [];
                     return Promise.all(registeredClearCache.map((clear) => clear(type)));
                 });
             };
@@ -226,6 +224,25 @@ const sharedProviders = [
             ],
         },
     }),
+    provide({
+        provide: CHILD_APP_ERROR_BOUNDARY_TOKEN,
+        useFactory: ({ logger }) => {
+            const log = logger('child-app:render');
+            return function logErrorBoundary(error, info, config) {
+                log.error({
+                    event: 'component-did-catch',
+                    message: 'An unexpected error occured during rendering',
+                    error,
+                    info,
+                    childApp: config,
+                });
+            };
+        },
+        deps: {
+            logger: LOGGER_TOKEN,
+        },
+        multi: true,
+    }),
 ];
 
 export { sharedProviders };

package/lib/shared/providers.es.js

@@ -1,6 +1,6 @@
 import { Scope, DI_TOKEN, optional } from '@tinkoff/dippy';
 import { provide, commandLineListTokens, COMMAND_LINE_RUNNER_TOKEN } from '@tramvai/core';
-import { CHILD_APP_RESOLUTION_CONFIG_MANAGER_TOKEN, CHILD_APP_RESOLUTION_CONFIGS_TOKEN, CHILD_APP_RESOLVE_CONFIG_TOKEN, CHILD_APP_RESOLVE_BASE_URL_TOKEN, CHILD_APP_SINGLETON_DI_MANAGER_TOKEN, CHILD_APP_LOADER_TOKEN, CHILD_APP_ROOT_DI_ACCESS_MODE_TOKEN, CHILD_APP_CONTRACT_MANAGER, CHILD_APP_DI_MANAGER_TOKEN, CHILD_APP_COMMAND_LINE_RUNNER_TOKEN, CHILD_APP_PRELOAD_MANAGER_TOKEN, CHILD_APP_RENDER_MANAGER_TOKEN, HOST_PROVIDED_CONTRACTS } from '@tramvai/tokens-child-app';
+import { CHILD_APP_RESOLUTION_CONFIG_MANAGER_TOKEN, CHILD_APP_RESOLUTION_CONFIGS_TOKEN, CHILD_APP_RESOLVE_CONFIG_TOKEN, CHILD_APP_RESOLVE_BASE_URL_TOKEN, CHILD_APP_SINGLETON_DI_MANAGER_TOKEN, CHILD_APP_LOADER_TOKEN, CHILD_APP_ROOT_DI_ACCESS_MODE_TOKEN, CHILD_APP_CONTRACT_MANAGER, CHILD_APP_DI_MANAGER_TOKEN, CHILD_APP_COMMAND_LINE_RUNNER_TOKEN, CHILD_APP_PRELOAD_MANAGER_TOKEN, CHILD_APP_RENDER_MANAGER_TOKEN, HOST_PROVIDED_CONTRACTS, CHILD_APP_ERROR_BOUNDARY_TOKEN } from '@tramvai/tokens-child-app';
 import { COMBINE_REDUCERS, LOGGER_TOKEN, ENV_MANAGER_TOKEN, REGISTER_CLEAR_CACHE_TOKEN, CLEAR_CACHE_TOKEN, ENV_USED_TOKEN, COMPONENT_REGISTRY_TOKEN, LIMIT_ACTION_GLOBAL_TIME_RUN, ACTION_CONDITIONALS } from '@tramvai/tokens-common';
 import { EXTEND_RENDER } from '@tramvai/tokens-render';
 import { ROUTER_TOKEN, PAGE_SERVICE_TOKEN, LINK_PREFETCH_MANAGER_TOKEN, ROUTER_SPA_ACTIONS_RUN_MODE_TOKEN } from '@tramvai/tokens-router';
@@ -51,12 +51,11 @@ const sharedProviders = [
             const rawEnv = envManager.get('CHILD_APP_DEBUG');
             const log = logger('child-app:resolve-config');
             const debug = new Map();
-            rawEnv === null || rawEnv === void 0 ? void 0 : rawEnv.split(';').reduce((acc, entry) => {
+            rawEnv?.split(';').reduce((acc, entry) => {
                 const [name, url] = entry.split('=');
                 return acc.set(name, url);
             }, debug);
             return (request) => {
-                var _a, _b;
                 const { name, tag = debug.has(name) ? 'debug' : 'latest' } = request;
                 const req = { name, tag, version: request.version };
                 const config = resolutionConfigManager.resolve(req);
@@ -65,7 +64,7 @@ const sharedProviders = [
                     return;
                 }
                 const { version, baseUrl: configBaseUrl, client, server, css, withoutCss } = config;
-                const baseUrl = (_b = (_a = debug.get(name)) !== null && _a !== void 0 ? _a : configBaseUrl) !== null && _b !== void 0 ? _b : rootBaseUrl;
+                const baseUrl = debug.get(name) ?? configBaseUrl ?? rootBaseUrl;
                 if (!baseUrl) {
                     throw new Error('CHILD_APP_EXTERNAL_URL was not defined');
                 }
@@ -173,17 +172,16 @@ const sharedProviders = [
         useFactory: ({ diManager }) => {
             return (type) => {
                 diManager.forEachChildDi((di) => {
-                    var _a;
                     const clearCache = di.get({ token: CLEAR_CACHE_TOKEN, optional: true });
                     if (clearCache) {
                         // first if child-app has its own CLEAR_CACHE_TOKEN implementation use only it
                         return clearCache(type);
                     }
                     // otherwise pick up any REGISTER_CLEAR_CACHE_TOKEN hooks and call it
-                    const registeredClearCache = (_a = di.get({
+                    const registeredClearCache = di.get({
                         token: REGISTER_CLEAR_CACHE_TOKEN,
                         optional: true,
-                    })) !== null && _a !== void 0 ? _a : [];
+                    }) ?? [];
                     return Promise.all(registeredClearCache.map((clear) => clear(type)));
                 });
             };
@@ -226,6 +224,25 @@ const sharedProviders = [
             ],
         },
     }),
+    provide({
+        provide: CHILD_APP_ERROR_BOUNDARY_TOKEN,
+        useFactory: ({ logger }) => {
+            const log = logger('child-app:render');
+            return function logErrorBoundary(error, info, config) {
+                log.error({
+                    event: 'component-did-catch',
+                    message: 'An unexpected error occured during rendering',
+                    error,
+                    info,
+                    childApp: config,
+                });
+            };
+        },
+        deps: {
+            logger: LOGGER_TOKEN,
+        },
+        multi: true,
+    }),
 ];
 
 export { sharedProviders };

package/lib/shared/providers.js

@@ -55,12 +55,11 @@ const sharedProviders = [
             const rawEnv = envManager.get('CHILD_APP_DEBUG');
             const log = logger('child-app:resolve-config');
             const debug = new Map();
-            rawEnv === null || rawEnv === void 0 ? void 0 : rawEnv.split(';').reduce((acc, entry) => {
+            rawEnv?.split(';').reduce((acc, entry) => {
                 const [name, url] = entry.split('=');
                 return acc.set(name, url);
             }, debug);
             return (request) => {
-                var _a, _b;
                 const { name, tag = debug.has(name) ? 'debug' : 'latest' } = request;
                 const req = { name, tag, version: request.version };
                 const config = resolutionConfigManager.resolve(req);
@@ -69,7 +68,7 @@ const sharedProviders = [
                     return;
                 }
                 const { version, baseUrl: configBaseUrl, client, server, css, withoutCss } = config;
-                const baseUrl = (_b = (_a = debug.get(name)) !== null && _a !== void 0 ? _a : configBaseUrl) !== null && _b !== void 0 ? _b : rootBaseUrl;
+                const baseUrl = debug.get(name) ?? configBaseUrl ?? rootBaseUrl;
                 if (!baseUrl) {
                     throw new Error('CHILD_APP_EXTERNAL_URL was not defined');
                 }
@@ -177,17 +176,16 @@ const sharedProviders = [
         useFactory: ({ diManager }) => {
             return (type) => {
                 diManager.forEachChildDi((di) => {
-                    var _a;
                     const clearCache = di.get({ token: tokensCommon.CLEAR_CACHE_TOKEN, optional: true });
                     if (clearCache) {
                         // first if child-app has its own CLEAR_CACHE_TOKEN implementation use only it
                         return clearCache(type);
                     }
                     // otherwise pick up any REGISTER_CLEAR_CACHE_TOKEN hooks and call it
-                    const registeredClearCache = (_a = di.get({
+                    const registeredClearCache = di.get({
                         token: tokensCommon.REGISTER_CLEAR_CACHE_TOKEN,
                         optional: true,
-                    })) !== null && _a !== void 0 ? _a : [];
+                    }) ?? [];
                     return Promise.all(registeredClearCache.map((clear) => clear(type)));
                 });
             };
@@ -230,6 +228,25 @@ const sharedProviders = [
             ],
         },
     }),
+    core.provide({
+        provide: tokensChildApp.CHILD_APP_ERROR_BOUNDARY_TOKEN,
+        useFactory: ({ logger }) => {
+            const log = logger('child-app:render');
+            return function logErrorBoundary(error, info, config) {
+                log.error({
+                    event: 'component-did-catch',
+                    message: 'An unexpected error occured during rendering',
+                    error,
+                    info,
+                    childApp: config,
+                });
+            };
+        },
+        deps: {
+            logger: tokensCommon.LOGGER_TOKEN,
+        },
+        multi: true,
+    }),
 ];
 
 exports.sharedProviders = sharedProviders;

package/lib/shared/react/childAppErrorBoundary.browser.js

@@ -0,0 +1,14 @@
+import { jsx } from 'react/jsx-runtime';
+import { useMemo } from 'react';
+import { CHILD_APP_ERROR_BOUNDARY_TOKEN } from '@tramvai/tokens-child-app';
+import { useDi, UniversalErrorBoundary } from '@tramvai/react';
+
+const ChildAppErrorBoundary = (props) => {
+    const { children, config } = props;
+    const { fallback, name, version, tag } = config;
+    const errorHandlers = useDi({ token: CHILD_APP_ERROR_BOUNDARY_TOKEN, optional: true });
+    const decoratedErrorHandlers = useMemo(() => errorHandlers?.map((errorHandler) => (error, info) => errorHandler(error, info, { name, version, tag })), [errorHandlers, name, version, tag]);
+    return (jsx(UniversalErrorBoundary, { fallback: fallback, errorHandlers: decoratedErrorHandlers, children: children }));
+};
+
+export { ChildAppErrorBoundary };

package/lib/shared/react/childAppErrorBoundary.d.ts

@@ -0,0 +1,8 @@
+import type { PropsWithChildren } from 'react';
+import type { ChildAppReactConfig } from '@tramvai/tokens-child-app';
+type Props = {
+    config: ChildAppReactConfig;
+};
+export declare const ChildAppErrorBoundary: (props: PropsWithChildren<Props>) => import("react/jsx-runtime").JSX.Element;
+export {};
+//# sourceMappingURL=childAppErrorBoundary.d.ts.map

package/lib/shared/react/childAppErrorBoundary.es.js

@@ -0,0 +1,14 @@
+import { jsx } from 'react/jsx-runtime';
+import { useMemo } from 'react';
+import { CHILD_APP_ERROR_BOUNDARY_TOKEN } from '@tramvai/tokens-child-app';
+import { useDi, UniversalErrorBoundary } from '@tramvai/react';
+
+const ChildAppErrorBoundary = (props) => {
+    const { children, config } = props;
+    const { fallback, name, version, tag } = config;
+    const errorHandlers = useDi({ token: CHILD_APP_ERROR_BOUNDARY_TOKEN, optional: true });
+    const decoratedErrorHandlers = useMemo(() => errorHandlers?.map((errorHandler) => (error, info) => errorHandler(error, info, { name, version, tag })), [errorHandlers, name, version, tag]);
+    return (jsx(UniversalErrorBoundary, { fallback: fallback, errorHandlers: decoratedErrorHandlers, children: children }));
+};
+
+export { ChildAppErrorBoundary };

package/lib/shared/react/childAppErrorBoundary.js

@@ -0,0 +1,18 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var jsxRuntime = require('react/jsx-runtime');
+var react$1 = require('react');
+var tokensChildApp = require('@tramvai/tokens-child-app');
+var react = require('@tramvai/react');
+
+const ChildAppErrorBoundary = (props) => {
+    const { children, config } = props;
+    const { fallback, name, version, tag } = config;
+    const errorHandlers = react.useDi({ token: tokensChildApp.CHILD_APP_ERROR_BOUNDARY_TOKEN, optional: true });
+    const decoratedErrorHandlers = react$1.useMemo(() => errorHandlers?.map((errorHandler) => (error, info) => errorHandler(error, info, { name, version, tag })), [errorHandlers, name, version, tag]);
+    return (jsxRuntime.jsx(react.UniversalErrorBoundary, { fallback: fallback, errorHandlers: decoratedErrorHandlers, children: children }));
+};
+
+exports.ChildAppErrorBoundary = ChildAppErrorBoundary;

package/lib/shared/react/component.browser.js

@@ -3,9 +3,10 @@ import noop from '@tinkoff/utils/function/noop';
 import { memo, Suspense, useContext, useMemo, useState, useEffect } from 'react';
 import { CHILD_APP_INTERNAL_RENDER_TOKEN } from '@tramvai/tokens-child-app';
 import { LOGGER_TOKEN } from '@tramvai/tokens-common';
-import { UniversalErrorBoundary, useDi } from '@tramvai/react';
+import { useDi } from '@tramvai/react';
 import { RenderContext } from './render-context.browser.js';
 import { Extractor } from './extractor.browser.browser.js';
+import { ChildAppErrorBoundary } from './childAppErrorBoundary.browser.js';
 
 const FailedChildAppFallback = ({ config: { name, version, tag, fallback: Fallback }, }) => {
     const logger = useDi(LOGGER_TOKEN);
@@ -93,12 +94,11 @@ const ChildAppWrapper = ({ name, version, tag, props, fallback: Fallback, }) =>
     }
 };
 const ChildApp = memo((config) => {
-    const { fallback } = config;
     let result = jsx(ChildAppWrapper, { ...config });
     if (process.env.__TRAMVAI_CONCURRENT_FEATURES) {
         result = jsx(Suspense, { fallback: jsx(FailedChildAppFallback, { config: config }), children: result });
     }
-    return jsx(UniversalErrorBoundary, { fallback: fallback, children: result });
+    return jsx(ChildAppErrorBoundary, { config: config, children: result });
 });
 
 export { ChildApp };

package/lib/shared/react/component.es.js

@@ -3,9 +3,10 @@ import noop from '@tinkoff/utils/function/noop';
 import { memo, Suspense, useContext, useMemo, useState, useEffect } from 'react';
 import { CHILD_APP_INTERNAL_RENDER_TOKEN } from '@tramvai/tokens-child-app';
 import { LOGGER_TOKEN } from '@tramvai/tokens-common';
-import { UniversalErrorBoundary, useDi } from '@tramvai/react';
+import { useDi } from '@tramvai/react';
 import { RenderContext } from './render-context.es.js';
 import { Extractor } from './extractor.es.js';
+import { ChildAppErrorBoundary } from './childAppErrorBoundary.es.js';
 
 const FailedChildAppFallback = ({ config: { name, version, tag, fallback: Fallback }, }) => {
     const logger = useDi(LOGGER_TOKEN);
@@ -93,12 +94,11 @@ const ChildAppWrapper = ({ name, version, tag, props, fallback: Fallback, }) =>
     }
 };
 const ChildApp = memo((config) => {
-    const { fallback } = config;
     let result = jsx(ChildAppWrapper, { ...config });
     if (process.env.__TRAMVAI_CONCURRENT_FEATURES) {
         result = jsx(Suspense, { fallback: jsx(FailedChildAppFallback, { config: config }), children: result });
     }
-    return jsx(UniversalErrorBoundary, { fallback: fallback, children: result });
+    return jsx(ChildAppErrorBoundary, { config: config, children: result });
 });
 
 export { ChildApp };

package/lib/shared/react/component.js

@@ -10,6 +10,7 @@ var tokensCommon = require('@tramvai/tokens-common');
 var react$1 = require('@tramvai/react');
 var renderContext = require('./render-context.js');
 var extractor = require('./extractor.js');
+var childAppErrorBoundary = require('./childAppErrorBoundary.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -101,12 +102,11 @@ const ChildAppWrapper = ({ name, version, tag, props, fallback: Fallback, }) =>
     }
 };
 const ChildApp = react.memo((config) => {
-    const { fallback } = config;
     let result = jsxRuntime.jsx(ChildAppWrapper, { ...config });
     if (process.env.__TRAMVAI_CONCURRENT_FEATURES) {
         result = jsxRuntime.jsx(react.Suspense, { fallback: jsxRuntime.jsx(FailedChildAppFallback, { config: config }), children: result });
     }
-    return jsxRuntime.jsx(react$1.UniversalErrorBoundary, { fallback: fallback, children: result });
+    return jsxRuntime.jsx(childAppErrorBoundary.ChildAppErrorBoundary, { config: config, children: result });
 });
 
 exports.ChildApp = ChildApp;

package/lib/shared/resolutionConfigManager.browser.js

@@ -4,7 +4,7 @@ import flatten from '@tinkoff/utils/array/flatten';
 class ChildAppResolutionConfigManager {
     constructor({ configs, logger, }) {
         this.hasInitialized = false;
-        this.rawConfigs = configs !== null && configs !== void 0 ? configs : [];
+        this.rawConfigs = configs ?? [];
         this.mapping = new Map();
         this.log = logger('child-app:resolution-config');
     }
@@ -35,7 +35,6 @@ class ChildAppResolutionConfigManager {
         return this.initPromise;
     }
     resolve({ name, version, tag = 'latest' }) {
-        var _a;
         const fromMapping = this.mapping.get(name);
         if (!fromMapping) {
             return;
@@ -49,8 +48,8 @@ class ChildAppResolutionConfigManager {
         }
         return {
             ...cfg,
-            baseUrl: (_a = cfg.baseUrl) !== null && _a !== void 0 ? _a : fromMapping.baseUrl,
-            version: version !== null && version !== void 0 ? version : cfg.version,
+            baseUrl: cfg.baseUrl ?? fromMapping.baseUrl,
+            version: version ?? cfg.version,
         };
     }
 }

package/lib/shared/resolutionConfigManager.es.js

@@ -4,7 +4,7 @@ import flatten from '@tinkoff/utils/array/flatten';
 class ChildAppResolutionConfigManager {
     constructor({ configs, logger, }) {
         this.hasInitialized = false;
-        this.rawConfigs = configs !== null && configs !== void 0 ? configs : [];
+        this.rawConfigs = configs ?? [];
         this.mapping = new Map();
         this.log = logger('child-app:resolution-config');
     }
@@ -35,7 +35,6 @@ class ChildAppResolutionConfigManager {
         return this.initPromise;
     }
     resolve({ name, version, tag = 'latest' }) {
-        var _a;
         const fromMapping = this.mapping.get(name);
         if (!fromMapping) {
             return;
@@ -49,8 +48,8 @@ class ChildAppResolutionConfigManager {
         }
         return {
             ...cfg,
-            baseUrl: (_a = cfg.baseUrl) !== null && _a !== void 0 ? _a : fromMapping.baseUrl,
-            version: version !== null && version !== void 0 ? version : cfg.version,
+            baseUrl: cfg.baseUrl ?? fromMapping.baseUrl,
+            version: version ?? cfg.version,
         };
     }
 }

package/lib/shared/resolutionConfigManager.js

@@ -13,7 +13,7 @@ var flatten__default = /*#__PURE__*/_interopDefaultLegacy(flatten);
 class ChildAppResolutionConfigManager {
     constructor({ configs, logger, }) {
         this.hasInitialized = false;
-        this.rawConfigs = configs !== null && configs !== void 0 ? configs : [];
+        this.rawConfigs = configs ?? [];
         this.mapping = new Map();
         this.log = logger('child-app:resolution-config');
     }
@@ -44,7 +44,6 @@ class ChildAppResolutionConfigManager {
         return this.initPromise;
     }
     resolve({ name, version, tag = 'latest' }) {
-        var _a;
         const fromMapping = this.mapping.get(name);
         if (!fromMapping) {
             return;
@@ -58,8 +57,8 @@ class ChildAppResolutionConfigManager {
         }
         return {
             ...cfg,
-            baseUrl: (_a = cfg.baseUrl) !== null && _a !== void 0 ? _a : fromMapping.baseUrl,
-            version: version !== null && version !== void 0 ? version : cfg.version,
+            baseUrl: cfg.baseUrl ?? fromMapping.baseUrl,
+            version: version ?? cfg.version,
         };
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-child-app",
-  "version": "5.9.2",
+  "version": "5.14.9",
   "description": "Module for child apps",
   "browser": {
     "./lib/server.js": "./lib/browser.js",
@@ -33,23 +33,23 @@
     "@tinkoff/env-validators": "0.4.2",
     "@tinkoff/module-loader-client": "0.7.3",
     "@tinkoff/module-loader-server": "0.8.3",
-    "@tramvai/module-common": "5.9.2",
+    "@tramvai/module-common": "5.14.9",
     "@tinkoff/url": "0.11.2",
-    "@tramvai/child-app-core": "5.9.2",
-    "@tramvai/safe-strings": "0.8.3",
-    "@tramvai/tokens-child-app": "5.9.2"
+    "@tramvai/child-app-core": "5.14.9",
+    "@tramvai/safe-strings": "0.8.4",
+    "@tramvai/tokens-child-app": "5.14.9"
   },
   "devDependencies": {},
   "peerDependencies": {
     "@tinkoff/dippy": "0.11.3",
-    "@tinkoff/router": "0.5.26",
+    "@tinkoff/router": "0.5.46",
     "@tinkoff/utils": "^2.1.2",
-    "@tramvai/core": "5.9.2",
-    "@tramvai/state": "5.9.2",
-    "@tramvai/react": "5.9.2",
-    "@tramvai/tokens-common": "5.9.2",
-    "@tramvai/tokens-render": "5.9.2",
-    "@tramvai/tokens-router": "5.9.2",
+    "@tramvai/core": "5.14.9",
+    "@tramvai/state": "5.14.9",
+    "@tramvai/react": "5.14.9",
+    "@tramvai/tokens-common": "5.14.9",
+    "@tramvai/tokens-render": "5.14.9",
+    "@tramvai/tokens-router": "5.14.9",
     "react": ">=16.14.0",
     "react-dom": ">=16.14.0",
     "object-assign": "^4.1.1",