Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 15 additions & 0 deletions packages/storage/src/__tests__/package-import.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import assert from 'node:assert/strict';
import { spawnSync } from 'node:child_process';
import { test } from 'node:test';

test('top-level package import does not initialize node:sqlite', () => {
const packageEntry = new URL('../index.js', import.meta.url).href;
const result = spawnSync(
process.execPath,
['--input-type=module', '--eval', `await import(${JSON.stringify(packageEntry)})`],
{ encoding: 'utf8' },
);

assert.equal(result.status, 0, result.stderr);
assert.equal(result.stderr, '');
});
10 changes: 9 additions & 1 deletion packages/storage/src/sqlite-runtime-store.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { createHash } from 'node:crypto';
import { mkdirSync } from 'node:fs';
import { createRequire } from 'node:module';
import { dirname } from 'node:path';
import { DatabaseSync } from 'node:sqlite';
import type { DatabaseSync } from 'node:sqlite';
import { isDeepStrictEqual } from 'node:util';
import {
isPartialRuntimeEvent,
Expand All @@ -20,6 +21,12 @@ export { SQLITE_RUNTIME_SCHEMA_VERSION } from './sqlite-runtime-schema.js';

export type { ToolRecoveryMode } from '@maka/core';

const require = createRequire(import.meta.url);

function loadDatabaseSync(): typeof import('node:sqlite').DatabaseSync {
return (require('node:sqlite') as typeof import('node:sqlite')).DatabaseSync;
}

export type ToolJournalState = 'prepared' | 'outcome_committed';

export type SqliteRuntimeStoreFailpoint =
Expand Down Expand Up @@ -113,6 +120,7 @@ export class SqliteRuntimeStore implements RuntimeEventStore {
private readonly options: SqliteRuntimeStoreOptions = {},
) {
if (path !== ':memory:') mkdirSync(dirname(path), { recursive: true });
const DatabaseSync = loadDatabaseSync();
this.db = new DatabaseSync(path);
configureSqliteRuntimeDatabase(this.db);
migrateSqliteRuntimeDatabase(this.db);
Expand Down
Loading