valtio-define 1.1.1 → 1.1.3

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { a as GettersReturnType, c as PluginContext, d as StoreDefine, f as StoreDefineOptions, h as SubscribeKey, i as Getters, l as Signal, m as Subscribe, n as ActionsOmitThisParameter, o as Patch, p as StoreOptions, r as ActionsTree, s as Plugin, t as Actions, u as Store } from "./types-C8WQypn2.mjs";
+import { a as GettersReturnType, c as PluginContext, d as StoreDefine, f as StoreDefineOptions, h as SubscribeKey, i as Getters, l as Signal, m as Subscribe, n as ActionsOmitThisParameter, o as Patch, p as StoreOptions, r as ActionsTree, s as Plugin, t as Actions, u as Store } from "./types-JMM2hTmB.mjs";
 import { Snapshot } from "valtio";
 import { Dispatch, SetStateAction } from "react";
 
@@ -35,7 +35,7 @@ declare function use(plugin: Plugin): void;
  *
  * ```
  */
-declare function defineStore<S extends object, A extends ActionsTree, G extends Getters<S>>(define: StoreDefine<S, A, G>): Store<S, A & Actions<S>, G>;
+declare function defineStore<S extends object, A extends Actions<S>, G extends Getters<S>>(define: StoreDefine<S, A, G>): Store<S, A & Actions<S>, G>;
 //#endregion
 //#region src/hooks.d.ts
 declare function useStore<S extends object, A extends Actions<S>, G extends Getters<S>>(store: Store<S, A, G>): Snapshot<S & GettersReturnType<G> & A>;

package/dist/index.mjs

@@ -1 +1 @@
-import{proxy as e,ref as t,subscribe as n,useSnapshot as r}from"valtio";import{createElement as i}from"react";import{subscribeKey as a}from"valtio/utils";const o=e([]);function s(e){o.push(e)}function c(s){let c=typeof s.state==`function`?s.state():s.state,l=s.getters||{},u=s.actions||{},d=e(c),f={},p={},m=new WeakSet;for(let e in u)f[e]=t(u[e].bind(d)),d[e]=f[e];for(let e in l)Object.defineProperty(d,e,{get:()=>l[e].call(d),enumerable:!0}),Object.defineProperty(p,e,{get:()=>d[e],enumerable:!0});function h(e){return n(d,t=>e(d,t))}function g(e,t){return a(d,e,e=>t(e),!0)}function _(e){typeof e==`function`?e(d):Object.assign(d,e)}function v(e){return i(()=>e(r(d)))}function y(e){o.push(e),S(e)}let b={$subscribe:h,$subscribeKey:g,$patch:_,$state:d,$actions:f,$getters:p,$signal:v,use:y},x=new Proxy(b,{get(e,t){return t in f?f[t]:t in e?e[t]:d[t]},has(e,t){return t in e||t in f||t in d},set(e,t,n){return t in d?d[t]=n:e[t]=n,!0}});function S(e){m.has(e)||(m.add(e),e({store:x,options:s}))}for(let e of o)S(e);return n(o,()=>{for(let e of o)S(e)}),x}function l(e){return r(e.$state)}function u(e,t){let n=l(e);function r(n){typeof n==`function`?e.$patch(e=>{e[t]=n(e[t])}):e.$patch(e=>{e[t]=n})}return[n[t],r]}function d(e){return Object.fromEntries(Object.keys(e.$state).map(t=>[t,u(e,t)]))}var f={use:s};export{f as default,c as defineStore,o as plugins,u as storeToState,d as storeToStates,s as use,l as useStore};
+import{proxy as e,ref as t,subscribe as n,useSnapshot as r}from"valtio";import{createElement as i}from"react";import{subscribeKey as a}from"valtio/utils";const o=e([]);function s(e){o.push(e)}function c(s){let c=typeof s.state==`function`?s.state():s.state,u=s.getters||{},d=s.actions||{},f=e(c),p={},m={},h=new WeakSet;for(let e in d)p[e]=t(d[e].bind(f)),f[e]=p[e];for(let e in u)l(f,e,()=>u[e].call(f)),l(m,e,()=>f[e]);function g(e){return n(f,t=>e(f,t))}function _(e,t){return a(f,e,e=>t(e),!0)}function v(e){typeof e==`function`?e(f):Object.assign(f,e)}function y(e){return i(()=>e(r(f)))}function b(e){o.push(e),C(e)}let x={$subscribe:g,$subscribeKey:_,$patch:v,$state:f,$actions:p,$getters:m,$signal:y,use:b},S=new Proxy(x,{get(e,t){return t in p?p[t]:t in e?e[t]:f[t]},has(e,t){return t in e||t in p||t in f},set(e,t,n){return t in f?f[t]=n:e[t]=n,!0}});function C(e){h.has(e)||(h.add(e),e({store:S,options:s}))}for(let e of o)C(e);return n(o,()=>{for(let e of o)C(e)}),S}function l(e,t,n){Object.defineProperty(e,t,{get:n,enumerable:!0})}function u(e){return r(e.$state)}function d(e,t){let n=u(e);function r(n){typeof n==`function`?e.$patch(e=>{e[t]=n(e[t])}):e.$patch(e=>{e[t]=n})}return[n[t],r]}function f(e){return Object.fromEntries(Object.keys(e.$state).map(t=>[t,d(e,t)]))}var p={use:s};export{p as default,c as defineStore,o as plugins,d as storeToState,f as storeToStates,s as use,u as useStore};

package/dist/plugins/index.d.mts

@@ -1,2 +1,2 @@
-import { PersistentMountOptions, persist } from "./persist/index.mjs";
-export { PersistentMountOptions, persist };
+import { PersistentMountOptions, StorePersistentOptions, persist } from "./persist/index.mjs";
+export { PersistentMountOptions, StorePersistentOptions, persist };

package/dist/plugins/persist/index.d.mts

@@ -1,10 +1,13 @@
-import { s as Plugin } from "../../types-C8WQypn2.mjs";
+import { s as Plugin } from "../../types-JMM2hTmB.mjs";
 import { PersistentOptions } from "./types.mjs";
 
 //#region src/plugins/persist/index.d.ts
 interface PersistentMountOptions {
   automount?: boolean;
 }
+interface StorePersistentOptions {
+  mount: () => void;
+}
 declare function persist({
   automount
 }?: PersistentMountOptions): Plugin;
@@ -13,10 +16,8 @@ declare module 'valtio-define' {
     persist?: PersistentOptions<S> | boolean;
   }
   interface StoreOptions {
-    persist: {
-      mount: () => void;
-    };
+    persist: StorePersistentOptions;
   }
 }
 //#endregion
-export { PersistentMountOptions, persist };
+export { PersistentMountOptions, StorePersistentOptions, persist };

package/dist/plugins/persist/index.mjs

@@ -1 +1 @@
-import{subscribe as e}from"valtio";import{get as t,set as n}from"@hairy/utils";import{destr as r}from"destr";import{generateStructureId as i}from"structure-id";function a({automount:a=!0}={}){return o=>{let{persist:s,getters:c}=o.options,{$state:l}=o.store;if(!s)return;let u=s===!0?{}:s,d=u.key||i(l),f=u.storage??(typeof localStorage<`u`?localStorage:void 0);if(!f?.getItem||!f?.setItem)return;let p=!1;function m(e){let t=r(e);t&&typeof t==`object`&&(Object.keys(c||{}).forEach(e=>Reflect.deleteProperty(t,e)),Object.assign(l,t)),p=!0}function h(){let e=f.getItem(d);e instanceof Promise?e.then(m):m(e)}function g(){e(l,()=>{if(!p)return;let e=(u.paths||Object.keys(l)).reduce((e,r)=>n(e,r,t(l,r)),{});f.setItem(d,JSON.stringify(e))})}a&&h(),g()}}export{a as persist};
+import{subscribe as e}from"valtio";import{get as t,set as n}from"@hairy/utils";import{destr as r}from"destr";import{generateStructureId as i}from"structure-id";function a({automount:a=!0}={}){return o=>{let{persist:s,getters:c}=o.options,{$state:l}=o.store;if(!s)return;let u=s===!0?{}:s,d=u.key||i(l),f=u.storage??(typeof localStorage<`u`?localStorage:void 0);if(!f?.getItem||!f?.setItem)return;let p=!1;function m(e){let t=r(e);t&&typeof t==`object`&&(Object.keys(c||{}).forEach(e=>Reflect.deleteProperty(t,e)),Object.assign(l,t)),p=!0}function h(){let e=f.getItem(d);e instanceof Promise?e.then(m):m(e)}function g(){e(l,()=>{if(!p)return;let e=(u.paths||Object.keys(l)).reduce((e,r)=>n(e,r,t(l,r)),{});f.setItem(d,JSON.stringify(e))})}o.store.persist={mount:h},a&&h(),g()}}export{a as persist};

package/dist/{types-C8WQypn2.d.mts → types-JMM2hTmB.d.mts}

@@ -1,16 +1,16 @@
 import { ReactElement } from "react";
 
 //#region src/types.d.ts
-type Actions<S = any> = Record<string, (this: S, ...args: any) => any>;
 type ActionsTree = Record<string, (...args: any[]) => any>;
+type Actions<S = any> = Record<string, (this: S, ...args: any) => any>;
 type Getters<S = any> = Record<string, (this: S) => any>;
 type ActionsOmitThisParameter<A extends Actions<any>> = { [K in keyof A]: (...args: Parameters<A[K]>) => ReturnType<A[K]> };
 type GettersReturnType<G extends Getters<any>> = { [K in keyof G]: ReturnType<G[K]> };
 interface StoreDefineOptions<S> {}
-interface StoreDefine<S extends object, A extends ActionsTree, G extends Getters<any>> extends StoreDefineOptions<S> {
+interface StoreDefine<S extends object, A extends Actions<S>, G extends Getters<any>> extends StoreDefineOptions<S> {
   state: (() => S) | S;
-  actions?: A & ThisType<A & S & GettersReturnType<G>>;
-  getters?: G & ThisType<S & GettersReturnType<G>>;
+  actions?: A & ThisType<A & S>;
+  getters?: G & ThisType<S>;
 }
 interface Signal<S, G extends Getters<S>> {
   <T>(fn: (state: S & GettersReturnType<G>) => T): ReactElement;

package/package.json

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