create-packer 1.19.3 → 1.19.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/package.json +1 -1
  2. package/template/chrome-extension/src/providers/modelUtils.ts +19 -14
  3. package/template/react/package.json +1 -1
  4. package/template/react/src/app.model.ts +3 -1
  5. package/template/react/src/providers/modelUtils.ts +19 -14
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "create-packer",
3
- "version": "1.19.3",
3
+ "version": "1.19.5",
4
4
  "main": "index.js",
5
5
  "repository": "https://github.com/kevily/create-packer",
6
6
  "author": "1k <bug_zero@163.com>",
package/template/chrome-extension/src/providers/modelUtils.ts CHANGED
@@ -1,11 +1,14 @@
1
- import { create, StoreApi } from 'zustand'
1
+ import { create, StoreApi as ZStoreApi } from 'zustand'
2
2
  import { combine } from 'zustand/middleware'
3
3
  import { produce } from 'immer'
4
- import { forEach, size } from 'lodash-es'
4
+ import { forEach, isEqual, size } from 'lodash-es'
5
5
 
6
+ export type StoreApi<S> = Omit<ZStoreApi<S>, 'setState'> & {
7
+ setState: (updater: ((state: S) => void) | Partial<S>, replace?: boolean) => void
8
+ }
6
9
  export interface insideActionsType<S> {
7
10
  reset: () => void
8
- setState: (updater: (state: S) => void) => void
11
+ setState: StoreApi<S>['setState']
9
12
  }
10
13
  export type actionsType<S, OptionAction, InsideActions = unknown> = (
11
14
  getState: () => S,
@@ -26,6 +29,7 @@ type GenGetterStateType<S, G extends defGetterStateType<S>> = G extends Record<
26
29
  >
27
30
  ? Record<K, V>
28
31
  : unknown
32
+
29
33
  export function define<
30
34
  S extends Record<string, any>,
31
35
  G extends defGetterStateType<S>,
@@ -42,13 +46,12 @@ export function define<
42
46
  combine(createDefState(), (set, get, store) => {
43
47
  // getterListener
44
48
  // ----------------------------------------------------------------------
45
- store.subscribe(state => {
46
- const oldGetterState: any = get()
49
+ store.subscribe((state, prevState) => {
47
50
  let equalledLen = 0
48
51
  const newGetterState: any = {}
49
52
  forEach(options.getter(), (getter, k) => {
50
53
  const value = getter(state)
51
- if (value === oldGetterState[k]) {
54
+ if (isEqual(value, prevState[k])) {
52
55
  equalledLen += 1
53
56
  } else {
54
57
  newGetterState[k] = getter(state)
@@ -60,21 +63,23 @@ export function define<
60
63
  })
61
64
  // actions
62
65
  // ----------------------------------------------------------------------
63
- const setState: insideActionsType<S>['setState'] = updater => {
64
- set(
65
- produce((store: S) => {
66
- updater(store)
67
- }) as any
68
- )
66
+ store.setState = (updater, replace) => {
67
+ const nextState = typeof updater === 'function' ? produce(updater as any) : updater
68
+
69
+ return set(nextState as any, replace)
69
70
  }
70
71
  const reset: insideActionsType<S>['reset'] = () => {
71
72
  set(() => options.state() as never)
72
73
  }
73
74
  return {
74
75
  reset,
75
- setState,
76
+ setState: store.setState as StoreApi<S>['setState'],
76
77
  subscribe: store.subscribe,
77
- ...options.actions(get, { reset, setState }, store)
78
+ ...options.actions(
79
+ get,
80
+ { reset, setState: store.setState as StoreApi<S>['setState'] },
81
+ store as StoreApi<S>
82
+ )
78
83
  }
79
84
  })
80
85
  )
package/template/react/package.json CHANGED
@@ -26,7 +26,7 @@
26
26
  "qs": "6.11.2",
27
27
  "react": "18.2.0",
28
28
  "react-dom": "18.2.0",
29
- "react-router-dom": "6.10.0",
29
+ "react-router-dom": "6.14.0",
30
30
  "zustand": "4.3.7"
31
31
  },
32
32
  "devDependencies": {
package/template/react/src/app.model.ts CHANGED
@@ -1,7 +1,9 @@
1
1
  import { modelUtils } from '@/providers'
2
2
 
3
3
  export const useApp = modelUtils.define({
4
- state: () => ({}),
4
+ state: () => ({
5
+ a: ''
6
+ }),
5
7
  getter: () => ({}),
6
8
  actions: () => ({})
7
9
  })
package/template/react/src/providers/modelUtils.ts CHANGED
@@ -1,11 +1,14 @@
1
- import { create, StoreApi } from 'zustand'
1
+ import { create, StoreApi as ZStoreApi } from 'zustand'
2
2
  import { combine } from 'zustand/middleware'
3
3
  import { produce } from 'immer'
4
- import { forEach, size } from 'lodash-es'
4
+ import { forEach, isEqual, size } from 'lodash-es'
5
5
 
6
+ export type StoreApi<S> = Omit<ZStoreApi<S>, 'setState'> & {
7
+ setState: (updater: ((state: S) => void) | Partial<S>, replace?: boolean) => void
8
+ }
6
9
  export interface insideActionsType<S> {
7
10
  reset: () => void
8
- setState: (updater: (state: S) => void) => void
11
+ setState: StoreApi<S>['setState']
9
12
  }
10
13
  export type actionsType<S, OptionAction, InsideActions = unknown> = (
11
14
  getState: () => S,
@@ -26,6 +29,7 @@ type GenGetterStateType<S, G extends defGetterStateType<S>> = G extends Record<
26
29
  >
27
30
  ? Record<K, V>
28
31
  : unknown
32
+
29
33
  export function define<
30
34
  S extends Record<string, any>,
31
35
  G extends defGetterStateType<S>,
@@ -42,13 +46,12 @@ export function define<
42
46
  combine(createDefState(), (set, get, store) => {
43
47
  // getterListener
44
48
  // ----------------------------------------------------------------------
45
- store.subscribe(state => {
46
- const oldGetterState: any = get()
49
+ store.subscribe((state, prevState) => {
47
50
  let equalledLen = 0
48
51
  const newGetterState: any = {}
49
52
  forEach(options.getter(), (getter, k) => {
50
53
  const value = getter(state)
51
- if (value === oldGetterState[k]) {
54
+ if (isEqual(value, prevState[k])) {
52
55
  equalledLen += 1
53
56
  } else {
54
57
  newGetterState[k] = getter(state)
@@ -60,21 +63,23 @@ export function define<
60
63
  })
61
64
  // actions
62
65
  // ----------------------------------------------------------------------
63
- const setState: insideActionsType<S>['setState'] = updater => {
64
- set(
65
- produce((store: S) => {
66
- updater(store)
67
- }) as any
68
- )
66
+ store.setState = (updater, replace) => {
67
+ const nextState = typeof updater === 'function' ? produce(updater as any) : updater
68
+
69
+ return set(nextState as any, replace)
69
70
  }
70
71
  const reset: insideActionsType<S>['reset'] = () => {
71
72
  set(() => options.state() as never)
72
73
  }
73
74
  return {
74
75
  reset,
75
- setState,
76
+ setState: store.setState as StoreApi<S>['setState'],
76
77
  subscribe: store.subscribe,
77
- ...options.actions(get, { reset, setState }, store)
78
+ ...options.actions(
79
+ get,
80
+ { reset, setState: store.setState as StoreApi<S>['setState'] },
81
+ store as StoreApi<S>
82
+ )
78
83
  }
79
84
  })
80
85
  )