@dxos/functions 0.5.3-main.8b66fe2 → 0.5.3-main.8ffbbae

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.
Files changed (87) hide show
  1. package/dist/lib/browser/index.mjs +493 -692
  2. package/dist/lib/browser/index.mjs.map +4 -4
  3. package/dist/lib/browser/meta.json +1 -1
  4. package/dist/lib/node/index.cjs +486 -675
  5. package/dist/lib/node/index.cjs.map +4 -4
  6. package/dist/lib/node/meta.json +1 -1
  7. package/dist/types/src/index.d.ts +0 -2
  8. package/dist/types/src/index.d.ts.map +1 -1
  9. package/dist/types/src/runtime/dev-server.d.ts +10 -7
  10. package/dist/types/src/runtime/dev-server.d.ts.map +1 -1
  11. package/dist/types/src/runtime/scheduler.d.ts +59 -11
  12. package/dist/types/src/runtime/scheduler.d.ts.map +1 -1
  13. package/dist/types/src/testing/test/handler.d.ts +0 -1
  14. package/dist/types/src/testing/test/handler.d.ts.map +1 -1
  15. package/dist/types/src/types.d.ts +111 -131
  16. package/dist/types/src/types.d.ts.map +1 -1
  17. package/package.json +14 -30
  18. package/schema/functions.json +116 -139
  19. package/src/index.ts +0 -2
  20. package/src/runtime/dev-server.test.ts +35 -15
  21. package/src/runtime/dev-server.ts +20 -37
  22. package/src/runtime/scheduler.test.ts +75 -54
  23. package/src/runtime/scheduler.ts +298 -66
  24. package/src/testing/test/handler.ts +2 -8
  25. package/src/types.ts +42 -58
  26. package/dist/lib/browser/chunk-366QG6IX.mjs +0 -81
  27. package/dist/lib/browser/chunk-366QG6IX.mjs.map +0 -7
  28. package/dist/lib/browser/types.mjs +0 -12
  29. package/dist/lib/browser/types.mjs.map +0 -7
  30. package/dist/lib/node/chunk-3VSJ57ZZ.cjs +0 -97
  31. package/dist/lib/node/chunk-3VSJ57ZZ.cjs.map +0 -7
  32. package/dist/lib/node/types.cjs +0 -33
  33. package/dist/lib/node/types.cjs.map +0 -7
  34. package/dist/types/src/function/function-registry.d.ts +0 -24
  35. package/dist/types/src/function/function-registry.d.ts.map +0 -1
  36. package/dist/types/src/function/function-registry.test.d.ts +0 -2
  37. package/dist/types/src/function/function-registry.test.d.ts.map +0 -1
  38. package/dist/types/src/function/index.d.ts +0 -2
  39. package/dist/types/src/function/index.d.ts.map +0 -1
  40. package/dist/types/src/testing/functions-integration.test.d.ts +0 -2
  41. package/dist/types/src/testing/functions-integration.test.d.ts.map +0 -1
  42. package/dist/types/src/testing/index.d.ts +0 -4
  43. package/dist/types/src/testing/index.d.ts.map +0 -1
  44. package/dist/types/src/testing/setup.d.ts +0 -5
  45. package/dist/types/src/testing/setup.d.ts.map +0 -1
  46. package/dist/types/src/testing/types.d.ts +0 -9
  47. package/dist/types/src/testing/types.d.ts.map +0 -1
  48. package/dist/types/src/testing/util.d.ts +0 -3
  49. package/dist/types/src/testing/util.d.ts.map +0 -1
  50. package/dist/types/src/trigger/index.d.ts +0 -2
  51. package/dist/types/src/trigger/index.d.ts.map +0 -1
  52. package/dist/types/src/trigger/trigger-registry.d.ts +0 -40
  53. package/dist/types/src/trigger/trigger-registry.d.ts.map +0 -1
  54. package/dist/types/src/trigger/trigger-registry.test.d.ts +0 -2
  55. package/dist/types/src/trigger/trigger-registry.test.d.ts.map +0 -1
  56. package/dist/types/src/trigger/type/index.d.ts +0 -5
  57. package/dist/types/src/trigger/type/index.d.ts.map +0 -1
  58. package/dist/types/src/trigger/type/subscription-trigger.d.ts +0 -4
  59. package/dist/types/src/trigger/type/subscription-trigger.d.ts.map +0 -1
  60. package/dist/types/src/trigger/type/timer-trigger.d.ts +0 -4
  61. package/dist/types/src/trigger/type/timer-trigger.d.ts.map +0 -1
  62. package/dist/types/src/trigger/type/webhook-trigger.d.ts +0 -4
  63. package/dist/types/src/trigger/type/webhook-trigger.d.ts.map +0 -1
  64. package/dist/types/src/trigger/type/websocket-trigger.d.ts +0 -13
  65. package/dist/types/src/trigger/type/websocket-trigger.d.ts.map +0 -1
  66. package/dist/types/src/util.d.ts +0 -15
  67. package/dist/types/src/util.d.ts.map +0 -1
  68. package/dist/types/src/util.test.d.ts +0 -2
  69. package/dist/types/src/util.test.d.ts.map +0 -1
  70. package/src/function/function-registry.test.ts +0 -105
  71. package/src/function/function-registry.ts +0 -90
  72. package/src/function/index.ts +0 -5
  73. package/src/testing/functions-integration.test.ts +0 -99
  74. package/src/testing/index.ts +0 -7
  75. package/src/testing/setup.ts +0 -45
  76. package/src/testing/types.ts +0 -9
  77. package/src/testing/util.ts +0 -16
  78. package/src/trigger/index.ts +0 -5
  79. package/src/trigger/trigger-registry.test.ts +0 -255
  80. package/src/trigger/trigger-registry.ts +0 -189
  81. package/src/trigger/type/index.ts +0 -8
  82. package/src/trigger/type/subscription-trigger.ts +0 -80
  83. package/src/trigger/type/timer-trigger.ts +0 -44
  84. package/src/trigger/type/webhook-trigger.ts +0 -47
  85. package/src/trigger/type/websocket-trigger.ts +0 -91
  86. package/src/util.test.ts +0 -43
  87. package/src/util.ts +0 -48
@@ -1,189 +0,0 @@
1
- //
2
- // Copyright 2024 DXOS.org
3
- //
4
-
5
- import { Event } from '@dxos/async';
6
- import { type Client } from '@dxos/client';
7
- import { create, Filter, getMeta, type Space } from '@dxos/client/echo';
8
- import { Context, Resource } from '@dxos/context';
9
- import { ECHO_ATTR_META, foreignKey, foreignKeyEquals, splitMeta } from '@dxos/echo-schema';
10
- import { invariant } from '@dxos/invariant';
11
- import { PublicKey } from '@dxos/keys';
12
- import { log } from '@dxos/log';
13
- import { ComplexMap } from '@dxos/util';
14
-
15
- import { createSubscriptionTrigger, createTimerTrigger, createWebhookTrigger, createWebsocketTrigger } from './type';
16
- import { type FunctionManifest, FunctionTrigger, type FunctionTriggerType, type TriggerSpec } from '../types';
17
- import { diff, intersection } from '../util';
18
-
19
- type ResponseCode = number;
20
-
21
- export type TriggerCallback = (args: object) => Promise<ResponseCode>;
22
-
23
- export type TriggerContext = { space: Space };
24
-
25
- // TODO(burdon): Make object?
26
- export type TriggerFactory<Spec extends TriggerSpec, Options = any> = (
27
- ctx: Context,
28
- context: TriggerContext,
29
- spec: Spec,
30
- callback: TriggerCallback,
31
- options?: Options,
32
- ) => Promise<void>;
33
-
34
- export type TriggerHandlerMap = { [type in FunctionTriggerType]: TriggerFactory<any> };
35
-
36
- const triggerHandlers: TriggerHandlerMap = {
37
- subscription: createSubscriptionTrigger,
38
- timer: createTimerTrigger,
39
- webhook: createWebhookTrigger,
40
- websocket: createWebsocketTrigger,
41
- };
42
-
43
- export type TriggerEvent = {
44
- space: Space;
45
- triggers: FunctionTrigger[];
46
- };
47
-
48
- type RegisteredTrigger = {
49
- activationCtx?: Context;
50
- trigger: FunctionTrigger;
51
- };
52
-
53
- export class TriggerRegistry extends Resource {
54
- private readonly _triggersBySpaceKey = new ComplexMap<PublicKey, RegisteredTrigger[]>(PublicKey.hash);
55
-
56
- public readonly registered = new Event<TriggerEvent>();
57
- public readonly removed = new Event<TriggerEvent>();
58
-
59
- constructor(
60
- private readonly _client: Client,
61
- private readonly _options?: TriggerHandlerMap,
62
- ) {
63
- super();
64
- }
65
-
66
- public getActiveTriggers(space: Space): FunctionTrigger[] {
67
- return this._getTriggers(space, (t) => t.activationCtx != null);
68
- }
69
-
70
- public getInactiveTriggers(space: Space): FunctionTrigger[] {
71
- return this._getTriggers(space, (t) => t.activationCtx == null);
72
- }
73
-
74
- async activate(triggerCtx: TriggerContext, trigger: FunctionTrigger, callback: TriggerCallback): Promise<void> {
75
- log('activate', { space: triggerCtx.space.key, trigger });
76
- const activationCtx = new Context({ name: `trigger_${trigger.function}` });
77
- this._ctx.onDispose(() => activationCtx.dispose());
78
- const registeredTrigger = this._triggersBySpaceKey
79
- .get(triggerCtx.space.key)
80
- ?.find((reg) => reg.trigger.id === trigger.id);
81
- invariant(registeredTrigger, `Trigger is not registered: ${trigger.function}`);
82
- registeredTrigger.activationCtx = activationCtx;
83
-
84
- try {
85
- const options = this._options?.[trigger.spec.type];
86
- await triggerHandlers[trigger.spec.type](activationCtx, triggerCtx, trigger.spec, callback, options);
87
- } catch (err) {
88
- delete registeredTrigger.activationCtx;
89
- throw err;
90
- }
91
- }
92
-
93
- /**
94
- * Loads triggers from the manifest into the space.
95
- */
96
- public async register(space: Space, manifest: FunctionManifest): Promise<void> {
97
- log('register', { space: space.key });
98
- if (!manifest.triggers?.length) {
99
- return;
100
- }
101
- if (!space.db.graph.runtimeSchemaRegistry.hasSchema(FunctionTrigger)) {
102
- space.db.graph.runtimeSchemaRegistry.registerSchema(FunctionTrigger);
103
- }
104
-
105
- // Sync triggers.
106
- const { objects: existing } = await space.db.query(Filter.schema(FunctionTrigger)).run();
107
- const { added, removed } = diff(existing, manifest.triggers, (a, b) => {
108
- // Create FK to enable syncing if none are set.
109
- // TODO(burdon): Warn if not unique.
110
- const keys = b[ECHO_ATTR_META]?.keys ?? [foreignKey('manifest', [b.function, b.spec.type].join('-'))];
111
- return intersection(getMeta(a)?.keys ?? [], keys, foreignKeyEquals).length > 0;
112
- });
113
-
114
- added.forEach((trigger) => {
115
- const { meta, object } = splitMeta(trigger);
116
- space.db.add(create(FunctionTrigger, object, meta));
117
- });
118
- // TODO(burdon): Update existing triggers.
119
- removed.forEach((trigger) => space.db.remove(trigger));
120
- }
121
-
122
- protected override async _open(): Promise<void> {
123
- const spaceListSubscription = this._client.spaces.subscribe(async (spaces) => {
124
- for (const space of spaces) {
125
- if (this._triggersBySpaceKey.has(space.key)) {
126
- continue;
127
- }
128
-
129
- const registered: RegisteredTrigger[] = [];
130
- this._triggersBySpaceKey.set(space.key, registered);
131
- await space.waitUntilReady();
132
- if (this._ctx.disposed) {
133
- break;
134
- }
135
- const functionsSubscription = space.db.query(Filter.schema(FunctionTrigger)).subscribe(async (triggers) => {
136
- await this._handleRemovedTriggers(space, triggers.objects, registered);
137
- this._handleNewTriggers(space, triggers.objects, registered);
138
- });
139
-
140
- this._ctx.onDispose(functionsSubscription);
141
- }
142
- });
143
-
144
- this._ctx.onDispose(() => spaceListSubscription.unsubscribe());
145
- }
146
-
147
- protected override async _close(_: Context): Promise<void> {
148
- this._triggersBySpaceKey.clear();
149
- }
150
-
151
- private _handleNewTriggers(space: Space, allTriggers: FunctionTrigger[], registered: RegisteredTrigger[]) {
152
- const newTriggers = allTriggers.filter((candidate) => {
153
- return registered.find((reg) => reg.trigger.id === candidate.id) == null;
154
- });
155
-
156
- if (newTriggers.length > 0) {
157
- const newRegisteredTriggers: RegisteredTrigger[] = newTriggers.map((trigger) => ({ trigger }));
158
- registered.push(...newRegisteredTriggers);
159
- log('registered new triggers', () => ({ spaceKey: space.key, functions: newTriggers.map((t) => t.function) }));
160
- this.registered.emit({ space, triggers: newTriggers });
161
- }
162
- }
163
-
164
- private async _handleRemovedTriggers(
165
- space: Space,
166
- allTriggers: FunctionTrigger[],
167
- registered: RegisteredTrigger[],
168
- ): Promise<void> {
169
- const removed: FunctionTrigger[] = [];
170
- for (let i = registered.length - 1; i >= 0; i--) {
171
- const wasRemoved =
172
- allTriggers.find((trigger: FunctionTrigger) => trigger.id === registered[i].trigger.id) == null;
173
- if (wasRemoved) {
174
- const unregistered = registered.splice(i, 1)[0];
175
- await unregistered.activationCtx?.dispose();
176
- removed.push(unregistered.trigger);
177
- }
178
- }
179
-
180
- if (removed.length > 0) {
181
- this.removed.emit({ space, triggers: removed });
182
- }
183
- }
184
-
185
- private _getTriggers(space: Space, predicate: (trigger: RegisteredTrigger) => boolean): FunctionTrigger[] {
186
- const allSpaceTriggers = this._triggersBySpaceKey.get(space.key) ?? [];
187
- return allSpaceTriggers.filter(predicate).map((trigger) => trigger.trigger);
188
- }
189
- }
@@ -1,8 +0,0 @@
1
- //
2
- // Copyright 2024 DXOS.org
3
- //
4
-
5
- export * from './subscription-trigger';
6
- export * from './timer-trigger';
7
- export * from './webhook-trigger';
8
- export * from './websocket-trigger';
@@ -1,80 +0,0 @@
1
- //
2
- // Copyright 2024 DXOS.org
3
- //
4
-
5
- import { TextV0Type } from '@braneframe/types';
6
- import { debounce, UpdateScheduler } from '@dxos/async';
7
- import { type Context } from '@dxos/context';
8
- import { createSubscription, Filter, getAutomergeObjectCore, type Query } from '@dxos/echo-db';
9
- import { log } from '@dxos/log';
10
-
11
- import type { SubscriptionTrigger } from '../../types';
12
- import { type TriggerCallback, type TriggerContext, type TriggerFactory } from '../trigger-registry';
13
-
14
- export const createSubscriptionTrigger: TriggerFactory<SubscriptionTrigger> = async (
15
- ctx: Context,
16
- triggerCtx: TriggerContext,
17
- spec: SubscriptionTrigger,
18
- callback: TriggerCallback,
19
- ) => {
20
- const objectIds = new Set<string>();
21
- const task = new UpdateScheduler(
22
- ctx,
23
- async () => {
24
- if (objectIds.size > 0) {
25
- const objects = Array.from(objectIds);
26
- objectIds.clear();
27
- await callback({ objects });
28
- }
29
- },
30
- { maxFrequency: 4 },
31
- );
32
-
33
- // TODO(burdon): Don't fire initially?
34
- // TODO(burdon): Create queue. Only allow one invocation per trigger at a time?
35
- const subscriptions: (() => void)[] = [];
36
- const subscription = createSubscription(({ added, updated }) => {
37
- const sizeBefore = objectIds.size;
38
- for (const object of added) {
39
- objectIds.add(object.id);
40
- }
41
- for (const object of updated) {
42
- objectIds.add(object.id);
43
- }
44
- if (objectIds.size > sizeBefore) {
45
- log.info('updated', { added: added.length, updated: updated.length });
46
- task.trigger();
47
- }
48
- });
49
-
50
- subscriptions.push(() => subscription.unsubscribe());
51
-
52
- // TODO(burdon): Disable trigger if keeps failing.
53
- const { filter, options: { deep, delay } = {} } = spec;
54
- const update = ({ objects }: Query) => {
55
- subscription.update(objects);
56
-
57
- // TODO(burdon): Hack to monitor changes to Document's text object.
58
- if (deep) {
59
- log.info('update', { objects: objects.length });
60
- for (const object of objects) {
61
- const content = object.content;
62
- if (content instanceof TextV0Type) {
63
- subscriptions.push(
64
- getAutomergeObjectCore(content).updates.on(debounce(() => subscription.update([object]), 1_000)),
65
- );
66
- }
67
- }
68
- }
69
- };
70
-
71
- // TODO(burdon): Is Filter.or implemented?
72
- // TODO(burdon): [Bug]: all callbacks are fired on the first mutation.
73
- // TODO(burdon): [Bug]: not updated when document is deleted (either top or hierarchically).
74
- const query = triggerCtx.space.db.query(Filter.or(filter.map(({ type, props }) => Filter.typename(type, props))));
75
- subscriptions.push(query.subscribe(delay ? debounce(update, delay) : update));
76
-
77
- ctx.onDispose(() => {
78
- subscriptions.forEach((unsubscribe) => unsubscribe());
79
- });
80
- };
@@ -1,44 +0,0 @@
1
- //
2
- // Copyright 2024 DXOS.org
3
- //
4
-
5
- import { CronJob } from 'cron';
6
-
7
- import { DeferredTask } from '@dxos/async';
8
- import { type Context } from '@dxos/context';
9
- import { log } from '@dxos/log';
10
-
11
- import type { TimerTrigger } from '../../types';
12
- import { type TriggerCallback, type TriggerContext, type TriggerFactory } from '../trigger-registry';
13
-
14
- export const createTimerTrigger: TriggerFactory<TimerTrigger> = async (
15
- ctx: Context,
16
- triggerContext: TriggerContext,
17
- spec: TimerTrigger,
18
- callback: TriggerCallback,
19
- ) => {
20
- const task = new DeferredTask(ctx, async () => {
21
- await callback({});
22
- });
23
-
24
- let last = 0;
25
- let run = 0;
26
- // https://www.npmjs.com/package/cron#constructor
27
- const job = CronJob.from({
28
- cronTime: spec.cron,
29
- runOnInit: false,
30
- onTick: () => {
31
- // TODO(burdon): Check greater than 30s (use cron-parser).
32
- const now = Date.now();
33
- const delta = last ? now - last : 0;
34
- last = now;
35
-
36
- run++;
37
- log.info('tick', { space: triggerContext.space.key.truncate(), count: run, delta });
38
- task.schedule();
39
- },
40
- });
41
-
42
- job.start();
43
- ctx.onDispose(() => job.stop());
44
- };
@@ -1,47 +0,0 @@
1
- //
2
- // Copyright 2024 DXOS.org
3
- //
4
-
5
- import { getPort } from 'get-port-please';
6
- import http from 'node:http';
7
-
8
- import { type Context } from '@dxos/context';
9
- import { log } from '@dxos/log';
10
-
11
- import type { WebhookTrigger } from '../../types';
12
- import { type TriggerCallback, type TriggerContext, type TriggerFactory } from '../trigger-registry';
13
-
14
- export const createWebhookTrigger: TriggerFactory<WebhookTrigger> = async (
15
- ctx: Context,
16
- _: TriggerContext,
17
- spec: WebhookTrigger,
18
- callback: TriggerCallback,
19
- ) => {
20
- // TODO(burdon): Enable POST hook with payload.
21
- const server = http.createServer(async (req, res) => {
22
- if (req.method !== spec.method) {
23
- res.statusCode = 405;
24
- return res.end();
25
- }
26
- res.statusCode = await callback({});
27
- res.end();
28
- });
29
-
30
- // TODO(burdon): Not used.
31
- // const DEF_PORT_RANGE = { min: 7500, max: 7599 };
32
- // const portRange = Object.assign({}, trigger.port, DEF_PORT_RANGE) as WebhookTrigger['port'];
33
- const port = await getPort({
34
- random: true,
35
- // portRange: [portRange!.min, portRange!.max],
36
- });
37
-
38
- // TODO(burdon): Update trigger object with actual port.
39
- server.listen(port, () => {
40
- log.info('started webhook', { port });
41
- spec.port = port;
42
- });
43
-
44
- ctx.onDispose(() => {
45
- server.close();
46
- });
47
- };
@@ -1,91 +0,0 @@
1
- //
2
- // Copyright 2024 DXOS.org
3
- //
4
-
5
- import WebSocket from 'ws';
6
-
7
- import { sleep, Trigger } from '@dxos/async';
8
- import { type Context } from '@dxos/context';
9
- import { log } from '@dxos/log';
10
-
11
- import { type WebsocketTrigger } from '../../types';
12
- import { type TriggerCallback, type TriggerContext, type TriggerFactory } from '../trigger-registry';
13
-
14
- interface WebsocketTriggerOptions {
15
- retryDelay: number;
16
- maxAttempts: number;
17
- }
18
-
19
- /**
20
- * Websocket.
21
- * NOTE: The port must be unique, so the same hook cannot be used for multiple spaces.
22
- */
23
- export const createWebsocketTrigger: TriggerFactory<WebsocketTrigger, WebsocketTriggerOptions> = async (
24
- ctx: Context,
25
- triggerCtx: TriggerContext,
26
- spec: WebsocketTrigger,
27
- callback: TriggerCallback,
28
- options: WebsocketTriggerOptions = { retryDelay: 2, maxAttempts: 5 },
29
- ) => {
30
- const { url, init } = spec;
31
-
32
- let ws: WebSocket;
33
- for (let attempt = 1; attempt <= options.maxAttempts; attempt++) {
34
- const open = new Trigger<boolean>();
35
-
36
- ws = new WebSocket(url);
37
- Object.assign(ws, {
38
- onopen: () => {
39
- log.info('opened', { url });
40
- if (spec.init) {
41
- ws.send(new TextEncoder().encode(JSON.stringify(init)));
42
- }
43
-
44
- open.wake(true);
45
- },
46
-
47
- onclose: (event) => {
48
- log.info('closed', { url, code: event.code });
49
- // Reconnect if server closes (e.g., CF restart).
50
- // https://developer.mozilla.org/en-US/docs/Web/API/CloseEvent/code
51
- if (event.code === 1006) {
52
- setTimeout(async () => {
53
- log.info(`reconnecting in ${options.retryDelay}s...`, { url });
54
- await createWebsocketTrigger(ctx, triggerCtx, spec, callback, options);
55
- }, options.retryDelay * 1_000);
56
- }
57
-
58
- open.wake(false);
59
- },
60
-
61
- onerror: (event) => {
62
- log.catch(event.error, { url });
63
- },
64
-
65
- onmessage: async (event) => {
66
- try {
67
- log.info('message');
68
- const data = JSON.parse(new TextDecoder().decode(event.data as Uint8Array));
69
- await callback({ data });
70
- } catch (err) {
71
- log.catch(err, { url });
72
- }
73
- },
74
- } satisfies Partial<WebSocket>);
75
-
76
- const isOpen = await open.wait();
77
- if (isOpen) {
78
- break;
79
- } else {
80
- const wait = Math.pow(attempt, 2) * options.retryDelay;
81
- if (attempt < options.maxAttempts) {
82
- log.warn(`failed to connect; trying again in ${wait}s`, { attempt });
83
- await sleep(wait * 1_000);
84
- }
85
- }
86
- }
87
-
88
- ctx.onDispose(() => {
89
- ws?.close();
90
- });
91
- };
package/src/util.test.ts DELETED
@@ -1,43 +0,0 @@
1
- //
2
- // Copyright 2024 DXOS.org
3
- //
4
-
5
- import { expect } from 'chai';
6
-
7
- import { describe, test } from '@dxos/test';
8
-
9
- import { diff, intersection } from './util';
10
-
11
- describe('diff', () => {
12
- test('returns the difference between two sets', () => {
13
- {
14
- const { added, updated, removed } = diff<number>([], [], (a, b) => a === b);
15
- expect(added).to.deep.eq([]);
16
- expect(updated).to.deep.eq([]);
17
- expect(removed).to.deep.eq([]);
18
- }
19
- {
20
- const previous = [1, 2, 3];
21
- const next = [2, 3, 4];
22
- const { added, updated, removed } = diff(previous, next, (a, b) => a === b);
23
- expect(added).to.deep.eq([4]);
24
- expect(updated).to.deep.eq([2, 3]);
25
- expect(removed).to.deep.eq([1]);
26
- }
27
- {
28
- const previous = [{ x: 1 }, { x: 2 }, { x: 3 }];
29
- const next = [{ x: 2 }, { x: 3 }, { x: 4 }];
30
- const { added, updated, removed } = diff(previous, next, (a, b) => a.x === b.x);
31
- expect(added).to.deep.eq([{ x: 4 }]);
32
- expect(updated).to.deep.eq([{ x: 2 }, { x: 3 }]);
33
- expect(removed).to.deep.eq([{ x: 1 }]);
34
- }
35
- });
36
-
37
- test('intersection', () => {
38
- expect(intersection([1, 2, 3], [2, 3, 4], (a, b) => a === b)).to.deep.eq([2, 3]);
39
- expect(
40
- intersection([{ x: 1 }, { x: 2 }, { x: 3 }], [{ x: 2 }, { x: 3 }, { x: 4 }], (a, b) => a.x === b.x),
41
- ).to.deep.eq([{ x: 2 }, { x: 3 }]);
42
- });
43
- });
package/src/util.ts DELETED
@@ -1,48 +0,0 @@
1
- //
2
- // Copyright 2024 DXOS.org
3
- //
4
-
5
- export type Comparator<A, B = A> = (a: A, b: B) => boolean;
6
-
7
- export type DiffResult<A, B = A> = {
8
- added: B[];
9
- updated: A[];
10
- removed: A[];
11
- };
12
-
13
- /**
14
- *
15
- * @param previous
16
- * @param next
17
- * @param comparator
18
- */
19
- // TODO(burdon): Factor out.
20
- export const diff = <A, B = A>(
21
- previous: readonly A[],
22
- next: readonly B[],
23
- comparator: Comparator<A, B>,
24
- ): DiffResult<A, B> => {
25
- const remaining = [...previous];
26
- const result: DiffResult<A, B> = {
27
- added: [],
28
- updated: [],
29
- removed: remaining,
30
- };
31
-
32
- // TODO(burdon): Mark and sweep.
33
- for (const object of next) {
34
- const index = remaining.findIndex((item) => comparator(item, object));
35
- if (index === -1) {
36
- result.added.push(object);
37
- } else {
38
- result.updated.push(remaining[index]);
39
- remaining.splice(index, 1);
40
- }
41
- }
42
-
43
- return result;
44
- };
45
-
46
- // TODO(burdon): Factor out.
47
- export const intersection = <A, B = A>(a: A[], b: B[], comparator: Comparator<A, B>): A[] =>
48
- a.filter((a) => b.find((b) => comparator(a, b)) !== undefined);