@dxos/keys 0.8.3 → 0.8.4-main.1da679c

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/keys",
-  "version": "0.8.3",
+  "version": "0.8.4-main.1da679c",
   "description": "Key utils and definitions.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -10,12 +10,10 @@
   "type": "module",
   "exports": {
     ".": {
+      "source": "./src/index.ts",
+      "types": "./dist/types/src/index.d.ts",
       "browser": "./dist/lib/browser/index.mjs",
-      "node": {
-        "require": "./dist/lib/node/index.cjs",
-        "default": "./dist/lib/node-esm/index.mjs"
-      },
-      "types": "./dist/types/src/index.d.ts"
+      "node": "./dist/lib/node-esm/index.mjs"
     }
   },
   "types": "dist/types/src/index.d.ts",
@@ -27,11 +25,11 @@
     "src"
   ],
   "dependencies": {
-    "effect": "3.14.21",
+    "effect": "3.17.7",
     "ulidx": "^2.3.0",
-    "@dxos/invariant": "0.8.3",
-    "@dxos/debug": "0.8.3",
-    "@dxos/node-std": "0.8.3"
+    "@dxos/debug": "0.8.4-main.1da679c",
+    "@dxos/invariant": "0.8.4-main.1da679c",
+    "@dxos/node-std": "0.8.4-main.1da679c"
   },
   "devDependencies": {
     "base32-decode": "^1.0.0",

package/src/dxn.ts

@@ -2,11 +2,12 @@
 // Copyright 2024 DXOS.org
 //
 
+import type { InspectOptionsStylized, inspect } from 'node:util';
+
 import { Schema } from 'effect';
-import type { inspect, InspectOptionsStylized } from 'node:util';
 
-import { devtoolsFormatter, type DevtoolsFormatter, inspectCustom } from '@dxos/debug';
-import { invariant } from '@dxos/invariant';
+import { type DevtoolsFormatter, devtoolsFormatter, inspectCustom } from '@dxos/debug';
+import { assertArgument, invariant } from '@dxos/invariant';
 
 import { ObjectId } from './object-id';
 import { SpaceId } from './space-id';
@@ -18,6 +19,8 @@ import { SpaceId } from './space-id';
 // TODO(dmaretskyi): "@" is a separator character in the URI spec.
 export const LOCAL_SPACE_TAG = '@';
 
+export const DXN_ECHO_REGEXP = /@(dxn:[a-zA-Z0-p:@]+)/;
+
 // TODO(burdon): Namespace for.
 export const QueueSubspaceTags = Object.freeze({
   DATA: 'data',
@@ -26,6 +29,12 @@ export const QueueSubspaceTags = Object.freeze({
 
 export type QueueSubspaceTag = (typeof QueueSubspaceTags)[keyof typeof QueueSubspaceTags];
 
+// TODO(burdon): Refactor.
+// Consider: https://github.com/multiformats/multiaddr
+// dxn:echo:[<space-id>:[<queue-id>:]]<object-id>
+// dxn:echo:[S/<space-id>:[Q/<queue-id>:]]<object-id>
+// dxn:type:dxos.org/markdown/Contact
+
 /**
  * DXN unambiguously names a resource like an ECHO object, schema definition, plugin, etc.
  * Each DXN starts with a dxn prefix, followed by a resource kind.
@@ -43,6 +52,7 @@ export type QueueSubspaceTag = (typeof QueueSubspaceTags)[keyof typeof QueueSubs
  * ```
  */
 export class DXN {
+  // TODO(burdon): Rename to DXN (i.e., DXN.DXN).
   // TODO(dmaretskyi): Should this be a transformation into the DXN type?
   static Schema = Schema.NonEmptyString.pipe(
     Schema.pattern(/^dxn:([^:]+):(?:[^:]+:?)+[^:]$/),
@@ -64,16 +74,16 @@ export class DXN {
    */
   static kind = Object.freeze({
     /**
-     * dxn:type:<type name>[:<version>]
+     * dxn:type:<type_name>[:<version>]
      */
     TYPE: 'type',
 
     /**
-     * dxn:echo:<space id>:<echo id>
-     * dxn:echo:@:<echo id>
+     * dxn:echo:<space_id>:<echo_id>
+     * dxn:echo:@:<echo_id>
      */
-    // TODO(burdon): Rename to OBJECT? (BREAKING CHANGE).
-    // TODO(burdon): Add separate Kind for space.
+    // TODO(burdon): Rename to OBJECT? (BREAKING CHANGE to update "echo").
+    // TODO(burdon): Add separate Kind for space?
     ECHO: 'echo',
 
     /**
@@ -85,14 +95,19 @@ export class DXN {
     QUEUE: 'queue',
   });
 
-  get kind() {
-    return this.#kind;
-  }
-
+  /**
+   * Exactly equals.
+   */
   static equals(a: DXN, b: DXN): boolean {
     return a.kind === b.kind && a.parts.length === b.parts.length && a.parts.every((part, i) => part === b.parts[i]);
   }
 
+  static equalsEchoId(a: DXN, b: DXN): boolean {
+    const a1 = a.asEchoDXN();
+    const b1 = b.asEchoDXN();
+    return !!a1 && !!b1 && a1.echoId === b1.echoId;
+  }
+
   // TODO(burdon): Rename isValid.
   static isDXNString(dxn: string): boolean {
     return dxn.startsWith('dxn:');
@@ -119,7 +134,7 @@ export class DXN {
   static tryParse(dxn: string): DXN | undefined {
     try {
       return DXN.parse(dxn);
-    } catch (error) {
+    } catch {
       return undefined;
     }
   }
@@ -139,17 +154,27 @@ export class DXN {
     return new DXN(DXN.kind.TYPE, [typename, version]);
   }
 
+  /**
+   * @example `dxn:echo:BA25QRC2FEWCSAMRP4RZL65LWJ7352CKE:01J00J9B45YHYSGZQTQMSKMGJ6`
+   */
+  static fromSpaceAndObjectId(spaceId: SpaceId, objectId: ObjectId): DXN {
+    assertArgument(SpaceId.isValid(spaceId), `Invalid space ID: ${spaceId}`);
+    assertArgument(ObjectId.isValid(objectId), 'objectId', `Invalid object ID: ${objectId}`);
+    return new DXN(DXN.kind.ECHO, [spaceId, objectId]);
+  }
+
   /**
    * @example `dxn:echo:@:01J00J9B45YHYSGZQTQMSKMGJ6`
    */
   static fromLocalObjectId(id: string): DXN {
+    assertArgument(ObjectId.isValid(id), 'id', `Invalid object ID: ${id}`);
     return new DXN(DXN.kind.ECHO, [LOCAL_SPACE_TAG, id]);
   }
 
   static fromQueue(subspaceTag: QueueSubspaceTag, spaceId: SpaceId, queueId: ObjectId, objectId?: ObjectId) {
-    invariant(SpaceId.isValid(spaceId));
-    invariant(ObjectId.isValid(queueId));
-    invariant(!objectId || ObjectId.isValid(objectId));
+    assertArgument(SpaceId.isValid(spaceId), `Invalid space ID: ${spaceId}`);
+    assertArgument(ObjectId.isValid(queueId), 'queueId', `Invalid queue ID: ${queueId}`);
+    assertArgument(!objectId || ObjectId.isValid(objectId), 'objectId', `Invalid object ID: ${objectId}`);
 
     return new DXN(DXN.kind.QUEUE, [subspaceTag, spaceId, queueId, ...(objectId ? [objectId] : [])]);
   }
@@ -158,19 +183,23 @@ export class DXN {
   #parts: string[];
 
   constructor(kind: string, parts: string[]) {
-    invariant(parts.length > 0);
-    invariant(parts.every((part) => typeof part === 'string' && part.length > 0 && part.indexOf(':') === -1));
+    assertArgument(parts.length > 0, 'parts', `Invalid DXN: ${parts}`);
+    assertArgument(
+      parts.every((part) => typeof part === 'string' && part.length > 0 && part.indexOf(':') === -1),
+      'parts',
+      `Invalid DXN: ${parts}`,
+    );
 
     // Per-type validation.
     switch (kind) {
       case DXN.kind.TYPE:
         if (parts.length > 2) {
-          throw new Error('Invalid "type" DXN');
+          throw new Error('Invalid DXN.kind.TYPE');
         }
         break;
       case DXN.kind.ECHO:
         if (parts.length !== 2) {
-          throw new Error('Invalid "echo" DXN');
+          throw new Error('Invalid DXN.kind.ECHO');
         }
         break;
     }
@@ -179,6 +208,39 @@ export class DXN {
     this.#parts = parts;
   }
 
+  toString(): DXN.String {
+    return `dxn:${this.#kind}:${this.#parts.join(':')}` as DXN.String;
+  }
+
+  toJSON(): string {
+    return this.toString();
+  }
+
+  /**
+   * Used by Node.js to get textual representation of this object when it's printed with a `console.log` statement.
+   */
+  [inspectCustom](depth: number, options: InspectOptionsStylized, inspectFn: typeof inspect): string {
+    const printControlCode = (code: number) => {
+      return `\x1b[${code}m`;
+    };
+
+    return (
+      printControlCode(inspectFn.colors.blueBright![0]) + this.toString() + printControlCode(inspectFn.colors.reset![0])
+    );
+  }
+
+  get [devtoolsFormatter](): DevtoolsFormatter {
+    return {
+      header: () => {
+        return ['span', { style: 'font-weight: bold;' }, this.toString()];
+      },
+    };
+  }
+
+  get kind() {
+    return this.#kind;
+  }
+
   get parts() {
     return this.#parts;
   }
@@ -189,6 +251,10 @@ export class DXN {
     return this.#parts[0];
   }
 
+  equals(other: DXN): boolean {
+    return DXN.equals(this, other);
+  }
+
   hasTypenameOf(typename: string): boolean {
     return this.#kind === DXN.kind.TYPE && this.#parts.length === 1 && this.#parts[0] === typename;
   }
@@ -204,6 +270,7 @@ export class DXN {
 
     const [type, version] = this.#parts;
     return {
+      // TODO(wittjosiah): Should be `typename` for consistency.
       type,
       version: version as string | undefined,
     };
@@ -217,6 +284,7 @@ export class DXN {
     const [spaceId, echoId] = this.#parts;
     return {
       spaceId: spaceId === LOCAL_SPACE_TAG ? undefined : (spaceId as SpaceId | undefined),
+      // TODO(burdon): objectId.
       echoId,
     };
   }
@@ -239,59 +307,26 @@ export class DXN {
     };
   }
 
-  toString(): DXN.String {
-    return `dxn:${this.#kind}:${this.#parts.join(':')}` as DXN.String;
-  }
-
   /**
-   * Used by Node.js to get textual representation of this object when it's printed with a `console.log` statement.
+   * Produces a new DXN with the given parts appended.
    */
-  [inspectCustom](depth: number, options: InspectOptionsStylized, inspectFn: typeof inspect): string {
-    const printControlCode = (code: number) => {
-      return `\x1b[${code}m`;
-    };
-
-    return (
-      printControlCode(inspectFn.colors.blueBright![0]) + this.toString() + printControlCode(inspectFn.colors.reset![0])
-    );
-  }
-
-  get [devtoolsFormatter](): DevtoolsFormatter {
-    return {
-      header: () => {
-        return ['span', { style: 'font-weight: bold;' }, this.toString()];
-      },
-    };
+  extend(parts: string[]): DXN {
+    return new DXN(this.#kind, [...this.#parts, ...parts]);
   }
 }
 
-// TODO(dmaretskyi): Fluent API:
-/*
-class DXN {
-  ...
-isEchoDXN(): this is EchoDXN {
-  return this.#kind === DXN.kind.ECHO;
-}
-...
-}
-
-interface EchoDXN extends DXN {
-  objectId: ObjectId;
-}
-
-declare const dxn: DXN;
-
-dxn.objectId
-
-if(dxn.isEchoDXN()) {
-  dxn.objectId
-}
-  ```
-
 /**
  * API namespace.
  */
 export declare namespace DXN {
+  /**
+   * DXN represented as a javascript string.
+   */
+  // TODO(burdon): Use Effect branded string?
+  // export const String = S.String.pipe(S.brand('DXN'));
+  // export type String = S.To(typoeof String);
+  export type String = string & { __DXNString: never };
+
   export type TypeDXN = {
     type: string;
     version?: string;
@@ -299,8 +334,7 @@ export declare namespace DXN {
 
   export type EchoDXN = {
     spaceId?: SpaceId;
-    // TODO(burdon): Rename objectId.
-    echoId: string; // TODO(dmaretskyi): ObjectId.
+    echoId: string; // TODO(dmaretskyi): Rename to `objectId` and use `ObjectId` for the type.
   };
 
   export type QueueDXN = {
@@ -309,12 +343,4 @@ export declare namespace DXN {
     queueId: string; // TODO(dmaretskyi): ObjectId.
     objectId?: string; // TODO(dmaretskyi): ObjectId.
   };
-
-  /**
-   * DXN represented as a javascript string.
-   */
-  export type String = string & { __DXNString: never };
-  // TODO(burdon): Make brand.
-  // export const String = S.String.pipe(S.brand('DXN'));
-  // export type String = S.To(typoeof String);
 }

package/src/index.ts

@@ -7,4 +7,4 @@ export * from './identity-did';
 export * from './object-id';
 export * from './public-key';
 export * from './space-id';
-export * from './types';
+export type * from './types';

package/src/object-id.ts

@@ -9,7 +9,7 @@ import { ulid } from 'ulidx';
 // export const ObjectIdBrand: unique symbol = Symbol('@dxos/echo/ObjectId');
 // export const ObjectIdSchema = Schema.ULID.pipe(S.brand(ObjectIdBrand));
 const ObjectIdSchema = Schema.String.pipe(Schema.pattern(/^[0-7][0-9A-HJKMNP-TV-Z]{25}$/i)).annotations({
-  description: 'a Universally Unique Lexicographically Sortable Identifier',
+  description: 'A Universally Unique Lexicographically Sortable Identifier',
   pattern: '^[0-7][0-9A-HJKMNP-TV-Z]{25}$',
 });
 
@@ -31,7 +31,7 @@ export const ObjectId: ObjectIdClass = class extends ObjectIdSchema {
     try {
       Schema.decodeSync(ObjectId)(id);
       return true;
-    } catch (err) {
+    } catch {
       return false;
     }
   }

package/src/public-key.ts

@@ -2,15 +2,16 @@
 // Copyright 2020 DXOS.org
 //
 
+import { type InspectOptionsStylized, type inspect } from 'node:util';
+
 import base32Decode from 'base32-decode';
 import base32Encode from 'base32-encode';
-import { type inspect, type InspectOptionsStylized } from 'node:util';
 
 import {
-  devtoolsFormatter,
   type DevtoolsFormatter,
-  equalsSymbol,
   type Equatable,
+  devtoolsFormatter,
+  equalsSymbol,
   inspectCustom,
   truncateKey,
 } from '@dxos/debug';

package/src/random-bytes.ts

@@ -4,7 +4,7 @@
 
 export const randomBytes = (length: number) => {
   // globalThis.crypto is not available in Node.js when running in vitest even though the documentation says it should be.
-  // eslint-disable-next-line @typescript-eslint/no-var-requires
+  // eslint-disable-next-line @typescript-eslint/no-require-imports
   const webCrypto = globalThis.crypto ?? require('node:crypto').webcrypto;
 
   const bytes = new Uint8Array(length);