@livestore/common 0.0.47 → 0.0.48-dev.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/.tsbuildinfo +1 -1
- package/dist/__tests__/fixture.d.ts +68 -0
- package/dist/__tests__/fixture.d.ts.map +1 -0
- package/dist/__tests__/fixture.js +16 -0
- package/dist/__tests__/fixture.js.map +1 -0
- package/dist/adapter-types.d.ts +86 -0
- package/dist/adapter-types.d.ts.map +1 -0
- package/dist/adapter-types.js +2 -0
- package/dist/adapter-types.js.map +1 -0
- package/dist/derived-mutations.d.ts +107 -0
- package/dist/derived-mutations.d.ts.map +1 -0
- package/dist/derived-mutations.js +51 -0
- package/dist/derived-mutations.js.map +1 -0
- package/dist/derived-mutations.test.d.ts +2 -0
- package/dist/derived-mutations.test.d.ts.map +1 -0
- package/dist/derived-mutations.test.js +92 -0
- package/dist/derived-mutations.test.js.map +1 -0
- package/dist/index.d.ts +6 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +6 -2
- package/dist/index.js.map +1 -1
- package/dist/init-singleton-tables.d.ts +2 -2
- package/dist/init-singleton-tables.d.ts.map +1 -1
- package/dist/init-singleton-tables.js.map +1 -1
- package/dist/mutation.d.ts.map +1 -1
- package/dist/query-info.d.ts +47 -0
- package/dist/query-info.d.ts.map +1 -0
- package/dist/query-info.js +38 -0
- package/dist/query-info.js.map +1 -0
- package/dist/rehydrate-from-mutationlog.d.ts +6 -5
- package/dist/rehydrate-from-mutationlog.d.ts.map +1 -1
- package/dist/rehydrate-from-mutationlog.js +24 -7
- package/dist/rehydrate-from-mutationlog.js.map +1 -1
- package/dist/schema/index.d.ts +33 -23
- package/dist/schema/index.d.ts.map +1 -1
- package/dist/schema/index.js +31 -15
- package/dist/schema/index.js.map +1 -1
- package/dist/schema/mutations.d.ts +16 -0
- package/dist/schema/mutations.d.ts.map +1 -1
- package/dist/schema/mutations.js +18 -8
- package/dist/schema/mutations.js.map +1 -1
- package/dist/schema/parse-utils.d.ts +14 -4
- package/dist/schema/parse-utils.d.ts.map +1 -1
- package/dist/schema/parse-utils.js +3 -3
- package/dist/schema/parse-utils.js.map +1 -1
- package/dist/schema/system-tables.d.ts +239 -67
- package/dist/schema/system-tables.d.ts.map +1 -1
- package/dist/schema/system-tables.js +24 -3
- package/dist/schema/system-tables.js.map +1 -1
- package/dist/schema/table-def.d.ts +53 -10
- package/dist/schema/table-def.d.ts.map +1 -1
- package/dist/schema/table-def.js +27 -12
- package/dist/schema/table-def.js.map +1 -1
- package/dist/schema-management/common.d.ts +5 -0
- package/dist/schema-management/common.d.ts.map +1 -0
- package/dist/schema-management/common.js +22 -0
- package/dist/schema-management/common.js.map +1 -0
- package/dist/schema-management/migrations.d.ts +18 -0
- package/dist/schema-management/migrations.d.ts.map +1 -0
- package/dist/{migrations.js → schema-management/migrations.js} +29 -36
- package/dist/schema-management/migrations.js.map +1 -0
- package/dist/schema-management/validate-mutation-defs.d.ts +16 -0
- package/dist/schema-management/validate-mutation-defs.d.ts.map +1 -0
- package/dist/schema-management/validate-mutation-defs.js +63 -0
- package/dist/schema-management/validate-mutation-defs.js.map +1 -0
- package/dist/sql-queries/sql-queries.d.ts +4 -4
- package/dist/sql-queries/sql-queries.d.ts.map +1 -1
- package/dist/sql-queries/sql-queries.js +7 -8
- package/dist/sql-queries/sql-queries.js.map +1 -1
- package/dist/sql-queries/sql-query-builder.d.ts +1 -1
- package/dist/sql-queries/sql-query-builder.d.ts.map +1 -1
- package/dist/sync/index.d.ts +2 -0
- package/dist/sync/index.d.ts.map +1 -0
- package/dist/sync/index.js +2 -0
- package/dist/sync/index.js.map +1 -0
- package/dist/sync/sync.d.ts +25 -0
- package/dist/sync/sync.d.ts.map +1 -0
- package/dist/sync/sync.js +8 -0
- package/dist/sync/sync.js.map +1 -0
- package/package.json +6 -6
- package/src/__tests__/fixture.ts +23 -0
- package/src/adapter-types.ts +104 -0
- package/src/ambient.d.ts +3 -0
- package/src/derived-mutations.test.ts +100 -0
- package/src/derived-mutations.ts +126 -0
- package/src/index.ts +6 -2
- package/src/init-singleton-tables.ts +2 -2
- package/src/query-info.ts +104 -0
- package/src/rehydrate-from-mutationlog.ts +34 -20
- package/src/schema/index.ts +67 -39
- package/src/schema/mutations.ts +28 -9
- package/src/schema/parse-utils.ts +3 -3
- package/src/schema/system-tables.ts +44 -3
- package/src/schema/table-def.ts +64 -18
- package/src/schema-management/common.ts +29 -0
- package/src/{migrations.ts → schema-management/migrations.ts} +44 -57
- package/src/schema-management/validate-mutation-defs.ts +108 -0
- package/src/sql-queries/sql-queries.ts +8 -9
- package/src/sync/index.ts +1 -0
- package/src/sync/sync.ts +14 -0
- package/dist/database.d.ts +0 -50
- package/dist/database.d.ts.map +0 -1
- package/dist/database.js +0 -2
- package/dist/database.js.map +0 -1
- package/dist/migrations.d.ts +0 -16
- package/dist/migrations.d.ts.map +0 -1
- package/dist/migrations.js.map +0 -1
- package/src/database.ts +0 -60
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import * as otel from '@opentelemetry/api';
|
|
2
|
+
import { SqliteAst } from 'effect-db-schema';
|
|
3
|
+
import type { InMemoryDatabase } from '../adapter-types.js';
|
|
4
|
+
import type { LiveStoreSchema } from '../schema/index.js';
|
|
5
|
+
export declare const migrateDb: ({ db, otelContext, schema, }: {
|
|
6
|
+
db: InMemoryDatabase;
|
|
7
|
+
otelContext?: otel.Context;
|
|
8
|
+
schema: LiveStoreSchema;
|
|
9
|
+
}) => void;
|
|
10
|
+
export declare const migrateTable: ({ db, tableAst, schemaHash, behaviour, skipMetaTable, }: {
|
|
11
|
+
db: InMemoryDatabase;
|
|
12
|
+
tableAst: SqliteAst.Table;
|
|
13
|
+
otelContext?: otel.Context;
|
|
14
|
+
schemaHash?: number;
|
|
15
|
+
behaviour: 'drop-and-recreate' | 'create-if-not-exists';
|
|
16
|
+
skipMetaTable?: boolean;
|
|
17
|
+
}) => void;
|
|
18
|
+
//# sourceMappingURL=migrations.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"migrations.d.ts","sourceRoot":"","sources":["../../src/schema-management/migrations.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,IAAI,MAAM,oBAAoB,CAAA;AAC1C,OAAO,EAAE,SAAS,EAAa,MAAM,kBAAkB,CAAA;AAEvD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;AAC3D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AAUzD,eAAO,MAAM,SAAS,iCAInB;IACD,EAAE,EAAE,gBAAgB,CAAA;IACpB,WAAW,CAAC,EAAE,KAAK,OAAO,CAAA;IAC1B,MAAM,EAAE,eAAe,CAAA;CACxB,SAsCA,CAAA;AAED,eAAO,MAAM,YAAY,4DAOtB;IACD,EAAE,EAAE,gBAAgB,CAAA;IACpB,QAAQ,EAAE,UAAU,KAAK,CAAA;IACzB,WAAW,CAAC,EAAE,KAAK,OAAO,CAAA;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,SAAS,EAAE,mBAAmB,GAAG,sBAAsB,CAAA;IACvD,aAAa,CAAC,EAAE,OAAO,CAAA;CACxB,SA6BA,CAAA"}
|
|
@@ -1,34 +1,21 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { memoizeByStringifyArgs } from '@livestore/utils';
|
|
2
2
|
import { Schema as EffectSchema } from '@livestore/utils/effect';
|
|
3
|
+
import * as otel from '@opentelemetry/api';
|
|
3
4
|
import { SqliteAst, SqliteDsl } from 'effect-db-schema';
|
|
4
|
-
import { SCHEMA_META_TABLE, systemTables } from '
|
|
5
|
-
import {
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
// const cachedStmts = new Map<string, PreparedStatement>()
|
|
10
|
-
const dbExecute = (db, queryStr, bindValues) => {
|
|
11
|
-
// let stmt = cachedStmts.get(queryStr)
|
|
12
|
-
// if (!stmt) {
|
|
13
|
-
const stmt = db.prepare(queryStr);
|
|
14
|
-
// cachedStmts.set(queryStr, stmt)
|
|
15
|
-
// }
|
|
16
|
-
const preparedBindValues = bindValues ? prepareBindValues(bindValues, queryStr) : undefined;
|
|
17
|
-
stmt.execute(preparedBindValues);
|
|
18
|
-
};
|
|
19
|
-
const dbSelect = (db, queryStr, bindValues) => {
|
|
20
|
-
// let stmt = cachedStmts.get(queryStr)
|
|
21
|
-
// if (!stmt) {
|
|
22
|
-
const stmt = db.prepare(queryStr);
|
|
23
|
-
// cachedStmts.set(queryStr, stmt)
|
|
24
|
-
// }
|
|
25
|
-
return stmt.select(bindValues ? prepareBindValues(bindValues, queryStr) : undefined);
|
|
26
|
-
};
|
|
5
|
+
import { SCHEMA_META_TABLE, schemaMetaTable, systemTables } from '../schema/system-tables.js';
|
|
6
|
+
import { sql } from '../util.js';
|
|
7
|
+
import { dbExecute, dbSelect } from './common.js';
|
|
8
|
+
import { makeSchemaManager, validateSchema } from './validate-mutation-defs.js';
|
|
9
|
+
const getMemoizedTimestamp = memoizeByStringifyArgs(() => new Date().toISOString());
|
|
27
10
|
// TODO more graceful DB migration (e.g. backup DB before destructive migrations)
|
|
28
|
-
export const migrateDb = ({ db, otelContext, schema, }) => {
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
11
|
+
export const migrateDb = ({ db, otelContext = otel.context.active(), schema, }) => {
|
|
12
|
+
migrateTable({
|
|
13
|
+
db,
|
|
14
|
+
otelContext,
|
|
15
|
+
tableAst: schemaMetaTable.sqliteDef.ast,
|
|
16
|
+
behaviour: 'create-if-not-exists',
|
|
17
|
+
});
|
|
18
|
+
validateSchema(schema, makeSchemaManager(db));
|
|
32
19
|
const schemaMetaRows = dbSelect(db, sql `SELECT * FROM ${SCHEMA_META_TABLE}`);
|
|
33
20
|
const dbSchemaHashByTable = Object.fromEntries(schemaMetaRows.map(({ tableName, schemaHash }) => [tableName, schemaHash]));
|
|
34
21
|
const tableDefs = new Set([
|
|
@@ -41,31 +28,37 @@ export const migrateDb = ({ db, otelContext, schema, }) => {
|
|
|
41
28
|
const tableName = tableAst.name;
|
|
42
29
|
const dbSchemaHash = dbSchemaHashByTable[tableName];
|
|
43
30
|
const schemaHash = SqliteAst.hash(tableAst);
|
|
44
|
-
// @ts-expect-error TODO fix typing
|
|
45
31
|
const skipMigrations = import.meta.env.VITE_LIVESTORE_SKIP_MIGRATIONS !== undefined;
|
|
46
32
|
if (schemaHash !== dbSchemaHash && skipMigrations === false) {
|
|
47
33
|
console.log(`Schema hash mismatch for table '${tableName}' (DB: ${dbSchemaHash}, expected: ${schemaHash}), migrating table...`);
|
|
48
|
-
migrateTable({ db, tableAst, otelContext, schemaHash });
|
|
34
|
+
migrateTable({ db, tableAst, otelContext, schemaHash, behaviour: 'drop-and-recreate' });
|
|
49
35
|
}
|
|
50
36
|
}
|
|
51
37
|
};
|
|
52
38
|
export const migrateTable = ({ db, tableAst,
|
|
53
39
|
// otelContext,
|
|
54
|
-
schemaHash, }) => {
|
|
40
|
+
schemaHash = SqliteAst.hash(tableAst), behaviour, skipMetaTable = false, }) => {
|
|
55
41
|
console.log(`Migrating table '${tableAst.name}'...`);
|
|
56
42
|
const tableName = tableAst.name;
|
|
57
43
|
const columnSpec = makeColumnSpec(tableAst);
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
44
|
+
if (behaviour === 'drop-and-recreate') {
|
|
45
|
+
// TODO need to possibly handle cascading deletes due to foreign keys
|
|
46
|
+
dbExecute(db, sql `drop table if exists ${tableName}`);
|
|
47
|
+
dbExecute(db, sql `create table if not exists ${tableName} (${columnSpec}) strict`);
|
|
48
|
+
}
|
|
49
|
+
else if (behaviour === 'create-if-not-exists') {
|
|
50
|
+
dbExecute(db, sql `create table if not exists ${tableName} (${columnSpec}) strict`);
|
|
51
|
+
}
|
|
61
52
|
for (const index of tableAst.indexes) {
|
|
62
53
|
dbExecute(db, createIndexFromDefinition(tableName, index));
|
|
63
54
|
}
|
|
64
|
-
|
|
65
|
-
|
|
55
|
+
if (skipMetaTable !== true) {
|
|
56
|
+
const updatedAt = getMemoizedTimestamp();
|
|
57
|
+
dbExecute(db, sql `
|
|
66
58
|
INSERT INTO ${SCHEMA_META_TABLE} (tableName, schemaHash, updatedAt) VALUES ($tableName, $schemaHash, $updatedAt)
|
|
67
59
|
ON CONFLICT (tableName) DO UPDATE SET schemaHash = $schemaHash, updatedAt = $updatedAt;
|
|
68
60
|
`, { tableName, schemaHash, updatedAt });
|
|
61
|
+
}
|
|
69
62
|
};
|
|
70
63
|
const createIndexFromDefinition = (tableName, index) => {
|
|
71
64
|
const uniqueStr = index.unique ? 'UNIQUE' : '';
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"migrations.js","sourceRoot":"","sources":["../../src/schema-management/migrations.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import type { InMemoryDatabase } from '../adapter-types.js';
|
|
2
|
+
import type { LiveStoreSchema } from '../schema/index.js';
|
|
3
|
+
import type { MutationDef } from '../schema/mutations.js';
|
|
4
|
+
export declare const validateSchema: (schema: LiveStoreSchema, schemaManager: SchemaManager) => void;
|
|
5
|
+
export declare const validateMutationDef: (mutationDef: MutationDef.Any, schemaManager: SchemaManager, registeredMutationDefInfo: MutationDefInfo | undefined) => void;
|
|
6
|
+
interface SchemaManager {
|
|
7
|
+
getMutationDefInfos: () => ReadonlyArray<MutationDefInfo>;
|
|
8
|
+
setMutationDefInfo: (mutationDefInfo: MutationDefInfo) => void;
|
|
9
|
+
}
|
|
10
|
+
type MutationDefInfo = {
|
|
11
|
+
mutationName: string;
|
|
12
|
+
schemaHash: number;
|
|
13
|
+
};
|
|
14
|
+
export declare const makeSchemaManager: (db: InMemoryDatabase) => SchemaManager;
|
|
15
|
+
export {};
|
|
16
|
+
//# sourceMappingURL=validate-mutation-defs.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"validate-mutation-defs.d.ts","sourceRoot":"","sources":["../../src/schema-management/validate-mutation-defs.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;AAC3D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AACzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAA;AAOzD,eAAO,MAAM,cAAc,WAAY,eAAe,iBAAiB,aAAa,SAqBnF,CAAA;AAED,eAAO,MAAM,mBAAmB,gBACjB,YAAY,GAAG,iBACb,aAAa,6BACD,eAAe,GAAG,SAAS,SA0BvD,CAAA;AAED,UAAU,aAAa;IACrB,mBAAmB,EAAE,MAAM,aAAa,CAAC,eAAe,CAAC,CAAA;IAEzD,kBAAkB,EAAE,CAAC,eAAe,EAAE,eAAe,KAAK,IAAI,CAAA;CAC/D;AAED,KAAK,eAAe,GAAG;IACrB,YAAY,EAAE,MAAM,CAAA;IACpB,UAAU,EAAE,MAAM,CAAA;CACnB,CAAA;AAED,eAAO,MAAM,iBAAiB,OAAQ,gBAAgB,KAAG,aA6BxD,CAAA"}
|
|
@@ -0,0 +1,63 @@
|
|
|
1
|
+
import { shouldNeverHappen } from '@livestore/utils';
|
|
2
|
+
import { Schema } from '@livestore/utils/effect';
|
|
3
|
+
import * as otel from '@opentelemetry/api';
|
|
4
|
+
import { SCHEMA_MUTATIONS_META_TABLE, schemaMutationsMetaTable } from '../schema/system-tables.js';
|
|
5
|
+
import { sql } from '../util.js';
|
|
6
|
+
import { dbExecute, dbSelect } from './common.js';
|
|
7
|
+
import { migrateTable } from './migrations.js';
|
|
8
|
+
export const validateSchema = (schema, schemaManager) => {
|
|
9
|
+
// Validate mutation definitions
|
|
10
|
+
const registeredMutationDefInfos = schemaManager.getMutationDefInfos();
|
|
11
|
+
const missingMutationDefs = registeredMutationDefInfos.filter((registeredMutationDefInfo) => !schema.mutations.has(registeredMutationDefInfo.mutationName));
|
|
12
|
+
if (missingMutationDefs.length > 0) {
|
|
13
|
+
shouldNeverHappen(`Missing mutation definitions: ${missingMutationDefs.map((info) => info.mutationName).join(', ')}`);
|
|
14
|
+
}
|
|
15
|
+
for (const [, mutationDef] of schema.mutations) {
|
|
16
|
+
const registeredMutationDefInfo = registeredMutationDefInfos.find((info) => info.mutationName === mutationDef.name);
|
|
17
|
+
validateMutationDef(mutationDef, schemaManager, registeredMutationDefInfo);
|
|
18
|
+
}
|
|
19
|
+
// Validate table schemas
|
|
20
|
+
};
|
|
21
|
+
export const validateMutationDef = (mutationDef, schemaManager, registeredMutationDefInfo) => {
|
|
22
|
+
const schemaHash = Schema.hash(mutationDef.schema);
|
|
23
|
+
if (registeredMutationDefInfo === undefined) {
|
|
24
|
+
schemaManager.setMutationDefInfo({
|
|
25
|
+
schemaHash,
|
|
26
|
+
mutationName: mutationDef.name,
|
|
27
|
+
});
|
|
28
|
+
return;
|
|
29
|
+
}
|
|
30
|
+
if (schemaHash === registeredMutationDefInfo.schemaHash)
|
|
31
|
+
return;
|
|
32
|
+
// TODO bring back some form of schema compatibility check (see https://github.com/livestorejs/livestore/issues/69)
|
|
33
|
+
// const newSchemaIsCompatibleWithOldSchema = Schema.isSubType(jsonSchemaDefFromMgmtStore, mutationDef.schema)
|
|
34
|
+
// if (!newSchemaIsCompatibleWithOldSchema) {
|
|
35
|
+
// shouldNeverHappen(`Schema for mutation ${mutationDef.name} has changed in an incompatible way`)
|
|
36
|
+
// }
|
|
37
|
+
schemaManager.setMutationDefInfo({
|
|
38
|
+
schemaHash,
|
|
39
|
+
mutationName: mutationDef.name,
|
|
40
|
+
});
|
|
41
|
+
};
|
|
42
|
+
export const makeSchemaManager = (db) => {
|
|
43
|
+
migrateTable({
|
|
44
|
+
db,
|
|
45
|
+
otelContext: otel.context.active(),
|
|
46
|
+
tableAst: schemaMutationsMetaTable.sqliteDef.ast,
|
|
47
|
+
behaviour: 'create-if-not-exists',
|
|
48
|
+
});
|
|
49
|
+
return {
|
|
50
|
+
getMutationDefInfos: () => {
|
|
51
|
+
const schemaMutationsMetaRows = dbSelect(db, sql `SELECT * FROM ${SCHEMA_MUTATIONS_META_TABLE}`);
|
|
52
|
+
return schemaMutationsMetaRows;
|
|
53
|
+
},
|
|
54
|
+
setMutationDefInfo: (info) => {
|
|
55
|
+
dbExecute(db, sql `INSERT OR REPLACE INTO ${SCHEMA_MUTATIONS_META_TABLE} (mutationName, schemaHash, updatedAt) VALUES ($mutationName, $schemaHash, $updatedAt)`, {
|
|
56
|
+
mutationName: info.mutationName,
|
|
57
|
+
schemaHash: info.schemaHash,
|
|
58
|
+
updatedAt: new Date().toISOString(),
|
|
59
|
+
});
|
|
60
|
+
},
|
|
61
|
+
};
|
|
62
|
+
};
|
|
63
|
+
//# sourceMappingURL=validate-mutation-defs.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"validate-mutation-defs.js","sourceRoot":"","sources":["../../src/schema-management/validate-mutation-defs.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ export declare const findManyRows: <TColumns extends SqliteDsl.Columns>({ column
|
|
|
7
7
|
tableName: string;
|
|
8
8
|
columns: TColumns;
|
|
9
9
|
where: ClientTypes.WhereValuesForColumns<TColumns>;
|
|
10
|
-
limit?: number
|
|
10
|
+
limit?: number;
|
|
11
11
|
}) => [string, BindValues];
|
|
12
12
|
export declare const countRows: <TColumns extends SqliteDsl.Columns>({ columns, tableName, where, }: {
|
|
13
13
|
tableName: string;
|
|
@@ -18,7 +18,7 @@ export declare const insertRow: <TColumns extends SqliteDsl.Columns>({ tableName
|
|
|
18
18
|
tableName: string;
|
|
19
19
|
columns: TColumns;
|
|
20
20
|
values: ClientTypes.DecodedValuesForColumns<TColumns>;
|
|
21
|
-
options
|
|
21
|
+
options?: {
|
|
22
22
|
orReplace: boolean;
|
|
23
23
|
};
|
|
24
24
|
}) => [string, BindValues];
|
|
@@ -58,8 +58,8 @@ export declare const createTable: ({ table, tableName, }: {
|
|
|
58
58
|
export declare const makeBindValues: <TColumns extends SqliteDsl.Columns, TKeys extends string>({ columns, values, variablePrefix, skipNil, }: {
|
|
59
59
|
columns: TColumns;
|
|
60
60
|
values: Record<TKeys, any>;
|
|
61
|
-
variablePrefix?: string
|
|
61
|
+
variablePrefix?: string;
|
|
62
62
|
/** So far only used to prepare `where` statements */
|
|
63
|
-
skipNil?: boolean
|
|
63
|
+
skipNil?: boolean;
|
|
64
64
|
}) => Record<string, any>;
|
|
65
65
|
//# sourceMappingURL=sql-queries.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sql-queries.d.ts","sourceRoot":"","sources":["../../src/sql-queries/sql-queries.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"sql-queries.d.ts","sourceRoot":"","sources":["../../src/sql-queries/sql-queries.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { shouldNeverHappen } from '@livestore/utils';
|
|
1
2
|
import { pipe, ReadonlyArray, Schema, TreeFormatter } from '@livestore/utils/effect';
|
|
2
3
|
import { sql } from '../util.js';
|
|
3
4
|
import { objectEntries } from './misc.js';
|
|
@@ -21,7 +22,7 @@ export const insertRow = ({ tableName, columns, values, options = { orReplace: f
|
|
|
21
22
|
.map((_) => `$${_}`)
|
|
22
23
|
.join(', ');
|
|
23
24
|
return [
|
|
24
|
-
sql `INSERT ${options.orReplace ? 'OR REPLACE' : ''}
|
|
25
|
+
sql `INSERT ${options.orReplace ? 'OR REPLACE ' : ''}INTO ${tableName} (${keysStr}) VALUES (${valuesStr})`,
|
|
25
26
|
makeBindValues({ columns, values }),
|
|
26
27
|
];
|
|
27
28
|
};
|
|
@@ -121,7 +122,7 @@ export const makeBindValues = ({ columns, values, variablePrefix = '', skipNil,
|
|
|
121
122
|
return null;
|
|
122
123
|
const res = Schema.encodeEither(columnDef.schema)(value);
|
|
123
124
|
if (res._tag === 'Left') {
|
|
124
|
-
const parseErrorStr = TreeFormatter.
|
|
125
|
+
const parseErrorStr = TreeFormatter.formatErrorSync(res.left);
|
|
125
126
|
const expectedSchemaStr = String(columnDef.schema.ast);
|
|
126
127
|
console.error(`\
|
|
127
128
|
Error making bind values for SQL query for column "${columnName}".
|
|
@@ -143,19 +144,17 @@ Value:`, value);
|
|
|
143
144
|
// NOTE null/undefined values are handled via explicit SQL syntax and don't need to be provided as bind values
|
|
144
145
|
.filter(([, value]) => skipNil !== true || (value !== null && value !== undefined))
|
|
145
146
|
.flatMap(([columnName, value]) => {
|
|
147
|
+
const codec = codecMap[columnName] ?? shouldNeverHappen(`No codec found for column "${columnName}"`);
|
|
146
148
|
// remap complex where-values with `op`
|
|
147
149
|
if (typeof value === 'object' && value !== null && 'op' in value) {
|
|
148
150
|
switch (value.op) {
|
|
149
151
|
case 'in': {
|
|
150
|
-
return value.val.map((value, i) => [
|
|
151
|
-
`${variablePrefix}${columnName}_${i}`,
|
|
152
|
-
codecMap[columnName](value),
|
|
153
|
-
]);
|
|
152
|
+
return value.val.map((value, i) => [`${variablePrefix}${columnName}_${i}`, codec(value)]);
|
|
154
153
|
}
|
|
155
154
|
case '=':
|
|
156
155
|
case '>':
|
|
157
156
|
case '<': {
|
|
158
|
-
return [[`${variablePrefix}${columnName}`,
|
|
157
|
+
return [[`${variablePrefix}${columnName}`, codec(value.val)]];
|
|
159
158
|
}
|
|
160
159
|
default: {
|
|
161
160
|
throw new Error(`Unknown op: ${value.op}`);
|
|
@@ -163,7 +162,7 @@ Value:`, value);
|
|
|
163
162
|
}
|
|
164
163
|
}
|
|
165
164
|
else {
|
|
166
|
-
return [[`${variablePrefix}${columnName}`,
|
|
165
|
+
return [[`${variablePrefix}${columnName}`, codec(value)]];
|
|
167
166
|
}
|
|
168
167
|
}), Object.fromEntries);
|
|
169
168
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sql-queries.js","sourceRoot":"","sources":["../../src/sql-queries/sql-queries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAA;AAGpF,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAA;AAChC,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAA;AACzC,OAAO,KAAK,WAAW,MAAM,YAAY,CAAA;AAMzC,MAAM,CAAC,MAAM,YAAY,GAAG,CAAqC,EAC/D,OAAO,EACP,SAAS,EACT,KAAK,EACL,KAAK,GAMN,EAAwB,EAAE;IACzB,MAAM,QAAQ,GAAG,aAAa,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;IACzC,MAAM,aAAa,GAAG,QAAQ,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,QAAQ,EAAE,CAAA;IAChE,MAAM,aAAa,GAAG,KAAK,CAAC,CAAC,CAAC,SAAS,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;IAEnD,MAAM,eAAe,GAAG,cAAc,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,cAAc,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAA;IAE3G,OAAO,CAAC,GAAG,CAAA,iBAAiB,SAAS,IAAI,aAAa,IAAI,aAAa,EAAE,EAAE,eAAe,CAAC,CAAA;AAC7F,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,SAAS,GAAG,CAAqC,EAC5D,OAAO,EACP,SAAS,EACT,KAAK,GAKN,EAAwB,EAAE;IACzB,MAAM,QAAQ,GAAG,aAAa,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;IACzC,MAAM,aAAa,GAAG,QAAQ,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,QAAQ,EAAE,CAAA;IAEhE,MAAM,eAAe,GAAG,cAAc,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,cAAc,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAA;IAE3G,OAAO,CAAC,GAAG,CAAA,wBAAwB,SAAS,IAAI,aAAa,EAAE,EAAE,eAAe,CAAC,CAAA;AACnF,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,SAAS,GAAG,CAAqC,EAC5D,SAAS,EACT,OAAO,EACP,MAAM,EACN,OAAO,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,GAM/B,EAAwB,EAAE;IACzB,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAC9C,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC;SAClC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;SACnB,IAAI,CAAC,IAAI,CAAC,CAAA;IAEb,OAAO;QACL,GAAG,CAAA,UAAU,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"sql-queries.js","sourceRoot":"","sources":["../../src/sql-queries/sql-queries.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ export declare const makeSqlQueryBuilder: <TSchema extends SqliteDsl.DbSchema>(s
|
|
|
6
6
|
findManyRows: <TTableName extends keyof TSchema & string>({ tableName, where, limit, }: {
|
|
7
7
|
tableName: TTableName;
|
|
8
8
|
where: ClientTypes.WhereValuesForTable<TSchema, TTableName>;
|
|
9
|
-
limit?: number
|
|
9
|
+
limit?: number;
|
|
10
10
|
}) => [string, BindValues, TTableName];
|
|
11
11
|
countRows: <TTableName_1 extends keyof TSchema & string>({ tableName, where, }: {
|
|
12
12
|
tableName: TTableName_1;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sql-query-builder.d.ts","sourceRoot":"","sources":["../../src/sql-queries/sql-query-builder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAEjD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAElD,OAAO,KAAK,KAAK,WAAW,MAAM,YAAY,CAAA;AAE9C,MAAM,MAAM,QAAQ,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,CAAC,CAAA;AAEhF,eAAO,MAAM,mBAAmB,+CAAgD,OAAO
|
|
1
|
+
{"version":3,"file":"sql-query-builder.d.ts","sourceRoot":"","sources":["../../src/sql-queries/sql-query-builder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAEjD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAElD,OAAO,KAAK,KAAK,WAAW,MAAM,YAAY,CAAA;AAE9C,MAAM,MAAM,QAAQ,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,CAAC,CAAA;AAEhF,eAAO,MAAM,mBAAmB,+CAAgD,OAAO;4FAKlF;QACD,SAAS,EAAE,UAAU,CAAA;QACrB,KAAK,EAAE,YAAY,mBAAmB,CAAC,OAAO,EAAE,UAAU,CAAC,CAAA;QAC3D,KAAK,CAAC,EAAE,MAAM,CAAA;KACf,KAAG,CAAC,MAAM,EAAE,UAAU,EAAE,UAAU,CAAC;;;;;;;;;uBAyBX,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;CA4FjC,CAAA"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/sync/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAA"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/sync/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAA"}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import { type Effect, Schema, type Stream, type SubscriptionRef } from '@livestore/utils/effect';
|
|
2
|
+
import type { MutationEvent } from '../schema/mutations.js';
|
|
3
|
+
export type SyncImpl = {
|
|
4
|
+
pull: (cursor: string | undefined) => Stream.Stream<MutationEvent.AnyEncoded, IsOfflineError | InvalidPullError>;
|
|
5
|
+
push: (mutationEvent: MutationEvent.AnyEncoded) => Effect.Effect<void, IsOfflineError | InvalidPushError>;
|
|
6
|
+
pushes: Stream.Stream<MutationEvent.AnyEncoded>;
|
|
7
|
+
isConnected: SubscriptionRef.SubscriptionRef<boolean>;
|
|
8
|
+
};
|
|
9
|
+
declare const IsOfflineError_base: Schema.TaggedErrorClass<IsOfflineError, "IsOfflineError", {
|
|
10
|
+
readonly _tag: Schema.PropertySignature<":", "IsOfflineError", never, ":", "IsOfflineError", true, never>;
|
|
11
|
+
}>;
|
|
12
|
+
export declare class IsOfflineError extends IsOfflineError_base {
|
|
13
|
+
}
|
|
14
|
+
declare const InvalidPushError_base: Schema.TaggedErrorClass<InvalidPushError, "InvalidPushError", {
|
|
15
|
+
readonly _tag: Schema.PropertySignature<":", "InvalidPushError", never, ":", "InvalidPushError", true, never>;
|
|
16
|
+
}>;
|
|
17
|
+
export declare class InvalidPushError extends InvalidPushError_base {
|
|
18
|
+
}
|
|
19
|
+
declare const InvalidPullError_base: Schema.TaggedErrorClass<InvalidPullError, "InvalidPullError", {
|
|
20
|
+
readonly _tag: Schema.PropertySignature<":", "InvalidPullError", never, ":", "InvalidPullError", true, never>;
|
|
21
|
+
}>;
|
|
22
|
+
export declare class InvalidPullError extends InvalidPullError_base {
|
|
23
|
+
}
|
|
24
|
+
export {};
|
|
25
|
+
//# sourceMappingURL=sync.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../src/sync/sync.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,EAAE,KAAK,MAAM,EAAE,KAAK,eAAe,EAAE,MAAM,yBAAyB,CAAA;AAEhG,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAA;AAE3D,MAAM,MAAM,QAAQ,GAAG;IACrB,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,KAAK,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,UAAU,EAAE,cAAc,GAAG,gBAAgB,CAAC,CAAA;IAChH,IAAI,EAAE,CAAC,aAAa,EAAE,aAAa,CAAC,UAAU,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,cAAc,GAAG,gBAAgB,CAAC,CAAA;IACzG,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,UAAU,CAAC,CAAA;IAC/C,WAAW,EAAE,eAAe,CAAC,eAAe,CAAC,OAAO,CAAC,CAAA;CACtD,CAAA;;;;AAED,qBAAa,cAAe,SAAQ,mBAA0D;CAAG;;;;AACjG,qBAAa,gBAAiB,SAAQ,qBAA8D;CAAG;;;;AACvG,qBAAa,gBAAiB,SAAQ,qBAA8D;CAAG"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { Schema } from '@livestore/utils/effect';
|
|
2
|
+
export class IsOfflineError extends Schema.TaggedError()('IsOfflineError', {}) {
|
|
3
|
+
}
|
|
4
|
+
export class InvalidPushError extends Schema.TaggedError()('InvalidPushError', {}) {
|
|
5
|
+
}
|
|
6
|
+
export class InvalidPullError extends Schema.TaggedError()('InvalidPullError', {}) {
|
|
7
|
+
}
|
|
8
|
+
//# sourceMappingURL=sync.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sync.js","sourceRoot":"","sources":["../../src/sync/sync.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,MAAM,EAAqC,MAAM,yBAAyB,CAAA;AAWhG,MAAM,OAAO,cAAe,SAAQ,MAAM,CAAC,WAAW,EAAkB,CAAC,gBAAgB,EAAE,EAAE,CAAC;CAAG;AACjG,MAAM,OAAO,gBAAiB,SAAQ,MAAM,CAAC,WAAW,EAAoB,CAAC,kBAAkB,EAAE,EAAE,CAAC;CAAG;AACvG,MAAM,OAAO,gBAAiB,SAAQ,MAAM,CAAC,WAAW,EAAoB,CAAC,kBAAkB,EAAE,EAAE,CAAC;CAAG"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@livestore/common",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.48-dev.0",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": {
|
|
6
6
|
".": {
|
|
@@ -28,17 +28,17 @@
|
|
|
28
28
|
}
|
|
29
29
|
},
|
|
30
30
|
"dependencies": {
|
|
31
|
-
"@opentelemetry/api": "^1.
|
|
32
|
-
"
|
|
33
|
-
"
|
|
31
|
+
"@opentelemetry/api": "^1.9.0",
|
|
32
|
+
"@livestore/utils": "0.0.48-dev.0",
|
|
33
|
+
"effect-db-schema": "0.0.48-dev.0"
|
|
34
34
|
},
|
|
35
35
|
"devDependencies": {
|
|
36
|
-
"
|
|
36
|
+
"vitest": "^1.6.0"
|
|
37
37
|
},
|
|
38
38
|
"publishConfig": {
|
|
39
39
|
"access": "public"
|
|
40
40
|
},
|
|
41
41
|
"scripts": {
|
|
42
|
-
"test": "
|
|
42
|
+
"test": "vitest"
|
|
43
43
|
}
|
|
44
44
|
}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
import { Schema } from '@livestore/utils/effect'
|
|
2
|
+
|
|
3
|
+
import { DbSchema } from '../schema/index.js'
|
|
4
|
+
|
|
5
|
+
export const todos = DbSchema.table(
|
|
6
|
+
'todos',
|
|
7
|
+
{
|
|
8
|
+
id: DbSchema.text({ primaryKey: true }),
|
|
9
|
+
text: DbSchema.text({ default: '', nullable: false }),
|
|
10
|
+
completed: DbSchema.boolean({ default: false, nullable: false }),
|
|
11
|
+
},
|
|
12
|
+
{ deriveMutations: true },
|
|
13
|
+
)
|
|
14
|
+
|
|
15
|
+
const Config = Schema.Struct({
|
|
16
|
+
fontSize: Schema.Number,
|
|
17
|
+
theme: Schema.Literal('light', 'dark'),
|
|
18
|
+
})
|
|
19
|
+
|
|
20
|
+
export const appConfig = DbSchema.table('app_config', DbSchema.json({ schema: Config, nullable: true }), {
|
|
21
|
+
isSingleton: true,
|
|
22
|
+
deriveMutations: true,
|
|
23
|
+
})
|
|
@@ -0,0 +1,104 @@
|
|
|
1
|
+
import type { Stream, SubscriptionRef, TRef } from '@livestore/utils/effect'
|
|
2
|
+
import type * as otel from '@opentelemetry/api'
|
|
3
|
+
|
|
4
|
+
import type { LiveStoreSchema, MutationEvent } from './schema/index.js'
|
|
5
|
+
import type { PreparedBindValues } from './util.js'
|
|
6
|
+
|
|
7
|
+
export interface PreparedStatement {
|
|
8
|
+
execute(bindValues: PreparedBindValues | undefined): GetRowsChangedCount
|
|
9
|
+
select<T>(bindValues: PreparedBindValues | undefined): ReadonlyArray<T>
|
|
10
|
+
finalize(): void
|
|
11
|
+
}
|
|
12
|
+
|
|
13
|
+
export type StoreAdapter = {
|
|
14
|
+
/** Main thread database (usually in-memory) */
|
|
15
|
+
mainDb: InMemoryDatabase
|
|
16
|
+
/** The coordinator is responsible for persisting the database, syncing etc */
|
|
17
|
+
coordinator: Coordinator
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
export type InMemoryDatabase = {
|
|
21
|
+
_tag: 'InMemoryDatabase'
|
|
22
|
+
prepare(queryStr: string): PreparedStatement
|
|
23
|
+
execute(queryStr: string, bindValues: PreparedBindValues | undefined): GetRowsChangedCount
|
|
24
|
+
dangerouslyReset(): Promise<void>
|
|
25
|
+
export(): Uint8Array
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
export type ResetMode = 'all-data' | 'only-app-db'
|
|
29
|
+
|
|
30
|
+
export type NetworkStatus = {
|
|
31
|
+
isConnected: boolean
|
|
32
|
+
timestampMs: number
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
export type Coordinator = {
|
|
36
|
+
hasLock: TRef.TRef<boolean>
|
|
37
|
+
syncMutations: Stream.Stream<MutationEvent.AnyEncoded>
|
|
38
|
+
execute(queryStr: string, bindValues: PreparedBindValues | undefined, span: otel.Span | undefined): Promise<void>
|
|
39
|
+
mutate(mutationEventEncoded: MutationEvent.Any, span: otel.Span): Promise<void>
|
|
40
|
+
dangerouslyReset(mode: ResetMode): Promise<void>
|
|
41
|
+
export(span: otel.Span | undefined): Promise<Uint8Array | undefined>
|
|
42
|
+
/**
|
|
43
|
+
* This is different from `export` since in `getInitialSnapshot` is usually the place for migrations etc to happen
|
|
44
|
+
*/
|
|
45
|
+
getInitialSnapshot(): Promise<Uint8Array>
|
|
46
|
+
getMutationLogData(): Promise<Uint8Array>
|
|
47
|
+
shutdown(): Promise<void>
|
|
48
|
+
networkStatus: SubscriptionRef.SubscriptionRef<NetworkStatus>
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
export type GetRowsChangedCount = () => number
|
|
52
|
+
|
|
53
|
+
export type BootDb = {
|
|
54
|
+
_tag: 'BootDb'
|
|
55
|
+
execute(queryStr: string, bindValues?: PreparedBindValues): void
|
|
56
|
+
mutate: <const TMutationArg extends ReadonlyArray<MutationEvent.Any>>(...list: TMutationArg) => void
|
|
57
|
+
select<T>(queryStr: string, bindValues?: PreparedBindValues): ReadonlyArray<T>
|
|
58
|
+
txn(callback: () => void): void
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
// TODO possibly allow a combination of these options
|
|
62
|
+
// TODO allow a way to stream the migration progress back to the app
|
|
63
|
+
export type MigrationOptions<TSchema extends LiveStoreSchema = LiveStoreSchema> =
|
|
64
|
+
| MigrationOptionsFromMutationLog<TSchema>
|
|
65
|
+
| {
|
|
66
|
+
strategy: 'hard-reset'
|
|
67
|
+
hooks?: Partial<MigrationHooks>
|
|
68
|
+
}
|
|
69
|
+
| {
|
|
70
|
+
strategy: 'manual'
|
|
71
|
+
migrate: (oldDb: Uint8Array) => Promise<Uint8Array> | Uint8Array
|
|
72
|
+
hooks?: Partial<MigrationHooks>
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
export type MigrationHooks = {
|
|
76
|
+
/** Runs on the empty in-memory database with no database schemas applied yet */
|
|
77
|
+
init: MigrationHook
|
|
78
|
+
/** Runs before applying the migration strategy but after table schemas have been applied and singleton rows have been created */
|
|
79
|
+
pre: MigrationHook
|
|
80
|
+
/** Runs after applying the migration strategy before creating export snapshot and closing the database */
|
|
81
|
+
post: MigrationHook
|
|
82
|
+
}
|
|
83
|
+
|
|
84
|
+
export type MigrationHook = (db: InMemoryDatabase) => void | Promise<void>
|
|
85
|
+
|
|
86
|
+
export type MigrationOptionsFromMutationLog<TSchema extends LiveStoreSchema = LiveStoreSchema> = {
|
|
87
|
+
strategy: 'from-mutation-log'
|
|
88
|
+
/**
|
|
89
|
+
* Mutations to exclude in the mutation log
|
|
90
|
+
*
|
|
91
|
+
* @default new Set(['livestore.RawSql'])
|
|
92
|
+
*/
|
|
93
|
+
excludeMutations?: ReadonlySet<keyof TSchema['_MutationDefMapType'] & string>
|
|
94
|
+
hooks?: Partial<MigrationHooks>
|
|
95
|
+
logging?: {
|
|
96
|
+
excludeAffectedRows?: (sqlStmt: string) => boolean
|
|
97
|
+
}
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
export type StoreAdapterFactory = (opts: {
|
|
101
|
+
otelTracer: otel.Tracer
|
|
102
|
+
otelContext: otel.Context
|
|
103
|
+
schema: LiveStoreSchema
|
|
104
|
+
}) => StoreAdapter | Promise<StoreAdapter>
|
package/src/ambient.d.ts
ADDED