@tramvai/state 2.24.1 → 2.25.1

package/lib/connect/hooks/useSelector.d.ts

@@ -3,7 +3,7 @@ import type { Reducer } from '../../createReducer/createReducer.h';
 import type { BaseStoreConstructor } from '../../stores/BaseStore';
 export declare type ArrayKeys = keyof any[];
 export declare type Indices<T> = Exclude<keyof T, ArrayKeys>;
-declare type OptionalStoreType<S extends any = any, N extends string = string> = {
+declare type OptionalStoreType<S = any, N extends string = string> = {
     store: Reducer<S, N> | string;
     optional: true;
 };
@@ -24,15 +24,15 @@ export declare function useSelector<T, R extends BaseStoreConstructor<any>>(stor
 export declare function useSelector<T, S extends ReadonlyArray<unknown>>(storesOrStore: S, selector: (state: {
     [Key in Indices<S> as InferStoreNameFromUnknownStore<S[Key]>]: InferStoreStateFromUnknownStore<S[Key]>;
 }) => T, equalityFn?: typeof shallowEqual): T;
-export declare function useSelector<T, S extends any>(storesOrStore: S, selector: (state: Record<string, any>) => T, equalityFn?: typeof shallowEqual): T;
+export declare function useSelector<T, S>(storesOrStore: S, selector: (state: Record<string, any>) => T, equalityFn?: typeof shallowEqual): T;
 declare type DEFAULT_STORE_NAME = string;
 declare type DEFAULT_STORE_STATE = any;
 declare type InferStoreNameFromOptionalStore<Store extends OptionalStoreType> = Store['store'] extends Reducer<any, infer Name> ? Name : DEFAULT_STORE_NAME;
 declare type InferStoreStateFromOptionalStore<Store extends OptionalStoreType> = Store['store'] extends Reducer<infer State> ? State : DEFAULT_STORE_STATE;
-declare type InferStoreNameFromUnknownStore<Store extends unknown> = Store extends string ? Store : Store extends OptionalStoreType ? InferStoreNameFromOptionalStore<Store> : Store extends Reducer<any> ? InferStoreNameFromReducer<Store> : Store extends BaseStoreConstructor<any> ? InferStoreNameFromLegacyStore<Store> : DEFAULT_STORE_NAME;
+declare type InferStoreNameFromUnknownStore<Store> = Store extends string ? Store : Store extends OptionalStoreType ? InferStoreNameFromOptionalStore<Store> : Store extends Reducer<any> ? InferStoreNameFromReducer<Store> : Store extends BaseStoreConstructor<any> ? InferStoreNameFromLegacyStore<Store> : DEFAULT_STORE_NAME;
 declare type InferStoreNameFromReducer<Store extends Reducer<any>> = Store['storeName'];
 declare type InferStoreStateFromReducer<Store extends Reducer<any>> = Store extends Reducer<infer State> ? State : DEFAULT_STORE_STATE;
 declare type InferStoreNameFromLegacyStore<Store extends BaseStoreConstructor<any>> = Store['storeName'];
 declare type InferStoreStateFromLegacyStore<Store extends BaseStoreConstructor<any>> = Store extends BaseStoreConstructor<infer State> ? State : DEFAULT_STORE_STATE;
-declare type InferStoreStateFromUnknownStore<Store extends unknown> = Store extends string ? DEFAULT_STORE_STATE : Store extends OptionalStoreType ? InferStoreStateFromOptionalStore<Store> : Store extends Reducer<any> ? InferStoreStateFromReducer<Store> : Store extends BaseStoreConstructor<any> ? InferStoreStateFromLegacyStore<Store> : DEFAULT_STORE_STATE;
+declare type InferStoreStateFromUnknownStore<Store> = Store extends string ? DEFAULT_STORE_STATE : Store extends OptionalStoreType ? InferStoreStateFromOptionalStore<Store> : Store extends Reducer<any> ? InferStoreStateFromReducer<Store> : Store extends BaseStoreConstructor<any> ? InferStoreStateFromLegacyStore<Store> : DEFAULT_STORE_STATE;
 export {};

package/lib/connect/hooks/useStoreSelector.d.ts

@@ -1,2 +1,2 @@
 import type { Reducer } from '../..';
-export declare const useStoreSelector: <TState extends unknown, TPayload extends unknown>(store: Reducer<TState, string>, selector: (state: TState) => TPayload) => TPayload;
+export declare const useStoreSelector: <TState, TPayload>(store: Reducer<TState, string>, selector: (state: TState) => TPayload) => TPayload;

package/lib/connect/index.d.ts

@@ -13,7 +13,7 @@ export declare function createConnect({ connectHOC, mapStateToPropsFactories, ma
 }): (stores: (StoreClass | string | {
     store: StoreClass | string;
     optional: boolean;
-})[], mapStateToProps: MapStateToProps, mapContextToProps?: MapContextToProps<any> | undefined, mergeProps?: MergeProps<any, any, any> | undefined, { pure, areStatesEqual, areOwnPropsEqual, areStatePropsEqual, areMergedPropsEqual, ...extraOptions }?: {
+})[], mapStateToProps: MapStateToProps, mapContextToProps?: MapContextToProps, mergeProps?: MergeProps, { pure, areStatesEqual, areOwnPropsEqual, areStatePropsEqual, areMergedPropsEqual, ...extraOptions }?: {
     pure?: boolean | undefined;
     areStatesEqual?: ((test1: any, test2: any) => boolean) | undefined;
     areOwnPropsEqual?: ((test1: any, test2: any) => boolean) | undefined;
@@ -23,7 +23,7 @@ export declare function createConnect({ connectHOC, mapStateToPropsFactories, ma
 declare const connect: (stores: (StoreClass | string | {
     store: StoreClass | string;
     optional: boolean;
-})[], mapStateToProps: MapStateToProps, mapContextToProps?: MapContextToProps<any> | undefined, mergeProps?: MergeProps<any, any, any> | undefined, { pure, areStatesEqual, areOwnPropsEqual, areStatePropsEqual, areMergedPropsEqual, ...extraOptions }?: {
+})[], mapStateToProps: MapStateToProps, mapContextToProps?: MapContextToProps, mergeProps?: MergeProps, { pure, areStatesEqual, areOwnPropsEqual, areStatePropsEqual, areMergedPropsEqual, ...extraOptions }?: {
     pure?: boolean | undefined;
     areStatesEqual?: ((test1: any, test2: any) => boolean) | undefined;
     areOwnPropsEqual?: ((test1: any, test2: any) => boolean) | undefined;

package/lib/index.es.js

@@ -885,7 +885,7 @@ pure = true,
             // We memoize the elements for the rendered child component as an optimization.
             const renderedWrappedComponent = useMemo(
             // eslint-disable-next-line react/jsx-props-no-spreading
-            () => jsx(WrappedComponent, Object.assign({}, actualChildProps, { ref: forwardedRef }), void 0), [forwardedRef, actualChildProps]);
+            () => jsx(WrappedComponent, { ...actualChildProps, ref: forwardedRef }), [forwardedRef, actualChildProps]);
             return renderedWrappedComponent;
         };
         // If we're in "pure" mode, ensure our wrapper component only re-renders when incoming props have changed.
@@ -895,7 +895,7 @@ pure = true,
         if (forwardRef) {
             const forwarded = React.forwardRef(function forwardConnectRef(props, ref) {
                 // eslint-disable-next-line react/jsx-props-no-spreading
-                return jsx(Connect, Object.assign({}, props, { forwardedRef: ref }), void 0);
+                return jsx(Connect, { ...props, forwardedRef: ref });
             });
             forwarded.displayName = displayName;
             forwarded.WrappedComponent = WrappedComponent;
@@ -1160,7 +1160,7 @@ function finalPropsSelectorFactory(context, { initMapStateToProps, initMapContex
 }
 
 const Provider = ({ context, children, serverState, }) => {
-    return (jsx(ConnectContext.Provider, Object.assign({ value: context }, { children: jsx(ServerStateContext.Provider, Object.assign({ value: serverState }, { children: children }), void 0) }), void 0));
+    return (jsx(ConnectContext.Provider, { value: context, children: jsx(ServerStateContext.Provider, { value: serverState, children: children }) }));
 };
 
 /*

package/lib/index.js

@@ -907,7 +907,7 @@ pure = true,
             // We memoize the elements for the rendered child component as an optimization.
             const renderedWrappedComponent = React.useMemo(
             // eslint-disable-next-line react/jsx-props-no-spreading
-            () => jsxRuntime.jsx(WrappedComponent, Object.assign({}, actualChildProps, { ref: forwardedRef }), void 0), [forwardedRef, actualChildProps]);
+            () => jsxRuntime.jsx(WrappedComponent, { ...actualChildProps, ref: forwardedRef }), [forwardedRef, actualChildProps]);
             return renderedWrappedComponent;
         };
         // If we're in "pure" mode, ensure our wrapper component only re-renders when incoming props have changed.
@@ -917,7 +917,7 @@ pure = true,
         if (forwardRef) {
             const forwarded = React__default["default"].forwardRef(function forwardConnectRef(props, ref) {
                 // eslint-disable-next-line react/jsx-props-no-spreading
-                return jsxRuntime.jsx(Connect, Object.assign({}, props, { forwardedRef: ref }), void 0);
+                return jsxRuntime.jsx(Connect, { ...props, forwardedRef: ref });
             });
             forwarded.displayName = displayName;
             forwarded.WrappedComponent = WrappedComponent;
@@ -1182,7 +1182,7 @@ function finalPropsSelectorFactory(context, { initMapStateToProps, initMapContex
 }
 
 const Provider = ({ context, children, serverState, }) => {
-    return (jsxRuntime.jsx(ConnectContext.Provider, Object.assign({ value: context }, { children: jsxRuntime.jsx(ServerStateContext.Provider, Object.assign({ value: serverState }, { children: children }), void 0) }), void 0));
+    return (jsxRuntime.jsx(ConnectContext.Provider, { value: context, children: jsxRuntime.jsx(ServerStateContext.Provider, { value: serverState, children: children }) }));
 };
 
 /*

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/state",
-  "version": "2.24.1",
+  "version": "2.25.1",
   "description": "",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -18,13 +18,13 @@
     "build-for-publish": "true"
   },
   "dependencies": {
-    "@tinkoff/react-hooks": "0.1.2",
+    "@tinkoff/react-hooks": "0.1.3",
     "@tinkoff/utils": "^2.1.2",
-    "@tramvai/types-actions-state-context": "2.24.1",
+    "@tramvai/types-actions-state-context": "2.25.1",
     "@types/hoist-non-react-statics": "^3.3.1",
     "invariant": "^2.2.4",
     "react-is": ">=17",
-    "tslib": "^2.0.3",
+    "tslib": "^2.4.0",
     "use-sync-external-store": "^1.2.0"
   },
   "peerDependencies": {
@@ -35,7 +35,7 @@
   },
   "devDependencies": {
     "@reatom/core": "^1.1.5",
-    "@tramvai/core": "2.24.1",
+    "@tramvai/core": "2.25.1",
     "@types/invariant": "^2.2.31",
     "@types/react-is": "^17.0.0",
     "@types/use-sync-external-store": "^0.0.3",