valtio-define 0.3.0 → 0.4.0

package/dist/index.d.mts

@@ -16,8 +16,8 @@ interface StoreDefine<S extends object, A extends Actions<S>, G extends Getters<
   actions?: A;
   getters?: G;
 }
-interface StoreOptions {
-  persist?: boolean | PersistentOptions;
+interface StoreOptions<S extends object = Record<string, unknown>> {
+  persist?: boolean | PersistentOptions<S>;
 }
 interface StoreSignal<S, A extends Actions<S>, G extends Getters<S>> {
   <T>(fn: (state: S & GettersReturnType<G>) => T): T;
@@ -26,6 +26,7 @@ interface StoreSignal<S, A extends Actions<S>, G extends Getters<S>> {
 interface StoreSubscribe<S, A extends Actions<S>, G extends Getters<S>> {
   (listener: (state: S & GettersReturnType<G>) => void): () => void;
   status: (listener: (status: ActionsStatus<A>) => void) => () => void;
+  key: <K$1 extends keyof S | keyof G>(key: K$1, listener: (state: (S & GettersReturnType<G>)[K$1]) => void) => () => void;
 }
 interface StorePatch<S, G extends Getters<S>> {
   (patch: Partial<S> | ((state: S & GettersReturnType<G>) => void)): void;
@@ -39,10 +40,11 @@ type Store<S, A extends Actions<S>, G extends Getters<S>> = {
   $status: ActionsStatus<A>;
   $signal: StoreSignal<S, A, G>;
 } & ActionsOmitThisParameter<A>;
-interface PersistentOptions {
+interface PersistentOptions<S extends object = Record<string, unknown>> {
   key?: string;
-  storage?: Storage;
-  paths?: string[];
+  storage?: Partial<Storage> & Pick<Storage, 'getItem' | 'setItem'>;
+  paths?: (keyof S)[];
+  initial?: (initialState: S) => any | Promise<any>;
 }
 //#endregion
 //#region src/define-store.d.ts
@@ -74,7 +76,7 @@ interface PersistentOptions {
  *
  * ```
  */
-declare function defineStore<S extends object, A extends Actions<S>, G extends Getters<S>>(store: StoreDefine<S, A, G> & StoreOptions): Store<S, A, G>;
+declare function defineStore<S extends object, A extends Actions<S>, G extends Getters<S>>(store: StoreDefine<S, A, G> & StoreOptions<S>): Store<S, A, G>;
 //#endregion
 //#region src/persistent.d.ts
 declare function proxyWithPersistent<T extends object>(initialObject: T, options?: PersistentOptions): T;

package/dist/index.mjs

@@ -1,5 +1,6 @@
 import { createElement } from "react";
 import { proxy, ref, subscribe, useSnapshot } from "valtio";
+import { subscribeKey } from "valtio/utils";
 import { tryParseJson } from "@hairy/utils";
 import { generateStructureId } from "structure-id";
 
@@ -101,7 +102,7 @@ function defineStore(store) {
 	const $actions = {};
 	const $getters = {};
 	setupActions($state, actions, $actions, $status);
-	setupGetters(state, $state, getters, $getters);
+	setupGetters($state, getters, $getters);
 	setupStatus($actions, $status);
 	function $subscribe(listener) {
 		return subscribe($state, () => listener($state));
@@ -109,6 +110,9 @@ function defineStore(store) {
 	$subscribe.status = function(listener) {
 		return subscribe($status, () => listener($status));
 	};
+	$subscribe.key = function(key, listener) {
+		return subscribeKey($state, key, () => listener($state));
+	};
 	function $patch(patch) {
 		if (typeof patch === "function") patch($state);
 		else Object.assign($state, patch);
@@ -144,13 +148,13 @@ function setupActions($state, actions, $actions, $status) {
 		});
 	}
 }
-function setupGetters(state, $state, getters, $getters) {
+function setupGetters($state, getters, $getters) {
 	for (const key in getters) {
 		Object.defineProperty($getters, key, {
-			get: () => state[key],
+			get: () => $state[key],
 			enumerable: true
 		});
-		Object.defineProperty(state, key, {
+		Object.defineProperty($state, key, {
 			get: () => getters[key].call($state),
 			enumerable: true
 		});

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "valtio-define",
   "type": "module",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "⚡quickly create a fully functional and robust Valtio factory",
   "author": "Hairyf <wwu710632@gmail.com>",
   "license": "MIT",