fixing the typecheck

outerbase · Apr 15, 2024 · 8a0d38f · 8a0d38f
1 parent d3babd5
commit 8a0d38f
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 428 deletions.
diff --git a/studio/src/app/connect/saved-connection-storage.ts b/studio/src/app/connect/saved-connection-storage.ts
@@ -1,5 +1,5 @@
 import { ApiUser } from "@studio/lib/api/api-database-response";
-import { parseSafeJson } from "@libsqlstudio/gui";
+import parseSafeJson from "@studio/lib/json-safe";
 
 export interface DriverDetailField {
   name: keyof SavedConnectionItemConfigConfig;

diff --git a/studio/src/app/storybook/connection_error/page.tsx b/studio/src/app/storybook/connection_error/page.tsx
diff --git a/studio/src/app/storybook/opacity_loading/page.tsx b/studio/src/app/storybook/opacity_loading/page.tsx
diff --git a/studio/src/app/storybook/query_progress/page.tsx b/studio/src/app/storybook/query_progress/page.tsx
diff --git a/studio/src/lib/json-safe.ts b/studio/src/lib/json-safe.ts
@@ -0,0 +1,13 @@
+export default function parseSafeJson<T = unknown>(
+  str: string | null | undefined,
+  defaultValue: T
+): T {
+  if (!str) return defaultValue;
+
+  try {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+    return JSON.parse(str);
+  } catch {
+    return defaultValue;
+  }
+}
diff --git a/studio/src/lib/multiple-query.ts b/studio/src/lib/multiple-query.ts
diff --git a/studio/src/lib/sql-execute-helper.ts b/studio/src/lib/sql-execute-helper.ts