@dxos/util 0.5.1-next.f040be1 → 0.5.2-main.16cd857

package/dist/types/src/map-values.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"map-values.d.ts","sourceRoot":"","sources":["../../../src/map-values.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,SAAS,qDAAsD,MAAM,4BAMjF,CAAC"}
+{"version":3,"file":"map-values.d.ts","sourceRoot":"","sources":["../../../src/map-values.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,SAAS,qDAAsD,MAAM,4BAMjF,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,aAAa,UAAW,GAAG,cAAc,GAAG,mBAAmB,GAAG,KAAK,GAAG,KAAK,GAAG,KAAG,GAEjG,CAAC"}

package/dist/types/src/map-values.test.d.ts

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

package/dist/types/src/map-values.test.d.ts.map

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

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

@@ -1,3 +1,11 @@
-export declare const range: (n: number) => number[];
-export declare const rangeFromTo: (from: number, to: number) => number[];
+export declare const range: {
+    (n: number): number[];
+    <T>(n: number, mapper: RangeMapper<T>): T[];
+};
+export declare const rangeFromTo: {
+    (from: number, to: number): number[];
+    <T>(from: number, to: number, mapper: RangeMapper<T>): T[];
+};
+type RangeMapper<T> = (n: number) => T;
+export {};
 //# sourceMappingURL=range.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"range.d.ts","sourceRoot":"","sources":["../../../src/range.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,KAAK,MAAO,MAAM,aAAgC,CAAC;AAEhE,eAAO,MAAM,WAAW,SAAU,MAAM,MAAM,MAAM,aAA0C,CAAC"}
+{"version":3,"file":"range.d.ts","sourceRoot":"","sources":["../../../src/range.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,KAAK,EAAE;IAClB,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACtB,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC;CAI7C,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE;IACxB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACrC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC;CAG5D,CAAC;AAEF,KAAK,WAAW,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,MAAM,KAAK,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/util",
-  "version": "0.5.1-next.f040be1",
+  "version": "0.5.2-main.16cd857",
   "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.1-next.f040be1",
-    "@dxos/keys": "0.5.1-next.f040be1",
-    "@dxos/invariant": "0.5.1-next.f040be1",
-    "@dxos/node-std": "0.5.1-next.f040be1"
+    "@dxos/debug": "0.5.2-main.16cd857",
+    "@dxos/keys": "0.5.2-main.16cd857",
+    "@dxos/node-std": "0.5.2-main.16cd857",
+    "@dxos/invariant": "0.5.2-main.16cd857"
   },
   "devDependencies": {
-    "@dxos/crypto": "0.5.1-next.f040be1"
+    "@dxos/crypto": "0.5.2-main.16cd857"
   },
   "publishConfig": {
     "access": "public"

package/src/complex.ts

@@ -209,6 +209,13 @@ export class ComplexMap<K, V> implements Map<K, V> {
     return this._values.values();
   }
 
+  mapValues<R>(mapper: (v: V, k: K) => R): ComplexMap<K, R> {
+    return new ComplexMap(
+      this._keyProjection,
+      [...this.entries()].map(([key, value]) => [key, mapper(value, key)]),
+    );
+  }
+
   get [Symbol.toStringTag](): string {
     return 'ComplexMap';
   }

package/src/map-values.test.ts

@@ -0,0 +1,44 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import { test } from 'vitest';
+
+import { deepMapValues } from './map-values';
+
+test('deepMapValues', ({ expect }) => {
+  const obj = {
+    a: 1,
+    b: {
+      c: 2,
+    },
+    d: [
+      3,
+      {
+        e: 4,
+      },
+    ],
+  };
+
+  // Double all numbers.
+  const res = deepMapValues(obj, (value, recurse) => {
+    if (typeof value === 'number') {
+      return value * 2;
+    }
+
+    return recurse(value);
+  });
+
+  expect(res).toEqual({
+    a: 2,
+    b: {
+      c: 4,
+    },
+    d: [
+      6,
+      {
+        e: 8,
+      },
+    ],
+  });
+});

package/src/map-values.ts

@@ -9,3 +9,49 @@ export const mapValues = <T, U>(obj: Record<string, T>, fn: (value: T, key: stri
   });
   return result;
 };
+
+/**
+ * Recursively maps values traversing arrays and objects.
+ * @param fn Function to apply to each value. Second argument is a function to recurse into the value.
+ */
+export const deepMapValues = (value: any, fn: (value: any, recurse: (value: any) => any) => any): any => {
+  return new DeepMapper(fn).map(value);
+};
+
+class DeepMapper {
+  private readonly _cyclic = new Map<any, any>();
+
+  constructor(private readonly _fn: (value: any, recurse: (value: any) => any) => any) {}
+
+  map(value: any): any {
+    if (this._cyclic.has(value)) {
+      return this._cyclic.get(value);
+    }
+
+    return this._fn(value, this._recurse);
+  }
+
+  private _recurse = (value: any) => {
+    if (this._cyclic.has(value)) {
+      return this._cyclic.get(value);
+    }
+
+    if (Array.isArray(value)) {
+      const res = new Array(value.length);
+      this._cyclic.set(value, res);
+      for (let i = 0; i < value.length; i++) {
+        res[i] = this.map(value[i]);
+      }
+      return res;
+    } else if (value !== null && typeof value === 'object') {
+      const res: any = {};
+      this._cyclic.set(value, res);
+      for (const key in value) {
+        res[key] = this.map(value[key]);
+      }
+      return res;
+    } else {
+      return value;
+    }
+  };
+}

package/src/range.ts

@@ -2,6 +2,19 @@
 // Copyright 2020 DXOS.org
 //
 
-export const range = (n: number) => Array.from(Array(n).keys());
+export const range: {
+  (n: number): number[];
+  <T>(n: number, mapper: RangeMapper<T>): T[];
+} = <T>(n: number, mapper?: RangeMapper<T>) => {
+  const range = Array.from(Array(n).keys());
+  return mapper == null ? range : range.map(mapper);
+};
 
-export const rangeFromTo = (from: number, to: number) => range(to - from).map((i) => i + from);
+export const rangeFromTo: {
+  (from: number, to: number): number[];
+  <T>(from: number, to: number, mapper: RangeMapper<T>): T[];
+} = <T = number>(from: number, to: number, mapper?: RangeMapper<T>) => {
+  return mapper == null ? range(to - from, (i) => i + from) : range(to - from, (i) => mapper(i + from));
+};
+
+type RangeMapper<T> = (n: number) => T;