@dxos/util 0.5.3-main.d7fe7b5 → 0.5.3-main.eb56347

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

@@ -0,0 +1 @@
+{"version":3,"file":"array.d.ts","sourceRoot":"","sources":["../../../src/array.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/array.test.d.ts

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

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

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

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

@@ -1,3 +1,4 @@
+export * from './array';
 export * from './assign';
 export * from './binder';
 export * from './bitfield';
@@ -28,4 +29,5 @@ export * from './weak';
 export * from './map-values';
 export * from './defer';
 export * from './circular-buffer';
+export * from './join-tables';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAIA,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC;AAC3B,cAAc,WAAW,CAAC;AAC1B,cAAc,kBAAkB,CAAC;AACjC,cAAc,eAAe,CAAC;AAC9B,cAAc,SAAS,CAAC;AACxB,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAC3B,cAAc,QAAQ,CAAC;AACvB,cAAc,OAAO,CAAC;AACtB,cAAc,SAAS,CAAC;AACxB,cAAc,YAAY,CAAC;AAC3B,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,YAAY,CAAC;AAC3B,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,QAAQ,CAAC;AACvB,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,cAAc,CAAC;AAC7B,cAAc,eAAe,CAAC;AAC9B,cAAc,OAAO,CAAC;AACtB,cAAc,kBAAkB,CAAC;AACjC,cAAc,QAAQ,CAAC;AACvB,cAAc,cAAc,CAAC;AAC7B,cAAc,SAAS,CAAC;AACxB,cAAc,mBAAmB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAIA,cAAc,SAAS,CAAC;AACxB,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC;AAC3B,cAAc,WAAW,CAAC;AAC1B,cAAc,kBAAkB,CAAC;AACjC,cAAc,eAAe,CAAC;AAC9B,cAAc,SAAS,CAAC;AACxB,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAC3B,cAAc,QAAQ,CAAC;AACvB,cAAc,OAAO,CAAC;AACtB,cAAc,SAAS,CAAC;AACxB,cAAc,YAAY,CAAC;AAC3B,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,YAAY,CAAC;AAC3B,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,QAAQ,CAAC;AACvB,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,cAAc,CAAC;AAC7B,cAAc,eAAe,CAAC;AAC9B,cAAc,OAAO,CAAC;AACtB,cAAc,kBAAkB,CAAC;AACjC,cAAc,QAAQ,CAAC;AACvB,cAAc,cAAc,CAAC;AAC7B,cAAc,SAAS,CAAC;AACxB,cAAc,mBAAmB,CAAC;AAClC,cAAc,eAAe,CAAC"}

package/dist/types/src/join-tables.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Joins two untyped tables on the given columns.
+ * @param leftColumn The column to join on in the first table.
+ * @param rightColumn The column to join on in the second table.
+ */
+export declare const joinTables: (leftColumn: string, rightColumn: string, left: Record<string, any>[], right: Record<string, any>[]) => any[];
+//# sourceMappingURL=join-tables.d.ts.map

package/dist/types/src/join-tables.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"join-tables.d.ts","sourceRoot":"","sources":["../../../src/join-tables.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,eAAO,MAAM,UAAU,eACT,MAAM,eACL,MAAM,QACb,OAAO,MAAM,EAAE,GAAG,CAAC,EAAE,SACpB,OAAO,MAAM,EAAE,GAAG,CAAC,EAAE,UAwB7B,CAAC"}

package/dist/types/src/join-tables.test.d.ts

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

package/dist/types/src/join-tables.test.d.ts.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/util",
-  "version": "0.5.3-main.d7fe7b5",
+  "version": "0.5.3-main.eb56347",
   "description": "Temporary bucket for misc functions, which should graduate into separate packages.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -16,13 +16,13 @@
     "src"
   ],
   "dependencies": {
-    "@dxos/debug": "0.5.3-main.d7fe7b5",
-    "@dxos/keys": "0.5.3-main.d7fe7b5",
-    "@dxos/invariant": "0.5.3-main.d7fe7b5",
-    "@dxos/node-std": "0.5.3-main.d7fe7b5"
+    "@dxos/debug": "0.5.3-main.eb56347",
+    "@dxos/node-std": "0.5.3-main.eb56347",
+    "@dxos/keys": "0.5.3-main.eb56347",
+    "@dxos/invariant": "0.5.3-main.eb56347"
   },
   "devDependencies": {
-    "@dxos/crypto": "0.5.3-main.d7fe7b5"
+    "@dxos/crypto": "0.5.3-main.eb56347"
   },
   "publishConfig": {
     "access": "public"

package/src/array.test.ts

@@ -0,0 +1,42 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import { expect } from 'chai';
+import { describe, test } from 'vitest';
+
+import { diff, intersection } from './array';
+
+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/array.ts

@@ -0,0 +1,48 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+export type Comparator<A, B = A> = (a: A, b: B) => boolean;
+
+export type DiffResult<A, B = A> = {
+  added: B[];
+  updated: B[];
+  removed: A[];
+};
+
+/**
+ * Compute diff between two arrays.
+ * @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(object);
+      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);

package/src/index.ts

@@ -2,6 +2,7 @@
 // Copyright 2020 DXOS.org
 //
 
+export * from './array';
 export * from './assign';
 export * from './binder';
 export * from './bitfield';
@@ -32,3 +33,4 @@ export * from './weak';
 export * from './map-values';
 export * from './defer';
 export * from './circular-buffer';
+export * from './join-tables';

package/src/join-tables.test.ts

@@ -0,0 +1,30 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import { expect } from 'chai';
+import { describe, test } from 'vitest';
+
+import { joinTables } from './join-tables';
+
+describe('joinTables', () => {
+  test('smoke', () => {
+    const left = [
+      { key: 1, name: 'A' },
+      { key: 2, name: 'B' },
+    ];
+
+    const right = [
+      { foreignKey: 1, value: 'X' },
+      { foreignKey: 3, value: 'Y' },
+    ];
+
+    const result = joinTables('key', 'foreignKey', left, right);
+
+    expect(result).to.deep.eq([
+      { foreignKey: 1, value: 'X', key: 1, name: 'A' },
+      { key: 2, name: 'B' },
+      { foreignKey: 3, value: 'Y' },
+    ]);
+  });
+});

package/src/join-tables.ts

@@ -0,0 +1,38 @@
+/**
+ * Joins two untyped tables on the given columns.
+ * @param leftColumn The column to join on in the first table.
+ * @param rightColumn The column to join on in the second table.
+ */
+//
+// Copyright 2024 DXOS.org
+//
+
+export const joinTables = (
+  leftColumn: string,
+  rightColumn: string,
+  left: Record<string, any>[],
+  right: Record<string, any>[],
+) => {
+  const map = new Map();
+  const used = new Set();
+  for (const row of right) {
+    map.set(row[rightColumn], row);
+  }
+
+  const result = [];
+  for (const row of left) {
+    const right = map.get(row[leftColumn]);
+    used.add(right);
+
+    result.push(Object.assign(right ?? {}, row));
+  }
+
+  // Add unmatched rows from the right table.
+  for (const row of right) {
+    if (!used.has(row)) {
+      result.push(row);
+    }
+  }
+
+  return result;
+};