Merge pull request #3597 from continuedev/dallin/gui-strict-null-checks

GUI strict null checks
continuedev · Jan 7, 2025 · a0d0bda · a0d0bda
2 parents bcc638f + 0a3fb19
commit a0d0bda
Show file tree

Hide file tree

Showing 52 changed files with 426 additions and 647 deletions.
diff --git a/core/core.ts b/core/core.ts
@@ -421,7 +421,6 @@ export class Core {
 
         const chunk = next.value;
 
-        // @ts-ignore
         yield { content: chunk };
         next = await gen.next();
       }

diff --git a/core/protocol/core.ts b/core/protocol/core.ts
@@ -23,10 +23,26 @@ import type {
 } from "../";
 import { ConfigResult } from "../config/load";
 
-export type ProtocolGeneratorType<T> = AsyncGenerator<{
+export type ProtocolGeneratorYield<T> = {
   done?: boolean;
   content: T;
-}>;
+};
+export type ProtocolGeneratorType<Y> = AsyncGenerator<
+  ProtocolGeneratorYield<Y>
+>;
+
+export type AsyncGeneratorYieldType<T> =
+  T extends AsyncGenerator<infer Y, any, any>
+    ? Y extends ProtocolGeneratorYield<infer PR>
+      ? PR
+      : never
+    : never;
+// export type AsyncGeneratorReturnType<T> =
+//   T extends AsyncGenerator<any, infer R, any>
+//     ? R extends ProtocolGeneratorYield<infer PR>
+//       ? PR
+//       : never
+//     : never;
 
 export type OnboardingModes =
   | "Local"

diff --git a/core/protocol/ideWebview.ts b/core/protocol/ideWebview.ts
@@ -43,7 +43,7 @@ export type ToIdeFromWebviewProtocol = ToIdeFromWebviewOrCoreProtocol & {
       vscMediaUrl: string;
     },
   ];
-  "jetbrains/getColors": [undefined, void];
+  "jetbrains/getColors": [undefined, Record<string, string>];
   "vscode/openMoveRightMarkdown": [undefined, void];
   setGitHubAuthToken: [{ token: string }, void];
   acceptDiff: [{ filepath: string; streamId?: string }, void];

diff --git a/extensions/vscode/package-lock.json b/extensions/vscode/package-lock.json
diff --git a/gui/.eslintrc.json b/gui/.eslintrc.json
@@ -1,23 +1,16 @@
 {
   "root": true,
   "parser": "@typescript-eslint/parser",
-  "plugins": [
-    "@typescript-eslint",
-    "strict-null-checks",
-    "eslint-plugin-react"
-  ],
+  "plugins": ["@typescript-eslint", "eslint-plugin-react"],
   "parserOptions": {
-    "project": "gui/tsconfig.strictNullChecks.json"
-  },
-  // "extends": [
-  //   "eslint:recommended",
-  //   "plugin:@typescript-eslint/recommended",
-  //   "plugin:@typescript-eslint/recommended-requiring-type-checking"
-  //   "plugin:react/recommended"
-  // ],
-  "rules": {
-    "strict-null-checks/all": "warn"
+    "project": "gui/tsconfig.json"
   },
+  "extends": [
+    // "eslint:recommended",
+    // "plugin:@typescript-eslint/recommended",
+    // "plugin:@typescript-eslint/recommended-requiring-type-checking"
+    // "plugin:react/recommended"
+  ],
   "overrides": [
     {
       "files": ["src/**/*.{js,ts,jsx,tsx}"]