@dxos/keys 0.8.2-main.f081794 → 0.8.2-main.fbd8ed0

package/dist/types/src/random-bytes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"random-bytes.d.ts","sourceRoot":"","sources":["../../../src/random-bytes.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,WAAW,WAAY,MAAM,4BAQzC,CAAC"}
+{"version":3,"file":"random-bytes.d.ts","sourceRoot":"","sources":["../../../src/random-bytes.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,WAAW,GAAI,QAAQ,MAAM,4BAQzC,CAAC"}

package/dist/types/src/space-id.d.ts

@@ -1,3 +1,4 @@
+import { Schema } from 'effect';
 /**
  * A unique identifier for a space.
  * Space keys are generated by creating a keypair, and then taking the first 20 bytes of the SHA-256 hash of the public key and encoding them to multibase RFC4648 base-32 format (prefixed with B, see Multibase Table).
@@ -6,11 +7,11 @@
 export type SpaceId = string & {
     __SpaceId: true;
 };
-export declare const SpaceId: Readonly<{
-    byteLength: 20;
+export declare const SpaceId: Schema.Schema<SpaceId, string> & {
+    byteLength: number;
     encode: (value: Uint8Array) => SpaceId;
     decode: (value: SpaceId) => Uint8Array;
     isValid: (value: string) => value is SpaceId;
     random: () => SpaceId;
-}>;
+};
 //# sourceMappingURL=space-id.d.ts.map

package/dist/types/src/space-id.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"space-id.d.ts","sourceRoot":"","sources":["../../../src/space-id.ts"],"names":[],"mappings":"AAWA;;;;GAIG;AAEH,MAAM,MAAM,OAAO,GAAG,MAAM,GAAG;IAAE,SAAS,EAAE,IAAI,CAAA;CAAE,CAAC;AAEnD,eAAO,MAAM,OAAO;;oBAEF,UAAU,KAAG,OAAO;oBAMpB,OAAO,KAAG,UAAU;qBAKnB,MAAM,KAAG,KAAK,IAAI,OAAO;kBAG9B,OAAO;EAGnB,CAAC"}
+{"version":3,"file":"space-id.d.ts","sourceRoot":"","sources":["../../../src/space-id.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAiBhC;;;;GAIG;AAEH,MAAM,MAAM,OAAO,GAAG,MAAM,GAAG;IAAE,SAAS,EAAE,IAAI,CAAA;CAAE,CAAC;AAEnD,eAAO,MAAM,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,GAAG;IACrD,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,CAAC,KAAK,EAAE,UAAU,KAAK,OAAO,CAAC;IACvC,MAAM,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,UAAU,CAAC;IACvC,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,KAAK,IAAI,OAAO,CAAC;IAC7C,MAAM,EAAE,MAAM,OAAO,CAAC;CAmBvB,CAAC"}

package/dist/types/tsconfig.tsbuildinfo

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/keys",
-  "version": "0.8.2-main.f081794",
+  "version": "0.8.2-main.fbd8ed0",
   "description": "Key utils and definitions.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -27,9 +27,10 @@
     "src"
   ],
   "dependencies": {
-    "@dxos/debug": "0.8.2-main.f081794",
-    "@dxos/invariant": "0.8.2-main.f081794",
-    "@dxos/node-std": "0.8.2-main.f081794"
+    "effect": "3.14.21",
+    "@dxos/debug": "0.8.2-main.fbd8ed0",
+    "@dxos/node-std": "0.8.2-main.fbd8ed0",
+    "@dxos/invariant": "0.8.2-main.fbd8ed0"
   },
   "devDependencies": {
     "base32-decode": "^1.0.0",

package/src/dxn.ts

@@ -153,6 +153,7 @@ export class DXN {
     return this.#parts;
   }
 
+  // TODO(burdon): Should getters fail?
   get typename() {
     invariant(this.#kind === DXN.kind.TYPE);
     return this.#parts[0];

package/src/space-id.ts

@@ -4,43 +4,53 @@
 
 import base32Decode from 'base32-decode';
 import base32Encode from 'base32-encode';
+import { Schema } from 'effect';
 
 import { invariant } from '@dxos/invariant';
 
 import { randomBytes } from './random-bytes';
 
+/**
+ * Denotes RFC4648 base-32 format.
+ */
+const MULTIBASE_PREFIX = 'B';
+
+const ENCODED_LENGTH = 33;
+
+const isValid = (value: string): value is SpaceId => {
+  return typeof value === 'string' && value.startsWith(MULTIBASE_PREFIX) && value.length === ENCODED_LENGTH;
+};
+
 /**
  * A unique identifier for a space.
  * Space keys are generated by creating a keypair, and then taking the first 20 bytes of the SHA-256 hash of the public key and encoding them to multibase RFC4648 base-32 format (prefixed with B, see Multibase Table).
  * @example BA25QRC2FEWCSAMRP4RZL65LWJ7352CKE
  */
-// TODO(burdon): Use effect brand.
+// TODO(burdon): Use effect branded type?
 export type SpaceId = string & { __SpaceId: true };
 
-export const SpaceId = Object.freeze({
-  byteLength: 20,
-  encode: (value: Uint8Array): SpaceId => {
+export const SpaceId: Schema.Schema<SpaceId, string> & {
+  byteLength: number;
+  encode: (value: Uint8Array) => SpaceId;
+  decode: (value: SpaceId) => Uint8Array;
+  isValid: (value: string) => value is SpaceId;
+  random: () => SpaceId;
+} = class extends Schema.String.pipe(Schema.filter(isValid)) {
+  static byteLength = 20;
+
+  static encode = (value: Uint8Array): SpaceId => {
     invariant(value instanceof Uint8Array, 'Invalid type');
     invariant(value.length === SpaceId.byteLength, 'Invalid length');
-
     return (MULTIBASE_PREFIX + base32Encode(value, 'RFC4648')) as SpaceId;
-  },
-  decode: (value: SpaceId): Uint8Array => {
-    invariant(value.startsWith(MULTIBASE_PREFIX), 'Invalid multibase32 encoding');
+  };
 
+  static decode = (value: SpaceId): Uint8Array => {
+    invariant(value.startsWith(MULTIBASE_PREFIX), 'Invalid multibase32 encoding');
     return new Uint8Array(base32Decode(value.slice(1), 'RFC4648'));
-  },
-  isValid: (value: string): value is SpaceId => {
-    return typeof value === 'string' && value.startsWith(MULTIBASE_PREFIX) && value.length === ENCODED_LENGTH;
-  },
-  random: (): SpaceId => {
-    return SpaceId.encode(randomBytes(SpaceId.byteLength));
-  },
-});
-
-/**
- * Denotes RFC4648 base-32 format.
- */
-const MULTIBASE_PREFIX = 'B';
+  };
 
-const ENCODED_LENGTH = 33;
+  static isValid = isValid;
+  static random = (): SpaceId => {
+    return SpaceId.encode(randomBytes(SpaceId.byteLength));
+  };
+};