create-packer 1.19.2 → 1.19.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-packer",
-  "version": "1.19.2",
+  "version": "1.19.4",
   "main": "index.js",
   "repository": "https://github.com/kevily/create-packer",
   "author": "1k <bug_zero@163.com>",

package/template/chrome-extension/src/providers/modelUtils.ts

@@ -1,32 +1,38 @@
-import { create, StoreApi } from 'zustand'
+import { create, StoreApi as ZStoreApi } from 'zustand'
 import { combine } from 'zustand/middleware'
 import { produce } from 'immer'
 import { forEach, size } from 'lodash-es'
 
+export type StoreApi<S> = Omit<ZStoreApi<S>, 'setState'> & {
+    setState: (updater: ((state: S) => void) | Partial<S>, replace?: boolean) => void
+}
 export interface insideActionsType<S> {
     reset: () => void
-    setState: (updater: (state: S) => void) => void
+    setState: StoreApi<S>['setState']
 }
 export type actionsType<S, OptionAction, InsideActions = unknown> = (
     getState: () => S,
     actions: insideActionsType<S> & InsideActions,
     store: StoreApi<S>
 ) => OptionAction
+
+export type defGetterStateType<S> = Record<string, (state: S) => any>
 export interface optionsType<S, G, OptionAction> {
     state: () => S
     getter: () => G
     actions: actionsType<S, OptionAction>
 }
 
-type GenGetterStateType<S, G extends Record<string, (state: S) => any>> = G extends Record<
+type GenGetterStateType<S, G extends defGetterStateType<S>> = G extends Record<
     infer K,
     (state: S) => infer V
 >
     ? Record<K, V>
     : unknown
+
 export function define<
     S extends Record<string, any>,
-    G extends Record<string, (state: S) => any>,
+    G extends defGetterStateType<S>,
     OptionActions extends Record<string, any>
 >(options: optionsType<S, G, OptionActions>) {
     function createDefState() {
@@ -58,21 +64,23 @@ export function define<
             })
             // actions
             // ----------------------------------------------------------------------
-            const setState: insideActionsType<S>['setState'] = updater => {
-                set(
-                    produce((store: S) => {
-                        updater(store)
-                    }) as any
-                )
+            store.setState = (updater, replace) => {
+                const nextState = typeof updater === 'function' ? produce(updater as any) : updater
+
+                return set(nextState as any, replace)
             }
             const reset: insideActionsType<S>['reset'] = () => {
                 set(() => options.state() as never)
             }
             return {
                 reset,
-                setState,
+                setState: store.setState as StoreApi<S>['setState'],
                 subscribe: store.subscribe,
-                ...options.actions(get, { reset, setState }, store)
+                ...options.actions(
+                    get,
+                    { reset, setState: store.setState as StoreApi<S>['setState'] },
+                    store as StoreApi<S>
+                )
             }
         })
     )

package/template/react/src/app.model.ts

@@ -1,7 +1,9 @@
 import { modelUtils } from '@/providers'
 
 export const useApp = modelUtils.define({
-    state: () => ({}),
+    state: () => ({
+        a: ''
+    }),
     getter: () => ({}),
     actions: () => ({})
 })

package/template/react/src/providers/modelUtils.ts

@@ -1,32 +1,38 @@
-import { create, StoreApi } from 'zustand'
+import { create, StoreApi as ZStoreApi } from 'zustand'
 import { combine } from 'zustand/middleware'
 import { produce } from 'immer'
 import { forEach, size } from 'lodash-es'
 
+export type StoreApi<S> = Omit<ZStoreApi<S>, 'setState'> & {
+    setState: (updater: ((state: S) => void) | Partial<S>, replace?: boolean) => void
+}
 export interface insideActionsType<S> {
     reset: () => void
-    setState: (updater: (state: S) => void) => void
+    setState: StoreApi<S>['setState']
 }
 export type actionsType<S, OptionAction, InsideActions = unknown> = (
     getState: () => S,
     actions: insideActionsType<S> & InsideActions,
     store: StoreApi<S>
 ) => OptionAction
+
+export type defGetterStateType<S> = Record<string, (state: S) => any>
 export interface optionsType<S, G, OptionAction> {
     state: () => S
     getter: () => G
     actions: actionsType<S, OptionAction>
 }
 
-type GenGetterStateType<S, G extends Record<string, (state: S) => any>> = G extends Record<
+type GenGetterStateType<S, G extends defGetterStateType<S>> = G extends Record<
     infer K,
     (state: S) => infer V
 >
     ? Record<K, V>
     : unknown
+
 export function define<
     S extends Record<string, any>,
-    G extends Record<string, (state: S) => any>,
+    G extends defGetterStateType<S>,
     OptionActions extends Record<string, any>
 >(options: optionsType<S, G, OptionActions>) {
     function createDefState() {
@@ -58,21 +64,23 @@ export function define<
             })
             // actions
             // ----------------------------------------------------------------------
-            const setState: insideActionsType<S>['setState'] = updater => {
-                set(
-                    produce((store: S) => {
-                        updater(store)
-                    }) as any
-                )
+            store.setState = (updater, replace) => {
+                const nextState = typeof updater === 'function' ? produce(updater as any) : updater
+
+                return set(nextState as any, replace)
             }
             const reset: insideActionsType<S>['reset'] = () => {
                 set(() => options.state() as never)
             }
             return {
                 reset,
-                setState,
+                setState: store.setState as StoreApi<S>['setState'],
                 subscribe: store.subscribe,
-                ...options.actions(get, { reset, setState }, store)
+                ...options.actions(
+                    get,
+                    { reset, setState: store.setState as StoreApi<S>['setState'] },
+                    store as StoreApi<S>
+                )
             }
         })
     )