refactor(store): make options easier to read

Author: DawidWraga

package.json

@@ -8,7 +8,7 @@
 		"format": "prettier --write \"**/*.{ts,tsx,md}\"",
 		"changeset": "changeset",
 		"version-packages": "changeset version",
-		"release": "turbo build --filter=docs^... && changeset publish ",
+		"release": "turbo build --filter='./packages/*'... && changeset publish ",
 		"test": "vitest --typecheck",
 		"test:watch": "vitest --watch --typecheck",
 		"test:ui": "vitest --ui ",

packages/store/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @davstack/store
 
+## 0.1.5
+
+### Patch Changes
+
+- refactor types
+
 ## 0.1.2
 
 ### Patch Changes

packages/store/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@davstack/store",
-	"version": "0.1.4",
+	"version": "0.1.5",
 	"main": "./dist/index.js",
 	"module": "./dist/index.mjs",
 	"types": "./dist/index.d.ts",

packages/store/src/types.ts

@@ -1,13 +1,10 @@
+/* eslint-disable no-unused-vars */
 /* eslint-disable prettier/prettier */
 import { Draft } from 'immer';
 import React from 'react';
 import { StoreApi as RawStoreApi, UseBoundStore } from 'zustand';
 import { NamedSet } from 'zustand/middleware';
-import {
-	GetState,
-	StateSelector,
-	StoreApi as ZustandStoreApi,
-} from 'zustand/vanilla';
+import { StoreApi as ZustandStoreApi } from 'zustand/vanilla';
 
 export type StoreApiGet<
 	T extends State = {},
@@ -133,7 +130,7 @@ export type StateActions<T extends State> = SetRecord<T> & {
 	mergeState: MergeState<T>;
 };
 export type StateGetters<T extends State> = GetRecord<T> & {
-	state: GetState<T>;
+	state: ZustandStoreApi<T>['getState'];
 };
 
 export type SelectorRecord<T> = Record<string, (state: T) => any>;
@@ -168,7 +165,7 @@ export type SetImmerState<T> = (
 export type StateCreatorWithDevtools<
 	T extends State,
 	CustomSetState = NamedSet<T>,
-	CustomGetState = GetState<T>,
+	CustomGetState = ZustandStoreApi<T>['getState'],
 	CustomStoreApi extends RawStoreApi<T> = RawStoreApi<T>,
 > = (set: CustomSetState, get: CustomGetState, api: CustomStoreApi) => T;
 
@@ -181,7 +178,7 @@ export interface UseImmerStore<T extends State>
 	extends Omit<UseBoundStore<RawStoreApi<T>>, 'setState'> {
 	(): T;
 
-	<U>(selector: StateSelector<T, U>, equalityFn?: EqualityChecker<U>): U;
+	<U>(selector: (s: T) => U, equalityFn?: EqualityChecker<U>): U;
 
 	setState: SetImmerState<T>;
 }

packages/store/src/types/CreateStoreOptions.ts

@@ -1,8 +1,6 @@
 import { DevtoolsOptions } from 'zustand/middleware';
 
 import { State } from '../types';
-import { ImmerOptions } from './ImmerOptions';
-import { PersistOptions } from './PersistOptions';
 
 export interface CreateStoreOptions<T extends State, TName> {
 	name?: TName;
@@ -27,3 +25,26 @@ export interface CreateStoreOptions<T extends State, TName> {
 	 */
 	persist?: PersistOptions<T>;
 }
+
+export interface ImmerOptions {
+	/**
+	 * Enable autofreeze.
+	 */
+	enabledAutoFreeze?: boolean;
+	enableMapSet?: boolean;
+}
+
+import { PersistOptions as ZustandPersistOptions } from 'zustand/middleware';
+
+export type StateStorage = {
+	getItem: (name: string) => string | null | Promise<string | null>;
+	setItem: (name: string, value: string) => void | Promise<void>;
+};
+export type StorageValue<S> = { state: S; version: number };
+
+type PersistOptionsWithoutName<S> = Omit<ZustandPersistOptions<S>, 'name'>;
+
+export type PersistOptions<S> = PersistOptionsWithoutName<S> & {
+	enabled?: boolean;
+	name?: string;
+};

packages/store/src/types/ImmerOptions.ts

@@ -3,5 +3,3 @@
  */
 
 export * from './CreateStoreOptions';
-export * from './ImmerOptions';
-export * from './PersistOptions';

packages/store/src/types/PersistOptions.ts

@@ -4,6 +4,7 @@
   "pipeline": {
     "build": {
       "outputs": ["dist/**", ".next/**", "!.next/cache/**"],
+      
       "dependsOn": ["^build"]
     },
     "test": {