create-packer 1.19.1 → 1.19.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-packer",
-  "version": "1.19.1",
+  "version": "1.19.3",
   "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,7 +1,7 @@
-import { create, StoreApi, UseBoundStore } from 'zustand'
+import { create, StoreApi } from 'zustand'
 import { combine } from 'zustand/middleware'
 import { produce } from 'immer'
-import { ExtractModelType } from '@/types'
+import { forEach, size } from 'lodash-es'
 
 export interface insideActionsType<S> {
     reset: () => void
@@ -12,16 +12,54 @@ export type actionsType<S, OptionAction, InsideActions = unknown> = (
     actions: insideActionsType<S> & InsideActions,
     store: StoreApi<S>
 ) => OptionAction
-export interface optionsType<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>
 }
 
-export function define<S extends Record<string, any>, OptionActions extends Record<string, any>>(
-    options: optionsType<S, OptionActions>
-) {
+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 defGetterStateType<S>,
+    OptionActions extends Record<string, any>
+>(options: optionsType<S, G, OptionActions>) {
+    function createDefState() {
+        const state: any = options.state()
+        forEach(options.getter(), (getter, k) => {
+            state[k] = getter(state)
+        })
+        return state as S & GenGetterStateType<S, G>
+    }
     return create(
-        combine(options.state(), (set, get, store) => {
+        combine(createDefState(), (set, get, store) => {
+            // getterListener
+            // ----------------------------------------------------------------------
+            store.subscribe(state => {
+                const oldGetterState: any = get()
+                let equalledLen = 0
+                const newGetterState: any = {}
+                forEach(options.getter(), (getter, k) => {
+                    const value = getter(state)
+                    if (value === oldGetterState[k]) {
+                        equalledLen += 1
+                    } else {
+                        newGetterState[k] = getter(state)
+                    }
+                })
+                if (size(options.getter()) > equalledLen) {
+                    set(newGetterState)
+                }
+            })
+            // actions
+            // ----------------------------------------------------------------------
             const setState: insideActionsType<S>['setState'] = updater => {
                 set(
                     produce((store: S) => {
@@ -33,7 +71,6 @@ export function define<S extends Record<string, any>, OptionActions extends Reco
                 set(() => options.state() as never)
             }
             return {
-                ...options.state(),
                 reset,
                 setState,
                 subscribe: store.subscribe,
@@ -42,11 +79,3 @@ export function define<S extends Record<string, any>, OptionActions extends Reco
         })
     )
 }
-
-export function defineComputed<
-    Model extends UseBoundStore<StoreApi<any>>,
-    K extends string,
-    R = any
->(useStore: Model, computed: Record<K, (state: ExtractModelType<Model>) => R>) {
-    return (field: K) => useStore(computed[field])
-}

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

@@ -12,13 +12,15 @@ export type actionsType<S, OptionAction, InsideActions = unknown> = (
     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
 >
@@ -26,7 +28,7 @@ type GenGetterStateType<S, G extends Record<string, (state: S) => any>> = G exte
     : 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() {