@dxos/functions 0.5.3-main.79e0565 → 0.5.3-main.7cd4303

package/src/trigger/trigger-registry.test.ts

@@ -11,7 +11,7 @@ import { type Space } from '@dxos/client/echo';
 import { TestBuilder } from '@dxos/client/testing';
 import { Context } from '@dxos/context';
 import { Filter } from '@dxos/echo-db';
-import { create, splitMeta } from '@dxos/echo-schema';
+import { create } from '@dxos/echo-schema';
 import { describe, test } from '@dxos/test';
 import { range } from '@dxos/util';
 
@@ -19,17 +19,9 @@ import { TriggerRegistry } from './trigger-registry';
 import { createInitializedClients, TestType, triggerWebhook } from '../testing';
 import { type FunctionManifest, FunctionTrigger } from '../types';
 
-const manifest: FunctionManifest = {
+const testManifest: FunctionManifest = {
   triggers: [
     {
-      '@meta': {
-        keys: [
-          {
-            source: 'example.com',
-            id: 'trigger-1',
-          },
-        ],
-      },
       function: 'example.com/function/webhook-test',
       spec: {
         type: 'webhook',
@@ -37,22 +29,10 @@ const manifest: FunctionManifest = {
       },
     },
     {
-      '@meta': {
-        keys: [
-          {
-            source: 'example.com',
-            id: 'trigger-2',
-          },
-        ],
-      },
       function: 'example.com/function/subscription-test',
       spec: {
         type: 'subscription',
-        filter: [
-          {
-            type: TestType.typename,
-          },
-        ],
+        filter: [{ type: TestType.typename }],
       },
     },
   ],
@@ -77,12 +57,11 @@ describe('trigger registry', () => {
       const client = (await createInitializedClients(testBuilder))[0];
       const registry = createRegistry(client);
       const space = await client.spaces.create();
-      await registry.register(space, manifest);
+      await registry.register(space, testManifest);
       const { objects } = await space.db.query(Filter.schema(FunctionTrigger)).run();
-      expect(objects.length).to.eq(manifest.triggers?.length);
-
-      const expected = manifest.triggers?.map((trigger) => trigger.function).sort();
-      expect(objects.map((object: FunctionTrigger) => object.function).sort()).to.deep.eq(expected);
+      expect(objects.length).to.eq(testManifest.triggers?.length);
+      const expected = testManifest.triggers?.map((t) => t.function).sort();
+      expect(objects.map((o: FunctionTrigger) => o.function).sort()).to.deep.eq(expected);
     });
   });
 
@@ -91,13 +70,13 @@ describe('trigger registry', () => {
       const client = (await createInitializedClients(testBuilder))[0];
       const space = await client.spaces.create();
       const registry = createRegistry(client);
-      await registry.register(space, manifest);
+      await registry.register(space, testManifest);
       await registry.open(ctx);
-      await waitForInactiveTriggers(registry, space);
+      await waitHasInactiveTriggers(registry, space);
 
       const callbackInvoked = new Trigger();
       const { objects: allTriggers } = await space.db.query(Filter.schema(FunctionTrigger)).run();
-      const webhookTrigger = allTriggers.find((trigger: FunctionTrigger) => trigger.spec.type === 'webhook')!;
+      const webhookTrigger = allTriggers.find((t: FunctionTrigger) => t.spec.type === 'webhook')!;
       await registry.activate({ space }, webhookTrigger, async () => {
         callbackInvoked.wake();
         return 200;
@@ -111,16 +90,15 @@ describe('trigger registry', () => {
       const client = (await createInitializedClients(testBuilder))[0];
       const space = await client.spaces.create();
       const registry = createRegistry(client);
-      await registry.register(space, manifest);
+      await registry.register(space, testManifest);
       await registry.open(ctx);
-      await waitForInactiveTriggers(registry, space);
+      await waitHasInactiveTriggers(registry, space);
 
       const inactiveTrigger = registry.getInactiveTriggers(space)[0];
       await registry.activate({ space }, inactiveTrigger, async () => 200);
 
       const updatedInactiveList = registry.getInactiveTriggers(space);
-      expect(updatedInactiveList.find((trigger: FunctionTrigger) => trigger.function === inactiveTrigger.function)).to
-        .be.undefined;
+      expect(updatedInactiveList.find((t: FunctionTrigger) => t.function === inactiveTrigger.function)).to.be.undefined;
     });
   });
 
@@ -129,12 +107,12 @@ describe('trigger registry', () => {
       const client = (await createInitializedClients(testBuilder))[0];
       const space = await client.spaces.create();
       const registry = createRegistry(client);
-      await registry.register(space, manifest);
+      await registry.register(space, testManifest);
       await registry.open(ctx);
-      await waitForInactiveTriggers(registry, space);
+      await waitHasInactiveTriggers(registry, space);
 
       const { objects: allTriggers } = await space.db.query(Filter.schema(FunctionTrigger)).run();
-      const echoTrigger = allTriggers.find((trigger: FunctionTrigger) => trigger.spec.type === 'subscription')!;
+      const echoTrigger = allTriggers.find((t: FunctionTrigger) => t.spec.type === 'subscription')!;
       let count = 0;
       await registry.activate({ space }, echoTrigger, async () => {
         count++;
@@ -146,6 +124,7 @@ describe('trigger registry', () => {
       expect(count).to.eq(1);
 
       space.db.remove(echoTrigger);
+
       space.db.add(create(TestType, { title: '2' }));
       await sleep(20);
       expect(count).to.eq(1);
@@ -155,12 +134,12 @@ describe('trigger registry', () => {
       const client = (await createInitializedClients(testBuilder))[0];
       const space = await client.spaces.create();
       const registry = createRegistry(client);
-      await registry.register(space, manifest);
+      await registry.register(space, testManifest);
       await registry.open(ctx);
-      await waitForInactiveTriggers(registry, space);
+      await waitHasInactiveTriggers(registry, space);
 
       const { objects: allTriggers } = await space.db.query(Filter.schema(FunctionTrigger)).run();
-      const echoTrigger = allTriggers.find((trigger: FunctionTrigger) => trigger.spec.type === 'subscription')!;
+      const echoTrigger = allTriggers.find((t: FunctionTrigger) => t.spec.type === 'subscription')!;
       let count = 0;
       await registry.activate({ space }, echoTrigger, async () => {
         count++;
@@ -176,20 +155,19 @@ describe('trigger registry', () => {
   });
 
   describe('trigger events', () => {
-    test.only('event fired when all registered when opened', async () => {
+    test('event fired when all registered when opened', async () => {
       const client = (await createInitializedClients(testBuilder))[0];
       const registry = createRegistry(client);
-      const triggers = createTriggers(client.spaces.default, 3);
+      const triggers = createTriggersInSpace(client.spaces.default, 3);
 
       const triggersRegistered = new Trigger<FunctionTrigger[]>();
       registry.registered.on((fn) => {
         expect(fn.space.key.toHex()).to.eq(client.spaces.default.key.toHex());
         triggersRegistered.wake(fn.triggers);
       });
-
       void registry.open(ctx);
       const functions = await triggersRegistered.wait();
-      const expected = triggers.map((object) => object.id).sort();
+      const expected = triggers.map((obj) => obj.id).sort();
       expect(functions.map((fn) => fn.id).sort()).to.deep.eq(expected);
     });
 
@@ -204,16 +182,16 @@ describe('trigger registry', () => {
         triggerRegistered.wake(fn.triggers[0]);
       });
       await registry.open(ctx);
-      await registry.register(space, { triggers: manifest?.triggers?.slice(0, 1) });
+      await registry.register(space, { triggers: testManifest?.triggers?.slice(0, 1) });
       const registered = await triggerRegistered.wait();
-      expect(registered.function).to.eq(manifest.triggers![0].function);
+      expect(registered.function).to.eq(testManifest.triggers![0].function);
     });
 
     test('event fired when a new trigger is removed', async () => {
       const client = (await createInitializedClients(testBuilder))[0];
       const registry = createRegistry(client);
       const space = await client.spaces.create();
-      const triggers = createTriggers(space, 3);
+      const triggers = createTriggersInSpace(space, 3);
 
       const triggerLoaded = new Trigger();
       registry.registered.on((fn) => triggerLoaded.wake());
@@ -223,7 +201,7 @@ describe('trigger registry', () => {
         expect(fn.triggers.length).to.eq(1);
         triggerRemoved.wake(fn.triggers[0]);
       });
-      await registry.register(space, manifest);
+      await registry.register(space, testManifest);
       await registry.open(ctx);
       await triggerLoaded.wait();
 
@@ -233,23 +211,19 @@ describe('trigger registry', () => {
     });
   });
 
+  const waitHasInactiveTriggers = async (registry: TriggerRegistry, space: Space) => {
+    await waitForCondition({ condition: () => registry.getInactiveTriggers(space).length > 0 });
+  };
+
   const createRegistry = (client: Client) => {
     const registry = new TriggerRegistry(client);
     ctx.onDispose(() => registry.close());
     return registry;
   };
 
-  const createTriggers = (space: Space, count: number) => {
-    const triggers = range(count, () => {
-      const { meta, object } = splitMeta(manifest.triggers![0]);
-      return create(FunctionTrigger, object, meta);
-    });
-
-    triggers.forEach((trigger) => space.db.add(trigger));
+  const createTriggersInSpace = (space: Space, count: number) => {
+    const triggers = range(count, () => create(FunctionTrigger, { ...testManifest.triggers![0] }));
+    triggers.forEach((def) => space.db.add(def));
     return triggers;
   };
-
-  const waitForInactiveTriggers = async (registry: TriggerRegistry, space: Space) => {
-    await waitForCondition({ condition: () => registry.getInactiveTriggers(space).length > 0 });
-  };
 });

package/src/trigger/trigger-registry.ts

@@ -4,9 +4,8 @@
 
 import { Event } from '@dxos/async';
 import { type Client } from '@dxos/client';
-import { create, Filter, getMeta, type Space } from '@dxos/client/echo';
+import { create, Filter, type Space } from '@dxos/client/echo';
 import { Context, Resource } from '@dxos/context';
-import { ECHO_ATTR_META, foreignKey, foreignKeyEquals, splitMeta } from '@dxos/echo-schema';
 import { invariant } from '@dxos/invariant';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
@@ -14,7 +13,6 @@ import { ComplexMap } from '@dxos/util';
 
 import { createSubscriptionTrigger, createTimerTrigger, createWebhookTrigger, createWebsocketTrigger } from './type';
 import { type FunctionManifest, FunctionTrigger, type FunctionTriggerType, type TriggerSpec } from '../types';
-import { diff, intersection } from '../util';
 
 type ResponseCode = number;
 
@@ -98,25 +96,14 @@ export class TriggerRegistry extends Resource {
     if (!manifest.triggers?.length) {
       return;
     }
-    if (!space.db.graph.runtimeSchemaRegistry.hasSchema(FunctionTrigger)) {
+    if (!space.db.graph.runtimeSchemaRegistry.isSchemaRegistered(FunctionTrigger)) {
       space.db.graph.runtimeSchemaRegistry.registerSchema(FunctionTrigger);
     }
 
-    // Sync triggers.
-    const { objects: existing } = await space.db.query(Filter.schema(FunctionTrigger)).run();
-    const { added, removed } = diff(existing, manifest.triggers, (a, b) => {
-      // Create FK to enable syncing if none are set.
-      // TODO(burdon): Warn if not unique.
-      const keys = b[ECHO_ATTR_META]?.keys ?? [foreignKey('manifest', [b.function, b.spec.type].join('-'))];
-      return intersection(getMeta(a)?.keys ?? [], keys, foreignKeyEquals).length > 0;
-    });
-
-    added.forEach((trigger) => {
-      const { meta, object } = splitMeta(trigger);
-      space.db.add(create(FunctionTrigger, object, meta));
-    });
-    // TODO(burdon): Update existing triggers.
-    removed.forEach((trigger) => space.db.remove(trigger));
+    const reactiveObjects = manifest.triggers.map((template: Omit<FunctionTrigger, 'id'>) =>
+      create(FunctionTrigger, { ...template }),
+    );
+    reactiveObjects.forEach((obj) => space.db.add(obj));
   }
 
   protected override async _open(): Promise<void> {

package/src/trigger/type/subscription-trigger.ts

@@ -3,7 +3,7 @@
 //
 
 import { TextV0Type } from '@braneframe/types';
-import { debounce, UpdateScheduler } from '@dxos/async';
+import { debounce, DeferredTask } from '@dxos/async';
 import { type Context } from '@dxos/context';
 import { createSubscription, Filter, getAutomergeObjectCore, type Query } from '@dxos/echo-db';
 import { log } from '@dxos/log';
@@ -18,33 +18,26 @@ export const createSubscriptionTrigger: TriggerFactory<SubscriptionTrigger> = as
   callback: TriggerCallback,
 ) => {
   const objectIds = new Set<string>();
-  const task = new UpdateScheduler(
-    ctx,
-    async () => {
-      if (objectIds.size > 0) {
-        const objects = Array.from(objectIds);
-        objectIds.clear();
-        await callback({ objects });
-      }
-    },
-    { maxFrequency: 4 },
-  );
+  const task = new DeferredTask(ctx, async () => {
+    if (objectIds.size > 0) {
+      await callback({ objects: Array.from(objectIds) });
+      objectIds.clear();
+    }
+  });
 
   // TODO(burdon): Don't fire initially?
   // TODO(burdon): Create queue. Only allow one invocation per trigger at a time?
   const subscriptions: (() => void)[] = [];
   const subscription = createSubscription(({ added, updated }) => {
-    const sizeBefore = objectIds.size;
+    log.info('updated', { added: added.length, updated: updated.length });
     for (const object of added) {
       objectIds.add(object.id);
     }
     for (const object of updated) {
       objectIds.add(object.id);
     }
-    if (objectIds.size > sizeBefore) {
-      log.info('updated', { added: added.length, updated: updated.length });
-      task.trigger();
-    }
+
+    task.schedule();
   });
 
   subscriptions.push(() => subscription.unsubscribe());

package/src/types.ts

@@ -2,7 +2,10 @@
 // Copyright 2023 DXOS.org
 //
 
-import { RawObject, S, TypedObject } from '@dxos/echo-schema';
+import { AST, S, TypedObject } from '@dxos/echo-schema';
+
+// TODO(burdon): Factor out.
+const omitEchoId = <T>(schema: S.Schema<T>): S.Schema<Omit<T, 'id'>> => S.make(AST.omit(schema.ast, ['id']));
 
 /**
  * Type discriminator for TriggerSpec.
@@ -14,7 +17,7 @@ export type FunctionTriggerType = 'subscription' | 'timer' | 'webhook' | 'websoc
 
 const SubscriptionTriggerSchema = S.struct({
   type: S.literal('subscription'),
-  // TODO(burdon): Define query DSL (from ECHO).
+  // TODO(burdon): Define query DSL.
   filter: S.array(
     S.struct({
       type: S.string,
@@ -30,14 +33,12 @@ const SubscriptionTriggerSchema = S.struct({
     }),
   ),
 });
-
 export type SubscriptionTrigger = S.Schema.Type<typeof SubscriptionTriggerSchema>;
 
 const TimerTriggerSchema = S.struct({
   type: S.literal('timer'),
   cron: S.string,
 });
-
 export type TimerTrigger = S.Schema.Type<typeof TimerTriggerSchema>;
 
 const WebhookTriggerSchema = S.mutable(
@@ -48,7 +49,6 @@ const WebhookTriggerSchema = S.mutable(
     port: S.optional(S.number),
   }),
 );
-
 export type WebhookTrigger = S.Schema.Type<typeof WebhookTriggerSchema>;
 
 const WebsocketTriggerSchema = S.struct({
@@ -56,7 +56,6 @@ const WebsocketTriggerSchema = S.struct({
   url: S.string,
   init: S.optional(S.record(S.string, S.any)),
 });
-
 export type WebsocketTrigger = S.Schema.Type<typeof WebsocketTriggerSchema>;
 
 const TriggerSpecSchema = S.union(
@@ -65,7 +64,6 @@ const TriggerSpecSchema = S.union(
   WebsocketTriggerSchema,
   SubscriptionTriggerSchema,
 );
-
 export type TriggerSpec = TimerTrigger | WebhookTrigger | WebsocketTrigger | SubscriptionTrigger;
 
 /**
@@ -86,9 +84,9 @@ export class FunctionTrigger extends TypedObject({
   typename: 'dxos.org/type/FunctionTrigger',
   version: '0.1.0',
 })({
-  function: S.string.pipe(S.description('Function URI.')),
-  // Context is merged into the event data passed to the function.
-  meta: S.optional(S.object),
+  function: S.string.pipe(S.description('Function ID/URI.')),
+  // Context passed to a function.
+  meta: S.optional(S.record(S.string, S.any)),
   spec: TriggerSpecSchema,
 }) {}
 
@@ -96,8 +94,8 @@ export class FunctionTrigger extends TypedObject({
  * Function manifest file.
  */
 export const FunctionManifestSchema = S.struct({
-  functions: S.optional(S.mutable(S.array(RawObject(FunctionDef)))),
-  triggers: S.optional(S.mutable(S.array(RawObject(FunctionTrigger)))),
+  functions: S.optional(S.mutable(S.array(omitEchoId(FunctionDef)))),
+  triggers: S.optional(S.mutable(S.array(omitEchoId(FunctionTrigger)))),
 });
 
 export type FunctionManifest = S.Schema.Type<typeof FunctionManifestSchema>;

package/dist/types/src/function/function-registry.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"function-registry.d.ts","sourceRoot":"","sources":["../../../../src/function/function-registry.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAkB,KAAK,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC/D,OAAO,EAAE,KAAK,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAKvD,OAAO,EAAE,WAAW,EAAE,KAAK,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAG9D,MAAM,MAAM,wBAAwB,GAAG;IACrC,KAAK,EAAE,KAAK,CAAC;IACb,KAAK,EAAE,WAAW,EAAE,CAAC;CACtB,CAAC;AAEF,qBAAa,gBAAiB,SAAQ,QAAQ;IAKhC,OAAO,CAAC,QAAQ,CAAC,OAAO;IAJpC,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAA4D;IAEhG,SAAgB,UAAU,kCAAyC;gBAEtC,OAAO,EAAE,MAAM;IAIrC,YAAY,CAAC,KAAK,EAAE,KAAK,GAAG,WAAW,EAAE;IAIhD;;;OAGG;IACU,QAAQ,CAAC,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,gBAAgB,CAAC,WAAW,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;cAiBnE,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;cAgCtB,MAAM,CAAC,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;CAG3D"}

package/dist/types/src/function/function-registry.test.d.ts.map

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

package/dist/types/src/function/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/function/index.ts"],"names":[],"mappings":"AAIA,cAAc,qBAAqB,CAAC"}

package/dist/types/src/util.d.ts

@@ -1,15 +0,0 @@
-export type Comparator<A, B = A> = (a: A, b: B) => boolean;
-export type DiffResult<A, B = A> = {
-    added: B[];
-    updated: A[];
-    removed: A[];
-};
-/**
- *
- * @param previous
- * @param next
- * @param comparator
- */
-export declare const diff: <A, B = A>(previous: readonly A[], next: readonly B[], comparator: Comparator<A, B>) => DiffResult<A, B>;
-export declare const intersection: <A, B = A>(a: A[], b: B[], comparator: Comparator<A, B>) => A[];
-//# sourceMappingURL=util.d.ts.map

package/dist/types/src/util.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../src/util.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,UAAU,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,OAAO,CAAC;AAE3D,MAAM,MAAM,UAAU,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI;IACjC,KAAK,EAAE,CAAC,EAAE,CAAC;IACX,OAAO,EAAE,CAAC,EAAE,CAAC;IACb,OAAO,EAAE,CAAC,EAAE,CAAC;CACd,CAAC;AAEF;;;;;GAKG;AAEH,eAAO,MAAM,IAAI,0GAwBhB,CAAC;AAGF,eAAO,MAAM,YAAY,iEACuC,CAAC"}

package/dist/types/src/util.test.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=util.test.d.ts.map

package/dist/types/src/util.test.d.ts.map

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

package/src/function/function-registry.ts

@@ -1,90 +0,0 @@
-//
-// Copyright 2024 DXOS.org
-//
-
-import { Event } from '@dxos/async';
-import { type Client } from '@dxos/client';
-import { create, Filter, type Space } from '@dxos/client/echo';
-import { type Context, Resource } from '@dxos/context';
-import { PublicKey } from '@dxos/keys';
-import { log } from '@dxos/log';
-import { ComplexMap } from '@dxos/util';
-
-import { FunctionDef, type FunctionManifest } from '../types';
-import { diff } from '../util';
-
-export type FunctionsRegisteredEvent = {
-  space: Space;
-  added: FunctionDef[];
-};
-
-export class FunctionRegistry extends Resource {
-  private readonly _functionBySpaceKey = new ComplexMap<PublicKey, FunctionDef[]>(PublicKey.hash);
-
-  public readonly registered = new Event<FunctionsRegisteredEvent>();
-
-  constructor(private readonly _client: Client) {
-    super();
-  }
-
-  public getFunctions(space: Space): FunctionDef[] {
-    return this._functionBySpaceKey.get(space.key) ?? [];
-  }
-
-  /**
-   * Loads function definitions from the manifest into the space.
-   * We first load all the definitions from the space to deduplicate by functionId.
-   */
-  public async register(space: Space, functions: FunctionManifest['functions']): Promise<void> {
-    log('register', { space: space.key, functions: functions?.length ?? 0 });
-    if (!functions?.length) {
-      return;
-    }
-    if (!space.db.graph.runtimeSchemaRegistry.hasSchema(FunctionDef)) {
-      space.db.graph.runtimeSchemaRegistry.registerSchema(FunctionDef);
-    }
-
-    // Sync definitions.
-    const { objects: existing } = await space.db.query(Filter.schema(FunctionDef)).run();
-    const { added, removed } = diff(existing, functions, (a, b) => a.uri === b.uri);
-    added.forEach((def) => space.db.add(create(FunctionDef, def)));
-    // TODO(burdon): Update existing templates.
-    removed.forEach((def) => space.db.remove(def));
-  }
-
-  protected override async _open(): Promise<void> {
-    const spacesSubscription = this._client.spaces.subscribe(async (spaces) => {
-      for (const space of spaces) {
-        if (this._functionBySpaceKey.has(space.key)) {
-          continue;
-        }
-
-        const registered: FunctionDef[] = [];
-        this._functionBySpaceKey.set(space.key, registered);
-        await space.waitUntilReady();
-        if (this._ctx.disposed) {
-          break;
-        }
-
-        // Subscribe to updates.
-        this._ctx.onDispose(
-          space.db.query(Filter.schema(FunctionDef)).subscribe(({ objects }) => {
-            const { added } = diff(registered, objects, (a, b) => a.uri === b.uri);
-            // TODO(burdon): Update and remove.
-            if (added.length > 0) {
-              registered.push(...added);
-              this.registered.emit({ space, added });
-            }
-          }),
-        );
-      }
-    });
-
-    // TODO(burdon): API: Normalize unsubscribe methods.
-    this._ctx.onDispose(() => spacesSubscription.unsubscribe());
-  }
-
-  protected override async _close(_: Context): Promise<void> {
-    this._functionBySpaceKey.clear();
-  }
-}

package/src/util.test.ts

@@ -1,43 +0,0 @@
-//
-// Copyright 2024 DXOS.org
-//
-
-import { expect } from 'chai';
-
-import { describe, test } from '@dxos/test';
-
-import { diff, intersection } from './util';
-
-describe('diff', () => {
-  test('returns the difference between two sets', () => {
-    {
-      const { added, updated, removed } = diff<number>([], [], (a, b) => a === b);
-      expect(added).to.deep.eq([]);
-      expect(updated).to.deep.eq([]);
-      expect(removed).to.deep.eq([]);
-    }
-    {
-      const previous = [1, 2, 3];
-      const next = [2, 3, 4];
-      const { added, updated, removed } = diff(previous, next, (a, b) => a === b);
-      expect(added).to.deep.eq([4]);
-      expect(updated).to.deep.eq([2, 3]);
-      expect(removed).to.deep.eq([1]);
-    }
-    {
-      const previous = [{ x: 1 }, { x: 2 }, { x: 3 }];
-      const next = [{ x: 2 }, { x: 3 }, { x: 4 }];
-      const { added, updated, removed } = diff(previous, next, (a, b) => a.x === b.x);
-      expect(added).to.deep.eq([{ x: 4 }]);
-      expect(updated).to.deep.eq([{ x: 2 }, { x: 3 }]);
-      expect(removed).to.deep.eq([{ x: 1 }]);
-    }
-  });
-
-  test('intersection', () => {
-    expect(intersection([1, 2, 3], [2, 3, 4], (a, b) => a === b)).to.deep.eq([2, 3]);
-    expect(
-      intersection([{ x: 1 }, { x: 2 }, { x: 3 }], [{ x: 2 }, { x: 3 }, { x: 4 }], (a, b) => a.x === b.x),
-    ).to.deep.eq([{ x: 2 }, { x: 3 }]);
-  });
-});

package/src/util.ts

@@ -1,48 +0,0 @@
-//
-// Copyright 2024 DXOS.org
-//
-
-export type Comparator<A, B = A> = (a: A, b: B) => boolean;
-
-export type DiffResult<A, B = A> = {
-  added: B[];
-  updated: A[];
-  removed: A[];
-};
-
-/**
- *
- * @param previous
- * @param next
- * @param comparator
- */
-// TODO(burdon): Factor out.
-export const diff = <A, B = A>(
-  previous: readonly A[],
-  next: readonly B[],
-  comparator: Comparator<A, B>,
-): DiffResult<A, B> => {
-  const remaining = [...previous];
-  const result: DiffResult<A, B> = {
-    added: [],
-    updated: [],
-    removed: remaining,
-  };
-
-  // TODO(burdon): Mark and sweep.
-  for (const object of next) {
-    const index = remaining.findIndex((item) => comparator(item, object));
-    if (index === -1) {
-      result.added.push(object);
-    } else {
-      result.updated.push(remaining[index]);
-      remaining.splice(index, 1);
-    }
-  }
-
-  return result;
-};
-
-// TODO(burdon): Factor out.
-export const intersection = <A, B = A>(a: A[], b: B[], comparator: Comparator<A, B>): A[] =>
-  a.filter((a) => b.find((b) => comparator(a, b)) !== undefined);