wrangler 0.0.0-e22f9d7 → 0.0.0-e2a26a0

package/src/index.tsx

@@ -1,22 +1,19 @@
-import React from "react";
+import * as fs from "node:fs";
+import { readFile, writeFile, mkdir } from "node:fs/promises";
+import path from "node:path";
+import { setTimeout } from "node:timers/promises";
+import TOML from "@iarna/toml";
+import { findUp } from "find-up";
 import { render } from "ink";
-import Dev from "./dev";
-import { readFile } from "node:fs/promises";
+import React from "react";
+import onExit from "signal-exit";
 import makeCLI from "yargs";
-import type Yargs from "yargs";
-import { findUp } from "find-up";
-import TOML from "@iarna/toml";
-import type { Config } from "./config";
-import { confirm, prompt } from "./dialogs";
 import { version as wranglerVersion } from "../package.json";
-import {
-  login,
-  logout,
-  listScopes,
-  initialise as initialiseUserConfig,
-  loginOrRefreshIfRequired,
-  getAccountId,
-} from "./user";
+import { toFormData } from "./api/form_data";
+import { fetchResult } from "./cfetch";
+import { normaliseAndValidateEnvironmentsConfig } from "./config";
+import Dev from "./dev";
+import { confirm, prompt } from "./dialogs";
 import {
   getNamespaceId,
   listNamespaces,
@@ -26,22 +23,29 @@ import {
   deleteBulkKeyValue,
   createNamespace,
   isValidNamespaceBinding,
+  getKeyValue,
 } from "./kv";
-
+import { getPackageManager } from "./package-manager";
 import { pages } from "./pages";
-
-import { fetchResult, fetchRaw } from "./cfetch";
-
 import publish from "./publish";
-import path from "path/posix";
-import { writeFile } from "node:fs/promises";
-import { toFormData } from "./api/form_data";
-
+import { getAssetPaths } from "./sites";
 import { createTail } from "./tail";
-import onExit from "signal-exit";
-import { setTimeout } from "node:timers/promises";
-import * as fs from "node:fs";
-import { execa } from "execa";
+import {
+  login,
+  logout,
+  listScopes,
+  initialise as initialiseUserConfig,
+  loginOrRefreshIfRequired,
+  getAccountId,
+  validateScopeKeys,
+} from "./user";
+import { whoami } from "./whoami";
+
+import type { Config } from "./config";
+import type Yargs from "yargs";
+
+const resetColor = "\x1b[0m";
+const fgGreenColor = "\x1b[32m";
 
 async function readConfig(configPath?: string): Promise<Config> {
   const config: Config = {};
@@ -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(
@@ -226,77 +189,103 @@ export async function main(argv: string[]): Promise<void> {
         throw new CommandLineArgsError(message);
       }
 
-      const destination = path.join(process.cwd(), "wrangler.toml");
+      const packageManager = await getPackageManager(process.cwd());
+
+      const destination = "./wrangler.toml";
       if (fs.existsSync(destination)) {
         console.warn(`${destination} file already exists!`);
-        const result = await confirm(
+        const shouldContinue = await confirm(
           "Do you want to continue initializing this project?"
         );
-        if (!result) {
+        if (!shouldContinue) {
           return;
         }
+      } else {
+        const compatibilityDate = new Date().toISOString().substring(0, 10);
+        try {
+          await writeFile(
+            destination,
+            `compatibility_date = "${compatibilityDate}"` + "\n"
+          );
+          console.log(`✨ Successfully created wrangler.toml`);
+          // TODO: suggest next steps?
+        } catch (err) {
+          throw new Error(
+            `Failed to create wrangler.toml.\n${err.message ?? err}`
+          );
+        }
       }
 
-      const compatibilityDate = new Date().toISOString().substring(0, 10);
-      try {
-        await writeFile(
-          destination,
-          `compatibility_date = "${compatibilityDate}"` + "\n"
-        );
-        console.log(`✨ Successfully created wrangler.toml`);
-        // TODO: suggest next steps?
-      } catch (err) {
-        throw new Error(
-          `Failed to create wrangler.toml.\n${err.message ?? err}`
-        );
-      }
-
-      // if no package.json, ask, and if yes, create one
       let pathToPackageJson = await findUp("package.json");
-
       if (!pathToPackageJson) {
-        if (
-          await confirm("No package.json found. Would you like to create one?")
-        ) {
+        // If no package.json exists, ask to create one
+        const shouldCreatePackageJson = await confirm(
+          "No package.json found. Would you like to create one?"
+        );
+        if (shouldCreatePackageJson) {
           await writeFile(
-            path.join(process.cwd(), "package.json"),
+            "./package.json",
             JSON.stringify(
               {
                 name: "worker",
-                version: "0.0.1",
+                version: "0.0.0",
+                devDependencies: {
+                  wrangler: wranglerVersion,
+                },
+                private: true,
               },
               null,
               "  "
             ) + "\n"
           );
+          await packageManager.install();
           console.log(`✨ Created package.json`);
           pathToPackageJson = path.join(process.cwd(), "package.json");
         } else {
           return;
         }
+      } else {
+        // If package.json exists and wrangler isn't installed,
+        // then ask to add wrangler to devDependencies
+        const packageJson = JSON.parse(
+          await readFile(pathToPackageJson, "utf-8")
+        );
+        if (
+          !(
+            packageJson.devDependencies?.wrangler ||
+            packageJson.dependencies?.wrangler
+          )
+        ) {
+          const shouldInstall = await confirm(
+            "Would you like to install wrangler into your package.json?"
+          );
+          if (shouldInstall) {
+            await packageManager.addDevDeps(`wrangler@${wranglerVersion}`);
+            console.log(`✨ Installed wrangler`);
+          }
+        }
       }
 
-      // if workers-types doesn't exist as a dependency
-      // offer to install it
-      // and make a tsconfig?
+      let isTypescriptProject = false;
       let pathToTSConfig = await findUp("tsconfig.json");
       if (!pathToTSConfig) {
-        if (await confirm("Would you like to use typescript?")) {
+        // If there's no tsconfig, offer to create one
+        // and install @cloudflare/workers-types
+        if (await confirm("Would you like to use TypeScript?")) {
+          isTypescriptProject = true;
           await writeFile(
-            path.join(process.cwd(), "tsconfig.json"),
+            "./tsconfig.json",
             JSON.stringify(
               {
                 compilerOptions: {
-                  target: "esnext",
-                  module: "esnext",
+                  target: "es2021",
+                  module: "es2022",
                   moduleResolution: "node",
-                  esModuleInterop: true,
                   allowJs: true,
                   allowSyntheticDefaultImports: true,
                   isolatedModules: true,
                   noEmit: true,
-                  lib: ["esnext"],
-                  jsx: "react",
+                  lib: ["es2021"],
                   resolveJsonModule: true,
                   types: ["@cloudflare/workers-types"],
                 },
@@ -305,16 +294,79 @@ export async function main(argv: string[]): Promise<void> {
               "  "
             ) + "\n"
           );
-          await execa("npm", [
-            "install",
+          await packageManager.addDevDeps(
             "@cloudflare/workers-types",
-            "--save-dev",
-          ]);
+            "typescript"
+          );
+
           console.log(
             `✨ Created tsconfig.json, installed @cloudflare/workers-types into devDependencies`
           );
           pathToTSConfig = path.join(process.cwd(), "tsconfig.json");
         }
+      } else {
+        isTypescriptProject = true;
+        // If there's a tsconfig, check if @cloudflare/workers-types
+        // is already installed, and offer to install it if not
+        const packageJson = JSON.parse(
+          await readFile(pathToPackageJson, "utf-8")
+        );
+        if (
+          !(
+            packageJson.devDependencies?.["@cloudflare/workers-types"] ||
+            packageJson.dependencies?.["@cloudflare/workers-types"]
+          )
+        ) {
+          const shouldInstall = await confirm(
+            "Would you like to install the type definitions for Workers into your package.json?"
+          );
+          if (shouldInstall) {
+            await packageManager.addDevDeps("@cloudflare/workers-types");
+            // We don't update the tsconfig.json because
+            // it could be complicated in existing projects
+            // and we don't want to break them. Instead, we simply
+            // tell the user that they need to update their tsconfig.json
+            console.log(
+              `✨ Installed @cloudflare/workers-types.\nPlease add "@cloudflare/workers-types" to compilerOptions.types in your tsconfig.json`
+            );
+          }
+        }
+      }
+
+      if (isTypescriptProject) {
+        if (!fs.existsSync("./src/index.ts")) {
+          const shouldCreateSource = await confirm(
+            `Would you like to create a Worker at src/index.ts?`
+          );
+          if (shouldCreateSource) {
+            await mkdir("./src", { recursive: true });
+            await writeFile(
+              "./src/index.ts",
+              await readFile(
+                path.join(__dirname, "../templates/new-worker.ts"),
+                "utf-8"
+              )
+            );
+            console.log(`✨ Created src/index.ts`);
+          }
+        }
+      } else {
+        if (!fs.existsSync("./src/index.js")) {
+          const shouldCreateSource = await confirm(
+            `Would you like to create a Worker at src/index.js?`
+          );
+          if (shouldCreateSource) {
+            await mkdir("./src", { recursive: true });
+            await writeFile(
+              path.join("./src/index.js"),
+              await readFile(
+                path.join(__dirname, "../templates/new-worker.js"),
+                "utf-8"
+              )
+            );
+            console.log(`✨ Created src/index.js`);
+          }
+        }
       }
     }
   );
@@ -368,6 +420,11 @@ export async function main(argv: string[]): Promise<void> {
           listScopes();
           return;
         }
+        if (!validateScopeKeys(args.scopes)) {
+          throw new CommandLineArgsError(
+            `One of ${args.scopes} is not a valid authentication scope. Run "wrangler login --list-scopes" to see the valid scopes.`
+          );
+        }
         await login({ scopes: args.scopes });
         return;
       }
@@ -394,11 +451,10 @@ export async function main(argv: string[]): Promise<void> {
   // whoami
   wrangler.command(
     "whoami",
-    false, // we don't need to show this the menu
-    // "🕵️  Retrieve your user info and test your auth config",
+    "🕵️  Retrieve your user info and test your auth config",
     () => {},
-    (args) => {
-      console.log(":whoami", args);
+    async () => {
+      await whoami();
     }
   );
 
@@ -421,7 +477,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",
@@ -477,6 +537,18 @@ export async function main(argv: string[]): Promise<void> {
           describe: "Root folder of static assets for Workers Sites",
           type: "string",
         })
+        .option("site-include", {
+          describe:
+            "Array of .gitignore-style patterns that match file or directory names from the sites directory. Only matched items will be uploaded.",
+          type: "string",
+          array: true,
+        })
+        .option("site-exclude", {
+          describe:
+            "Array of .gitignore-style patterns that match file or directory names from the sites directory. Matched items will not be uploaded.",
+          type: "string",
+          array: true,
+        })
         .option("upstream-protocol", {
           default: "https",
           describe:
@@ -490,6 +562,10 @@ export async function main(argv: string[]): Promise<void> {
         .option("jsx-fragment", {
           describe: "The function that is called for each JSX fragment",
           type: "string",
+        })
+        .option("experimental-enable-local-persistence", {
+          describe: "Enable persistence for this session (only for local mode)",
+          type: "boolean",
         });
     },
     async (args) => {
@@ -508,26 +584,34 @@ export async function main(argv: string[]): Promise<void> {
         );
       }
 
-      // -- snip, extract --
+      if (config.site?.["entry-point"]) {
+        console.warn(
+          "Deprecation notice: The `site.entry-point` config field is no longer used.\n" +
+            "The entry-point is specified via the command line (e.g. `wrangler dev path/to/script`).\n" +
+            "Please remove the `site.entry-point` field from the `wrangler.toml` file."
+        );
+      }
 
       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
@@ -544,13 +628,22 @@ export async function main(argv: string[]): Promise<void> {
         <Dev
           name={args.name || config.name}
           entry={path.relative(process.cwd(), filename)}
+          env={args.env}
           buildCommand={config.build || {}}
           format={format}
           initialMode={args.local ? "local" : "remote"}
           jsxFactory={args["jsx-factory"] || envRootObj?.jsx_factory}
           jsxFragment={args["jsx-fragment"] || envRootObj?.jsx_fragment}
+          enableLocalPersistence={
+            args["experimental-enable-local-persistence"] || false
+          }
           accountId={config.account_id}
-          site={args.site || config.site?.bucket}
+          assetPaths={getAssetPaths(
+            config,
+            args.site,
+            args.siteInclude,
+            args.siteExclude
+          )}
           port={args.port || config.dev?.port}
           public={args["experimental-public"]}
           compatibilityDate={
@@ -635,6 +728,18 @@ export async function main(argv: string[]): Promise<void> {
           describe: "Root folder of static assets for Workers Sites",
           type: "string",
         })
+        .option("site-include", {
+          describe:
+            "Array of .gitignore-style patterns that match file or directory names from the sites directory. Only matched items will be uploaded.",
+          type: "string",
+          array: true,
+        })
+        .option("site-exclude", {
+          describe:
+            "Array of .gitignore-style patterns that match file or directory names from the sites directory. Matched items will not be uploaded.",
+          type: "string",
+          array: true,
+        })
         .option("triggers", {
           describe: "cron schedules to attach",
           alias: ["schedule", "schedules"],
@@ -686,24 +791,30 @@ export async function main(argv: string[]): Promise<void> {
         );
       }
 
-      // -- 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 assetPaths = getAssetPaths(
+        config,
+        args["experimental-public"] || args.site,
+        args.siteInclude,
+        args.siteExclude
+      );
       await publish({
         config: args.config as Config,
         name: args.name,
@@ -717,8 +828,10 @@ export async function main(argv: string[]): Promise<void> {
         jsxFactory: args["jsx-factory"],
         jsxFragment: args["jsx-fragment"],
         routes: args.routes,
-        public: args["experimental-public"],
-        site: args.site,
+        assetPaths,
+        format: undefined, // TODO: add args for this
+        legacyEnv: undefined, // TODO: get this from somewhere... config?
+        experimentalPublic: args["experimental-public"] !== undefined,
       });
     }
   );
@@ -768,6 +881,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)) {
@@ -778,22 +897,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;
@@ -986,11 +1102,6 @@ export async function main(argv: string[]): Promise<void> {
               });
           },
           async (args) => {
-            if (args.local) {
-              throw new NotImplementedError(
-                "--local not implemented for this command yet"
-              );
-            }
             const config = args.config as Config;
 
             // TODO: use environment (how does current wrangler do it?)
@@ -999,29 +1110,39 @@ export async function main(argv: string[]): Promise<void> {
               throw new Error("Missing script name");
             }
 
-            // -- snip, extract --
+            if (args.local) {
+              console.warn("`wrangler secret put` is a no-op in --local mode");
+            }
 
             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"
             );
+
+            if (args.local) {
+              return;
+            }
+
+            console.log(`🌀 Creating the secret for script ${scriptName}`);
+
             async function submitSecret() {
               return await fetchResult(
                 `/accounts/${config.account_id}/workers/scripts/${scriptName}/secrets/`,
@@ -1038,7 +1159,7 @@ export async function main(argv: string[]): Promise<void> {
             }
 
             try {
-              console.log(await submitSecret());
+              await submitSecret();
             } catch (e) {
               if (e.code === 10007) {
                 // upload a draft worker
@@ -1046,8 +1167,8 @@ export async function main(argv: string[]): Promise<void> {
                   `/accounts/${config.account_id}/workers/scripts/${scriptName}`,
                   {
                     method: "PUT",
-                    // @ts-expect-error TODO: fix this error!
                     body: toFormData({
+                      name: scriptName,
                       main: {
                         name: scriptName,
                         content: `export default { fetch() {} }`,
@@ -1059,15 +1180,20 @@ export async function main(argv: string[]): Promise<void> {
                         durable_objects: { bindings: [] },
                       },
                       modules: [],
+                      migrations: undefined,
+                      compatibility_date: undefined,
+                      compatibility_flags: undefined,
+                      usage_model: undefined,
                     }),
                   }
                 );
 
                 // and then try again
-                console.log(await submitSecret());
+                await submitSecret();
                 // TODO: delete the draft worker if this failed too?
               }
             }
+            console.log(`✨ Success! Uploaded secret ${args.key}`);
           }
         )
         .command(
@@ -1090,11 +1216,6 @@ export async function main(argv: string[]): Promise<void> {
               });
           },
           async (args) => {
-            if (args.local) {
-              throw new NotImplementedError(
-                "--local not implemented for this command yet"
-              );
-            }
             const config = args.config as Config;
 
             // TODO: use environment (how does current wrangler do it?)
@@ -1103,36 +1224,48 @@ export async function main(argv: string[]): Promise<void> {
               throw new Error("Missing script name");
             }
 
-            // -- snip, extract --
+            if (args.local) {
+              console.warn(
+                "`wrangler secret delete` is a no-op in --local mode"
+              );
+            }
 
             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?")) {
+            if (
+              await confirm(
+                `Are you sure you want to permanently delete the variable ${args.key} on the script ${scriptName}?`
+              )
+            ) {
               console.log(
-                `Deleting the secret ${args.key} on script ${scriptName}.`
+                `🌀 Deleting the secret ${args.key} on script ${scriptName}.`
               );
 
-              console.log(
-                await fetchResult(
-                  `/accounts/${config.account_id}/workers/scripts/${scriptName}/secrets/${args.key}`,
-                  { method: "DELETE" }
-                )
+              if (args.local) {
+                return;
+              }
+
+              await fetchResult(
+                `/accounts/${config.account_id}/workers/scripts/${scriptName}/secrets/${args.key}`,
+                { method: "DELETE" }
               );
+              console.log(`✨ Success! Deleted secret ${args.key}`);
             }
           }
         )
@@ -1152,11 +1285,6 @@ export async function main(argv: string[]): Promise<void> {
               });
           },
           async (args) => {
-            if (args.local) {
-              throw new NotImplementedError(
-                "--local not implemented for this command yet"
-              );
-            }
             const config = args.config as Config;
 
             // TODO: use environment (how does current wrangler do it?)
@@ -1165,28 +1293,39 @@ export async function main(argv: string[]): Promise<void> {
               throw new Error("Missing script name");
             }
 
-            // -- snip, extract --
+            if (args.local) {
+              console.warn("`wrangler secret list` is a no-op in --local mode");
+            }
 
             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 (args.local) {
+              return;
+            }
 
             console.log(
-              await fetchResult(
-                `/accounts/${config.account_id}/workers/scripts/${scriptName}/secrets`
+              JSON.stringify(
+                await fetchResult(
+                  `/accounts/${config.account_id}/workers/scripts/${scriptName}/secrets`
+                ),
+                null,
+                "  "
               )
             );
           }
@@ -1209,6 +1348,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",
@@ -1254,44 +1394,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(
@@ -1299,42 +1438,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(
@@ -1361,25 +1497,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;
-
-            let id;
-            try {
-              id = getNamespaceId(args);
-            } catch (e) {
-              throw new CommandLineArgsError(
-                "Not able to delete namespace.\n" + e.message
-              );
-            }
-
-            // -- 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
@@ -1393,32 +1527,31 @@ export async function main(argv: string[]): Promise<void> {
                   throw new Error("No account id found, quitting...");
                 }
               }
-            }
-
-            // -- snip, end --
+              // -- snip, end --
 
-            await fetchResult<{ 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?
+            }
           }
         );
     }
@@ -1438,6 +1571,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",
@@ -1477,9 +1611,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) {
@@ -1501,11 +1637,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
@@ -1519,14 +1652,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(
@@ -1574,12 +1706,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
@@ -1593,13 +1721,15 @@ 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)
-            );
+              const results = await listNamespaceKeys(
+                config.account_id,
+                namespaceId,
+                prefix
+              );
+              console.log(JSON.stringify(results, undefined, 2));
+            }
           }
         )
         .command(
@@ -1610,6 +1740,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",
@@ -1651,9 +1782,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
@@ -1667,15 +1797,12 @@ export async function main(argv: string[]): Promise<void> {
                   throw new Error("No account id found, quitting...");
                 }
               }
-            }
-
-            // -- snip, end --
+              // -- snip, end --
 
-            console.log(
-              await fetchRaw(
-                `/accounts/${config.account_id}/storage/kv/namespaces/${namespaceId}/values/${key}`
-              )
-            );
+              console.log(
+                await getKeyValue(config.account_id, namespaceId, key)
+              );
+            }
           }
         )
         .command(
@@ -1686,6 +1813,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",
@@ -1726,9 +1854,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
@@ -1742,10 +1869,9 @@ export async function main(argv: string[]): Promise<void> {
                   throw new Error("No account id found, quitting...");
                 }
               }
+              // -- snip, end --
             }
 
-            // -- snip, end --
-
             await fetchResult(
               `/accounts/${config.account_id}/storage/kv/namespaces/${namespaceId}/values/${key}`,
               { method: "DELETE" }
@@ -1769,6 +1895,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",
@@ -1824,13 +1951,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
@@ -1844,13 +1966,12 @@ 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(
@@ -1861,6 +1982,7 @@ export async function main(argv: string[]): Promise<void> {
               .positional("filename", {
                 describe: `The JSON file of keys to delete, in the form ["key1", "key2", ...]`,
                 type: "string",
+                demandOption: true,
               })
               .option("binding", {
                 type: "string",
@@ -1904,13 +2026,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
@@ -1924,13 +2041,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
+                )
+              );
+            }
           }
         );
     }
@@ -1967,8 +2087,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;
   }
 }