fix(ext/kv): KvU64#valueOf and KvU64 inspect

denoland · May 1, 2023 · 4e7106e · 4e7106e
1 parent 6728ad4
commit 4e7106e
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 13 deletions.
diff --git a/cli/tests/unit/kv_test.ts b/cli/tests/unit/kv_test.ts
@@ -578,17 +578,19 @@ Deno.test("KvU64 underflow", () => {
   }, RangeError);
 });
 
-Deno.test("KvU64 frozen", () => {
+Deno.test("KvU64 unbox", () => {
   const a = new Deno.KvU64(1n);
-  assertThrows(() => {
-    // @ts-expect-error value is readonly
-    a.value = 2n;
-  }, TypeError);
+  assertEquals(a.value, 1n);
 });
 
-Deno.test("KvU64 unbox", () => {
+Deno.test("KvU64 unbox with valueOf", () => {
   const a = new Deno.KvU64(1n);
-  assertEquals(a.value, 1n);
+  assertEquals(a.valueOf(), 1n);
+});
+
+Deno.test("KvU64 auto-unbox", () => {
+  const a = new Deno.KvU64(1n);
+  assertEquals(a as unknown as bigint + 1n, 2n);
 });
 
 async function collect<T>(

diff --git a/ext/kv/01_db.ts b/ext/kv/01_db.ts
@@ -2,8 +2,10 @@
 
 // @ts-ignore internal api
 const {
-  ObjectGetPrototypeOf,
   AsyncGeneratorPrototype,
+  SymbolToStringTag,
+  ObjectGetPrototypeOf,
+  SymbolFor,
 } = globalThis.__bootstrap.primordials;
 const core = Deno.core;
 const ops = core.ops;
@@ -289,7 +291,7 @@ const MIN_U64 = BigInt("0");
 const MAX_U64 = BigInt("0xffffffffffffffff");
 
 class KvU64 {
-  readonly value: bigint;
+  value: bigint;
 
   constructor(value: bigint) {
     if (typeof value !== "bigint") {
@@ -299,11 +301,28 @@ class KvU64 {
       throw new RangeError("value must be a positive bigint");
     }
     if (value > MAX_U64) {
-      throw new RangeError("value must be a 64-bit unsigned integer");
+      throw new RangeError("value must fit in a 64-bit unsigned integer");
     }
     this.value = value;
     Object.freeze(this);
   }
+
+  valueOf() {
+    return this.value;
+  }
+
+  toString() {
+    return this.value.toString();
+  }
+
+  get [SymbolToStringTag]() {
+    return "Deno.KvU64";
+  }
+
+  [SymbolFor("Deno.privateCustomInspect")](inspect, inspectOptions) {
+    return inspect(Object(this.value), inspectOptions)
+      .replace("BigInt", "Deno.KvU64");
+  }
 }
 
 function deserializeValue(entry: RawKvEntry): Deno.KvEntry<unknown> {
@@ -338,7 +357,7 @@ function serializeValue(value: unknown): RawValue {
   } else if (value instanceof KvU64) {
     return {
       kind: "u64",
-      value: value.value,
+      value: value.valueOf(),
     };
   } else {
     return {

diff --git a/ext/kv/lib.rs b/ext/kv/lib.rs
@@ -53,8 +53,7 @@ impl UnstableChecker {
 }
 
 deno_core::extension!(deno_kv,
-  // TODO(bartlomieju): specify deps
-  deps = [ ],
+  deps = [ deno_console ],
   parameters = [ DBH: DatabaseHandler ],
   ops = [
     op_kv_database_open<DBH>,