@livestore/common 0.4.0-dev.9 → 0.4.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/.tsbuildinfo +1 -1
- package/dist/ClientSessionLeaderThreadProxy.d.ts +27 -12
- package/dist/ClientSessionLeaderThreadProxy.d.ts.map +1 -1
- package/dist/ClientSessionLeaderThreadProxy.js.map +1 -1
- package/dist/WorkerTransportError.d.ts +11 -0
- package/dist/WorkerTransportError.d.ts.map +1 -0
- package/dist/WorkerTransportError.js +11 -0
- package/dist/WorkerTransportError.js.map +1 -0
- package/dist/adapter-types.d.ts +37 -7
- package/dist/adapter-types.d.ts.map +1 -1
- package/dist/adapter-types.js +27 -1
- package/dist/adapter-types.js.map +1 -1
- package/dist/bounded-collections.d.ts.map +1 -1
- package/dist/bounded-collections.js +6 -4
- package/dist/bounded-collections.js.map +1 -1
- package/dist/debug-info.d.ts.map +1 -1
- package/dist/debug-info.js +33 -6
- package/dist/debug-info.js.map +1 -1
- package/dist/devtools/devtools-compatibility.test.d.ts +2 -0
- package/dist/devtools/devtools-compatibility.test.d.ts.map +1 -0
- package/dist/devtools/devtools-compatibility.test.js +15 -0
- package/dist/devtools/devtools-compatibility.test.js.map +1 -0
- package/dist/devtools/devtools-messages-client-session.d.ts +55 -24
- package/dist/devtools/devtools-messages-client-session.d.ts.map +1 -1
- package/dist/devtools/devtools-messages-client-session.js +22 -5
- package/dist/devtools/devtools-messages-client-session.js.map +1 -1
- package/dist/devtools/devtools-messages-common.d.ts +11 -14
- package/dist/devtools/devtools-messages-common.d.ts.map +1 -1
- package/dist/devtools/devtools-messages-common.js +7 -9
- package/dist/devtools/devtools-messages-common.js.map +1 -1
- package/dist/devtools/devtools-messages-leader.d.ts +65 -30
- package/dist/devtools/devtools-messages-leader.d.ts.map +1 -1
- package/dist/devtools/devtools-messages-leader.js +29 -11
- package/dist/devtools/devtools-messages-leader.js.map +1 -1
- package/dist/devtools/devtools-sessioninfo.d.ts +14 -2
- package/dist/devtools/devtools-sessioninfo.d.ts.map +1 -1
- package/dist/devtools/devtools-sessioninfo.js +7 -4
- package/dist/devtools/devtools-sessioninfo.js.map +1 -1
- package/dist/devtools/mod.d.ts +13 -2
- package/dist/devtools/mod.d.ts.map +1 -1
- package/dist/devtools/mod.js +10 -3
- package/dist/devtools/mod.js.map +1 -1
- package/dist/errors.d.ts +48 -18
- package/dist/errors.d.ts.map +1 -1
- package/dist/errors.js +20 -12
- package/dist/errors.js.map +1 -1
- package/dist/index.d.ts +4 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +4 -1
- package/dist/index.js.map +1 -1
- package/dist/leader-thread/LeaderSyncProcessor.d.ts +53 -6
- package/dist/leader-thread/LeaderSyncProcessor.d.ts.map +1 -1
- package/dist/leader-thread/LeaderSyncProcessor.js +325 -257
- package/dist/leader-thread/LeaderSyncProcessor.js.map +1 -1
- package/dist/leader-thread/RejectedPushError.d.ts +107 -0
- package/dist/leader-thread/RejectedPushError.d.ts.map +1 -0
- package/dist/leader-thread/RejectedPushError.js +78 -0
- package/dist/leader-thread/RejectedPushError.js.map +1 -0
- package/dist/leader-thread/connection.js +1 -1
- package/dist/leader-thread/connection.js.map +1 -1
- package/dist/leader-thread/eventlog.d.ts +19 -14
- package/dist/leader-thread/eventlog.d.ts.map +1 -1
- package/dist/leader-thread/eventlog.js +78 -18
- package/dist/leader-thread/eventlog.js.map +1 -1
- package/dist/leader-thread/leader-worker-devtools.d.ts +1 -2
- package/dist/leader-thread/leader-worker-devtools.d.ts.map +1 -1
- package/dist/leader-thread/leader-worker-devtools.js +90 -58
- package/dist/leader-thread/leader-worker-devtools.js.map +1 -1
- package/dist/leader-thread/make-leader-thread-layer.d.ts +15 -7
- package/dist/leader-thread/make-leader-thread-layer.d.ts.map +1 -1
- package/dist/leader-thread/make-leader-thread-layer.js +49 -17
- package/dist/leader-thread/make-leader-thread-layer.js.map +1 -1
- package/dist/leader-thread/make-leader-thread-layer.test.d.ts +2 -0
- package/dist/leader-thread/make-leader-thread-layer.test.d.ts.map +1 -0
- package/dist/leader-thread/make-leader-thread-layer.test.js +32 -0
- package/dist/leader-thread/make-leader-thread-layer.test.js.map +1 -0
- package/dist/leader-thread/materialize-event.d.ts +1 -1
- package/dist/leader-thread/materialize-event.d.ts.map +1 -1
- package/dist/leader-thread/materialize-event.js +28 -9
- package/dist/leader-thread/materialize-event.js.map +1 -1
- package/dist/leader-thread/mod.d.ts +1 -0
- package/dist/leader-thread/mod.d.ts.map +1 -1
- package/dist/leader-thread/mod.js +1 -0
- package/dist/leader-thread/mod.js.map +1 -1
- package/dist/leader-thread/recreate-db.d.ts +2 -2
- package/dist/leader-thread/recreate-db.d.ts.map +1 -1
- package/dist/leader-thread/recreate-db.js +6 -6
- package/dist/leader-thread/recreate-db.js.map +1 -1
- package/dist/leader-thread/shutdown-channel.d.ts +2 -2
- package/dist/leader-thread/shutdown-channel.d.ts.map +1 -1
- package/dist/leader-thread/shutdown-channel.js +2 -2
- package/dist/leader-thread/shutdown-channel.js.map +1 -1
- package/dist/leader-thread/stream-events.d.ts +56 -0
- package/dist/leader-thread/stream-events.d.ts.map +1 -0
- package/dist/leader-thread/stream-events.js +167 -0
- package/dist/leader-thread/stream-events.js.map +1 -0
- package/dist/leader-thread/types.d.ts +95 -17
- package/dist/leader-thread/types.d.ts.map +1 -1
- package/dist/leader-thread/types.js +13 -0
- package/dist/leader-thread/types.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/make-client-session.d.ts +5 -3
- package/dist/make-client-session.d.ts.map +1 -1
- package/dist/make-client-session.js +7 -4
- package/dist/make-client-session.js.map +1 -1
- package/dist/materializer-helper.d.ts +6 -6
- package/dist/materializer-helper.d.ts.map +1 -1
- package/dist/materializer-helper.js +18 -8
- package/dist/materializer-helper.js.map +1 -1
- package/dist/otel.d.ts +2 -1
- package/dist/otel.d.ts.map +1 -1
- package/dist/otel.js +7 -2
- package/dist/otel.js.map +1 -1
- package/dist/rematerialize-from-eventlog.d.ts +3 -3
- package/dist/rematerialize-from-eventlog.d.ts.map +1 -1
- package/dist/rematerialize-from-eventlog.js +40 -29
- package/dist/rematerialize-from-eventlog.js.map +1 -1
- package/dist/schema/EventDef/define.d.ts +161 -0
- package/dist/schema/EventDef/define.d.ts.map +1 -0
- package/dist/schema/EventDef/define.js +140 -0
- package/dist/schema/EventDef/define.js.map +1 -0
- package/dist/schema/EventDef/deprecated.d.ts +99 -0
- package/dist/schema/EventDef/deprecated.d.ts.map +1 -0
- package/dist/schema/EventDef/deprecated.js +144 -0
- package/dist/schema/EventDef/deprecated.js.map +1 -0
- package/dist/schema/EventDef/deprecated.test.d.ts +2 -0
- package/dist/schema/EventDef/deprecated.test.d.ts.map +1 -0
- package/dist/schema/EventDef/deprecated.test.js +95 -0
- package/dist/schema/EventDef/deprecated.test.js.map +1 -0
- package/dist/schema/EventDef/event-def.d.ts +110 -0
- package/dist/schema/EventDef/event-def.d.ts.map +1 -0
- package/dist/schema/EventDef/event-def.js +2 -0
- package/dist/schema/EventDef/event-def.js.map +1 -0
- package/dist/schema/EventDef/facts.d.ts +118 -0
- package/dist/schema/EventDef/facts.d.ts.map +1 -0
- package/dist/schema/EventDef/facts.js +53 -0
- package/dist/schema/EventDef/facts.js.map +1 -0
- package/dist/schema/EventDef/materializer.d.ts +155 -0
- package/dist/schema/EventDef/materializer.d.ts.map +1 -0
- package/dist/schema/EventDef/materializer.js +83 -0
- package/dist/schema/EventDef/materializer.js.map +1 -0
- package/dist/schema/EventDef/mod.d.ts +6 -0
- package/dist/schema/EventDef/mod.d.ts.map +1 -0
- package/dist/schema/EventDef/mod.js +6 -0
- package/dist/schema/EventDef/mod.js.map +1 -0
- package/dist/schema/EventSequenceNumber/client.d.ts +136 -0
- package/dist/schema/EventSequenceNumber/client.d.ts.map +1 -0
- package/dist/schema/EventSequenceNumber/client.js +193 -0
- package/dist/schema/EventSequenceNumber/client.js.map +1 -0
- package/dist/schema/EventSequenceNumber/global.d.ts +15 -0
- package/dist/schema/EventSequenceNumber/global.d.ts.map +1 -0
- package/dist/schema/EventSequenceNumber/global.js +14 -0
- package/dist/schema/EventSequenceNumber/global.js.map +1 -0
- package/dist/schema/EventSequenceNumber/mod.d.ts +37 -0
- package/dist/schema/EventSequenceNumber/mod.d.ts.map +1 -0
- package/dist/schema/EventSequenceNumber/mod.js +37 -0
- package/dist/schema/EventSequenceNumber/mod.js.map +1 -0
- package/dist/schema/EventSequenceNumber.test.js +44 -44
- package/dist/schema/EventSequenceNumber.test.js.map +1 -1
- package/dist/schema/{LiveStoreEvent.d.ts → LiveStoreEvent/client.d.ts} +102 -111
- package/dist/schema/LiveStoreEvent/client.d.ts.map +1 -0
- package/dist/schema/LiveStoreEvent/client.js +176 -0
- package/dist/schema/LiveStoreEvent/client.js.map +1 -0
- package/dist/schema/LiveStoreEvent/client.test.d.ts +2 -0
- package/dist/schema/LiveStoreEvent/client.test.d.ts.map +1 -0
- package/dist/schema/LiveStoreEvent/client.test.js +111 -0
- package/dist/schema/LiveStoreEvent/client.test.js.map +1 -0
- package/dist/schema/LiveStoreEvent/for-event-def.d.ts +52 -0
- package/dist/schema/LiveStoreEvent/for-event-def.d.ts.map +1 -0
- package/dist/schema/LiveStoreEvent/for-event-def.js +2 -0
- package/dist/schema/LiveStoreEvent/for-event-def.js.map +1 -0
- package/dist/schema/LiveStoreEvent/global.d.ts +36 -0
- package/dist/schema/LiveStoreEvent/global.d.ts.map +1 -0
- package/dist/schema/LiveStoreEvent/global.js +31 -0
- package/dist/schema/LiveStoreEvent/global.js.map +1 -0
- package/dist/schema/LiveStoreEvent/input.d.ts +46 -0
- package/dist/schema/LiveStoreEvent/input.d.ts.map +1 -0
- package/dist/schema/LiveStoreEvent/input.js +26 -0
- package/dist/schema/LiveStoreEvent/input.js.map +1 -0
- package/dist/schema/LiveStoreEvent/mod.d.ts +5 -0
- package/dist/schema/LiveStoreEvent/mod.d.ts.map +1 -0
- package/dist/schema/LiveStoreEvent/mod.js +5 -0
- package/dist/schema/LiveStoreEvent/mod.js.map +1 -0
- package/dist/schema/events.d.ts +1 -1
- package/dist/schema/events.d.ts.map +1 -1
- package/dist/schema/events.js +1 -1
- package/dist/schema/events.js.map +1 -1
- package/dist/schema/mod.d.ts +6 -4
- package/dist/schema/mod.d.ts.map +1 -1
- package/dist/schema/mod.js +5 -4
- package/dist/schema/mod.js.map +1 -1
- package/dist/schema/schema.d.ts +16 -1
- package/dist/schema/schema.d.ts.map +1 -1
- package/dist/schema/schema.js +32 -4
- package/dist/schema/schema.js.map +1 -1
- package/dist/schema/state/sqlite/client-document-def.d.ts +2 -1
- package/dist/schema/state/sqlite/client-document-def.d.ts.map +1 -1
- package/dist/schema/state/sqlite/client-document-def.js +36 -15
- package/dist/schema/state/sqlite/client-document-def.js.map +1 -1
- package/dist/schema/state/sqlite/client-document-def.test.js +121 -2
- package/dist/schema/state/sqlite/client-document-def.test.js.map +1 -1
- package/dist/schema/state/sqlite/column-annotations.d.ts.map +1 -1
- package/dist/schema/state/sqlite/column-annotations.js +1 -1
- package/dist/schema/state/sqlite/column-annotations.js.map +1 -1
- package/dist/schema/state/sqlite/column-annotations.test.js +2 -2
- package/dist/schema/state/sqlite/column-annotations.test.js.map +1 -1
- package/dist/schema/state/sqlite/column-def.d.ts.map +1 -1
- package/dist/schema/state/sqlite/column-def.js +96 -47
- package/dist/schema/state/sqlite/column-def.js.map +1 -1
- package/dist/schema/state/sqlite/column-def.test.js +51 -12
- package/dist/schema/state/sqlite/column-def.test.js.map +1 -1
- package/dist/schema/state/sqlite/column-spec.d.ts.map +1 -1
- package/dist/schema/state/sqlite/column-spec.js +30 -12
- package/dist/schema/state/sqlite/column-spec.js.map +1 -1
- package/dist/schema/state/sqlite/column-spec.test.js +24 -15
- package/dist/schema/state/sqlite/column-spec.test.js.map +1 -1
- package/dist/schema/state/sqlite/db-schema/ast/sqlite.js +2 -2
- package/dist/schema/state/sqlite/db-schema/ast/sqlite.js.map +1 -1
- package/dist/schema/state/sqlite/db-schema/dsl/field-defs.d.ts +16 -10
- 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 +15 -4
- package/dist/schema/state/sqlite/db-schema/dsl/field-defs.js.map +1 -1
- package/dist/schema/state/sqlite/db-schema/dsl/field-defs.test.js +1 -1
- package/dist/schema/state/sqlite/db-schema/dsl/field-defs.test.js.map +1 -1
- package/dist/schema/state/sqlite/db-schema/dsl/mod.d.ts +1 -1
- package/dist/schema/state/sqlite/db-schema/dsl/mod.d.ts.map +1 -1
- package/dist/schema/state/sqlite/db-schema/dsl/mod.js +1 -1
- package/dist/schema/state/sqlite/db-schema/dsl/mod.js.map +1 -1
- package/dist/schema/state/sqlite/mod.d.ts +2 -2
- package/dist/schema/state/sqlite/mod.d.ts.map +1 -1
- package/dist/schema/state/sqlite/mod.js +5 -7
- package/dist/schema/state/sqlite/mod.js.map +1 -1
- package/dist/schema/state/sqlite/query-builder/api.d.ts +51 -22
- package/dist/schema/state/sqlite/query-builder/api.d.ts.map +1 -1
- package/dist/schema/state/sqlite/query-builder/astToSql.d.ts.map +1 -1
- package/dist/schema/state/sqlite/query-builder/astToSql.js +99 -22
- package/dist/schema/state/sqlite/query-builder/astToSql.js.map +1 -1
- package/dist/schema/state/sqlite/query-builder/impl.d.ts +1 -1
- package/dist/schema/state/sqlite/query-builder/impl.d.ts.map +1 -1
- package/dist/schema/state/sqlite/query-builder/impl.js +28 -15
- package/dist/schema/state/sqlite/query-builder/impl.js.map +1 -1
- package/dist/schema/state/sqlite/query-builder/impl.test.js +231 -93
- package/dist/schema/state/sqlite/query-builder/impl.test.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 +24 -14
- 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/schema/state/sqlite/{system-tables.d.ts → system-tables/eventlog-tables.d.ts} +21 -450
- package/dist/schema/state/sqlite/system-tables/eventlog-tables.d.ts.map +1 -0
- package/dist/schema/state/sqlite/system-tables/eventlog-tables.js +54 -0
- package/dist/schema/state/sqlite/system-tables/eventlog-tables.js.map +1 -0
- package/dist/schema/state/sqlite/system-tables/mod.d.ts +3 -0
- package/dist/schema/state/sqlite/system-tables/mod.d.ts.map +1 -0
- package/dist/schema/state/sqlite/system-tables/mod.js +3 -0
- package/dist/schema/state/sqlite/system-tables/mod.js.map +1 -0
- package/dist/schema/state/sqlite/system-tables/state-tables.d.ts +456 -0
- package/dist/schema/state/sqlite/system-tables/state-tables.d.ts.map +1 -0
- package/dist/schema/state/sqlite/system-tables/state-tables.js +55 -0
- package/dist/schema/state/sqlite/system-tables/state-tables.js.map +1 -0
- package/dist/schema/state/sqlite/table-def.d.ts +5 -3
- package/dist/schema/state/sqlite/table-def.d.ts.map +1 -1
- package/dist/schema/state/sqlite/table-def.js +1 -1
- package/dist/schema/state/sqlite/table-def.js.map +1 -1
- package/dist/schema/state/sqlite/table-def.test.js +92 -3
- package/dist/schema/state/sqlite/table-def.test.js.map +1 -1
- package/dist/schema/unknown-events.d.ts +47 -0
- package/dist/schema/unknown-events.d.ts.map +1 -0
- package/dist/schema/unknown-events.js +69 -0
- package/dist/schema/unknown-events.js.map +1 -0
- package/dist/schema-management/__tests__/migrations-autoincrement-quoting.test.d.ts +2 -0
- package/dist/schema-management/__tests__/migrations-autoincrement-quoting.test.d.ts.map +1 -0
- package/dist/schema-management/__tests__/migrations-autoincrement-quoting.test.js +73 -0
- package/dist/schema-management/__tests__/migrations-autoincrement-quoting.test.js.map +1 -0
- package/dist/schema-management/common.js +2 -2
- package/dist/schema-management/common.js.map +1 -1
- package/dist/schema-management/migrations.d.ts +32 -2
- package/dist/schema-management/migrations.d.ts.map +1 -1
- package/dist/schema-management/migrations.js +38 -6
- package/dist/schema-management/migrations.js.map +1 -1
- package/dist/schema-management/validate-schema.d.ts +3 -3
- package/dist/schema-management/validate-schema.d.ts.map +1 -1
- package/dist/schema-management/validate-schema.js +2 -2
- package/dist/schema-management/validate-schema.js.map +1 -1
- package/dist/sql-queries/sql-queries.d.ts.map +1 -1
- package/dist/sql-queries/sql-queries.js +18 -6
- package/dist/sql-queries/sql-queries.js.map +1 -1
- package/dist/sql-queries/sql-query-builder.d.ts.map +1 -1
- package/dist/sql-queries/sql-query-builder.js.map +1 -1
- package/dist/sqlite-db-helper.js +3 -3
- package/dist/sqlite-db-helper.js.map +1 -1
- package/dist/sqlite-types.d.ts +5 -5
- package/dist/sqlite-types.d.ts.map +1 -1
- package/dist/sqlite-types.js.map +1 -1
- package/dist/sync/ClientSessionSyncProcessor.d.ts +12 -12
- package/dist/sync/ClientSessionSyncProcessor.d.ts.map +1 -1
- package/dist/sync/ClientSessionSyncProcessor.js +99 -114
- package/dist/sync/ClientSessionSyncProcessor.js.map +1 -1
- package/dist/sync/errors.d.ts +0 -33
- package/dist/sync/errors.d.ts.map +1 -1
- package/dist/sync/errors.js +5 -22
- package/dist/sync/errors.js.map +1 -1
- package/dist/sync/index.d.ts +2 -0
- package/dist/sync/index.d.ts.map +1 -1
- package/dist/sync/index.js +2 -0
- package/dist/sync/index.js.map +1 -1
- package/dist/sync/mock-sync-backend.d.ts +10 -8
- package/dist/sync/mock-sync-backend.d.ts.map +1 -1
- package/dist/sync/mock-sync-backend.js +71 -69
- package/dist/sync/mock-sync-backend.js.map +1 -1
- package/dist/sync/next/compact-events.d.ts.map +1 -1
- package/dist/sync/next/compact-events.js +11 -12
- package/dist/sync/next/compact-events.js.map +1 -1
- package/dist/sync/next/facts.d.ts +5 -5
- package/dist/sync/next/facts.d.ts.map +1 -1
- package/dist/sync/next/facts.js +7 -8
- package/dist/sync/next/facts.js.map +1 -1
- package/dist/sync/next/history-dag-common.d.ts +54 -15
- package/dist/sync/next/history-dag-common.d.ts.map +1 -1
- package/dist/sync/next/history-dag-common.js +198 -9
- package/dist/sync/next/history-dag-common.js.map +1 -1
- package/dist/sync/next/history-dag.d.ts.map +1 -1
- package/dist/sync/next/history-dag.js +11 -11
- package/dist/sync/next/history-dag.js.map +1 -1
- package/dist/sync/next/rebase-events.d.ts +5 -5
- package/dist/sync/next/rebase-events.d.ts.map +1 -1
- package/dist/sync/next/rebase-events.js +6 -6
- package/dist/sync/next/rebase-events.js.map +1 -1
- package/dist/sync/next/test/compact-events.calculator.test.js +2 -2
- package/dist/sync/next/test/compact-events.calculator.test.js.map +1 -1
- package/dist/sync/next/test/compact-events.test.d.ts.map +1 -1
- package/dist/sync/next/test/compact-events.test.js +2 -2
- package/dist/sync/next/test/compact-events.test.js.map +1 -1
- package/dist/sync/next/test/event-fixtures.d.ts +2 -2
- package/dist/sync/next/test/event-fixtures.d.ts.map +1 -1
- package/dist/sync/next/test/event-fixtures.js +11 -11
- package/dist/sync/next/test/event-fixtures.js.map +1 -1
- package/dist/sync/sync-backend-kv.d.ts +3 -3
- package/dist/sync/sync-backend-kv.d.ts.map +1 -1
- package/dist/sync/sync-backend-kv.js +3 -3
- package/dist/sync/sync-backend-kv.js.map +1 -1
- package/dist/sync/sync-backend.d.ts +33 -13
- package/dist/sync/sync-backend.d.ts.map +1 -1
- package/dist/sync/sync-backend.js +38 -1
- package/dist/sync/sync-backend.js.map +1 -1
- package/dist/sync/sync.d.ts +23 -2
- package/dist/sync/sync.d.ts.map +1 -1
- package/dist/sync/syncstate.d.ts +55 -55
- package/dist/sync/syncstate.d.ts.map +1 -1
- package/dist/sync/syncstate.js +80 -98
- package/dist/sync/syncstate.js.map +1 -1
- package/dist/sync/syncstate.test.js +221 -132
- package/dist/sync/syncstate.test.js.map +1 -1
- package/dist/sync/transport-chunking.d.ts +36 -0
- package/dist/sync/transport-chunking.d.ts.map +1 -0
- package/dist/sync/transport-chunking.js +56 -0
- package/dist/sync/transport-chunking.js.map +1 -0
- 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 -6
- package/dist/sync/validate-push-payload.js.map +1 -1
- package/dist/testing/event-factory.d.ts +3 -3
- package/dist/testing/event-factory.d.ts.map +1 -1
- package/dist/testing/event-factory.js +5 -7
- package/dist/testing/event-factory.js.map +1 -1
- package/dist/util.js +2 -2
- package/dist/util.js.map +1 -1
- package/dist/version.d.ts +24 -5
- package/dist/version.d.ts.map +1 -1
- package/dist/version.js +25 -8
- package/dist/version.js.map +1 -1
- package/package.json +67 -15
- package/src/ClientSessionLeaderThreadProxy.ts +27 -12
- package/src/WorkerTransportError.ts +12 -0
- package/src/adapter-types.ts +50 -7
- package/src/bounded-collections.ts +6 -5
- package/src/debug-info.ts +37 -6
- package/src/devtools/devtools-compatibility.test.ts +18 -0
- package/src/devtools/devtools-messages-client-session.ts +22 -4
- package/src/devtools/devtools-messages-common.ts +7 -12
- package/src/devtools/devtools-messages-leader.ts +29 -10
- package/src/devtools/devtools-sessioninfo.ts +8 -5
- package/src/devtools/mod.ts +11 -2
- package/src/errors.ts +32 -24
- package/src/index.ts +4 -1
- package/src/leader-thread/LeaderSyncProcessor.ts +523 -373
- package/src/leader-thread/RejectedPushError.ts +106 -0
- package/src/leader-thread/connection.ts +1 -1
- package/src/leader-thread/eventlog.ts +112 -39
- package/src/leader-thread/leader-worker-devtools.ts +201 -120
- package/src/leader-thread/make-leader-thread-layer.test.ts +44 -0
- package/src/leader-thread/make-leader-thread-layer.ts +125 -40
- package/src/leader-thread/materialize-event.ts +40 -10
- package/src/leader-thread/mod.ts +1 -0
- package/src/leader-thread/recreate-db.ts +7 -7
- package/src/leader-thread/shutdown-channel.ts +4 -8
- package/src/leader-thread/stream-events.ts +206 -0
- package/src/leader-thread/types.ts +68 -18
- package/src/logging.ts +62 -0
- package/src/make-client-session.ts +11 -5
- package/src/materializer-helper.ts +27 -16
- package/src/otel.ts +13 -2
- package/src/rematerialize-from-eventlog.ts +61 -51
- package/src/schema/EventDef/define.ts +217 -0
- package/src/schema/EventDef/deprecated.test.ts +129 -0
- package/src/schema/EventDef/deprecated.ts +175 -0
- package/src/schema/EventDef/event-def.ts +125 -0
- package/src/schema/EventDef/facts.ts +135 -0
- package/src/schema/EventDef/materializer.ts +172 -0
- package/src/schema/EventDef/mod.ts +5 -0
- package/src/schema/EventSequenceNumber/client.ts +257 -0
- package/src/schema/EventSequenceNumber/global.ts +19 -0
- package/src/schema/EventSequenceNumber/mod.ts +37 -0
- package/src/schema/EventSequenceNumber.test.ts +72 -53
- package/src/schema/LiveStoreEvent/client.test.ts +129 -0
- package/src/schema/LiveStoreEvent/client.ts +235 -0
- package/src/schema/LiveStoreEvent/for-event-def.ts +60 -0
- package/src/schema/LiveStoreEvent/global.ts +45 -0
- package/src/schema/LiveStoreEvent/input.ts +63 -0
- package/src/schema/LiveStoreEvent/mod.ts +4 -0
- package/src/schema/events.ts +1 -1
- package/src/schema/mod.ts +6 -4
- package/src/schema/schema.ts +46 -5
- package/src/schema/state/sqlite/client-document-def.test.ts +144 -5
- package/src/schema/state/sqlite/client-document-def.ts +47 -34
- package/src/schema/state/sqlite/column-annotations.test.ts +3 -2
- package/src/schema/state/sqlite/column-annotations.ts +2 -1
- package/src/schema/state/sqlite/column-def.test.ts +66 -12
- package/src/schema/state/sqlite/column-def.ts +119 -47
- package/src/schema/state/sqlite/column-spec.test.ts +32 -17
- package/src/schema/state/sqlite/column-spec.ts +37 -11
- package/src/schema/state/sqlite/db-schema/ast/sqlite.ts +2 -2
- package/src/schema/state/sqlite/db-schema/dsl/field-defs.test.ts +2 -1
- package/src/schema/state/sqlite/db-schema/dsl/field-defs.ts +41 -15
- package/src/schema/state/sqlite/db-schema/dsl/mod.ts +13 -19
- package/src/schema/state/sqlite/mod.ts +7 -8
- package/src/schema/state/sqlite/query-builder/api.ts +55 -17
- package/src/schema/state/sqlite/query-builder/astToSql.ts +110 -21
- package/src/schema/state/sqlite/query-builder/impl.test.ts +267 -93
- package/src/schema/state/sqlite/query-builder/impl.ts +26 -13
- package/src/schema/state/sqlite/schema-helpers.test.ts +44 -0
- package/src/schema/state/sqlite/schema-helpers.ts +30 -22
- package/src/schema/state/sqlite/system-tables/eventlog-tables.ts +64 -0
- package/src/schema/state/sqlite/system-tables/mod.ts +2 -0
- package/src/schema/state/sqlite/system-tables/state-tables.ts +69 -0
- package/src/schema/state/sqlite/table-def.test.ts +114 -3
- package/src/schema/state/sqlite/table-def.ts +16 -22
- package/src/schema/unknown-events.ts +131 -0
- package/src/schema-management/__tests__/migrations-autoincrement-quoting.test.ts +88 -0
- package/src/schema-management/common.ts +2 -2
- package/src/schema-management/migrations.ts +42 -9
- package/src/schema-management/validate-schema.ts +3 -3
- package/src/sql-queries/sql-queries.ts +18 -6
- package/src/sql-queries/sql-query-builder.ts +1 -0
- package/src/sqlite-db-helper.ts +3 -3
- package/src/sqlite-types.ts +6 -5
- package/src/sync/ClientSessionSyncProcessor.ts +152 -142
- package/src/sync/errors.ts +12 -24
- package/src/sync/index.ts +2 -0
- package/src/sync/mock-sync-backend.ts +146 -104
- package/src/sync/next/compact-events.ts +10 -11
- package/src/sync/next/facts.ts +13 -14
- package/src/sync/next/history-dag-common.ts +280 -26
- package/src/sync/next/history-dag.ts +17 -13
- package/src/sync/next/rebase-events.ts +12 -12
- package/src/sync/next/test/compact-events.calculator.test.ts +3 -2
- package/src/sync/next/test/compact-events.test.ts +4 -3
- package/src/sync/next/test/event-fixtures.ts +13 -13
- package/src/sync/sync-backend-kv.ts +4 -3
- package/src/sync/sync-backend.ts +66 -17
- package/src/sync/sync.ts +24 -2
- package/src/sync/syncstate.test.ts +583 -419
- package/src/sync/syncstate.ts +127 -122
- package/src/sync/transport-chunking.ts +90 -0
- package/src/sync/validate-push-payload.ts +6 -8
- package/src/testing/event-factory.ts +10 -12
- package/src/util.ts +2 -2
- package/src/version.ts +33 -8
- package/dist/schema/EventDef.d.ts +0 -126
- package/dist/schema/EventDef.d.ts.map +0 -1
- package/dist/schema/EventDef.js +0 -46
- package/dist/schema/EventDef.js.map +0 -1
- package/dist/schema/EventSequenceNumber.d.ts +0 -80
- package/dist/schema/EventSequenceNumber.d.ts.map +0 -1
- package/dist/schema/EventSequenceNumber.js +0 -139
- package/dist/schema/EventSequenceNumber.js.map +0 -1
- package/dist/schema/LiveStoreEvent.d.ts.map +0 -1
- package/dist/schema/LiveStoreEvent.js +0 -147
- package/dist/schema/LiveStoreEvent.js.map +0 -1
- 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
- package/dist/sync/next/graphology.d.ts +0 -8
- package/dist/sync/next/graphology.d.ts.map +0 -1
- package/dist/sync/next/graphology.js +0 -30
- package/dist/sync/next/graphology.js.map +0 -1
- package/dist/sync/next/graphology_.d.ts +0 -3
- package/dist/sync/next/graphology_.d.ts.map +0 -1
- package/dist/sync/next/graphology_.js +0 -3
- package/dist/sync/next/graphology_.js.map +0 -1
- package/src/schema/EventDef.ts +0 -222
- package/src/schema/EventSequenceNumber.ts +0 -199
- package/src/schema/LiveStoreEvent.ts +0 -286
- package/src/schema/state/sqlite/system-tables.ts +0 -106
- package/src/sync/next/ambient.d.ts +0 -3
- package/src/sync/next/graphology.ts +0 -41
- package/src/sync/next/graphology_.ts +0 -2
|
@@ -1,18 +1,207 @@
|
|
|
1
|
-
import
|
|
2
|
-
import {
|
|
1
|
+
import { shouldNeverHappen } from '@livestore/utils';
|
|
2
|
+
import { Graph } from '@livestore/utils/effect';
|
|
3
|
+
import * as EventSequenceNumber from "../../schema/EventSequenceNumber/mod.js";
|
|
3
4
|
export const connectionTypeOptions = ['parent', 'facts'];
|
|
4
|
-
|
|
5
|
+
const defaultOptions = {
|
|
5
6
|
allowSelfLoops: false,
|
|
6
|
-
|
|
7
|
-
|
|
7
|
+
};
|
|
8
|
+
const cloneFactsGroup = (factsGroup) => ({
|
|
9
|
+
depRead: new Map(factsGroup.depRead),
|
|
10
|
+
depRequire: new Map(factsGroup.depRequire),
|
|
11
|
+
modifySet: new Map(factsGroup.modifySet),
|
|
12
|
+
modifyUnset: new Map(factsGroup.modifyUnset),
|
|
13
|
+
});
|
|
14
|
+
const cloneHistoryDagNode = (node) => ({
|
|
15
|
+
...node,
|
|
16
|
+
// Copy the event sequence numbers to avoid accidental aliasing
|
|
17
|
+
parentSeqNum: { ...node.parentSeqNum },
|
|
18
|
+
seqNum: { ...node.seqNum },
|
|
19
|
+
// Facts are represented via maps which should not be shared across DAG copies
|
|
20
|
+
factsGroup: cloneFactsGroup(node.factsGroup),
|
|
8
21
|
});
|
|
22
|
+
/**
|
|
23
|
+
* Mutable DAG wrapper that retains the previous string-based node ids API
|
|
24
|
+
* while delegating storage and algorithms to Effect's graph module.
|
|
25
|
+
*/
|
|
26
|
+
export class HistoryDag {
|
|
27
|
+
options;
|
|
28
|
+
idToIndex;
|
|
29
|
+
indexToId;
|
|
30
|
+
graph;
|
|
31
|
+
constructor({ graph, idToIndex, indexToId, options, }) {
|
|
32
|
+
this.graph = graph;
|
|
33
|
+
this.options = { ...defaultOptions, ...options };
|
|
34
|
+
this.idToIndex = idToIndex !== undefined ? new Map(idToIndex) : new Map();
|
|
35
|
+
this.indexToId = indexToId !== undefined ? new Map(indexToId) : new Map();
|
|
36
|
+
}
|
|
37
|
+
static create(options) {
|
|
38
|
+
const graph = Graph.beginMutation(Graph.directed());
|
|
39
|
+
return options !== undefined ? new HistoryDag({ graph, options }) : new HistoryDag({ graph });
|
|
40
|
+
}
|
|
41
|
+
copy() {
|
|
42
|
+
const clone = HistoryDag.create(this.options);
|
|
43
|
+
for (const [id, index] of this.idToIndex) {
|
|
44
|
+
const node = this.graph.nodes.get(index) ?? shouldNeverHappen(`HistoryDag.copy missing node for ${id}`);
|
|
45
|
+
clone.addNode(id, cloneHistoryDagNode(node));
|
|
46
|
+
}
|
|
47
|
+
for (const edge of this.graph.edges.values()) {
|
|
48
|
+
const sourceId = this.indexToId.get(edge.source) ?? shouldNeverHappen('HistoryDag.copy missing source id');
|
|
49
|
+
const targetId = this.indexToId.get(edge.target) ?? shouldNeverHappen('HistoryDag.copy missing target id');
|
|
50
|
+
clone.addEdge(sourceId, targetId, { ...edge.data });
|
|
51
|
+
}
|
|
52
|
+
return clone;
|
|
53
|
+
}
|
|
54
|
+
topologicalNodeIds() {
|
|
55
|
+
const walker = Graph.topo(this.graph);
|
|
56
|
+
const indices = Array.from(Graph.indices(walker));
|
|
57
|
+
return indices.map((index) => this.indexToId.get(index) ?? shouldNeverHappen(`Missing node id for index ${String(index)}`));
|
|
58
|
+
}
|
|
59
|
+
addNode(id, attributes) {
|
|
60
|
+
if (this.idToIndex.has(id) === true) {
|
|
61
|
+
shouldNeverHappen(`HistoryDag node ${id} already exists`);
|
|
62
|
+
}
|
|
63
|
+
const nodeIndex = Graph.addNode(this.graph, attributes);
|
|
64
|
+
this.idToIndex.set(id, nodeIndex);
|
|
65
|
+
this.indexToId.set(nodeIndex, id);
|
|
66
|
+
}
|
|
67
|
+
hasNode(id) {
|
|
68
|
+
return this.idToIndex.has(id);
|
|
69
|
+
}
|
|
70
|
+
getNodeAttributes(id) {
|
|
71
|
+
const index = this.idToIndex.get(id);
|
|
72
|
+
if (index === undefined) {
|
|
73
|
+
return shouldNeverHappen(`HistoryDag node ${id} not found`);
|
|
74
|
+
}
|
|
75
|
+
const node = this.graph.nodes.get(index);
|
|
76
|
+
return node ?? shouldNeverHappen(`HistoryDag node data missing for ${id}`);
|
|
77
|
+
}
|
|
78
|
+
nodes() {
|
|
79
|
+
return this.idToIndex.keys();
|
|
80
|
+
}
|
|
81
|
+
nodeEntries() {
|
|
82
|
+
return function* () {
|
|
83
|
+
for (const [id, index] of this.idToIndex) {
|
|
84
|
+
const attributes = this.graph.nodes.get(index) ?? shouldNeverHappen(`HistoryDag node data missing for ${id}`);
|
|
85
|
+
yield { key: id, attributes };
|
|
86
|
+
}
|
|
87
|
+
}.call(this);
|
|
88
|
+
}
|
|
89
|
+
addEdge(sourceId, targetId, attributes) {
|
|
90
|
+
if (this.options.allowSelfLoops === false && sourceId === targetId) {
|
|
91
|
+
return shouldNeverHappen('HistoryDag self-loops are disabled');
|
|
92
|
+
}
|
|
93
|
+
const sourceIndex = this.idToIndex.get(sourceId);
|
|
94
|
+
const targetIndex = this.idToIndex.get(targetId);
|
|
95
|
+
if (sourceIndex === undefined || targetIndex === undefined) {
|
|
96
|
+
return shouldNeverHappen(`HistoryDag edge references unknown nodes: ${sourceId} -> ${targetId}`);
|
|
97
|
+
}
|
|
98
|
+
return Graph.addEdge(this.graph, sourceIndex, targetIndex, attributes);
|
|
99
|
+
}
|
|
100
|
+
edges(sourceId, targetId) {
|
|
101
|
+
const sourceIndex = this.idToIndex.get(sourceId);
|
|
102
|
+
const targetIndex = this.idToIndex.get(targetId);
|
|
103
|
+
if (sourceIndex === undefined || targetIndex === undefined) {
|
|
104
|
+
return [];
|
|
105
|
+
}
|
|
106
|
+
const adjacency = this.graph.adjacency.get(sourceIndex);
|
|
107
|
+
if (adjacency === undefined) {
|
|
108
|
+
return [];
|
|
109
|
+
}
|
|
110
|
+
return adjacency.filter((edgeIndex) => {
|
|
111
|
+
const edge = this.graph.edges.get(edgeIndex);
|
|
112
|
+
return edge !== undefined && edge.target === targetIndex;
|
|
113
|
+
});
|
|
114
|
+
}
|
|
115
|
+
inEdges(id) {
|
|
116
|
+
const index = this.idToIndex.get(id);
|
|
117
|
+
if (index === undefined) {
|
|
118
|
+
return [];
|
|
119
|
+
}
|
|
120
|
+
const incoming = this.graph.reverseAdjacency.get(index);
|
|
121
|
+
return incoming !== undefined ? [...incoming] : [];
|
|
122
|
+
}
|
|
123
|
+
outboundEdgeEntries(id) {
|
|
124
|
+
const index = this.idToIndex.get(id);
|
|
125
|
+
if (index === undefined) {
|
|
126
|
+
return [];
|
|
127
|
+
}
|
|
128
|
+
const adjacency = this.graph.adjacency.get(index);
|
|
129
|
+
if (adjacency === undefined) {
|
|
130
|
+
return [];
|
|
131
|
+
}
|
|
132
|
+
return adjacency
|
|
133
|
+
.map((edgeIndex) => this.edgeEntry(edgeIndex))
|
|
134
|
+
.filter((entry) => entry !== undefined);
|
|
135
|
+
}
|
|
136
|
+
inboundEdgeEntries(id) {
|
|
137
|
+
const index = this.idToIndex.get(id);
|
|
138
|
+
if (index === undefined) {
|
|
139
|
+
return [];
|
|
140
|
+
}
|
|
141
|
+
const adjacency = this.graph.reverseAdjacency.get(index);
|
|
142
|
+
if (adjacency === undefined) {
|
|
143
|
+
return [];
|
|
144
|
+
}
|
|
145
|
+
return adjacency
|
|
146
|
+
.map((edgeIndex) => this.edgeEntry(edgeIndex))
|
|
147
|
+
.filter((entry) => entry !== undefined);
|
|
148
|
+
}
|
|
149
|
+
getEdgeAttributes(edgeIndex) {
|
|
150
|
+
const edge = this.graph.edges.get(edgeIndex);
|
|
151
|
+
return edge?.data ?? shouldNeverHappen(`HistoryDag edge ${edgeIndex} not found`);
|
|
152
|
+
}
|
|
153
|
+
getEdgeAttribute(edgeIndex, key) {
|
|
154
|
+
const attributes = this.getEdgeAttributes(edgeIndex);
|
|
155
|
+
return attributes[key];
|
|
156
|
+
}
|
|
157
|
+
source(edgeIndex) {
|
|
158
|
+
const edge = this.graph.edges.get(edgeIndex);
|
|
159
|
+
const sourceId = edge !== undefined ? this.indexToId.get(edge.source) : undefined;
|
|
160
|
+
return sourceId ?? shouldNeverHappen(`HistoryDag edge ${edgeIndex} missing source`);
|
|
161
|
+
}
|
|
162
|
+
target(edgeIndex) {
|
|
163
|
+
const edge = this.graph.edges.get(edgeIndex);
|
|
164
|
+
const targetId = edge !== undefined ? this.indexToId.get(edge.target) : undefined;
|
|
165
|
+
return targetId ?? shouldNeverHappen(`HistoryDag edge ${edgeIndex} missing target`);
|
|
166
|
+
}
|
|
167
|
+
dropNode(id) {
|
|
168
|
+
const index = this.idToIndex.get(id);
|
|
169
|
+
if (index === undefined) {
|
|
170
|
+
return;
|
|
171
|
+
}
|
|
172
|
+
Graph.removeNode(this.graph, index);
|
|
173
|
+
this.idToIndex.delete(id);
|
|
174
|
+
this.indexToId.delete(index);
|
|
175
|
+
}
|
|
176
|
+
get size() {
|
|
177
|
+
return this.idToIndex.size;
|
|
178
|
+
}
|
|
179
|
+
edgeEntry(edgeIndex) {
|
|
180
|
+
const edge = this.graph.edges.get(edgeIndex);
|
|
181
|
+
if (edge === undefined) {
|
|
182
|
+
return undefined;
|
|
183
|
+
}
|
|
184
|
+
const source = this.indexToId.get(edge.source);
|
|
185
|
+
const target = this.indexToId.get(edge.target);
|
|
186
|
+
if (source === undefined || target === undefined) {
|
|
187
|
+
return undefined;
|
|
188
|
+
}
|
|
189
|
+
return {
|
|
190
|
+
edge: edgeIndex,
|
|
191
|
+
source,
|
|
192
|
+
target,
|
|
193
|
+
attributes: edge.data,
|
|
194
|
+
};
|
|
195
|
+
}
|
|
196
|
+
}
|
|
197
|
+
export const emptyHistoryDag = () => HistoryDag.create({ allowSelfLoops: false });
|
|
9
198
|
// TODO consider making `ROOT_ID` parent to itself
|
|
10
|
-
export const rootParentNum = EventSequenceNumber.make({
|
|
11
|
-
global: EventSequenceNumber.ROOT.global - 1,
|
|
12
|
-
client: EventSequenceNumber.
|
|
199
|
+
export const rootParentNum = EventSequenceNumber.Client.Composite.make({
|
|
200
|
+
global: EventSequenceNumber.Client.ROOT.global - 1,
|
|
201
|
+
client: EventSequenceNumber.Client.DEFAULT,
|
|
13
202
|
});
|
|
14
203
|
export const rootEventNode = {
|
|
15
|
-
seqNum: EventSequenceNumber.ROOT,
|
|
204
|
+
seqNum: EventSequenceNumber.Client.ROOT,
|
|
16
205
|
parentSeqNum: rootParentNum,
|
|
17
206
|
// unused below
|
|
18
207
|
name: '__Root__',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"history-dag-common.js","sourceRoot":"","sources":["../../../src/sync/next/history-dag-common.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"history-dag-common.js","sourceRoot":"","sources":["../../../src/sync/next/history-dag-common.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
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,
|
|
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,iDAmEpG,CAAA"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import * as EventSequenceNumber from "../../schema/EventSequenceNumber.js";
|
|
1
|
+
import * as EventSequenceNumber from "../../schema/EventSequenceNumber/mod.js";
|
|
2
2
|
import { factsToString, validateFacts } from "./facts.js";
|
|
3
3
|
import { emptyHistoryDag, rootParentNum } from "./history-dag-common.js";
|
|
4
4
|
export const historyDagFromNodes = (dagNodes, options) => {
|
|
@@ -13,11 +13,11 @@ export const historyDagFromNodes = (dagNodes, options) => {
|
|
|
13
13
|
}
|
|
14
14
|
const dag = emptyHistoryDag();
|
|
15
15
|
dagNodes.forEach((node) => {
|
|
16
|
-
dag.addNode(EventSequenceNumber.toString(node.seqNum), node);
|
|
16
|
+
dag.addNode(EventSequenceNumber.Client.toString(node.seqNum), node);
|
|
17
17
|
});
|
|
18
18
|
dagNodes.forEach((node) => {
|
|
19
|
-
if (EventSequenceNumber.toString(node.parentSeqNum) !== EventSequenceNumber.toString(rootParentNum)) {
|
|
20
|
-
dag.addEdge(EventSequenceNumber.toString(node.parentSeqNum), EventSequenceNumber.toString(node.seqNum), {
|
|
19
|
+
if (EventSequenceNumber.Client.toString(node.parentSeqNum) !== EventSequenceNumber.Client.toString(rootParentNum)) {
|
|
20
|
+
dag.addEdge(EventSequenceNumber.Client.toString(node.parentSeqNum), EventSequenceNumber.Client.toString(node.seqNum), {
|
|
21
21
|
type: 'parent',
|
|
22
22
|
});
|
|
23
23
|
}
|
|
@@ -27,23 +27,23 @@ export const historyDagFromNodes = (dagNodes, options) => {
|
|
|
27
27
|
for (const factKey of factKeys) {
|
|
28
28
|
// Find the first ancestor node with a matching fact key (via modifySet or modifyUnset) by traversing the graph backwards via the parent edges
|
|
29
29
|
const depNode = (() => {
|
|
30
|
-
let currentSeqNumStr = EventSequenceNumber.toString(node.seqNum);
|
|
31
|
-
while (currentSeqNumStr !== EventSequenceNumber.toString(rootParentNum)) {
|
|
30
|
+
let currentSeqNumStr = EventSequenceNumber.Client.toString(node.seqNum);
|
|
31
|
+
while (currentSeqNumStr !== EventSequenceNumber.Client.toString(rootParentNum)) {
|
|
32
32
|
const parentEdge = dag.inEdges(currentSeqNumStr).find((e) => dag.getEdgeAttribute(e, 'type') === 'parent');
|
|
33
|
-
if (
|
|
33
|
+
if (parentEdge == null)
|
|
34
34
|
return null;
|
|
35
35
|
const parentSeqNumStr = dag.source(parentEdge);
|
|
36
36
|
const parentNode = dag.getNodeAttributes(parentSeqNumStr);
|
|
37
|
-
if (parentNode.factsGroup.modifySet.has(factKey) || parentNode.factsGroup.modifyUnset.has(factKey)) {
|
|
37
|
+
if (parentNode.factsGroup.modifySet.has(factKey) === true || parentNode.factsGroup.modifyUnset.has(factKey) === true) {
|
|
38
38
|
return parentNode;
|
|
39
39
|
}
|
|
40
40
|
currentSeqNumStr = parentSeqNumStr;
|
|
41
41
|
}
|
|
42
42
|
return null;
|
|
43
43
|
})();
|
|
44
|
-
if (depNode) {
|
|
45
|
-
const depNodeIdStr = EventSequenceNumber.toString(depNode.seqNum);
|
|
46
|
-
const nodeIdStr = EventSequenceNumber.toString(node.seqNum);
|
|
44
|
+
if (depNode !== null) {
|
|
45
|
+
const depNodeIdStr = EventSequenceNumber.Client.toString(depNode.seqNum);
|
|
46
|
+
const nodeIdStr = EventSequenceNumber.Client.toString(node.seqNum);
|
|
47
47
|
if (dag.edges(depNodeIdStr, nodeIdStr).filter((e) => dag.getEdgeAttributes(e).type === 'facts').length === 0) {
|
|
48
48
|
dag.addEdge(depNodeIdStr, nodeIdStr, { type: 'facts' });
|
|
49
49
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"history-dag.js","sourceRoot":"","sources":["../../../src/sync/next/history-dag.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,mBAAmB,MAAM,
|
|
1
|
+
{"version":3,"file":"history-dag.js","sourceRoot":"","sources":["../../../src/sync/next/history-dag.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type { EventDef, EventDefFactsSnapshot } from '../../schema/EventDef.ts';
|
|
2
|
-
import type * as LiveStoreEvent from '../../schema/LiveStoreEvent.ts';
|
|
1
|
+
import type { EventDef, EventDefFactsSnapshot } from '../../schema/EventDef/mod.ts';
|
|
2
|
+
import type * as LiveStoreEvent from '../../schema/LiveStoreEvent/mod.ts';
|
|
3
3
|
import { type FactValidationResult } from './facts.ts';
|
|
4
4
|
import type { HistoryDagNode } from './history-dag-common.ts';
|
|
5
5
|
export type RebaseEventWithConflict = HistoryDagNode & {
|
|
@@ -10,12 +10,12 @@ export type RebaseInput = {
|
|
|
10
10
|
newRemoteEvents: RebaseEventWithConflict[];
|
|
11
11
|
pendingLocalEvents: RebaseEventWithConflict[];
|
|
12
12
|
validate: (args: {
|
|
13
|
-
rebasedLocalEvents: LiveStoreEvent.
|
|
13
|
+
rebasedLocalEvents: LiveStoreEvent.Input.Decoded[];
|
|
14
14
|
eventDefs: Record<string, EventDef.Any>;
|
|
15
15
|
}) => FactValidationResult;
|
|
16
16
|
};
|
|
17
17
|
export type RebaseOutput = {
|
|
18
|
-
rebasedLocalEvents: LiveStoreEvent.
|
|
18
|
+
rebasedLocalEvents: LiveStoreEvent.Input.Decoded[];
|
|
19
19
|
};
|
|
20
20
|
export type RebaseFn = (input: RebaseInput) => RebaseOutput;
|
|
21
21
|
export declare const defaultRebaseFn: RebaseFn;
|
|
@@ -26,5 +26,5 @@ export declare const rebaseEvents: ({ rebaseFn, pendingLocalEvents, newRemoteEve
|
|
|
26
26
|
currentFactsSnapshot: EventDefFactsSnapshot;
|
|
27
27
|
clientId: string;
|
|
28
28
|
sessionId: string;
|
|
29
|
-
}) => ReadonlyArray<LiveStoreEvent.
|
|
29
|
+
}) => ReadonlyArray<LiveStoreEvent.Client.Decoded>;
|
|
30
30
|
//# sourceMappingURL=rebase-events.d.ts.map
|
|
@@ -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,
|
|
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,8BAA8B,CAAA;AAEnF,OAAO,KAAK,KAAK,cAAc,MAAM,oCAAoC,CAAA;AACzE,OAAO,EAEL,KAAK,oBAAoB,EAI1B,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,KAAK,CAAC,OAAO,EAAE,CAAA;QAClD,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,KAAK,CAAC,OAAO,EAAE,CAAA;CACnD,CAAA;AAED,MAAM,MAAM,QAAQ,GAAG,CAAC,KAAK,EAAE,WAAW,KAAK,YAAY,CAAA;AAE3D,eAAO,MAAM,eAAe,EAAE,QAM7B,CAAA;AAGD,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,MAAM,CAAC,OAAO,CAuD9C,CAAA"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import * as EventSequenceNumber from "../../schema/EventSequenceNumber.js";
|
|
1
|
+
import * as EventSequenceNumber from "../../schema/EventSequenceNumber/mod.js";
|
|
2
2
|
import { applyFactGroups, factsIntersect, getFactsGroupForEventArgs, validateFacts, } from "./facts.js";
|
|
3
3
|
export const defaultRebaseFn = ({ pendingLocalEvents }) => {
|
|
4
|
-
if (pendingLocalEvents.some((_) => _.conflictType === 'missing-requirement')) {
|
|
4
|
+
if (pendingLocalEvents.some((_) => _.conflictType === 'missing-requirement') === true) {
|
|
5
5
|
throw new Error('missing-requirement conflicts must be resolved before rebasing');
|
|
6
6
|
}
|
|
7
7
|
return { rebasedLocalEvents: pendingLocalEvents };
|
|
@@ -34,13 +34,13 @@ export const rebaseEvents = ({ rebaseFn, pendingLocalEvents, newRemoteEvents, cu
|
|
|
34
34
|
});
|
|
35
35
|
const headGlobalId = newRemoteEvents.at(-1).seqNum.global;
|
|
36
36
|
return rebasedLocalEvents.map((event, index) => ({
|
|
37
|
-
seqNum: EventSequenceNumber.make({
|
|
37
|
+
seqNum: EventSequenceNumber.Client.Composite.make({
|
|
38
38
|
global: headGlobalId + index + 1,
|
|
39
|
-
client: EventSequenceNumber.
|
|
39
|
+
client: EventSequenceNumber.Client.DEFAULT,
|
|
40
40
|
}),
|
|
41
|
-
parentSeqNum: EventSequenceNumber.make({
|
|
41
|
+
parentSeqNum: EventSequenceNumber.Client.Composite.make({
|
|
42
42
|
global: headGlobalId + index,
|
|
43
|
-
client: EventSequenceNumber.
|
|
43
|
+
client: EventSequenceNumber.Client.DEFAULT,
|
|
44
44
|
}),
|
|
45
45
|
name: event.name,
|
|
46
46
|
args: event.args,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rebase-events.js","sourceRoot":"","sources":["../../../src/sync/next/rebase-events.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,mBAAmB,MAAM,
|
|
1
|
+
{"version":3,"file":"rebase-events.js","sourceRoot":"","sources":["../../../src/sync/next/rebase-events.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
+
import { describe, expect, it } from 'vitest';
|
|
1
2
|
import { defineEvent } from '@livestore/common/schema';
|
|
2
3
|
import { Schema } from '@livestore/utils/effect';
|
|
3
|
-
import { describe, expect, it } from 'vitest';
|
|
4
4
|
import { compactEvents } from "../compact-events.js";
|
|
5
5
|
import { historyDagFromNodes } from "../history-dag.js";
|
|
6
6
|
import { customSerializer } from "./compact-events.test.js";
|
|
@@ -27,7 +27,7 @@ const eventDefs = {
|
|
|
27
27
|
schema: Schema.Struct({ value: Schema.Number }),
|
|
28
28
|
facts: ({ value }, currentFacts) => ({
|
|
29
29
|
modify: {
|
|
30
|
-
set: value === 0 || currentFacts.has(facts.multiplyByZero) ? [facts.multiplyByZero] : [],
|
|
30
|
+
set: value === 0 || currentFacts.has(facts.multiplyByZero) === true ? [facts.multiplyByZero] : [],
|
|
31
31
|
unset: value === 0 ? [] : [facts.multiplyByZero],
|
|
32
32
|
},
|
|
33
33
|
}),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compact-events.calculator.test.js","sourceRoot":"","sources":["../../../../src/sync/next/test/compact-events.calculator.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"compact-events.calculator.test.js","sourceRoot":"","sources":["../../../../src/sync/next/test/compact-events.calculator.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compact-events.test.d.ts","sourceRoot":"","sources":["../../../../src/sync/next/test/compact-events.test.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"compact-events.test.d.ts","sourceRoot":"","sources":["../../../../src/sync/next/test/compact-events.test.ts"],"names":[],"mappings":"AAgEA,eAAO,MAAM,gBAAgB,EAKxB,GAAG,CAAA"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { describe, expect, it } from 'vitest';
|
|
2
2
|
import { compactEvents } from "../compact-events.js";
|
|
3
|
-
import { historyDagFromNodes } from "../history-dag.js";
|
|
4
3
|
import { EMPTY_FACT_VALUE } from "../history-dag-common.js";
|
|
4
|
+
import { historyDagFromNodes } from "../history-dag.js";
|
|
5
5
|
import { events as eventDefs, printEvent, toEventNodes } from "./event-fixtures.js";
|
|
6
6
|
const customStringify = (value) => {
|
|
7
7
|
if (value === null) {
|
|
@@ -14,7 +14,7 @@ const customStringify = (value) => {
|
|
|
14
14
|
if (type === 'number' || type === 'boolean') {
|
|
15
15
|
return String(value);
|
|
16
16
|
}
|
|
17
|
-
if (Array.isArray(value)) {
|
|
17
|
+
if (Array.isArray(value) === true) {
|
|
18
18
|
const elements = value.map((el) => customStringify(el));
|
|
19
19
|
return `[${elements.join(', ')}]`;
|
|
20
20
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compact-events.test.js","sourceRoot":"","sources":["../../../../src/sync/next/test/compact-events.test.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"compact-events.test.js","sourceRoot":"","sources":["../../../../src/sync/next/test/compact-events.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import type { EventDef } from '../../../schema/EventDef.ts';
|
|
1
|
+
import type { EventDef } from '../../../schema/EventDef/mod.ts';
|
|
2
2
|
import type { HistoryDagNode } from '../history-dag-common.ts';
|
|
3
3
|
export declare const printEvent: ({ seqNum, parentSeqNum, factsGroup, ...rest }: HistoryDagNode) => {
|
|
4
|
-
facts: import("../../../schema/EventDef.ts").EventDefFactsGroup;
|
|
4
|
+
facts: import("../../../schema/EventDef/facts.ts").EventDefFactsGroup;
|
|
5
5
|
name: string;
|
|
6
6
|
args: any;
|
|
7
7
|
meta?: any;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"event-fixtures.d.ts","sourceRoot":"","sources":["../../../../src/sync/next/test/event-fixtures.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"event-fixtures.d.ts","sourceRoot":"","sources":["../../../../src/sync/next/test/event-fixtures.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAA;AAI/D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAA;AAI9D,eAAO,MAAM,UAAU,GAAI,+CAA+C,cAAc;;;;;;;;;CAKtF,CAAA;AAEF,+DAA+D;AAC/D,eAAO,MAAM,KAAK;qBACC,MAAM;0BACD,MAAM,aAAa,OAAO;wBAC5B,MAAM,aAAa,OAAO;0BACxB,MAAM;qBACX,MAAM;CACvB,CAAA;AAIF,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAsGlB,CAAA;AAED,MAAM,MAAM,YAAY,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,GAAG,CAAA;CAAE,CAAA;AAEtD,eAAO,MAAM,YAAY,GACvB,eAAe,YAAY,EAAE,EAC7B,WAAW,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,CAAC,EACvC,UAAU,MAAM,EAChB,WAAW,MAAM,GAAG,SAAS,KAC5B,cAAc,EAgFhB,CAAA"}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import { Schema } from '@livestore/utils/effect';
|
|
2
|
-
import { defineEvent, defineFacts } from "../../../schema/EventDef.js";
|
|
3
|
-
import * as EventSequenceNumber from "../../../schema/EventSequenceNumber.js";
|
|
2
|
+
import { defineEvent, defineFacts } from "../../../schema/EventDef/mod.js";
|
|
3
|
+
import * as EventSequenceNumber from "../../../schema/EventSequenceNumber/mod.js";
|
|
4
4
|
import { factsSnapshotForDag, getFactsGroupForEventArgs } from "../facts.js";
|
|
5
|
-
import { historyDagFromNodes } from "../history-dag.js";
|
|
6
5
|
import { rootEventNode } from "../history-dag-common.js";
|
|
6
|
+
import { historyDagFromNodes } from "../history-dag.js";
|
|
7
7
|
export const printEvent = ({ seqNum, parentSeqNum, factsGroup, ...rest }) => ({
|
|
8
|
-
seqNum: EventSequenceNumber.toString(seqNum),
|
|
9
|
-
parentSeqNum: EventSequenceNumber.toString(parentSeqNum),
|
|
8
|
+
seqNum: EventSequenceNumber.Client.toString(seqNum),
|
|
9
|
+
parentSeqNum: EventSequenceNumber.Client.toString(parentSeqNum),
|
|
10
10
|
...rest,
|
|
11
11
|
facts: factsGroup,
|
|
12
12
|
});
|
|
@@ -39,7 +39,7 @@ export const events = {
|
|
|
39
39
|
// {
|
|
40
40
|
facts: ({ id }, currentFacts) =>
|
|
41
41
|
// TODO enable an API along the lines of `map.has(key, value)`
|
|
42
|
-
currentFacts.has(facts.todoExists(id)) && currentFacts.get(facts.todoIsWriteable(id, true)[0]) === false
|
|
42
|
+
currentFacts.has(facts.todoExists(id)) === true && currentFacts.get(facts.todoIsWriteable(id, true)[0]) === false
|
|
43
43
|
? { require: [facts.todoExists(id), facts.todoIsWriteable(id, true)] }
|
|
44
44
|
: { modify: { set: [facts.todoExists(id), facts.todoIsWriteable(id, true), facts.todoTextUpdated(id)] } },
|
|
45
45
|
}),
|
|
@@ -125,10 +125,10 @@ export const events = {
|
|
|
125
125
|
};
|
|
126
126
|
export const toEventNodes = (partialEvents, eventDefs, clientId, sessionId) => {
|
|
127
127
|
const nodesAcc = [rootEventNode];
|
|
128
|
-
let currentEventSequenceNumber = EventSequenceNumber.ROOT;
|
|
128
|
+
let currentEventSequenceNumber = EventSequenceNumber.Client.ROOT;
|
|
129
129
|
const eventNodes = partialEvents.map((partialEvent) => {
|
|
130
130
|
const eventDef = eventDefs[partialEvent.name];
|
|
131
|
-
const eventNum = EventSequenceNumber.nextPair({
|
|
131
|
+
const eventNum = EventSequenceNumber.Client.nextPair({
|
|
132
132
|
seqNum: currentEventSequenceNumber,
|
|
133
133
|
isClient: eventDef.options.clientOnly,
|
|
134
134
|
}).seqNum;
|
|
@@ -197,12 +197,12 @@ const getParentNum = (eventNum) => {
|
|
|
197
197
|
const globalParentNum = eventNum.global;
|
|
198
198
|
const clientParentNum = eventNum.client - 1;
|
|
199
199
|
if (clientParentNum < 0) {
|
|
200
|
-
return EventSequenceNumber.make({
|
|
200
|
+
return EventSequenceNumber.Client.Composite.make({
|
|
201
201
|
global: globalParentNum - 1,
|
|
202
|
-
client: EventSequenceNumber.
|
|
202
|
+
client: EventSequenceNumber.Client.DEFAULT,
|
|
203
203
|
});
|
|
204
204
|
}
|
|
205
|
-
return EventSequenceNumber.make({
|
|
205
|
+
return EventSequenceNumber.Client.Composite.make({
|
|
206
206
|
global: globalParentNum,
|
|
207
207
|
client: clientParentNum,
|
|
208
208
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"event-fixtures.js","sourceRoot":"","sources":["../../../../src/sync/next/test/event-fixtures.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAGhD,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"event-fixtures.js","sourceRoot":"","sources":["../../../../src/sync/next/test/event-fixtures.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAGhD,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAA;AAC1E,OAAO,KAAK,mBAAmB,MAAM,4CAA4C,CAAA;AACjF,OAAO,EAAE,mBAAmB,EAAE,yBAAyB,EAAE,MAAM,aAAa,CAAA;AAE5E,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAA;AACxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAA;AAEvD,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,UAAU,EAAE,GAAG,IAAI,EAAkB,EAAE,EAAE,CAAC,CAAC;IAC5F,MAAM,EAAE,mBAAmB,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC;IACnD,YAAY,EAAE,mBAAmB,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC;IAC/D,GAAG,IAAI;IACP,KAAK,EAAE,UAAU;CAClB,CAAC,CAAA;AAEF,+DAA+D;AAC/D,MAAM,CAAC,MAAM,KAAK,GAAG,WAAW,CAAC;IAC/B,UAAU,EAAE,CAAC,EAAU,EAAE,EAAE,CAAC,eAAe,EAAE,EAAE;IAC/C,eAAe,EAAE,CAAC,EAAU,EAAE,SAAkB,EAAE,EAAE,CAAC,CAAC,qBAAqB,EAAE,EAAE,EAAE,SAAS,CAAC;IAC3F,aAAa,EAAE,CAAC,EAAU,EAAE,SAAkB,EAAE,EAAE,CAAC,CAAC,kBAAkB,EAAE,EAAE,EAAE,SAAS,CAAC;IACtF,eAAe,EAAE,CAAC,EAAU,EAAE,EAAE,CAAC,qBAAqB,EAAE,EAAE;IAC1D,UAAU,EAAE,CAAC,EAAU,EAAE,EAAE,CAAC,eAAe,EAAE,EAAE;CAChD,CAAC,CAAA;AAEF,mDAAmD;AACnD,yEAAyE;AACzE,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,UAAU,EAAE,WAAW,CAAC;QACtB,IAAI,EAAE,YAAY;QAClB,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC;QACjE,sDAAsD;QACtD,IAAI;QACJ,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;YAClB,MAAM,EAAE;gBACN,GAAG,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,eAAe,CAAC,EAAE,EAAE,IAAI,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;aAC7F;SACF,CAAC;KACH,CAAC;IACF,UAAU,EAAE,WAAW,CAAC;QACtB,IAAI,EAAE,YAAY;QAClB,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;QAClF,kGAAkG;QAClG,IAAI;QACJ,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,YAAY,EAAE,EAAE;QAC9B,8DAA8D;QAC9D,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,KAAK,IAAI,IAAI,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,eAAe,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK;YAC/G,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,eAAe,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC,EAAE;YACtE,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,eAAe,CAAC,EAAE,EAAE,IAAI,CAAC,EAAE,KAAK,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE;KAC9G,CAAC;IACF,aAAa,EAAE,WAAW,CAAC;QACzB,IAAI,EAAE,eAAe;QACrB,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC;QAC5C,yDAAyD;QACzD,sDAAsD;QACtD,IAAI;QACJ,8BAA8B;QAC9B,2BAA2B;QAC3B,8BAA8B;QAC9B,8BAA8B;QAC9B,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;YAClB,OAAO,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,eAAe,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;YAChE,MAAM,EAAE,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC,EAAE;SACjD,CAAC;KACH,CAAC;IACF,eAAe,EAAE,WAAW,CAAC;QAC3B,IAAI,EAAE,iBAAiB;QACvB,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC;QAC5C,uDAAuD;QACvD,IAAI;QACJ,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;YAClB,OAAO,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,eAAe,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;YAChE,MAAM,EAAE,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC,EAAE;SAClD,CAAC;KACH,CAAC;IACF,cAAc,EAAE,WAAW,CAAC;QAC1B,IAAI,EAAE,gBAAgB;QACtB,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;QAC3D,8DAA8D;QAC9D,IAAI;QACJ,KAAK,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC;YACnB,OAAO,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,eAAe,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC;YACrF,MAAM,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC,EAAE;SAChE,CAAC;KACH,CAAC;IACF,UAAU,EAAE,WAAW,CAAC;QACtB,IAAI,EAAE,YAAY;QAClB,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC;QAC5C,+DAA+D;QAC/D,IAAI;QACJ,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,YAAY,EAAE,EAAE;YAC9B,MAAM,kBAAkB,GAAG,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,CAAA;YACtF,OAAO;gBACL,OAAO,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,eAAe,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;gBAChE,MAAM,EAAE;oBACN,yDAAyD;oBACzD,GAAG,EAAE,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE,EAAE,CAAC,kBAAkB,CAAC,CAAC;iBACpD;aACF,CAAA;QACH,CAAC;KACF,CAAC;IACF,eAAe,EAAE,WAAW,CAAC;QAC3B,IAAI,EAAE,iBAAiB;QACvB,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC;QACtE,0DAA0D;QAC1D,IAAI;QACJ,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC;YAC5B,OAAO,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;YAC/B,MAAM,EAAE,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,eAAe,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE;SACxD,CAAC;KACH,CAAC;IACF,WAAW,EAAE,WAAW,CAAC;QACvB,IAAI,EAAE,aAAa;QACnB,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC;QACjE,kDAAkD;QAClD,IAAI;QACJ,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;YAClB,OAAO,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,eAAe,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;YAChE,MAAM,EAAE,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC,EAAE;SAC7C,CAAC;KACH,CAAC;IACF,aAAa,EAAE,WAAW,CAAC;QACzB,IAAI,EAAE,eAAe;QACrB,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC;QACjE,kDAAkD;QAClD,IAAI;QACJ,UAAU,EAAE,IAAI;QAChB,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC;KACjE,CAAC;CACH,CAAA;AAID,MAAM,CAAC,MAAM,YAAY,GAAG,CAC1B,aAA6B,EAC7B,SAAuC,EACvC,QAAgB,EAChB,SAA6B,EACX,EAAE;IACpB,MAAM,QAAQ,GAAqB,CAAC,aAAa,CAAC,CAAA;IAElD,IAAI,0BAA0B,GAAyC,mBAAmB,CAAC,MAAM,CAAC,IAAI,CAAA;IAEtG,MAAM,UAAU,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,YAAY,EAAE,EAAE;QACpD,MAAM,QAAQ,GAAG,SAAS,CAAC,YAAY,CAAC,IAAI,CAAE,CAAA;QAC9C,MAAM,QAAQ,GAAG,mBAAmB,CAAC,MAAM,CAAC,QAAQ,CAAC;YACnD,MAAM,EAAE,0BAA0B;YAClC,QAAQ,EAAE,QAAQ,CAAC,OAAO,CAAC,UAAU;SACtC,CAAC,CAAC,MAAM,CAAA;QACT,0BAA0B,GAAG,QAAQ,CAAA;QAErC,MAAM,aAAa,GAAG,mBAAmB,CAAC,mBAAmB,CAAC,QAAQ,EAAE,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC,EAAE,SAAS,CAAC,CAAA;QAC7G,wDAAwD;QACxD,gEAAgE;QAChE,wDAAwD;QACxD,6BAA6B;QAC7B,4BAA4B;QAC5B,kCAAkC;QAClC,6CAA6C;QAC7C,iCAAiC;QACjC,UAAU;QACV,mCAAmC;QACnC,kCAAkC;QAClC,6CAA6C;QAC7C,iCAAiC;QACjC,UAAU;QACV,QAAQ;QAER,mFAAmF;QACnF,OAAO;QACP,KAAK;QAEL,mFAAmF;QACnF,+DAA+D;QAC/D,qEAAqE;QACrE,0BAA0B;QAC1B,mCAAmC;QACnC,sCAAsC;QACtC,wCAAwC;QACxC,eAAe;QACf,kCAAkC;QAClC,QAAQ;QACR,MAAM;QACN,eAAe;QACf,IAAI;QACJ,kBAAkB;QAClB,sFAAsF;QACtF,+FAA+F;QAC/F,iFAAiF;QACjF,aAAa;QACb,iCAAiC;QAEjC,uCAAuC;QAEvC,MAAM,KAAK,GAAG,yBAAyB,CAAC;YACtC,aAAa,EAAE,QAAQ,CAAC,OAAO,CAAC,KAAK;YACrC,IAAI,EAAE,YAAY,CAAC,IAAI;YACvB,YAAY,EAAE,aAAa;SAC5B,CAAC,CAAA;QAEF,MAAM,IAAI,GAAG;YACX,MAAM,EAAE,QAAQ;YAChB,YAAY,EAAE,YAAY,CAAC,QAAQ,CAAC;YACpC,IAAI,EAAE,YAAY,CAAC,IAAI;YACvB,IAAI,EAAE,YAAY,CAAC,IAAI;YACvB,UAAU,EAAE,KAAK;YACjB,QAAQ;YACR,SAAS;SACe,CAAA;QAC1B,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACnB,OAAO,IAAI,CAAA;IACb,CAAC,CAAC,CAAA;IAEF,UAAU,CAAC,OAAO,CAAC,aAAsB,CAAC,CAAA;IAE1C,wCAAwC;IAExC,OAAO,UAAU,CAAA;AACnB,CAAC,CAAA;AAED,MAAM,YAAY,GAAG,CAAC,QAA8C,EAAwC,EAAE;IAC5G,MAAM,eAAe,GAAG,QAAQ,CAAC,MAAM,CAAA;IACvC,MAAM,eAAe,GAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAA;IAE3C,IAAI,eAAe,GAAG,CAAC,EAAE,CAAC;QACxB,OAAO,mBAAmB,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC;YAC/C,MAAM,EAAE,eAAe,GAAG,CAAC;YAC3B,MAAM,EAAE,mBAAmB,CAAC,MAAM,CAAC,OAAO;SAC3C,CAAC,CAAA;IACJ,CAAC;IAED,OAAO,mBAAmB,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC;QAC/C,MAAM,EAAE,eAAe;QACvB,MAAM,EAAE,eAAe;KACxB,CAAC,CAAA;AACJ,CAAC,CAAA"}
|