@livestore/common 0.3.0-dev.47 → 0.3.0-dev.48
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 +8 -6
- package/dist/adapter-types.d.ts.map +1 -1
- package/dist/adapter-types.js +2 -2
- package/dist/adapter-types.js.map +1 -1
- package/dist/devtools/devtools-messages-client-session.d.ts +25 -25
- package/dist/devtools/devtools-messages-client-session.js +3 -3
- package/dist/devtools/devtools-messages-client-session.js.map +1 -1
- package/dist/devtools/devtools-messages-common.d.ts +6 -6
- package/dist/devtools/devtools-messages-leader.d.ts +30 -30
- package/dist/devtools/devtools-messages-leader.js +3 -3
- package/dist/devtools/devtools-messages-leader.js.map +1 -1
- package/dist/leader-thread/LeaderSyncProcessor.d.ts.map +1 -1
- package/dist/leader-thread/LeaderSyncProcessor.js +27 -25
- package/dist/leader-thread/LeaderSyncProcessor.js.map +1 -1
- package/dist/leader-thread/eventlog.d.ts +10 -10
- package/dist/leader-thread/eventlog.d.ts.map +1 -1
- package/dist/leader-thread/eventlog.js +24 -24
- package/dist/leader-thread/eventlog.js.map +1 -1
- package/dist/leader-thread/leader-worker-devtools.js +1 -1
- package/dist/leader-thread/leader-worker-devtools.js.map +1 -1
- package/dist/leader-thread/materialize-event.d.ts +3 -3
- package/dist/leader-thread/materialize-event.d.ts.map +1 -1
- package/dist/leader-thread/materialize-event.js +19 -15
- package/dist/leader-thread/materialize-event.js.map +1 -1
- package/dist/leader-thread/types.d.ts +4 -4
- package/dist/leader-thread/types.d.ts.map +1 -1
- package/dist/make-client-session.d.ts +1 -1
- package/dist/make-client-session.d.ts.map +1 -1
- package/dist/make-client-session.js +2 -1
- package/dist/make-client-session.js.map +1 -1
- package/dist/materializer-helper.d.ts.map +1 -1
- package/dist/materializer-helper.js +4 -2
- package/dist/materializer-helper.js.map +1 -1
- package/dist/rematerialize-from-eventlog.js +9 -9
- package/dist/rematerialize-from-eventlog.js.map +1 -1
- package/dist/schema/EventId.d.ts +28 -28
- package/dist/schema/EventId.d.ts.map +1 -1
- package/dist/schema/EventId.js +9 -9
- package/dist/schema/EventId.js.map +1 -1
- package/dist/schema/EventId.test.js +5 -5
- package/dist/schema/EventId.test.js.map +1 -1
- package/dist/schema/EventNumber.d.ts +57 -0
- package/dist/schema/EventNumber.d.ts.map +1 -0
- package/dist/schema/EventNumber.js +82 -0
- package/dist/schema/EventNumber.js.map +1 -0
- package/dist/schema/EventNumber.test.d.ts +2 -0
- package/dist/schema/EventNumber.test.d.ts.map +1 -0
- package/dist/schema/EventNumber.test.js +11 -0
- package/dist/schema/EventNumber.test.js.map +1 -0
- package/dist/schema/EventSequenceNumber.d.ts +57 -0
- package/dist/schema/EventSequenceNumber.d.ts.map +1 -0
- package/dist/schema/EventSequenceNumber.js +82 -0
- package/dist/schema/EventSequenceNumber.js.map +1 -0
- package/dist/schema/EventSequenceNumber.test.d.ts +2 -0
- package/dist/schema/EventSequenceNumber.test.d.ts.map +1 -0
- package/dist/schema/EventSequenceNumber.test.js +11 -0
- package/dist/schema/EventSequenceNumber.test.js.map +1 -0
- package/dist/schema/LiveStoreEvent.d.ts +81 -79
- package/dist/schema/LiveStoreEvent.d.ts.map +1 -1
- package/dist/schema/LiveStoreEvent.js +31 -32
- package/dist/schema/LiveStoreEvent.js.map +1 -1
- package/dist/schema/mod.d.ts +1 -1
- package/dist/schema/mod.d.ts.map +1 -1
- package/dist/schema/mod.js +1 -1
- package/dist/schema/mod.js.map +1 -1
- package/dist/schema/state/sqlite/query-builder/impl.d.ts.map +1 -1
- package/dist/schema/state/sqlite/query-builder/impl.js +2 -2
- package/dist/schema/state/sqlite/query-builder/impl.js.map +1 -1
- package/dist/schema/state/sqlite/query-builder/impl.test.d.ts +3 -3
- package/dist/schema/state/sqlite/query-builder/impl.test.js +9 -0
- package/dist/schema/state/sqlite/query-builder/impl.test.js.map +1 -1
- package/dist/schema/state/sqlite/system-tables.d.ts +52 -52
- package/dist/schema/state/sqlite/system-tables.d.ts.map +1 -1
- package/dist/schema/state/sqlite/system-tables.js +11 -10
- package/dist/schema/state/sqlite/system-tables.js.map +1 -1
- package/dist/sync/ClientSessionSyncProcessor.js +6 -6
- package/dist/sync/ClientSessionSyncProcessor.js.map +1 -1
- package/dist/sync/next/compact-events.js +38 -35
- package/dist/sync/next/compact-events.js.map +1 -1
- package/dist/sync/next/facts.d.ts +4 -4
- package/dist/sync/next/facts.d.ts.map +1 -1
- package/dist/sync/next/facts.js +8 -8
- package/dist/sync/next/facts.js.map +1 -1
- package/dist/sync/next/history-dag-common.d.ts +4 -4
- package/dist/sync/next/history-dag-common.d.ts.map +1 -1
- package/dist/sync/next/history-dag-common.js +7 -4
- package/dist/sync/next/history-dag-common.js.map +1 -1
- package/dist/sync/next/history-dag.d.ts +0 -2
- package/dist/sync/next/history-dag.d.ts.map +1 -1
- package/dist/sync/next/history-dag.js +15 -13
- package/dist/sync/next/history-dag.js.map +1 -1
- package/dist/sync/next/rebase-events.d.ts.map +1 -1
- package/dist/sync/next/rebase-events.js +10 -4
- package/dist/sync/next/rebase-events.js.map +1 -1
- package/dist/sync/next/test/compact-events.calculator.test.js +13 -13
- package/dist/sync/next/test/compact-events.calculator.test.js.map +1 -1
- package/dist/sync/next/test/compact-events.test.js +31 -31
- package/dist/sync/next/test/compact-events.test.js.map +1 -1
- package/dist/sync/next/test/event-fixtures.d.ts +10 -0
- package/dist/sync/next/test/event-fixtures.d.ts.map +1 -1
- package/dist/sync/next/test/event-fixtures.js +19 -13
- package/dist/sync/next/test/event-fixtures.js.map +1 -1
- package/dist/sync/sync.d.ts +11 -11
- package/dist/sync/sync.d.ts.map +1 -1
- package/dist/sync/sync.js +5 -5
- package/dist/sync/sync.js.map +1 -1
- package/dist/sync/syncstate.d.ts +18 -18
- package/dist/sync/syncstate.d.ts.map +1 -1
- package/dist/sync/syncstate.js +46 -47
- package/dist/sync/syncstate.js.map +1 -1
- package/dist/sync/syncstate.test.js +110 -110
- 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 +4 -4
- package/dist/sync/validate-push-payload.js.map +1 -1
- package/dist/version.d.ts +2 -2
- package/dist/version.js +2 -2
- package/package.json +4 -4
- package/src/adapter-types.ts +6 -4
- package/src/devtools/devtools-messages-client-session.ts +3 -3
- package/src/devtools/devtools-messages-leader.ts +3 -3
- package/src/leader-thread/LeaderSyncProcessor.ts +36 -29
- package/src/leader-thread/eventlog.ts +36 -31
- package/src/leader-thread/leader-worker-devtools.ts +1 -1
- package/src/leader-thread/materialize-event.ts +21 -17
- package/src/leader-thread/types.ts +4 -4
- package/src/make-client-session.ts +2 -0
- package/src/materializer-helper.ts +5 -2
- package/src/rematerialize-from-eventlog.ts +10 -10
- package/src/schema/EventSequenceNumber.test.ts +12 -0
- package/src/schema/EventSequenceNumber.ts +121 -0
- package/src/schema/LiveStoreEvent.ts +66 -65
- package/src/schema/mod.ts +1 -1
- package/src/schema/state/sqlite/query-builder/impl.test.ts +9 -0
- package/src/schema/state/sqlite/query-builder/impl.ts +3 -2
- package/src/schema/state/sqlite/system-tables.ts +11 -10
- package/src/sync/ClientSessionSyncProcessor.ts +6 -6
- package/src/sync/next/compact-events.ts +38 -35
- package/src/sync/next/facts.ts +12 -9
- package/src/sync/next/history-dag-common.ts +9 -6
- package/src/sync/next/history-dag.ts +15 -16
- package/src/sync/next/rebase-events.ts +10 -4
- package/src/sync/next/test/compact-events.calculator.test.ts +13 -13
- package/src/sync/next/test/compact-events.test.ts +31 -31
- package/src/sync/next/test/event-fixtures.ts +20 -13
- package/src/sync/sync.ts +7 -7
- package/src/sync/syncstate.test.ts +112 -112
- package/src/sync/syncstate.ts +58 -48
- package/src/sync/validate-push-payload.ts +5 -5
- package/src/version.ts +2 -2
- package/src/schema/EventId.test.ts +0 -12
- package/src/schema/EventId.ts +0 -106
@@ -1,5 +1,5 @@
|
|
1
1
|
import { Schema } from '@livestore/utils/effect';
|
2
|
-
import * as
|
2
|
+
import * as EventSequenceNumber from '../../EventSequenceNumber.js';
|
3
3
|
import { SqliteDsl } from './db-schema/mod.js';
|
4
4
|
import { table } from './table-def.js';
|
5
5
|
/// Read model DB
|
@@ -32,14 +32,15 @@ export const sessionChangesetMetaTable = table({
|
|
32
32
|
name: SESSION_CHANGESET_META_TABLE,
|
33
33
|
columns: {
|
34
34
|
// TODO bring back primary key
|
35
|
-
|
36
|
-
|
35
|
+
seqNumGlobal: SqliteDsl.integer({ schema: EventSequenceNumber.GlobalEventSequenceNumber }),
|
36
|
+
seqNumClient: SqliteDsl.integer({ schema: EventSequenceNumber.ClientEventSequenceNumber }),
|
37
37
|
changeset: SqliteDsl.blob({ nullable: true }),
|
38
38
|
debug: SqliteDsl.json({ nullable: true }),
|
39
39
|
},
|
40
|
-
indexes: [{ columns: ['
|
40
|
+
indexes: [{ columns: ['seqNumGlobal', 'seqNumClient'], name: 'idx_session_changeset_id' }],
|
41
41
|
});
|
42
42
|
export const LEADER_MERGE_COUNTER_TABLE = '__livestore_leader_merge_counter';
|
43
|
+
// TODO get rid of this table in favour of client-only merge generation
|
43
44
|
export const leaderMergeCounterTable = table({
|
44
45
|
name: LEADER_MERGE_COUNTER_TABLE,
|
45
46
|
columns: {
|
@@ -60,10 +61,10 @@ export const eventlogMetaTable = table({
|
|
60
61
|
name: EVENTLOG_META_TABLE,
|
61
62
|
columns: {
|
62
63
|
// TODO Adjust modeling so a global event never needs a client id component
|
63
|
-
|
64
|
-
|
65
|
-
|
66
|
-
|
64
|
+
seqNumGlobal: SqliteDsl.integer({ primaryKey: true, schema: EventSequenceNumber.GlobalEventSequenceNumber }),
|
65
|
+
seqNumClient: SqliteDsl.integer({ primaryKey: true, schema: EventSequenceNumber.ClientEventSequenceNumber }),
|
66
|
+
parentSeqNumGlobal: SqliteDsl.integer({ schema: EventSequenceNumber.GlobalEventSequenceNumber }),
|
67
|
+
parentSeqNumClient: SqliteDsl.integer({ schema: EventSequenceNumber.ClientEventSequenceNumber }),
|
67
68
|
name: SqliteDsl.text({}),
|
68
69
|
argsJson: SqliteDsl.text({ schema: Schema.parseJson(Schema.Any) }),
|
69
70
|
clientId: SqliteDsl.text({}),
|
@@ -72,8 +73,8 @@ export const eventlogMetaTable = table({
|
|
72
73
|
syncMetadataJson: SqliteDsl.text({ schema: Schema.parseJson(Schema.Option(Schema.JsonValue)) }),
|
73
74
|
},
|
74
75
|
indexes: [
|
75
|
-
{ columns: ['
|
76
|
-
{ columns: ['
|
76
|
+
{ columns: ['seqNumGlobal'], name: 'idx_eventlog_seqNumGlobal' },
|
77
|
+
{ columns: ['seqNumGlobal', 'seqNumClient'], name: 'idx_eventlog_seqNum' },
|
77
78
|
],
|
78
79
|
});
|
79
80
|
export const SYNC_STATUS_TABLE = '__livestore_sync_status';
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"system-tables.js","sourceRoot":"","sources":["../../../../src/schema/state/sqlite/system-tables.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAEhD,OAAO,KAAK,
|
1
|
+
{"version":3,"file":"system-tables.js","sourceRoot":"","sources":["../../../../src/schema/state/sqlite/system-tables.ts"],"names":[],"mappings":"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"}
|
@@ -2,7 +2,7 @@
|
|
2
2
|
import { LS_DEV, shouldNeverHappen, TRACE_VERBOSE } from '@livestore/utils';
|
3
3
|
import { BucketQueue, Effect, FiberHandle, Queue, Schema, Stream, Subscribable } from '@livestore/utils/effect';
|
4
4
|
import * as otel from '@opentelemetry/api';
|
5
|
-
import * as
|
5
|
+
import * as EventSequenceNumber from '../schema/EventSequenceNumber.js';
|
6
6
|
import * as LiveStoreEvent from '../schema/LiveStoreEvent.js';
|
7
7
|
import { getEventDef, SystemTables } from '../schema/mod.js';
|
8
8
|
import { sql } from '../util.js';
|
@@ -35,15 +35,15 @@ export const makeClientSessionSyncProcessor = ({ schema, clientSession, runtime,
|
|
35
35
|
const leaderPushQueue = BucketQueue.make().pipe(Effect.runSync);
|
36
36
|
const push = (batch, { otelContext }) => {
|
37
37
|
// TODO validate batch
|
38
|
-
let
|
38
|
+
let baseEventSequenceNumber = syncStateRef.current.localHead;
|
39
39
|
const encodedEventDefs = batch.map(({ name, args }) => {
|
40
40
|
const eventDef = getEventDef(schema, name);
|
41
|
-
const
|
42
|
-
|
41
|
+
const nextNumPair = EventSequenceNumber.nextPair(baseEventSequenceNumber, eventDef.eventDef.options.clientOnly);
|
42
|
+
baseEventSequenceNumber = nextNumPair.seqNum;
|
43
43
|
return new LiveStoreEvent.EncodedWithMeta(Schema.encodeUnknownSync(eventSchema)({
|
44
44
|
name,
|
45
45
|
args,
|
46
|
-
...
|
46
|
+
...nextNumPair,
|
47
47
|
clientId: clientSession.clientId,
|
48
48
|
sessionId: clientSession.sessionId,
|
49
49
|
}));
|
@@ -109,7 +109,7 @@ export const makeClientSessionSyncProcessor = ({ schema, clientSession, runtime,
|
|
109
109
|
const getMergeCounter = () => clientSession.sqliteDb.select(sql `SELECT mergeCounter FROM ${SystemTables.LEADER_MERGE_COUNTER_TABLE} WHERE id = 0`)[0]?.mergeCounter ?? 0;
|
110
110
|
// NOTE We need to lazily call `.pull` as we want the cursor to be updated
|
111
111
|
yield* Stream.suspend(() => clientSession.leaderThread.events.pull({
|
112
|
-
cursor: { mergeCounter: getMergeCounter(),
|
112
|
+
cursor: { mergeCounter: getMergeCounter(), eventNum: syncStateRef.current.localHead },
|
113
113
|
})).pipe(Stream.tap(({ payload, mergeCounter: leaderMergeCounter }) => Effect.gen(function* () {
|
114
114
|
// yield* Effect.logDebug('ClientSessionSyncProcessor:pull', payload)
|
115
115
|
if (clientSession.devtools.enabled) {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"ClientSessionSyncProcessor.js","sourceRoot":"","sources":["../../src/sync/ClientSessionSyncProcessor.ts"],"names":[],"mappings":"AAAA,2BAA2B;AAC3B,OAAO,EAAE,MAAM,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAA;AAE3E,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAA;AAC/G,OAAO,KAAK,IAAI,MAAM,oBAAoB,CAAA;AAG1C,OAAO,KAAK,
|
1
|
+
{"version":3,"file":"ClientSessionSyncProcessor.js","sourceRoot":"","sources":["../../src/sync/ClientSessionSyncProcessor.ts"],"names":[],"mappings":"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"}
|
@@ -1,6 +1,6 @@
|
|
1
|
+
import { EventSequenceNumber } from '../../schema/mod.js';
|
1
2
|
import { replacesFacts } from './facts.js';
|
2
3
|
import { graphologyDag } from './graphology_.js';
|
3
|
-
import { eventIdToString } from './history-dag.js';
|
4
4
|
import { emptyHistoryDag } from './history-dag-common.js';
|
5
5
|
/**
|
6
6
|
* Idea:
|
@@ -14,21 +14,21 @@ import { emptyHistoryDag } from './history-dag-common.js';
|
|
14
14
|
export const compactEvents = (inputDag) => {
|
15
15
|
const dag = inputDag.copy();
|
16
16
|
const compactedEventCount = 0;
|
17
|
-
const
|
17
|
+
const orderedEventSequenceNumberStrs = graphologyDag.topologicalSort(dag).reverse();
|
18
18
|
// drop root
|
19
|
-
|
20
|
-
for (const
|
21
|
-
if (dag.hasNode(
|
19
|
+
orderedEventSequenceNumberStrs.pop();
|
20
|
+
for (const eventNumStr of orderedEventSequenceNumberStrs) {
|
21
|
+
if (dag.hasNode(eventNumStr) === false) {
|
22
22
|
continue;
|
23
23
|
}
|
24
|
-
const subDagsForEvent = Array.from(makeSubDagsForEvent(dag,
|
24
|
+
const subDagsForEvent = Array.from(makeSubDagsForEvent(dag, eventNumStr));
|
25
25
|
for (const subDag of subDagsForEvent) {
|
26
26
|
let shouldRetry = true;
|
27
27
|
while (shouldRetry) {
|
28
|
-
const subDagsInHistory = findSubDagsInHistory(dag, subDag,
|
28
|
+
const subDagsInHistory = findSubDagsInHistory(dag, subDag, eventNumStr);
|
29
29
|
// console.debug(
|
30
30
|
// 'subDagsInHistory',
|
31
|
-
//
|
31
|
+
// eventNumStr,
|
32
32
|
// 'target',
|
33
33
|
// subDag.nodes(),
|
34
34
|
// 'found',
|
@@ -50,27 +50,30 @@ export const compactEvents = (inputDag) => {
|
|
50
50
|
}
|
51
51
|
return { dag, compactedEventCount };
|
52
52
|
};
|
53
|
-
function* makeSubDagsForEvent(inputDag,
|
54
|
-
/** Map from
|
55
|
-
let nextIterationEls = new Map([[
|
53
|
+
function* makeSubDagsForEvent(inputDag, eventNumStr) {
|
54
|
+
/** Map from eventNumStr to array of eventNumStrs that are dependencies */
|
55
|
+
let nextIterationEls = new Map([[eventNumStr, []]]);
|
56
56
|
let previousDag;
|
57
57
|
while (nextIterationEls.size > 0) {
|
58
58
|
// start with a copy of the last sub dag to build on top of
|
59
59
|
const subDag = previousDag?.copy() ?? emptyHistoryDag();
|
60
60
|
const currentIterationEls = new Map(nextIterationEls);
|
61
61
|
nextIterationEls = new Map();
|
62
|
-
for (const [
|
63
|
-
const node = inputDag.getNodeAttributes(
|
64
|
-
if (subDag.hasNode(
|
65
|
-
subDag.addNode(
|
62
|
+
for (const [currentEventSequenceNumberStr, edgeTargetIdStrs] of currentIterationEls) {
|
63
|
+
const node = inputDag.getNodeAttributes(currentEventSequenceNumberStr);
|
64
|
+
if (subDag.hasNode(currentEventSequenceNumberStr) === false) {
|
65
|
+
subDag.addNode(currentEventSequenceNumberStr, { ...node });
|
66
66
|
}
|
67
67
|
for (const edgeTargetIdStr of edgeTargetIdStrs) {
|
68
|
-
subDag.addEdge(
|
68
|
+
subDag.addEdge(currentEventSequenceNumberStr, edgeTargetIdStr, { type: 'facts' });
|
69
69
|
}
|
70
|
-
for (const depEdge of inputDag.outboundEdgeEntries(
|
70
|
+
for (const depEdge of inputDag.outboundEdgeEntries(currentEventSequenceNumberStr)) {
|
71
71
|
if (depEdge.attributes.type === 'facts') {
|
72
|
-
const
|
73
|
-
nextIterationEls.set(
|
72
|
+
const depEventSequenceNumberStr = depEdge.target;
|
73
|
+
nextIterationEls.set(depEventSequenceNumberStr, [
|
74
|
+
...(nextIterationEls.get(depEventSequenceNumberStr) ?? []),
|
75
|
+
currentEventSequenceNumberStr,
|
76
|
+
]);
|
74
77
|
}
|
75
78
|
}
|
76
79
|
}
|
@@ -80,17 +83,17 @@ function* makeSubDagsForEvent(inputDag, eventIdStr) {
|
|
80
83
|
}
|
81
84
|
}
|
82
85
|
/**
|
83
|
-
* Iterates over all events from root to `
|
86
|
+
* Iterates over all events from root to `upToExclEventSequenceNumberStr`
|
84
87
|
* and collects all valid sub dags that are replaced by `targetSubDag`.
|
85
88
|
*/
|
86
|
-
const findSubDagsInHistory = (inputDag, targetSubDag,
|
89
|
+
const findSubDagsInHistory = (inputDag, targetSubDag, upToExclEventSequenceNumberStr) => {
|
87
90
|
const subDags = [];
|
88
91
|
const allOutsideDependencies = [];
|
89
|
-
for (const
|
90
|
-
if (
|
92
|
+
for (const eventNumStr of graphologyDag.topologicalSort(inputDag)) {
|
93
|
+
if (eventNumStr === upToExclEventSequenceNumberStr) {
|
91
94
|
break;
|
92
95
|
}
|
93
|
-
for (const subDag of makeSubDagsForEvent(inputDag,
|
96
|
+
for (const subDag of makeSubDagsForEvent(inputDag, eventNumStr)) {
|
94
97
|
// console.debug('findSubDagsInHistory', 'target', targetSubDag.nodes(), 'subDag', subDag.nodes())
|
95
98
|
if (subDag.size < targetSubDag.size) {
|
96
99
|
continue;
|
@@ -120,9 +123,9 @@ const outsideDependenciesForDag = (subDag, inputDag) => {
|
|
120
123
|
for (const nodeIdStr of subDag.nodes()) {
|
121
124
|
for (const edgeEntry of inputDag.outboundEdgeEntries(nodeIdStr)) {
|
122
125
|
if (edgeEntry.attributes.type === 'facts') {
|
123
|
-
const
|
124
|
-
if (subDag.hasNode(
|
125
|
-
outsideDependencies.push(
|
126
|
+
const depEventSequenceNumberStr = edgeEntry.target;
|
127
|
+
if (subDag.hasNode(depEventSequenceNumberStr) === false) {
|
128
|
+
outsideDependencies.push(depEventSequenceNumberStr);
|
126
129
|
}
|
127
130
|
}
|
128
131
|
}
|
@@ -160,18 +163,18 @@ const dagReplacesDag = (dagA, dagB) => {
|
|
160
163
|
}
|
161
164
|
return true;
|
162
165
|
};
|
163
|
-
const removeEvent = (dag,
|
164
|
-
// console.debug('removing event',
|
165
|
-
const event = dag.getNodeAttributes(
|
166
|
-
const
|
167
|
-
const childEdges = dag.outboundEdgeEntries(
|
166
|
+
const removeEvent = (dag, eventNumStr) => {
|
167
|
+
// console.debug('removing event', eventNumStr)
|
168
|
+
const event = dag.getNodeAttributes(eventNumStr);
|
169
|
+
const parentSeqNumStr = EventSequenceNumber.toString(event.parentSeqNum);
|
170
|
+
const childEdges = dag.outboundEdgeEntries(eventNumStr);
|
168
171
|
for (const childEdge of childEdges) {
|
169
172
|
if (childEdge.attributes.type === 'parent') {
|
170
173
|
const childEvent = dag.getNodeAttributes(childEdge.target);
|
171
|
-
childEvent.
|
172
|
-
dag.addEdge(
|
174
|
+
childEvent.parentSeqNum = { ...event.parentSeqNum };
|
175
|
+
dag.addEdge(parentSeqNumStr, EventSequenceNumber.toString(childEvent.seqNum), { type: 'parent' });
|
173
176
|
}
|
174
177
|
}
|
175
|
-
dag.dropNode(
|
178
|
+
dag.dropNode(eventNumStr);
|
176
179
|
};
|
177
180
|
//# sourceMappingURL=compact-events.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"compact-events.js","sourceRoot":"","sources":["../../../src/sync/next/compact-events.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
1
|
+
{"version":3,"file":"compact-events.js","sourceRoot":"","sources":["../../../src/sync/next/compact-events.ts"],"names":[],"mappings":"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"}
|
@@ -1,8 +1,8 @@
|
|
1
1
|
import type { EventDefFacts, EventDefFactsGroup, EventDefFactsSnapshot, FactsCallback } from '../../schema/EventDef.js';
|
2
|
-
import type * as
|
2
|
+
import type * as EventSequenceNumber from '../../schema/EventSequenceNumber.js';
|
3
3
|
import { type HistoryDag, type HistoryDagNode } from './history-dag-common.js';
|
4
|
-
export declare const factsSnapshotForEvents: (events: HistoryDagNode[],
|
5
|
-
export declare const factsSnapshotForDag: (dag: HistoryDag,
|
4
|
+
export declare const factsSnapshotForEvents: (events: HistoryDagNode[], endEventSequenceNumber: EventSequenceNumber.EventSequenceNumber) => EventDefFactsSnapshot;
|
5
|
+
export declare const factsSnapshotForDag: (dag: HistoryDag, endEventSequenceNumber: EventSequenceNumber.EventSequenceNumber | undefined) => EventDefFactsSnapshot;
|
6
6
|
export type FactValidationResult = {
|
7
7
|
success: true;
|
8
8
|
} | {
|
@@ -33,5 +33,5 @@ export declare const getFactsGroupForEventArgs: ({ factsCallback, args, currentF
|
|
33
33
|
args: any;
|
34
34
|
currentFacts: EventDefFactsSnapshot;
|
35
35
|
}) => EventDefFactsGroup;
|
36
|
-
export declare const
|
36
|
+
export declare const compareEventSequenceNumbers: (a: EventSequenceNumber.EventSequenceNumber, b: EventSequenceNumber.EventSequenceNumber) => number;
|
37
37
|
//# sourceMappingURL=facts.d.ts.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"facts.d.ts","sourceRoot":"","sources":["../../../src/sync/next/facts.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAEV,aAAa,EACb,kBAAkB,EAClB,qBAAqB,EACrB,aAAa,EACd,MAAM,0BAA0B,CAAA;AACjC,OAAO,KAAK,KAAK,
|
1
|
+
{"version":3,"file":"facts.d.ts","sourceRoot":"","sources":["../../../src/sync/next/facts.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAEV,aAAa,EACb,kBAAkB,EAClB,qBAAqB,EACrB,aAAa,EACd,MAAM,0BAA0B,CAAA;AACjC,OAAO,KAAK,KAAK,mBAAmB,MAAM,qCAAqC,CAAA;AAE/E,OAAO,EAAoB,KAAK,UAAU,EAAE,KAAK,cAAc,EAAE,MAAM,yBAAyB,CAAA;AAEhG,eAAO,MAAM,sBAAsB,GACjC,QAAQ,cAAc,EAAE,EACxB,wBAAwB,mBAAmB,CAAC,mBAAmB,KAC9D,qBAYF,CAAA;AAED,eAAO,MAAM,mBAAmB,GAC9B,KAAK,UAAU,EACf,wBAAwB,mBAAmB,CAAC,mBAAmB,GAAG,SAAS,KAC1E,qBAeF,CAAA;AAED,MAAM,MAAM,oBAAoB,GAC5B;IACE,OAAO,EAAE,IAAI,CAAA;CACd,GACD;IACE,OAAO,EAAE,KAAK,CAAA;IACd,2DAA2D;IAC3D,KAAK,EAAE,MAAM,CAAA;IACb,aAAa,EAAE,aAAa,CAAA;IAC5B,QAAQ,EAAE;QACR,QAAQ,EAAE,aAAa,CAAA;QACvB,QAAQ,EAAE,aAAa,CAAA;KACxB,CAAA;IACD,eAAe,EAAE,aAAa,CAAA;CAC/B,CAAA;AAEL,eAAO,MAAM,aAAa,GAAI,kCAG3B;IACD,UAAU,EAAE,kBAAkB,EAAE,CAAA;IAChC,eAAe,EAAE,qBAAqB,CAAA;CACvC,KAAG,oBA8BH,CAAA;AAED,eAAO,MAAM,eAAe,GAAI,YAAY,kBAAkB,EAAE,EAAE,UAAU,qBAAqB,SAIhG,CAAA;AAED,eAAO,MAAM,cAAc,GAAI,WAAW,kBAAkB,EAAE,UAAU,qBAAqB,SAQ5F,CAAA;AAsBD,wCAAwC;AACxC,eAAO,MAAM,SAAS,GAAI,QAAQ,kBAAkB,EAAE,QAAQ,kBAAkB,KAAG,OAI5B,CAAA;AAEvD,eAAO,MAAM,aAAa,GAAI,QAAQ,kBAAkB,EAAE,QAAQ,kBAAkB,KAAG,OAWtF,CAAA;AAED,eAAO,MAAM,cAAc,GAAI,KAAK,aAAa,EAAE,UAAU,aAAa,YACX,CAAA;AAE/D,eAAO,MAAM,aAAa,GAAI,OAAO,aAAa,WAIjD,CAAA;AAED,eAAO,MAAM,cAAc,GAAI,MAAM,aAAa,EAAE,MAAM,aAAa,KAAG,OAOzE,CAAA;AAED,eAAO,MAAM,yBAAyB,GAAI,wCAIvC;IACD,aAAa,EAAE,aAAa,CAAC,GAAG,CAAC,GAAG,SAAS,CAAA;IAC7C,IAAI,EAAE,GAAG,CAAA;IACT,YAAY,EAAE,qBAAqB,CAAA;CACpC,KAAG,kBAwCH,CAAA;AAED,eAAO,MAAM,2BAA2B,GACtC,GAAG,mBAAmB,CAAC,mBAAmB,EAC1C,GAAG,mBAAmB,CAAC,mBAAmB,WAM3C,CAAA"}
|
package/dist/sync/next/facts.js
CHANGED
@@ -1,22 +1,22 @@
|
|
1
1
|
import { notYetImplemented } from '@livestore/utils';
|
2
2
|
import { graphologyDag } from './graphology_.js';
|
3
3
|
import { EMPTY_FACT_VALUE } from './history-dag-common.js';
|
4
|
-
export const factsSnapshotForEvents = (events,
|
4
|
+
export const factsSnapshotForEvents = (events, endEventSequenceNumber) => {
|
5
5
|
const facts = new Map();
|
6
6
|
for (const event of events) {
|
7
|
-
if (
|
7
|
+
if (compareEventSequenceNumbers(event.seqNum, endEventSequenceNumber) > 0) {
|
8
8
|
return facts;
|
9
9
|
}
|
10
10
|
applyFactGroup(event.factsGroup, facts);
|
11
11
|
}
|
12
12
|
return facts;
|
13
13
|
};
|
14
|
-
export const factsSnapshotForDag = (dag,
|
14
|
+
export const factsSnapshotForDag = (dag, endEventSequenceNumber) => {
|
15
15
|
const facts = new Map();
|
16
|
-
const
|
17
|
-
for (let i = 0; i <
|
18
|
-
const event = dag.getNodeAttributes(
|
19
|
-
if (
|
16
|
+
const orderedEventSequenceNumberStrs = graphologyDag.topologicalSort(dag);
|
17
|
+
for (let i = 0; i < orderedEventSequenceNumberStrs.length; i++) {
|
18
|
+
const event = dag.getNodeAttributes(orderedEventSequenceNumberStrs[i]);
|
19
|
+
if (endEventSequenceNumber !== undefined && compareEventSequenceNumbers(event.seqNum, endEventSequenceNumber) > 0) {
|
20
20
|
return facts;
|
21
21
|
}
|
22
22
|
applyFactGroup(event.factsGroup, facts);
|
@@ -147,7 +147,7 @@ export const getFactsGroupForEventArgs = ({ factsCallback, args, currentFacts, }
|
|
147
147
|
};
|
148
148
|
return facts;
|
149
149
|
};
|
150
|
-
export const
|
150
|
+
export const compareEventSequenceNumbers = (a, b) => {
|
151
151
|
if (a.global !== b.global) {
|
152
152
|
return a.global - b.global;
|
153
153
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"facts.js","sourceRoot":"","sources":["../../../src/sync/next/facts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AAUpD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAA;AAChD,OAAO,EAAE,gBAAgB,EAAwC,MAAM,yBAAyB,CAAA;AAEhG,MAAM,CAAC,MAAM,sBAAsB,GAAG,CACpC,MAAwB,EACxB,
|
1
|
+
{"version":3,"file":"facts.js","sourceRoot":"","sources":["../../../src/sync/next/facts.ts"],"names":[],"mappings":"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"}
|
@@ -1,5 +1,5 @@
|
|
1
1
|
import type { EventDefFactsGroup } from '../../schema/EventDef.js';
|
2
|
-
import * as
|
2
|
+
import * as EventSequenceNumber from '../../schema/EventSequenceNumber.js';
|
3
3
|
import { graphology } from './graphology_.js';
|
4
4
|
export declare const connectionTypeOptions: readonly ["parent", "facts"];
|
5
5
|
export type ConnectionType = (typeof connectionTypeOptions)[number];
|
@@ -12,10 +12,10 @@ export type HistoryDag = graphology.IGraph<HistoryDagNode, {
|
|
12
12
|
type: ConnectionType;
|
13
13
|
}>;
|
14
14
|
export declare const emptyHistoryDag: () => HistoryDag;
|
15
|
-
export declare const
|
15
|
+
export declare const rootParentNum: EventSequenceNumber.EventSequenceNumber;
|
16
16
|
export type HistoryDagNode = {
|
17
|
-
|
18
|
-
|
17
|
+
seqNum: EventSequenceNumber.EventSequenceNumber;
|
18
|
+
parentSeqNum: EventSequenceNumber.EventSequenceNumber;
|
19
19
|
name: string;
|
20
20
|
args: any;
|
21
21
|
/** Facts are being used for conflict detection and history compaction */
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"history-dag-common.d.ts","sourceRoot":"","sources":["../../../src/sync/next/history-dag-common.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAA;AAClE,OAAO,KAAK,
|
1
|
+
{"version":3,"file":"history-dag-common.d.ts","sourceRoot":"","sources":["../../../src/sync/next/history-dag-common.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAA;AAClE,OAAO,KAAK,mBAAmB,MAAM,qCAAqC,CAAA;AAC1E,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAE7C,eAAO,MAAM,qBAAqB,8BAA+B,CAAA;AACjE,MAAM,MAAM,cAAc,GAAG,CAAC,OAAO,qBAAqB,CAAC,CAAC,MAAM,CAAC,CAAA;AAEnE;;;;GAIG;AACH,MAAM,MAAM,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC,cAAc,EAAE;IAAE,IAAI,EAAE,cAAc,CAAA;CAAE,CAAC,CAAA;AAEpF,eAAO,MAAM,eAAe,QAAO,UAK/B,CAAA;AAGJ,eAAO,MAAM,aAAa,yCAGxB,CAAA;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,MAAM,EAAE,mBAAmB,CAAC,mBAAmB,CAAA;IAC/C,YAAY,EAAE,mBAAmB,CAAC,mBAAmB,CAAA;IACrD,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,GAAG,CAAA;IACT,yEAAyE;IACzE,UAAU,EAAE,kBAAkB,CAAA;IAC9B,IAAI,CAAC,EAAE,GAAG,CAAA;IACV,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,EAAE,MAAM,GAAG,SAAS,CAAA;CAC9B,CAAA;AAED,eAAO,MAAM,aAAa,EAAE,cAS3B,CAAA;AAED,eAAO,MAAM,gBAAgB,eAA6B,CAAA"}
|
@@ -1,4 +1,4 @@
|
|
1
|
-
import * as
|
1
|
+
import * as EventSequenceNumber from '../../schema/EventSequenceNumber.js';
|
2
2
|
import { graphology } from './graphology_.js';
|
3
3
|
export const connectionTypeOptions = ['parent', 'facts'];
|
4
4
|
export const emptyHistoryDag = () => new graphology.Graph({
|
@@ -7,10 +7,13 @@ export const emptyHistoryDag = () => new graphology.Graph({
|
|
7
7
|
type: 'directed',
|
8
8
|
});
|
9
9
|
// TODO consider making `ROOT_ID` parent to itself
|
10
|
-
export const
|
10
|
+
export const rootParentNum = EventSequenceNumber.make({
|
11
|
+
global: EventSequenceNumber.ROOT.global - 1,
|
12
|
+
client: EventSequenceNumber.clientDefault,
|
13
|
+
});
|
11
14
|
export const rootEventNode = {
|
12
|
-
|
13
|
-
|
15
|
+
seqNum: EventSequenceNumber.ROOT,
|
16
|
+
parentSeqNum: rootParentNum,
|
14
17
|
// unused below
|
15
18
|
name: '__Root__',
|
16
19
|
args: {},
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"history-dag-common.js","sourceRoot":"","sources":["../../../src/sync/next/history-dag-common.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,
|
1
|
+
{"version":3,"file":"history-dag-common.js","sourceRoot":"","sources":["../../../src/sync/next/history-dag-common.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,mBAAmB,MAAM,qCAAqC,CAAA;AAC1E,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAE7C,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,QAAQ,EAAE,OAAO,CAAU,CAAA;AAUjE,MAAM,CAAC,MAAM,eAAe,GAAG,GAAe,EAAE,CAC9C,IAAI,UAAU,CAAC,KAAK,CAAC;IACnB,cAAc,EAAE,KAAK;IACrB,KAAK,EAAE,IAAI;IACX,IAAI,EAAE,UAAU;CACjB,CAAC,CAAA;AAEJ,kDAAkD;AAClD,MAAM,CAAC,MAAM,aAAa,GAAG,mBAAmB,CAAC,IAAI,CAAC;IACpD,MAAM,EAAE,mBAAmB,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC;IAC3C,MAAM,EAAE,mBAAmB,CAAC,aAAa;CAC1C,CAAC,CAAA;AAcF,MAAM,CAAC,MAAM,aAAa,GAAmB;IAC3C,MAAM,EAAE,mBAAmB,CAAC,IAAI;IAChC,YAAY,EAAE,aAAa;IAC3B,eAAe;IACf,IAAI,EAAE,UAAU;IAChB,IAAI,EAAE,EAAE;IACR,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,GAAG,EAAE,EAAE,WAAW,EAAE,IAAI,GAAG,EAAE,EAAE,UAAU,EAAE,IAAI,GAAG,EAAE,EAAE,OAAO,EAAE,IAAI,GAAG,EAAE,EAAE;IACvG,QAAQ,EAAE,MAAM;IAChB,SAAS,EAAE,SAAS;CACrB,CAAA;AAED,MAAM,CAAC,MAAM,gBAAgB,GAAG,MAAM,CAAC,kBAAkB,CAAC,CAAA"}
|
@@ -1,6 +1,4 @@
|
|
1
|
-
import type * as EventId from '../../schema/EventId.js';
|
2
1
|
import { type HistoryDagNode } from './history-dag-common.js';
|
3
|
-
export declare const eventIdToString: (eventId: EventId.EventId) => string;
|
4
2
|
export declare const historyDagFromNodes: (dagNodes: HistoryDagNode[], options?: {
|
5
3
|
skipFactsCheck: boolean;
|
6
4
|
}) => import("./history-dag-common.js").HistoryDag;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"history-dag.d.ts","sourceRoot":"","sources":["../../../src/sync/next/history-dag.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"history-dag.d.ts","sourceRoot":"","sources":["../../../src/sync/next/history-dag.ts"],"names":[],"mappings":"AAEA,OAAO,EAAmB,KAAK,cAAc,EAAiB,MAAM,yBAAyB,CAAA;AAE7F,eAAO,MAAM,mBAAmB,GAAI,UAAU,cAAc,EAAE,EAAE,UAAU;IAAE,cAAc,EAAE,OAAO,CAAA;CAAE,iDA6DpG,CAAA"}
|
@@ -1,6 +1,6 @@
|
|
1
|
+
import * as EventSequenceNumber from '../../schema/EventSequenceNumber.js';
|
1
2
|
import { factsToString, validateFacts } from './facts.js';
|
2
|
-
import { emptyHistoryDag,
|
3
|
-
export const eventIdToString = (eventId) => eventId.client === 0 ? eventId.global.toString() : `${eventId.global}.${eventId.client}`;
|
3
|
+
import { emptyHistoryDag, rootParentNum } from './history-dag-common.js';
|
4
4
|
export const historyDagFromNodes = (dagNodes, options) => {
|
5
5
|
if (options?.skipFactsCheck !== true) {
|
6
6
|
const validationResult = validateFacts({
|
@@ -12,10 +12,12 @@ export const historyDagFromNodes = (dagNodes, options) => {
|
|
12
12
|
}
|
13
13
|
}
|
14
14
|
const dag = emptyHistoryDag();
|
15
|
-
dagNodes.forEach((node) => dag.addNode(
|
15
|
+
dagNodes.forEach((node) => dag.addNode(EventSequenceNumber.toString(node.seqNum), node));
|
16
16
|
dagNodes.forEach((node) => {
|
17
|
-
if (
|
18
|
-
dag.addEdge(
|
17
|
+
if (EventSequenceNumber.toString(node.parentSeqNum) !== EventSequenceNumber.toString(rootParentNum)) {
|
18
|
+
dag.addEdge(EventSequenceNumber.toString(node.parentSeqNum), EventSequenceNumber.toString(node.seqNum), {
|
19
|
+
type: 'parent',
|
20
|
+
});
|
19
21
|
}
|
20
22
|
});
|
21
23
|
dagNodes.forEach((node) => {
|
@@ -23,23 +25,23 @@ export const historyDagFromNodes = (dagNodes, options) => {
|
|
23
25
|
for (const factKey of factKeys) {
|
24
26
|
// Find the first ancestor node with a matching fact key (via modifySet or modifyUnset) by traversing the graph backwards via the parent edges
|
25
27
|
const depNode = (() => {
|
26
|
-
let
|
27
|
-
while (
|
28
|
-
const parentEdge = dag.inEdges(
|
28
|
+
let currentSeqNumStr = EventSequenceNumber.toString(node.seqNum);
|
29
|
+
while (currentSeqNumStr !== EventSequenceNumber.toString(rootParentNum)) {
|
30
|
+
const parentEdge = dag.inEdges(currentSeqNumStr).find((e) => dag.getEdgeAttribute(e, 'type') === 'parent');
|
29
31
|
if (!parentEdge)
|
30
32
|
return null;
|
31
|
-
const
|
32
|
-
const parentNode = dag.getNodeAttributes(
|
33
|
+
const parentSeqNumStr = dag.source(parentEdge);
|
34
|
+
const parentNode = dag.getNodeAttributes(parentSeqNumStr);
|
33
35
|
if (parentNode.factsGroup.modifySet.has(factKey) || parentNode.factsGroup.modifyUnset.has(factKey)) {
|
34
36
|
return parentNode;
|
35
37
|
}
|
36
|
-
|
38
|
+
currentSeqNumStr = parentSeqNumStr;
|
37
39
|
}
|
38
40
|
return null;
|
39
41
|
})();
|
40
42
|
if (depNode) {
|
41
|
-
const depNodeIdStr =
|
42
|
-
const nodeIdStr =
|
43
|
+
const depNodeIdStr = EventSequenceNumber.toString(depNode.seqNum);
|
44
|
+
const nodeIdStr = EventSequenceNumber.toString(node.seqNum);
|
43
45
|
if (dag.edges(depNodeIdStr, nodeIdStr).filter((e) => dag.getEdgeAttributes(e).type === 'facts').length === 0) {
|
44
46
|
dag.addEdge(depNodeIdStr, nodeIdStr, { type: 'facts' });
|
45
47
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"history-dag.js","sourceRoot":"","sources":["../../../src/sync/next/history-dag.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"history-dag.js","sourceRoot":"","sources":["../../../src/sync/next/history-dag.ts"],"names":[],"mappings":"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"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"rebase-events.d.ts","sourceRoot":"","sources":["../../../src/sync/next/rebase-events.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAA;AAE/E,OAAO,KAAK,KAAK,cAAc,MAAM,gCAAgC,CAAA;AACrE,OAAO,EAGL,KAAK,oBAAoB,EAG1B,MAAM,YAAY,CAAA;AACnB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAA;AAE7D,MAAM,MAAM,uBAAuB,GAAG,cAAc,GAAG;IACrD,YAAY,EAAE,SAAS,GAAG,qBAAqB,CAAA;IAC/C,iBAAiB,EAAE,cAAc,EAAE,CAAA;CACpC,CAAA;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,eAAe,EAAE,uBAAuB,EAAE,CAAA;IAC1C,kBAAkB,EAAE,uBAAuB,EAAE,CAAA;IAC7C,QAAQ,EAAE,CAAC,IAAI,EAAE;QACf,kBAAkB,EAAE,cAAc,CAAC,iBAAiB,EAAE,CAAA;QACtD,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAA;KACxC,KAAK,oBAAoB,CAAA;CAC3B,CAAA;AAED,MAAM,MAAM,YAAY,GAAG;IACzB,kBAAkB,EAAE,cAAc,CAAC,iBAAiB,EAAE,CAAA;CACvD,CAAA;AAED,MAAM,MAAM,QAAQ,GAAG,CAAC,KAAK,EAAE,WAAW,KAAK,YAAY,CAAA;AAE3D,eAAO,MAAM,eAAe,EAAE,QAM7B,CAAA;AAED,eAAO,MAAM,YAAY,GAAI,+FAO1B;IACD,kBAAkB,EAAE,cAAc,EAAE,CAAA;IACpC,eAAe,EAAE,cAAc,EAAE,CAAA;IACjC,QAAQ,EAAE,QAAQ,CAAA;IAClB,oBAAoB,EAAE,qBAAqB,CAAA;IAC3C,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,EAAE,MAAM,CAAA;CAClB,KAAG,aAAa,CAAC,cAAc,CAAC,UAAU,
|
1
|
+
{"version":3,"file":"rebase-events.d.ts","sourceRoot":"","sources":["../../../src/sync/next/rebase-events.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAA;AAE/E,OAAO,KAAK,KAAK,cAAc,MAAM,gCAAgC,CAAA;AACrE,OAAO,EAGL,KAAK,oBAAoB,EAG1B,MAAM,YAAY,CAAA;AACnB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAA;AAE7D,MAAM,MAAM,uBAAuB,GAAG,cAAc,GAAG;IACrD,YAAY,EAAE,SAAS,GAAG,qBAAqB,CAAA;IAC/C,iBAAiB,EAAE,cAAc,EAAE,CAAA;CACpC,CAAA;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,eAAe,EAAE,uBAAuB,EAAE,CAAA;IAC1C,kBAAkB,EAAE,uBAAuB,EAAE,CAAA;IAC7C,QAAQ,EAAE,CAAC,IAAI,EAAE;QACf,kBAAkB,EAAE,cAAc,CAAC,iBAAiB,EAAE,CAAA;QACtD,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAA;KACxC,KAAK,oBAAoB,CAAA;CAC3B,CAAA;AAED,MAAM,MAAM,YAAY,GAAG;IACzB,kBAAkB,EAAE,cAAc,CAAC,iBAAiB,EAAE,CAAA;CACvD,CAAA;AAED,MAAM,MAAM,QAAQ,GAAG,CAAC,KAAK,EAAE,WAAW,KAAK,YAAY,CAAA;AAE3D,eAAO,MAAM,eAAe,EAAE,QAM7B,CAAA;AAED,eAAO,MAAM,YAAY,GAAI,+FAO1B;IACD,kBAAkB,EAAE,cAAc,EAAE,CAAA;IACpC,eAAe,EAAE,cAAc,EAAE,CAAA;IACjC,QAAQ,EAAE,QAAQ,CAAA;IAClB,oBAAoB,EAAE,qBAAqB,CAAA;IAC3C,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,EAAE,MAAM,CAAA;CAClB,KAAG,aAAa,CAAC,cAAc,CAAC,UAAU,CAuD1C,CAAA"}
|