@dxos/echo-db 2.33.5-dev.1fc05a51 → 2.33.5-dev.39ec2a53

package/src/pipeline/party-feed-provider.ts

@@ -8,7 +8,7 @@ import debug from 'debug';
 import { Event, synchronized } from '@dxos/async';
 import { Keyring, KeyType } from '@dxos/credentials';
 import { PublicKey } from '@dxos/crypto';
-import { FeedStoreIterator, MessageSelector, Timeframe } from '@dxos/echo-protocol';
+import { FeedSelector, FeedStoreIterator, MessageSelector, Timeframe } from '@dxos/echo-protocol';
 import { FeedDescriptor, FeedStore } from '@dxos/feed-store';
 import { ComplexMap } from '@dxos/util';
 
@@ -33,19 +33,6 @@ export class PartyFeedProvider {
     return Array.from(this._feeds.values());
   }
 
-  @synchronized
-  async openKnownFeeds () {
-    for (const feedKey of this._metadataStore.getParty(this._partyKey)?.feedKeys ?? []) {
-      if (!this._feeds.has(feedKey)) {
-        const fullKey = this._keyring.getFullKey(feedKey);
-        const feed = fullKey?.secretKey
-          ? await this._feedStore.openReadWriteFeed(fullKey.publicKey, fullKey.secretKey)
-          : await this._feedStore.openReadOnlyFeed(feedKey);
-        this._trackFeed(feed);
-      }
-    }
-  }
-
   @synchronized
   async createOrOpenWritableFeed () {
     const partyMetadata = this._metadataStore.getParty(this._partyKey);
@@ -103,8 +90,8 @@ export class PartyFeedProvider {
     return feed;
   }
 
-  async createIterator (messageSelector: MessageSelector, initialTimeframe?: Timeframe) {
-    const iterator = new FeedStoreIterator(() => true, messageSelector, initialTimeframe ?? new Timeframe());
+  async createIterator (messageSelector: MessageSelector, feedSelector: FeedSelector, initialTimeframe?: Timeframe) {
+    const iterator = new FeedStoreIterator(feedSelector, messageSelector, initialTimeframe ?? new Timeframe());
     for (const feed of this._feeds.values()) {
       iterator.addFeedDescriptor(feed);
     }

package/src/pipeline/{party-core.test.ts → party-pipeline.test.ts}

@@ -8,7 +8,8 @@ import { it as test } from 'mocha';
 import { promiseTimeout } from '@dxos/async';
 import { createFeedAdmitMessage, createPartyGenesisMessage, Keyring, KeyType } from '@dxos/credentials';
 import { createId, PublicKey } from '@dxos/crypto';
-import { codec, Timeframe } from '@dxos/echo-protocol';
+import { checkType } from '@dxos/debug';
+import { codec, FeedMessage, Timeframe } from '@dxos/echo-protocol';
 import { FeedStore } from '@dxos/feed-store';
 import { createTestProtocolPair } from '@dxos/mesh-protocol';
 import { ModelFactory } from '@dxos/model-factory';
@@ -16,12 +17,12 @@ import { ObjectModel } from '@dxos/object-model';
 import { createStorage, StorageType } from '@dxos/random-access-multi-storage';
 import { afterTest } from '@dxos/testutils';
 
-import { MetadataStore, PartyFeedProvider } from '../pipeline';
+import { MetadataStore, PartyFeedProvider } from '.';
 import { createReplicatorPlugin } from '../protocol/replicator-plugin';
 import { SnapshotStore } from '../snapshots';
-import { PartyCore } from './party-core';
+import { PartyPipeline } from './party-pipeline';
 
-describe('PartyCore', () => {
+describe('PartyPipeline', () => {
   const setup = async () => {
     const storage = createStorage('', StorageType.RAM);
     const feedStore = new FeedStore(storage.directory('feed'), { valueEncoding: codec });
@@ -38,7 +39,7 @@ describe('PartyCore', () => {
 
     const partyFeedProvider = new PartyFeedProvider(metadataStore, keyring, feedStore, partyKey.publicKey);
 
-    const party = new PartyCore(
+    const party = new PartyPipeline(
       partyKey.publicKey,
       partyFeedProvider,
       modelFactory,
@@ -47,11 +48,11 @@ describe('PartyCore', () => {
     );
 
     const feed = await partyFeedProvider.createOrOpenWritableFeed();
-    await party.open();
+    await party.open({ feedHints: [feed.key] });
     afterTest(async () => party.close());
 
     // PartyGenesis (self-signed by Party).
-    await party.writeCredentialsMessage(createPartyGenesisMessage(
+    await party.credentialsWriter.write(createPartyGenesisMessage(
       keyring,
       partyKey,
       feed.key,
@@ -59,7 +60,7 @@ describe('PartyCore', () => {
     );
 
     // FeedAdmit (signed by the Device KeyChain).
-    await party.writeCredentialsMessage(createFeedAdmitMessage(
+    await party.credentialsWriter.write(createFeedAdmitMessage(
       keyring,
       partyKey.publicKey,
       feed.key,
@@ -87,7 +88,7 @@ describe('PartyCore', () => {
   });
 
   test('create item with parent and then reload', async () => {
-    const { party } = await setup();
+    const { party, feedKey } = await setup();
 
     {
       const parent = await party.database.createItem({ model: ObjectModel, type: 'parent' });
@@ -102,7 +103,7 @@ describe('PartyCore', () => {
     }
 
     await party.close();
-    await party.open();
+    await party.open({ feedHints: [feedKey] });
 
     {
       await party.database.select().exec().update.waitFor(result => result.entities.length === 2);
@@ -120,7 +121,7 @@ describe('PartyCore', () => {
     const feedKey = await keyring.createKeyRecord({ type: KeyType.FEED });
 
     const eventFired = feedStore.feedOpenedEvent.waitForCount(1);
-    await party.writeCredentialsMessage(createFeedAdmitMessage(
+    await party.credentialsWriter.write(createFeedAdmitMessage(
       keyring,
       party.key,
       feedKey.publicKey,
@@ -148,7 +149,7 @@ describe('PartyCore', () => {
 
     const otherFeedKey = PublicKey.random();
 
-    const party = new PartyCore(
+    const party = new PartyPipeline(
       partyKey.publicKey,
       partyFeedProvider,
       modelFactory,
@@ -160,7 +161,7 @@ describe('PartyCore', () => {
 
     const feedOpened = feedStore.feedOpenedEvent.waitForCount(1);
 
-    await party.open([{ type: KeyType.FEED, publicKey: otherFeedKey }]);
+    await party.open({ feedHints: [otherFeedKey] });
     afterTest(async () => party.close());
 
     await feedOpened;
@@ -175,16 +176,16 @@ describe('PartyCore', () => {
     const feed = await partyFeedProvider.createOrOpenWritableFeed();
 
     const itemId = createId();
-    await feed.feed.append({
+    await feed.feed.append(checkType<FeedMessage>({
+      timeframe: new Timeframe(),
       echo: {
         itemId,
         genesis: {
           itemType: 'dxos:example',
           modelType: ObjectModel.meta.type
-        },
-        timeframe: new Timeframe()
+        }
       }
-    });
+    }));
 
     await promiseTimeout(party.database.waitForItem({ id: itemId }), 1000, new Error('timeout'));
   });
@@ -197,7 +198,7 @@ describe('PartyCore', () => {
     const fullKey = keyring.getFullKey(feedKey.publicKey);
     const feed2 = await feedStore.openReadWriteFeed(fullKey!.publicKey, fullKey!.secretKey!);
 
-    await party.writeCredentialsMessage(createFeedAdmitMessage(
+    await party.credentialsWriter.write(createFeedAdmitMessage(
       keyring,
       party.key,
       feed2.key,
@@ -205,16 +206,16 @@ describe('PartyCore', () => {
     ));
 
     const itemId = createId();
-    await feed2.append({
+    await feed2.append(checkType<FeedMessage>({
+      timeframe: new Timeframe(),
       echo: {
         itemId,
         genesis: {
           itemType: 'dxos:example',
           modelType: ObjectModel.meta.type
-        },
-        timeframe: new Timeframe()
+        }
       }
-    });
+    }));
 
     await promiseTimeout(party.database.waitForItem({ id: itemId }), 1000, new Error('timeout'));
   });
@@ -226,7 +227,7 @@ describe('PartyCore', () => {
     const feedKey = await keyring.createKeyRecord({ type: KeyType.FEED });
     const fullKey = keyring.getFullKey(feedKey.publicKey);
 
-    await party.writeCredentialsMessage(createFeedAdmitMessage(
+    await party.credentialsWriter.write(createFeedAdmitMessage(
       keyring,
       party.key,
       feedKey.publicKey,
@@ -235,20 +236,42 @@ describe('PartyCore', () => {
 
     const feed2 = await feedStore.openReadWriteFeed(fullKey!.publicKey, fullKey!.secretKey!);
     const itemId = createId();
-    await feed2.append({
+    await feed2.append(checkType<FeedMessage>({
+      timeframe: new Timeframe(),
       echo: {
         itemId,
         genesis: {
           itemType: 'dxos:example',
           modelType: ObjectModel.meta.type
-        },
-        timeframe: new Timeframe()
+        }
       }
-    });
+    }));
 
     await promiseTimeout(party.database.waitForItem({ id: itemId }), 1000, new Error('timeout'));
   });
 
+  test('wait to reach specific timeframe', async () => {
+    const { party, feedKey } = await setup();
+
+    {
+      const parent = await party.database.createItem({ model: ObjectModel, type: 'parent' });
+      const child = await party.database.createItem({
+        model: ObjectModel,
+        parent: parent.id,
+        type: 'child'
+      });
+
+      expect(child.parent).toEqual(parent);
+      expect(parent.children).toContain(child);
+    }
+
+    const timeframe = party.timeframe;
+    expect(timeframe.isEmpty()).toBeFalsy();
+
+    await party.close();
+    await party.open({ feedHints: [feedKey], targetTimeframe: timeframe });
+  });
+
   test('two instances replicating', async () => {
     const peer1 = await setup();
 
@@ -263,7 +286,7 @@ describe('PartyCore', () => {
 
     const partyFeedProvider = new PartyFeedProvider(metadataStore, peer1.keyring, feedStore, peer1.party.key);
 
-    const party2 = new PartyCore(
+    const party2 = new PartyPipeline(
       peer1.party.key,
       partyFeedProvider,
       modelFactory,
@@ -273,17 +296,16 @@ describe('PartyCore', () => {
 
     const feed2 = await partyFeedProvider.createOrOpenWritableFeed();
 
-    await peer1.party.writeCredentialsMessage(createFeedAdmitMessage(
+    await peer1.party.credentialsWriter.write(createFeedAdmitMessage(
       peer1.keyring,
       peer1.party.key,
       feed2.key,
       [peer1.partyKey]
     ));
 
-    await party2.open([{
-      publicKey: peer1.feedKey,
-      type: KeyType.FEED
-    }]);
+    await party2.open({
+      feedHints: [peer1.feedKey]
+    });
     afterTest(async () => party2.close());
 
     createTestProtocolPair(

package/src/pipeline/{party-core.ts → party-pipeline.ts}

@@ -5,21 +5,20 @@
 import assert from 'assert';
 
 import { synchronized } from '@dxos/async';
-import { KeyHint, KeyType, Message as HaloMessage } from '@dxos/credentials';
+import { KeyType, Message as HaloMessage } from '@dxos/credentials';
 import { PublicKey } from '@dxos/crypto';
 import { timed } from '@dxos/debug';
-import { createFeedWriter, DatabaseSnapshot, PartyKey, PartySnapshot, Timeframe, WriteReceipt } from '@dxos/echo-protocol';
+import { createFeedWriter, DatabaseSnapshot, FeedSelector, FeedWriter, PartyKey, PartySnapshot, Timeframe } from '@dxos/echo-protocol';
 import { ModelFactory } from '@dxos/model-factory';
 import { SubscriptionGroup } from '@dxos/util';
 
-import { Database } from '../api';
-import { FeedDatabaseBackend, TimeframeClock } from '../database';
-import { createMessageSelector, PartyProcessor, PartyFeedProvider, Pipeline } from '../pipeline';
+import { createMessageSelector, PartyProcessor, PartyFeedProvider, FeedMuxer } from '.';
+import { Database, FeedDatabaseBackend, TimeframeClock } from '../packlets/database';
 import { createAutomaticSnapshots, SnapshotStore } from '../snapshots';
 
 const DEFAULT_SNAPSHOT_INTERVAL = 100; // Every 100 messages.
 
-export interface PartyOptions {
+export interface PipelineOptions {
   readLogger?: (msg: any) => void;
   writeLogger?: (msg: any) => void;
   readOnly?: boolean;
@@ -29,6 +28,22 @@ export interface PartyOptions {
   snapshotInterval?: number;
 }
 
+export interface OpenOptions {
+  /**
+   * Keys of initial feeds needed to bootstrap the party.
+   */
+  feedHints?: PublicKey[]
+  /**
+   * Timeframe to start processing feed messages from.
+   */
+  initialTimeframe?: Timeframe
+  /**
+   * Timeframe which must be reached until further processing.
+   * PartyCore.open will block until this timeframe is reached.
+   */
+  targetTimeframe?: Timeframe
+}
+
 /**
  * Encapsulates core components needed by a party:
  * - ECHO database with item-manager & item-demuxer.
@@ -37,7 +52,7 @@ export interface PartyOptions {
  *
  * The core class also handles the combined ECHO and HALO state snapshots.
  */
-export class PartyCore {
+export class PartyPipeline {
   /**
    * Snapshot to be restored from when party.open() is called.
    */
@@ -46,7 +61,7 @@ export class PartyCore {
   private readonly _subscriptions = new SubscriptionGroup();
 
   private _database?: Database;
-  private _pipeline?: Pipeline;
+  private _pipeline?: FeedMuxer;
   private _partyProcessor?: PartyProcessor;
   private _timeframeClock?: TimeframeClock;
 
@@ -56,8 +71,7 @@ export class PartyCore {
     private readonly _modelFactory: ModelFactory,
     private readonly _snapshotStore: SnapshotStore,
     private readonly _memberKey: PublicKey,
-    private readonly _initialTimeframe?: Timeframe,
-    private readonly _options: PartyOptions = {}
+    private readonly _options: PipelineOptions = {}
   ) { }
 
   get key (): PartyKey {
@@ -99,20 +113,29 @@ export class PartyCore {
     return feed;
   }
 
+  get credentialsWriter (): FeedWriter<HaloMessage> {
+    assert(this._pipeline?.outboundHaloStream, 'Party not open');
+    return this._pipeline?.outboundHaloStream;
+  }
+
   /**
    * Opens the pipeline and connects the streams.
    */
   @synchronized
   @timed(1_000)
-  async open (keyHints: KeyHint[] = []) {
+  async open (options: OpenOptions = {}) {
+    const {
+      feedHints = [],
+      initialTimeframe,
+      targetTimeframe
+    } = options;
+
     if (this.isOpen) {
       return this;
     }
 
-    this._timeframeClock = new TimeframeClock(this._initialTimeframe);
+    this._timeframeClock = new TimeframeClock(initialTimeframe);
 
-    // Open all feeds known from metadata and open or create a writable feed to the party.
-    await this._feedProvider.openKnownFeeds();
     const writableFeed = await this._feedProvider.createOrOpenWritableFeed();
 
     if (!this._partyProcessor) {
@@ -124,12 +147,8 @@ export class PartyCore {
       void this._feedProvider.createOrOpenReadOnlyFeed(feed);
     }));
 
-    // Hint at our own writable feed.
-    // TODO(dmaretskyi): Does not seem like it should be required, but without it replication between devices (B -> A) breaks.
-    await this._partyProcessor.takeHints([{ type: KeyType.FEED, publicKey: writableFeed.key }]);
-
-    if (keyHints.length > 0) {
-      await this._partyProcessor.takeHints(keyHints);
+    if (feedHints.length > 0) {
+      await this._partyProcessor.takeHints(feedHints.map(publicKey => ({ publicKey, type: KeyType.FEED })));
     }
 
     //
@@ -138,31 +157,34 @@ export class PartyCore {
 
     const iterator = await this._feedProvider.createIterator(
       createMessageSelector(this._partyProcessor, this._timeframeClock),
-      this._initialTimeframe
+      createFeedSelector(this._partyProcessor, feedHints),
+      initialTimeframe
     );
 
-    this._pipeline = new Pipeline(
-      this._partyProcessor, iterator, this._timeframeClock, createFeedWriter(writableFeed.feed), this._options);
-
-    // TODO(burdon): Support read-only parties.
-    const [readStream, writeStream] = await this._pipeline.open();
+    this._pipeline = new FeedMuxer(
+      this._partyProcessor,
 
-    // Must happen after open.
-    if (this._pipeline.outboundHaloStream) {
-      this._partyProcessor.setOutboundStream(this._pipeline.outboundHaloStream);
-    }
+      iterator,
+      this._timeframeClock,
+      createFeedWriter(writableFeed.feed),
+      this._options
+    );
 
     //
     // Database
     //
 
+    const databaseBackend = new FeedDatabaseBackend(this._pipeline.outboundEchoStream, this._databaseSnapshot, { snapshots: true });
     this._database = new Database(
       this._modelFactory,
-      new FeedDatabaseBackend(readStream, writeStream, this._databaseSnapshot, { snapshots: true }),
+      databaseBackend,
       this._memberKey
     );
 
+    // Open pipeline and connect it to the database.
     await this._database.initialize();
+    this._pipeline.setEchoProcessor(databaseBackend.echoProcessor);
+    await this._pipeline.open();
 
     // TODO(burdon): Propagate errors.
     this._subscriptions.push(this._pipeline.errors.on(err => console.error(err)));
@@ -176,6 +198,10 @@ export class PartyCore {
       );
     }
 
+    if (targetTimeframe) {
+      await this._timeframeClock.waitUntilReached(targetTimeframe);
+    }
+
     return this;
   }
 
@@ -202,11 +228,6 @@ export class PartyCore {
     return this;
   }
 
-  writeCredentialsMessage (message: HaloMessage): Promise<WriteReceipt> {
-    assert(this._partyProcessor, 'Party not open');
-    return this._partyProcessor?.writeHaloMessage(message);
-  }
-
   /**
    * Create a snapshot of the current state.
    */
@@ -234,3 +255,5 @@ export class PartyCore {
     this._databaseSnapshot = snapshot.database;
   }
 }
+
+const createFeedSelector = (partyProcessor: PartyProcessor, hints: PublicKey[]): FeedSelector => feed => hints.some(hint => hint.equals(feed.key)) || partyProcessor.isFeedAdmitted(feed.key);

package/src/pipeline/party-processor.ts

@@ -16,15 +16,11 @@ import {
   SignedMessage
 } from '@dxos/credentials';
 import { PublicKey } from '@dxos/crypto';
-import { FeedKey, FeedWriter, IHaloStream, PartyKey, HaloStateSnapshot, WriteReceipt } from '@dxos/echo-protocol';
+import { FeedKey, IHaloStream, PartyKey, HaloStateSnapshot } from '@dxos/echo-protocol';
 import { jsonReplacer } from '@dxos/util';
 
 const log = debug('dxos:echo-db:party-processor');
 
-export interface CredentialWriter {
-  writeHaloMessage (message: HaloMessage): Promise<WriteReceipt>
-}
-
 export interface CredentialProcessor {
   processMessage (message: IHaloStream): Promise<void>
 }
@@ -47,11 +43,9 @@ export interface PartyStateProvider {
 /**
  * TODO(burdon): Wrapper/Bridge between HALO APIs.
  */
-export class PartyProcessor implements CredentialWriter, CredentialProcessor, PartyStateProvider {
+export class PartyProcessor implements CredentialProcessor, PartyStateProvider {
   private readonly _state: PartyState;
 
-  private _outboundHaloStream: FeedWriter<HaloMessage> | undefined;
-
   readonly feedAdded = new Event<FeedKey>()
 
   public readonly keyOrInfoAdded = new Event<PublicKey>();
@@ -148,16 +142,6 @@ export class PartyProcessor implements CredentialWriter, CredentialProcessor, Pa
     await this._state.processMessages([data]);
   }
 
-  setOutboundStream (stream: FeedWriter<HaloMessage>) {
-    this._outboundHaloStream = stream;
-  }
-
-  async writeHaloMessage (message: HaloMessage): Promise<WriteReceipt> {
-    assert(this._outboundHaloStream, 'Party is closed or read-only');
-    // TODO(marik-d): Wait for the message to be processed?
-    return this._outboundHaloStream.write(message);
-  }
-
   makeSnapshot (): HaloStateSnapshot {
     return {
       messages: this._haloMessages

package/src/protocol/authenticator.test.ts

@@ -6,7 +6,6 @@ import expect from 'expect';
 import { it as test } from 'mocha';
 
 import { createAuthMessage, createKeyAdmitMessage, createPartyGenesisMessage, Keyring, KeyType } from '@dxos/credentials';
-import { MockFeedWriter } from '@dxos/echo-protocol';
 
 import { PartyProcessor } from '../pipeline';
 import { createAuthenticator } from './authenticator';
@@ -23,8 +22,6 @@ describe('authenticator', () => {
     const signer = CredentialsSigner.createDirectDeviceSigner(keyring);
 
     const partyProcessor = new PartyProcessor(partyKey.publicKey);
-    const feed = new MockFeedWriter();
-    partyProcessor.setOutboundStream(feed);
     await partyProcessor.processMessage({
       data: createPartyGenesisMessage(
         keyring,
@@ -53,7 +50,7 @@ describe('authenticator', () => {
       meta: {} as any
     });
 
-    const authenticator = createAuthenticator(partyProcessor, signer);
+    const authenticator = createAuthenticator(partyProcessor, signer, null as any);
     const credential = createAuthMessage(
       keyring,
       partyKey.publicKey,

package/src/protocol/authenticator.ts

@@ -4,18 +4,22 @@
 
 import debug from 'debug';
 
-import { Authenticator, codec, createAuthMessage, createEnvelopeMessage, createFeedAdmitMessage, PartyAuthenticator } from '@dxos/credentials';
-import { FeedKey, PartyKey } from '@dxos/echo-protocol';
+import { Message as HaloMessage, Authenticator, codec, createAuthMessage, createEnvelopeMessage, createFeedAdmitMessage, PartyAuthenticator } from '@dxos/credentials';
+import { FeedKey, FeedWriter, PartyKey } from '@dxos/echo-protocol';
 
 import { PartyProcessor } from '../pipeline';
 import { CredentialsSigner } from './credentials-signer';
 
 const log = debug('dxos:echo-db:authenticator');
 
-export const createAuthenticator = (partyProcessor: PartyProcessor, credentialsSigner: CredentialsSigner): Authenticator => new PartyAuthenticator(partyProcessor.state, async auth => {
+export const createAuthenticator = (
+  partyProcessor: PartyProcessor,
+  credentialsSigner: CredentialsSigner,
+  credentialsWriter: FeedWriter<HaloMessage>
+): Authenticator => new PartyAuthenticator(partyProcessor.state, async auth => {
   if (auth.feedAdmit && auth.feedKey && !partyProcessor.isFeedAdmitted(auth.feedKey)) {
     log(`Admitting feed of authenticated member: ${auth.feedKey}`);
-    await partyProcessor.writeHaloMessage(createEnvelopeMessage(
+    await credentialsWriter.write(createEnvelopeMessage(
       credentialsSigner.signer,
       partyProcessor.partyKey,
       auth.feedAdmit,

package/src/snapshots/snapshot-generator.ts

@@ -4,13 +4,13 @@
 
 import debug from 'debug';
 
-import { TimeframeClock } from '../database';
-import { PartyCore } from '../pipeline';
+import { TimeframeClock } from '../packlets/database';
+import { PartyPipeline } from '../pipeline';
 import { SnapshotStore } from './snapshot-store';
 
 const log = debug('dxos:snapshot-generator');
 
-export const createAutomaticSnapshots = (party: PartyCore, clock: TimeframeClock, store: SnapshotStore, interval: number) => clock.update.on(async timeframe => {
+export const createAutomaticSnapshots = (party: PartyPipeline, clock: TimeframeClock, store: SnapshotStore, interval: number) => clock.update.on(async timeframe => {
   const totalMessages = timeframe.totalMessages();
   if (totalMessages > 0 && totalMessages % interval === 0) {
     log(`Saving snapshot of ${party.key.humanize()}...`);

package/src/snapshots/snapshot-store.ts

@@ -59,6 +59,6 @@ export class SnapshotStore {
    */
   async clear () {
     log('Clearing all snapshots..');
-    await this._directory.destroy();
+    await this._directory.delete();
   }
 }

package/src/snapshots/snapshot.test.ts

@@ -12,7 +12,7 @@ import { schema, ItemID, MockFeedWriter, PartyKey } from '@dxos/echo-protocol';
 import { ModelFactory } from '@dxos/model-factory';
 import { ObjectModel, ValueUtil } from '@dxos/object-model';
 
-import { ItemDemuxer, ItemManager } from '../database';
+import { ItemDemuxer, ItemManager } from '../packlets/database';
 import { createTestInstance } from '../testing';
 
 const log = debug('dxos:snapshot:test');

package/src/testing/testing-factories.ts

@@ -8,8 +8,8 @@ import { Model } from '@dxos/model-factory';
 import { ObjectModel } from '@dxos/object-model';
 import { range } from '@dxos/util';
 
-import { Item, CreateItemOption } from '../api';
 import { ECHO } from '../echo';
+import { CreateItemOption, Item } from '../packlets/database';
 import { DataParty } from '../parties';
 import { createTestInstance, inviteTestPeer } from './testing';
 

package/dist/src/api/database.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"database.d.ts","sourceRoot":"","sources":["../../../src/api/database.ts"],"names":[],"mappings":"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"}

package/dist/src/api/database.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"database.js","sourceRoot":"","sources":["../../../src/api/database.ts"],"names":[],"mappings":"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"}

package/dist/src/api/database.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"database.test.d.ts","sourceRoot":"","sources":["../../../src/api/database.test.ts"],"names":[],"mappings":""}