wrangler 2.0.3 → 2.0.5

package/bin/wrangler.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
-const { spawn } = require("node:child_process");
-const { join } = require("node:path");
+const { spawn } = require("child_process");
+const { join } = require("path");
 const semiver = require("semiver");
 
 const MIN_NODE_VERSION = "16.7.0";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wrangler",
-  "version": "2.0.3",
+  "version": "2.0.5",
   "author": "wrangler@cloudflare.com",
   "description": "Command-line interface for all things Cloudflare Workers",
   "bin": {

package/src/__tests__/kv.test.ts

@@ -257,14 +257,6 @@ describe("wrangler", () => {
         expect(requests.count).toEqual(1);
       });
 
-      it("should encode URI id properly for deleting namespace", async () => {
-        const requests = mockDeleteRequest("%2Fvoyager");
-        await runWrangler(`kv:namespace delete --namespace-id /voyager`);
-        expect(requests.count).toEqual(1);
-        expect(std.out).toMatchInlineSnapshot(`""`);
-        expect(std.err).toMatchInlineSnapshot(`""`);
-      });
-
       it("should delete a namespace specified by binding name", async () => {
         writeWranglerConfig();
         const requests = mockDeleteRequest("bound-id");
@@ -389,7 +381,7 @@ describe("wrangler", () => {
         expect(std.err).toMatchInlineSnapshot(`""`);
       });
 
-      it("should encode URI key's properly for putting in a key request", async () => {
+      it("should encode the key in the api request to put a value", async () => {
         const requests = mockKeyPutRequest("DS9", {
           key: "%2Fmy-key",
           value: "my-value",
@@ -951,6 +943,20 @@ describe("wrangler", () => {
         expect(std.err).toMatchInlineSnapshot(`""`);
       });
 
+      it("should encode the key in the api request to get a value", async () => {
+        setMockFetchKVGetValue(
+          "some-account-id",
+          "some-namespace-id",
+          "%2Fmy%2Ckey",
+          "my-value"
+        );
+        await runWrangler(
+          "kv:key get /my,key --namespace-id some-namespace-id"
+        );
+        expect(std.out).toMatchInlineSnapshot(`"my-value"`);
+        expect(std.err).toMatchInlineSnapshot(`""`);
+      });
+
       it("should error if no key is provided", async () => {
         await expect(
           runWrangler("kv:key get")
@@ -1101,7 +1107,7 @@ describe("wrangler", () => {
         expect(requests.count).toEqual(1);
       });
 
-      it("should encode the URI properly for deleting a key requests", async () => {
+      it("should encode the key in the api request to delete a value", async () => {
         const requests = mockDeleteRequest("voyager", "%2FNCC-74656");
         await runWrangler(`kv:key delete --namespace-id voyager /NCC-74656`);
         expect(requests.count).toEqual(1);

package/src/cfetch/internal.ts

@@ -112,6 +112,9 @@ function addAuthorizationHeader(
  * doesn't return json. We inline the implementation and try not to share
  * any code with the other calls. We should push back on any new APIs that
  * try to introduce non-"standard" response structures.
+ *
+ * Note: any calls to fetchKVGetValue must call encodeURIComponent on key
+ * before passing it
  */
 
 export async function fetchKVGetValue(

package/src/index.tsx

@@ -22,17 +22,19 @@ import { confirm, prompt } from "./dialogs";
 import { getEntry } from "./entry";
 import { DeprecationError } from "./errors";
 import {
-  getNamespaceId,
-  listNamespaces,
-  listNamespaceKeys,
-  putKeyValue,
-  putBulkKeyValue,
-  deleteBulkKeyValue,
-  createNamespace,
-  isValidNamespaceBinding,
-  getKeyValue,
-  isKeyValue,
-  unexpectedKeyValueProps,
+  getKVNamespaceId,
+  listKVNamespaces,
+  listKVNamespaceKeys,
+  putKVKeyValue,
+  putKVBulkKeyValue,
+  deleteKVBulkKeyValue,
+  createKVNamespace,
+  isValidKVNamespaceBinding,
+  getKVKeyValue,
+  isKVKeyValue,
+  unexpectedKVKeyValueProps,
+  deleteKVNamespace,
+  deleteKVKeyValue,
 } from "./kv";
 import { logger } from "./logger";
 import { getPackageManager } from "./package-manager";
@@ -1919,7 +1921,7 @@ export async function main(argv: string[]): Promise<void> {
           async (args) => {
             await printWranglerBanner();
 
-            if (!isValidNamespaceBinding(args.namespace)) {
+            if (!isValidKVNamespaceBinding(args.namespace)) {
               throw new CommandLineArgsError(
                 `The namespace binding name "${args.namespace}" is invalid. It can only have alphanumeric and _ characters, and cannot begin with a number.`
               );
@@ -1942,7 +1944,7 @@ export async function main(argv: string[]): Promise<void> {
             // TODO: generate a binding name stripping non alphanumeric chars
 
             logger.log(`🌀 Creating namespace with title "${title}"`);
-            const namespaceId = await createNamespace(accountId, title);
+            const namespaceId = await createKVNamespace(accountId, title);
 
             logger.log("✨ Success!");
             const envString = args.env ? ` under [env.${args.env}]` : "";
@@ -1969,7 +1971,7 @@ export async function main(argv: string[]): Promise<void> {
             // TODO: we should show bindings if they exist for given ids
 
             logger.log(
-              JSON.stringify(await listNamespaces(accountId), null, "  ")
+              JSON.stringify(await listKVNamespaces(accountId), null, "  ")
             );
           }
         )
@@ -2006,7 +2008,7 @@ export async function main(argv: string[]): Promise<void> {
 
             let id;
             try {
-              id = getNamespaceId(args, config);
+              id = getKVNamespaceId(args, config);
             } catch (e) {
               throw new CommandLineArgsError(
                 "Not able to delete namespace.\n" + ((e as Error).message ?? e)
@@ -2015,12 +2017,7 @@ export async function main(argv: string[]): Promise<void> {
 
             const accountId = await requireAuth(config);
 
-            await fetchResult<{ id: string }>(
-              `/accounts/${accountId}/storage/kv/namespaces/${encodeURIComponent(
-                id
-              )}`,
-              { method: "DELETE" }
-            );
+            await deleteKVNamespace(accountId, id);
 
             // TODO: recommend they remove it from wrangler.toml
 
@@ -2105,7 +2102,7 @@ export async function main(argv: string[]): Promise<void> {
           async ({ key, ttl, expiration, ...args }) => {
             await printWranglerBanner();
             const config = readConfig(args.config as ConfigPath, args);
-            const namespaceId = getNamespaceId(args, config);
+            const namespaceId = getKVNamespaceId(args, config);
             // One of `args.path` and `args.value` must be defined
             const value = args.path
               ? readFileSync(args.path)
@@ -2124,7 +2121,7 @@ export async function main(argv: string[]): Promise<void> {
 
             const accountId = await requireAuth(config);
 
-            await putKeyValue(accountId, namespaceId, {
+            await putKVKeyValue(accountId, namespaceId, {
               key,
               value,
               expiration,
@@ -2169,11 +2166,11 @@ export async function main(argv: string[]): Promise<void> {
           async ({ prefix, ...args }) => {
             // TODO: support for limit+cursor (pagination)
             const config = readConfig(args.config as ConfigPath, args);
-            const namespaceId = getNamespaceId(args, config);
+            const namespaceId = getKVNamespaceId(args, config);
 
             const accountId = await requireAuth(config);
 
-            const results = await listNamespaceKeys(
+            const results = await listKVNamespaceKeys(
               accountId,
               namespaceId,
               prefix
@@ -2221,11 +2218,11 @@ export async function main(argv: string[]): Promise<void> {
           },
           async ({ key, ...args }) => {
             const config = readConfig(args.config as ConfigPath, args);
-            const namespaceId = getNamespaceId(args, config);
+            const namespaceId = getKVNamespaceId(args, config);
 
             const accountId = await requireAuth(config);
 
-            logger.log(await getKeyValue(accountId, namespaceId, key));
+            logger.log(await getKVKeyValue(accountId, namespaceId, key));
           }
         )
         .command(
@@ -2263,7 +2260,7 @@ export async function main(argv: string[]): Promise<void> {
           async ({ key, ...args }) => {
             await printWranglerBanner();
             const config = readConfig(args.config as ConfigPath, args);
-            const namespaceId = getNamespaceId(args, config);
+            const namespaceId = getKVNamespaceId(args, config);
 
             logger.log(
               `Deleting the key "${key}" on namespace ${namespaceId}.`
@@ -2271,12 +2268,7 @@ export async function main(argv: string[]): Promise<void> {
 
             const accountId = await requireAuth(config);
 
-            await fetchResult(
-              `/accounts/${accountId}/storage/kv/namespaces/${namespaceId}/values/${encodeURIComponent(
-                key
-              )}`,
-              { method: "DELETE" }
-            );
+            await deleteKVKeyValue(accountId, namespaceId, key);
           }
         );
     }
@@ -2328,7 +2320,7 @@ export async function main(argv: string[]): Promise<void> {
             // but we'll do that in the future if needed.
 
             const config = readConfig(args.config as ConfigPath, args);
-            const namespaceId = getNamespaceId(args, config);
+            const namespaceId = getKVNamespaceId(args, config);
             const content = parseJSON(readFileSync(filename), filename);
 
             if (!Array.isArray(content)) {
@@ -2348,12 +2340,12 @@ export async function main(argv: string[]): Promise<void> {
                     keyValue
                   )}`
                 );
-              } else if (!isKeyValue(keyValue)) {
+              } else if (!isKVKeyValue(keyValue)) {
                 errors.push(
                   `The item at index ${i} is ${JSON.stringify(keyValue)}`
                 );
               } else {
-                const props = unexpectedKeyValueProps(keyValue);
+                const props = unexpectedKVKeyValueProps(keyValue);
                 if (props.length > 0) {
                   warnings.push(
                     `The item at index ${i} contains unexpected properties: ${JSON.stringify(
@@ -2386,7 +2378,7 @@ export async function main(argv: string[]): Promise<void> {
             }
 
             const accountId = await requireAuth(config);
-            await putBulkKeyValue(
+            await putKVBulkKeyValue(
               accountId,
               namespaceId,
               content,
@@ -2438,7 +2430,7 @@ export async function main(argv: string[]): Promise<void> {
           async ({ filename, ...args }) => {
             await printWranglerBanner();
             const config = readConfig(args.config as ConfigPath, args);
-            const namespaceId = getNamespaceId(args, config);
+            const namespaceId = getKVNamespaceId(args, config);
 
             if (!args.force) {
               const result = await confirm(
@@ -2483,7 +2475,7 @@ export async function main(argv: string[]): Promise<void> {
 
             const accountId = await requireAuth(config);
 
-            await deleteBulkKeyValue(
+            await deleteKVBulkKeyValue(
               accountId,
               namespaceId,
               content,

package/src/kv.ts

@@ -19,7 +19,7 @@ type KvArgs = {
  *
  * @returns the generated id of the created namespace.
  */
-export async function createNamespace(
+export async function createKVNamespace(
   accountId: string,
   title: string
 ): Promise<string> {
@@ -51,7 +51,7 @@ export interface KVNamespaceInfo {
 /**
  * Fetch a list of all the namespaces under the given `accountId`.
  */
-export async function listNamespaces(
+export async function listKVNamespaces(
   accountId: string
 ): Promise<KVNamespaceInfo[]> {
   const pageSize = 100;
@@ -83,7 +83,7 @@ export interface NamespaceKeyInfo {
   metadata?: { [key: string]: unknown };
 }
 
-export async function listNamespaceKeys(
+export async function listKVNamespaceKeys(
   accountId: string,
   namespaceId: string,
   prefix = ""
@@ -95,6 +95,16 @@ export async function listNamespaceKeys(
   );
 }
 
+export async function deleteKVNamespace(
+  accountId: string,
+  namespaceId: string
+) {
+  return await fetchResult<{ id: string }>(
+    `/accounts/${accountId}/storage/kv/namespaces/${namespaceId}`,
+    { method: "DELETE" }
+  );
+}
+
 /**
  * Information about a key-value pair, including its "metadata" fields.
  */
@@ -119,7 +129,7 @@ const KeyValueKeys = new Set([
 /**
  * Is the given object a valid `KeyValue` type?
  */
-export function isKeyValue(keyValue: object): keyValue is KeyValue {
+export function isKVKeyValue(keyValue: object): keyValue is KeyValue {
   const props = Object.keys(keyValue);
   if (!props.includes("key") || !props.includes("value")) {
     return false;
@@ -130,12 +140,12 @@ export function isKeyValue(keyValue: object): keyValue is KeyValue {
 /**
  * Get all the properties on the `keyValue` that are not expected.
  */
-export function unexpectedKeyValueProps(keyValue: KeyValue): string[] {
+export function unexpectedKVKeyValueProps(keyValue: KeyValue): string[] {
   const props = Object.keys(keyValue);
   return props.filter((prop) => !KeyValueKeys.has(prop));
 }
 
-export async function putKeyValue(
+export async function putKVKeyValue(
   accountId: string,
   namespaceId: string,
   keyValue: KeyValue
@@ -159,15 +169,28 @@ export async function putKeyValue(
   );
 }
 
-export async function getKeyValue(
+export async function getKVKeyValue(
   accountId: string,
   namespaceId: string,
   key: string
 ): Promise<string> {
-  return await fetchKVGetValue(accountId, namespaceId, key);
+  return await fetchKVGetValue(accountId, namespaceId, encodeURIComponent(key));
+}
+
+export async function deleteKVKeyValue(
+  accountId: string,
+  namespaceId: string,
+  key: string
+) {
+  return await fetchResult(
+    `/accounts/${accountId}/storage/kv/namespaces/${namespaceId}/values/${encodeURIComponent(
+      key
+    )}`,
+    { method: "DELETE" }
+  );
 }
 
-export async function putBulkKeyValue(
+export async function putKVBulkKeyValue(
   accountId: string,
   namespaceId: string,
   keyValues: KeyValue[],
@@ -192,7 +215,7 @@ export async function putBulkKeyValue(
   }
 }
 
-export async function deleteBulkKeyValue(
+export async function deleteKVBulkKeyValue(
   accountId: string,
   namespaceId: string,
   keys: string[],
@@ -217,7 +240,7 @@ export async function deleteBulkKeyValue(
   }
 }
 
-export function getNamespaceId(
+export function getKVNamespaceId(
   { preview, binding, "namespace-id": namespaceId }: KvArgs,
   config: Config
 ): string {
@@ -312,7 +335,7 @@ export function getNamespaceId(
 /**
  * KV namespace binding names must be valid JS identifiers.
  */
-export function isValidNamespaceBinding(
+export function isValidKVNamespaceBinding(
   binding: string | undefined
 ): binding is string {
   return (

package/src/sites.tsx

@@ -3,11 +3,11 @@ import * as path from "node:path";
 import ignore from "ignore";
 import xxhash from "xxhash-wasm";
 import {
-  createNamespace,
-  listNamespaceKeys,
-  listNamespaces,
-  putBulkKeyValue,
-  deleteBulkKeyValue,
+  createKVNamespace,
+  listKVNamespaceKeys,
+  listKVNamespaces,
+  putKVBulkKeyValue,
+  deleteKVBulkKeyValue,
 } from "./kv";
 import { logger } from "./logger";
 import type { Config } from "./config";
@@ -75,14 +75,14 @@ async function createKVNamespaceIfNotAlreadyExisting(
 ) {
   // check if it already exists
   // TODO: this is super inefficient, should be made better
-  const namespaces = await listNamespaces(accountId);
+  const namespaces = await listKVNamespaces(accountId);
   const found = namespaces.find((x) => x.title === title);
   if (found) {
     return { created: false, id: found.id };
   }
 
   // else we make the namespace
-  const id = await createNamespace(accountId, title);
+  const id = await createKVNamespace(accountId, title);
   logger.log(`🌀 Created namespace for Workers Site "${title}"`);
 
   return {
@@ -131,7 +131,7 @@ export async function syncAssets(
   );
 
   // let's get all the keys in this namespace
-  const namespaceKeysResponse = await listNamespaceKeys(accountId, namespace);
+  const namespaceKeysResponse = await listKVNamespaceKeys(accountId, namespace);
   const namespaceKeys = new Set(namespaceKeysResponse.map((x) => x.name));
 
   const manifest: Record<string, string> = {};
@@ -185,9 +185,9 @@ export async function syncAssets(
 
   await Promise.all([
     // upload all the new assets
-    putBulkKeyValue(accountId, namespace, toUpload, () => {}),
+    putKVBulkKeyValue(accountId, namespace, toUpload, () => {}),
     // delete all the unused assets
-    deleteBulkKeyValue(
+    deleteKVBulkKeyValue(
       accountId,
       namespace,
       Array.from(namespaceKeys),

package/wrangler-dist/cli.js

@@ -104962,7 +104962,7 @@ var yargs_default = Yargs;
 
 // package.json
 var name = "wrangler";
-var version = "2.0.3";
+var version = "2.0.5";
 var author = "wrangler@cloudflare.com";
 var description = "Command-line interface for all things Cloudflare Workers";
 var bin = {
@@ -108538,7 +108538,7 @@ init_import_meta_url();
 var import_node_url10 = require("node:url");
 var API_MAX = 1e4;
 var BATCH_KEY_MAX = API_MAX / 2;
-async function createNamespace(accountId, title) {
+async function createKVNamespace(accountId, title) {
   const response = await fetchResult(`/accounts/${accountId}/storage/kv/namespaces`, {
     method: "POST",
     headers: {
@@ -108550,7 +108550,7 @@ async function createNamespace(accountId, title) {
   });
   return response.id;
 }
-async function listNamespaces(accountId) {
+async function listKVNamespaces(accountId) {
   const pageSize = 100;
   let page = 1;
   const results = [];
@@ -108569,9 +108569,12 @@ async function listNamespaces(accountId) {
   }
   return results;
 }
-async function listNamespaceKeys(accountId, namespaceId, prefix2 = "") {
+async function listKVNamespaceKeys(accountId, namespaceId, prefix2 = "") {
   return await fetchListResult(`/accounts/${accountId}/storage/kv/namespaces/${namespaceId}/keys`, {}, new import_node_url10.URLSearchParams({ prefix: prefix2 }));
 }
+async function deleteKVNamespace(accountId, namespaceId) {
+  return await fetchResult(`/accounts/${accountId}/storage/kv/namespaces/${namespaceId}`, { method: "DELETE" });
+}
 var KeyValueKeys = /* @__PURE__ */ new Set([
   "key",
   "value",
@@ -108580,18 +108583,18 @@ var KeyValueKeys = /* @__PURE__ */ new Set([
   "metadata",
   "base64"
 ]);
-function isKeyValue(keyValue) {
+function isKVKeyValue(keyValue) {
   const props = Object.keys(keyValue);
   if (!props.includes("key") || !props.includes("value")) {
     return false;
   }
   return true;
 }
-function unexpectedKeyValueProps(keyValue) {
+function unexpectedKVKeyValueProps(keyValue) {
   const props = Object.keys(keyValue);
   return props.filter((prop) => !KeyValueKeys.has(prop));
 }
-async function putKeyValue(accountId, namespaceId, keyValue) {
+async function putKVKeyValue(accountId, namespaceId, keyValue) {
   let searchParams;
   if (keyValue.expiration || keyValue.expiration_ttl) {
     searchParams = new import_node_url10.URLSearchParams();
@@ -108604,10 +108607,13 @@ async function putKeyValue(accountId, namespaceId, keyValue) {
   }
   return await fetchResult(`/accounts/${accountId}/storage/kv/namespaces/${namespaceId}/values/${encodeURIComponent(keyValue.key)}`, { method: "PUT", body: keyValue.value }, searchParams);
 }
-async function getKeyValue(accountId, namespaceId, key2) {
-  return await fetchKVGetValue(accountId, namespaceId, key2);
+async function getKVKeyValue(accountId, namespaceId, key2) {
+  return await fetchKVGetValue(accountId, namespaceId, encodeURIComponent(key2));
+}
+async function deleteKVKeyValue(accountId, namespaceId, key2) {
+  return await fetchResult(`/accounts/${accountId}/storage/kv/namespaces/${namespaceId}/values/${encodeURIComponent(key2)}`, { method: "DELETE" });
 }
-async function putBulkKeyValue(accountId, namespaceId, keyValues, progressCallback) {
+async function putKVBulkKeyValue(accountId, namespaceId, keyValues, progressCallback) {
   for (let index = 0; index < keyValues.length; index += BATCH_KEY_MAX) {
     if (progressCallback && keyValues.length > BATCH_KEY_MAX) {
       progressCallback(index, keyValues.length);
@@ -108622,7 +108628,7 @@ async function putBulkKeyValue(accountId, namespaceId, keyValues, progressCallba
     progressCallback(keyValues.length, keyValues.length);
   }
 }
-async function deleteBulkKeyValue(accountId, namespaceId, keys, progressCallback) {
+async function deleteKVBulkKeyValue(accountId, namespaceId, keys, progressCallback) {
   for (let index = 0; index < keys.length; index += BATCH_KEY_MAX) {
     if (progressCallback && keys.length > BATCH_KEY_MAX) {
       progressCallback(index, keys.length);
@@ -108637,7 +108643,7 @@ async function deleteBulkKeyValue(accountId, namespaceId, keys, progressCallback
     progressCallback(keys.length, keys.length);
   }
 }
-function getNamespaceId({ preview, binding, "namespace-id": namespaceId }, config) {
+function getKVNamespaceId({ preview, binding, "namespace-id": namespaceId }, config) {
   if (namespaceId) {
     return namespaceId;
   }
@@ -108678,7 +108684,7 @@ function getNamespaceId({ preview, binding, "namespace-id": namespaceId }, confi
   }
   return namespaceId;
 }
-function isValidNamespaceBinding(binding) {
+function isValidKVNamespaceBinding(binding) {
   return typeof binding === "string" && /^[a-zA-Z_][a-zA-Z0-9_]*$/.test(binding);
 }
 
@@ -108714,12 +108720,12 @@ function hashAsset(hasher, filePath, content) {
   return urlSafe(path13.join(directory, `${baseName}.${hash2}${extName}`));
 }
 async function createKVNamespaceIfNotAlreadyExisting(title, accountId) {
-  const namespaces = await listNamespaces(accountId);
+  const namespaces = await listKVNamespaces(accountId);
   const found = namespaces.find((x) => x.title === title);
   if (found) {
     return { created: false, id: found.id };
   }
-  const id = await createNamespace(accountId, title);
+  const id = await createKVNamespace(accountId, title);
   logger.log(`\u{1F300} Created namespace for Workers Site "${title}"`);
   return {
     created: true,
@@ -108736,7 +108742,7 @@ async function syncAssets(accountId, scriptName, siteAssets, preview, dryRun) {
   }
   const title = `__${scriptName}-workers_sites_assets${preview ? "_preview" : ""}`;
   const { id: namespace } = await createKVNamespaceIfNotAlreadyExisting(title, accountId);
-  const namespaceKeysResponse = await listNamespaceKeys(accountId, namespace);
+  const namespaceKeysResponse = await listKVNamespaceKeys(accountId, namespace);
   const namespaceKeys = new Set(namespaceKeysResponse.map((x) => x.name));
   const manifest = {};
   const toUpload = [];
@@ -108774,9 +108780,9 @@ async function syncAssets(accountId, scriptName, siteAssets, preview, dryRun) {
     logger.log(`Deleting ${key2} from the asset store...`);
   }
   await Promise.all([
-    putBulkKeyValue(accountId, namespace, toUpload, () => {
+    putKVBulkKeyValue(accountId, namespace, toUpload, () => {
     }),
-    deleteBulkKeyValue(accountId, namespace, Array.from(namespaceKeys), () => {
+    deleteKVBulkKeyValue(accountId, namespace, Array.from(namespaceKeys), () => {
     })
   ]);
   logger.log("\u2197\uFE0F  Done syncing assets");
@@ -112881,7 +112887,7 @@ ${shouldDo}`);
       });
     }, async (args) => {
       await printWranglerBanner();
-      if (!isValidNamespaceBinding(args.namespace)) {
+      if (!isValidKVNamespaceBinding(args.namespace)) {
         throw new CommandLineArgsError(`The namespace binding name "${args.namespace}" is invalid. It can only have alphanumeric and _ characters, and cannot begin with a number.`);
       }
       const config = readConfig(args.config, args);
@@ -112894,7 +112900,7 @@ ${shouldDo}`);
       const title = `${name2}${environment}-${args.namespace}${preview}`;
       const accountId = await requireAuth(config);
       logger.log(`\u{1F300} Creating namespace with title "${title}"`);
-      const namespaceId = await createNamespace(accountId, title);
+      const namespaceId = await createKVNamespace(accountId, title);
       logger.log("\u2728 Success!");
       const envString = args.env ? ` under [env.${args.env}]` : "";
       const previewString = args.preview ? "preview_" : "";
@@ -112903,7 +112909,7 @@ ${shouldDo}`);
     }).command("list", "Outputs a list of all KV namespaces associated with your account id.", {}, async (args) => {
       const config = readConfig(args.config, args);
       const accountId = await requireAuth(config);
-      logger.log(JSON.stringify(await listNamespaces(accountId), null, "  "));
+      logger.log(JSON.stringify(await listKVNamespaces(accountId), null, "  "));
     }).command("delete", "Deletes a given namespace.", (yargs) => {
       return yargs.option("binding", {
         type: "string",
@@ -112927,12 +112933,12 @@ ${shouldDo}`);
       const config = readConfig(args.config, args);
       let id;
       try {
-        id = getNamespaceId(args, config);
+        id = getKVNamespaceId(args, config);
       } catch (e2) {
         throw new CommandLineArgsError("Not able to delete namespace.\n" + (e2.message ?? e2));
       }
       const accountId = await requireAuth(config);
-      await fetchResult(`/accounts/${accountId}/storage/kv/namespaces/${encodeURIComponent(id)}`, { method: "DELETE" });
+      await deleteKVNamespace(accountId, id);
     });
   });
   wrangler.command("kv:key", "\u{1F511} Individually manage Workers KV key-value pairs", (kvKeyYargs) => {
@@ -112974,7 +112980,7 @@ ${shouldDo}`);
     }, async ({ key: key2, ttl, expiration, ...args }) => {
       await printWranglerBanner();
       const config = readConfig(args.config, args);
-      const namespaceId = getNamespaceId(args, config);
+      const namespaceId = getKVNamespaceId(args, config);
       const value = args.path ? readFileSync5(args.path) : args.value;
       if (args.path) {
         logger.log(`Writing the contents of ${args.path} to the key "${key2}" on namespace ${namespaceId}.`);
@@ -112982,7 +112988,7 @@ ${shouldDo}`);
         logger.log(`Writing the value "${value}" to key "${key2}" on namespace ${namespaceId}.`);
       }
       const accountId = await requireAuth(config);
-      await putKeyValue(accountId, namespaceId, {
+      await putKVKeyValue(accountId, namespaceId, {
         key: key2,
         value,
         expiration,
@@ -113013,9 +113019,9 @@ ${shouldDo}`);
       });
     }, async ({ prefix: prefix2, ...args }) => {
       const config = readConfig(args.config, args);
-      const namespaceId = getNamespaceId(args, config);
+      const namespaceId = getKVNamespaceId(args, config);
       const accountId = await requireAuth(config);
-      const results = await listNamespaceKeys(accountId, namespaceId, prefix2);
+      const results = await listKVNamespaceKeys(accountId, namespaceId, prefix2);
       logger.log(JSON.stringify(results, void 0, 2));
     }).command("get <key>", "Reads a single value by key from the given namespace.", (yargs) => {
       return yargs.positional("key", {
@@ -113045,9 +113051,9 @@ ${shouldDo}`);
       });
     }, async ({ key: key2, ...args }) => {
       const config = readConfig(args.config, args);
-      const namespaceId = getNamespaceId(args, config);
+      const namespaceId = getKVNamespaceId(args, config);
       const accountId = await requireAuth(config);
-      logger.log(await getKeyValue(accountId, namespaceId, key2));
+      logger.log(await getKVKeyValue(accountId, namespaceId, key2));
     }).command("delete <key>", "Removes a single key value pair from the given namespace.", (yargs) => {
       return yargs.positional("key", {
         describe: "The key value to delete",
@@ -113073,10 +113079,10 @@ ${shouldDo}`);
     }, async ({ key: key2, ...args }) => {
       await printWranglerBanner();
       const config = readConfig(args.config, args);
-      const namespaceId = getNamespaceId(args, config);
+      const namespaceId = getKVNamespaceId(args, config);
       logger.log(`Deleting the key "${key2}" on namespace ${namespaceId}.`);
       const accountId = await requireAuth(config);
-      await fetchResult(`/accounts/${accountId}/storage/kv/namespaces/${namespaceId}/values/${encodeURIComponent(key2)}`, { method: "DELETE" });
+      await deleteKVKeyValue(accountId, namespaceId, key2);
     });
   });
   wrangler.command("kv:bulk", "\u{1F4AA} Interact with multiple Workers KV key-value pairs at once", (kvBulkYargs) => {
@@ -113105,7 +113111,7 @@ ${shouldDo}`);
     }, async ({ filename, ...args }) => {
       await printWranglerBanner();
       const config = readConfig(args.config, args);
-      const namespaceId = getNamespaceId(args, config);
+      const namespaceId = getKVNamespaceId(args, config);
       const content = parseJSON(readFileSync5(filename), filename);
       if (!Array.isArray(content)) {
         throw new Error(`Unexpected JSON input from "${filename}".
@@ -113117,10 +113123,10 @@ Expected an array of key-value objects but got type "${typeof content}".`);
         const keyValue = content[i2];
         if (typeof keyValue !== "object") {
           errors.push(`The item at index ${i2} is type: "${typeof keyValue}" - ${JSON.stringify(keyValue)}`);
-        } else if (!isKeyValue(keyValue)) {
+        } else if (!isKVKeyValue(keyValue)) {
           errors.push(`The item at index ${i2} is ${JSON.stringify(keyValue)}`);
         } else {
-          const props = unexpectedKeyValueProps(keyValue);
+          const props = unexpectedKVKeyValueProps(keyValue);
           if (props.length > 0) {
             warnings.push(`The item at index ${i2} contains unexpected properties: ${JSON.stringify(props)}.`);
           }
@@ -113146,7 +113152,7 @@ interface KeyValue {
 ` + errors.join("\n"));
       }
       const accountId = await requireAuth(config);
-      await putBulkKeyValue(accountId, namespaceId, content, (index, total) => {
+      await putKVBulkKeyValue(accountId, namespaceId, content, (index, total) => {
         logger.log(`Uploaded ${index} of ${total}.`);
       });
       logger.log("Success!");
@@ -113179,7 +113185,7 @@ interface KeyValue {
     }, async ({ filename, ...args }) => {
       await printWranglerBanner();
       const config = readConfig(args.config, args);
-      const namespaceId = getNamespaceId(args, config);
+      const namespaceId = getKVNamespaceId(args, config);
       if (!args.force) {
         const result = await confirm(`Are you sure you want to delete all the keys read from "${filename}" from kv-namespace with id "${namespaceId}"?`);
         if (!result) {
@@ -113206,7 +113212,7 @@ Expected an array of strings.
 ` + errors.join("\n"));
       }
       const accountId = await requireAuth(config);
-      await deleteBulkKeyValue(accountId, namespaceId, content, (index, total) => {
+      await deleteKVBulkKeyValue(accountId, namespaceId, content, (index, total) => {
         logger.log(`Deleted ${index} of ${total}.`);
       });
       logger.log("Success!");