@dune2/tools 1.0.1 → 1.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dune2/tools",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "",
   "keywords": [
     "i18n"
@@ -27,7 +27,6 @@
     "./storage/*": "./src/storage/*.ts",
     "./logger": "./src/logger/index.ts",
     "./logger/*": "./src/logger/*.ts",
-    "./niceModal": "./src/niceModal/index.tsx",
     "./store": "./src/store/index.ts",
     "./package.json": "./package.json",
     ".": "./src/index.ts"
@@ -36,16 +35,14 @@
     "src"
   ],
   "dependencies": {
-    "@ebay/nice-modal-react": "^1.2.13",
     "bignumber.js": "^9.1.2",
+    "es-toolkit": "^1.39.5",
     "js-cookie": "^3.0.5",
-    "lodash": "^4",
     "store2": "^2.14.3"
   },
   "devDependencies": {
     "@tanstack/react-query": "5.51.11",
     "@types/js-cookie": "3.0.3",
-    "@types/lodash": "^4.17.0",
     "axios": "^1.6.8",
     "react": "^19",
     "valtio": "^2"

package/src/factory/createStateContext.tsx

@@ -2,7 +2,7 @@
 import type { ComponentType, FC, PropsWithChildren } from "react";
 import React, { useContext } from "react";
 
-interface Params<T> {
+interface Params<P, T> {
   /**
    * context 的名字 方便 debug
    */
@@ -10,7 +10,7 @@ interface Params<T> {
   /**
    * 传入一个 hooks 返回值会给 context 的 value
    */
-  useValueHooks: () => T;
+  useValueHooks: (props: P) => T;
   defaultValue?: T;
 }
 
@@ -18,12 +18,12 @@ interface Params<T> {
  * 快速创建一个 context 和 Provider
  * 通过给定的 hooks 返回值创建 context 的 value
  */
-export function createStateContext<T>(params: Params<T>) {
+export function createStateContext<P, T>(params: Params<P, T>) {
   const { useValueHooks, defaultValue, name } = params;
   const Context = React.createContext(defaultValue as T);
 
-  const Provider: FC<PropsWithChildren> = (props) => {
-    const value = useValueHooks();
+  const Provider: FC<PropsWithChildren<P>> = (props) => {
+    const value = useValueHooks(props);
     return <Context.Provider value={value}>{props.children}</Context.Provider>;
   };
   Provider.displayName = `${name}Provider`;
@@ -32,10 +32,13 @@ export function createStateContext<T>(params: Params<T>) {
     return useContext(Context)!;
   }
 
-  function withProvider<P extends object>(Comp: ComponentType<P>) {
-    function WithProvider(props: P) {
+  function withProvider<C extends object>(
+    Comp: ComponentType<C>,
+    providerProps: P = {} as P,
+  ) {
+    function WithProvider(props: C) {
       return (
-        <Provider>
+        <Provider {...providerProps}>
           <Comp {...props}></Comp>
         </Provider>
       );

package/src/logger/Logger.ts

@@ -1,4 +1,4 @@
-import _ from "lodash";
+import { noop } from "es-toolkit";
 import store2 from "store2";
 import { Level, type OnLogParams } from "./shared";
 
@@ -16,7 +16,7 @@ export class Logger {
      * 只有大于等于当前等级的日志才会输出
      */
     public level = Level.Debug,
-    public onLog: OnLog = _.noop,
+    public onLog: OnLog = noop,
   ) {
     this.level = this.getStorageLevel() ?? level;
   }

package/src/logger/index.ts

@@ -1,4 +1,5 @@
-import _ from "lodash";
+import { camelCase } from "es-toolkit";
+import { forEach } from "es-toolkit/compat";
 import { Logger, type OnLog } from "./Logger";
 import { Level } from "./shared";
 
@@ -30,7 +31,7 @@ export function createLogger<Name extends string>(config: Config<Name>) {
     }
     // 输入：foo.login
     // 输出：fooLogin
-    const key = (name.includes(".") ? _.camelCase(name) : name) as Key;
+    const key = (name.includes(".") ? camelCase(name) : name) as Key;
 
     if (loggerMap[key]) {
       throw new Error(`logger name "${name}" is duplicated`);
@@ -47,17 +48,17 @@ export function createLogger<Name extends string>(config: Config<Name>) {
 
   const method = {
     enable() {
-      _.forEach(loggerMap, (v) => {
+      forEach(loggerMap, (v) => {
         v.enable();
       });
     },
     disable() {
-      _.forEach(loggerMap, (v) => {
+      forEach(loggerMap, (v) => {
         v.disable();
       });
     },
     setLevel(level: Level) {
-      _.forEach(loggerMap, (v) => {
+      forEach(loggerMap, (v) => {
         v.setLevel(level);
       });
     },

package/src/storage/index.ts

@@ -1,4 +1,5 @@
-import _ from "lodash";
+import { isEqual } from "es-toolkit";
+
 import { useSyncExternalStore } from "react";
 import type { StoreType } from "store2";
 import baseStore from "store2";
@@ -52,7 +53,7 @@ class StorageHelper<V = any> {
 
   get(): V | undefined {
     const r = this.store.get(this.baseKey) ?? this.defaultValue;
-    if (!_.isEqual(r, this.currentValue)) {
+    if (!isEqual(r, this.currentValue)) {
       this.currentValue = r;
     }
     return this.currentValue;
@@ -62,7 +63,7 @@ class StorageHelper<V = any> {
    * 设置为 undefined 时，会删除该 key
    */
   set(v: V | undefined): void {
-    if (_.isEqual(v, this.currentValue)) {
+    if (isEqual(v, this.currentValue)) {
       return;
     }
     this.currentValue = v;

package/src/store/index.ts

@@ -1,4 +1,4 @@
-import _ from "lodash";
+import { isEqual } from "es-toolkit";
 import { useDebugValue, useRef, useSyncExternalStore } from "react";
 import { proxy, snapshot, subscribe, useSnapshot } from "valtio";
 
@@ -69,7 +69,7 @@ export function createStore<
       const prev = useRef<T>(undefined);
       const combinedSelector = (state: S) => {
         const next = selector(state);
-        if (!_.isEqual(prev.current, next)) {
+        if (!isEqual(prev.current, next)) {
           prev.current = next;
         }
         return prev.current;

package/src/niceModal/createModal.tsx

@@ -1,31 +0,0 @@
-import NiceModal from "@ebay/nice-modal-react";
-import _ from "lodash";
-import { niceModalStore } from "./niceModalStore";
-
-export const createModal = <P extends object, Res = unknown>(
-  Comp: React.ComponentType<P>,
-) => {
-  const customModal = NiceModal.create(Comp);
-
-  const modalId: string = _.uniqueId("niceModal_");
-
-  NiceModal.register(modalId, customModal);
-  return Object.assign(customModal, {
-    async show(props?: P): Promise<Res> {
-      await niceModalStore.actions.initModal(modalId);
-      return NiceModal.show(modalId, props);
-    },
-    hide() {
-      return NiceModal.hide(modalId);
-    },
-    remove() {
-      return NiceModal.remove(modalId);
-    },
-    /**
-     * 获取当前弹框是否打开
-     */
-    getVisible() {
-      return !!niceModalStore.getState().modals[modalId]?.visible;
-    },
-  });
-};

package/src/niceModal/index.tsx

@@ -1,32 +0,0 @@
-import { Provider } from "@ebay/nice-modal-react";
-import type { PropsWithChildren } from "react";
-import { niceModalStore } from "./niceModalStore";
-
-export {
-  antdDrawer,
-  antdDrawerV5,
-  antdModal,
-  antdModalV5,
-  bootstrapDialog,
-  muiDialog,
-  muiDialogV5,
-  useModal,
-} from "@ebay/nice-modal-react";
-export { createModal } from "./createModal";
-export {
-  /**
-   * 一般情况下不需要使用这个，这里导出主要是给 storybook 使用，防止弹出多个 modal
-   */
-  Provider as BaseNiceModalProvider,
-  niceModalStore,
-};
-
-export function NiceModalProvider(props: PropsWithChildren) {
-  const { modals } = niceModalStore.useSnapshot();
-
-  return (
-    <Provider dispatch={niceModalStore.actions.dispatch} modals={modals}>
-      {props.children}
-    </Provider>
-  );
-}

package/src/niceModal/niceModalStore.tsx

@@ -1,40 +0,0 @@
-import {
-  reducer,
-  type NiceModalAction,
-  type NiceModalStore,
-} from "@ebay/nice-modal-react";
-import { createStore } from "../store";
-
-export const niceModalStore = createStore({
-  name: "niceModalStore",
-  state: {
-    modals: {} as NiceModalStore,
-  },
-  actionsCreator: (state) => {
-    return {
-      dispatch(action: NiceModalAction) {
-        state.modals = reducer(state.modals, action);
-      },
-      /**
-       * 为了让 modal 第一次打开的时候过渡动画存在
-       * 目前主要是兼容 mantine ui，它们使用的是 css 动画
-       * 要确保 dom 存在
-       */
-      async initModal(id: string) {
-        if (state.modals[id]) {
-          return;
-        }
-        state.modals = {
-          ...state.modals,
-          [id]: {
-            id,
-            visible: false,
-            delayVisible: false,
-          },
-        };
-        // 确保下一帧调用，让 过渡动画有效果
-        return Promise.resolve();
-      },
-    };
-  },
-});