@dxos/util 0.8.4-main.fffef41 → 0.8.4-staging.ac66bdf99f

package/src/safe-stringify.test.ts

@@ -0,0 +1,96 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { describe, test } from 'vitest';
+
+import { SKIP, createReplacer, safeStringify } from './safe-stringify';
+
+describe('safeStringify', () => {
+  test('stringifies plain nested objects', ({ expect }) => {
+    const data = { a: 1, b: { c: 'hello' } };
+    const result = safeStringify(data);
+    expect(result).to.include('"a": 1');
+    expect(result).to.include('"b"');
+    expect(result).to.include('"c": "hello"');
+  });
+
+  test('handles circular references (Cycle story)', ({ expect }) => {
+    const cycle: Record<string, unknown> = { a: 1, b: [] };
+    (cycle.b as unknown[]).push(cycle);
+
+    const result = safeStringify(cycle);
+    expect(result).to.include('"a": 1');
+    expect(result).to.include('=> $]');
+    expect(result).to.match(/\[\$\.b\.\d+ => \$\]/);
+  });
+
+  test('handles multiple circular references', ({ expect }) => {
+    const obj: Record<string, unknown> = { x: 1 };
+    obj.self = obj;
+
+    const result = safeStringify(obj);
+    expect(result).to.include('"x": 1');
+    expect(result).to.include('[$.self => $]');
+  });
+
+  test('filters functions', ({ expect }) => {
+    const data = { a: 1, fn: () => {} };
+    const result = safeStringify(data);
+    expect(result).to.include('"a": 1');
+    expect(result).not.to.include('fn');
+  });
+
+  test('filters exotic objects', ({ expect }) => {
+    class Custom {}
+    const data = { a: 1, exotic: new Custom() };
+    const result = safeStringify(data);
+    expect(result).to.include('"a": 1');
+    expect(result).not.to.include('exotic');
+  });
+
+  test('preserves arrays', ({ expect }) => {
+    const data = { arr: [1, 2, 3] };
+    const result = safeStringify(data);
+    expect(result).to.include('"arr"');
+    expect(result).to.include('1');
+    expect(result).to.include('2');
+    expect(result).to.include('3');
+  });
+});
+
+describe('createReplacer', () => {
+  test('maxArrayLen truncates long arrays (Large story)', ({ expect }) => {
+    const data = { arr: Array.from({ length: 15 }, (_, index) => index) };
+    const result = safeStringify(data, createReplacer({ maxArrayLen: 10 }));
+    expect(result).to.include('"[length: 15]"');
+  });
+
+  test('maxStringLen truncates long strings (Large story)', ({ expect }) => {
+    const data = { str: 'a'.repeat(20) };
+    const result = safeStringify(data, createReplacer({ maxStringLen: 10 }));
+    expect(result).to.include('"aaaaaaaaaa..."');
+  });
+
+  test('omit skips specified keys', ({ expect }) => {
+    const data = { a: 1, secret: 'hide', b: 2 };
+    const result = safeStringify(data, createReplacer({ omit: ['secret'] }));
+    expect(result).to.include('"a": 1');
+    expect(result).to.include('"b": 2');
+    expect(result).not.to.include('secret');
+  });
+
+  test('parse parses JSON string values', ({ expect }) => {
+    const data = { nested: '{"x":1}' };
+    const result = safeStringify(data, createReplacer({ parse: ['nested'] }));
+    expect(result).to.include('"x": 1');
+  });
+
+  test('SKIP return value removes key from output', ({ expect }) => {
+    const customReplacer = (_key: string, value: unknown) => (_key === 'skip' ? SKIP : value);
+    const data = { a: 1, skip: 'hidden' };
+    const result = safeStringify(data, customReplacer);
+    expect(result).to.include('"a": 1');
+    expect(result).not.to.include('skip');
+  });
+});

package/src/safe-stringify.ts

@@ -4,48 +4,89 @@
 
 export const SKIP = Object.freeze({});
 
+/**
+ * JSON.stringify replacer function.
+ */
 export type StringifyReplacer = (key: string, value: any) => typeof SKIP | any;
 
-export function safeStringify(obj: any, filter: StringifyReplacer = defaultFilter, indent = 2) {
-  const seen = new WeakSet();
+/**
+ * Safely stringifies an object.
+ */
+export function safeStringify(obj: any, filter: StringifyReplacer | undefined = defaultFilter, indent = 2) {
+  const seen = new WeakMap<object, string>();
+
+  // NOTE: Called for the root object with undefined key.
+  function replacer(this: any, key: string, value: any) {
+    try {
+      let path = key;
+      if (!key) {
+        path = '$';
+        if (value != null && typeof value === 'object') {
+          seen.set(value, path);
+        }
+        return value;
+      } else if (this) {
+        const parentPath = seen.get(this);
+        path = parentPath ? `${parentPath}.${key}` : key;
+      }
 
-  function replacer(key: string, value: any) {
-    if (typeof value === 'object' && value !== null) {
-      if (seen.has(value)) {
-        return '[Circular]';
+      // Null or undefined.
+      if (value == null) {
+        return value;
       }
 
-      seen.add(value);
-    }
+      // Ignore functions.
+      if (typeof value === 'function') {
+        return undefined;
+      }
 
-    if (filter) {
-      const v2 = filter?.(key, value);
-      if (v2 !== undefined) {
-        return v2 === SKIP ? undefined : v2;
+      // Ignore exotic objects (non-plain objects like DOM elements, class instances, etc.)
+      if (typeof value === 'object' && Object.getPrototypeOf(value) !== Object.prototype && !Array.isArray(value)) {
+        return undefined;
       }
-    }
 
-    return value;
+      // Check cycles.
+      if (typeof value === 'object' && value !== null) {
+        const exists = seen.get(value);
+        if (exists) {
+          return `[${path} => ${exists}]`;
+        }
+
+        seen.set(value, path);
+      }
+
+      if (filter) {
+        const filteredValue = filter?.(key, value);
+        if (filteredValue !== undefined) {
+          return filteredValue === SKIP ? undefined : filteredValue;
+        }
+      }
+
+      return value;
+    } catch (error: any) {
+      return `ERROR: ${error.message}`;
+    }
   }
 
-  let result = '';
   try {
-    result = JSON.stringify(obj, replacer, indent);
+    return JSON.stringify(obj, replacer, indent);
   } catch (error: any) {
-    result = `Error: ${error.message}`;
+    return `ERROR: ${error.message}`;
   }
-
-  return result;
 }
 
 export type CreateReplacerProps = {
   omit?: string[];
-  parse?: string[];
+  parse?: string[]; // TODO(burdon): Parse JSON value.
   maxDepth?: number;
   maxArrayLen?: number;
   maxStringLen?: number;
 };
 
+/**
+ * Construct JSON.stringify replacer.
+ */
+// TODO(burdon): Change to composite effect.
 export const createReplacer = ({
   omit,
   parse,
@@ -59,14 +100,21 @@ export const createReplacer = ({
   return function (this: any, key: string, value: any) {
     // Track depth.
     if (key === '') {
+      // Root.
       currentDepth = 0;
     } else if (this && typeof this === 'object') {
       const parentDepth = depthMap.get(this) ?? 0;
       currentDepth = parentDepth + 1;
     }
 
+    // Skip functions.
     if (typeof value === 'function') {
-      return undefined;
+      return SKIP;
+    }
+
+    // Show array length.
+    if (maxArrayLen != null && Array.isArray(value) && value.length > maxArrayLen) {
+      return `[length: ${value.length}]`;
     }
 
     // Store depth for this object.
@@ -81,8 +129,10 @@ export const createReplacer = ({
 
     // Apply other filters.
     if (omit?.includes(key)) {
-      return undefined;
+      return SKIP;
     }
+
+    // Parse JSON values.
     if (parse?.includes(key) && typeof value === 'string') {
       try {
         return JSON.parse(value);
@@ -90,9 +140,8 @@ export const createReplacer = ({
         return value;
       }
     }
-    if (maxArrayLen != null && Array.isArray(value) && value.length > maxArrayLen) {
-      return `[length: ${value.length}]`;
-    }
+
+    // Truncate strings.
     if (maxStringLen != null && typeof value === 'string' && value.length > maxStringLen) {
       return value.slice(0, maxStringLen) + '...';
     }

package/src/to-fallback.ts

@@ -4,166 +4,55 @@
 
 import { type PublicKey } from '@dxos/keys';
 
+/**
+ * When changing this set, please check the result in a console or e.g. RunKit (https://runkit.com/thure/642214441dd6ae000855a8de)
+ * Emoji sometimes use a combination of code points, and some code points aren't visible on their own, so by adding or deleting you may unintentionally create non-visible items.
+ * This set was chosen from the characters in Unicode Emoji v15.0 based on the following criteria:
+ * – not people or isolated anthropomorphic faces
+ * – not flags
+ * – more concrete than abstract
+ * – less culturally specific
+ * – less easily confused with another emoji in the set
+ * – requires less special knowledge to identify
+ * – less likely to evoke negative feelings (no meat, no drugs, no weapons, etc)
+ * – less common as a signifier in UX
+ * NOTE that this is intentionally an array of strings because of the way emoji graphemes work.
+ */
+// prettier-ignore
 export const idEmoji = [
-  // When changing this set, please check the result in a console or e.g. RunKit (https://runkit.com/thure/642214441dd6ae000855a8de)
-  // Emoji sometimes use a combination of code points, and some code points aren't visible on their own, so by adding or deleting you may unintentionally create non-visible items.
-  // This set was chosen from the characters in Unicode Emoji v15.0 based on the following criteria:
-  // – not people or isolated anthropomorphic faces
-  // – not flags
-  // – more concrete than abstract
-  // – less culturally specific
-  // – less easily confused with another emoji in the set
-  // – requires less special knowledge to identify
-  // – less likely to evoke negative feelings (no meat, no drugs, no weapons, etc)
-  // – less common as a signifier in UX
-  // NOTE that this is intentionally an array of strings because of the way emoji graphemes work.
-  '👻',
-  '👹',
-  '👽',
-  '🤖',
-  '🎃',
-  '🦾',
-  '🦿',
-  '🦷',
-  '👣',
-  '👁️',
-  '🧶',
-  '👑',
-  '🐒',
-  '🦆',
-  '🦉',
-  '🐴',
-  '🦄',
-  '🐝',
-  '🦋',
-  '🐞',
-  '🪲',
-  '🐢',
-  '🦎',
-  '🦕',
-  '🦑',
-  '🦀',
-  '🐠',
-  '🐬',
-  '🐋',
-  '🦭',
-  '🐅',
-  '🐆',
-  '🦓',
-  '🦍',
-  '🦧',
-  '🐘',
-  '🐫',
-  '🦒',
-  '🦘',
-  '🦬',
-  '🐖',
-  '🐏',
-  '🦌',
-  '🐕',
-  '🐈',
-  '🐓',
-  '🦚',
-  '🦜',
-  '🦢',
-  '🦩',
-  '🦦',
-  '🐁',
-  '🐿️',
-  '🌵',
-  '🌲',
-  '🌳',
-  '🪵',
-  '🌱',
-  '🍁',
-  '🪺',
-  '🍄',
-  '🐚',
-  '🪸',
-  '🪨',
-  '🌾',
-  '🌷',
-  '🌻',
-  '☀️',
-  '🌙',
-  '🪐',
-  '⭐️',
-  '⚡️',
-  '☄️',
-  '🔥',
-  '🌈',
-  '☁️',
-  '💧',
-  '⛱️',
-  '🌊',
-  '🍎',
-  '🍋',
-  '🍉',
-  '🍇',
-  '🫐',
-  '🍈',
-  '🍒',
-  '🍑',
-  '🥭',
-  '🍍',
-  '🥥',
-  '🥝',
-  '🥑',
-  '🌶️',
-  '🌽',
-  '🥕',
-  '🍬',
-  '🥜',
-  '🫖',
-  '☕️',
-  '🍵',
-  '🧊',
-  '🧂',
-  '🏔️',
-  '⚓️',
-  '🛟',
-  '🏝️',
-  '🛶',
-  '🚀',
-  '🛰️',
-  '⛲️',
-  '🏰',
-  '🚲',
-  '⛺️',
-  '🎙️',
-  '🧲',
-  '⚙️',
-  '🔩',
-  '🔮',
-  '🔭',
-  '🔬',
-  '🧬',
-  '🌡️',
-  '🧺',
-  '🛎️',
-  '🔑',
-  '🪑',
-  '🧸',
-  '🎈',
-  '🎀',
-  '🎊',
-  '♻️',
-  '🎵',
+  '👻', '👹', '👽', '🤖', '🎃', '🦾', '🦿', '🦷', 
+  '👣', '👁️', '🧶', '👑', '🐒', '🦆', '🦉', '🐴',
+  '🦄', '🐝', '🦋', '🐞', '🪲', '🐢', '🦎', '🦕', 
+  '🦑', '🦀', '🐠', '🐬', '🐋', '🦭', '🐅', '🐆', 
+  '🦓', '🦍', '🦧', '🐘', '🐫', '🦒', '🦘', '🦬', 
+  '🐖', '🐏', '🦌', '🐕', '🐈', '🐓', '🦚', '🦜', 
+  '🦢', '🦩', '🦦', '🐁', '🐿️', '🌵', '🌲', '🌳',
+  '🪵', '🌱', '🍁', '🪺', '🍄', '🐚', '🪸', '🪨',
+  '🌾', '🌷', '🌻', '☀️', '🌙', '🪐', '⭐️', '⚡️',
+  '☄️', '🔥', '🌈', '☁️', '💧', '⛱️', '🌊', '🍎',
+  '🍋', '🍉', '🍇', '🫐', '🍈', '🍒', '🍑', '🥭',
+  '🍍', '🥥', '🥝', '🥑', '🌶️', '🌽', '🥕', '🍬',
+  '🥜', '🫖', '☕️', '🍵', '🧊', '🧂', '🏔️', '⚓️',
+  '🛟', '🏝️', '🛶', '🚀', '🛰️', '⛲️', '🏰', '🚲',
+  '⛺️', '🎙️', '🧲', '⚙️', '🔩', '🔮', '🔭', '🔬',
+  '🧬', '🌡️', '🧺', '🛎️', '🔑', '🪑', '🧸', '🎈',
+  '🎀', '🎊', '♻️', '🎵',
 ];
 
 export const idHue = [
   'red' as const,
-  // 'orange' as const, /* More shades in these palettes are considered “ugly” */
-  'amber' as const, // Amber arcs between red-orange and yellow as it gets lighter, so improves aesthetics.
-  // 'yellow' as const, /* More shades in these palettes are considered “ugly” */
+  'orange' as const,
+  'amber' as const,
+  'yellow' as const,
   'lime' as const,
   'green' as const,
   'emerald' as const,
   'teal' as const,
   'cyan' as const,
-  // 'sky' as const, /* Omitted since it is quite similar to the primary accent palette */
-  // 'blue' as const, /* Omitted since it is quite similar to the primary accent palette */
-  // 'indigo' as const, /* Omitted since it is quite similar to the primary accent palette */
+  // Omit colors similar to primary accent.
+  // 'sky' as const,
+  // 'blue' as const,
+  // 'indigo' as const,
   'violet' as const,
   'purple' as const,
   'fuchsia' as const,
@@ -171,17 +60,11 @@ export const idHue = [
   'rose' as const,
 ];
 
-// TODO(wittjosiah): Do we need all of these variants?
 export const keyToEmoji = (key: PublicKey) => keyToFallback(key).emoji;
-
 export const hexToEmoji = (hex: string) => hexToFallback(hex).emoji;
-
 export const toEmoji = (hash: number) => toFallback(hash).emoji;
-
 export const keyToHue = (key: PublicKey) => keyToFallback(key).hue;
-
 export const hexToHue = (hex: string) => hexToFallback(hex).hue;
-
 export const toHue = (hash: number) => toFallback(hash).hue;
 
 export type FallbackValue = {

package/src/types.test.ts

@@ -4,7 +4,7 @@
 
 import { describe, expect, test } from 'vitest';
 
-import { isNonNullable } from './types';
+import { arrayMove, arraySwap, isNonNullable } from './types';
 
 describe('types', () => {
   test('filter', async () => {
@@ -12,4 +12,14 @@ describe('types', () => {
     const filtered: number[] = values.filter(isNonNullable);
     expect(filtered).to.deep.equal([1, 2, 3, 4]);
   });
+
+  test('arrayMove', () => {
+    expect(arrayMove([1, 2, 3, 4], 0, 2)).to.deep.equal([2, 3, 1, 4]);
+    expect(arrayMove([1, 2, 3, 4], 2, 0)).to.deep.equal([3, 1, 2, 4]);
+  });
+
+  test('arraySwap', () => {
+    expect(arraySwap([1, 2, 3, 4], 0, 2)).to.deep.equal([3, 2, 1, 4]);
+    expect(arraySwap([1, 2, 3, 4], 2, 0)).to.deep.equal([3, 2, 1, 4]);
+  });
 });

package/src/types.ts

@@ -10,15 +10,33 @@ export type MaybeProvider<T, V = void> = T | ((arg: V) => T);
 
 export type MaybePromise<T> = T | Promise<T>;
 
-export type GuardedType<T> = T extends (value: any) => value is infer R ? R : never;
-
-export type DeepReadonly<T> = {
-  readonly [P in keyof T]: T[P] extends Record<string, any>
-    ? DeepReadonly<T[P]>
-    : T[P] extends Array<infer U>
-      ? ReadonlyArray<DeepReadonly<U>>
-      : T[P];
-};
+export type GuardedType<T> = T extends ((value: any) => value is infer R) ? R : never;
+
+/**
+ * Removes readonly modifiers from top-level properties of T.
+ * Also converts readonly arrays at the top level to mutable arrays.
+ * For nested properties, mutability depends on the schema definition.
+ */
+export type ToMutable<T> = T extends object
+  ? { -readonly [K in keyof T]: T[K] extends readonly (infer U)[] ? U[] : T[K] }
+  : T;
+
+export type Intersection<Types extends readonly unknown[]> = Types extends [infer First, ...infer Rest]
+  ? First & Intersection<Rest>
+  : unknown;
+
+/**
+ * Recursively makes all properties of T readonly.
+ * Primitives (including branded types like `string & { __brand: true }`) are returned as-is.
+ * Arrays become ReadonlyArrays with deeply readonly elements.
+ */
+export type DeepReadonly<T> = T extends string | number | boolean | bigint | symbol | null | undefined
+  ? T // Primitives (including branded primitives) stay as-is.
+  : T extends Array<infer U>
+    ? ReadonlyArray<DeepReadonly<U>>
+    : T extends object
+      ? { readonly [P in keyof T]: DeepReadonly<T[P]> }
+      : T;
 
 export type DeepWriteable<T> = { -readonly [K in keyof T]: T[K] extends object ? DeepWriteable<T[K]> : T[K] };
 
@@ -104,9 +122,19 @@ export const sortKeys = <T extends object>(obj: T): T =>
     }, {} as T);
 
 /**
- * Swap position of element within array.
+ * Move element within array.
  */
-export const arrayMove = <T>(array: T[], from: number, to: number): Array<T> => {
+export const arrayMove = <T>(array: T[], from: number, to: number): T[] => {
   array.splice(to < 0 ? array.length + to : to, 0, array.splice(from, 1)[0]);
   return array;
 };
+
+/**
+ * Swap position of element within array.
+ */
+export function arraySwap<T>(array: T[], from: number, to: number): T[] {
+  const current = array[from];
+  array[from] = array[to];
+  array[to] = current;
+  return array;
+}

package/src/unit.ts

@@ -42,6 +42,7 @@ export const Unit: Record<string, UnitFormat> = {
   Gigabyte: createFormat({ symbol: 'GB', quotient: 1_000 * 1_000 * 1_000, precision: 2 }),
   Megabyte: createFormat({ symbol: 'MB', quotient: 1_000 * 1_000, precision: 2 }),
   Kilobyte: createFormat({ symbol: 'KB', quotient: 1_000, precision: 2 }),
+  Byte: createFormat({ symbol: 'B', quotient: 1 }),
 
   // Time.
   Hour: createFormat({ symbol: 'h', quotient: MS_HOURS }),

package/src/weak.ts

@@ -7,13 +7,20 @@
  */
 export class WeakDictionary<K, V extends object> implements Map<K, V> {
   private readonly _internal = new Map<K, WeakRef<V>>();
-  private readonly _finalization = new FinalizationRegistry((cleanUpCallback: () => void) => {
-    cleanUpCallback();
+  private readonly _finalization = new FinalizationRegistry<{ key: K; ref: WeakRef<V> }>(({ key, ref }) => {
+    if (this._internal.get(key) === ref) {
+      this._internal.delete(key);
+    }
   });
 
   constructor(entries?: [K, V][]) {
-    this._internal = new Map(entries?.map(([key, value]) => [key, new WeakRef(value)]));
-    entries?.forEach(([key, value]) => this._register(key, value));
+    if (entries) {
+      for (const [key, value] of entries) {
+        const ref = new WeakRef(value);
+        this._internal.set(key, ref);
+        this._register(key, value, ref);
+      }
+    }
   }
 
   *entries(): SetIterator<[K, V]> {
@@ -55,11 +62,48 @@ export class WeakDictionary<K, V extends object> implements Map<K, V> {
   }
 
   set(key: K, value: V): this {
-    this._internal.set(key, new WeakRef(value));
-    this._register(key, value);
+    const previous = this._internal.get(key)?.deref();
+    if (previous) {
+      this._unregister(previous);
+    }
+    const ref = new WeakRef(value);
+    this._internal.set(key, ref);
+    this._register(key, value, ref);
     return this;
   }
 
+  /**
+   * Returns the value for the given key if present, otherwise inserts and returns the default value.
+   * @param key - The key to look up or insert.
+   * @param defaultValue - The value to insert if the key is not present.
+   * @returns The existing or newly inserted value.
+   */
+  getOrInsert(key: K, defaultValue: V): V {
+    const existing = this.get(key);
+    if (existing !== undefined) {
+      return existing;
+    }
+    this.set(key, defaultValue);
+    return defaultValue;
+  }
+
+  /**
+   * Returns the value for the given key if present, otherwise computes, inserts, and returns a new value.
+   * The callback is only invoked when the key is missing.
+   * @param key - The key to look up or insert.
+   * @param callbackfn - Function to compute the value if the key is not present.
+   * @returns The existing or newly computed value.
+   */
+  getOrInsertComputed(key: K, callbackfn: (key: K) => V): V {
+    const existing = this.get(key);
+    if (existing !== undefined) {
+      return existing;
+    }
+    const value = callbackfn(key);
+    this.set(key, value);
+    return value;
+  }
+
   has(key: K): boolean {
     return this._internal.has(key) && this._internal.get(key)!.deref() !== undefined;
   }
@@ -96,14 +140,8 @@ export class WeakDictionary<K, V extends object> implements Map<K, V> {
     });
   }
 
-  private _register(key: K, value: V): void {
-    this._finalization.register(
-      value,
-      () => {
-        this._internal.delete(key);
-      },
-      value,
-    );
+  private _register(key: K, value: V, ref: WeakRef<V>): void {
+    this._finalization.register(value, { key, ref }, value);
   }
 
   private _unregister(value: V): void {

package/dist/types/src/explicit-resource-management-polyfill.d.ts

@@ -1 +0,0 @@
-//# sourceMappingURL=explicit-resource-management-polyfill.d.ts.map

package/dist/types/src/explicit-resource-management-polyfill.d.ts.map

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