@tramvai/module-render 1.30.1 → 1.32.1

package/lib/browser.js

@@ -1,8 +1,9 @@
 import { __decorate } from 'tslib';
 import { Module, commandLineListTokens, DI_TOKEN } from '@tramvai/core';
-import { LOGGER_TOKEN, COMPONENT_REGISTRY_TOKEN, CONTEXT_TOKEN } from '@tramvai/module-common';
+import { LOGGER_TOKEN, CONTEXT_TOKEN } from '@tramvai/module-common';
 import { DEFAULT_LAYOUT_COMPONENT, LAYOUT_OPTIONS, DEFAULT_FOOTER_COMPONENT, DEFAULT_HEADER_COMPONENT, RESOURCES_REGISTRY, CUSTOM_RENDER, EXTEND_RENDER, RENDERER_CALLBACK, RENDER_MODE } from '@tramvai/tokens-render';
 export * from '@tramvai/tokens-render';
+import { PAGE_SERVICE_TOKEN } from '@tramvai/tokens-router';
 import each from '@tinkoff/utils/array/each';
 import React, { PureComponent, createElement, StrictMode, useEffect } from 'react';
 import { Provider } from '@tramvai/state';
@@ -22,24 +23,24 @@ class RootComponent extends PureComponent {
 }
 const layoutWrapper = memoOne(withError(), strictEqual);
 const pageWrapper = memoOne(withError(), strictEqual);
-const Root = withError()(({ componentRegistry, }) => {
+const Root = withError()(({ pageService }) => {
     const { config } = useRoute();
-    const { bundle, pageComponent, layoutComponent = 'layoutDefault', headerComponent = 'headerDefault', footerComponent = 'footerDefault', } = config;
-    const PageComponent = componentRegistry.get(pageComponent, bundle);
-    // Достаем компоненты из бандла, либо берем default реализации
-    const LayoutComponent = componentRegistry.get(layoutComponent, bundle) || componentRegistry.get('layoutDefault');
-    const HeaderComponent = componentRegistry.get(headerComponent, bundle) || componentRegistry.get('headerDefault');
-    const FooterComponent = componentRegistry.get(footerComponent, bundle) || componentRegistry.get('footerDefault');
+    const { pageComponent, layoutComponent = 'layoutDefault', headerComponent = 'headerDefault', footerComponent = 'footerDefault', } = config;
+    const PageComponent = pageService.getComponent(pageComponent);
+    // Достаем компоненты для текущей страницы, либо берем default реализации
+    const LayoutComponent = pageService.getComponent(layoutComponent) || pageService.getComponent('layoutDefault');
+    const HeaderComponent = pageService.getComponent(headerComponent) || pageService.getComponent('headerDefault');
+    const FooterComponent = pageService.getComponent(footerComponent) || pageService.getComponent('footerDefault');
     if (!PageComponent) {
         throw new Error(`Page component '${pageComponent}' not found`);
     }
     return (React.createElement(RootComponent, { HeaderComponent: HeaderComponent, FooterComponent: FooterComponent, LayoutComponent: layoutWrapper(LayoutComponent), PageComponent: pageWrapper(PageComponent) }));
 });
 
-function renderReact({ componentRegistry, di }, context) {
+function renderReact({ pageService, di }, context) {
     return (React.createElement(Provider, { context: context },
         React.createElement(DIContext.Provider, { value: di },
-            React.createElement(Root, { componentRegistry: componentRegistry }))));
+            React.createElement(Root, { pageService: pageService }))));
 }
 
 const legacyRenderer = ({ element, container, callback }) => hydrate(element, container, callback);
@@ -69,8 +70,8 @@ const blockingRenderer = rendererFactory(ReactDOM.createBlockingRoot);
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const concurrentRenderer = rendererFactory(ReactDOM.createRoot);
 
-function rendering({ componentRegistry, log, consumerContext, customRender, extendRender, di, mode, rendererCallback, }) {
-    let renderResult = renderReact({ componentRegistry, di }, consumerContext);
+function rendering({ pageService, log, consumerContext, customRender, extendRender, di, mode, rendererCallback, }) {
+    let renderResult = renderReact({ pageService, di }, consumerContext);
     if (extendRender) {
         each((render) => {
             renderResult = render(renderResult);
@@ -191,7 +192,7 @@ RenderModule = RenderModule_1 = __decorate([
                     };
                 },
                 deps: {
-                    componentRegistry: COMPONENT_REGISTRY_TOKEN,
+                    pageService: PAGE_SERVICE_TOKEN,
                     log: LOGGER_TOKEN,
                     customRender: { token: CUSTOM_RENDER, optional: true },
                     extendRender: { token: EXTEND_RENDER, optional: true },

package/lib/client/index.d.ts

@@ -1,6 +1,7 @@
 import type { EXTEND_RENDER, RenderMode, RENDERER_CALLBACK } from '@tramvai/tokens-render';
-export declare function rendering({ componentRegistry, log, consumerContext, customRender, extendRender, di, mode, rendererCallback, }: {
-    componentRegistry: any;
+import type { PAGE_SERVICE_TOKEN } from '@tramvai/tokens-router';
+export declare function rendering({ pageService, log, consumerContext, customRender, extendRender, di, mode, rendererCallback, }: {
+    pageService: typeof PAGE_SERVICE_TOKEN;
     log: any;
     consumerContext: any;
     extendRender?: typeof EXTEND_RENDER;

package/lib/react/index.d.ts

@@ -1,4 +1,4 @@
-export declare function renderReact({ componentRegistry, di }: {
-    componentRegistry: any;
+export declare function renderReact({ pageService, di }: {
+    pageService: any;
     di: any;
 }, context: any): JSX.Element;

package/lib/react/root.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
-import type { COMPONENT_REGISTRY_TOKEN } from '@tramvai/tokens-common';
-export declare const Root: ({ componentRegistry, }: {
-    componentRegistry: typeof COMPONENT_REGISTRY_TOKEN;
+import type { PAGE_SERVICE_TOKEN } from '@tramvai/tokens-router';
+export declare const Root: ({ pageService }: {
+    pageService: typeof PAGE_SERVICE_TOKEN;
     children?: React.ReactNode;
 }) => JSX.Element;

package/lib/server/ReactRenderServer.d.ts

@@ -1,15 +1,16 @@
 import type { DI_TOKEN } from '@tramvai/core';
-import type { COMPONENT_REGISTRY_TOKEN, CONTEXT_TOKEN } from '@tramvai/module-common';
+import type { CONTEXT_TOKEN } from '@tramvai/module-common';
 import type { EXTEND_RENDER, CUSTOM_RENDER } from '@tramvai/tokens-render';
+import type { PAGE_SERVICE_TOKEN } from '@tramvai/tokens-router';
 import type { ChunkExtractor } from '@loadable/server';
 export declare class ReactRenderServer {
     customRender: typeof CUSTOM_RENDER;
     extendRender: typeof EXTEND_RENDER;
     context: typeof CONTEXT_TOKEN;
-    componentRegistry: typeof COMPONENT_REGISTRY_TOKEN;
+    pageService: typeof PAGE_SERVICE_TOKEN;
     di: typeof DI_TOKEN;
-    constructor({ componentRegistry, context, customRender, extendRender, di }: {
-        componentRegistry: any;
+    constructor({ pageService, context, customRender, extendRender, di }: {
+        pageService: any;
         context: any;
         customRender: any;
         extendRender: any;

package/lib/server.es.js

@@ -1,6 +1,6 @@
 import { __decorate } from 'tslib';
 import { Module, commandLineListTokens, DI_TOKEN, provide } from '@tramvai/core';
-import { CREATE_CACHE_TOKEN, RESPONSE_MANAGER_TOKEN, CONTEXT_TOKEN, COMPONENT_REGISTRY_TOKEN } from '@tramvai/module-common';
+import { CREATE_CACHE_TOKEN, RESPONSE_MANAGER_TOKEN, CONTEXT_TOKEN } from '@tramvai/module-common';
 import { PAGE_SERVICE_TOKEN } from '@tramvai/tokens-router';
 import { ClientHintsModule, USER_AGENT_TOKEN } from '@tramvai/module-client-hints';
 import { ResourceType, ResourceSlot, DEFAULT_LAYOUT_COMPONENT, LAYOUT_OPTIONS, DEFAULT_FOOTER_COMPONENT, DEFAULT_HEADER_COMPONENT, RESOURCES_REGISTRY, RESOURCE_INLINE_OPTIONS, RENDER_SLOTS, POLYFILL_CONDITION, HTML_ATTRS, CUSTOM_RENDER, EXTEND_RENDER } from '@tramvai/tokens-render';
@@ -607,29 +607,29 @@ class RootComponent extends PureComponent {
 }
 const layoutWrapper = memoOne(withError(), strictEqual);
 const pageWrapper = memoOne(withError(), strictEqual);
-const Root = withError()(({ componentRegistry, }) => {
+const Root = withError()(({ pageService }) => {
     const { config } = useRoute();
-    const { bundle, pageComponent, layoutComponent = 'layoutDefault', headerComponent = 'headerDefault', footerComponent = 'footerDefault', } = config;
-    const PageComponent = componentRegistry.get(pageComponent, bundle);
-    // Достаем компоненты из бандла, либо берем default реализации
-    const LayoutComponent = componentRegistry.get(layoutComponent, bundle) || componentRegistry.get('layoutDefault');
-    const HeaderComponent = componentRegistry.get(headerComponent, bundle) || componentRegistry.get('headerDefault');
-    const FooterComponent = componentRegistry.get(footerComponent, bundle) || componentRegistry.get('footerDefault');
+    const { pageComponent, layoutComponent = 'layoutDefault', headerComponent = 'headerDefault', footerComponent = 'footerDefault', } = config;
+    const PageComponent = pageService.getComponent(pageComponent);
+    // Достаем компоненты для текущей страницы, либо берем default реализации
+    const LayoutComponent = pageService.getComponent(layoutComponent) || pageService.getComponent('layoutDefault');
+    const HeaderComponent = pageService.getComponent(headerComponent) || pageService.getComponent('headerDefault');
+    const FooterComponent = pageService.getComponent(footerComponent) || pageService.getComponent('footerDefault');
     if (!PageComponent) {
         throw new Error(`Page component '${pageComponent}' not found`);
     }
     return (React.createElement(RootComponent, { HeaderComponent: HeaderComponent, FooterComponent: FooterComponent, LayoutComponent: layoutWrapper(LayoutComponent), PageComponent: pageWrapper(PageComponent) }));
 });
 
-function renderReact({ componentRegistry, di }, context) {
+function renderReact({ pageService, di }, context) {
     return (React.createElement(Provider, { context: context },
         React.createElement(DIContext.Provider, { value: di },
-            React.createElement(Root, { componentRegistry: componentRegistry }))));
+            React.createElement(Root, { pageService: pageService }))));
 }
 
 class ReactRenderServer {
-    constructor({ componentRegistry, context, customRender, extendRender, di }) {
-        this.componentRegistry = componentRegistry;
+    constructor({ pageService, context, customRender, extendRender, di }) {
+        this.pageService = pageService;
         this.context = context;
         this.customRender = customRender;
         this.extendRender = extendRender;
@@ -637,7 +637,7 @@ class ReactRenderServer {
     }
     render(extractor) {
         var _a;
-        let renderResult = renderReact({ componentRegistry: this.componentRegistry, di: this.di }, this.context);
+        let renderResult = renderReact({ pageService: this.pageService, di: this.di }, this.context);
         each((render) => {
             renderResult = render(renderResult);
         }, (_a = this.extendRender) !== null && _a !== void 0 ? _a : []);
@@ -769,7 +769,7 @@ RenderModule = RenderModule_1 = __decorate([
                 useClass: ReactRenderServer,
                 deps: {
                     context: CONTEXT_TOKEN,
-                    componentRegistry: COMPONENT_REGISTRY_TOKEN,
+                    pageService: PAGE_SERVICE_TOKEN,
                     customRender: { token: CUSTOM_RENDER, optional: true },
                     extendRender: { token: EXTEND_RENDER, optional: true },
                     di: DI_TOKEN,

package/lib/server.js

@@ -646,29 +646,29 @@ class RootComponent extends React.PureComponent {
 }
 const layoutWrapper = memoOne__default["default"](react.withError(), strictEqual__default["default"]);
 const pageWrapper = memoOne__default["default"](react.withError(), strictEqual__default["default"]);
-const Root = react.withError()(({ componentRegistry, }) => {
+const Root = react.withError()(({ pageService }) => {
     const { config } = moduleRouter.useRoute();
-    const { bundle, pageComponent, layoutComponent = 'layoutDefault', headerComponent = 'headerDefault', footerComponent = 'footerDefault', } = config;
-    const PageComponent = componentRegistry.get(pageComponent, bundle);
-    // Достаем компоненты из бандла, либо берем default реализации
-    const LayoutComponent = componentRegistry.get(layoutComponent, bundle) || componentRegistry.get('layoutDefault');
-    const HeaderComponent = componentRegistry.get(headerComponent, bundle) || componentRegistry.get('headerDefault');
-    const FooterComponent = componentRegistry.get(footerComponent, bundle) || componentRegistry.get('footerDefault');
+    const { pageComponent, layoutComponent = 'layoutDefault', headerComponent = 'headerDefault', footerComponent = 'footerDefault', } = config;
+    const PageComponent = pageService.getComponent(pageComponent);
+    // Достаем компоненты для текущей страницы, либо берем default реализации
+    const LayoutComponent = pageService.getComponent(layoutComponent) || pageService.getComponent('layoutDefault');
+    const HeaderComponent = pageService.getComponent(headerComponent) || pageService.getComponent('headerDefault');
+    const FooterComponent = pageService.getComponent(footerComponent) || pageService.getComponent('footerDefault');
     if (!PageComponent) {
         throw new Error(`Page component '${pageComponent}' not found`);
     }
     return (React__default["default"].createElement(RootComponent, { HeaderComponent: HeaderComponent, FooterComponent: FooterComponent, LayoutComponent: layoutWrapper(LayoutComponent), PageComponent: pageWrapper(PageComponent) }));
 });
 
-function renderReact({ componentRegistry, di }, context) {
+function renderReact({ pageService, di }, context) {
     return (React__default["default"].createElement(state.Provider, { context: context },
         React__default["default"].createElement(react.DIContext.Provider, { value: di },
-            React__default["default"].createElement(Root, { componentRegistry: componentRegistry }))));
+            React__default["default"].createElement(Root, { pageService: pageService }))));
 }
 
 class ReactRenderServer {
-    constructor({ componentRegistry, context, customRender, extendRender, di }) {
-        this.componentRegistry = componentRegistry;
+    constructor({ pageService, context, customRender, extendRender, di }) {
+        this.pageService = pageService;
         this.context = context;
         this.customRender = customRender;
         this.extendRender = extendRender;
@@ -676,7 +676,7 @@ class ReactRenderServer {
     }
     render(extractor) {
         var _a;
-        let renderResult = renderReact({ componentRegistry: this.componentRegistry, di: this.di }, this.context);
+        let renderResult = renderReact({ pageService: this.pageService, di: this.di }, this.context);
         each__default["default"]((render) => {
             renderResult = render(renderResult);
         }, (_a = this.extendRender) !== null && _a !== void 0 ? _a : []);
@@ -808,7 +808,7 @@ exports.RenderModule = RenderModule_1 = tslib.__decorate([
                 useClass: ReactRenderServer,
                 deps: {
                     context: moduleCommon.CONTEXT_TOKEN,
-                    componentRegistry: moduleCommon.COMPONENT_REGISTRY_TOKEN,
+                    pageService: tokensRouter.PAGE_SERVICE_TOKEN,
                     customRender: { token: tokensRender.CUSTOM_RENDER, optional: true },
                     extendRender: { token: tokensRender.EXTEND_RENDER, optional: true },
                     di: core.DI_TOKEN,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-render",
-  "version": "1.30.1",
+  "version": "1.32.1",
   "description": "",
   "browser": "lib/browser.js",
   "main": "lib/server.js",
@@ -24,26 +24,26 @@
     "@tinkoff/htmlpagebuilder": "0.4.22",
     "@tinkoff/layout-factory": "0.2.28",
     "@tinkoff/url": "0.7.37",
-    "@tinkoff/user-agent": "0.3.151",
-    "@tramvai/module-client-hints": "1.30.1",
-    "@tramvai/module-router": "1.30.1",
-    "@tramvai/react": "1.30.1",
+    "@tinkoff/user-agent": "0.3.156",
+    "@tramvai/module-client-hints": "1.32.1",
+    "@tramvai/module-router": "1.32.1",
+    "@tramvai/react": "1.32.1",
     "@tramvai/safe-strings": "0.4.3",
-    "@tramvai/tokens-render": "1.30.1",
-    "@tramvai/experiments": "1.30.1",
+    "@tramvai/tokens-render": "1.32.1",
+    "@tramvai/experiments": "1.32.1",
     "@types/loadable__server": "^5.12.6",
     "node-fetch": "^2.6.1"
   },
   "peerDependencies": {
     "@tinkoff/dippy": "0.7.35",
     "@tinkoff/utils": "^2.1.2",
-    "@tramvai/cli": "1.30.1",
-    "@tramvai/core": "1.30.1",
-    "@tramvai/module-common": "1.30.1",
-    "@tramvai/state": "1.30.1",
-    "@tramvai/test-helpers": "1.30.1",
-    "@tramvai/tokens-common": "1.30.1",
-    "@tramvai/tokens-router": "1.30.1",
+    "@tramvai/cli": "1.32.1",
+    "@tramvai/core": "1.32.1",
+    "@tramvai/module-common": "1.32.1",
+    "@tramvai/state": "1.32.1",
+    "@tramvai/test-helpers": "1.32.1",
+    "@tramvai/tokens-common": "1.32.1",
+    "@tramvai/tokens-router": "1.32.1",
     "prop-types": "^15.6.2",
     "react": ">=16.8.0",
     "react-dom": ">=16.8.0",