@tramvai/module-router 2.22.0 → 2.24.0

package/lib/index.es.js

@@ -549,25 +549,29 @@ const routerOptions = ({ requestManager, responseManager, }) => {
 const deduplicateArray = (list) => {
     return Array.from(new Set(list));
 };
-const bundleInfo = ({ routes, routeTransform, }) => {
-    return createPapiMethod({
-        method: 'get',
-        path: '/bundleInfo',
-        async handler(deps) {
-            var _a, _b;
-            const loadAdditional = (_a = deps.getAdditionalRoutes) !== null && _a !== void 0 ? _a : (() => []);
-            return deduplicateArray(flatten(routes || [])
-                .concat((_b = (await loadAdditional())) !== null && _b !== void 0 ? _b : [])
-                .map(routeTransform)
-                .map(prop('path'))
-                .filter((path) => !isWildcard(path) && !isHistoryFallback(path))
-                .sort());
-        },
-        deps: {
-            getAdditionalRoutes: { token: routerBundleInfoAdditionalToken, optional: true },
+const bundleInfoPapi = createPapiMethod({
+    method: 'get',
+    path: '/bundleInfo',
+    async handler() {
+        var _a;
+        const { getAdditionalRoutes, routes, routeTransform } = this.deps;
+        const loadAdditional = getAdditionalRoutes !== null && getAdditionalRoutes !== void 0 ? getAdditionalRoutes : (() => []);
+        return deduplicateArray(flatten(routes || [])
+            .concat((_a = (await loadAdditional())) !== null && _a !== void 0 ? _a : [])
+            .map(routeTransform)
+            .map(prop('path'))
+            .filter((path) => !isWildcard(path) && !isHistoryFallback(path))
+            .sort());
+    },
+    deps: {
+        routes: {
+            token: ROUTES_TOKEN,
+            optional: true,
         },
-    });
-};
+        routeTransform: routeTransformToken,
+        getAdditionalRoutes: { token: routerBundleInfoAdditionalToken, optional: true },
+    },
+});
 
 const serverTokens = [
     {
@@ -581,14 +585,7 @@ const serverTokens = [
     {
         provide: SERVER_MODULE_PAPI_PUBLIC_ROUTE,
         multi: true,
-        useFactory: bundleInfo,
-        deps: {
-            routes: {
-                token: ROUTES_TOKEN,
-                optional: true,
-            },
-            routeTransform: routeTransformToken,
-        },
+        useValue: bundleInfoPapi,
     },
 ];
 

package/lib/index.js

@@ -560,25 +560,29 @@ const routerOptions = ({ requestManager, responseManager, }) => {
 const deduplicateArray = (list) => {
     return Array.from(new Set(list));
 };
-const bundleInfo = ({ routes, routeTransform, }) => {
-    return papi.createPapiMethod({
-        method: 'get',
-        path: '/bundleInfo',
-        async handler(deps) {
-            var _a, _b;
-            const loadAdditional = (_a = deps.getAdditionalRoutes) !== null && _a !== void 0 ? _a : (() => []);
-            return deduplicateArray(flatten__default["default"](routes || [])
-                .concat((_b = (await loadAdditional())) !== null && _b !== void 0 ? _b : [])
-                .map(routeTransform)
-                .map(prop__default["default"]('path'))
-                .filter((path) => !router.isWildcard(path) && !router.isHistoryFallback(path))
-                .sort());
-        },
-        deps: {
-            getAdditionalRoutes: { token: routerBundleInfoAdditionalToken, optional: true },
+const bundleInfoPapi = papi.createPapiMethod({
+    method: 'get',
+    path: '/bundleInfo',
+    async handler() {
+        var _a;
+        const { getAdditionalRoutes, routes, routeTransform } = this.deps;
+        const loadAdditional = getAdditionalRoutes !== null && getAdditionalRoutes !== void 0 ? getAdditionalRoutes : (() => []);
+        return deduplicateArray(flatten__default["default"](routes || [])
+            .concat((_a = (await loadAdditional())) !== null && _a !== void 0 ? _a : [])
+            .map(routeTransform)
+            .map(prop__default["default"]('path'))
+            .filter((path) => !router.isWildcard(path) && !router.isHistoryFallback(path))
+            .sort());
+    },
+    deps: {
+        routes: {
+            token: tokensRouter.ROUTES_TOKEN,
+            optional: true,
         },
-    });
-};
+        routeTransform: routeTransformToken,
+        getAdditionalRoutes: { token: routerBundleInfoAdditionalToken, optional: true },
+    },
+});
 
 const serverTokens = [
     {
@@ -592,14 +596,7 @@ const serverTokens = [
     {
         provide: tokensServer.SERVER_MODULE_PAPI_PUBLIC_ROUTE,
         multi: true,
-        useFactory: bundleInfo,
-        deps: {
-            routes: {
-                token: tokensRouter.ROUTES_TOKEN,
-                optional: true,
-            },
-            routeTransform: routeTransformToken,
-        },
+        useValue: bundleInfoPapi,
     },
 ];
 

package/lib/modules/tokens/server/bundleInfo.d.ts

@@ -1,6 +1 @@
-import type { ROUTES_TOKEN } from '@tramvai/tokens-router';
-import type { routeTransformToken } from '../../tokens';
-export declare const bundleInfo: ({ routes, routeTransform, }: {
-    routes?: Array<typeof ROUTES_TOKEN>;
-    routeTransform: typeof routeTransformToken;
-}) => import("@tramvai/papi").Papi<any, any>;
+export declare const bundleInfoPapi: import("@tramvai/papi").Papi<any, any>;

package/lib/modules/tokens.d.ts

@@ -1,4 +1,5 @@
 import type { NavigationHook, AbstractRouter, NavigationSyncHook, Route } from '@tinkoff/router';
+import type { RouteTransform } from '@tramvai/tokens-router';
 export declare const routerClassToken: import("@tinkoff/dippy").BaseTokenInterface<AbstractRouter>;
 export declare const additionalRouterParameters: import("@tinkoff/dippy").BaseTokenInterface<Record<string, any>>;
 export declare const onChangeHooksToken: import("@tinkoff/dippy").MultiTokenInterface<NavigationSyncHook>;
@@ -7,5 +8,5 @@ export declare const beforeNavigateHooksToken: import("@tinkoff/dippy").MultiTok
 export declare const afterNavigateHooksToken: import("@tinkoff/dippy").MultiTokenInterface<NavigationHook>;
 export declare const beforeUpdateCurrentHooksToken: import("@tinkoff/dippy").MultiTokenInterface<NavigationHook>;
 export declare const afterUpdateCurrentHooksToken: import("@tinkoff/dippy").MultiTokenInterface<NavigationHook>;
-export declare const routeTransformToken: import("@tinkoff/dippy").BaseTokenInterface<import("@tinkoff/dippy").MultiTokenInterface<import("@tramvai/tokens-router").RouteTransform>>;
+export declare const routeTransformToken: import("@tinkoff/dippy").BaseTokenInterface<RouteTransform>;
 export declare const routerBundleInfoAdditionalToken: import("@tinkoff/dippy").BaseTokenInterface<() => Promise<Route[]>>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-router",
-  "version": "2.22.0",
+  "version": "2.24.0",
   "description": "",
   "main": "lib/index.js",
   "browser": {
@@ -24,26 +24,26 @@
     "build-for-publish": "true"
   },
   "dependencies": {
-    "@tinkoff/errors": "0.3.2",
+    "@tinkoff/errors": "0.3.3",
     "@tinkoff/router": "0.2.2",
     "@tinkoff/url": "0.8.2",
-    "@tramvai/tokens-child-app": "2.22.0",
-    "@tramvai/tokens-render": "2.22.0",
-    "@tramvai/tokens-router": "2.22.0",
-    "@tramvai/tokens-server": "2.22.0",
-    "@tramvai/experiments": "2.22.0"
+    "@tramvai/tokens-child-app": "2.24.0",
+    "@tramvai/tokens-render": "2.24.0",
+    "@tramvai/tokens-router": "2.24.0",
+    "@tramvai/tokens-server": "2.24.0",
+    "@tramvai/experiments": "2.24.0"
   },
   "peerDependencies": {
     "@tinkoff/utils": "^2.1.2",
-    "@tramvai/cli": "2.22.0",
-    "@tramvai/core": "2.22.0",
-    "@tramvai/module-log": "2.22.0",
-    "@tramvai/module-server": "2.22.0",
-    "@tramvai/papi": "2.22.0",
-    "@tramvai/state": "2.22.0",
-    "@tramvai/test-helpers": "2.22.0",
-    "@tramvai/test-mocks": "2.22.0",
-    "@tramvai/tokens-common": "2.22.0",
+    "@tramvai/cli": "2.24.0",
+    "@tramvai/core": "2.24.0",
+    "@tramvai/module-log": "2.24.0",
+    "@tramvai/module-server": "2.24.0",
+    "@tramvai/papi": "2.24.0",
+    "@tramvai/state": "2.24.0",
+    "@tramvai/test-helpers": "2.24.0",
+    "@tramvai/test-mocks": "2.24.0",
+    "@tramvai/tokens-common": "2.24.0",
     "@tinkoff/dippy": "0.8.2",
     "react": "*",
     "tslib": "^2.0.3"