🏷️ typescript 修订 (#1127)

* typescript 修订

* 调整type

---------

Co-authored-by: 王一之 <yz@ggnb.top>

Author: cyfung1031

packages/message/message_queue.ts

@@ -2,7 +2,7 @@ import EventEmitter from "eventemitter3";
 import LoggerCore from "@App/app/logger/core";
 import { type TMessage } from "./types";
 
-export type TKeyValue = { key: string; value: string };
+export type TKeyValue<T = string> = { key: string; value: T };
 
 // 中间件函数类型
 type MiddlewareFunction<T = any> = (topic: string, message: T, next: () => void) => void | Promise<void>;

src/pkg/config/config.ts

@@ -75,20 +75,20 @@ export class SystemConfig {
   private readonly storage = new ChromeStorage("system", true);
 
   constructor(private mq: IMessageQueue) {
-    this.mq.subscribe<TKeyValue>(SystemConfigChange, ({ key, value }) => {
+    this.mq.subscribe<TKeyValue<any>>(SystemConfigChange, ({ key, value }) => {
       this.cache.set(key, value);
     });
   }
 
-  addListener(key: string, callback: (value: any) => void) {
-    this.mq.subscribe<TKeyValue>(SystemConfigChange, (data) => {
+  addListener<T extends SystemConfigKey>(key: T, callback: (value: SystemConfigValueType<T>) => void) {
+    this.mq.subscribe<TKeyValue<SystemConfigValueType<T>>>(SystemConfigChange, (data) => {
       if (data.key === key) {
         callback(data.value);
       }
     });
   }
 
-  private _get<T extends string | number | boolean | object>(
+  private _get<T extends string | number | boolean | object | undefined>(
     key: SystemConfigKey,
     defaultValue: WithAsyncValue<Exclude<T, undefined>>
   ): Promise<T> {
@@ -106,20 +106,7 @@ export class SystemConfig {
     });
   }
 
-  public get(key: SystemConfigKey | SystemConfigKey[]): Promise<any | any[]> {
-    if (Array.isArray(key)) {
-      const promises = key.map((key) => {
-        const funcName = `get${toCamelCase(key)}`;
-        // @ts-ignore
-        if (typeof this[funcName] === "function") {
-          // @ts-ignore
-          return this[funcName]() as Promise<any>;
-        } else {
-          throw new Error(`Method ${funcName} does not exist on SystemConfig`);
-        }
-      });
-      return Promise.all(promises);
-    }
+  public get<T extends SystemConfigKey>(key: T): Promise<SystemConfigValueType<T>> {
     const funcName = `get${toCamelCase(key)}`;
     // @ts-ignore
     if (typeof this[funcName] === "function") {
@@ -130,7 +117,7 @@ export class SystemConfig {
     }
   }
 
-  public set(key: SystemConfigKey, value: any): void {
+  public set<T extends SystemConfigKey>(key: T, value: SystemConfigValueType<T>): void {
     const funcName = `set${toCamelCase(key)}`;
     // @ts-ignore
     if (typeof this[funcName] === "function") {
@@ -141,7 +128,7 @@ export class SystemConfig {
     }
   }
 
-  private _set(key: SystemConfigKey, value: any) {
+  private _set<T extends SystemConfigKey>(key: T, value: SystemConfigValueType<T>) {
     if (value === undefined) {
       this.cache.delete(key);
       this.storage.remove(key);
@@ -150,7 +137,7 @@ export class SystemConfig {
       this.storage.set(key, value);
     }
     // 发送消息通知更新
-    this.mq.publish<TKeyValue>(SystemConfigChange, {
+    this.mq.publish<TKeyValue<any>>(SystemConfigChange, {
       key,
       value,
     });
@@ -260,7 +247,7 @@ export class SystemConfig {
   }
 
   getCatFileStorage() {
-    return this._get<CATFileStorage>("cat_file_storage", this.defaultCatFileStorage());
+    return this._get<CATFileStorage | undefined>("cat_file_storage", this.defaultCatFileStorage());
   }
 
   setCatFileStorage(data: CATFileStorage | undefined) {
@@ -276,7 +263,7 @@ export class SystemConfig {
   }
 
   getEslintConfig() {
-    return this._get<string>("eslint_config", defaultConfig);
+    return this._get<string | undefined>("eslint_config", defaultConfig);
   }
 
   setEslintConfig(v: string) {
@@ -289,7 +276,7 @@ export class SystemConfig {
   }
 
   getEditorConfig() {
-    return this._get<string>("editor_config", editorDefaultConfig);
+    return this._get<string | undefined>("editor_config", editorDefaultConfig);
   }
 
   setEditorConfig(v: string) {