diff options
author | Ryan Dahl <ry@tinyclouds.org> | 2023-03-22 15:23:36 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-03-22 20:23:36 +0100 |
commit | f9c8d98b776083525a41f37ebfd86a4a4a288c43 (patch) | |
tree | fe96f0affd7c923ede54acd2b969e5c2e4089afd | |
parent | 47aa58c72168055047151927946b81085e4ea4cd (diff) |
Revert "refactor: rename Deno.openKv() to Deno.kv() (#18349)" (#18362)
This reverts commit 50b793c9ed866ee29e8f04b4fa24b485b01a2b74.
-rw-r--r-- | cli/tests/unit/kv_test.ts | 14 | ||||
-rw-r--r-- | cli/tsc/dts/lib.deno.unstable.d.ts | 12 | ||||
-rw-r--r-- | ext/kv/01_db.ts | 4 | ||||
-rw-r--r-- | ext/kv/lib.rs | 4 | ||||
-rw-r--r-- | ext/kv/sqlite.rs | 4 | ||||
-rw-r--r-- | runtime/js/90_deno_ns.js | 2 |
6 files changed, 22 insertions, 18 deletions
diff --git a/cli/tests/unit/kv_test.ts b/cli/tests/unit/kv_test.ts index 6ca9f2afc..c50e52c52 100644 --- a/cli/tests/unit/kv_test.ts +++ b/cli/tests/unit/kv_test.ts @@ -8,25 +8,25 @@ import { } from "./test_util.ts"; Deno.test({ - name: "kv :memory: no permissions", + name: "openKv :memory: no permissions", permissions: {}, async fn() { - const db = await Deno.kv(":memory:"); + const db = await Deno.openKv(":memory:"); await db.close(); }, }); Deno.test({ - name: "kv invalid filenames", + name: "openKv invalid filenames", permissions: {}, async fn() { await assertRejects( - async () => await Deno.kv(""), + async () => await Deno.openKv(""), TypeError, "Filename cannot be empty", ); await assertRejects( - async () => await Deno.kv(":foo"), + async () => await Deno.openKv(":foo"), TypeError, "Filename cannot start with ':' unless prefixed with './'", ); @@ -37,7 +37,9 @@ function dbTest(name: string, fn: (db: Deno.Kv) => Promise<void>) { Deno.test({ name, async fn() { - const db: Deno.Kv = await Deno.kv(":memory:"); + const db: Deno.Kv = await Deno.openKv( + ":memory:", + ); try { await fn(db); } finally { diff --git a/cli/tsc/dts/lib.deno.unstable.d.ts b/cli/tsc/dts/lib.deno.unstable.d.ts index 0ea1f89ba..b042ceabe 100644 --- a/cli/tsc/dts/lib.deno.unstable.d.ts +++ b/cli/tsc/dts/lib.deno.unstable.d.ts @@ -1535,7 +1535,7 @@ declare namespace Deno { * @tags allow-read, allow-write * @category KV */ - export function kv(path?: string): Promise<Deno.Kv>; + export function openKv(path?: string): Promise<Deno.Kv>; /** **UNSTABLE**: New API, yet to be vetted. * @@ -1876,7 +1876,7 @@ declare namespace Deno { * the returned entry will have a `null` value and versionstamp. * * ```ts - * const db = await Deno.kv(); + * const db = await Deno.openKv(); * const result = await db.get(["foo"]); * result.key; // ["foo"] * result.value; // "bar" @@ -1902,7 +1902,7 @@ declare namespace Deno { * entry will have a `null` value and versionstamp. * * ```ts - * const db = await Deno.kv(); + * const db = await Deno.openKv(); * const result = await db.getMany([["foo"], ["baz"]]); * result[0].key; // ["foo"] * result[0].value; // "bar" @@ -1928,7 +1928,7 @@ declare namespace Deno { * exists for the key, it will be overwritten. * * ```ts - * const db = await Deno.kv(); + * const db = await Deno.openKv(); * await db.set(["foo"], "bar"); * ``` */ @@ -1939,7 +1939,7 @@ declare namespace Deno { * for the key, this operation is a no-op. * * ```ts - * const db = await Deno.kv(); + * const db = await Deno.openKv(); * await db.delete(["foo"]); * ``` */ @@ -1971,7 +1971,7 @@ declare namespace Deno { * not `["users", "noa"]` or `["users", "zoe"]`. * * ```ts - * const db = await Deno.kv(); + * const db = await Deno.openKv(); * const entries = db.list({ prefix: ["users"] }); * for await (const entry of entries) { * entry.key; // ["users", "alice"] diff --git a/ext/kv/01_db.ts b/ext/kv/01_db.ts index 4f1f9bc5a..571a1b3cd 100644 --- a/ext/kv/01_db.ts +++ b/ext/kv/01_db.ts @@ -14,7 +14,7 @@ const encodeCursor: ( ) => string = (selector, boundaryKey) => ops.op_kv_encode_cursor(selector, boundaryKey); -async function kv(path: string) { +async function openKv(path: string) { const rid = await core.opAsync("op_kv_database_open", path); return new Kv(rid); } @@ -466,4 +466,4 @@ class KvListIterator extends AsyncIterator } } -export { Kv, kv, KvListIterator, KvU64 }; +export { Kv, KvListIterator, KvU64, openKv }; diff --git a/ext/kv/lib.rs b/ext/kv/lib.rs index b0b629e33..49a59af74 100644 --- a/ext/kv/lib.rs +++ b/ext/kv/lib.rs @@ -84,7 +84,9 @@ where { let handler = { let state = state.borrow(); - state.borrow::<UnstableChecker>().check_unstable("Deno.kv"); + state + .borrow::<UnstableChecker>() + .check_unstable("Deno.openKv"); state.borrow::<Rc<DBH>>().clone() }; let db = handler.open(state.clone(), path).await?; diff --git a/ext/kv/sqlite.rs b/ext/kv/sqlite.rs index 7c6fc73a6..17634127f 100644 --- a/ext/kv/sqlite.rs +++ b/ext/kv/sqlite.rs @@ -128,8 +128,8 @@ impl<P: SqliteDbHandlerPermissions> DatabaseHandler for SqliteDbHandler<P> { { let mut state = state.borrow_mut(); let permissions = state.borrow_mut::<P>(); - permissions.check_read(path, "Deno.kv")?; - permissions.check_write(path, "Deno.kv")?; + permissions.check_read(path, "Deno.openKv")?; + permissions.check_write(path, "Deno.openKv")?; } let flags = OpenFlags::default().difference(OpenFlags::SQLITE_OPEN_URI); rusqlite::Connection::open_with_flags(path, flags)? diff --git a/runtime/js/90_deno_ns.js b/runtime/js/90_deno_ns.js index dda2c89a8..54480c9c7 100644 --- a/runtime/js/90_deno_ns.js +++ b/runtime/js/90_deno_ns.js @@ -170,7 +170,7 @@ const denoNsUnstable = { funlockSync: fs.funlockSync, upgradeHttp: http.upgradeHttp, upgradeHttpRaw: flash.upgradeHttpRaw, - kv: kv.kv, + openKv: kv.openKv, Kv: kv.Kv, KvU64: kv.KvU64, KvListIterator: kv.KvListIterator, |