@tramvai/module-common 1.105.2 → 1.106.0

package/lib/bundleManager/bundleManager.d.ts

@@ -1,4 +1,4 @@
-import type { BUNDLE_MANAGER_TOKEN, DISPATCHER_TOKEN, DISPATCHER_CONTEXT_TOKEN, ActionsRegistry } from '@tramvai/tokens-common';
+import type { BUNDLE_MANAGER_TOKEN, DISPATCHER_TOKEN, ActionsRegistry } from '@tramvai/tokens-common';
 import type { Bundle } from '@tramvai/core';
 import type { ComponentRegistry } from '../componentRegistry/componentRegistry';
 declare type Interface = typeof BUNDLE_MANAGER_TOKEN;
@@ -9,13 +9,11 @@ export declare class BundleManager implements Interface {
     actionRegistry: ActionsRegistry;
     componentRegistry: ComponentRegistry;
     dispatcher: typeof DISPATCHER_TOKEN;
-    dispatcherContext: typeof DISPATCHER_CONTEXT_TOKEN;
-    constructor({ bundleList, componentRegistry, actionRegistry, dispatcher, dispatcherContext, logger, }: {
+    constructor({ bundleList, componentRegistry, actionRegistry, dispatcher, logger }: {
         bundleList: any;
         componentRegistry: any;
         actionRegistry: any;
         dispatcher: any;
-        dispatcherContext: any;
         logger: any;
     });
     get(name: string, pageComponent: string): Promise<Bundle>;

package/lib/cache/cacheFactory.d.ts

@@ -1,3 +1,2 @@
-import type { Options } from 'lru-cache';
-import type { Cache } from '@tramvai/tokens-common';
-export declare const cacheFactory: (type?: string, ...args: Options<unknown, undefined>[]) => Cache;
+import type { CacheFactory } from '@tramvai/tokens-common';
+export declare const cacheFactory: CacheFactory;

package/lib/index.browser.js

@@ -27,19 +27,18 @@ import objectMap from '@tinkoff/utils/object/map';
 import uniq from '@tinkoff/utils/array/uniq';
 import difference from '@tinkoff/utils/array/difference';
 import toArray from '@tinkoff/utils/array/toArray';
-import LRU from 'lru-cache';
+import LRU from '@tinkoff/lru-cache-nano';
 import { jsx } from 'react/jsx-runtime';
 import { EXTEND_RENDER } from '@tramvai/tokens-render';
 import { CHILD_APP_COMMON_INITIAL_STATE_TOKEN, CHILD_APP_INTERNAL_CONFIG_TOKEN, CHILD_APP_INTERNAL_ROOT_DI_BORROW_TOKEN, commandLineListTokens as commandLineListTokens$1 } from '@tramvai/tokens-child-app';
 
 const FS_PAGES_DEFAULT_BUNDLE = '__default';
 class BundleManager {
-    constructor({ bundleList, componentRegistry, actionRegistry, dispatcher, dispatcherContext, logger, }) {
+    constructor({ bundleList, componentRegistry, actionRegistry, dispatcher, logger }) {
         this.bundles = bundleList;
         this.componentRegistry = componentRegistry;
         this.actionRegistry = actionRegistry;
         this.dispatcher = dispatcher;
-        this.dispatcherContext = dispatcherContext;
         if (fileSystemPagesEnabled()) {
             const log = logger('file-system-pages:bundle-manager');
             const components = getAllFileSystemPages();
@@ -96,7 +95,6 @@ class BundleManager {
             if (component.reducers) {
                 component.reducers.forEach((reducer) => {
                     this.dispatcher.registerStore(reducer);
-                    this.dispatcherContext.getStore(reducer);
                 });
             }
         }
@@ -109,7 +107,6 @@ class BundleManager {
         if (bundle.reducers) {
             bundle.reducers.forEach((reducer) => {
                 this.dispatcher.registerStore(reducer);
-                this.dispatcherContext.getStore(reducer);
             });
         }
         return bundle;
@@ -912,10 +909,8 @@ StateModule = __decorate([
     })
 ], StateModule);
 
-// @ts-ignore
-LRU.prototype.clear = LRU.prototype.reset;
-const cacheFactory = (type, ...args) => {
-    return new LRU(...args);
+const cacheFactory = (type, options = { max: 100 }) => {
+    return new LRU(options);
 };
 
 const providers$1 = [];
@@ -1025,7 +1020,6 @@ CommonModule = __decorate([
                     componentRegistry: COMPONENT_REGISTRY_TOKEN,
                     actionRegistry: ACTION_REGISTRY_TOKEN,
                     dispatcher: DISPATCHER_TOKEN,
-                    dispatcherContext: DISPATCHER_CONTEXT_TOKEN,
                     logger: LOGGER_TOKEN,
                 },
             }),
@@ -1123,14 +1117,14 @@ CommonChildAppModule = __decorate([
             provide({
                 provide: EXTEND_RENDER,
                 multi: true,
-                useFactory: ({ context, initialState }) => {
+                useFactory: ({ context }) => {
+                    const serverState = typeof window !== 'undefined' ? context.getState() : undefined;
                     return (render) => {
-                        return (jsx(Provider, Object.assign({ context: context, serverState: initialState && context.getState() }, { children: render }), void 0));
+                        return (jsx(Provider, Object.assign({ context: context, serverState: serverState }, { children: render }), void 0));
                     };
                 },
                 deps: {
                     context: CONTEXT_TOKEN,
-                    initialState: { token: INITIAL_APP_STATE_TOKEN$1, optional: true },
                 },
             }),
         ],

package/lib/index.es.js

@@ -6,7 +6,7 @@ import { CookieModule } from '@tramvai/module-cookie';
 export { COOKIE_MANAGER_TOKEN } from '@tramvai/module-cookie';
 import { LogModule } from '@tramvai/module-log';
 import { Hooks } from '@tinkoff/hook-runner';
-import { REQUEST_MANAGER_TOKEN, REQUEST, COMBINE_REDUCERS, CONTEXT_TOKEN, RESPONSE_MANAGER_TOKEN, RESPONSE, ACTION_EXECUTION_TOKEN, LOGGER_TOKEN, PUBSUB_FACTORY_TOKEN, PUBSUB_TOKEN, ROOT_PUBSUB_TOKEN, ACTION_REGISTRY_TOKEN, ACTION_CONDITIONALS, STORE_TOKEN, ACTION_PAGE_RUNNER_TOKEN, DISPATCHER_TOKEN, DISPATCHER_CONTEXT_TOKEN, STORE_MIDDLEWARE, CLEAR_CACHE_TOKEN, CREATE_CACHE_TOKEN, REGISTER_CLEAR_CACHE_TOKEN, HOOK_TOKEN, COMPONENT_REGISTRY_TOKEN, BUNDLE_MANAGER_TOKEN, ADDITIONAL_BUNDLE_TOKEN, INITIAL_APP_STATE_TOKEN as INITIAL_APP_STATE_TOKEN$1 } from '@tramvai/tokens-common';
+import { REQUEST_MANAGER_TOKEN, REQUEST, COMBINE_REDUCERS, CONTEXT_TOKEN, RESPONSE_MANAGER_TOKEN, RESPONSE, ACTION_EXECUTION_TOKEN, LOGGER_TOKEN, PUBSUB_FACTORY_TOKEN, PUBSUB_TOKEN, ROOT_PUBSUB_TOKEN, ACTION_REGISTRY_TOKEN, ACTION_CONDITIONALS, STORE_TOKEN, ACTION_PAGE_RUNNER_TOKEN, DISPATCHER_TOKEN, DISPATCHER_CONTEXT_TOKEN, STORE_MIDDLEWARE, CLEAR_CACHE_TOKEN, CREATE_CACHE_TOKEN, REGISTER_CLEAR_CACHE_TOKEN, HOOK_TOKEN, COMPONENT_REGISTRY_TOKEN, BUNDLE_MANAGER_TOKEN, ADDITIONAL_BUNDLE_TOKEN } from '@tramvai/tokens-common';
 export * from '@tramvai/tokens-common';
 import { __lazyErrorHandler } from '@tramvai/react';
 import { fileSystemPagesEnabled, getAllFileSystemPages, isFileSystemPageComponent } from '@tramvai/experiments';
@@ -27,7 +27,7 @@ import objectMap from '@tinkoff/utils/object/map';
 import uniq from '@tinkoff/utils/array/uniq';
 import difference from '@tinkoff/utils/array/difference';
 import toArray from '@tinkoff/utils/array/toArray';
-import LRU from 'lru-cache';
+import LRU from '@tinkoff/lru-cache-nano';
 import { SERVER_MODULE_PAPI_PRIVATE_ROUTE } from '@tramvai/tokens-server';
 import { createPapiMethod } from '@tramvai/papi';
 import { jsx } from 'react/jsx-runtime';
@@ -36,12 +36,11 @@ import { CHILD_APP_INTERNAL_ROOT_DI_BORROW_TOKEN, commandLineListTokens as comma
 
 const FS_PAGES_DEFAULT_BUNDLE = '__default';
 class BundleManager {
-    constructor({ bundleList, componentRegistry, actionRegistry, dispatcher, dispatcherContext, logger, }) {
+    constructor({ bundleList, componentRegistry, actionRegistry, dispatcher, logger }) {
         this.bundles = bundleList;
         this.componentRegistry = componentRegistry;
         this.actionRegistry = actionRegistry;
         this.dispatcher = dispatcher;
-        this.dispatcherContext = dispatcherContext;
         if (fileSystemPagesEnabled()) {
             const log = logger('file-system-pages:bundle-manager');
             const components = getAllFileSystemPages();
@@ -98,7 +97,6 @@ class BundleManager {
             if (component.reducers) {
                 component.reducers.forEach((reducer) => {
                     this.dispatcher.registerStore(reducer);
-                    this.dispatcherContext.getStore(reducer);
                 });
             }
         }
@@ -111,7 +109,6 @@ class BundleManager {
         if (bundle.reducers) {
             bundle.reducers.forEach((reducer) => {
                 this.dispatcher.registerStore(reducer);
-                this.dispatcherContext.getStore(reducer);
             });
         }
         return bundle;
@@ -920,10 +917,8 @@ StateModule = __decorate([
     })
 ], StateModule);
 
-// @ts-ignore
-LRU.prototype.clear = LRU.prototype.reset;
-const cacheFactory = (type, ...args) => {
-    return new LRU(...args);
+const cacheFactory = (type, options = { max: 100 }) => {
+    return new LRU(options);
 };
 
 const papiClearCache = ({ clearCache, logger, }) => {
@@ -1058,7 +1053,6 @@ CommonModule = __decorate([
                     componentRegistry: COMPONENT_REGISTRY_TOKEN,
                     actionRegistry: ACTION_REGISTRY_TOKEN,
                     dispatcher: DISPATCHER_TOKEN,
-                    dispatcherContext: DISPATCHER_CONTEXT_TOKEN,
                     logger: LOGGER_TOKEN,
                 },
             }),
@@ -1145,14 +1139,14 @@ CommonChildAppModule = __decorate([
             provide({
                 provide: EXTEND_RENDER,
                 multi: true,
-                useFactory: ({ context, initialState }) => {
+                useFactory: ({ context }) => {
+                    const serverState = typeof window !== 'undefined' ? context.getState() : undefined;
                     return (render) => {
-                        return (jsx(Provider, Object.assign({ context: context, serverState: initialState && context.getState() }, { children: render }), void 0));
+                        return (jsx(Provider, Object.assign({ context: context, serverState: serverState }, { children: render }), void 0));
                     };
                 },
                 deps: {
                     context: CONTEXT_TOKEN,
-                    initialState: { token: INITIAL_APP_STATE_TOKEN$1, optional: true },
                 },
             }),
         ],

package/lib/index.js

@@ -29,7 +29,7 @@ var objectMap = require('@tinkoff/utils/object/map');
 var uniq = require('@tinkoff/utils/array/uniq');
 var difference = require('@tinkoff/utils/array/difference');
 var toArray = require('@tinkoff/utils/array/toArray');
-var LRU = require('lru-cache');
+var LRU = require('@tinkoff/lru-cache-nano');
 var tokensServer = require('@tramvai/tokens-server');
 var papi = require('@tramvai/papi');
 var jsxRuntime = require('react/jsx-runtime');
@@ -54,12 +54,11 @@ var LRU__default = /*#__PURE__*/_interopDefaultLegacy(LRU);
 
 const FS_PAGES_DEFAULT_BUNDLE = '__default';
 class BundleManager {
-    constructor({ bundleList, componentRegistry, actionRegistry, dispatcher, dispatcherContext, logger, }) {
+    constructor({ bundleList, componentRegistry, actionRegistry, dispatcher, logger }) {
         this.bundles = bundleList;
         this.componentRegistry = componentRegistry;
         this.actionRegistry = actionRegistry;
         this.dispatcher = dispatcher;
-        this.dispatcherContext = dispatcherContext;
         if (experiments.fileSystemPagesEnabled()) {
             const log = logger('file-system-pages:bundle-manager');
             const components = experiments.getAllFileSystemPages();
@@ -116,7 +115,6 @@ class BundleManager {
             if (component.reducers) {
                 component.reducers.forEach((reducer) => {
                     this.dispatcher.registerStore(reducer);
-                    this.dispatcherContext.getStore(reducer);
                 });
             }
         }
@@ -129,7 +127,6 @@ class BundleManager {
         if (bundle.reducers) {
             bundle.reducers.forEach((reducer) => {
                 this.dispatcher.registerStore(reducer);
-                this.dispatcherContext.getStore(reducer);
             });
         }
         return bundle;
@@ -938,10 +935,8 @@ StateModule = tslib.__decorate([
     })
 ], StateModule);
 
-// @ts-ignore
-LRU__default["default"].prototype.clear = LRU__default["default"].prototype.reset;
-const cacheFactory = (type, ...args) => {
-    return new LRU__default["default"](...args);
+const cacheFactory = (type, options = { max: 100 }) => {
+    return new LRU__default["default"](options);
 };
 
 const papiClearCache = ({ clearCache, logger, }) => {
@@ -1076,7 +1071,6 @@ exports.CommonModule = tslib.__decorate([
                     componentRegistry: tokensCommon.COMPONENT_REGISTRY_TOKEN,
                     actionRegistry: tokensCommon.ACTION_REGISTRY_TOKEN,
                     dispatcher: tokensCommon.DISPATCHER_TOKEN,
-                    dispatcherContext: tokensCommon.DISPATCHER_CONTEXT_TOKEN,
                     logger: tokensCommon.LOGGER_TOKEN,
                 },
             }),
@@ -1163,14 +1157,14 @@ exports.CommonChildAppModule = tslib.__decorate([
             core.provide({
                 provide: tokensRender.EXTEND_RENDER,
                 multi: true,
-                useFactory: ({ context, initialState }) => {
+                useFactory: ({ context }) => {
+                    const serverState = typeof window !== 'undefined' ? context.getState() : undefined;
                     return (render) => {
-                        return (jsxRuntime.jsx(state.Provider, Object.assign({ context: context, serverState: initialState && context.getState() }, { children: render }), void 0));
+                        return (jsxRuntime.jsx(state.Provider, Object.assign({ context: context, serverState: serverState }, { children: render }), void 0));
                     };
                 },
                 deps: {
                     context: tokensCommon.CONTEXT_TOKEN,
-                    initialState: { token: tokensCommon.INITIAL_APP_STATE_TOKEN, optional: true },
                 },
             }),
         ],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-common",
-  "version": "1.105.2",
+  "version": "1.106.0",
   "description": "",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -29,29 +29,29 @@
   },
   "dependencies": {
     "@tinkoff/errors": "0.2.21",
+    "@tinkoff/hook-runner": "0.3.22",
+    "@tinkoff/lru-cache-nano": "^7.8.1",
     "@tinkoff/pubsub": "0.4.24",
     "@tinkoff/url": "0.7.38",
-    "@tramvai/module-cookie": "1.105.2",
-    "@tramvai/module-environment": "1.105.2",
-    "@tramvai/module-log": "1.105.2",
-    "@tramvai/tokens-child-app": "1.105.2",
-    "@tramvai/tokens-common": "1.105.2",
-    "@tramvai/tokens-render": "1.105.2",
-    "@tramvai/experiments": "1.105.2",
-    "@tinkoff/hook-runner": "0.3.22",
-    "hoist-non-react-statics": "^3.3.1",
-    "lru-cache": "^6.0.0"
+    "@tramvai/experiments": "1.106.0",
+    "@tramvai/module-cookie": "1.106.0",
+    "@tramvai/module-environment": "1.106.0",
+    "@tramvai/module-log": "1.106.0",
+    "@tramvai/tokens-child-app": "1.106.0",
+    "@tramvai/tokens-common": "1.106.0",
+    "@tramvai/tokens-render": "1.106.0",
+    "hoist-non-react-statics": "^3.3.1"
   },
   "peerDependencies": {
-    "@tinkoff/utils": "^2.1.2",
-    "@tramvai/cli": "1.105.2",
-    "@tramvai/core": "1.105.2",
-    "@tramvai/react": "1.105.2",
-    "@tramvai/papi": "1.105.2",
-    "@tramvai/state": "1.105.2",
-    "@tramvai/tokens-metrics": "1.105.2",
-    "@tramvai/tokens-server": "1.105.2",
     "@tinkoff/dippy": "0.7.41",
+    "@tinkoff/utils": "^2.1.2",
+    "@tramvai/cli": "1.106.0",
+    "@tramvai/core": "1.106.0",
+    "@tramvai/papi": "1.106.0",
+    "@tramvai/react": "1.106.0",
+    "@tramvai/state": "1.106.0",
+    "@tramvai/tokens-metrics": "1.106.0",
+    "@tramvai/tokens-server": "1.106.0",
     "react": ">=16.14.0",
     "tslib": "^2.0.3"
   },