create-packer 1.24.10 → 1.24.13

package/package.json

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

package/template/web-app/react/domain/app/app.model.ts

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

package/template/web-app/react/package.json

@@ -18,6 +18,7 @@
     },
     "dependencies": {
         "axios": "1.3.6",
+        "define-zustand": "1.0.1",
         "immer": "10.0.1",
         "lodash-es": "4.17.21",
         "qs": "6.11.2",
@@ -25,7 +26,7 @@
         "react-dom": "18.2.0",
         "react-router-dom": "6.14.0",
         "react-use": "17.4.0",
-        "zustand": "4.3.7"
+        "zustand": "4.4.1"
     },
     "devDependencies": {
         "@commitlint/cli": "17.6.1",

package/template/web-app/react/providers/index.ts

@@ -1,3 +1,2 @@
-export * as modelUtils from './modelUtils'
 export { default as request } from './request'
 export * as componentInstance from './componentInstance'

package/template/workspace/pnpm/package.json

@@ -23,7 +23,7 @@
         }
     },
     "dependencies": {
-        "1k-tasks": "3.5.1",
+        "1k-tasks": "3.6.0",
         "@commitlint/config-conventional": "17.6.6",
         "@commitlint/cz-commitlint": "17.5.0",
         "commitizen": "4.3.0",

package/template/web-app/react/providers/modelUtils.ts

@@ -1,83 +0,0 @@
-import { create, StoreApi as ZStoreApi } from 'zustand'
-import { combine } from 'zustand/middleware'
-import { produce } from 'immer'
-import { forEach, isEqual, 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: 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 ExtraGetterStateType<S, G extends defGetterStateType<S>> = {
-    [key in keyof G]: ReturnType<G[key]>
-}
-
-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 & ExtraGetterStateType<S, G>
-    }
-    return create(
-        combine(createDefState(), (set, get, store) => {
-            // getterListener
-            // ----------------------------------------------------------------------
-            store.subscribe((state, prevState) => {
-                let equalledLen = 0
-                const newGetterState: any = {}
-                forEach(options.getter, (getter, k) => {
-                    const value = getter(state)
-                    if (isEqual(value, prevState[k])) {
-                        equalledLen += 1
-                    } else {
-                        newGetterState[k] = getter(state)
-                    }
-                })
-                if (size(options.getter) > equalledLen) {
-                    set(newGetterState)
-                }
-            })
-            // actions
-            // ----------------------------------------------------------------------
-            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: store.setState as StoreApi<S>['setState'],
-                subscribe: store.subscribe,
-                ...options.actions(
-                    get,
-                    { reset, setState: store.setState as StoreApi<S>['setState'] },
-                    store as StoreApi<S>
-                )
-            }
-        })
-    )
-}