@dxos/keys 0.8.3-staging.0fa589b → 0.8.4-main.28f8d3d

package/dist/lib/browser/index.mjs

@@ -44,9 +44,9 @@ var init_inject_globals = __esm({
   }
 });
 
-// node_modules/.pnpm/base32-decode@1.0.0/node_modules/base32-decode/index.js
+// ../../../node_modules/.pnpm/base32-decode@1.0.0/node_modules/base32-decode/index.js
 var require_base32_decode = __commonJS({
-  "node_modules/.pnpm/base32-decode@1.0.0/node_modules/base32-decode/index.js"(exports, module) {
+  "../../../node_modules/.pnpm/base32-decode@1.0.0/node_modules/base32-decode/index.js"(exports, module) {
     init_inject_globals();
     var RFC46482 = "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567";
     var RFC4648_HEX2 = "0123456789ABCDEFGHIJKLMNOPQRSTUV";
@@ -95,21 +95,21 @@ var require_base32_decode = __commonJS({
   }
 });
 
-// packages/common/keys/src/index.ts
+// src/index.ts
 init_inject_globals();
 
-// packages/common/keys/src/dxn.ts
+// src/dxn.ts
 init_inject_globals();
 import { Schema as Schema3 } from "effect";
 import { devtoolsFormatter, inspectCustom } from "@dxos/debug";
-import { invariant as invariant2 } from "@dxos/invariant";
+import { assertArgument, invariant as invariant2 } from "@dxos/invariant";
 
-// packages/common/keys/src/object-id.ts
+// src/object-id.ts
 init_inject_globals();
 import { Schema } from "effect";
 import { ulid } from "ulidx";
 var 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}$"
 });
 var ObjectId = class extends ObjectIdSchema {
@@ -117,7 +117,7 @@ var ObjectId = class extends ObjectIdSchema {
     try {
       Schema.decodeSync(ObjectId)(id);
       return true;
-    } catch (err) {
+    } catch {
       return false;
     }
   }
@@ -126,14 +126,14 @@ var ObjectId = class extends ObjectIdSchema {
   }
 };
 
-// packages/common/keys/src/space-id.ts
+// src/space-id.ts
 init_inject_globals();
 var import_base32_decode = __toESM(require_base32_decode(), 1);
 
-// node_modules/.pnpm/base32-encode@2.0.0/node_modules/base32-encode/index.js
+// ../../../node_modules/.pnpm/base32-encode@2.0.0/node_modules/base32-encode/index.js
 init_inject_globals();
 
-// node_modules/.pnpm/to-data-view@2.0.0/node_modules/to-data-view/index.js
+// ../../../node_modules/.pnpm/to-data-view@2.0.0/node_modules/to-data-view/index.js
 init_inject_globals();
 function toDataView(data) {
   if (data instanceof Int8Array || data instanceof Uint8Array || data instanceof Uint8ClampedArray) {
@@ -145,7 +145,7 @@ function toDataView(data) {
   throw new TypeError("Expected `data` to be an ArrayBuffer, Buffer, Int8Array, Uint8Array or Uint8ClampedArray");
 }
 
-// node_modules/.pnpm/base32-encode@2.0.0/node_modules/base32-encode/index.js
+// ../../../node_modules/.pnpm/base32-encode@2.0.0/node_modules/base32-encode/index.js
 var RFC4648 = "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567";
 var RFC4648_HEX = "0123456789ABCDEFGHIJKLMNOPQRSTUV";
 var CROCKFORD = "0123456789ABCDEFGHJKMNPQRSTVWXYZ";
@@ -193,11 +193,11 @@ function base32Encode(data, variant, options) {
   return output;
 }
 
-// packages/common/keys/src/space-id.ts
+// src/space-id.ts
 import { Schema as Schema2 } from "effect";
 import { invariant } from "@dxos/invariant";
 
-// packages/common/keys/src/random-bytes.ts
+// src/random-bytes.ts
 init_inject_globals();
 var randomBytes = (length) => {
   const webCrypto = globalThis.crypto ?? __require("@dxos/node-std/crypto").webcrypto;
@@ -206,116 +206,104 @@ var randomBytes = (length) => {
   return bytes;
 };
 
-// packages/common/keys/src/space-id.ts
-var __dxlog_file = "/home/runner/work/dxos/dxos/packages/common/keys/src/space-id.ts";
+// src/space-id.ts
+var __dxlog_file = "/__w/dxos/dxos/packages/common/keys/src/space-id.ts";
 var MULTIBASE_PREFIX = "B";
 var ENCODED_LENGTH = 33;
 var isValid = (value) => {
   return typeof value === "string" && value.startsWith(MULTIBASE_PREFIX) && value.length === ENCODED_LENGTH;
 };
 var SpaceId = class extends Schema2.String.pipe(Schema2.filter(isValid)) {
-  static {
-    this.byteLength = 20;
-  }
-  static {
-    this.encode = (value) => {
-      invariant(value instanceof Uint8Array, "Invalid type", {
-        F: __dxlog_file,
-        L: 43,
-        S: this,
-        A: [
-          "value instanceof Uint8Array",
-          "'Invalid type'"
-        ]
-      });
-      invariant(value.length === SpaceId.byteLength, "Invalid length", {
-        F: __dxlog_file,
-        L: 44,
-        S: this,
-        A: [
-          "value.length === SpaceId.byteLength",
-          "'Invalid length'"
-        ]
-      });
-      return MULTIBASE_PREFIX + base32Encode(value, "RFC4648");
-    };
-  }
-  static {
-    this.decode = (value) => {
-      invariant(value.startsWith(MULTIBASE_PREFIX), "Invalid multibase32 encoding", {
-        F: __dxlog_file,
-        L: 49,
-        S: this,
-        A: [
-          "value.startsWith(MULTIBASE_PREFIX)",
-          "'Invalid multibase32 encoding'"
-        ]
-      });
-      return new Uint8Array((0, import_base32_decode.default)(value.slice(1), "RFC4648"));
-    };
-  }
-  static {
-    this.isValid = isValid;
-  }
-  static {
-    this.random = () => {
-      return SpaceId.encode(randomBytes(SpaceId.byteLength));
-    };
-  }
+  static byteLength = 20;
+  static encode = (value) => {
+    invariant(value instanceof Uint8Array, "Invalid type", {
+      F: __dxlog_file,
+      L: 43,
+      S: this,
+      A: [
+        "value instanceof Uint8Array",
+        "'Invalid type'"
+      ]
+    });
+    invariant(value.length === SpaceId.byteLength, "Invalid length", {
+      F: __dxlog_file,
+      L: 44,
+      S: this,
+      A: [
+        "value.length === SpaceId.byteLength",
+        "'Invalid length'"
+      ]
+    });
+    return MULTIBASE_PREFIX + base32Encode(value, "RFC4648");
+  };
+  static decode = (value) => {
+    invariant(value.startsWith(MULTIBASE_PREFIX), "Invalid multibase32 encoding", {
+      F: __dxlog_file,
+      L: 49,
+      S: this,
+      A: [
+        "value.startsWith(MULTIBASE_PREFIX)",
+        "'Invalid multibase32 encoding'"
+      ]
+    });
+    return new Uint8Array((0, import_base32_decode.default)(value.slice(1), "RFC4648"));
+  };
+  static isValid = isValid;
+  static random = () => {
+    return SpaceId.encode(randomBytes(SpaceId.byteLength));
+  };
 };
 
-// packages/common/keys/src/dxn.ts
-var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/common/keys/src/dxn.ts";
+// src/dxn.ts
+var __dxlog_file2 = "/__w/dxos/dxos/packages/common/keys/src/dxn.ts";
 var LOCAL_SPACE_TAG = "@";
+var DXN_ECHO_REGEXP = /@(dxn:[a-zA-Z0-p:@]+)/;
 var QueueSubspaceTags = Object.freeze({
   DATA: "data",
   TRACE: "trace"
 });
 var DXN = class _DXN {
-  static {
-    // TODO(dmaretskyi): Should this be a transformation into the DXN type?
-    this.Schema = Schema3.NonEmptyString.pipe(
-      Schema3.pattern(/^dxn:([^:]+):(?:[^:]+:?)+[^:]$/),
-      // TODO(dmaretskyi): To set the format we need to move the annotation IDs out of the echo-schema package.
-      // FormatAnnotation.set(FormatEnum.DXN),
-      Schema3.annotations({
-        title: "DXN",
-        description: "DXN URI",
-        examples: [
-          "dxn:type:example.com/type/MyType",
-          "dxn:echo:@:01J00J9B45YHYSGZQTQMSKMGJ6"
-        ]
-      })
-    );
-  }
+  // TODO(burdon): Rename to DXN (i.e., DXN.DXN).
+  // TODO(dmaretskyi): Should this be a transformation into the DXN type?
+  static Schema = Schema3.NonEmptyString.pipe(
+    Schema3.pattern(/^dxn:([^:]+):(?:[^:]+:?)+[^:]$/),
+    // TODO(dmaretskyi): To set the format we need to move the annotation IDs out of the echo-schema package.
+    // FormatAnnotation.set(FormatEnum.DXN),
+    Schema3.annotations({
+      title: "DXN",
+      description: "DXN URI",
+      examples: [
+        "dxn:type:example.com/type/MyType",
+        "dxn:echo:@:01J00J9B45YHYSGZQTQMSKMGJ6"
+      ]
+    })
+  );
   static hash(dxn) {
     return dxn.toString();
   }
-  static {
+  /**
+  * Kind constants.
+  */
+  static kind = Object.freeze({
     /**
-    * Kind constants.
+    * dxn:type:<type name>[:<version>]
     */
-    this.kind = Object.freeze({
-      /**
-      * dxn:type:<type name>[:<version>]
-      */
-      TYPE: "type",
-      /**
-      * dxn:echo:<space id>:<echo id>
-      * dxn:echo:@:<echo id>
-      */
-      // TODO(burdon): Rename to OBJECT? (BREAKING CHANGE).
-      // TODO(burdon): Add separate Kind for space.
-      ECHO: "echo",
-      /**
-      * The subspace tag enables us to partition queues by usage within the context of a space.
-      * dxn:queue:<subspace_tag>:<space_id>:<queue_id>[:object_id]
-      * dxn:queue:data:BA25QRC2FEWCSAMRP4RZL65LWJ7352CKE:01J00J9B45YHYSGZQTQMSKMGJ6
-      * dxn:queue:trace:BA25QRC2FEWCSAMRP4RZL65LWJ7352CKE:01J00J9B45YHYSGZQTQMSKMGJ6
-      */
-      QUEUE: "queue"
-    });
-  }
+    TYPE: "type",
+    /**
+    * dxn:echo:<space id>:<echo id>
+    * dxn:echo:@:<echo id>
+    */
+    // TODO(burdon): Rename to OBJECT? (BREAKING CHANGE).
+    // TODO(burdon): Add separate Kind for space.
+    ECHO: "echo",
+    /**
+    * The subspace tag enables us to partition queues by usage within the context of a space.
+    * dxn:queue:<subspace_tag>:<space_id>:<queue_id>[:object_id]
+    * dxn:queue:data:BA25QRC2FEWCSAMRP4RZL65LWJ7352CKE:01J00J9B45YHYSGZQTQMSKMGJ6
+    * dxn:queue:trace:BA25QRC2FEWCSAMRP4RZL65LWJ7352CKE:01J00J9B45YHYSGZQTQMSKMGJ6
+    */
+    QUEUE: "queue"
+  });
   get kind() {
     return this.#kind;
   }
@@ -345,7 +333,7 @@ var DXN = class _DXN {
   static tryParse(dxn) {
     try {
       return _DXN.parse(dxn);
-    } catch (error) {
+    } catch {
       return void 0;
     }
   }
@@ -368,42 +356,30 @@ var DXN = class _DXN {
     ]);
   }
   /**
+  * @example `dxn:echo:BA25QRC2FEWCSAMRP4RZL65LWJ7352CKE:01J00J9B45YHYSGZQTQMSKMGJ6`
+  */
+  static fromSpaceAndObjectId(spaceId, objectId) {
+    assertArgument(SpaceId.isValid(spaceId), `Invalid space ID: ${spaceId}`);
+    assertArgument(ObjectId.isValid(objectId), `Invalid object ID: ${objectId}`);
+    return new _DXN(_DXN.kind.ECHO, [
+      spaceId,
+      objectId
+    ]);
+  }
+  /**
   * @example `dxn:echo:@:01J00J9B45YHYSGZQTQMSKMGJ6`
   */
   static fromLocalObjectId(id) {
+    assertArgument(ObjectId.isValid(id), `Invalid object ID: ${id}`);
     return new _DXN(_DXN.kind.ECHO, [
       LOCAL_SPACE_TAG,
       id
     ]);
   }
   static fromQueue(subspaceTag, spaceId, queueId, objectId) {
-    invariant2(SpaceId.isValid(spaceId), void 0, {
-      F: __dxlog_file2,
-      L: 150,
-      S: this,
-      A: [
-        "SpaceId.isValid(spaceId)",
-        ""
-      ]
-    });
-    invariant2(ObjectId.isValid(queueId), void 0, {
-      F: __dxlog_file2,
-      L: 151,
-      S: this,
-      A: [
-        "ObjectId.isValid(queueId)",
-        ""
-      ]
-    });
-    invariant2(!objectId || ObjectId.isValid(objectId), void 0, {
-      F: __dxlog_file2,
-      L: 152,
-      S: this,
-      A: [
-        "!objectId || ObjectId.isValid(objectId)",
-        ""
-      ]
-    });
+    assertArgument(SpaceId.isValid(spaceId), `Invalid space ID: ${spaceId}`);
+    assertArgument(ObjectId.isValid(queueId), `Invalid queue ID: ${queueId}`);
+    assertArgument(!objectId || ObjectId.isValid(objectId), `Invalid object ID: ${objectId}`);
     return new _DXN(_DXN.kind.QUEUE, [
       subspaceTag,
       spaceId,
@@ -416,24 +392,8 @@ var DXN = class _DXN {
   #kind;
   #parts;
   constructor(kind, parts) {
-    invariant2(parts.length > 0, void 0, {
-      F: __dxlog_file2,
-      L: 161,
-      S: this,
-      A: [
-        "parts.length > 0",
-        ""
-      ]
-    });
-    invariant2(parts.every((part) => typeof part === "string" && part.length > 0 && part.indexOf(":") === -1), void 0, {
-      F: __dxlog_file2,
-      L: 162,
-      S: this,
-      A: [
-        "parts.every((part) => typeof part === 'string' && part.length > 0 && part.indexOf(':') === -1)",
-        ""
-      ]
-    });
+    assertArgument(parts.length > 0, `Invalid DXN: ${parts}`);
+    assertArgument(parts.every((part) => typeof part === "string" && part.length > 0 && part.indexOf(":") === -1), `Invalid DXN: ${parts}`);
     switch (kind) {
       case _DXN.kind.TYPE:
         if (parts.length > 2) {
@@ -449,6 +409,34 @@ var DXN = class _DXN {
     this.#kind = kind;
     this.#parts = parts;
   }
+  toString() {
+    return `dxn:${this.#kind}:${this.#parts.join(":")}`;
+  }
+  toJSON() {
+    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, options, inspectFn) {
+    const printControlCode = (code) => {
+      return `\x1B[${code}m`;
+    };
+    return printControlCode(inspectFn.colors.blueBright[0]) + this.toString() + printControlCode(inspectFn.colors.reset[0]);
+  }
+  get [devtoolsFormatter]() {
+    return {
+      header: () => {
+        return [
+          "span",
+          {
+            style: "font-weight: bold;"
+          },
+          this.toString()
+        ];
+      }
+    };
+  }
   get parts() {
     return this.#parts;
   }
@@ -456,7 +444,7 @@ var DXN = class _DXN {
   get typename() {
     invariant2(this.#kind === _DXN.kind.TYPE, void 0, {
       F: __dxlog_file2,
-      L: 188,
+      L: 234,
       S: this,
       A: [
         "this.#kind === DXN.kind.TYPE",
@@ -477,6 +465,7 @@ var DXN = class _DXN {
     }
     const [type, version] = this.#parts;
     return {
+      // TODO(wittjosiah): Should be `typename` for consistency.
       type,
       version
     };
@@ -506,38 +495,22 @@ var DXN = class _DXN {
       objectId
     };
   }
-  toString() {
-    return `dxn:${this.#kind}:${this.#parts.join(":")}`;
-  }
   /**
-  * 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, options, inspectFn) {
-    const printControlCode = (code) => {
-      return `\x1B[${code}m`;
-    };
-    return printControlCode(inspectFn.colors.blueBright[0]) + this.toString() + printControlCode(inspectFn.colors.reset[0]);
-  }
-  get [devtoolsFormatter]() {
-    return {
-      header: () => {
-        return [
-          "span",
-          {
-            style: "font-weight: bold;"
-          },
-          this.toString()
-        ];
-      }
-    };
+  extend(parts) {
+    return new _DXN(this.#kind, [
+      ...this.#parts,
+      ...parts
+    ]);
   }
 };
 
-// packages/common/keys/src/identity-did.ts
+// src/identity-did.ts
 init_inject_globals();
 var import_base32_decode2 = __toESM(require_base32_decode(), 1);
 import { invariant as invariant3 } from "@dxos/invariant";
-var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/common/keys/src/identity-did.ts";
+var __dxlog_file3 = "/__w/dxos/dxos/packages/common/keys/src/identity-did.ts";
 var IdentityDid = Object.freeze({
   byteLength: 20,
   encode: (value) => {
@@ -584,19 +557,18 @@ var MULTIBASE_PREFIX2 = "B";
 var DID_PREFIX = "did:halo:";
 var ENCODED_LENGTH2 = 42;
 
-// packages/common/keys/src/public-key.ts
+// src/public-key.ts
 init_inject_globals();
 var import_base32_decode3 = __toESM(require_base32_decode(), 1);
 import { devtoolsFormatter as devtoolsFormatter2, equalsSymbol, inspectCustom as inspectCustom2, truncateKey } from "@dxos/debug";
 import { invariant as invariant4 } from "@dxos/invariant";
-var __dxlog_file4 = "/home/runner/work/dxos/dxos/packages/common/keys/src/public-key.ts";
+var __dxlog_file4 = "/__w/dxos/dxos/packages/common/keys/src/public-key.ts";
 var PUBLIC_KEY_LENGTH = 32;
 var SECRET_KEY_LENGTH = 64;
 var isLikeArrayBuffer = (value) => typeof value === "object" && value !== null && Object.getPrototypeOf(value).constructor.name === "ArrayBuffer";
 var PublicKey = class _PublicKey {
-  static {
-    this.ZERO = _PublicKey.from("00".repeat(PUBLIC_KEY_LENGTH));
-  }
+  _value;
+  static ZERO = _PublicKey.from("00".repeat(PUBLIC_KEY_LENGTH));
   /**
   * Creates new instance of PublicKey automatically determining the input format.
   * @param source A Buffer, or Uint8Array, or hex encoded string, or something with an `asUint8Array` method on it
@@ -605,7 +577,7 @@ var PublicKey = class _PublicKey {
   static from(source) {
     invariant4(source, void 0, {
       F: __dxlog_file4,
-      L: 49,
+      L: 50,
       S: this,
       A: [
         "source",
@@ -697,7 +669,7 @@ var PublicKey = class _PublicKey {
   static bufferize(str) {
     invariant4(typeof str === "string", "Invalid type", {
       F: __dxlog_file4,
-      L: 152,
+      L: 153,
       S: this,
       A: [
         "typeof str === 'string'",
@@ -720,7 +692,7 @@ var PublicKey = class _PublicKey {
     }
     invariant4(key instanceof Buffer2, "Invalid type", {
       F: __dxlog_file4,
-      L: 171,
+      L: 172,
       S: this,
       A: [
         "key instanceof Buffer",
@@ -739,7 +711,7 @@ var PublicKey = class _PublicKey {
   static fromMultibase32(encoded) {
     invariant4(encoded.startsWith("B"), "Invalid multibase32 encoding", {
       F: __dxlog_file4,
-      L: 184,
+      L: 185,
       S: this,
       A: [
         "encoded.startsWith('B')",
@@ -878,6 +850,7 @@ var PublicKey = class _PublicKey {
 };
 export {
   DXN,
+  DXN_ECHO_REGEXP,
   IdentityDid,
   LOCAL_SPACE_TAG,
   ObjectId,