@livestore/common 0.3.0-dev.11 → 0.3.0-dev.3
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/adapter-types.d.ts +35 -47
- package/dist/adapter-types.d.ts.map +1 -1
- package/dist/adapter-types.js.map +1 -1
- package/dist/derived-mutations.d.ts +4 -4
- package/dist/derived-mutations.d.ts.map +1 -1
- package/dist/derived-mutations.test.js.map +1 -1
- package/dist/devtools/devtools-bridge.d.ts +1 -2
- package/dist/devtools/devtools-bridge.d.ts.map +1 -1
- package/dist/devtools/devtools-messages.d.ts +592 -3
- package/dist/devtools/devtools-messages.d.ts.map +1 -1
- package/dist/devtools/devtools-messages.js +171 -3
- package/dist/devtools/devtools-messages.js.map +1 -1
- package/dist/index.d.ts +4 -0
- package/dist/index.d.ts.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/leader-thread/apply-mutation.d.ts +2 -5
- package/dist/leader-thread/apply-mutation.d.ts.map +1 -1
- package/dist/leader-thread/apply-mutation.js +29 -41
- package/dist/leader-thread/apply-mutation.js.map +1 -1
- package/dist/leader-thread/connection.d.ts +4 -4
- package/dist/leader-thread/connection.d.ts.map +1 -1
- package/dist/leader-thread/connection.js +5 -5
- package/dist/leader-thread/connection.js.map +1 -1
- package/dist/leader-thread/leader-sync-processor.d.ts +2 -2
- package/dist/leader-thread/leader-sync-processor.d.ts.map +1 -1
- package/dist/leader-thread/leader-sync-processor.js +12 -20
- package/dist/leader-thread/leader-sync-processor.js.map +1 -1
- package/dist/leader-thread/leader-worker-devtools.d.ts +1 -1
- package/dist/leader-thread/leader-worker-devtools.d.ts.map +1 -1
- package/dist/leader-thread/leader-worker-devtools.js +81 -37
- package/dist/leader-thread/leader-worker-devtools.js.map +1 -1
- package/dist/leader-thread/make-leader-thread-layer.d.ts +11 -12
- package/dist/leader-thread/make-leader-thread-layer.d.ts.map +1 -1
- package/dist/leader-thread/make-leader-thread-layer.js +14 -33
- package/dist/leader-thread/make-leader-thread-layer.js.map +1 -1
- package/dist/leader-thread/mutationlog.d.ts +19 -6
- package/dist/leader-thread/mutationlog.d.ts.map +1 -1
- package/dist/leader-thread/mutationlog.js +6 -7
- package/dist/leader-thread/mutationlog.js.map +1 -1
- package/dist/leader-thread/pull-queue-set.d.ts.map +1 -1
- package/dist/leader-thread/recreate-db.d.ts.map +1 -1
- package/dist/leader-thread/recreate-db.js +18 -24
- package/dist/leader-thread/recreate-db.js.map +1 -1
- package/dist/leader-thread/types.d.ts +16 -36
- package/dist/leader-thread/types.d.ts.map +1 -1
- package/dist/leader-thread/types.js.map +1 -1
- package/dist/mutation.d.ts +2 -9
- package/dist/mutation.d.ts.map +1 -1
- package/dist/mutation.js +5 -5
- package/dist/mutation.js.map +1 -1
- package/dist/query-builder/impl.d.ts +1 -1
- package/dist/rehydrate-from-mutationlog.d.ts +5 -5
- package/dist/rehydrate-from-mutationlog.d.ts.map +1 -1
- package/dist/rehydrate-from-mutationlog.js +19 -13
- package/dist/rehydrate-from-mutationlog.js.map +1 -1
- package/dist/schema/EventId.d.ts +14 -16
- package/dist/schema/EventId.d.ts.map +1 -1
- package/dist/schema/EventId.js +7 -15
- package/dist/schema/EventId.js.map +1 -1
- package/dist/schema/MutationEvent.d.ts +80 -49
- package/dist/schema/MutationEvent.d.ts.map +1 -1
- package/dist/schema/MutationEvent.js +15 -32
- package/dist/schema/MutationEvent.js.map +1 -1
- package/dist/schema/system-tables.d.ts +26 -26
- package/dist/schema/system-tables.d.ts.map +1 -1
- package/dist/schema/system-tables.js +11 -19
- package/dist/schema/system-tables.js.map +1 -1
- package/dist/schema-management/common.d.ts +3 -3
- package/dist/schema-management/common.d.ts.map +1 -1
- package/dist/schema-management/common.js.map +1 -1
- package/dist/schema-management/migrations.d.ts +4 -4
- package/dist/schema-management/migrations.d.ts.map +1 -1
- package/dist/schema-management/migrations.js +6 -6
- package/dist/schema-management/migrations.js.map +1 -1
- package/dist/sync/client-session-sync-processor.d.ts +4 -4
- package/dist/sync/client-session-sync-processor.d.ts.map +1 -1
- package/dist/sync/index.d.ts +1 -1
- package/dist/sync/index.d.ts.map +1 -1
- package/dist/sync/index.js +1 -1
- package/dist/sync/index.js.map +1 -1
- package/dist/sync/next/history-dag-common.d.ts +4 -1
- package/dist/sync/next/history-dag-common.d.ts.map +1 -1
- package/dist/sync/next/history-dag-common.js +1 -1
- package/dist/sync/next/history-dag-common.js.map +1 -1
- package/dist/sync/next/rebase-events.d.ts +3 -3
- package/dist/sync/next/rebase-events.d.ts.map +1 -1
- package/dist/sync/next/rebase-events.js +2 -3
- package/dist/sync/next/rebase-events.js.map +1 -1
- package/dist/sync/next/test/mutation-fixtures.d.ts +7 -7
- package/dist/sync/next/test/mutation-fixtures.d.ts.map +1 -1
- package/dist/sync/next/test/mutation-fixtures.js +9 -3
- package/dist/sync/next/test/mutation-fixtures.js.map +1 -1
- package/dist/sync/sync.d.ts +11 -21
- package/dist/sync/sync.d.ts.map +1 -1
- package/dist/sync/sync.js.map +1 -1
- package/dist/sync/syncstate.d.ts +23 -45
- package/dist/sync/syncstate.d.ts.map +1 -1
- package/dist/sync/syncstate.js +12 -56
- package/dist/sync/syncstate.js.map +1 -1
- package/dist/sync/syncstate.test.js +69 -125
- package/dist/sync/syncstate.test.js.map +1 -1
- package/dist/sync/validate-push-payload.d.ts +2 -2
- package/dist/sync/validate-push-payload.d.ts.map +1 -1
- package/dist/sync/validate-push-payload.js +2 -2
- package/dist/sync/validate-push-payload.js.map +1 -1
- package/dist/version.d.ts +1 -1
- package/dist/version.d.ts.map +1 -1
- package/dist/version.js +1 -1
- package/dist/version.js.map +1 -1
- package/package.json +5 -6
- package/src/adapter-types.ts +40 -39
- package/src/derived-mutations.test.ts +1 -1
- package/src/derived-mutations.ts +5 -9
- package/src/devtools/devtools-bridge.ts +1 -2
- package/src/devtools/devtools-messages.ts +243 -3
- package/src/index.ts +6 -0
- package/src/init-singleton-tables.ts +2 -2
- package/src/leader-thread/apply-mutation.ts +35 -53
- package/src/leader-thread/connection.ts +7 -7
- package/src/leader-thread/{LeaderSyncProcessor.ts → leader-sync-processor.ts} +268 -306
- package/src/leader-thread/leader-worker-devtools.ts +124 -52
- package/src/leader-thread/make-leader-thread-layer.ts +30 -62
- package/src/leader-thread/mutationlog.ts +10 -14
- package/src/leader-thread/recreate-db.ts +20 -24
- package/src/leader-thread/types.ts +20 -41
- package/src/mutation.ts +7 -17
- package/src/rehydrate-from-mutationlog.ts +26 -18
- package/src/schema/EventId.ts +9 -23
- package/src/schema/MutationEvent.ts +24 -46
- package/src/schema/system-tables.ts +11 -19
- package/src/schema-management/common.ts +3 -3
- package/src/schema-management/migrations.ts +10 -10
- package/src/sync/{ClientSessionSyncProcessor.ts → client-session-sync-processor.ts} +19 -26
- package/src/sync/index.ts +1 -1
- package/src/sync/next/history-dag-common.ts +1 -1
- package/src/sync/next/rebase-events.ts +7 -7
- package/src/sync/next/test/mutation-fixtures.ts +10 -3
- package/src/sync/sync.ts +6 -19
- package/src/sync/syncstate.test.ts +67 -127
- package/src/sync/syncstate.ts +19 -21
- package/src/sync/validate-push-payload.ts +4 -7
- package/src/version.ts +1 -1
- package/dist/devtools/devtool-message-leader.d.ts +0 -2
- package/dist/devtools/devtool-message-leader.d.ts.map +0 -1
- package/dist/devtools/devtool-message-leader.js +0 -2
- package/dist/devtools/devtool-message-leader.js.map +0 -1
- package/dist/devtools/devtools-messages-client-session.d.ts +0 -297
- package/dist/devtools/devtools-messages-client-session.d.ts.map +0 -1
- package/dist/devtools/devtools-messages-client-session.js +0 -61
- package/dist/devtools/devtools-messages-client-session.js.map +0 -1
- package/dist/devtools/devtools-messages-common.d.ts +0 -65
- package/dist/devtools/devtools-messages-common.d.ts.map +0 -1
- package/dist/devtools/devtools-messages-common.js +0 -35
- package/dist/devtools/devtools-messages-common.js.map +0 -1
- package/dist/devtools/devtools-messages-leader.d.ts +0 -261
- package/dist/devtools/devtools-messages-leader.d.ts.map +0 -1
- package/dist/devtools/devtools-messages-leader.js +0 -85
- package/dist/devtools/devtools-messages-leader.js.map +0 -1
- package/dist/leader-thread/LeaderSyncProcessor.d.ts +0 -37
- package/dist/leader-thread/LeaderSyncProcessor.d.ts.map +0 -1
- package/dist/leader-thread/LeaderSyncProcessor.js +0 -432
- package/dist/leader-thread/LeaderSyncProcessor.js.map +0 -1
- package/dist/schema/EventId.test.d.ts +0 -2
- package/dist/schema/EventId.test.d.ts.map +0 -1
- package/dist/schema/EventId.test.js +0 -11
- package/dist/schema/EventId.test.js.map +0 -1
- package/dist/schema/MutationEvent.test.d.ts +0 -2
- package/dist/schema/MutationEvent.test.d.ts.map +0 -1
- package/dist/schema/MutationEvent.test.js +0 -2
- package/dist/schema/MutationEvent.test.js.map +0 -1
- package/dist/sync/ClientSessionSyncProcessor.d.ts +0 -43
- package/dist/sync/ClientSessionSyncProcessor.d.ts.map +0 -1
- package/dist/sync/ClientSessionSyncProcessor.js +0 -141
- package/dist/sync/ClientSessionSyncProcessor.js.map +0 -1
- package/src/devtools/devtools-messages-client-session.ts +0 -109
- package/src/devtools/devtools-messages-common.ts +0 -52
- package/src/devtools/devtools-messages-leader.ts +0 -115
- package/src/schema/EventId.test.ts +0 -12
@@ -4,41 +4,39 @@ import { initializeSingletonTables, migrateDb, rehydrateFromMutationLog, Unexpec
|
|
4
4
|
import { configureConnection } from './connection.js';
|
5
5
|
import { LeaderThreadCtx } from './types.js';
|
6
6
|
export const recreateDb = Effect.gen(function* () {
|
7
|
-
const {
|
7
|
+
const { db, dbLog, makeSyncDb, schema, bootStatusQueue } = yield* LeaderThreadCtx;
|
8
8
|
const migrationOptions = schema.migrationOptions;
|
9
9
|
yield* Effect.addFinalizer(Effect.fn('recreateDb:finalizer')(function* (ex) {
|
10
10
|
if (ex._tag === 'Failure')
|
11
|
-
|
11
|
+
db.destroy();
|
12
12
|
}));
|
13
13
|
// NOTE to speed up the operations below, we're creating a temporary in-memory database
|
14
14
|
// and later we'll overwrite the persisted database with the new data
|
15
|
-
|
16
|
-
|
17
|
-
const tmpDb = dbReadModel;
|
18
|
-
yield* configureConnection(tmpDb, { fkEnabled: true });
|
15
|
+
const tmpSyncDb = yield* makeSyncDb({ _tag: 'in-memory' });
|
16
|
+
yield* configureConnection(tmpSyncDb, { fkEnabled: true });
|
19
17
|
const initDb = (hooks) => Effect.gen(function* () {
|
20
|
-
yield* Effect.tryAll(() => hooks?.init?.(
|
18
|
+
yield* Effect.tryAll(() => hooks?.init?.(tmpSyncDb)).pipe(UnexpectedError.mapToUnexpectedError);
|
21
19
|
yield* migrateDb({
|
22
|
-
db:
|
20
|
+
db: tmpSyncDb,
|
23
21
|
schema,
|
24
22
|
onProgress: ({ done, total }) => Queue.offer(bootStatusQueue, { stage: 'migrating', progress: { done, total } }),
|
25
23
|
});
|
26
|
-
initializeSingletonTables(schema,
|
27
|
-
yield* Effect.tryAll(() => hooks?.pre?.(
|
28
|
-
return
|
24
|
+
initializeSingletonTables(schema, tmpSyncDb);
|
25
|
+
yield* Effect.tryAll(() => hooks?.pre?.(tmpSyncDb)).pipe(UnexpectedError.mapToUnexpectedError);
|
26
|
+
return tmpSyncDb;
|
29
27
|
});
|
30
28
|
switch (migrationOptions.strategy) {
|
31
29
|
case 'from-mutation-log': {
|
32
30
|
const hooks = migrationOptions.hooks;
|
33
|
-
const
|
31
|
+
const tmpSyncDb = yield* initDb(hooks);
|
34
32
|
yield* rehydrateFromMutationLog({
|
35
|
-
db:
|
36
|
-
logDb:
|
33
|
+
db: tmpSyncDb,
|
34
|
+
logDb: dbLog,
|
37
35
|
schema,
|
38
36
|
migrationOptions,
|
39
37
|
onProgress: ({ done, total }) => Queue.offer(bootStatusQueue, { stage: 'rehydrating', progress: { done, total } }),
|
40
38
|
});
|
41
|
-
yield* Effect.tryAll(() => hooks?.post?.(
|
39
|
+
yield* Effect.tryAll(() => hooks?.post?.(tmpSyncDb)).pipe(UnexpectedError.mapToUnexpectedError);
|
42
40
|
break;
|
43
41
|
}
|
44
42
|
case 'hard-reset': {
|
@@ -49,9 +47,9 @@ export const recreateDb = Effect.gen(function* () {
|
|
49
47
|
break;
|
50
48
|
}
|
51
49
|
case 'manual': {
|
52
|
-
const oldDbData =
|
50
|
+
const oldDbData = db.export();
|
53
51
|
const newDbData = yield* Effect.tryAll(() => migrationOptions.migrate(oldDbData)).pipe(UnexpectedError.mapToUnexpectedError);
|
54
|
-
|
52
|
+
tmpSyncDb.import(newDbData);
|
55
53
|
// TODO validate schema
|
56
54
|
break;
|
57
55
|
}
|
@@ -59,17 +57,13 @@ export const recreateDb = Effect.gen(function* () {
|
|
59
57
|
casesHandled(migrationOptions);
|
60
58
|
}
|
61
59
|
}
|
62
|
-
// TODO bring back
|
63
60
|
// Import the temporary in-memory database into the persistent database
|
64
|
-
|
65
|
-
// Effect.withSpan('@livestore/common:leader-thread:recreateDb:import'),
|
66
|
-
// )
|
61
|
+
yield* Effect.sync(() => db.import(tmpSyncDb)).pipe(Effect.withSpan('@livestore/common:leader-thread:recreateDb:import'));
|
67
62
|
// TODO maybe bring back re-using this initial snapshot to avoid calling `.export()` again
|
68
63
|
// We've disabled this for now as it made the code too complex, as we often run syncing right after
|
69
64
|
// so the snapshot is no longer up to date
|
70
|
-
// const snapshotFromTmpDb =
|
71
|
-
|
72
|
-
// tmpDb.close()
|
65
|
+
// const snapshotFromTmpDb = tmpSyncDb.export()
|
66
|
+
tmpSyncDb.close();
|
73
67
|
}).pipe(Effect.scoped, // NOTE we're closing the scope here so finalizers are called when the effect is done
|
74
68
|
Effect.withSpan('@livestore/common:leader-thread:recreateDb'), Effect.withPerformanceMeasure('@livestore/common:leader-thread:recreateDb'));
|
75
69
|
//# sourceMappingURL=recreate-db.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"recreate-db.js","sourceRoot":"","sources":["../../src/leader-thread/recreate-db.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;AAE/C,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAA;AAGvD,OAAO,EAAE,yBAAyB,EAAE,SAAS,EAAE,wBAAwB,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAC7G,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAA;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAE5C,MAAM,CAAC,MAAM,UAAU,GAInB,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IACtB,MAAM,EAAE,
|
1
|
+
{"version":3,"file":"recreate-db.js","sourceRoot":"","sources":["../../src/leader-thread/recreate-db.ts"],"names":[],"mappings":"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"}
|
@@ -1,8 +1,8 @@
|
|
1
|
-
import type { Deferred, Effect, Fiber, HttpClient, Option, Queue, Scope,
|
1
|
+
import type { Deferred, Effect, Fiber, HttpClient, Option, Queue, Scope, SubscriptionRef, WebChannel } from '@livestore/utils/effect';
|
2
2
|
import { Context, Schema } from '@livestore/utils/effect';
|
3
|
-
import type { BootStatus, Devtools, InvalidPushError,
|
3
|
+
import type { BootStatus, Devtools, InvalidPushError, MakeSynchronousDatabase, PersistenceInfo, SyncBackend, SynchronousDatabase, UnexpectedError } from '../index.js';
|
4
4
|
import type { EventId, LiveStoreSchema, MutationEvent } from '../schema/mod.js';
|
5
|
-
import type
|
5
|
+
import type { PayloadUpstream, SyncState } from '../sync/syncstate.js';
|
6
6
|
import type { ShutdownChannel } from './shutdown-channel.js';
|
7
7
|
export type ShutdownState = 'running' | 'shutting-down';
|
8
8
|
declare const OuterWorkerCtx_base: Context.TagClass<OuterWorkerCtx, "OuterWorkerCtx", {
|
@@ -24,51 +24,37 @@ export type InitialSyncInfo = Option.Option<{
|
|
24
24
|
cursor: EventId.EventId;
|
25
25
|
metadata: Option.Option<Schema.JsonValue>;
|
26
26
|
}>;
|
27
|
-
export type
|
27
|
+
export type LeaderDatabase = SynchronousDatabase<{
|
28
28
|
dbPointer: number;
|
29
29
|
persistenceInfo: PersistenceInfo;
|
30
30
|
}>;
|
31
31
|
export type PersistenceInfoPair = {
|
32
|
-
|
32
|
+
db: PersistenceInfo;
|
33
33
|
mutationLog: PersistenceInfo;
|
34
34
|
};
|
35
35
|
export type DevtoolsOptions = {
|
36
36
|
enabled: false;
|
37
37
|
} | {
|
38
38
|
enabled: true;
|
39
|
-
|
39
|
+
makeContext: Effect.Effect<{
|
40
40
|
devtoolsWebChannel: WebChannel.WebChannel<Devtools.MessageToAppLeader, Devtools.MessageFromAppLeader>;
|
41
|
+
shutdownChannel: ShutdownChannel;
|
41
42
|
persistenceInfo: PersistenceInfoPair;
|
42
43
|
}, UnexpectedError, Scope.Scope>;
|
43
44
|
};
|
44
|
-
export type DevtoolsContext = {
|
45
|
-
enabled: true;
|
46
|
-
syncBackendPullLatch: Effect.Latch;
|
47
|
-
syncBackendPushLatch: Effect.Latch;
|
48
|
-
} | {
|
49
|
-
enabled: false;
|
50
|
-
};
|
51
45
|
declare const LeaderThreadCtx_base: Context.TagClass<LeaderThreadCtx, "LeaderThreadCtx", {
|
52
46
|
schema: LiveStoreSchema;
|
53
47
|
storeId: string;
|
54
|
-
|
55
|
-
|
56
|
-
|
57
|
-
|
48
|
+
originId: string;
|
49
|
+
makeSyncDb: MakeSynchronousDatabase;
|
50
|
+
db: LeaderDatabase;
|
51
|
+
dbLog: LeaderDatabase;
|
58
52
|
bootStatusQueue: Queue.Queue<BootStatus>;
|
59
53
|
shutdownStateSubRef: SubscriptionRef.SubscriptionRef<ShutdownState>;
|
60
|
-
shutdownChannel: ShutdownChannel;
|
61
54
|
mutationEventSchema: MutationEvent.ForMutationDefRecord<any>;
|
62
|
-
devtools: DevtoolsContext;
|
63
55
|
syncBackend: SyncBackend | undefined;
|
64
|
-
syncProcessor:
|
56
|
+
syncProcessor: SyncProcessor;
|
65
57
|
connectedClientSessionPullQueues: PullQueueSet;
|
66
|
-
/**
|
67
|
-
* e.g. used for `store._dev` APIs
|
68
|
-
*
|
69
|
-
* This is currently separated from `.devtools` as it also needs to work when devtools are disabled
|
70
|
-
*/
|
71
|
-
extraIncomingMessagesQueue: Queue.Queue<Devtools.MessageToAppLeader>;
|
72
58
|
}>;
|
73
59
|
export declare class LeaderThreadCtx extends LeaderThreadCtx_base {
|
74
60
|
}
|
@@ -80,24 +66,18 @@ export type InitialBlockingSyncContext = {
|
|
80
66
|
}) => Effect.Effect<void>;
|
81
67
|
};
|
82
68
|
export type PullQueueItem = {
|
83
|
-
payload:
|
69
|
+
payload: PayloadUpstream;
|
84
70
|
remaining: number;
|
85
71
|
};
|
86
|
-
export interface
|
72
|
+
export interface SyncProcessor {
|
87
73
|
push: (
|
88
74
|
/** `batch` needs to follow the same rules as `batch` in `SyncBackend.push` */
|
89
|
-
batch: ReadonlyArray<MutationEvent.EncodedWithMeta
|
90
|
-
/**
|
91
|
-
* If true, the effect will only finish when the local push has been processed (i.e. succeeded or was rejected).
|
92
|
-
* @default false
|
93
|
-
*/
|
94
|
-
waitForProcessing?: boolean;
|
95
|
-
}) => Effect.Effect<void, InvalidPushError>;
|
75
|
+
batch: ReadonlyArray<MutationEvent.EncodedWithMeta>) => Effect.Effect<void, UnexpectedError | InvalidPushError, HttpClient.HttpClient | LeaderThreadCtx>;
|
96
76
|
pushPartial: (mutationEvent: MutationEvent.PartialAnyEncoded) => Effect.Effect<void, UnexpectedError, LeaderThreadCtx>;
|
97
77
|
boot: (args: {
|
98
78
|
dbReady: Deferred.Deferred<void>;
|
99
79
|
}) => Effect.Effect<void, UnexpectedError, LeaderThreadCtx | Scope.Scope | HttpClient.HttpClient>;
|
100
|
-
syncState:
|
80
|
+
syncState: Effect.Effect<SyncState, UnexpectedError>;
|
101
81
|
}
|
102
82
|
export interface PullQueueSet {
|
103
83
|
makeQueue: (since: EventId.EventId) => Effect.Effect<Queue.Queue<PullQueueItem>, UnexpectedError, Scope.Scope | LeaderThreadCtx>;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/leader-thread/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,QAAQ,EACR,MAAM,EACN,KAAK,EACL,UAAU,EACV,MAAM,EACN,KAAK,EACL,KAAK,EACL,
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/leader-thread/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,QAAQ,EACR,MAAM,EACN,KAAK,EACL,UAAU,EACV,MAAM,EACN,KAAK,EACL,KAAK,EACL,eAAe,EACf,UAAU,EACX,MAAM,yBAAyB,CAAA;AAChC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAEzD,OAAO,KAAK,EACV,UAAU,EACV,QAAQ,EACR,gBAAgB,EAChB,uBAAuB,EACvB,eAAe,EACf,WAAW,EACX,mBAAmB,EACnB,eAAe,EAChB,MAAM,aAAa,CAAA;AACpB,OAAO,KAAK,EAAE,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAA;AAC/E,OAAO,KAAK,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAA;AACtE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAE5D,MAAM,MAAM,aAAa,GAAG,SAAS,GAAG,eAAe,CAAA;;gBAKvC,KAAK,CAAC,YAAY,CAAC,GAAG,EAAE,GAAG,CAAC;;AAH5C,qBAAa,cAAe,SAAQ,mBAKjC;CAAG;AAEN,eAAO,MAAM,sBAAsB,iCAAkC,CAAA;AACrE,MAAM,MAAM,sBAAsB,GAAG,OAAO,sBAAsB,CAAC,IAAI,CAAA;AAEvE,eAAO,MAAM,0BAA0B;;EAErC,CAAA;AAEF,MAAM,MAAM,0BAA0B,GAAG,OAAO,0BAA0B,CAAC,IAAI,CAAA;AAE/E,eAAO,MAAM,kBAAkB;;IAAmE,CAAA;AAClG,MAAM,MAAM,kBAAkB,GAAG,OAAO,kBAAkB,CAAC,IAAI,CAAA;AAE/D,MAAM,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,CAAC;IAC1C,MAAM,EAAE,OAAO,CAAC,OAAO,CAAA;IACvB,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;CAC1C,CAAC,CAAA;AAMF,MAAM,MAAM,cAAc,GAAG,mBAAmB,CAAC;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,eAAe,EAAE,eAAe,CAAA;CAAE,CAAC,CAAA;AACzG,MAAM,MAAM,mBAAmB,GAAG;IAAE,EAAE,EAAE,eAAe,CAAC;IAAC,WAAW,EAAE,eAAe,CAAA;CAAE,CAAA;AAEvF,MAAM,MAAM,eAAe,GACvB;IACE,OAAO,EAAE,KAAK,CAAA;CACf,GACD;IACE,OAAO,EAAE,IAAI,CAAA;IACb,WAAW,EAAE,MAAM,CAAC,MAAM,CACxB;QACE,kBAAkB,EAAE,UAAU,CAAC,UAAU,CAAC,QAAQ,CAAC,kBAAkB,EAAE,QAAQ,CAAC,oBAAoB,CAAC,CAAA;QACrG,eAAe,EAAE,eAAe,CAAA;QAChC,eAAe,EAAE,mBAAmB,CAAA;KACrC,EACD,eAAe,EACf,KAAK,CAAC,KAAK,CACZ,CAAA;CACF,CAAA;;YAKO,eAAe;aACd,MAAM;cACL,MAAM;gBACJ,uBAAuB;QAC/B,cAAc;WACX,cAAc;qBACJ,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC;yBAEnB,eAAe,CAAC,eAAe,CAAC,aAAa,CAAC;yBAC9C,aAAa,CAAC,oBAAoB,CAAC,GAAG,CAAC;iBAE/C,WAAW,GAAG,SAAS;mBACrB,aAAa;sCACM,YAAY;;AAhBlD,qBAAa,eAAgB,SAAQ,oBAkBlC;CAAG;AAEN,MAAM,MAAM,0BAA0B,GAAG;IACvC,gBAAgB,EAAE,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,SAAS,CAAA;IACrD,MAAM,EAAE,CAAC,CAAC,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;CAC7E,CAAA;AAED,MAAM,MAAM,aAAa,GAAG;IAG1B,OAAO,EAAE,eAAe,CAAA;IAExB,SAAS,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE;IACJ,8EAA8E;IAC9E,KAAK,EAAE,aAAa,CAAC,aAAa,CAAC,eAAe,CAAC,KAChD,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,eAAe,GAAG,gBAAgB,EAAE,UAAU,CAAC,UAAU,GAAG,eAAe,CAAC,CAAA;IAErG,WAAW,EAAE,CAAC,aAAa,EAAE,aAAa,CAAC,iBAAiB,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,eAAe,EAAE,eAAe,CAAC,CAAA;IACtH,IAAI,EAAE,CAAC,IAAI,EAAE;QACX,OAAO,EAAE,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;KACjC,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,eAAe,EAAE,eAAe,GAAG,KAAK,CAAC,KAAK,GAAG,UAAU,CAAC,UAAU,CAAC,CAAA;IACjG,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,eAAe,CAAC,CAAA;CACrD;AAED,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,CACT,KAAK,EAAE,OAAO,CAAC,OAAO,KACnB,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE,eAAe,EAAE,KAAK,CAAC,KAAK,GAAG,eAAe,CAAC,CAAA;IAC9F,KAAK,EAAE,CAAC,IAAI,EAAE,aAAa,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,eAAe,EAAE,eAAe,CAAC,CAAA;CACtF"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/leader-thread/types.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/leader-thread/types.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAkBzD,MAAM,OAAO,cAAe,SAAQ,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,EAK9D;CAAG;AAEN,MAAM,CAAC,MAAM,sBAAsB,GAAG,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;AAGrE,MAAM,CAAC,MAAM,0BAA0B,GAAG,MAAM,CAAC,YAAY,CAAC,UAAU,EAAE;IACxE,OAAO,EAAE,MAAM,CAAC,kBAAkB;CACnC,CAAC,CAAA;AAIF,MAAM,CAAC,MAAM,kBAAkB,GAAG,MAAM,CAAC,KAAK,CAAC,sBAAsB,EAAE,0BAA0B,CAAC,CAAA;AAgClG,MAAM,OAAO,eAAgB,SAAQ,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,EAkBhE;CAAG"}
|
package/dist/mutation.d.ts
CHANGED
@@ -1,16 +1,9 @@
|
|
1
1
|
import type * as MutationEvent from './schema/MutationEvent.js';
|
2
2
|
import type { MutationDef } from './schema/mutations.js';
|
3
3
|
import type { PreparedBindValues } from './util.js';
|
4
|
-
export declare const getExecArgsFromMutation: ({ mutationDef,
|
4
|
+
export declare const getExecArgsFromMutation: ({ mutationDef, mutationEventDecoded, }: {
|
5
5
|
mutationDef: MutationDef.Any;
|
6
|
-
|
7
|
-
mutationEvent: {
|
8
|
-
decoded: MutationEvent.AnyDecoded | MutationEvent.PartialAnyDecoded;
|
9
|
-
encoded: undefined;
|
10
|
-
} | {
|
11
|
-
decoded: undefined;
|
12
|
-
encoded: MutationEvent.AnyEncoded | MutationEvent.PartialAnyEncoded;
|
13
|
-
};
|
6
|
+
mutationEventDecoded: MutationEvent.Any | MutationEvent.PartialAny;
|
14
7
|
}) => ReadonlyArray<{
|
15
8
|
statementSql: string;
|
16
9
|
bindValues: PreparedBindValues;
|
package/dist/mutation.d.ts.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"mutation.d.ts","sourceRoot":"","sources":["../src/mutation.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,KAAK,aAAa,MAAM,2BAA2B,CAAA;AAC/D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AACxD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAA;AAGnD,eAAO,MAAM,uBAAuB,
|
1
|
+
{"version":3,"file":"mutation.d.ts","sourceRoot":"","sources":["../src/mutation.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,KAAK,aAAa,MAAM,2BAA2B,CAAA;AAC/D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AACxD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAA;AAGnD,eAAO,MAAM,uBAAuB,2CAGjC;IACD,WAAW,EAAE,WAAW,CAAC,GAAG,CAAA;IAC5B,oBAAoB,EAAE,aAAa,CAAC,GAAG,GAAG,aAAa,CAAC,UAAU,CAAA;CACnE,KAAG,aAAa,CAAC;IAChB,YAAY,EAAE,MAAM,CAAA;IACpB,UAAU,EAAE,kBAAkB,CAAA;IAC9B,WAAW,EAAE,WAAW,CAAC,MAAM,CAAC,GAAG,SAAS,CAAA;CAC7C,CAiCA,CAAA;AAID,eAAO,MAAM,sBAAsB,eACrB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,aAAa,CAAC,OAAO,CAAC,aACjD,MAAM,SAGlB,CAAA"}
|
package/dist/mutation.js
CHANGED
@@ -1,12 +1,11 @@
|
|
1
1
|
import { Schema } from '@livestore/utils/effect';
|
2
2
|
import { SessionIdSymbol } from './adapter-types.js';
|
3
3
|
import { prepareBindValues } from './util.js';
|
4
|
-
export const getExecArgsFromMutation = ({ mutationDef,
|
4
|
+
export const getExecArgsFromMutation = ({ mutationDef, mutationEventDecoded, }) => {
|
5
5
|
let statementRes;
|
6
6
|
switch (typeof mutationDef.sql) {
|
7
7
|
case 'function': {
|
8
|
-
const
|
9
|
-
const res = mutationDef.sql(mutationArgsDecoded);
|
8
|
+
const res = mutationDef.sql(mutationEventDecoded.args);
|
10
9
|
statementRes = Array.isArray(res) ? res : [res];
|
11
10
|
break;
|
12
11
|
}
|
@@ -21,8 +20,9 @@ export const getExecArgsFromMutation = ({ mutationDef, mutationEvent, }) => {
|
|
21
20
|
}
|
22
21
|
return statementRes.map((statementRes) => {
|
23
22
|
const statementSql = typeof statementRes === 'string' ? statementRes : statementRes.sql;
|
24
|
-
const
|
25
|
-
|
23
|
+
const bindValues = typeof statementRes === 'string'
|
24
|
+
? Schema.encodeUnknownSync(mutationDef.schema)(mutationEventDecoded.args)
|
25
|
+
: statementRes.bindValues;
|
26
26
|
const writeTables = typeof statementRes === 'string' ? undefined : statementRes.writeTables;
|
27
27
|
return { statementSql, bindValues: prepareBindValues(bindValues ?? {}, statementSql), writeTables };
|
28
28
|
});
|
package/dist/mutation.js.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"mutation.js","sourceRoot":"","sources":["../src/mutation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAEhD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AAIpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAA;AAE7C,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,EACtC,WAAW,EACX,
|
1
|
+
{"version":3,"file":"mutation.js","sourceRoot":"","sources":["../src/mutation.ts"],"names":[],"mappings":"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"}
|
@@ -7,6 +7,6 @@ export declare const invalidQueryBuilder: (msg?: string) => never;
|
|
7
7
|
export declare const getResultSchema: (qb: QueryBuilder<any, any, any>) => Schema.Array$<Schema.Schema<any, any, never>> | Schema.SchemaClass<any, readonly any[], never> | Schema.SchemaClass<number, readonly {
|
8
8
|
readonly count: number;
|
9
9
|
}[], never> | Schema.SchemaClass<any, readonly {
|
10
|
-
value: any;
|
10
|
+
readonly value: any;
|
11
11
|
}[], never>;
|
12
12
|
//# sourceMappingURL=impl.d.ts.map
|
@@ -1,14 +1,14 @@
|
|
1
1
|
import { Effect } from '@livestore/utils/effect';
|
2
|
-
import { type MigrationOptionsFromMutationLog, type
|
2
|
+
import { type MigrationOptionsFromMutationLog, type SynchronousDatabase, UnexpectedError } from './adapter-types.js';
|
3
3
|
import type { LiveStoreSchema } from './schema/mod.js';
|
4
|
-
export declare const rehydrateFromMutationLog: ({ logDb, schema, migrationOptions, onProgress, }: {
|
5
|
-
logDb:
|
6
|
-
db:
|
4
|
+
export declare const rehydrateFromMutationLog: ({ logDb, db, schema, migrationOptions, onProgress, }: {
|
5
|
+
logDb: SynchronousDatabase;
|
6
|
+
db: SynchronousDatabase;
|
7
7
|
schema: LiveStoreSchema;
|
8
8
|
migrationOptions: MigrationOptionsFromMutationLog;
|
9
9
|
onProgress: (_: {
|
10
10
|
done: number;
|
11
11
|
total: number;
|
12
12
|
}) => Effect.Effect<void>;
|
13
|
-
}) => Effect.Effect<void, UnexpectedError
|
13
|
+
}) => Effect.Effect<void, UnexpectedError, never>;
|
14
14
|
//# sourceMappingURL=rehydrate-from-mutationlog.d.ts.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"rehydrate-from-mutationlog.d.ts","sourceRoot":"","sources":["../src/rehydrate-from-mutationlog.ts"],"names":[],"mappings":"AACA,OAAO,EAAS,MAAM,EAA0B,MAAM,yBAAyB,CAAA;AAE/E,OAAO,EAAE,KAAK,+BAA+B,EAAE,KAAK,
|
1
|
+
{"version":3,"file":"rehydrate-from-mutationlog.d.ts","sourceRoot":"","sources":["../src/rehydrate-from-mutationlog.ts"],"names":[],"mappings":"AACA,OAAO,EAAS,MAAM,EAA0B,MAAM,yBAAyB,CAAA;AAE/E,OAAO,EAAE,KAAK,+BAA+B,EAAE,KAAK,mBAAmB,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AAEpH,OAAO,KAAK,EAAE,eAAe,EAAkD,MAAM,iBAAiB,CAAA;AAKtG,eAAO,MAAM,wBAAwB,yDAMlC;IACD,KAAK,EAAE,mBAAmB,CAAA;IAC1B,EAAE,EAAE,mBAAmB,CAAA;IACvB,MAAM,EAAE,eAAe,CAAA;IACvB,gBAAgB,EAAE,+BAA+B,CAAA;IACjD,UAAU,EAAE,CAAC,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;CACxE,gDAwGE,CAAA"}
|
@@ -1,16 +1,12 @@
|
|
1
|
-
import { memoizeByRef, shouldNeverHappen } from '@livestore/utils';
|
1
|
+
import { isDevEnv, memoizeByRef, shouldNeverHappen } from '@livestore/utils';
|
2
2
|
import { Chunk, Effect, Option, Schema, Stream } from '@livestore/utils/effect';
|
3
3
|
import { UnexpectedError } from './adapter-types.js';
|
4
|
-
import {
|
4
|
+
import { getExecArgsFromMutation } from './mutation.js';
|
5
5
|
import { EventId, MUTATION_LOG_META_TABLE } from './schema/mod.js';
|
6
6
|
import { sql } from './util.js';
|
7
|
-
export const rehydrateFromMutationLog = ({ logDb,
|
8
|
-
// TODO re-use this db when bringing back the boot in-memory db implementation
|
9
|
-
// db,
|
10
|
-
schema, migrationOptions, onProgress, }) => Effect.gen(function* () {
|
7
|
+
export const rehydrateFromMutationLog = ({ logDb, db, schema, migrationOptions, onProgress, }) => Effect.gen(function* () {
|
11
8
|
const mutationsCount = logDb.select(`SELECT COUNT(*) AS count FROM ${MUTATION_LOG_META_TABLE}`)[0].count;
|
12
9
|
const hashMutation = memoizeByRef((mutation) => Schema.hash(mutation.schema));
|
13
|
-
const applyMutation = yield* makeApplyMutation;
|
14
10
|
const processMutation = (row) => Effect.gen(function* () {
|
15
11
|
const mutationDef = schema.mutations.get(row.mutation) ?? shouldNeverHappen(`Unknown mutation ${row.mutation}`);
|
16
12
|
if (migrationOptions.excludeMutations?.has(row.mutation) === true)
|
@@ -18,9 +14,7 @@ schema, migrationOptions, onProgress, }) => Effect.gen(function* () {
|
|
18
14
|
if (hashMutation(mutationDef) !== row.schemaHash) {
|
19
15
|
yield* Effect.logWarning(`Schema hash mismatch for mutation ${row.mutation}. Trying to apply mutation anyway.`);
|
20
16
|
}
|
21
|
-
const
|
22
|
-
// Checking whether the schema has changed in an incompatible way
|
23
|
-
yield* Schema.decodeUnknown(mutationDef.schema)(args).pipe(Effect.mapError((cause) => UnexpectedError.make({
|
17
|
+
const argsDecoded = yield* Schema.decodeUnknown(Schema.parseJson(mutationDef.schema))(row.argsJson).pipe(Effect.mapError((cause) => UnexpectedError.make({
|
24
18
|
cause,
|
25
19
|
note: `\
|
26
20
|
There was an error during rehydrating from the mutation log while decoding
|
@@ -28,13 +22,25 @@ the persisted mutation event args for mutation "${row.mutation}".
|
|
28
22
|
This likely means the schema has changed in an incompatible way.
|
29
23
|
`,
|
30
24
|
})));
|
31
|
-
const
|
25
|
+
const mutationEventDecoded = {
|
32
26
|
id: { global: row.idGlobal, local: row.idLocal },
|
33
27
|
parentId: { global: row.parentIdGlobal, local: row.parentIdLocal },
|
34
28
|
mutation: row.mutation,
|
35
|
-
args,
|
29
|
+
args: argsDecoded,
|
36
30
|
};
|
37
|
-
|
31
|
+
const execArgsArr = getExecArgsFromMutation({ mutationDef, mutationEventDecoded });
|
32
|
+
const makeExecuteOptions = (statementSql, bindValues) => ({
|
33
|
+
onRowsChanged: (rowsChanged) => {
|
34
|
+
if (rowsChanged === 0 && migrationOptions.logging?.excludeAffectedRows?.(statementSql) !== true) {
|
35
|
+
console.warn(`Mutation "${mutationDef.name}" did not affect any rows:`, statementSql, bindValues);
|
36
|
+
}
|
37
|
+
},
|
38
|
+
});
|
39
|
+
for (const { statementSql, bindValues } of execArgsArr) {
|
40
|
+
// TODO cache prepared statements for mutations
|
41
|
+
db.execute(statementSql, bindValues, isDevEnv() ? makeExecuteOptions(statementSql, bindValues) : undefined);
|
42
|
+
// console.log(`Re-executed mutation ${mutationSql}`, bindValues)
|
43
|
+
}
|
38
44
|
}).pipe(Effect.withSpan(`@livestore/common:rehydrateFromMutationLog:processMutation`));
|
39
45
|
const CHUNK_SIZE = 100;
|
40
46
|
const stmt = logDb.prepare(sql `\
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"rehydrate-from-mutationlog.js","sourceRoot":"","sources":["../src/rehydrate-from-mutationlog.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;
|
1
|
+
{"version":3,"file":"rehydrate-from-mutationlog.js","sourceRoot":"","sources":["../src/rehydrate-from-mutationlog.ts"],"names":[],"mappings":"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"}
|
package/dist/schema/EventId.d.ts
CHANGED
@@ -1,11 +1,4 @@
|
|
1
|
-
import {
|
2
|
-
export type LocalEventId = Brand.Branded<number, 'LocalEventId'>;
|
3
|
-
export declare const localEventId: Brand.Brand.Constructor<LocalEventId>;
|
4
|
-
export declare const LocalEventId: Schema.BrandSchema<number & Brand.Brand<"LocalEventId">, number, never>;
|
5
|
-
export type GlobalEventId = Brand.Branded<number, 'GlobalEventId'>;
|
6
|
-
export declare const globalEventId: Brand.Brand.Constructor<GlobalEventId>;
|
7
|
-
export declare const GlobalEventId: Schema.BrandSchema<number & Brand.Brand<"GlobalEventId">, number, never>;
|
8
|
-
export declare const localDefault: LocalEventId;
|
1
|
+
import { Schema } from '@livestore/utils/effect';
|
9
2
|
/**
|
10
3
|
* LiveStore event id value consisting of a globally unique event sequence number
|
11
4
|
* and a local sequence number.
|
@@ -13,12 +6,12 @@ export declare const localDefault: LocalEventId;
|
|
13
6
|
* The local sequence number is only used for localOnly mutations and starts from 0 for each global sequence number.
|
14
7
|
*/
|
15
8
|
export type EventId = {
|
16
|
-
global:
|
17
|
-
local:
|
9
|
+
global: number;
|
10
|
+
local: number;
|
18
11
|
};
|
19
12
|
export declare const EventId: Schema.Struct<{
|
20
|
-
global: Schema.
|
21
|
-
local: Schema.
|
13
|
+
global: typeof Schema.Number;
|
14
|
+
local: typeof Schema.Number;
|
22
15
|
}>;
|
23
16
|
/**
|
24
17
|
* Compare two event ids i.e. checks if the first event id is less than the second.
|
@@ -30,10 +23,15 @@ export type EventIdPair = {
|
|
30
23
|
parentId: EventId;
|
31
24
|
};
|
32
25
|
export declare const ROOT: {
|
33
|
-
global:
|
34
|
-
local:
|
26
|
+
global: number;
|
27
|
+
local: number;
|
35
28
|
};
|
36
29
|
export declare const isGreaterThan: (a: EventId, b: EventId) => boolean;
|
37
|
-
export declare const
|
38
|
-
|
30
|
+
export declare const nextPair: (id: EventId, isLocal: boolean) => {
|
31
|
+
id: {
|
32
|
+
global: number;
|
33
|
+
local: number;
|
34
|
+
};
|
35
|
+
parentId: EventId;
|
36
|
+
};
|
39
37
|
//# sourceMappingURL=EventId.d.ts.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"EventId.d.ts","sourceRoot":"","sources":["../../src/schema/EventId.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
1
|
+
{"version":3,"file":"EventId.d.ts","sourceRoot":"","sources":["../../src/schema/EventId.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAEhD;;;;;GAKG;AACH,MAAM,MAAM,OAAO,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAA;AAEvD,eAAO,MAAM,OAAO;;;EAG0B,CAAA;AAE9C;;GAEG;AACH,eAAO,MAAM,OAAO,MAAO,OAAO,KAAK,OAAO,WAK7C,CAAA;AAED,eAAO,MAAM,OAAO,MAAO,OAAO,KAAK,OAAO,YAAiD,CAAA;AAE/F,MAAM,MAAM,WAAW,GAAG;IAAE,EAAE,EAAE,OAAO,CAAC;IAAC,QAAQ,EAAE,OAAO,CAAA;CAAE,CAAA;AAE5D,eAAO,MAAM,IAAI;;;CAA6C,CAAA;AAE9D,eAAO,MAAM,aAAa,MAAO,OAAO,KAAK,OAAO,YAEnD,CAAA;AAED,eAAO,MAAM,QAAQ,OAAQ,OAAO,WAAW,OAAO;;;;;;CAUrD,CAAA"}
|
package/dist/schema/EventId.js
CHANGED
@@ -1,12 +1,7 @@
|
|
1
|
-
import {
|
2
|
-
export const localEventId = Brand.nominal();
|
3
|
-
export const LocalEventId = Schema.fromBrand(localEventId)(Schema.Int);
|
4
|
-
export const globalEventId = Brand.nominal();
|
5
|
-
export const GlobalEventId = Schema.fromBrand(globalEventId)(Schema.Int);
|
6
|
-
export const localDefault = 0;
|
1
|
+
import { Schema } from '@livestore/utils/effect';
|
7
2
|
export const EventId = Schema.Struct({
|
8
|
-
global:
|
9
|
-
local:
|
3
|
+
global: Schema.Number,
|
4
|
+
local: Schema.Number,
|
10
5
|
}).annotations({ title: 'LiveStore.EventId' });
|
11
6
|
/**
|
12
7
|
* Compare two event ids i.e. checks if the first event id is less than the second.
|
@@ -18,21 +13,18 @@ export const compare = (a, b) => {
|
|
18
13
|
return a.local - b.local;
|
19
14
|
};
|
20
15
|
export const isEqual = (a, b) => a.global === b.global && a.local === b.local;
|
21
|
-
export const ROOT = { global: -1, local:
|
16
|
+
export const ROOT = { global: -1, local: 0 };
|
22
17
|
export const isGreaterThan = (a, b) => {
|
23
18
|
return a.global > b.global || (a.global === b.global && a.local > b.local);
|
24
19
|
};
|
25
|
-
export const make = (id) => {
|
26
|
-
return Schema.is(EventId)(id) ? id : Schema.decodeSync(EventId)(id);
|
27
|
-
};
|
28
20
|
export const nextPair = (id, isLocal) => {
|
29
21
|
if (isLocal) {
|
30
|
-
return { id: { global: id.global, local:
|
22
|
+
return { id: { global: id.global, local: id.local + 1 }, parentId: id };
|
31
23
|
}
|
32
24
|
return {
|
33
|
-
id: { global:
|
25
|
+
id: { global: id.global + 1, local: 0 },
|
34
26
|
// NOTE we always point to `local: 0` for non-localOnly mutations
|
35
|
-
parentId: { global: id.global, local:
|
27
|
+
parentId: { global: id.global, local: 0 },
|
36
28
|
};
|
37
29
|
};
|
38
30
|
//# sourceMappingURL=EventId.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"EventId.js","sourceRoot":"","sources":["../../src/schema/EventId.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
1
|
+
{"version":3,"file":"EventId.js","sourceRoot":"","sources":["../../src/schema/EventId.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAUhD,MAAM,CAAC,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC;IACnC,MAAM,EAAE,MAAM,CAAC,MAAM;IACrB,KAAK,EAAE,MAAM,CAAC,MAAM;CACrB,CAAC,CAAC,WAAW,CAAC,EAAE,KAAK,EAAE,mBAAmB,EAAE,CAAC,CAAA;AAE9C;;GAEG;AACH,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,CAAU,EAAE,CAAU,EAAE,EAAE;IAChD,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,EAAE,CAAC;QAC1B,OAAO,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,MAAM,CAAA;IAC5B,CAAC;IACD,OAAO,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAA;AAC1B,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,CAAU,EAAE,CAAU,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,KAAK,CAAA;AAI/F,MAAM,CAAC,MAAM,IAAI,GAAG,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAoB,CAAA;AAE9D,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,CAAU,EAAE,CAAU,EAAE,EAAE;IACtD,OAAO,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,CAAA;AAC5E,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,EAAW,EAAE,OAAgB,EAAE,EAAE;IACxD,IAAI,OAAO,EAAE,CAAC;QACZ,OAAO,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK,GAAG,CAAC,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAA;IACzE,CAAC;IAED,OAAO;QACL,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC,MAAM,GAAG,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE;QACvC,iEAAiE;QACjE,QAAQ,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE;KAC1C,CAAA;AACH,CAAC,CAAA"}
|