define-zustand 3.1.1 → 3.2.0

package/dist/types.d.ts

@@ -1,19 +1,22 @@
-import { StoreApi as ZStoreApi } from 'zustand';
+import { StoreApi as ZStoreApi, ExtractState as ZExtractState } from 'zustand';
 export type defGetterStateType<S> = Record<string, (state: S) => any>;
 export type ExtraGetterState<S, G extends defGetterStateType<S>> = {
     [key in keyof G]: ReturnType<G[key]>;
 };
+export type stateType<S, G extends defGetterStateType<S>> = S & ExtraGetterState<S, G>;
 export type StoreApi<S> = Omit<ZStoreApi<S>, 'setState'> & {
     setState: (updater: ((state: S) => void) | Partial<S>, replace?: boolean) => void;
 };
+export type ExtractState<S> = ZExtractState<S>;
 export interface insideActionsType<S> {
     reset: () => void;
     setState: StoreApi<S>['setState'];
     subscribe: StoreApi<S>['subscribe'];
 }
-export type actionsType<S, G extends defGetterStateType<S>, OptionAction, InsideActions = unknown> = (getState: () => S & ExtraGetterState<S, G>, actions: Omit<insideActionsType<S>, 'subscribe'> & InsideActions, store: StoreApi<S>) => OptionAction;
-export interface optionsType<S, G extends defGetterStateType<S>, OptionAction> {
+export type actionsType<S, G extends defGetterStateType<S>, OptionAction> = (getState: () => stateType<S, G>, actions: Omit<insideActionsType<S>, 'subscribe'>, store: StoreApi<S>) => OptionAction;
+export interface optionsType<S, G extends defGetterStateType<S>, Actions> {
     state: () => S;
     getter: G;
-    actions: actionsType<S, G, OptionAction>;
+    actions: actionsType<S, G, Actions>;
 }
+export type modelStateType<S, G extends defGetterStateType<S>, Actions> = stateType<S, G> & Actions & insideActionsType<S>;

package/dist/utils.d.ts

@@ -1,12 +1,11 @@
 import { FunctionComponent, ReactNode } from 'react';
-import { StateCreator } from 'zustand';
-import { defGetterStateType, optionsType, ExtraGetterState, insideActionsType } from './types';
-export declare function defineStateFactory<Options extends optionsType<any, any, any>>(options: Options): () => Options;
-export declare function creator<S extends Record<string, any>, G extends defGetterStateType<S>, OptionActions extends Record<string, any>>(options: optionsType<S, G, OptionActions>): StateCreator<S & ExtraGetterState<S, G> & insideActionsType<S> & OptionActions>;
-export declare function defineStore<S extends Record<string, any>, G extends defGetterStateType<S>, OptionActions extends Record<string, any>>(options: optionsType<S, G, OptionActions>): import("zustand").UseBoundStore<import("zustand").StoreApi<S & ExtraGetterState<S, G> & insideActionsType<S> & OptionActions>>;
-export declare function defineContext<S extends Record<string, any>, G extends defGetterStateType<S>, OptionActions extends Record<string, any>>(options: optionsType<S, G, OptionActions>): {
+import { defGetterStateType, optionsType, modelStateType } from './types';
+export declare function defineStateFactory<S extends Record<string, any>, G extends defGetterStateType<S>, OptionActions extends Record<string, any>>(options: optionsType<S, G, OptionActions>): () => optionsType<S, G, OptionActions>;
+export declare function creator<S extends Record<string, any>, G extends defGetterStateType<S>, Actions extends Record<string, any>>(options: optionsType<S, G, Actions>): (set: any, get: any, store: any) => modelStateType<S, G, Actions>;
+export declare function defineStore<S extends Record<string, any>, G extends defGetterStateType<S>, Actions extends Record<string, any>>(options: optionsType<S, G, Actions>): import("zustand").UseBoundStore<import("zustand").StoreApi<modelStateType<S, G, Actions>>>;
+export declare function defineContext<S extends Record<string, any>, G extends defGetterStateType<S>, Actions extends Record<string, any>>(options: optionsType<S, G, Actions>): {
     Provider: FunctionComponent<{
         children?: ReactNode;
     }>;
-    useContext: <T>(selector: (state: S & ExtraGetterState<S, G> & insideActionsType<S> & OptionActions) => T) => T;
+    useContext: <T>(selector: (state: modelStateType<S, G, Actions>) => T) => T;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "define-zustand",
-  "version": "3.1.1",
+  "version": "3.2.0",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -23,8 +23,8 @@
     "stylelint": "15.9.0",
     "stylelint-config-standard": "33.0.0",
     "ts-jest": "29.0.5",
-    "typescript": "5.1.3",
-    "zustand": "4.4.1"
+    "typescript": "5.7.3",
+    "zustand": "5.0.3"
   },
   "dependencies": {
     "@types/react": "18.3.3",
@@ -33,7 +33,7 @@
   },
   "peerDependencies": {
     "react": "~18.3.1",
-    "zustand": "~4.4.1"
+    "zustand": "~5.0.3"
   },
   "scripts": {
     "build": "node scripts/build.js",