🐛 修复类型错误 (#975)

* 1.3 bug fix

* 构建前添加类型检查

* 移动类型检查

* 修复类型错误

---------

Co-authored-by: 王一之 <[email protected]>

Author: cyfung1031

.github/workflows/test.yaml

@@ -27,7 +27,9 @@ jobs:
         run: pnpm i --frozen-lockfile
 
       - name: Lint
-        run: pnpm run lint
+        run: |
+          pnpm run typecheck
+          pnpm run lint
 
       - name: Unit Test
         run: |

package.json

@@ -9,6 +9,7 @@
     "preinstall": "pnpm dlx only-allow pnpm",
     "test": "vitest --test-timeout=500 --no-coverage --isolate=false --reporter=verbose",
     "coverage": "vitest run --coverage",
+    "typecheck": "tsc --noEmit",
     "build": "cross-env NODE_ENV=production rspack build",
     "dev": "cross-env NODE_ENV=development rspack",
     "dev:noMap": "cross-env NODE_ENV=development NO_MAP=true rspack",

src/pages/install/App.tsx

@@ -61,7 +61,7 @@ function App() {
 
   const installOrUpdateScript = async (newScript: Script, code: string) => {
     if (newScript.ignoreVersion) newScript.ignoreVersion = "";
-    await scriptClient.install({ details: newScript, code });
+    await scriptClient.install({ script: newScript, code });
     const metadata = newScript.metadata;
     setScriptInfo((prev) => (prev ? { ...prev, code, metadata } : prev));
     setOldScriptVersion(metadata!.version![0]);
@@ -314,7 +314,7 @@ function App() {
           (upsertScript as Script).checkUpdate = false;
         }
         // 故意只安装或执行，不改变显示内容
-        await scriptClient.install({ details: upsertScript as Script, code: scriptCode });
+        await scriptClient.install({ script: upsertScript as Script, code: scriptCode });
         if (isUpdate) {
           Message.success(t("install.update_success")!);
           setBtnText(t("install.update_success")!);
@@ -326,7 +326,7 @@ function App() {
           }
           if ((upsertScript as Script).ignoreVersion) (upsertScript as Script).ignoreVersion = "";
           // 故意只安装或执行，不改变显示内容
-          await scriptClient.install({ details: upsertScript as Script, code: scriptCode });
+          await scriptClient.install({ script: upsertScript as Script, code: scriptCode });
           if (isUpdate) {
             Message.success(t("install.update_success")!);
             setBtnText(t("install.update_success")!);

src/pkg/utils/yaml.ts

@@ -25,6 +25,7 @@ export function parseUserConfig(code: string): UserConfig | undefined {
         throw new Error(`UserConfig group "${groupKey}" is not a valid object.`);
       }
 
+      //@ts-ignore
       ret[groupKey] = groupValue;
 
       if (groupKey === "#options") {

tests/mocks/fetch.ts

@@ -27,6 +27,5 @@ export const mockFetch = vi.fn(async (input: RequestInfo | URL, init?: RequestIn
     setNetworkRequestCounter(input);
   }
 
-  // @ts-expect-error
   return ret;
 });

tests/mocks/request.ts

@@ -17,8 +17,7 @@ export class MockRequest implements Request {
   readonly destination: RequestDestination = "";
   readonly isHistoryNavigation: boolean = false;
   readonly isReloadNavigation: boolean = false;
-  // @ts-expect-error
-  readonly body: ReadableStream<Uint8Array> | null;
+  readonly body: ReadableStream<Uint8Array<ArrayBuffer>> | null;
   #bytes: Uint8Array | null;
 
   constructor(input: RequestInfo | URL, init?: RequestInit) {
@@ -62,9 +61,12 @@ export class MockRequest implements Request {
     }
 
     this.body = this.#bytes
-      ? new ReadableStream<Uint8Array>({
+      ? new ReadableStream<Uint8Array<ArrayBuffer>>({
           start: (controller) => {
-            controller.enqueue(this.#bytes!);
+            const buffer = new ArrayBuffer(this.#bytes!.byteLength);
+            const view = new Uint8Array(buffer);
+            view.set(this.#bytes!);
+            controller.enqueue(view);
             controller.close();
           },
           pull: () => {
@@ -124,9 +126,18 @@ export class MockRequest implements Request {
     return this.#bytes ? new TextDecoder().decode(this.#bytes) : "";
   }
 
+  async bytes(): Promise<Uint8Array<ArrayBuffer>> {
+    if (this.bodyUsed) throw new TypeError("Body already consumed");
+    (this as any).bodyUsed = true;
+    if (!this.#bytes) return new Uint8Array(new ArrayBuffer(0));
+    const buffer = new ArrayBuffer(this.#bytes.byteLength);
+    const view = new Uint8Array(buffer);
+    view.set(this.#bytes);
+    return view;
+  }
+
   clone(): Request {
     if (this.bodyUsed) throw new TypeError("Cannot clone: Body already consumed");
-    // @ts-expect-error
     return new MockRequest(this, {
       method: this.method,
       headers: this.headers,

tests/mocks/response.ts

@@ -18,8 +18,7 @@ export class MockResponse implements Response {
   readonly redirected: boolean = false;
   readonly type: ResponseType = "basic";
   readonly headers: Headers;
-  // @ts-expect-error
-  readonly body: ReadableStream<Uint8Array> | null;
+  readonly body: ReadableStream<Uint8Array<ArrayBuffer>> | null;
   bodyUsed: boolean = false;
   #bytes: Uint8Array;
 
@@ -50,9 +49,12 @@ export class MockResponse implements Response {
     this.url = init?.url ?? "";
 
     this.body = this.#bytes.length
-      ? new ReadableStream<Uint8Array>({
+      ? new ReadableStream<Uint8Array<ArrayBuffer>>({
           start: (controller) => {
-            controller.enqueue(this.#bytes);
+            const buffer = new ArrayBuffer(this.#bytes.byteLength);
+            const view = new Uint8Array(buffer);
+            view.set(this.#bytes);
+            controller.enqueue(view);
             controller.close();
           },
           pull: () => {
@@ -112,9 +114,17 @@ export class MockResponse implements Response {
     return new TextDecoder().decode(this.#bytes);
   }
 
+  async bytes(): Promise<Uint8Array<ArrayBuffer>> {
+    if (this.bodyUsed) throw new TypeError("Body already consumed");
+    (this as any).bodyUsed = true;
+    const buffer = new ArrayBuffer(this.#bytes.byteLength);
+    const view = new Uint8Array(buffer);
+    view.set(this.#bytes);
+    return view;
+  }
+
   clone(): Response {
     if (this.bodyUsed) throw new TypeError("Cannot clone: Body already consumed");
-    // @ts-expect-error
     return new MockResponse(this.#bytes.slice(), {
       status: this.status,
       statusText: this.statusText,