create-packer 1.17.15 → 1.17.17

package/package.json

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

package/template/react/package.json

@@ -23,6 +23,7 @@
         "axios": "1.3.6",
         "immer": "10.0.1",
         "lodash-es": "4.17.21",
+        "qs": "6.11.2",
         "react": "18.2.0",
         "react-dom": "18.2.0",
         "react-router-dom": "6.10.0",
@@ -30,7 +31,7 @@
     },
     "devDependencies": {
         "@commitlint/cli": "17.6.1",
-        "@commitlint/config-conventional": "^17.6.1",
+        "@commitlint/config-conventional": "17.6.1",
         "@commitlint/cz-commitlint": "17.5.0",
         "@testing-library/dom": "9.2.0",
         "@testing-library/jest-dom": "5.16.5",
@@ -38,7 +39,8 @@
         "@testing-library/user-event": "14.4.3",
         "@types/jest": "29.5.1",
         "@types/lodash-es": "4.17.7",
-        "@types/node": "^18.16.0",
+        "@types/node": "18.16.0",
+        "@types/qs": "6.9.7",
         "@types/react": "18.0.38",
         "@types/react-dom": "18.0.11",
         "@types/testing-library__jest-dom": "5.14.5",
@@ -49,8 +51,8 @@
         "commitizen": "4.3.0",
         "cssnano": "6.0.0",
         "eslint": "8.39.0",
-        "eslint-import-resolver-typescript": "^3.5.5",
-        "eslint-plugin-import": "^2.27.5",
+        "eslint-import-resolver-typescript": "3.5.5",
+        "eslint-plugin-import": "2.27.5",
         "eslint-plugin-prettier": "4.2.1",
         "eslint-plugin-react": "7.32.2",
         "eslint-plugin-react-hooks": "4.6.0",

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

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

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

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

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

@@ -0,0 +1,52 @@
+import { create, StoreApi, UseBoundStore } from 'zustand'
+import { combine } from 'zustand/middleware'
+import { produce } from 'immer'
+import { ExtractModelType } from '@/types'
+
+export interface insideActionsType<S> {
+    reset: () => void
+    setState: (updater: (state: S) => void) => void
+}
+export type actionsType<S, OptionAction, InsideActions = unknown> = (
+    getState: () => S,
+    actions: insideActionsType<S> & InsideActions,
+    store: StoreApi<S>
+) => OptionAction
+export interface optionsType<S, OptionAction> {
+    state: () => S
+    actions: actionsType<S, OptionAction>
+}
+
+export function define<S extends Record<string, any>, OptionActions extends Record<string, any>>(
+    options: optionsType<S, OptionActions>
+) {
+    return create(
+        combine(options.state(), (set, get, store) => {
+            const setState: insideActionsType<S>['setState'] = updater => {
+                set(
+                    produce((store: S) => {
+                        updater(store)
+                    }) as any
+                )
+            }
+            const reset: insideActionsType<S>['reset'] = () => {
+                set(() => options.state() as never)
+            }
+            return {
+                ...options.state(),
+                reset,
+                setState,
+                subscribe: store.subscribe,
+                ...options.actions(get, { reset, setState }, store)
+            }
+        })
+    )
+}
+
+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/router/home/index.ts

@@ -1,2 +1,2 @@
 export { default as routes } from './routes'
-export { default as paths } from './paths'
+export { default as names } from './names'

package/template/react/src/router/home/names.ts

@@ -0,0 +1,3 @@
+export default {
+    home: 'home'
+}

package/template/react/src/router/home/routes.tsx

@@ -1,9 +1,11 @@
 import { lazy } from 'react'
-import type { RouteObject } from 'react-router-dom'
+import names from './names'
+import type { routeType } from '../router.types'
 
-const routes: RouteObject[] = [
+const routes: routeType[] = [
     {
         index: true,
+        name: names.home,
         Component: lazy(() => import('@/pages/home'))
     }
 ]

package/template/react/src/router/index.ts

@@ -1,2 +1,3 @@
-export { default as routePaths } from './paths'
-export { default as router } from './router'
+export { default as routeNames } from './names'
+export * from './router'
+export * from './router.provider'

package/template/react/src/router/{paths.ts → names.ts}

@@ -1,5 +1,5 @@
 import * as home from './home'
 export default {
-    root: '/',
-    ...home.paths
+    root: 'root',
+    ...home.names
 }

package/template/react/src/router/router.provider.ts

@@ -0,0 +1,22 @@
+import { find, get } from 'lodash-es'
+import { stringify } from 'qs'
+import { NavigateOptions, redirect as routerRedirect } from 'react-router-dom'
+import { router, routesList } from './router'
+
+export function getRoute(name: string, path?: string | string[]) {
+    const route = find(routesList, o => o.name === name)
+    if (path) {
+        return get(route, path)
+    }
+    return route
+}
+
+export function navigate(
+    to: { name: string; query?: Record<string, any> },
+    opts?: NavigateOptions
+) {
+    return router.navigate(
+        { pathname: getRoute(to.name, 'path'), search: to.query ? stringify(to.query) : '' },
+        opts
+    )
+}

package/template/react/src/router/router.tsx

@@ -1,16 +1,37 @@
 import { lazy } from 'react'
+import { concat, isArray, reduce } from 'lodash-es'
 import { createBrowserRouter } from 'react-router-dom'
 import * as home from './home'
-import paths from './paths'
+import names from './names'
+import type { routeType } from './router.types'
 
-export default createBrowserRouter([
+const routes: routeType[] = [
     {
-        path: paths.root,
+        path: '/',
+        name: names.root,
         Component: lazy(() => import('@/layout')),
         children: [...home.routes]
     },
     {
         path: '*',
+        name: '404',
         Component: lazy(() => import('@/pages/notFound'))
     }
-])
+]
+export const routesList = (function flat(routes: routeType[], parentRoute?: routeType) {
+    return reduce(
+        routes,
+        (result, route) => {
+            route.path = parentRoute
+                ? `${parentRoute.path === '/' ? '' : parentRoute.path}/${route.path}`
+                : route.path
+            result.push(route)
+            if (isArray(route.children)) {
+                result = concat(result, flat(route.children, route))
+            }
+            return result
+        },
+        [] as routeType[]
+    )
+})(routes)
+export const router = createBrowserRouter(routes as never)

package/template/react/src/router/router.types.ts

@@ -0,0 +1,6 @@
+import { RouteObject } from 'react-router-dom'
+
+export type routeType = Omit<RouteObject, 'children'> & {
+    name: string | symbol
+    children?: routeType[]
+}

package/template/react/src/types/index.ts

@@ -0,0 +1 @@
+export * from './utils'

package/template/react/src/types/utils.ts

@@ -0,0 +1,19 @@
+import type { UseBoundStore, StoreApi } from 'zustand'
+export type ExtractArrayElType<T> = T extends Array<infer E> ? E : unknown
+export type ExtractReadonlyArrayElType<T> = T extends ReadonlyArray<infer E> ? E : unknown
+export type ExtractReadonlyArrayFieldType<T, K extends keyof any> = T extends ReadonlyArray<infer V>
+    ? V extends { [key in K]: infer V2 }
+        ? V2
+        : any
+    : any
+export type ExtractArrayFieldType<T, K extends keyof any> = T extends Array<infer V>
+    ? V extends { [key in K]: infer V2 }
+        ? V2
+        : any
+    : any
+
+export type UnReadonly<R extends Record<string, any>> = {
+    -readonly [K in keyof R]: R[K]
+}
+export type ValueType<R extends Record<string, any>> = R extends Record<string, infer V> ? V : R
+export type ExtractModelType<T> = T extends UseBoundStore<StoreApi<infer S>> ? S : unknown

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

@@ -1,42 +0,0 @@
-import { create } from 'zustand'
-import { produce } from 'immer'
-
-export type setStateType<S> = (updater: (state: S) => void) => void
-export interface modelActionsType<S extends Record<string, any>> {
-    reset: () => void
-    setState: setStateType<S>
-}
-export interface modelOptionsType<S extends Record<string, any>, A extends Record<string, any>> {
-    state: () => S
-    actions: (getState: () => S, actions: modelActionsType<S>) => A
-}
-
-export function defineModel<S extends Record<string, any>, A extends Record<string, any>>(
-    options: modelOptionsType<S, A>
-) {
-    return create<{ state: S; actions: modelActionsType<S> & A }>()((setState, getState, store) => {
-        const _setState: modelActionsType<S>['setState'] = updater => {
-            setState(
-                produce((store: { state: S }) => {
-                    updater(store.state)
-                }) as any
-            )
-        }
-        const _getState = () => getState().state
-        const reset: modelActionsType<S>['reset'] = () => {
-            setState({ state: options.state() })
-        }
-        return {
-            state: options.state(),
-            actions: {
-                reset,
-                setState: _setState,
-                subscribe: store.subscribe,
-                ...options.actions(_getState, {
-                    reset,
-                    setState: _setState
-                })
-            }
-        }
-    })
-}

package/template/react/src/router/home/paths.ts

@@ -1 +0,0 @@
-export default {}