@tramvai/module-router 1.82.2 → 1.84.2

package/lib/index.browser.js

@@ -509,22 +509,20 @@ const providers = [
     provide({
         provide: commandLineListTokens.clear,
         multi: true,
-        useFactory: (deps) => {
+        useFactory: ({ store, router, renderMode }) => {
             return async function csrFirstNavigation() {
-                const currentRoute = deps.store.getState(RouterStore).currentRoute;
+                const currentRoute = store.getState(RouterStore).currentRoute;
                 // in client-side rendering mode, if current route inconsistent with current location,
                 // run navigation to current location.
-                if (deps.renderMode === 'client' &&
+                if (renderMode === 'client' &&
                     (!currentRoute || (currentRoute && currentRoute.actualPath !== window.location.pathname))) {
-                    return deps.router.navigate(window.location.href);
+                    return router.navigate(window.location.href);
                 }
             };
         },
         deps: {
             store: STORE_TOKEN,
             router: ROUTER_TOKEN,
-            actionRegistry: ACTION_REGISTRY_TOKEN,
-            actionPageRunner: ACTION_PAGE_RUNNER_TOKEN,
             renderMode: TRAMVAI_RENDER_MODE,
         },
     }),
@@ -563,17 +561,31 @@ const NoSpaRouterModule = /* @__PURE__ */ Module({
     _a$1.forRoot = generateForRoot(_a$1),
     _a$1));
 
-const runCommands = ({ commandLineRunner, di, }) => {
+const runCommandsSpa = ({ commandLineRunner, di, }) => {
     return async () => {
         await commandLineRunner.run('client', 'spa', [], di);
     };
 };
+const runCommandsAfterSpa = ({ commandLineRunner, di, }) => {
+    return async () => {
+        await commandLineRunner.run('client', 'afterSpa', [], di);
+    };
+};
 
 const spaHooks = [
     {
         provide: beforeNavigateHooksToken,
         multi: true,
-        useFactory: runCommands,
+        useFactory: runCommandsSpa,
+        deps: {
+            di: DI_TOKEN,
+            commandLineRunner: COMMAND_LINE_RUNNER_TOKEN,
+        },
+    },
+    {
+        provide: afterNavigateHooksToken,
+        multi: true,
+        useFactory: runCommandsAfterSpa,
         deps: {
             di: DI_TOKEN,
             commandLineRunner: COMMAND_LINE_RUNNER_TOKEN,
@@ -600,13 +612,11 @@ const spaHooks = [
         },
     },
     {
-        provide: commandLineListTokens.customerStart,
+        provide: commandLineListTokens.afterSpaTransition,
         multi: true,
         useFactory: ({ spaMode, ...deps }) => {
             if (spaMode === 'after') {
-                return function installRouterRunActions() {
-                    deps.router.registerHook('afterNavigate', runActionsFactory(deps));
-                };
+                return runActionsFactory(deps);
             }
             return noop;
         },

package/lib/index.es.js

@@ -15,7 +15,7 @@ import replace from '@tinkoff/utils/string/replace';
 import React from 'react';
 import { isFileSystemPageComponent, fileSystemPagesEnabled, getStaticFileSystemPages, fileSystemPageToRoute } from '@tramvai/experiments';
 import uniq from '@tinkoff/utils/array/uniq';
-import { isRedirectFoundError, isNotFoundError, throwHttpError, throwRedirectFoundError } from '@tinkoff/errors';
+import { isRedirectFoundError, isNotFoundError, throwRedirectFoundError, HttpError, makeErrorSilent } from '@tinkoff/errors';
 import { SERVER_MODULE_PAPI_PUBLIC_ROUTE } from '@tramvai/tokens-server';
 import prop from '@tinkoff/utils/object/prop';
 import { createPapiMethod } from '@tramvai/papi';
@@ -500,24 +500,33 @@ const serverHooks = [
 ];
 
 const routerOptions = ({ requestManager, responseManager, }) => {
-    const throwError = (defaultStatus) => {
-        return throwHttpError({
+    const getUrl = (navigation) => { var _a, _b; return (_b = (_a = navigation.url) === null || _a === void 0 ? void 0 : _a.path) !== null && _b !== void 0 ? _b : requestManager.getUrl(); };
+    const throwError = ({ defaultStatus, url, silent, }) => {
+        const error = new HttpError({
+            url,
             httpStatus: responseManager.getStatus() >= 300 ? responseManager.getStatus() : defaultStatus,
         });
+        if (silent) {
+            makeErrorSilent(error);
+        }
+        throw error;
     };
     return {
-        onNotFound: async () => {
-            throwError(404);
+        onNotFound: async (navigation) => {
+            // isSilent is used to prevent command line error logs,
+            // because 404 errors is expected behavior
+            throwError({ defaultStatus: 404, url: getUrl(navigation), silent: true });
         },
         onRedirect: async (navigation) => {
             const { fromUrl, url, code } = navigation;
             throwRedirectFoundError({
+                url: getUrl(navigation),
                 nextUrl: fromUrl.origin !== url.origin ? url.href : url.path,
                 httpStatus: code,
             });
         },
-        onBlock: async () => {
-            throwError(500);
+        onBlock: async (navigation) => {
+            throwError({ defaultStatus: 500, url: getUrl(navigation) });
         },
         defaultRedirectCode: requestManager.getMethod() === 'GET' ? 301 : 308,
     };

package/lib/index.js

@@ -512,24 +512,33 @@ const serverHooks = [
 ];
 
 const routerOptions = ({ requestManager, responseManager, }) => {
-    const throwError = (defaultStatus) => {
-        return errors.throwHttpError({
+    const getUrl = (navigation) => { var _a, _b; return (_b = (_a = navigation.url) === null || _a === void 0 ? void 0 : _a.path) !== null && _b !== void 0 ? _b : requestManager.getUrl(); };
+    const throwError = ({ defaultStatus, url, silent, }) => {
+        const error = new errors.HttpError({
+            url,
             httpStatus: responseManager.getStatus() >= 300 ? responseManager.getStatus() : defaultStatus,
         });
+        if (silent) {
+            errors.makeErrorSilent(error);
+        }
+        throw error;
     };
     return {
-        onNotFound: async () => {
-            throwError(404);
+        onNotFound: async (navigation) => {
+            // isSilent is used to prevent command line error logs,
+            // because 404 errors is expected behavior
+            throwError({ defaultStatus: 404, url: getUrl(navigation), silent: true });
         },
         onRedirect: async (navigation) => {
             const { fromUrl, url, code } = navigation;
             errors.throwRedirectFoundError({
+                url: getUrl(navigation),
                 nextUrl: fromUrl.origin !== url.origin ? url.href : url.path,
                 httpStatus: code,
             });
         },
-        onBlock: async () => {
-            throwError(500);
+        onBlock: async (navigation) => {
+            throwError({ defaultStatus: 500, url: getUrl(navigation) });
         },
         defaultRedirectCode: requestManager.getMethod() === 'GET' ? 301 : 308,
     };

package/lib/modules/hooks/spa/runCommands.d.ts

@@ -1,6 +1,10 @@
 import type { DI_TOKEN, COMMAND_LINE_RUNNER_TOKEN } from '@tramvai/core';
 import type { NavigationHook } from '@tinkoff/router';
-export declare const runCommands: ({ commandLineRunner, di, }: {
+export declare const runCommandsSpa: ({ commandLineRunner, di, }: {
+    di: typeof DI_TOKEN;
+    commandLineRunner: typeof COMMAND_LINE_RUNNER_TOKEN;
+}) => NavigationHook;
+export declare const runCommandsAfterSpa: ({ commandLineRunner, di, }: {
     di: typeof DI_TOKEN;
     commandLineRunner: typeof COMMAND_LINE_RUNNER_TOKEN;
 }) => NavigationHook;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-router",
-  "version": "1.82.2",
+  "version": "1.84.2",
   "description": "",
   "main": "lib/index.js",
   "browser": {
@@ -22,26 +22,26 @@
     "build-for-publish": "true"
   },
   "dependencies": {
-    "@tinkoff/errors": "0.2.19",
+    "@tinkoff/errors": "0.2.20",
     "@tinkoff/router": "0.1.71",
     "@tinkoff/url": "0.7.37",
-    "@tramvai/tokens-child-app": "1.82.2",
-    "@tramvai/tokens-render": "1.82.2",
-    "@tramvai/tokens-router": "1.82.2",
-    "@tramvai/tokens-server": "1.82.2",
-    "@tramvai/experiments": "1.82.2"
+    "@tramvai/tokens-child-app": "1.84.2",
+    "@tramvai/tokens-render": "1.84.2",
+    "@tramvai/tokens-router": "1.84.2",
+    "@tramvai/tokens-server": "1.84.2",
+    "@tramvai/experiments": "1.84.2"
   },
   "peerDependencies": {
     "@tinkoff/utils": "^2.1.2",
-    "@tramvai/cli": "1.82.2",
-    "@tramvai/core": "1.82.2",
-    "@tramvai/module-log": "1.82.2",
-    "@tramvai/module-server": "1.82.2",
-    "@tramvai/papi": "1.82.2",
-    "@tramvai/state": "1.82.2",
-    "@tramvai/test-helpers": "1.82.2",
-    "@tramvai/test-mocks": "1.82.2",
-    "@tramvai/tokens-common": "1.82.2",
+    "@tramvai/cli": "1.84.2",
+    "@tramvai/core": "1.84.2",
+    "@tramvai/module-log": "1.84.2",
+    "@tramvai/module-server": "1.84.2",
+    "@tramvai/papi": "1.84.2",
+    "@tramvai/state": "1.84.2",
+    "@tramvai/test-helpers": "1.84.2",
+    "@tramvai/test-mocks": "1.84.2",
+    "@tramvai/tokens-common": "1.84.2",
     "@tinkoff/dippy": "0.7.39",
     "react": "*",
     "tslib": "^2.0.3"