@livestore/common 0.4.0-dev.15 → 0.4.0-dev.17
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/devtools/devtools-messages-client-session.d.ts +21 -21
- package/dist/devtools/devtools-messages-common.d.ts +6 -6
- package/dist/devtools/devtools-messages-leader.d.ts +24 -24
- package/dist/devtools/devtools-sessioninfo.d.ts +2 -2
- package/dist/devtools/devtools-sessioninfo.d.ts.map +1 -1
- package/dist/devtools/devtools-sessioninfo.js +1 -4
- package/dist/devtools/devtools-sessioninfo.js.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/leader-thread/leader-worker-devtools.js +22 -38
- package/dist/leader-thread/leader-worker-devtools.js.map +1 -1
- package/dist/logging.d.ts +40 -0
- package/dist/logging.d.ts.map +1 -0
- package/dist/logging.js +33 -0
- package/dist/logging.js.map +1 -0
- package/dist/schema/state/sqlite/column-annotations.test.js +1 -1
- package/dist/schema/state/sqlite/column-annotations.test.js.map +1 -1
- package/dist/schema/state/sqlite/column-def.test.js +24 -6
- package/dist/schema/state/sqlite/column-def.test.js.map +1 -1
- package/dist/schema/state/sqlite/column-spec.js +8 -4
- package/dist/schema/state/sqlite/column-spec.js.map +1 -1
- package/dist/schema/state/sqlite/column-spec.test.js +10 -0
- package/dist/schema/state/sqlite/column-spec.test.js.map +1 -1
- package/dist/schema/state/sqlite/db-schema/dsl/field-defs.d.ts +14 -8
- package/dist/schema/state/sqlite/db-schema/dsl/field-defs.d.ts.map +1 -1
- package/dist/schema/state/sqlite/db-schema/dsl/field-defs.js +5 -3
- package/dist/schema/state/sqlite/db-schema/dsl/field-defs.js.map +1 -1
- package/dist/schema/state/sqlite/schema-helpers.d.ts +2 -2
- package/dist/schema/state/sqlite/schema-helpers.d.ts.map +1 -1
- package/dist/schema/state/sqlite/schema-helpers.js +22 -12
- package/dist/schema/state/sqlite/schema-helpers.js.map +1 -1
- package/dist/schema/state/sqlite/schema-helpers.test.d.ts +2 -0
- package/dist/schema/state/sqlite/schema-helpers.test.d.ts.map +1 -0
- package/dist/schema/state/sqlite/schema-helpers.test.js +36 -0
- package/dist/schema/state/sqlite/schema-helpers.test.js.map +1 -0
- package/dist/sql-queries/sql-queries.d.ts.map +1 -1
- package/dist/sql-queries/sql-queries.js +11 -1
- package/dist/sql-queries/sql-queries.js.map +1 -1
- package/dist/version.d.ts +1 -1
- package/dist/version.js +1 -1
- package/package.json +4 -4
- package/src/devtools/devtools-sessioninfo.ts +2 -5
- package/src/index.ts +1 -0
- package/src/leader-thread/leader-worker-devtools.ts +42 -50
- package/src/logging.ts +62 -0
- package/src/schema/state/sqlite/column-annotations.test.ts +1 -1
- package/src/schema/state/sqlite/column-def.test.ts +29 -6
- package/src/schema/state/sqlite/column-spec.test.ts +16 -0
- package/src/schema/state/sqlite/column-spec.ts +8 -3
- package/src/schema/state/sqlite/db-schema/dsl/field-defs.ts +29 -12
- package/src/schema/state/sqlite/schema-helpers.test.ts +44 -0
- package/src/schema/state/sqlite/schema-helpers.ts +28 -20
- package/src/sql-queries/sql-queries.ts +9 -1
- package/src/version.ts +1 -1
- package/dist/schema/state/sqlite/system-tables.d.ts +0 -976
- package/dist/schema/state/sqlite/system-tables.d.ts.map +0 -1
- package/dist/schema/state/sqlite/system-tables.js +0 -81
- package/dist/schema/state/sqlite/system-tables.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"field-defs.js","sourceRoot":"","sources":["../../../../../../src/schema/state/sqlite/db-schema/dsl/field-defs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;AAC/C,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;
|
|
1
|
+
{"version":3,"file":"field-defs.js","sourceRoot":"","sources":["../../../../../../src/schema/state/sqlite/db-schema/dsl/field-defs.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
export declare const getDefaultValuesEncoded: <TTableDef extends
|
|
1
|
+
import type { TableDefBase } from './table-def.ts';
|
|
2
|
+
export declare const getDefaultValuesEncoded: <TTableDef extends TableDefBase>(tableDef: TTableDef, fallbackValues?: Record<string, any>) => Record<string, any>;
|
|
3
3
|
export declare const getDefaultValuesDecoded: <TTableDef extends TableDefBase>(tableDef: TTableDef, fallbackValues?: Record<string, any>) => Record<string, any>;
|
|
4
4
|
//# sourceMappingURL=schema-helpers.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema-helpers.d.ts","sourceRoot":"","sources":["../../../../src/schema/state/sqlite/schema-helpers.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"schema-helpers.d.ts","sourceRoot":"","sources":["../../../../src/schema/state/sqlite/schema-helpers.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAElD,eAAO,MAAM,uBAAuB,GAAI,SAAS,SAAS,YAAY,EACpE,UAAU,SAAS,EACnB,iBAAiB,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,wBAsBnC,CAAA;AAEH,eAAO,MAAM,uBAAuB,GAAI,SAAS,SAAS,YAAY,EACpE,UAAU,SAAS,EACnB,iBAAiB,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,wBAsBnC,CAAA"}
|
|
@@ -7,24 +7,34 @@ export const getDefaultValuesEncoded = (tableDef, fallbackValues) => pipe(tableD
|
|
|
7
7
|
if (key === 'id')
|
|
8
8
|
return false;
|
|
9
9
|
return col.default._tag === 'None' || SqliteDsl.isSqlDefaultValue(col.default.value) === false;
|
|
10
|
-
}), ReadonlyRecord.map((column, columnName) =>
|
|
11
|
-
|
|
12
|
-
|
|
10
|
+
}), ReadonlyRecord.map((column, columnName) => {
|
|
11
|
+
if (fallbackValues?.[columnName] !== undefined)
|
|
12
|
+
return fallbackValues[columnName];
|
|
13
|
+
if (column.default._tag === 'None') {
|
|
14
|
+
return column.nullable === true
|
|
13
15
|
? null
|
|
14
|
-
: shouldNeverHappen(`Column ${columnName} has no default value and is not nullable`)
|
|
15
|
-
|
|
16
|
-
|
|
16
|
+
: shouldNeverHappen(`Column ${columnName} has no default value and is not nullable`);
|
|
17
|
+
}
|
|
18
|
+
const defaultValue = column.default.value;
|
|
19
|
+
const resolvedDefault = SqliteDsl.resolveColumnDefault(defaultValue);
|
|
20
|
+
return Schema.encodeSync(column.schema)(resolvedDefault);
|
|
21
|
+
}));
|
|
17
22
|
export const getDefaultValuesDecoded = (tableDef, fallbackValues) => pipe(tableDef.sqliteDef.columns, ReadonlyRecord.filter((col, key) => {
|
|
18
23
|
if (fallbackValues?.[key] !== undefined)
|
|
19
24
|
return true;
|
|
20
25
|
if (key === 'id')
|
|
21
26
|
return false;
|
|
22
27
|
return col.default._tag === 'None' || SqliteDsl.isSqlDefaultValue(col.default.value) === false;
|
|
23
|
-
}), ReadonlyRecord.map((column, columnName) =>
|
|
24
|
-
|
|
25
|
-
|
|
28
|
+
}), ReadonlyRecord.map((column, columnName) => {
|
|
29
|
+
if (fallbackValues?.[columnName] !== undefined)
|
|
30
|
+
return fallbackValues[columnName];
|
|
31
|
+
if (column.default._tag === 'None') {
|
|
32
|
+
return column.nullable === true
|
|
26
33
|
? null
|
|
27
|
-
: shouldNeverHappen(`Column ${columnName} has no default value and is not nullable`)
|
|
28
|
-
|
|
29
|
-
|
|
34
|
+
: shouldNeverHappen(`Column ${columnName} has no default value and is not nullable`);
|
|
35
|
+
}
|
|
36
|
+
const defaultValue = column.default.value;
|
|
37
|
+
const resolvedDefault = SqliteDsl.resolveColumnDefault(defaultValue);
|
|
38
|
+
return Schema.validateSync(column.schema)(resolvedDefault);
|
|
39
|
+
}));
|
|
30
40
|
//# sourceMappingURL=schema-helpers.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema-helpers.js","sourceRoot":"","sources":["../../../../src/schema/state/sqlite/schema-helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AACpD,OAAO,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAEtE,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAG9C,MAAM,CAAC,MAAM,uBAAuB,GAAG,CACrC,QAAmB,EACnB,cAAoC,EACpC,EAAE,CACF,IAAI,CACF,QAAQ,CAAC,SAAS,CAAC,OAAO,EAC1B,cAAc,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;IACjC,IAAI,cAAc,EAAE,CAAC,GAAG,CAAC,KAAK,SAAS;QAAE,OAAO,IAAI,CAAA;IACpD,IAAI,GAAG,KAAK,IAAI;QAAE,OAAO,KAAK,CAAA;IAC9B,OAAO,GAAI,CAAC,OAAO,CAAC,IAAI,KAAK,MAAM,IAAI,SAAS,CAAC,iBAAiB,CAAC,GAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,KAAK,CAAA;AAClG,CAAC,CAAC,EACF,cAAc,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,UAAU,EAAE,EAAE,
|
|
1
|
+
{"version":3,"file":"schema-helpers.js","sourceRoot":"","sources":["../../../../src/schema/state/sqlite/schema-helpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"schema-helpers.test.d.ts","sourceRoot":"","sources":["../../../../src/schema/state/sqlite/schema-helpers.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
import { describe, expect, it } from 'vitest';
|
|
2
|
+
import * as State from "../mod.js";
|
|
3
|
+
import { getDefaultValuesDecoded, getDefaultValuesEncoded } from "./schema-helpers.js";
|
|
4
|
+
describe('schema-helpers', () => {
|
|
5
|
+
it('resolves thunk defaults when decoding values', () => {
|
|
6
|
+
let counter = 0;
|
|
7
|
+
const table = State.SQLite.table({
|
|
8
|
+
name: 'sessions',
|
|
9
|
+
columns: {
|
|
10
|
+
id: State.SQLite.text({ primaryKey: true }),
|
|
11
|
+
token: State.SQLite.text({ default: () => `token-${++counter}` }),
|
|
12
|
+
},
|
|
13
|
+
});
|
|
14
|
+
expect(counter).toBe(0);
|
|
15
|
+
const firstDefaults = getDefaultValuesDecoded(table);
|
|
16
|
+
const secondDefaults = getDefaultValuesDecoded(table);
|
|
17
|
+
expect(firstDefaults.token).toBe('token-1');
|
|
18
|
+
expect(secondDefaults.token).toBe('token-2');
|
|
19
|
+
});
|
|
20
|
+
it('resolves thunk defaults when encoding values', () => {
|
|
21
|
+
let counter = 0;
|
|
22
|
+
const table = State.SQLite.table({
|
|
23
|
+
name: 'sessions_encoded',
|
|
24
|
+
columns: {
|
|
25
|
+
id: State.SQLite.text({ primaryKey: true }),
|
|
26
|
+
token: State.SQLite.text({ default: () => `encoded-${++counter}` }),
|
|
27
|
+
},
|
|
28
|
+
});
|
|
29
|
+
expect(counter).toBe(0);
|
|
30
|
+
const firstDefaults = getDefaultValuesEncoded(table);
|
|
31
|
+
const secondDefaults = getDefaultValuesEncoded(table);
|
|
32
|
+
expect(firstDefaults.token).toBe('encoded-1');
|
|
33
|
+
expect(secondDefaults.token).toBe('encoded-2');
|
|
34
|
+
});
|
|
35
|
+
});
|
|
36
|
+
//# sourceMappingURL=schema-helpers.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"schema-helpers.test.js","sourceRoot":"","sources":["../../../../src/schema/state/sqlite/schema-helpers.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAA;AAE7C,OAAO,KAAK,KAAK,MAAM,WAAW,CAAA;AAClC,OAAO,EAAE,uBAAuB,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAA;AAEtF,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;IAC9B,EAAE,CAAC,8CAA8C,EAAE,GAAG,EAAE;QACtD,IAAI,OAAO,GAAG,CAAC,CAAA;QACf,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC;YAC/B,IAAI,EAAE,UAAU;YAChB,OAAO,EAAE;gBACP,EAAE,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;gBAC3C,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,SAAS,EAAE,OAAO,EAAE,EAAE,CAAC;aAClE;SACF,CAAC,CAAA;QAEF,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QAEvB,MAAM,aAAa,GAAG,uBAAuB,CAAC,KAAK,CAAC,CAAA;QACpD,MAAM,cAAc,GAAG,uBAAuB,CAAC,KAAK,CAAC,CAAA;QAErD,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;QAC3C,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;IAC9C,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,8CAA8C,EAAE,GAAG,EAAE;QACtD,IAAI,OAAO,GAAG,CAAC,CAAA;QACf,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC;YAC/B,IAAI,EAAE,kBAAkB;YACxB,OAAO,EAAE;gBACP,EAAE,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;gBAC3C,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,WAAW,EAAE,OAAO,EAAE,EAAE,CAAC;aACpE;SACF,CAAC,CAAA;QAEF,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QAEvB,MAAM,aAAa,GAAG,uBAAuB,CAAC,KAAK,CAAC,CAAA;QACpD,MAAM,cAAc,GAAG,uBAAuB,CAAC,KAAK,CAAC,CAAA;QAErD,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;QAC7C,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;IAChD,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sql-queries.d.ts","sourceRoot":"","sources":["../../src/sql-queries/sql-queries.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"sql-queries.d.ts","sourceRoot":"","sources":["../../src/sql-queries/sql-queries.ts"],"names":[],"mappings":"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"}
|
|
@@ -111,7 +111,17 @@ export const createTable = ({ table, tableName, }) => {
|
|
|
111
111
|
.map(([columnName, _]) => columnName);
|
|
112
112
|
const columnDefStrs = Object.entries(table.columns).map(([columnName, columnDef]) => {
|
|
113
113
|
const nullModifier = columnDef.nullable === true ? '' : 'NOT NULL';
|
|
114
|
-
const defaultModifier =
|
|
114
|
+
const defaultModifier = (() => {
|
|
115
|
+
if (columnDef.default._tag === 'None')
|
|
116
|
+
return '';
|
|
117
|
+
const defaultValue = columnDef.default.value;
|
|
118
|
+
if (typeof defaultValue === 'function')
|
|
119
|
+
return '';
|
|
120
|
+
if (defaultValue && typeof defaultValue === 'object' && 'sql' in defaultValue) {
|
|
121
|
+
return `DEFAULT ${defaultValue.sql}`;
|
|
122
|
+
}
|
|
123
|
+
return `DEFAULT ${defaultValue}`;
|
|
124
|
+
})();
|
|
115
125
|
return sql `${columnName} ${columnDef.columnType} ${nullModifier} ${defaultModifier}`;
|
|
116
126
|
});
|
|
117
127
|
if (primaryKeys.length > 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sql-queries.js","sourceRoot":"","sources":["../../src/sql-queries/sql-queries.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"sql-queries.js","sourceRoot":"","sources":["../../src/sql-queries/sql-queries.ts"],"names":[],"mappings":"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"}
|
package/dist/version.d.ts
CHANGED
package/dist/version.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
// TODO bring back when Expo and Playwright supports `with` imports
|
|
2
2
|
// import packageJson from '../package.json' with { type: 'json' }
|
|
3
3
|
// export const liveStoreVersion = packageJson.version
|
|
4
|
-
export const liveStoreVersion = '0.4.0-dev.
|
|
4
|
+
export const liveStoreVersion = '0.4.0-dev.17';
|
|
5
5
|
/**
|
|
6
6
|
* CRITICAL: Increment this version whenever you modify client-side EVENTLOG table schemas.
|
|
7
7
|
*
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@livestore/common",
|
|
3
|
-
"version": "0.4.0-dev.
|
|
3
|
+
"version": "0.4.0-dev.17",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"sideEffects": false,
|
|
6
6
|
"exports": {
|
|
@@ -15,12 +15,12 @@
|
|
|
15
15
|
},
|
|
16
16
|
"dependencies": {
|
|
17
17
|
"@opentelemetry/api": "1.9.0",
|
|
18
|
-
"@livestore/
|
|
19
|
-
"@livestore/
|
|
18
|
+
"@livestore/webmesh": "0.4.0-dev.17",
|
|
19
|
+
"@livestore/utils": "0.4.0-dev.17"
|
|
20
20
|
},
|
|
21
21
|
"devDependencies": {
|
|
22
22
|
"vitest": "3.2.4",
|
|
23
|
-
"@livestore/utils-dev": "0.4.0-dev.
|
|
23
|
+
"@livestore/utils-dev": "0.4.0-dev.17"
|
|
24
24
|
},
|
|
25
25
|
"files": [
|
|
26
26
|
"package.json",
|
|
@@ -61,7 +61,7 @@ export const requestSessionInfoSubscription = ({
|
|
|
61
61
|
webChannel: WebChannel.WebChannel<Message, Message>
|
|
62
62
|
pollInterval?: Duration.DurationInput
|
|
63
63
|
staleTimeout?: Duration.DurationInput
|
|
64
|
-
}): Effect.Effect<Subscribable.Subscribable<
|
|
64
|
+
}): Effect.Effect<Subscribable.Subscribable<HashSet.HashSet<SessionInfo>>, ParseResult.ParseError, Scope.Scope> =>
|
|
65
65
|
Effect.gen(function* () {
|
|
66
66
|
yield* webChannel
|
|
67
67
|
.send(RequestSessions.make({}))
|
|
@@ -100,8 +100,5 @@ export const requestSessionInfoSubscription = ({
|
|
|
100
100
|
Effect.forkScoped,
|
|
101
101
|
)
|
|
102
102
|
|
|
103
|
-
return Subscribable.make({
|
|
104
|
-
get: sessionInfoSubRef.get.pipe(Effect.map((sessionInfos) => new Set(sessionInfos))),
|
|
105
|
-
changes: sessionInfoSubRef.changes.pipe(Stream.map((sessionInfos) => new Set(sessionInfos))),
|
|
106
|
-
})
|
|
103
|
+
return Subscribable.make({ get: sessionInfoSubRef.get, changes: sessionInfoSubRef.changes })
|
|
107
104
|
})
|
package/src/index.ts
CHANGED
|
@@ -2,6 +2,7 @@ export * from './adapter-types.ts'
|
|
|
2
2
|
export * from './bounded-collections.ts'
|
|
3
3
|
export * from './debug-info.ts'
|
|
4
4
|
export * as Devtools from './devtools/mod.ts'
|
|
5
|
+
export * as LogConfig from './logging.ts'
|
|
5
6
|
export * from './make-client-session.ts'
|
|
6
7
|
export * from './materializer-helper.ts'
|
|
7
8
|
export * from './otel.ts'
|
|
@@ -135,72 +135,64 @@ const listenToDevtools = ({
|
|
|
135
135
|
case 'LSD.Leader.LoadDatabaseFile.Request': {
|
|
136
136
|
const { data } = decodedEvent
|
|
137
137
|
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
tmpDb.close()
|
|
150
|
-
} catch (cause) {
|
|
151
|
-
yield* Effect.logError(`Error importing database file`, cause)
|
|
152
|
-
yield* sendMessage(
|
|
153
|
-
Devtools.Leader.LoadDatabaseFile.Error.make({
|
|
154
|
-
...reqPayload,
|
|
155
|
-
cause: { _tag: 'unexpected-error', cause },
|
|
156
|
-
}),
|
|
138
|
+
const handleLoadDb = Effect.gen(function* () {
|
|
139
|
+
const tableNames = yield* Effect.acquireRelease(makeSqliteDb({ _tag: 'in-memory' }), (db) =>
|
|
140
|
+
Effect.sync(() => db.close()),
|
|
141
|
+
).pipe(
|
|
142
|
+
Effect.flatMap((db) =>
|
|
143
|
+
Effect.try(() => {
|
|
144
|
+
db.import(data)
|
|
145
|
+
const rows = db.select<{ name: string }>(`select name from sqlite_master where type = 'table'`)
|
|
146
|
+
return new Set(rows.map((r) => r.name))
|
|
147
|
+
}),
|
|
148
|
+
),
|
|
157
149
|
)
|
|
158
150
|
|
|
159
|
-
return
|
|
160
|
-
}
|
|
161
|
-
|
|
162
|
-
try {
|
|
163
151
|
if (tableNames.has(SystemTables.EVENTLOG_META_TABLE)) {
|
|
164
152
|
// Is eventlog db
|
|
165
153
|
yield* SubscriptionRef.set(shutdownStateSubRef, 'shutting-down')
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
dbState.destroy()
|
|
154
|
+
yield* Effect.try(() => void dbEventlog.import(data))
|
|
155
|
+
yield* Effect.try(() => void dbState.destroy())
|
|
170
156
|
} else if (
|
|
171
157
|
tableNames.has(SystemTables.SCHEMA_META_TABLE) &&
|
|
172
158
|
tableNames.has(SystemTables.SCHEMA_EVENT_DEFS_META_TABLE)
|
|
173
159
|
) {
|
|
174
160
|
// Is state db
|
|
175
161
|
yield* SubscriptionRef.set(shutdownStateSubRef, 'shutting-down')
|
|
162
|
+
yield* Effect.try(() => void dbState.import(data))
|
|
163
|
+
yield* Effect.try(() => void dbEventlog.destroy())
|
|
164
|
+
} else {
|
|
165
|
+
return yield* Effect.fail({ _tag: 'unsupported-database' } as const)
|
|
166
|
+
}
|
|
176
167
|
|
|
177
|
-
|
|
168
|
+
yield* sendMessage(Devtools.Leader.LoadDatabaseFile.Success.make({ ...reqPayload }))
|
|
169
|
+
yield* shutdownChannel.send(IntentionalShutdownCause.make({ reason: 'devtools-import' }))
|
|
170
|
+
})
|
|
178
171
|
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
172
|
+
yield* handleLoadDb.pipe(
|
|
173
|
+
Effect.catchTag('unsupported-database', () =>
|
|
174
|
+
sendMessage(
|
|
182
175
|
Devtools.Leader.LoadDatabaseFile.Error.make({
|
|
183
176
|
...reqPayload,
|
|
184
|
-
cause: { _tag: 'unsupported-database' },
|
|
177
|
+
cause: { _tag: 'unsupported-database' as const },
|
|
185
178
|
}),
|
|
186
|
-
)
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
179
|
+
),
|
|
180
|
+
),
|
|
181
|
+
Effect.catchAll((cause) =>
|
|
182
|
+
Effect.logWarning('Error importing database file', cause).pipe(
|
|
183
|
+
Effect.zipRight(
|
|
184
|
+
sendMessage(
|
|
185
|
+
Devtools.Leader.LoadDatabaseFile.Error.make({
|
|
186
|
+
...reqPayload,
|
|
187
|
+
cause: { _tag: 'unexpected-error' as const, cause },
|
|
188
|
+
}),
|
|
189
|
+
),
|
|
190
|
+
),
|
|
191
|
+
),
|
|
192
|
+
),
|
|
193
|
+
)
|
|
192
194
|
|
|
193
|
-
|
|
194
|
-
} catch (cause) {
|
|
195
|
-
yield* Effect.logError(`Error importing database file`, cause)
|
|
196
|
-
yield* sendMessage(
|
|
197
|
-
Devtools.Leader.LoadDatabaseFile.Error.make({
|
|
198
|
-
...reqPayload,
|
|
199
|
-
cause: { _tag: 'unexpected-error', cause },
|
|
200
|
-
}),
|
|
201
|
-
)
|
|
202
|
-
return
|
|
203
|
-
}
|
|
195
|
+
return
|
|
204
196
|
}
|
|
205
197
|
case 'LSD.Leader.ResetAllData.Request': {
|
|
206
198
|
const { mode } = decodedEvent
|
|
@@ -215,7 +207,7 @@ const listenToDevtools = ({
|
|
|
215
207
|
|
|
216
208
|
yield* sendMessage(Devtools.Leader.ResetAllData.Success.make({ ...reqPayload }))
|
|
217
209
|
|
|
218
|
-
yield* shutdownChannel.send(IntentionalShutdownCause.make({ reason: 'devtools-reset' }))
|
|
210
|
+
yield* shutdownChannel.send(IntentionalShutdownCause.make({ reason: 'devtools-reset' }))
|
|
219
211
|
|
|
220
212
|
return
|
|
221
213
|
}
|
package/src/logging.ts
ADDED
|
@@ -0,0 +1,62 @@
|
|
|
1
|
+
import { isDevEnv } from '@livestore/utils'
|
|
2
|
+
import { Effect, type Layer, Logger, LogLevel } from '@livestore/utils/effect'
|
|
3
|
+
|
|
4
|
+
/**
|
|
5
|
+
* Optional Effect logger configuration that LiveStore entry points accept.
|
|
6
|
+
*
|
|
7
|
+
* When provided, `logger` replaces the default pretty logger for the runtime.
|
|
8
|
+
* Use `logLevel` to control verbosity. Set to `LogLevel.None` to disable logging
|
|
9
|
+
* entirely while keeping the same logger implementation.
|
|
10
|
+
*/
|
|
11
|
+
export type WithLoggerOptions = {
|
|
12
|
+
/** Optional Effect logger layer to control logging output. */
|
|
13
|
+
logger?: Layer.Layer<never> | undefined
|
|
14
|
+
/** Optional minimum log level for the runtime. */
|
|
15
|
+
logLevel?: LogLevel.LogLevel | undefined
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
/**
|
|
19
|
+
* Common defaults for resolving a logger configuration.
|
|
20
|
+
* - `threadName` is used by the default pretty logger when `logger` is not provided.
|
|
21
|
+
* - `mode` selects pretty logger mode (e.g. 'browser' for web workers).
|
|
22
|
+
* - `defaultLogLevel` is used when `logLevel` is not provided.
|
|
23
|
+
*/
|
|
24
|
+
export type LoggerDefaults = {
|
|
25
|
+
threadName?: string
|
|
26
|
+
mode?: 'tty' | 'browser'
|
|
27
|
+
defaultLogLevel?: LogLevel.LogLevel
|
|
28
|
+
/** Optional default logger layer to use when `config.logger` is not provided. */
|
|
29
|
+
defaultLogger?: Layer.Layer<never>
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
/**
|
|
33
|
+
* Resolve the logger layer to provide to the Effect runtime.
|
|
34
|
+
*/
|
|
35
|
+
export const resolveLoggerLayer = (config?: WithLoggerOptions, defaults?: LoggerDefaults): Layer.Layer<never> => {
|
|
36
|
+
if (config?.logger) return config.logger
|
|
37
|
+
if (defaults?.defaultLogger) return defaults.defaultLogger
|
|
38
|
+
const threadName = defaults?.threadName ?? 'livestore'
|
|
39
|
+
const mode = defaults?.mode
|
|
40
|
+
return Logger.prettyWithThread(threadName, mode ? { mode } : {})
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
/**
|
|
44
|
+
* Resolve the minimum log level, falling back to `defaults.defaultLogLevel` then `LogLevel.Debug`.
|
|
45
|
+
*/
|
|
46
|
+
export const resolveLogLevel = (config?: WithLoggerOptions, defaults?: LoggerDefaults): LogLevel.LogLevel => {
|
|
47
|
+
if (config?.logLevel !== undefined) return config.logLevel
|
|
48
|
+
if (defaults?.defaultLogLevel !== undefined) return defaults.defaultLogLevel
|
|
49
|
+
return isDevEnv() ? LogLevel.Debug : LogLevel.Info
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
/**
|
|
53
|
+
* Wrap an effect by applying the resolved minimum log level and providing the resolved logger layer.
|
|
54
|
+
*/
|
|
55
|
+
export const withLoggerConfig = <TEnv, TError, TOut>(
|
|
56
|
+
config?: WithLoggerOptions,
|
|
57
|
+
defaults?: LoggerDefaults,
|
|
58
|
+
): ((effect: Effect.Effect<TOut, TError, TEnv>) => Effect.Effect<TOut, TError, TEnv>) => {
|
|
59
|
+
const level = resolveLogLevel(config, defaults)
|
|
60
|
+
const layer = resolveLoggerLayer(config, defaults)
|
|
61
|
+
return (effect) => effect.pipe(Logger.withMinimumLogLevel(level), Effect.provide(layer))
|
|
62
|
+
}
|
|
@@ -65,7 +65,7 @@ describe.concurrent('annotations', () => {
|
|
|
65
65
|
})
|
|
66
66
|
|
|
67
67
|
test('Union of same type with compatible column type', () => {
|
|
68
|
-
const unionSchema = Schema.
|
|
68
|
+
const unionSchema = Schema.Literal('a', 'b')
|
|
69
69
|
expect(() => withColumnType(unionSchema, 'text')).not.toThrow()
|
|
70
70
|
})
|
|
71
71
|
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Schema } from '@livestore/utils/effect'
|
|
2
|
-
import { describe, expect, it } from 'vitest'
|
|
2
|
+
import { assert, describe, expect, it } from 'vitest'
|
|
3
3
|
|
|
4
4
|
import * as State from '../mod.ts'
|
|
5
5
|
import { withAutoIncrement, withColumnType, withDefault, withPrimaryKey, withUnique } from './column-annotations.ts'
|
|
@@ -273,7 +273,7 @@ describe('getColumnDefForSchema', () => {
|
|
|
273
273
|
INACTIVE: 'inactive',
|
|
274
274
|
})
|
|
275
275
|
|
|
276
|
-
const StatusUnion = Schema.
|
|
276
|
+
const StatusUnion = Schema.Literal('pending', 'active', 'inactive')
|
|
277
277
|
|
|
278
278
|
expect(State.SQLite.getColumnDefForSchema(StatusEnum).columnType).toBe('text')
|
|
279
279
|
expect(State.SQLite.getColumnDefForSchema(StatusUnion).columnType).toBe('text')
|
|
@@ -552,7 +552,7 @@ describe('getColumnDefForSchema', () => {
|
|
|
552
552
|
|
|
553
553
|
it('should work with column type annotation', () => {
|
|
554
554
|
const UserSchema = Schema.Struct({
|
|
555
|
-
id: Schema.Number.pipe(withColumnType('integer')
|
|
555
|
+
id: Schema.Number.pipe(withColumnType('integer'), withPrimaryKey),
|
|
556
556
|
name: Schema.String,
|
|
557
557
|
})
|
|
558
558
|
|
|
@@ -584,7 +584,7 @@ describe('getColumnDefForSchema', () => {
|
|
|
584
584
|
describe('withAutoIncrement', () => {
|
|
585
585
|
it('should add autoIncrement annotation to schema', () => {
|
|
586
586
|
const UserSchema = Schema.Struct({
|
|
587
|
-
id: Schema.Int.pipe(withPrimaryKey
|
|
587
|
+
id: Schema.Int.pipe(withPrimaryKey, withAutoIncrement),
|
|
588
588
|
name: Schema.String,
|
|
589
589
|
})
|
|
590
590
|
const userTable = State.SQLite.table({
|
|
@@ -636,6 +636,29 @@ describe('getColumnDefForSchema', () => {
|
|
|
636
636
|
table2.sqliteDef.columns.count.default._tag === 'Some' && table2.sqliteDef.columns.count.default.value,
|
|
637
637
|
).toBe(0)
|
|
638
638
|
})
|
|
639
|
+
|
|
640
|
+
it('should support thunk defaults without eager evaluation', () => {
|
|
641
|
+
let counter = 0
|
|
642
|
+
const UserSchema = Schema.Struct({
|
|
643
|
+
id: Schema.String.pipe(
|
|
644
|
+
withDefault(() => {
|
|
645
|
+
counter += 1
|
|
646
|
+
return `user-${counter}`
|
|
647
|
+
}),
|
|
648
|
+
),
|
|
649
|
+
})
|
|
650
|
+
|
|
651
|
+
const table = State.SQLite.table({ name: 'users_with_thunk', schema: UserSchema })
|
|
652
|
+
|
|
653
|
+
expect(counter).toBe(0)
|
|
654
|
+
expect(table.sqliteDef.columns.id.default._tag).toBe('Some')
|
|
655
|
+
if (table.sqliteDef.columns.id.default._tag === 'Some') {
|
|
656
|
+
const defaultThunk = table.sqliteDef.columns.id.default.value
|
|
657
|
+
assert(typeof defaultThunk === 'function')
|
|
658
|
+
expect(defaultThunk()).toBe('user-1')
|
|
659
|
+
expect(defaultThunk()).toBe('user-2')
|
|
660
|
+
}
|
|
661
|
+
})
|
|
639
662
|
})
|
|
640
663
|
|
|
641
664
|
describe('withUnique', () => {
|
|
@@ -681,7 +704,7 @@ describe('getColumnDefForSchema', () => {
|
|
|
681
704
|
|
|
682
705
|
describe('combined annotations', () => {
|
|
683
706
|
it('should work with multiple annotations', () => {
|
|
684
|
-
const schema = Schema.Uint8ArrayFromBase64.pipe(withColumnType('blob')
|
|
707
|
+
const schema = Schema.Uint8ArrayFromBase64.pipe(withColumnType('blob'), withPrimaryKey)
|
|
685
708
|
|
|
686
709
|
const UserSchema = Schema.Struct({
|
|
687
710
|
id: schema,
|
|
@@ -699,7 +722,7 @@ describe('getColumnDefForSchema', () => {
|
|
|
699
722
|
|
|
700
723
|
it('should combine all annotations', () => {
|
|
701
724
|
const UserSchema = Schema.Struct({
|
|
702
|
-
id: Schema.Int.pipe(withPrimaryKey
|
|
725
|
+
id: Schema.Int.pipe(withPrimaryKey, withAutoIncrement),
|
|
703
726
|
email: Schema.String.pipe(withUnique),
|
|
704
727
|
status: Schema.String.pipe(withDefault('active')),
|
|
705
728
|
metadata: Schema.Unknown.pipe(withColumnType('text')),
|
|
@@ -146,6 +146,22 @@ describe('makeColumnSpec', () => {
|
|
|
146
146
|
expect(result).toContain('default RANDOM()')
|
|
147
147
|
})
|
|
148
148
|
|
|
149
|
+
it('should omit default clause for thunk defaults', () => {
|
|
150
|
+
const table = SqliteAst.table(
|
|
151
|
+
'thunks',
|
|
152
|
+
[
|
|
153
|
+
createColumn('id', 'integer', { nullable: false, primaryKey: true }),
|
|
154
|
+
createColumn('token', 'text', { defaultValue: () => 'dynamic-token' }),
|
|
155
|
+
],
|
|
156
|
+
[],
|
|
157
|
+
)
|
|
158
|
+
|
|
159
|
+
const result = makeColumnSpec(table)
|
|
160
|
+
expect(result).toMatchInlineSnapshot(`""id" integer primary key , "token" text "`)
|
|
161
|
+
expect(result).not.toContain('dynamic-token')
|
|
162
|
+
expect(result).not.toMatch(/token" text\s+default/i)
|
|
163
|
+
})
|
|
164
|
+
|
|
149
165
|
it('should handle null default values', () => {
|
|
150
166
|
const table = SqliteAst.table(
|
|
151
167
|
'nullable_defaults',
|