@dxos/keys 0.7.5-labs.a279d8c → 0.7.5-main.2567c87

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

@@ -1,6 +1,5 @@
 import type { inspect, InspectOptionsStylized } from 'node:util';
 import { inspectCustom } from '@dxos/debug';
-import type { SpaceId } from './space-id';
 /**
  * DXN unambiguously names a resource like an ECHO object, schema definition, plugin, etc.
  * Each DXN starts with a dx prefix, followed by a resource kind.
@@ -24,26 +23,12 @@ export declare class DXN {
      * Kind constants.
      */
     static kind: Readonly<{
-        /**
-         * dxn:type:<type name>[:<version>]
-         */
         TYPE: "type";
-        /**
-         * dxn:echo:<space id>:<echo id>
-         * dxn:echo:@:<echo id>
-         */
         ECHO: "echo";
-        /**
-         * dxn:queue:<subspace tag>:<space id>:<queue id>[:object id]
-         * dxn:queue:data:BA25QRC2FEWCSAMRP4RZL65LWJ7352CKE:01J00J9B45YHYSGZQTQMSKMGJ6
-         * dxn:queue:trace:BA25QRC2FEWCSAMRP4RZL65LWJ7352CKE:01J00J9B45YHYSGZQTQMSKMGJ6
-         */
-        QUEUE: "queue";
     }>;
     static equals(a: DXN, b: DXN): boolean;
     static isDXNString(dxn: string): boolean;
     static parse(dxn: string): DXN;
-    static parse(dxn: string, noThrow: boolean): DXN | undefined;
     /**
      * @example `dxn:type:example.com/type/Contact`
      */
@@ -61,9 +46,10 @@ export declare class DXN {
     get parts(): string[];
     toTypename(): string;
     hasTypenameOf(typename: string): boolean;
-    asTypeDXN(): DXN.TypeDXN | undefined;
-    asEchoDXN(): DXN.EchoDXN | undefined;
-    asQueueDXN(): DXN.QueueDXN | undefined;
+    asTypeDXN(): {
+        type: string;
+        version: string | undefined;
+    } | undefined;
     isLocalObjectId(): boolean;
     toString(): string;
     /**
@@ -71,28 +57,8 @@ export declare class DXN {
      */
     [inspectCustom](depth: number, options: InspectOptionsStylized, inspectFn: typeof inspect): string;
 }
-export declare namespace DXN {
-    type TypeDXN = {
-        type: string;
-        version?: string;
-    };
-    type EchoDXN = {
-        spaceId?: SpaceId;
-        echoId: string;
-    };
-    type QueueDXN = {
-        subspaceTag: string;
-        spaceId: SpaceId;
-        queueId: string;
-        objectId?: string;
-    };
-}
 /**
  * Tags for ECHO DXNs that should resolve the object ID in the local space.
  */
 export declare const LOCAL_SPACE_TAG = "@";
-export declare const QueueSubspaceTags: Readonly<{
-    DATA: "data";
-    TRACE: "trace";
-}>;
 //# sourceMappingURL=dxn.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"dxn.d.ts","sourceRoot":"","sources":["../../../src/dxn.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,OAAO,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAC;AAEjE,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAG5C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAE1C;;;;;;;;;;;;;;;;GAgBG;AACH,qBAAa,GAAG;;IACd;;OAEG;IACH,MAAM,CAAC,IAAI;QACT;;WAEG;;QAEH;;;WAGG;;QAEH;;;;WAIG;;OAEF;IAEH,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG;IAI5B,MAAM,CAAC,WAAW,CAAC,GAAG,EAAE,MAAM;IAI9B,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG;IAC9B,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,GAAG,GAAG,SAAS;IA+B5D;;OAEG;IACH,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM;IAIhC;;OAEG;IAEH,MAAM,CAAC,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IAI3D;;OAEG;IACH,MAAM,CAAC,iBAAiB,CAAC,EAAE,EAAE,MAAM;gBAOvB,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE;IAsBzC,IAAI,IAAI,WAEP;IAED,IAAI,KAAK,aAER;IAED,UAAU;IAKV,aAAa,CAAC,QAAQ,EAAE,MAAM;IAI9B,SAAS,IAAI,GAAG,CAAC,OAAO,GAAG,SAAS;IAYpC,SAAS,IAAI,GAAG,CAAC,OAAO,GAAG,SAAS;IAYpC,UAAU,IAAI,GAAG,CAAC,QAAQ,GAAG,SAAS;IAiBtC,eAAe;IAIf,QAAQ;IAIR;;OAEG;IACH,CAAC,aAAa,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,sBAAsB,EAAE,SAAS,EAAE,OAAO,OAAO;CAS1F;AAED,MAAM,CAAC,OAAO,WAAW,GAAG,CAAC;IAC3B,KAAY,OAAO,GAAG;QACpB,IAAI,EAAE,MAAM,CAAC;QACb,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB,CAAC;IAEF,KAAY,OAAO,GAAG;QACpB,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;IAEF,KAAY,QAAQ,GAAG;QACrB,WAAW,EAAE,MAAM,CAAC;QACpB,OAAO,EAAE,OAAO,CAAC;QACjB,OAAO,EAAE,MAAM,CAAC;QAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB,CAAC;CACH;AAED;;GAEG;AACH,eAAO,MAAM,eAAe,MAAM,CAAC;AAEnC,eAAO,MAAM,iBAAiB;;;EAG5B,CAAC"}
+{"version":3,"file":"dxn.d.ts","sourceRoot":"","sources":["../../../src/dxn.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,OAAO,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAC;AAEjE,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAG5C;;;;;;;;;;;;;;;;GAgBG;AACH,qBAAa,GAAG;;IACd;;OAEG;IACH,MAAM,CAAC,IAAI;;;OAGR;IAEH,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG;IAI5B,MAAM,CAAC,WAAW,CAAC,GAAG,EAAE,MAAM;IAI9B,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG;IAkB9B;;OAEG;IACH,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM;IAIhC;;OAEG;IAEH,MAAM,CAAC,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IAI3D;;OAEG;IACH,MAAM,CAAC,iBAAiB,CAAC,EAAE,EAAE,MAAM;gBAOvB,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE;IAsBzC,IAAI,IAAI,WAEP;IAED,IAAI,KAAK,aAER;IAED,UAAU;IAKV,aAAa,CAAC,QAAQ,EAAE,MAAM;IAI9B,SAAS;;iBAOsB,MAAM,GAAG,SAAS;;IAIjD,eAAe;IAIf,QAAQ;IAIR;;OAEG;IACH,CAAC,aAAa,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,sBAAsB,EAAE,SAAS,EAAE,OAAO,OAAO;CAS1F;AAED;;GAEG;AACH,eAAO,MAAM,eAAe,MAAM,CAAC"}

package/dist/types/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"version":"5.7.2"}
+{"version":"5.7.3"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/keys",
-  "version": "0.7.5-labs.a279d8c",
+  "version": "0.7.5-main.2567c87",
   "description": "Key utils and definitions.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -26,9 +26,9 @@
     "src"
   ],
   "dependencies": {
-    "@dxos/debug": "0.7.5-labs.a279d8c",
-    "@dxos/invariant": "0.7.5-labs.a279d8c",
-    "@dxos/node-std": "0.7.5-labs.a279d8c"
+    "@dxos/debug": "0.7.5-main.2567c87",
+    "@dxos/invariant": "0.7.5-main.2567c87",
+    "@dxos/node-std": "0.7.5-main.2567c87"
   },
   "devDependencies": {
     "base32-decode": "^1.0.0",

package/src/dxn.ts

@@ -7,8 +7,6 @@ import type { inspect, InspectOptionsStylized } from 'node:util';
 import { inspectCustom } from '@dxos/debug';
 import { invariant } from '@dxos/invariant';
 
-import type { SpaceId } from './space-id';
-
 /**
  * DXN unambiguously names a resource like an ECHO object, schema definition, plugin, etc.
  * Each DXN starts with a dx prefix, followed by a resource kind.
@@ -31,21 +29,8 @@ export class DXN {
    * Kind constants.
    */
   static kind = Object.freeze({
-    /**
-     * dxn:type:<type name>[:<version>]
-     */
     TYPE: 'type',
-    /**
-     * dxn:echo:<space id>:<echo id>
-     * dxn:echo:@:<echo id>
-     */
     ECHO: 'echo',
-    /**
-     * dxn:queue:<subspace tag>:<space id>:<queue id>[:object id]
-     * dxn:queue:data:BA25QRC2FEWCSAMRP4RZL65LWJ7352CKE:01J00J9B45YHYSGZQTQMSKMGJ6
-     * dxn:queue:trace:BA25QRC2FEWCSAMRP4RZL65LWJ7352CKE:01J00J9B45YHYSGZQTQMSKMGJ6
-     */
-    QUEUE: 'queue',
   });
 
   static equals(a: DXN, b: DXN) {
@@ -56,33 +41,19 @@ export class DXN {
     return dxn.startsWith('dxn:');
   }
 
-  static parse(dxn: string): DXN;
-  static parse(dxn: string, noThrow: boolean): DXN | undefined;
-  static parse(dxn: string, noThrow?: boolean): DXN | undefined {
+  static parse(dxn: string): DXN {
     if (typeof dxn !== 'string') {
-      if (noThrow) {
-        return undefined;
-      }
-      throw new Error(`Invalid DXN: ${dxn}`);
+      throw new Error('Invalid DXN');
     }
     const [prefix, kind, ...parts] = dxn.split(':');
     if (!(prefix === 'dxn')) {
-      if (noThrow) {
-        return undefined;
-      }
-      throw new Error(`Invalid DXN: ${dxn}`);
+      throw new Error('Invalid DXN');
     }
     if (!(typeof kind === 'string' && kind.length > 0)) {
-      if (noThrow) {
-        return undefined;
-      }
-      throw new Error(`Invalid DXN: ${dxn}`);
+      throw new Error('Invalid DXN');
     }
     if (!(parts.length > 0)) {
-      if (noThrow) {
-        return undefined;
-      }
-      throw new Error(`Invalid DXN: ${dxn}`);
+      throw new Error('Invalid DXN');
     }
 
     return new DXN(kind, parts);
@@ -152,44 +123,14 @@ export class DXN {
     return this.#kind === DXN.kind.TYPE && this.#parts.length === 1 && this.#parts[0] === typename;
   }
 
-  asTypeDXN(): DXN.TypeDXN | undefined {
+  asTypeDXN() {
     if (this.kind !== DXN.kind.TYPE) {
       return undefined;
     }
 
-    const [type, version] = this.#parts;
-    return {
-      type,
-      version: version as string | undefined,
-    };
-  }
-
-  asEchoDXN(): DXN.EchoDXN | undefined {
-    if (this.kind !== DXN.kind.ECHO) {
-      return undefined;
-    }
-
-    const [spaceId, echoId] = this.#parts;
-    return {
-      spaceId: spaceId === LOCAL_SPACE_TAG ? undefined : (spaceId as SpaceId | undefined),
-      echoId,
-    };
-  }
-
-  asQueueDXN(): DXN.QueueDXN | undefined {
-    if (this.kind !== DXN.kind.QUEUE) {
-      return undefined;
-    }
-
-    const [subspaceTag, spaceId, queueId, objectId] = this.#parts;
-    if (typeof queueId !== 'string') {
-      return undefined;
-    }
     return {
-      subspaceTag,
-      spaceId: spaceId as SpaceId,
-      queueId,
-      objectId: objectId as string | undefined,
+      type: this.#parts[0],
+      version: this.#parts[1] as string | undefined,
     };
   }
 
@@ -215,31 +156,7 @@ export class DXN {
   }
 }
 
-export declare namespace DXN {
-  export type TypeDXN = {
-    type: string;
-    version?: string;
-  };
-
-  export type EchoDXN = {
-    spaceId?: SpaceId;
-    echoId: string; // TODO(dmaretskyi): ObjectId.
-  };
-
-  export type QueueDXN = {
-    subspaceTag: string;
-    spaceId: SpaceId;
-    queueId: string; // TODO(dmaretskyi): ObjectId.
-    objectId?: string; // TODO(dmaretskyi): ObjectId.
-  };
-}
-
 /**
  * Tags for ECHO DXNs that should resolve the object ID in the local space.
  */
 export const LOCAL_SPACE_TAG = '@';
-
-export const QueueSubspaceTags = Object.freeze({
-  DATA: 'data',
-  TRACE: 'trace',
-});