@tramvai/module-page-render-mode 7.5.3 → 7.11.0

package/lib/utils/cacheKey.d.ts

@@ -1,8 +1,6 @@
-export declare const getCacheKey: ({ method, host, path, deviceType, }: {
-    method: string;
-    host: string;
-    path: string;
-    deviceType: 'desktop' | 'mobile';
+export declare const getCacheKey: ({ pathname, key }: {
+    pathname: string;
+    key: string;
 }) => string;
-export declare const parseCacheKey: (key: string) => string[];
+export declare const parseCacheKey: (key: string) => [pathname: string, key: string];
 //# sourceMappingURL=cacheKey.d.ts.map

package/lib/utils/cacheKey.es.js

@@ -1,5 +1,10 @@
-const getCacheKey = ({ method, host, path, deviceType, }) => {
-    return `${method}=${host}=${path}=${deviceType}`;
+// unsafe url symbol, cannot be used in pathname without encoding
+const SEPARATOR = '^';
+const getCacheKey = ({ pathname, key }) => {
+    return `${pathname}${SEPARATOR}${key}`;
+};
+const parseCacheKey = (key) => {
+    return key.split(SEPARATOR);
 };
 
-export { getCacheKey };
+export { getCacheKey, parseCacheKey };

package/lib/utils/cacheKey.js

@@ -2,8 +2,14 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-const getCacheKey = ({ method, host, path, deviceType, }) => {
-    return `${method}=${host}=${path}=${deviceType}`;
+// unsafe url symbol, cannot be used in pathname without encoding
+const SEPARATOR = '^';
+const getCacheKey = ({ pathname, key }) => {
+    return `${pathname}${SEPARATOR}${key}`;
+};
+const parseCacheKey = (key) => {
+    return key.split(SEPARATOR);
 };
 
 exports.getCacheKey = getCacheKey;
+exports.parseCacheKey = parseCacheKey;

package/lib/utils/getPageRenderMode.browser.js

@@ -1,5 +1,17 @@
-const getPageRenderMode = ({ pageService, defaultRenderMode, }) => {
-    const { pageComponent, pageRenderMode } = pageService.getConfig();
+const getPageRenderMode = ({ requestManager, router, pageService, defaultRenderMode, fileSystemCache, }) => {
+    const resolvedRoute = router?.getCurrentRoute() ?? router?.resolve(requestManager.getParsedUrl().pathname);
+    // if we can't resolve route, it means that we are on 404 page, or has dynamic routing,
+    // so we can't determine render mode by page config or page component property, and should fallback to default render mode
+    if (!resolvedRoute) {
+        return typeof defaultRenderMode === 'function' ? defaultRenderMode() : defaultRenderMode;
+    }
+    // fast way for prerendered pages to determine render mode without full route resolving
+    if (fileSystemCache &&
+        // TODO: refactor for log(1) complexity
+        fileSystemCache.staticPages.some((item) => item.path === resolvedRoute.path || item.name === resolvedRoute.name)) {
+        return 'static';
+    }
+    const { pageComponent, pageRenderMode } = (pageService.getCurrentRoute() ? pageService.getConfig() : resolvedRoute.config) ?? {};
     const { renderMode } = pageService.getComponent(pageComponent) ?? {};
     const mode = pageRenderMode || renderMode || defaultRenderMode;
     return typeof mode === 'function' ? mode() : mode;

package/lib/utils/getPageRenderMode.d.ts

@@ -1,9 +1,14 @@
 import type { ExtractDependencyType } from '@tinkoff/dippy';
 import type { TramvaiRenderMode } from '@tramvai/tokens-render';
-import type { PAGE_SERVICE_TOKEN } from '@tramvai/tokens-router';
+import type { PAGE_SERVICE_TOKEN, ROUTER_TOKEN } from '@tramvai/tokens-router';
+import { REQUEST_MANAGER_TOKEN } from '@tramvai/tokens-common';
 import type { PAGE_RENDER_DEFAULT_MODE } from '../tokens';
-export declare const getPageRenderMode: ({ pageService, defaultRenderMode, }: {
-    pageService: ExtractDependencyType<typeof PAGE_SERVICE_TOKEN>;
+import { STATIC_PAGES_FS_CACHE_TOKEN } from '../private-tokens';
+export declare const getPageRenderMode: ({ requestManager, router, pageService, defaultRenderMode, fileSystemCache, }: {
+    requestManager: ExtractDependencyType<typeof REQUEST_MANAGER_TOKEN>;
+    router: ExtractDependencyType<typeof ROUTER_TOKEN> | null;
+    pageService: ExtractDependencyType<typeof PAGE_SERVICE_TOKEN> | null;
     defaultRenderMode: ExtractDependencyType<typeof PAGE_RENDER_DEFAULT_MODE>;
+    fileSystemCache?: import("../staticPages/fileSystemCache").FileSystemCache | null | undefined;
 }) => TramvaiRenderMode;
 //# sourceMappingURL=getPageRenderMode.d.ts.map

package/lib/utils/getPageRenderMode.es.js

@@ -1,5 +1,17 @@
-const getPageRenderMode = ({ pageService, defaultRenderMode, }) => {
-    const { pageComponent, pageRenderMode } = pageService.getConfig();
+const getPageRenderMode = ({ requestManager, router, pageService, defaultRenderMode, fileSystemCache, }) => {
+    const resolvedRoute = router?.getCurrentRoute() ?? router?.resolve(requestManager.getParsedUrl().pathname);
+    // if we can't resolve route, it means that we are on 404 page, or has dynamic routing,
+    // so we can't determine render mode by page config or page component property, and should fallback to default render mode
+    if (!resolvedRoute) {
+        return typeof defaultRenderMode === 'function' ? defaultRenderMode() : defaultRenderMode;
+    }
+    // fast way for prerendered pages to determine render mode without full route resolving
+    if (fileSystemCache &&
+        // TODO: refactor for log(1) complexity
+        fileSystemCache.staticPages.some((item) => item.path === resolvedRoute.path || item.name === resolvedRoute.name)) {
+        return 'static';
+    }
+    const { pageComponent, pageRenderMode } = (pageService.getCurrentRoute() ? pageService.getConfig() : resolvedRoute.config) ?? {};
     const { renderMode } = pageService.getComponent(pageComponent) ?? {};
     const mode = pageRenderMode || renderMode || defaultRenderMode;
     return typeof mode === 'function' ? mode() : mode;

package/lib/utils/getPageRenderMode.js

@@ -2,8 +2,20 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-const getPageRenderMode = ({ pageService, defaultRenderMode, }) => {
-    const { pageComponent, pageRenderMode } = pageService.getConfig();
+const getPageRenderMode = ({ requestManager, router, pageService, defaultRenderMode, fileSystemCache, }) => {
+    const resolvedRoute = router?.getCurrentRoute() ?? router?.resolve(requestManager.getParsedUrl().pathname);
+    // if we can't resolve route, it means that we are on 404 page, or has dynamic routing,
+    // so we can't determine render mode by page config or page component property, and should fallback to default render mode
+    if (!resolvedRoute) {
+        return typeof defaultRenderMode === 'function' ? defaultRenderMode() : defaultRenderMode;
+    }
+    // fast way for prerendered pages to determine render mode without full route resolving
+    if (fileSystemCache &&
+        // TODO: refactor for log(1) complexity
+        fileSystemCache.staticPages.some((item) => item.path === resolvedRoute.path || item.name === resolvedRoute.name)) {
+        return 'static';
+    }
+    const { pageComponent, pageRenderMode } = (pageService.getCurrentRoute() ? pageService.getConfig() : resolvedRoute.config) ?? {};
     const { renderMode } = pageService.getComponent(pageComponent) ?? {};
     const mode = pageRenderMode || renderMode || defaultRenderMode;
     return typeof mode === 'function' ? mode() : mode;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-page-render-mode",
-  "version": "7.5.3",
+  "version": "7.11.0",
   "description": "Enable different rendering modes for pages",
   "main": "./lib/server.js",
   "module": "./lib/server.es.js",
@@ -24,23 +24,25 @@
   },
   "dependencies": {
     "@tinkoff/errors": "0.8.1",
-    "@tinkoff/url": "0.13.1"
+    "@tinkoff/url": "0.13.1",
+    "p-limit": "^3"
   },
   "peerDependencies": {
     "@tinkoff/dippy": "0.13.2",
+    "@tinkoff/router": "0.7.32",
     "@tinkoff/utils": "^2.1.2",
-    "@tramvai/core": "7.5.3",
-    "@tramvai/module-client-hints": "7.5.3",
-    "@tramvai/module-router": "7.5.3",
-    "@tramvai/papi": "7.5.3",
-    "@tramvai/react": "7.5.3",
-    "@tramvai/tokens-common": "7.5.3",
-    "@tramvai/tokens-core": "7.5.3",
-    "@tramvai/tokens-metrics": "7.5.3",
-    "@tramvai/tokens-render": "7.5.3",
-    "@tramvai/tokens-router": "7.5.3",
-    "@tramvai/tokens-server": "7.5.3",
-    "@tramvai/tokens-server-private": "7.5.3",
+    "@tramvai/core": "7.11.0",
+    "@tramvai/module-client-hints": "7.11.0",
+    "@tramvai/module-router": "7.11.0",
+    "@tramvai/papi": "7.11.0",
+    "@tramvai/react": "7.11.0",
+    "@tramvai/tokens-common": "7.11.0",
+    "@tramvai/tokens-core": "7.11.0",
+    "@tramvai/tokens-metrics": "7.11.0",
+    "@tramvai/tokens-render": "7.11.0",
+    "@tramvai/tokens-router": "7.11.0",
+    "@tramvai/tokens-server": "7.11.0",
+    "@tramvai/tokens-server-private": "7.11.0",
     "prom-client": "^14.2.0",
     "react": ">=16.14.0",
     "tslib": "^2.4.0"