@tramvai/module-router 7.39.0 → 7.41.1

package/lib/index.browser.js

@@ -9,5 +9,6 @@ export { PageErrorStore, setPageErrorEvent } from './stores/PageErrorStore.brows
 export { usePageService } from './hooks/usePageService.browser.js';
 export { stopRunAtError } from './modules/utils/stopRunAtError.browser.js';
 export { ROUTER_VIEW_TRANSITIONS_ENABLED, afterNavigateHooksToken, afterUpdateCurrentHooksToken, beforeNavigateHooksToken, beforeResolveHooksToken, beforeUpdateCurrentHooksToken, onChangeHooksToken, routeTransformToken, routerBundleInfoAdditionalToken } from './modules/tokens.browser.js';
+export { resetDeferredAction } from './modules/hooks/runActions.browser.js';
 export * from '@tinkoff/router';
 export { deserializeError, serializeError } from '@tramvai/safe-strings';

package/lib/index.d.ts

@@ -9,6 +9,7 @@ export * from './stores/PageErrorStore';
 export * from './hooks/usePageService';
 export { stopRunAtError } from './modules/utils/stopRunAtError';
 export { onChangeHooksToken, beforeNavigateHooksToken, afterNavigateHooksToken, beforeResolveHooksToken, beforeUpdateCurrentHooksToken, afterUpdateCurrentHooksToken, routerBundleInfoAdditionalToken, routeTransformToken, ROUTER_VIEW_TRANSITIONS_ENABLED, } from './modules/tokens';
+export { resetDeferredAction } from './modules/hooks/runActions';
 export * from '@tinkoff/router';
 declare module '@tinkoff/router' {
     interface RouteConfig {

package/lib/index.es.js

@@ -8,5 +8,6 @@ export { PageErrorStore, setPageErrorEvent } from './stores/PageErrorStore.es.js
 export { usePageService } from './hooks/usePageService.es.js';
 export { stopRunAtError } from './modules/utils/stopRunAtError.es.js';
 export { ROUTER_VIEW_TRANSITIONS_ENABLED, afterNavigateHooksToken, afterUpdateCurrentHooksToken, beforeNavigateHooksToken, beforeResolveHooksToken, beforeUpdateCurrentHooksToken, onChangeHooksToken, routeTransformToken, routerBundleInfoAdditionalToken } from './modules/tokens.es.js';
+export { resetDeferredAction } from './modules/hooks/runActions.es.js';
 export * from '@tinkoff/router';
 export { deserializeError, serializeError } from '@tramvai/safe-strings';

package/lib/index.js

@@ -12,6 +12,7 @@ var PageErrorStore = require('./stores/PageErrorStore.js');
 var usePageService = require('./hooks/usePageService.js');
 var stopRunAtError = require('./modules/utils/stopRunAtError.js');
 var tokens = require('./modules/tokens.js');
+var runActions = require('./modules/hooks/runActions.js');
 var router = require('@tinkoff/router');
 var safeStrings = require('@tramvai/safe-strings');
 
@@ -42,6 +43,7 @@ exports.beforeUpdateCurrentHooksToken = tokens.beforeUpdateCurrentHooksToken;
 exports.onChangeHooksToken = tokens.onChangeHooksToken;
 exports.routeTransformToken = tokens.routeTransformToken;
 exports.routerBundleInfoAdditionalToken = tokens.routerBundleInfoAdditionalToken;
+exports.resetDeferredAction = runActions.resetDeferredAction;
 Object.defineProperty(exports, 'deserializeError', {
 	enumerable: true,
 	get: function () { return safeStrings.deserializeError; }

package/lib/modules/hooks/runActions.browser.js

@@ -30,17 +30,18 @@ const runActionsFactory = (deps) => {
         });
     };
 };
+const resetDeferredAction = (action, deferredActionsMap, actionExecution) => {
+    const parameters = action[ACTION_PARAMETERS];
+    const isDeferredAction = parameters?.deferred;
+    const deferred = deferredActionsMap.get(parameters?.name);
+    // here only deferred actions with always or dynamic conditions will be refreshed
+    if (isDeferredAction && deferred && actionExecution.canExecute(action)) {
+        deferred.reset();
+    }
+};
 const resetDeferredActions = (deps) => {
     const actions = getActions(deps);
-    actions.forEach((action) => {
-        const parameters = action[ACTION_PARAMETERS];
-        const isDeferredAction = parameters?.deferred;
-        const deferred = deps.deferredActionsMap.get(parameters?.name);
-        // here only deferred actions with always or dynamic conditions will be refreshed
-        if (isDeferredAction && deferred && deps.actionExecution.canExecute(action)) {
-            deferred.reset();
-        }
-    });
+    actions.forEach((action) => resetDeferredAction(action, deps.deferredActionsMap, deps.actionExecution));
 };
 
-export { getActions, resetDeferredActions, runActionsFactory };
+export { getActions, resetDeferredAction, resetDeferredActions, runActionsFactory };

package/lib/modules/hooks/runActions.d.ts

@@ -1,17 +1,19 @@
 import type { ACTION_REGISTRY_TOKEN, ACTION_PAGE_RUNNER_TOKEN, STORE_TOKEN, DEFERRED_ACTIONS_MAP_TOKEN, ACTION_EXECUTION_TOKEN } from '@tramvai/tokens-common';
 import type { ROUTER_TOKEN } from '@tramvai/tokens-router';
+import { type PageAction } from '@tramvai/core';
 export declare const getActions: ({ store, router, actionRegistry, actionPageRunner, }: {
     store: typeof STORE_TOKEN;
     router: typeof ROUTER_TOKEN;
     actionRegistry: typeof ACTION_REGISTRY_TOKEN;
     actionPageRunner: typeof ACTION_PAGE_RUNNER_TOKEN;
-}) => import("@tramvai/core").PageAction[];
+}) => PageAction[];
 export declare const runActionsFactory: (deps: {
     store: typeof STORE_TOKEN;
     router: typeof ROUTER_TOKEN;
     actionRegistry: typeof ACTION_REGISTRY_TOKEN;
     actionPageRunner: typeof ACTION_PAGE_RUNNER_TOKEN;
 }) => () => Promise<any>;
+export declare const resetDeferredAction: (action: PageAction, deferredActionsMap: typeof DEFERRED_ACTIONS_MAP_TOKEN, actionExecution: typeof ACTION_EXECUTION_TOKEN) => void;
 export declare const resetDeferredActions: (deps: {
     store: typeof STORE_TOKEN;
     router: typeof ROUTER_TOKEN;

package/lib/modules/hooks/runActions.es.js

@@ -1,6 +1,6 @@
 import uniq from '@tinkoff/utils/array/uniq';
 import { isRedirectFoundError } from '@tinkoff/errors';
-import '@tramvai/core';
+import { ACTION_PARAMETERS } from '@tramvai/core';
 import { stopRunAtError } from '../utils/stopRunAtError.es.js';
 
 const getActions = ({ store, router, actionRegistry, actionPageRunner, }) => {
@@ -30,5 +30,14 @@ const runActionsFactory = (deps) => {
         });
     };
 };
+const resetDeferredAction = (action, deferredActionsMap, actionExecution) => {
+    const parameters = action[ACTION_PARAMETERS];
+    const isDeferredAction = parameters?.deferred;
+    const deferred = deferredActionsMap.get(parameters?.name);
+    // here only deferred actions with always or dynamic conditions will be refreshed
+    if (isDeferredAction && deferred && actionExecution.canExecute(action)) {
+        deferred.reset();
+    }
+};
 
-export { getActions, runActionsFactory };
+export { getActions, resetDeferredAction, runActionsFactory };

package/lib/modules/hooks/runActions.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var uniq = require('@tinkoff/utils/array/uniq');
 var errors = require('@tinkoff/errors');
-require('@tramvai/core');
+var core = require('@tramvai/core');
 var stopRunAtError = require('../utils/stopRunAtError.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -38,6 +38,16 @@ const runActionsFactory = (deps) => {
         });
     };
 };
+const resetDeferredAction = (action, deferredActionsMap, actionExecution) => {
+    const parameters = action[core.ACTION_PARAMETERS];
+    const isDeferredAction = parameters?.deferred;
+    const deferred = deferredActionsMap.get(parameters?.name);
+    // here only deferred actions with always or dynamic conditions will be refreshed
+    if (isDeferredAction && deferred && actionExecution.canExecute(action)) {
+        deferred.reset();
+    }
+};
 
 exports.getActions = getActions;
+exports.resetDeferredAction = resetDeferredAction;
 exports.runActionsFactory = runActionsFactory;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-router",
-  "version": "7.39.0",
+  "version": "7.41.1",
   "description": "",
   "main": "lib/index.js",
   "browser": {
@@ -26,29 +26,29 @@
   },
   "dependencies": {
     "@tinkoff/errors": "0.8.1",
-    "@tinkoff/router": "0.7.149",
+    "@tinkoff/router": "0.7.153",
     "@tinkoff/url": "0.13.1",
-    "@tramvai/experiments": "7.39.0",
-    "@tramvai/react": "7.39.0",
+    "@tramvai/experiments": "7.41.1",
+    "@tramvai/react": "7.41.1",
     "@tramvai/safe-strings": "0.10.2",
-    "@tramvai/tokens-child-app": "7.39.0",
-    "@tramvai/tokens-core": "7.39.0",
-    "@tramvai/tokens-render": "7.39.0",
-    "@tramvai/tokens-router": "7.39.0",
-    "@tramvai/tokens-server": "7.39.0"
+    "@tramvai/tokens-child-app": "7.41.1",
+    "@tramvai/tokens-core": "7.41.1",
+    "@tramvai/tokens-render": "7.41.1",
+    "@tramvai/tokens-router": "7.41.1",
+    "@tramvai/tokens-server": "7.41.1"
   },
   "peerDependencies": {
     "@tinkoff/dippy": "^1.0.0",
     "@tinkoff/utils": "^2.1.2",
-    "@tramvai/cli": "7.39.0",
-    "@tramvai/core": "7.39.0",
-    "@tramvai/module-log": "7.39.0",
-    "@tramvai/module-server": "7.39.0",
-    "@tramvai/papi": "7.39.0",
-    "@tramvai/state": "7.39.0",
-    "@tramvai/test-helpers": "7.39.0",
-    "@tramvai/test-mocks": "7.39.0",
-    "@tramvai/tokens-common": "7.39.0",
+    "@tramvai/cli": "7.41.1",
+    "@tramvai/core": "7.41.1",
+    "@tramvai/module-log": "7.41.1",
+    "@tramvai/module-server": "7.41.1",
+    "@tramvai/papi": "7.41.1",
+    "@tramvai/state": "7.41.1",
+    "@tramvai/test-helpers": "7.41.1",
+    "@tramvai/test-mocks": "7.41.1",
+    "@tramvai/tokens-common": "7.41.1",
     "react": "*",
     "tslib": "^2.4.0"
   },