@tramvai/module-child-app 5.9.2 → 5.10.0

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';
@@ -226,6 +226,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';
@@ -226,6 +226,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

@@ -230,6 +230,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 === null || errorHandlers === void 0 ? void 0 : 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 === null || errorHandlers === void 0 ? void 0 : 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 === null || errorHandlers === void 0 ? void 0 : 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-child-app",
-  "version": "5.9.2",
+  "version": "5.10.0",
   "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.10.0",
     "@tinkoff/url": "0.11.2",
-    "@tramvai/child-app-core": "5.9.2",
+    "@tramvai/child-app-core": "5.10.0",
     "@tramvai/safe-strings": "0.8.3",
-    "@tramvai/tokens-child-app": "5.9.2"
+    "@tramvai/tokens-child-app": "5.10.0"
   },
   "devDependencies": {},
   "peerDependencies": {
     "@tinkoff/dippy": "0.11.3",
-    "@tinkoff/router": "0.5.26",
+    "@tinkoff/router": "0.5.27",
     "@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.10.0",
+    "@tramvai/state": "5.10.0",
+    "@tramvai/react": "5.10.0",
+    "@tramvai/tokens-common": "5.10.0",
+    "@tramvai/tokens-render": "5.10.0",
+    "@tramvai/tokens-router": "5.10.0",
     "react": ">=16.14.0",
     "react-dom": ">=16.14.0",
     "object-assign": "^4.1.1",