refactor: improve code readability by formatting multi-line queries and string handling

caioricciuti · caioricciuti · commit 45b023e4449c · 2026-02-28T12:22:14.000+01:00
diff --git a/src/components/charts/tooltipPlugin.ts b/src/components/charts/tooltipPlugin.ts
@@ -57,8 +57,8 @@ export function tooltipPlugin(xLabels: string[]): uPlot.Plugin {
             typeof s.stroke === "function"
               ? (s.stroke as (self: uPlot, seriesIdx: number) => string)(u, i)
               : s.stroke;
-          const safeLabel = escapeHtml(s.label ?? "");
-          const safeColor = escapeHtml(String(color ?? ""));
+          const safeLabel = typeof s.label === "string" ? escapeHtml(s.label) : "";
+          const safeColor = typeof color === "string" ? escapeHtml(color) : "";
           html += `<div class="uplot-tooltip-row">
             <span class="uplot-tooltip-dot" style="background:${safeColor}"></span>
             <span class="uplot-tooltip-label">${safeLabel}</span>
diff --git a/src/components/layout/Sidebar.tsx b/src/components/layout/Sidebar.tsx
@@ -391,7 +391,9 @@ export default function Sidebar({ isExplorerOpen, onToggleExplorer }: SidebarPro
                     setTheme(newTheme);
                     const profileId = useDuckStore.getState().currentProfileId;
                     if (profileId) {
-                      setSetting(profileId, "theme", "mode", JSON.stringify(newTheme)).catch(() => {});
+                      setSetting(profileId, "theme", "mode", JSON.stringify(newTheme)).catch(
+                        () => {}
+                      );
                     }
                   }}
                 >
diff --git a/src/services/duckdb/schemaFetcher.ts b/src/services/duckdb/schemaFetcher.ts
@@ -20,7 +20,9 @@ export const fetchWasmDatabases = async (
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         tablesResult.toArray().map(async (tbl: any) => {
           const tableName = tbl.table_name.toString();
-          const columnsResult = await connection.query(`DESCRIBE ${sqlEscapeIdentifier(dbName)}.${sqlEscapeIdentifier(tableName)}`);
+          const columnsResult = await connection.query(
+            `DESCRIBE ${sqlEscapeIdentifier(dbName)}.${sqlEscapeIdentifier(tableName)}`
+          );
           // eslint-disable-next-line @typescript-eslint/no-explicit-any
           const columns: ColumnInfo[] = columnsResult.toArray().map((col: any) => ({
             name: col.column_name.toString(),
diff --git a/src/services/duckdb/wasmConnection.ts b/src/services/duckdb/wasmConnection.ts
@@ -194,7 +194,9 @@ export const loadEmbeddedDatabases = async (
 
         // Attach the database (derive alias from filename without extension)
         const dbAlias = fileName.replace(/\.db$/i, "").replace(/[^a-zA-Z0-9_]/g, "_");
-        await connection.query(`ATTACH DATABASE '${sqlEscapeString(fileName)}' AS ${sqlEscapeIdentifier(dbAlias)}`);
+        await connection.query(
+          `ATTACH DATABASE '${sqlEscapeString(fileName)}' AS ${sqlEscapeIdentifier(dbAlias)}`
+        );
 
         console.info(`Successfully loaded embedded database: ${dbConfig.name} as ${dbAlias}`);
       } catch (error) {
diff --git a/src/services/persistence/crypto.ts b/src/services/persistence/crypto.ts
@@ -19,7 +19,7 @@ const PBKDF2_ITERATIONS = 100_000;
 // ─── Base64 helpers (avoids stack overflow with large arrays) ────────────────
 
 function uint8ArrayToBase64(bytes: Uint8Array): string {
-  let binary = '';
+  let binary = "";
   for (let i = 0; i < bytes.length; i++) {
     binary += String.fromCharCode(bytes[i]);
   }
@@ -96,10 +96,12 @@ export async function loadKeyForProfile(
         resolve(null);
         return;
       }
-      importKey(record.key).then((key) => {
-        const salt = record.salt ? new Uint8Array(record.salt) : undefined;
-        resolve({ key, salt });
-      }).catch(reject);
+      importKey(record.key)
+        .then((key) => {
+          const salt = record.salt ? new Uint8Array(record.salt) : undefined;
+          resolve({ key, salt });
+        })
+        .catch(reject);
     };
     tx.onerror = () => {
       db.close();
@@ -206,8 +208,11 @@ export async function exportKey(key: CryptoKey): Promise<string> {
 
 export async function importKey(exported: string): Promise<CryptoKey> {
   const raw = base64ToUint8Array(exported);
-  return crypto.subtle.importKey("raw", raw, { name: ALGORITHM, length: KEY_LENGTH }, true, [
-    "encrypt",
-    "decrypt",
-  ]);
+  return crypto.subtle.importKey(
+    "raw",
+    raw.buffer as ArrayBuffer,
+    { name: ALGORITHM, length: KEY_LENGTH },
+    true,
+    ["encrypt", "decrypt"]
+  );
 }
diff --git a/src/services/persistence/repositories/profileRepository.ts b/src/services/persistence/repositories/profileRepository.ts
@@ -156,7 +156,9 @@ export async function updateLastActive(id: string): Promise<void> {
   const now = new Date().toISOString();
   if (isUsingOpfs()) {
     const conn = getSystemConnection();
-    await conn.query(`UPDATE profiles SET last_active = ${sqlQuote(now)} WHERE id = ${sqlQuote(id)}`);
+    await conn.query(
+      `UPDATE profiles SET last_active = ${sqlQuote(now)} WHERE id = ${sqlQuote(id)}`
+    );
   } else {
     const existing = (await fallbackGet("profiles", id)) as Profile | null;
     if (existing) {
diff --git a/src/services/persistence/repositories/savedQueryRepository.ts b/src/services/persistence/repositories/savedQueryRepository.ts
@@ -86,20 +86,19 @@ export async function updateSavedQuery(
     const conn = getSystemConnection();
     const setClauses: string[] = [`updated_at = ${sqlQuote(now)}`];
     if (updates.name !== undefined) setClauses.push(`name = ${sqlQuote(updates.name)}`);
-    if (updates.sql_text !== undefined)
-      setClauses.push(`sql_text = ${sqlQuote(updates.sql_text)}`);
+    if (updates.sql_text !== undefined) setClauses.push(`sql_text = ${sqlQuote(updates.sql_text)}`);
     if (updates.description !== undefined)
       setClauses.push(
         updates.description
           ? `description = ${sqlQuote(updates.description)}`
           : `description = NULL`
       );
     if (updates.tags !== undefined)
-      setClauses.push(
-        updates.tags ? `tags = ${sqlQuote(updates.tags)}` : `tags = NULL`
-      );
+      setClauses.push(updates.tags ? `tags = ${sqlQuote(updates.tags)}` : `tags = NULL`);
     if (updates.folder !== undefined) setClauses.push(`folder = ${sqlQuote(updates.folder)}`);
-    await conn.query(`UPDATE saved_queries SET ${setClauses.join(", ")} WHERE id = ${sqlQuote(id)}`);
+    await conn.query(
+      `UPDATE saved_queries SET ${setClauses.join(", ")} WHERE id = ${sqlQuote(id)}`
+    );
   } else {
     const existing = (await fallbackGet("saved_queries", id)) as SavedQuery | null;
     if (existing) {
diff --git a/src/store/index.ts b/src/store/index.ts
@@ -22,9 +22,7 @@ export * from "./types";
 // Re-export cloud storage types for use in components
 export type { CloudConnection, CloudSupportStatus } from "@/lib/cloudStorage";
 
-const storeCreator = (
-  ...a: Parameters<StateCreator<DuckStoreState>>
-) => ({
+const storeCreator: StateCreator<DuckStoreState, [["zustand/devtools", never]]> = (...a) => ({
   ...createDuckdbSlice(...a),
   ...createConnectionSlice(...a),
   ...createQuerySlice(...a),
@@ -36,7 +34,7 @@ const storeCreator = (
 });
 
 export const useDuckStore = create<DuckStoreState>()(
-  import.meta.env.DEV ? devtools(storeCreator) : storeCreator
+  devtools(storeCreator, { enabled: import.meta.env.DEV })
 );
 
 // ─── Auto-save: debounced writes to system DB ────────────────────────────────
diff --git a/src/store/slices/schemaSlice.ts b/src/store/slices/schemaSlice.ts
@@ -100,7 +100,9 @@ export const createSchemaSlice: StateCreator<
       }
       const wasmConnection = validateConnection(connection);
       set({ isLoading: true });
-      await wasmConnection.query(`DROP TABLE IF EXISTS ${sqlEscapeIdentifier(database)}.${sqlEscapeIdentifier(tableName)}`);
+      await wasmConnection.query(
+        `DROP TABLE IF EXISTS ${sqlEscapeIdentifier(database)}.${sqlEscapeIdentifier(tableName)}`
+      );
       await get().fetchDatabasesAndTablesInfo();
       set({ isLoading: false });
     } catch (error) {
@@ -139,7 +141,9 @@ export const createSchemaSlice: StateCreator<
       await db.registerFileBuffer(fileName, buffer);
       // Handle DuckDB database files (.duckdb, .db, .ddb)
       if (fileType === "duckdb" || fileType === "db" || fileType === "ddb") {
-        await connection.query(`ATTACH DATABASE '${sqlEscapeString(fileName)}' AS ${sqlEscapeIdentifier(tableName)}`);
+        await connection.query(
+          `ATTACH DATABASE '${sqlEscapeString(fileName)}' AS ${sqlEscapeIdentifier(tableName)}`
+        );
         await get().fetchDatabasesAndTablesInfo();
         return;
       }

Original file line number	Diff line number	Diff line change
`@@ -391,7 +391,9 @@ export default function Sidebar({ isExplorerOpen, onToggleExplorer }: SidebarPro`
`391`	`391`	`setTheme(newTheme);`
`392`	`392`	`const profileId = useDuckStore.getState().currentProfileId;`
`393`	`393`	`if (profileId) {`
`394`		`- setSetting(profileId, "theme", "mode", JSON.stringify(newTheme)).catch(() => {});`
	`394`	`+ setSetting(profileId, "theme", "mode", JSON.stringify(newTheme)).catch(`
	`395`	`+ () => {}`
	`396`	`+ );`
`395`	`397`	`}`
`396`	`398`	`}}`
`397`	`399`	`>`