wrangler 0.0.0-e9a1820 → 0.0.0-e9ab55a

package/src/index.tsx

@@ -6,6 +6,7 @@ import makeCLI from "yargs";
 import type Yargs from "yargs";
 import { findUp } from "find-up";
 import TOML from "@iarna/toml";
+import { normaliseAndValidateEnvironmentsConfig } from "./config";
 import type { Config } from "./config";
 import { confirm, prompt } from "./dialogs";
 import { version as wranglerVersion } from "../package.json";
@@ -30,7 +31,7 @@ import {
 
 import { pages } from "./pages";
 
-import cfetch from "./cfetch";
+import { fetchResult, fetchRaw } from "./cfetch";
 
 import publish from "./publish";
 import path from "path/posix";
@@ -43,6 +44,9 @@ import { setTimeout } from "node:timers/promises";
 import * as fs from "node:fs";
 import { execa } from "execa";
 
+const resetColor = "\x1b[0m";
+const fgGreenColor = "\x1b[32m";
+
 async function readConfig(configPath?: string): Promise<Config> {
   const config: Config = {};
   if (!configPath) {
@@ -56,48 +60,7 @@ async function readConfig(configPath?: string): Promise<Config> {
     Object.assign(config, parsed);
   }
 
-  const inheritedFields = [
-    "name",
-    "account_id",
-    "workers_dev",
-    "compatibility_date",
-    "compatibility_flags",
-    "zone_id",
-    "routes",
-    "route",
-    "jsx_factory",
-    "jsx_fragment",
-    "site",
-    "triggers",
-    "usage_model",
-  ];
-
-  Object.keys(config.env || {}).forEach((env) => {
-    inheritedFields.forEach((field) => {
-      if (config[field] !== undefined && config.env[env][field] === undefined) {
-        config.env[env][field] = config[field]; // TODO: - shallow copy?
-      }
-    });
-  });
-
-  const mirroredFields = [
-    "vars",
-    "kv_namespaces",
-    "durable_objects",
-    "experimental_services",
-  ];
-  Object.keys(config.env || {}).forEach((env) => {
-    mirroredFields.forEach((field) => {
-      // if it exists on top level, it should exist on env definitions
-      Object.keys(config[field] || {}).forEach((fieldKey) => {
-        if (!(fieldKey in config.env[env][field])) {
-          console.warn(
-            `In your configuration, "${field}.${fieldKey}" exists at a top level, but not on "env.${env}". This is not what you probably want, since the field "${field}" is not inherited by environments. Please add "${field}.${fieldKey}" to "env.${env}".`
-          );
-        }
-      });
-    });
-  });
+  normaliseAndValidateEnvironmentsConfig(config);
 
   if ("experimental_services" in config) {
     console.warn(
@@ -421,7 +384,11 @@ export async function main(argv: string[]): Promise<void> {
     "👂 Start a local server for developing your worker",
     (yargs) => {
       return yargs
-        .positional("filename", { describe: "entry point", type: "string" })
+        .positional("filename", {
+          describe: "entry point",
+          type: "string",
+          demandOption: true,
+        })
         .option("name", {
           describe: "name of the script",
           type: "string",
@@ -435,6 +402,20 @@ export async function main(argv: string[]): Promise<void> {
           type: "string",
           // TODO: get choices for the toml file?
         })
+        .option("compatibility-date", {
+          describe: "Date to use for compatibility checks",
+          type: "string",
+        })
+        .option("compatibility-flags", {
+          describe: "Flags to use for compatibility checks",
+          type: "array",
+          alias: "compatibility-flag",
+        })
+        .option("latest", {
+          describe: "Use the latest version of the worker runtime",
+          type: "boolean",
+          default: true,
+        })
         .option("ip", {
           describe: "IP address to listen on",
           type: "string",
@@ -455,7 +436,7 @@ export async function main(argv: string[]): Promise<void> {
           describe: "Protocol to listen to requests on, defaults to http.",
           choices: ["http", "https"],
         })
-        .option("public", {
+        .option("experimental-public", {
           describe: "Static assets to be served",
           type: "string",
         })
@@ -482,39 +463,51 @@ export async function main(argv: string[]): Promise<void> {
       const { filename, format } = args;
       const config = args.config as Config;
 
-      // -- snip, extract --
+      if (args["experimental-public"]) {
+        console.warn(
+          "🚨  The --experimental-public field is experimental and will change in the future."
+        );
+      }
+
+      if (args.public) {
+        throw new Error(
+          "🚨  The --public field has been renamed to --experimental-public, and will change behaviour in the future."
+        );
+      }
 
       if (!args.local) {
+        // -- snip, extract --
         const loggedIn = await loginOrRefreshIfRequired();
         if (!loggedIn) {
           // didn't login, let's just quit
           console.log("Did not login, quitting...");
           return;
         }
+
         if (!config.account_id) {
           config.account_id = await getAccountId();
           if (!config.account_id) {
             throw new Error("No account id found, quitting...");
           }
         }
+        // -- snip, end --
       }
 
-      // -- snip, end --
-
-      const envRootObj = args.env ? config.env[args.env] || {} : config;
+      const environments = config.env ?? {};
+      const envRootObj = args.env ? environments[args.env] || {} : config;
 
       // TODO: this error shouldn't actually happen,
       // but we haven't fixed it internally yet
       if ("durable_objects" in envRootObj) {
         if (!(args.name || config.name)) {
           console.warn(
-            'A worker with durable objects need to be named, or it may not work as expected. Add a "name" into wrangler.toml, or pass it in the command line with --name.'
+            'A worker with durable objects needs to be named, or it may not work as expected. Add a "name" into wrangler.toml, or pass it in the command line with --name.'
           );
         }
         // TODO: if not already published, publish a draft worker
       }
 
-      render(
+      const { waitUntilExit } = render(
         <Dev
           name={args.name || config.name}
           entry={path.relative(process.cwd(), filename)}
@@ -526,9 +519,16 @@ export async function main(argv: string[]): Promise<void> {
           accountId={config.account_id}
           site={args.site || config.site?.bucket}
           port={args.port || config.dev?.port}
-          public={args.public}
-          compatibilityDate={config.compatibility_date}
-          compatibilityFlags={config.compatibility_flags}
+          public={args["experimental-public"]}
+          compatibilityDate={
+            args["compatibility-date"] ||
+            config.compatibility_date ||
+            new Date().toISOString().substring(0, 10)
+          }
+          compatibilityFlags={
+            (args["compatibility-flags"] as string[]) ||
+            config.compatibility_flags
+          }
           usageModel={config.usage_model}
           bindings={{
             kv_namespaces: envRootObj.kv_namespaces?.map(
@@ -537,7 +537,7 @@ export async function main(argv: string[]): Promise<void> {
                 // `preview_id` instead of `id` so that they don't
                 // break production data. So here we check that a `preview_id`
                 // has actually been configured.
-                // This whole block of code will be obsolted in the future
+                // This whole block of code will be obsoleted in the future
                 // when we have copy-on-write for previews on edge workers.
                 if (!preview_id) {
                   // TODO: This error has to be a _lot_ better, ideally just asking
@@ -558,6 +558,7 @@ export async function main(argv: string[]): Promise<void> {
           }}
         />
       );
+      await waitUntilExit();
     }
   );
 
@@ -579,7 +580,21 @@ export async function main(argv: string[]): Promise<void> {
           describe: "name to use when uploading",
           type: "string",
         })
-        .option("public", {
+        .option("compatibility-date", {
+          describe: "Date to use for compatibility checks",
+          type: "string",
+        })
+        .option("compatibility-flags", {
+          describe: "Flags to use for compatibility checks",
+          type: "array",
+          alias: "compatibility-flag",
+        })
+        .option("latest", {
+          describe: "Use the latest version of the worker runtime",
+          type: "boolean",
+          default: false,
+        })
+        .option("experimental-public", {
           describe: "Static assets to be served",
           type: "string",
         })
@@ -618,36 +633,58 @@ export async function main(argv: string[]): Promise<void> {
           "🚫  Local publishing is not yet supported"
         );
       }
+
+      if (args["experimental-public"]) {
+        console.warn(
+          "🚨  The --experimental-public field is experimental and will change in the future."
+        );
+      }
+      if (args.public) {
+        throw new Error(
+          "🚨  The --public field has been renamed to --experimental-public, and will change behaviour in the future."
+        );
+      }
+
       const config = args.config as Config;
 
-      // -- snip, extract --
+      if (args.latest) {
+        console.warn(
+          "⚠️  Using the latest version of the Workers runtime. To silence this warning, please choose a specific version of the runtime with --compatibility-date, or add a compatibility_date to your wrangler.toml.\n"
+        );
+      }
+
       if (!args.local) {
+        // -- snip, extract --
         const loggedIn = await loginOrRefreshIfRequired();
         if (!loggedIn) {
           // didn't login, let's just quit
           console.log("Did not login, quitting...");
           return;
         }
+
         if (!config.account_id) {
           config.account_id = await getAccountId();
           if (!config.account_id) {
             throw new Error("No account id found, quitting...");
           }
         }
+        // -- snip, end --
       }
 
-      // -- snip, end --
-
       await publish({
         config: args.config as Config,
         name: args.name,
         script: args.script,
         env: args.env,
+        compatibilityDate: args.latest
+          ? new Date().toISOString().substring(0, 10)
+          : args["compatibility-date"],
+        compatibilityFlags: args["compatibility-flags"] as string[],
         triggers: args.triggers,
         jsxFactory: args["jsx-factory"],
         jsxFragment: args["jsx-fragment"],
         routes: args.routes,
-        public: args.public,
+        public: args["experimental-public"],
         site: args.site,
       });
     }
@@ -698,6 +735,12 @@ export async function main(argv: string[]): Promise<void> {
       // TODO: filter by client ip, which can be 'self' or an ip address
     },
     async (args) => {
+      if (args.local) {
+        throw new NotImplementedError(
+          `local mode is not yet supported for this command`
+        );
+      }
+
       const config = args.config as Config;
 
       if (!(args.name || config.name)) {
@@ -708,22 +751,19 @@ export async function main(argv: string[]): Promise<void> {
       }`;
 
       // -- snip, extract --
+      const loggedIn = await loginOrRefreshIfRequired();
+      if (!loggedIn) {
+        // didn't login, let's just quit
+        console.log("Did not login, quitting...");
+        return;
+      }
 
-      if (!args.local) {
-        const loggedIn = await loginOrRefreshIfRequired();
-        if (!loggedIn) {
-          // didn't login, let's just quit
-          console.log("Did not login, quitting...");
-          return;
-        }
+      if (!config.account_id) {
+        config.account_id = await getAccountId();
         if (!config.account_id) {
-          config.account_id = await getAccountId();
-          if (!config.account_id) {
-            throw new Error("No account id found, quitting...");
-          }
+          throw new Error("No account id found, quitting...");
         }
       }
-
       // -- snip, end --
 
       const accountId = config.account_id;
@@ -836,7 +876,7 @@ export async function main(argv: string[]): Promise<void> {
               throw new Error("missing zone id");
             }
 
-            console.log(await cfetch(`/zones/${zone}/workers/routes`));
+            console.log(await fetchResult(`/zones/${zone}/workers/routes`));
           }
         )
         .command(
@@ -866,7 +906,7 @@ export async function main(argv: string[]): Promise<void> {
             }
 
             console.log(
-              await cfetch(`/zones/${zone}/workers/routes/${args.id}`, {
+              await fetchResult(`/zones/${zone}/workers/routes/${args.id}`, {
                 method: "DELETE",
               })
             );
@@ -929,31 +969,30 @@ export async function main(argv: string[]): Promise<void> {
               throw new Error("Missing script name");
             }
 
-            // -- snip, extract --
-
             if (!args.local) {
+              // -- snip, extract --
               const loggedIn = await loginOrRefreshIfRequired();
               if (!loggedIn) {
                 // didn't login, let's just quit
                 console.log("Did not login, quitting...");
                 return;
               }
+
               if (!config.account_id) {
                 config.account_id = await getAccountId();
                 if (!config.account_id) {
                   throw new Error("No account id found, quitting...");
                 }
               }
+              // -- snip, end --
             }
 
-            // -- snip, end --
-
             const secretValue = await prompt(
               "Enter a secret value:",
               "password"
             );
             async function submitSecret() {
-              return await cfetch(
+              return await fetchResult(
                 `/accounts/${config.account_id}/workers/scripts/${scriptName}/secrets/`,
                 {
                   method: "PUT",
@@ -972,7 +1011,7 @@ export async function main(argv: string[]): Promise<void> {
             } catch (e) {
               if (e.code === 10007) {
                 // upload a draft worker
-                await cfetch(
+                await fetchResult(
                   `/accounts/${config.account_id}/workers/scripts/${scriptName}`,
                   {
                     method: "PUT",
@@ -1033,32 +1072,31 @@ export async function main(argv: string[]): Promise<void> {
               throw new Error("Missing script name");
             }
 
-            // -- snip, extract --
-
             if (!args.local) {
+              // -- snip, extract --
               const loggedIn = await loginOrRefreshIfRequired();
               if (!loggedIn) {
                 // didn't login, let's just quit
                 console.log("Did not login, quitting...");
                 return;
               }
+
               if (!config.account_id) {
                 config.account_id = await getAccountId();
                 if (!config.account_id) {
                   throw new Error("No account id found, quitting...");
                 }
               }
+              // -- snip, end --
             }
 
-            // -- snip, end --
-
             if (await confirm("Are you sure you want to delete this secret?")) {
               console.log(
                 `Deleting the secret ${args.key} on script ${scriptName}.`
               );
 
               console.log(
-                await cfetch(
+                await fetchResult(
                   `/accounts/${config.account_id}/workers/scripts/${scriptName}/secrets/${args.key}`,
                   { method: "DELETE" }
                 )
@@ -1095,27 +1133,26 @@ export async function main(argv: string[]): Promise<void> {
               throw new Error("Missing script name");
             }
 
-            // -- snip, extract --
-
             if (!args.local) {
+              // -- snip, extract --
               const loggedIn = await loginOrRefreshIfRequired();
               if (!loggedIn) {
                 // didn't login, let's just quit
                 console.log("Did not login, quitting...");
                 return;
               }
+
               if (!config.account_id) {
                 config.account_id = await getAccountId();
                 if (!config.account_id) {
                   throw new Error("No account id found, quitting...");
                 }
               }
+              // -- snip, end --
             }
 
-            // -- snip, end --
-
             console.log(
-              await cfetch(
+              await fetchResult(
                 `/accounts/${config.account_id}/workers/scripts/${scriptName}/secrets`
               )
             );
@@ -1139,6 +1176,7 @@ export async function main(argv: string[]): Promise<void> {
               .positional("namespace", {
                 describe: "The name of the new namespace",
                 type: "string",
+                demandOption: true,
               })
               .option("env", {
                 type: "string",
@@ -1184,44 +1222,43 @@ export async function main(argv: string[]): Promise<void> {
               });
               await mf.getKVNamespace(title); // this should "create" the namespace
               console.log(`✨ Success! Created KV namespace ${title}`);
-              return;
-            }
-
-            // -- snip, extract --
-
-            if (!args.local) {
+            } else {
+              // -- snip, extract --
               const loggedIn = await loginOrRefreshIfRequired();
               if (!loggedIn) {
                 // didn't login, let's just quit
                 console.log("Did not login, quitting...");
                 return;
               }
+
               if (!config.account_id) {
                 config.account_id = await getAccountId();
                 if (!config.account_id) {
                   throw new Error("No account id found, quitting...");
                 }
               }
-            }
+              // -- snip, end --
 
-            // -- snip, end --
+              // TODO: generate a binding name stripping non alphanumeric chars
 
-            // TODO: generate a binding name stripping non alphanumeric chars
-
-            console.log(`🌀 Creating namespace with title "${title}"`);
-            const namespaceId = await createNamespace(config.account_id, title);
+              console.log(`🌀 Creating namespace with title "${title}"`);
+              const namespaceId = await createNamespace(
+                config.account_id,
+                title
+              );
 
-            console.log("✨ Success!");
-            const envString = args.env ? ` under [env.${args.env}]` : "";
-            const previewString = args.preview ? "preview_" : "";
-            console.log(
-              `Add the following to your configuration file in your kv_namespaces array${envString}:`
-            );
-            console.log(
-              `{ binding = "${args.namespace}", ${previewString}id = "${namespaceId}" }`
-            );
+              console.log("✨ Success!");
+              const envString = args.env ? ` under [env.${args.env}]` : "";
+              const previewString = args.preview ? "preview_" : "";
+              console.log(
+                `Add the following to your configuration file in your kv_namespaces array${envString}:`
+              );
+              console.log(
+                `{ binding = "${args.namespace}", ${previewString}id = "${namespaceId}" }`
+              );
 
-            // TODO: automatically write this block to the wrangler.toml config file??
+              // TODO: automatically write this block to the wrangler.toml config file??
+            }
           }
         )
         .command(
@@ -1229,42 +1266,39 @@ export async function main(argv: string[]): Promise<void> {
           "Outputs a list of all KV namespaces associated with your account id.",
           {},
           async (args) => {
+            const config = args.config as Config;
+
             if (args.local) {
               throw new NotImplementedError(
                 `local mode is not yet supported for this command`
               );
-            }
-
-            const config = args.config as Config;
-
-            // -- snip, extract --
-
-            if (!args.local) {
+            } else {
+              // -- snip, extract --
               const loggedIn = await loginOrRefreshIfRequired();
               if (!loggedIn) {
                 // didn't login, let's just quit
                 console.log("Did not login, quitting...");
                 return;
               }
+
               if (!config.account_id) {
                 config.account_id = await getAccountId();
                 if (!config.account_id) {
                   throw new Error("No account id found, quitting...");
                 }
               }
-            }
+              // -- snip, end --
 
-            // -- snip, end --
+              // TODO: we should show bindings if they exist for given ids
 
-            // TODO: we should show bindings if they exist for given ids
-
-            console.log(
-              JSON.stringify(
-                await listNamespaces(config.account_id),
-                null,
-                "  "
-              )
-            );
+              console.log(
+                JSON.stringify(
+                  await listNamespaces(config.account_id),
+                  null,
+                  "  "
+                )
+              );
+            }
           }
         )
         .command(
@@ -1291,31 +1325,23 @@ export async function main(argv: string[]): Promise<void> {
               });
           },
           async (args) => {
+            const config = args.config as Config;
+
             if (args.local) {
               throw new NotImplementedError(
                 `local mode is not yet supported for this command`
               );
-            }
-            const config = args.config as Config;
-
-            const id =
-              args["namespace-id"] ||
-              (args.env
-                ? config.env[args.env] || {}
-                : config
-              ).kv_namespaces.find(
-                (namespace) => namespace.binding === args.binding
-              )?.[args.preview ? "preview_id" : "id"];
-            if (!id) {
-              throw new CommandLineArgsError(
-                "Not able to delete namespace.\n" +
-                  `A namespace with binding name "${args.binding}" was not found in the configured "kv_namespaces".`
-              );
-            }
-
-            // -- snip, extract --
+            } else {
+              let id;
+              try {
+                id = getNamespaceId(args);
+              } catch (e) {
+                throw new CommandLineArgsError(
+                  "Not able to delete namespace.\n" + e.message
+                );
+              }
 
-            if (!args.local) {
+              // -- snip, extract --
               const loggedIn = await loginOrRefreshIfRequired();
               if (!loggedIn) {
                 // didn't login, let's just quit
@@ -1329,32 +1355,31 @@ export async function main(argv: string[]): Promise<void> {
                   throw new Error("No account id found, quitting...");
                 }
               }
-            }
-
-            // -- snip, end --
+              // -- snip, end --
 
-            await cfetch<{ id: string }>(
-              `/accounts/${config.account_id}/storage/kv/namespaces/${id}`,
-              { method: "DELETE" }
-            );
+              await fetchResult<{ id: string }>(
+                `/accounts/${config.account_id}/storage/kv/namespaces/${id}`,
+                { method: "DELETE" }
+              );
 
-            // TODO: recommend they remove it from wrangler.toml
+              // TODO: recommend they remove it from wrangler.toml
 
-            // test-mf wrangler kv:namespace delete --namespace-id 2a7d3d8b23fc4159b5afa489d6cfd388
-            // Are you sure you want to delete namespace 2a7d3d8b23fc4159b5afa489d6cfd388? [y/n]
-            // n
-            // 💁  Not deleting namespace 2a7d3d8b23fc4159b5afa489d6cfd388
-            // ➜  test-mf wrangler kv:namespace delete --namespace-id 2a7d3d8b23fc4159b5afa489d6cfd388
-            // Are you sure you want to delete namespace 2a7d3d8b23fc4159b5afa489d6cfd388? [y/n]
-            // y
-            // 🌀  Deleting namespace 2a7d3d8b23fc4159b5afa489d6cfd388
-            // ✨  Success
-            // ⚠️  Make sure to remove this "kv-namespace" entry from your configuration file!
-            // ➜  test-mf
+              // test-mf wrangler kv:namespace delete --namespace-id 2a7d3d8b23fc4159b5afa489d6cfd388
+              // Are you sure you want to delete namespace 2a7d3d8b23fc4159b5afa489d6cfd388? [y/n]
+              // n
+              // 💁  Not deleting namespace 2a7d3d8b23fc4159b5afa489d6cfd388
+              // ➜  test-mf wrangler kv:namespace delete --namespace-id 2a7d3d8b23fc4159b5afa489d6cfd388
+              // Are you sure you want to delete namespace 2a7d3d8b23fc4159b5afa489d6cfd388? [y/n]
+              // y
+              // 🌀  Deleting namespace 2a7d3d8b23fc4159b5afa489d6cfd388
+              // ✨  Success
+              // ⚠️  Make sure to remove this "kv-namespace" entry from your configuration file!
+              // ➜  test-mf
 
-            // TODO: do it automatically
+              // TODO: do it automatically
 
-            // TODO: delete the preview namespace as well?
+              // TODO: delete the preview namespace as well?
+            }
           }
         );
     }
@@ -1374,6 +1399,7 @@ export async function main(argv: string[]): Promise<void> {
               .positional("key", {
                 type: "string",
                 describe: "The key to write to.",
+                demandOption: true,
               })
               .positional("value", {
                 type: "string",
@@ -1413,9 +1439,11 @@ export async function main(argv: string[]): Promise<void> {
           },
           async ({ key, ttl, expiration, ...args }) => {
             const namespaceId = getNamespaceId(args);
+            // One of `args.path` and `args.value` must be defined
             const value = args.path
               ? await readFile(args.path, "utf-8")
-              : args.value;
+              : // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                args.value!;
             const config = args.config as Config;
 
             if (args.path) {
@@ -1437,11 +1465,8 @@ export async function main(argv: string[]): Promise<void> {
               });
               const ns = await mf.getKVNamespace(namespaceId);
               await ns.put(key, value, { expiration, expirationTtl: ttl });
-              return;
-            }
-            // -- snip, extract --
-
-            if (!args.local) {
+            } else {
+              // -- snip, extract --
               const loggedIn = await loginOrRefreshIfRequired();
               if (!loggedIn) {
                 // didn't login, let's just quit
@@ -1455,14 +1480,13 @@ export async function main(argv: string[]): Promise<void> {
                   throw new Error("No account id found, quitting...");
                 }
               }
-            }
-
-            // -- snip, end --
+              // -- snip, end --
 
-            await putKeyValue(config.account_id, namespaceId, key, value, {
-              expiration,
-              expiration_ttl: ttl,
-            });
+              await putKeyValue(config.account_id, namespaceId, key, value, {
+                expiration,
+                expiration_ttl: ttl,
+              });
+            }
           }
         )
         .command(
@@ -1483,6 +1507,12 @@ export async function main(argv: string[]): Promise<void> {
                 type: "string",
                 describe: "Perform on a specific environment",
               })
+              .option("preview", {
+                type: "boolean",
+                // In the case of listing keys we will default to non-preview mode
+                default: false,
+                describe: "Interact with a preview namespace",
+              })
               .option("prefix", {
                 type: "string",
                 describe: "A prefix to filter listed keys",
@@ -1504,12 +1534,8 @@ export async function main(argv: string[]): Promise<void> {
               const ns = await mf.getKVNamespace(namespaceId);
               const listResponse = await ns.list({ prefix });
               console.log(JSON.stringify(listResponse.keys, null, "  ")); // TODO: paginate, collate
-              return;
-            }
-
-            // -- snip, extract --
-
-            if (!args.local) {
+            } else {
+              // -- snip, extract --
               const loggedIn = await loginOrRefreshIfRequired();
               if (!loggedIn) {
                 // didn't login, let's just quit
@@ -1523,13 +1549,12 @@ export async function main(argv: string[]): Promise<void> {
                   throw new Error("No account id found, quitting...");
                 }
               }
-            }
+              // -- snip, end --
 
-            // -- snip, end --
-
-            console.log(
-              await listNamespaceKeys(config.account_id, namespaceId, prefix)
-            );
+              console.log(
+                await listNamespaceKeys(config.account_id, namespaceId, prefix)
+              );
+            }
           }
         )
         .command(
@@ -1540,6 +1565,7 @@ export async function main(argv: string[]): Promise<void> {
               .positional("key", {
                 describe: "The key value to get.",
                 type: "string",
+                demandOption: true,
               })
               .option("binding", {
                 type: "string",
@@ -1557,6 +1583,12 @@ export async function main(argv: string[]): Promise<void> {
               .option("preview", {
                 type: "boolean",
                 describe: "Interact with a preview namespace",
+              })
+              .option("preview", {
+                type: "boolean",
+                // In the case of getting key values we will default to non-preview mode
+                default: false,
+                describe: "Interact with a preview namespace",
               });
           },
           async ({ key, ...args }) => {
@@ -1575,9 +1607,8 @@ export async function main(argv: string[]): Promise<void> {
               return;
             }
 
-            // -- snip, extract --
-
             if (!args.local) {
+              // -- snip, extract --
               const loggedIn = await loginOrRefreshIfRequired();
               if (!loggedIn) {
                 // didn't login, let's just quit
@@ -1591,16 +1622,11 @@ export async function main(argv: string[]): Promise<void> {
                   throw new Error("No account id found, quitting...");
                 }
               }
+              // -- snip, end --
             }
 
-            // -- snip, end --
-
-            // annoyingly, the API for this one doesn't return the
-            // data in the 'standard' format. goddammit.
-            // That's why we have the fallthrough response in cfetch.
-            // Oh well.
             console.log(
-              await cfetch(
+              await fetchRaw(
                 `/accounts/${config.account_id}/storage/kv/namespaces/${namespaceId}/values/${key}`
               )
             );
@@ -1614,6 +1640,7 @@ export async function main(argv: string[]): Promise<void> {
               .positional("key", {
                 describe: "The key value to delete",
                 type: "string",
+                demandOption: true,
               })
               .option("binding", {
                 type: "string",
@@ -1654,9 +1681,8 @@ export async function main(argv: string[]): Promise<void> {
 
             const config = args.config as Config;
 
-            // -- snip, extract --
-
             if (!args.local) {
+              // -- snip, extract --
               const loggedIn = await loginOrRefreshIfRequired();
               if (!loggedIn) {
                 // didn't login, let's just quit
@@ -1670,11 +1696,10 @@ export async function main(argv: string[]): Promise<void> {
                   throw new Error("No account id found, quitting...");
                 }
               }
+              // -- snip, end --
             }
 
-            // -- snip, end --
-
-            await cfetch(
+            await fetchResult(
               `/accounts/${config.account_id}/storage/kv/namespaces/${namespaceId}/values/${key}`,
               { method: "DELETE" }
             );
@@ -1697,6 +1722,7 @@ export async function main(argv: string[]): Promise<void> {
               .positional("filename", {
                 describe: `The JSON file of key-value pairs to upload, in form [{"key":..., "value":...}"...]`,
                 type: "string",
+                demandOption: true,
               })
               .option("binding", {
                 type: "string",
@@ -1752,13 +1778,8 @@ export async function main(argv: string[]): Promise<void> {
                   expirationTtl: expiration_ttl,
                 });
               }
-
-              return;
-            }
-
-            // -- snip, extract --
-
-            if (!args.local) {
+            } else {
+              // -- snip, extract --
               const loggedIn = await loginOrRefreshIfRequired();
               if (!loggedIn) {
                 // didn't login, let's just quit
@@ -1772,23 +1793,23 @@ export async function main(argv: string[]): Promise<void> {
                   throw new Error("No account id found, quitting...");
                 }
               }
-            }
-
-            // -- snip, end --
+              // -- snip, end --
 
-            console.log(
-              await putBulkKeyValue(config.account_id, namespaceId, content)
-            );
+              console.log(
+                await putBulkKeyValue(config.account_id, namespaceId, content)
+              );
+            }
           }
         )
         .command(
           "delete <filename>",
-          "Upload multiple key-value pairs to a namespace",
+          "Delete multiple key-value pairs from a namespace",
           (yargs) => {
             return yargs
               .positional("filename", {
-                describe: `The JSON file of key-value pairs to upload, in form ["key1", "key2", ...]`,
+                describe: `The JSON file of keys to delete, in the form ["key1", "key2", ...]`,
                 type: "string",
+                demandOption: true,
               })
               .option("binding", {
                 type: "string",
@@ -1832,13 +1853,8 @@ export async function main(argv: string[]): Promise<void> {
               for (const key of parsedContent) {
                 await ns.delete(key);
               }
-
-              return;
-            }
-
-            // -- snip, extract --
-
-            if (!args.local) {
+            } else {
+              // -- snip, extract --
               const loggedIn = await loginOrRefreshIfRequired();
               if (!loggedIn) {
                 // didn't login, let's just quit
@@ -1852,13 +1868,16 @@ export async function main(argv: string[]): Promise<void> {
                   throw new Error("No account id found, quitting...");
                 }
               }
-            }
+              // -- snip, end --
 
-            // -- snip, end --
-
-            console.log(
-              await deleteBulkKeyValue(config.account_id, namespaceId, content)
-            );
+              console.log(
+                await deleteBulkKeyValue(
+                  config.account_id,
+                  namespaceId,
+                  content
+                )
+              );
+            }
           }
         );
     }
@@ -1895,8 +1914,15 @@ export async function main(argv: string[]): Promise<void> {
     if (e instanceof CommandLineArgsError) {
       wrangler.showHelp("error");
       console.error(""); // Just adds a bit of space
+      console.error(e.message);
+    } else {
+      console.error(e.message);
+      console.error(""); // Just adds a bit of space
+      console.error(
+        `${fgGreenColor}%s${resetColor}`,
+        "If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+      );
     }
-    console.error(e.message);
     throw e;
   }
 }