Skip to content

🧹 [code health: Strongly type catch blocks in WasmDatabaseEngine] #485

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
google-labs-jules wants to merge 1 commit into from
Closed

🧹 [code health: Strongly type catch blocks in WasmDatabaseEngine] #485

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 21 additions & 17 deletions src/core/engine/wasm/WasmDatabaseEngine.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,9 @@ export class WasmDatabaseEngine implements DatabaseOperations {
private async safeRollback(context: string): Promise<void> {
try {
await this.executeQuery('ROLLBACK');
} catch (rollbackErr) {
console.warn(`Failed to rollback (${context}):`, rollbackErr);
} catch (rollbackErr: unknown) {
const errorDetail = rollbackErr instanceof Error ? rollbackErr.message : String(rollbackErr);
console.warn(`Failed to rollback (${context}):`, errorDetail);
}
}

Expand All @@ -112,8 +113,9 @@ export class WasmDatabaseEngine implements DatabaseOperations {
try {
await this.executeQuery(`ROLLBACK TO ${savepointName}`);
await this.executeQuery(`RELEASE ${savepointName}`);
} catch (rollbackErr) {
console.warn(`Failed to rollback savepoint (${context}):`, rollbackErr);
} catch (rollbackErr: unknown) {
const errorDetail = rollbackErr instanceof Error ? rollbackErr.message : String(rollbackErr);
console.warn(`Failed to rollback savepoint (${context}):`, errorDetail);
}
}

Expand Down Expand Up @@ -189,13 +191,14 @@ export class WasmDatabaseEngine implements DatabaseOperations {
// iterateStatements handles freeing - clear reference
currentStmt = null;
}
} catch (err) {
} catch (err: unknown) {
// Ensure current statement is freed if iteration was interrupted
if (currentStmt) {
try {
currentStmt.free();
} catch (freeErr) {
console.warn('Failed to free statement on error:', freeErr);
} catch (freeErr: unknown) {
const freeErrorDetail = freeErr instanceof Error ? freeErr.message : String(freeErr);
console.warn('Failed to free statement on error:', freeErrorDetail);
}
}
const errorDetail = err instanceof Error ? err.message : String(err);
Expand Down Expand Up @@ -242,7 +245,7 @@ export class WasmDatabaseEngine implements DatabaseOperations {
}
signal?.throwIfAborted();
await this.executeQuery(`RELEASE ${savepointName}`);
} catch (err) {
} catch (err: unknown) {
await this.safeRollbackSavepoint(savepointName, 'applyModifications');
throw err;
}
Expand Down Expand Up @@ -421,7 +424,7 @@ export class WasmDatabaseEngine implements DatabaseOperations {
}

await this.executeQuery('COMMIT');
} catch (e) {
} catch (e: unknown) {
await this.safeRollback('undoColumnDrop');
throw e;
}
Expand Down Expand Up @@ -591,7 +594,7 @@ export class WasmDatabaseEngine implements DatabaseOperations {

let currentObj = {};
if (typeof currentValue === 'string') {
try { currentObj = JSON.parse(currentValue); } catch (e) { console.warn('Failed to parse current JSON value for patching (updateCell)', e); }
try { currentObj = JSON.parse(currentValue); } catch (e: unknown) { const errorDetail = e instanceof Error ? e.message : String(e); console.warn('Failed to parse current JSON value for patching (updateCell)', errorDetail); }
} else if (typeof currentValue === 'object' && currentValue !== null && !(currentValue instanceof Uint8Array)) {
currentObj = currentValue;
}
Expand Down Expand Up @@ -687,7 +690,7 @@ export class WasmDatabaseEngine implements DatabaseOperations {
}

await this.executeQuery('COMMIT');
} catch (e) {
} catch (e: unknown) {
await this.safeRollback('insertRowBatch');
throw e;
}
Expand Down Expand Up @@ -788,7 +791,7 @@ export class WasmDatabaseEngine implements DatabaseOperations {
.join('\n');
await this.executeQuery(dropColumnStatements);
await this.executeQuery(`RELEASE ${savepointName}`);
} catch (e) {
} catch (e: unknown) {
await this.safeRollbackSavepoint(savepointName, 'deleteColumns');
throw e;
}
Expand Down Expand Up @@ -906,7 +909,7 @@ export class WasmDatabaseEngine implements DatabaseOperations {

let currentObj = {};
if (typeof currentValue === 'string') {
try { currentObj = JSON.parse(currentValue); } catch (e) { console.warn('Failed to parse current JSON value for patching (updateCells)', e); }
try { currentObj = JSON.parse(currentValue); } catch (e: unknown) { const errorDetail = e instanceof Error ? e.message : String(e); console.warn('Failed to parse current JSON value for patching (updateCells)', errorDetail); }
}

let patchObj;
Expand Down Expand Up @@ -937,13 +940,14 @@ export class WasmDatabaseEngine implements DatabaseOperations {
}

await this.executeQuery(`RELEASE ${savepointName}`);
} catch (err) {
} catch (err: unknown) {
try {
// ROLLBACK TO restores but keeps the savepoint; RELEASE removes it
await this.executeQuery(`ROLLBACK TO ${savepointName}`);
await this.executeQuery(`RELEASE ${savepointName}`);
} catch (rollbackErr) {
console.warn('Failed to rollback savepoint:', rollbackErr);
} catch (rollbackErr: unknown) {
const errorDetail = rollbackErr instanceof Error ? rollbackErr.message : String(rollbackErr);
console.warn('Failed to rollback savepoint:', errorDetail);
}
throw err;
}
Expand Down Expand Up @@ -1009,7 +1013,7 @@ export class WasmDatabaseEngine implements DatabaseOperations {
columns: headers,
values: rows
};
} catch (err) {
} catch (err: unknown) {
const errorDetail = err instanceof Error ? err.message : String(err);
throw new Error(`Fetch failed: ${errorDetail}`);
} finally {
Expand Down
Loading