create-cloudflare 0.0.0-b032bf2e → 0.0.0-b58663a8

package/dist/cli.js

@@ -52612,7 +52612,9 @@ var require_typescript2 = __commonJS({
 // src/cli.ts
 var cli_exports = {};
 __export(cli_exports, {
-  main: () => main
+  C3_DEFAULTS: () => C3_DEFAULTS,
+  main: () => main,
+  parseArgs: () => parseArgs
 });
 module.exports = __toCommonJS(cli_exports);
 var import_haikunator = __toESM(require_dist_node());
@@ -54347,174 +54349,165 @@ var logUpdateStderr = createLogUpdate(import_node_process6.default.stderr);
 var grayBar = gray(shapes.bar);
 var blCorner = gray(shapes.corners.bl);
 var leftT = gray(shapes.leftT);
-var textInput = async (opts) => {
-  const { renderSubmitted, question, defaultValue, validate, acceptDefault } = opts;
-  const helpText = opts.helpText || ``;
-  const format3 = opts.format || ((val) => val);
-  const prompt = new oD({
-    defaultValue,
-    validate,
-    render() {
-      let body = "";
-      switch (this.state) {
-        case "initial":
-          body += `${blCorner} ${bold(question)} ${dim(helpText)}
-`;
-          body += `${space(2)}${gray(format3(defaultValue))}
-`;
-          break;
-        case "active":
-          body += `${blCorner} ${bold(question)} ${dim(helpText)}
-`;
-          body += `${space(2)}${format3(this.value || dim(defaultValue))}
-`;
-          break;
-        case "submit":
-          body += `${leftT} ${question}
-`;
-          body += `${grayBar} ${renderSubmitted(
-            format3(this.value)
-          )}
-${grayBar}`;
-          break;
-        case "error":
-          body += `${leftT} ${status.error} ${dim(this.error)}
-`;
-          body += `${grayBar}
-`;
-          body += `${blCorner} ${question} ${dim(helpText)}
-`;
-          body += `${space(2)}${format3(this.value)}
-`;
-          break;
-        default:
-          break;
-      }
-      return body;
-    }
-  });
-  let value;
-  if (acceptDefault) {
-    logRaw(`${leftT} ${question}`);
-    logRaw(`${grayBar} ${renderSubmitted(defaultValue)}
-${grayBar}`);
-    value = defaultValue;
-    validate?.(value);
-  } else {
-    value = await prompt.prompt();
-    if (eD(value)) {
-      cancel("Operation cancelled.");
-      process.exit(0);
-    }
-  }
+var processArgument = async (args, name, promptConfig) => {
+  let value = args[name];
+  const renderSubmitted = getRenderers(promptConfig).submit;
+  if (value !== void 0) {
+    promptConfig.validate?.(value);
+    const lines = renderSubmitted({ value });
+    logRaw(lines.join("\n"));
+    return value;
+  }
+  value = await inputPrompt(promptConfig);
   return value;
 };
-var selectInput = async (opts) => {
-  const { question, options, renderSubmitted, defaultValue, acceptDefault } = opts;
-  const helpText = opts.helpText || ``;
-  const prompt = new ED({
-    options,
-    initialValue: defaultValue ?? options[0].value,
-    render() {
-      const renderOption = (opt, i) => {
-        const { label } = opt;
-        const active = i === this.cursor;
-        const text = active ? blue.underline(label) : dim(label);
-        const indicator = active ? blue(shapes.radioActive) : dim(shapes.radioInactive);
-        return `${space(2)}${indicator} ${text}`;
-      };
-      let body = ``;
-      switch (this.state) {
-        case "submit":
-          body += `${leftT} ${question}
-`;
-          body += `${grayBar} ${renderSubmitted(options[this.cursor])}`;
-          body += `
-${grayBar}`;
-          break;
-        default:
-          body += `${blCorner} ${bold(question)} ${dim(helpText)}
-`;
-          body += `${options.map(renderOption).join(`
-`)}
-`;
-          break;
+var inputPrompt = async (promptConfig) => {
+  const renderers = getRenderers(promptConfig);
+  let prompt;
+  const dispatchRender = (props) => {
+    const renderedLines = renderers[props.state](props);
+    return renderedLines.join("\n");
+  };
+  if (promptConfig.type === "select") {
+    prompt = new ED({
+      ...promptConfig,
+      options: promptConfig.options,
+      initialValue: String(promptConfig.defaultValue),
+      render() {
+        return dispatchRender(this);
       }
-      return body;
-    }
-  });
-  let value;
-  if (acceptDefault) {
-    logRaw(`${leftT} ${question}`);
-    logRaw(
-      `${grayBar} ${renderSubmitted({
-        label: defaultValue,
-        value: defaultValue
-      })}`
-    );
-    logRaw(`${grayBar}`);
-    value = defaultValue;
+    });
+  } else if (promptConfig.type === "confirm") {
+    prompt = new sD({
+      ...promptConfig,
+      initialValue: Boolean(promptConfig.defaultValue),
+      active: promptConfig.activeText || "",
+      inactive: promptConfig.inactiveText || "",
+      render() {
+        return dispatchRender(this);
+      }
+    });
   } else {
-    value = await prompt.prompt();
-    if (eD(value)) {
-      cancel("Operation cancelled.");
-      process.exit(0);
-    }
+    prompt = new oD({
+      ...promptConfig,
+      defaultValue: String(promptConfig.defaultValue),
+      render() {
+        return dispatchRender(this);
+      }
+    });
   }
-  return value;
+  const input = await prompt.prompt();
+  if (eD(input)) {
+    cancel("Operation cancelled.");
+    process.exit(0);
+  }
+  return input;
+};
+var renderSubmit = (config14, value) => {
+  const { question, label } = config14;
+  const content = config14.type === "confirm" ? `${grayBar} ${brandColor(value)} ${dim(label)}` : `${grayBar} ${brandColor(label)} ${dim(value)}`;
+  return [`${leftT} ${question}`, content, `${grayBar}`];
+};
+var handleCancel = () => {
+  cancel("Operation cancelled.");
+  process.exit(0);
 };
-var confirmInput = async (opts) => {
+var getRenderers = (config14) => {
+  switch (config14.type) {
+    case "select":
+      return getSelectRenderers(config14);
+    case "confirm":
+      return getConfirmRenderers(config14);
+    case "text":
+      return getTextRenderers(config14);
+  }
+};
+var getTextRenderers = (config14) => {
   const {
-    activeText,
-    inactiveText,
+    defaultValue,
     question,
-    renderSubmitted,
-    defaultValue = true,
-    acceptDefault
-  } = opts;
-  const helpText = opts.helpText || `(y/n)`;
+    helpText: _helpText,
+    format: _format
+  } = config14;
+  const helpText = _helpText ?? "";
+  const format3 = _format ?? ((val) => String(val));
+  return {
+    initial: () => [
+      `${blCorner} ${bold(question)} ${dim(helpText)}`,
+      `${space(2)}${gray(format3(defaultValue))}`,
+      ``
+      // extra line for readability
+    ],
+    active: ({ value }) => [
+      `${blCorner} ${bold(question)} ${dim(helpText)}`,
+      `${space(2)}${format3(value || dim(defaultValue))}`,
+      ``
+      // extra line for readability
+    ],
+    error: ({ value, error }) => [
+      `${leftT} ${status.error} ${dim(error)}`,
+      `${grayBar}`,
+      `${blCorner} ${question} ${dim(helpText)}`,
+      `${space(2)}${format3(value)}`,
+      ``
+      // extra line for readability
+    ],
+    submit: ({ value }) => renderSubmit(config14, format3(value)),
+    cancel: handleCancel
+  };
+};
+var getSelectRenderers = (config14) => {
+  const { options, question, helpText: _helpText } = config14;
+  const helpText = _helpText ?? "";
+  const defaultRenderer = ({ cursor }) => {
+    const renderOption = (opt, i) => {
+      const { label: optionLabel } = opt;
+      const active = i === cursor;
+      const text = active ? blue.underline(optionLabel) : dim(optionLabel);
+      const indicator = active ? blue(shapes.radioActive) : dim(shapes.radioInactive);
+      return `${space(2)}${indicator} ${text}`;
+    };
+    return [
+      `${blCorner} ${bold(question)} ${dim(helpText)}`,
+      `${options.map(renderOption).join(`
+`)}`,
+      ``
+      // extra line for readability
+    ];
+  };
+  return {
+    initial: defaultRenderer,
+    active: defaultRenderer,
+    confirm: defaultRenderer,
+    error: defaultRenderer,
+    submit: ({ value }) => renderSubmit(
+      config14,
+      options.find((o2) => o2.value === value)?.label
+    ),
+    cancel: handleCancel
+  };
+};
+var getConfirmRenderers = (config14) => {
+  const { activeText, inactiveText, question, helpText: _helpText } = config14;
+  const helpText = _helpText ?? "";
   const active = activeText || "Yes";
   const inactive = inactiveText || "No";
-  const prompt = new sD({
-    active,
-    inactive,
-    initialValue: defaultValue,
-    render() {
-      const yesColor = this.value ? blue : dim;
-      const noColor = this.value ? dim : blue;
-      let body = ``;
-      switch (this.state) {
-        case "submit":
-          body += `${leftT} ${question}
-`;
-          body += `${grayBar} ${renderSubmitted(this.value)}`;
-          body += `
-${grayBar}`;
-          break;
-        default:
-          body += `${blCorner} ${bold(question)} ${dim(helpText)}
-`;
-          body += `${space(2)}${yesColor(active)} / ${noColor(inactive)}
-`;
-          break;
-      }
-      return body;
-    }
-  });
-  let value;
-  if (acceptDefault) {
-    logRaw(`${leftT} ${question}`);
-    logRaw(`${grayBar} ${renderSubmitted(defaultValue)}`);
-    logRaw(`${grayBar}`);
-    value = defaultValue;
-  } else {
-    value = Boolean(await prompt.prompt());
-    if (eD(value)) {
-      cancel("Operation cancelled.");
-      process.exit(0);
-    }
-  }
-  return value;
+  const defaultRenderer = ({ value }) => {
+    const yesColor = value ? blue : dim;
+    const noColor = value ? dim : blue;
+    return [
+      `${blCorner} ${bold(question)} ${dim(helpText)}`,
+      `${space(2)}${yesColor(active)} / ${noColor(inactive)}`
+    ];
+  };
+  return {
+    initial: defaultRenderer,
+    active: defaultRenderer,
+    confirm: defaultRenderer,
+    error: defaultRenderer,
+    submit: ({ value }) => renderSubmit(config14, value ? "yes" : "no"),
+    cancel: handleCancel
+  };
 };
 var spinner = () => {
   const spinnerFrames = ["\u2524", "\u2518", "\u2534", "\u2514", "\u251C", "\u250C", "\u252C", "\u2510"];
@@ -59419,7 +59412,7 @@ var Yargs = YargsFactory(esm_default);
 var yargs_default = Yargs;
 
 // package.json
-var version = "0.0.0-b032bf2e";
+var version = "0.0.0-b58663a8";
 
 // src/common.ts
 var import_fs6 = require("fs");
@@ -59521,6 +59514,9 @@ var runCommand = async (command2, opts = {}) => {
             }
           }
         });
+        cmd.on("error", (code) => {
+          reject(code);
+        });
       });
     }
   });
@@ -59631,10 +59627,14 @@ var installWrangler = async () => {
 };
 var isLoggedIn = async () => {
   const { npx: npx6 } = detectPackageManager();
-  const output = await runCommand(`${npx6} wrangler whoami`, {
-    silent: true
-  });
-  return !/not authenticated/.test(output);
+  try {
+    const output = await runCommand(`${npx6} wrangler whoami`, {
+      silent: true
+    });
+    return /You are logged in/.test(output);
+  } catch (error) {
+    return false;
+  }
 };
 var wranglerLogin = async () => {
   const { npx: npx6 } = detectPackageManager();
@@ -59779,14 +59779,12 @@ var setupProjectDirectory = (args) => {
 };
 var offerToDeploy = async (ctx) => {
   startSection(`Deploy with Cloudflare`, `Step 3 of 3`);
-  ctx.args.deploy = await confirmInput({
+  const label = `deploy via \`${npm} run ${ctx.framework?.config.deployCommand ?? "deploy"}\``;
+  ctx.args.deploy = await processArgument(ctx.args, "deploy", {
+    type: "confirm",
     question: "Do you want to deploy your application?",
-    renderSubmitted: (value) => `${brandColor(value ? `yes` : `no`)} ${dim(
-      `deploying via \`${npm} run ${ctx.framework?.config.deployCommand ?? "deploy"}\``
-    )}`,
-    defaultValue: ctx.args.deploy ?? (ctx.args.wranglerDefaults ? false : true),
-    // if --wrangler-defaults, default to false, otherwise default to true
-    acceptDefault: ctx.args.wranglerDefaults
+    label,
+    defaultValue: C3_DEFAULTS.deploy
   });
   if (!ctx.args.deploy)
     return;
@@ -59840,14 +59838,12 @@ var chooseAccount = async (ctx) => {
       label: name,
       value: id
     }));
-    accountId = await selectInput({
+    accountId = await inputPrompt({
+      type: "select",
       question: "Which account do you want to use?",
       options: accountOptions,
-      renderSubmitted: (option) => {
-        return `${brandColor("account")} ${dim(option.label)}`;
-      },
-      defaultValue: accountOptions[0].value,
-      acceptDefault: ctx.args.wranglerDefaults
+      label: "account",
+      defaultValue: accountOptions[0].value
     });
   }
   const accountName = Object.keys(accounts).find(
@@ -59857,6 +59853,7 @@ var chooseAccount = async (ctx) => {
 };
 var printSummary = async (ctx) => {
   const nextSteps = [
+    [`Navigate to the new directory:`, `cd ${ctx.project.name}`],
     [
       `Run the development server`,
       `${npm} run ${ctx.framework?.config.devCommand ?? "start"}`
@@ -59919,11 +59916,11 @@ var offerGit = async (ctx) => {
   const insideGitRepo = await isInsideGitRepo(ctx.project.path);
   if (insideGitRepo)
     return;
-  ctx.args.git ??= await confirmInput({
+  ctx.args.git = await processArgument(ctx.args, "git", {
+    type: "confirm",
     question: "Do you want to use git for version control?",
-    renderSubmitted: (value) => `${brandColor("git")} ${dim(value ? `yes` : `no`)}`,
-    defaultValue: true,
-    acceptDefault: ctx.args.wranglerDefaults
+    label: "git",
+    defaultValue: C3_DEFAULTS.git
   });
   if (ctx.args.git) {
     await printAsyncStatus({
@@ -60191,25 +60188,19 @@ var docusaurus_default = config3;
 var { npm: npm4, dlx: dlx4 } = detectPackageManager();
 var generate4 = async (ctx) => {
   const defaultTemplate = "https://github.com/gatsbyjs/gatsby-starter-blog";
-  const useTemplate = await confirmInput({
+  const useTemplate = await inputPrompt({
+    type: "confirm",
     question: "Would you like to use a template?",
-    renderSubmitted: (value) => {
-      const status2 = value ? "yes" : "no";
-      return `${brandColor(`template`)} ${status2}`;
-    },
-    defaultValue: true,
-    acceptDefault: false
+    label: "template",
+    defaultValue: true
   });
   let templateUrl = "";
   if (useTemplate) {
-    templateUrl = await textInput({
+    templateUrl = await inputPrompt({
+      type: "text",
       question: `Please specify the url of the template you'd like to use`,
-      renderSubmitted: (value) => {
-        const result = `Using template \`${value}\``;
-        return `${brandColor("template")} ${dim(result)}`;
-      },
-      defaultValue: defaultTemplate,
-      acceptDefault: false
+      label: "template",
+      defaultValue: defaultTemplate
     });
   }
   const version2 = getFrameworkVersion(ctx);
@@ -60502,7 +60493,7 @@ var config11 = {
   displayName: "Solid",
   packageScripts: {
     "pages:dev": `wrangler pages dev ${compatDateFlag()} --proxy 3000 -- ${npm9} run dev`,
-    "pages:deploy": `${npm9} run build build && wrangler pages deploy ./dist/public`
+    "pages:deploy": `${npm9} run build && wrangler pages deploy ./dist/public`
   }
 };
 var solid_default = config11;
@@ -60613,7 +60604,7 @@ var versionMap_default = {
   astro: "3.1.5",
   docusaurus: "2.4.1",
   gatsby: "5.10.0",
-  hono: "0.2.0",
+  hono: "0.2.6",
   next: "13.4.2",
   nuxt: "3.4.2",
   qwik: "1.1.x",
@@ -60718,14 +60709,12 @@ var getFrameworkSelection = async (args) => {
       value: key
     })
   );
-  const framework = await selectInput({
+  const framework = await processArgument(args, "framework", {
+    type: "select",
+    label: "framework",
     question: "Which development framework do you want to use?",
     options: frameworkOptions,
-    renderSubmitted: (option) => {
-      return `${brandColor("framework")} ${dim(option.label)}`;
-    },
-    defaultValue: args.framework ?? "svelte",
-    acceptDefault: Boolean(args.framework)
+    defaultValue: C3_DEFAULTS.framework
   });
   framework || crash("A framework must be selected to continue.");
   if (!supportedFramework(framework)) {
@@ -60803,11 +60792,11 @@ var runWorkersGenerator = async (args) => {
 };
 async function getTemplate(ctx) {
   if (ctx.args.ts === void 0) {
-    ctx.args.ts = await confirmInput({
+    ctx.args.ts = await processArgument(ctx.args, "ts", {
+      type: "confirm",
       question: "Do you want to use TypeScript?",
-      renderSubmitted: (value) => `${brandColor("typescript")} ${dim(`${value ? "yes" : "no"}`)}`,
-      defaultValue: true,
-      acceptDefault: ctx.args.wranglerDefaults
+      label: "typescript",
+      defaultValue: C3_DEFAULTS.ts
     });
   }
   const preexisting = ctx.args.type === "pre-existing";
@@ -60833,12 +60822,16 @@ async function copyExistingWorkerFiles(ctx) {
   if (preexisting) {
     await chooseAccount(ctx);
     if (ctx.args.existingScript === void 0) {
-      ctx.args.existingScript = await textInput({
-        question: "Please specify the name of the existing worker in this account?",
-        renderSubmitted: (value) => `${brandColor("worker")} ${dim(`"${value}"`)}`,
-        defaultValue: ctx.project.name,
-        acceptDefault: ctx.args.wranglerDefaults
-      });
+      ctx.args.existingScript = await processArgument(
+        ctx.args,
+        "existingScript",
+        {
+          type: "text",
+          question: "Please specify the name of the existing worker in this account?",
+          label: "worker",
+          defaultValue: ctx.project.name
+        }
+      );
     }
     const tempdir = await (0, import_promises3.mkdtemp)(
       (0, import_path9.join)((0, import_os.tmpdir)(), "c3-wrangler-init--from-dash-")
@@ -60894,19 +60887,55 @@ async function updateFiles(ctx) {
 }
 
 // src/cli.ts
+var C3_DEFAULTS = {
+  projectName: new import_haikunator.default().haikunate({ tokenHex: true }),
+  type: "hello-world",
+  framework: "angular",
+  deploy: true,
+  git: true,
+  open: true,
+  ts: true
+};
+var WRANGLER_DEFAULTS = {
+  ...C3_DEFAULTS,
+  deploy: false
+};
 var main = async (argv) => {
   const args = await parseArgs(argv);
   printBanner();
+  const projectName = await processArgument(args, "projectName", {
+    type: "text",
+    question: `In which directory do you want to create your application?`,
+    helpText: "also used as application name",
+    defaultValue: C3_DEFAULTS.projectName,
+    label: "dir",
+    validate: (value) => validateProjectDirectory(String(value) || C3_DEFAULTS.projectName),
+    format: (val) => `./${val}`
+  });
+  if (!args.type) {
+    if (args.framework) {
+      args.type = "webFramework";
+    } else if (args.existingScript) {
+      args.type = "pre-existing";
+    }
+  }
+  const templateOptions = Object.entries(templateMap).filter(([_3, { hidden: hidden2 }]) => !hidden2).map(([value, { label }]) => ({ value, label }));
+  const type = await processArgument(args, "type", {
+    type: "select",
+    question: "What type of application do you want to create?",
+    label: "type",
+    options: templateOptions,
+    defaultValue: C3_DEFAULTS.type
+  });
+  if (!type || !Object.keys(templateMap).includes(type)) {
+    return crash("An application type must be specified to continue.");
+  }
   const validatedArgs = {
     ...args,
-    projectName: await validateName(args.projectName, {
-      acceptDefault: args.wranglerDefaults
-    }),
-    type: await validateType(args.type, {
-      acceptDefault: args.wranglerDefaults
-    })
+    type,
+    projectName
   };
-  const { handler } = templateMap[validatedArgs.type];
+  const { handler } = templateMap[type];
   await handler(validatedArgs);
 };
 var printBanner = () => {
@@ -60923,42 +60952,17 @@ var parseArgs = async (argv) => {
   }).option("existing-script", {
     type: "string",
     hidden: templateMap["pre-existing"].hidden
+  }).option("accept-defaults", {
+    alias: "y",
+    type: "boolean"
   }).option("wrangler-defaults", { type: "boolean", hidden: true }).version(version).help().argv;
   return {
+    ...args.wranglerDefaults && WRANGLER_DEFAULTS,
+    ...args.acceptDefaults && C3_DEFAULTS,
     projectName: args._[0],
     ...args
   };
 };
-var validateName = async (name, { acceptDefault = false } = {}) => {
-  const defaultValue = name ?? new import_haikunator.default().haikunate({ tokenHex: true });
-  return textInput({
-    question: `In which directory do you want to create your application?`,
-    helpText: "also used as application name",
-    renderSubmitted: (value) => {
-      return `${brandColor("dir")} ${dim(value)}`;
-    },
-    defaultValue,
-    acceptDefault,
-    validate: (value) => validateProjectDirectory(value || defaultValue),
-    format: (val) => `./${val}`
-  });
-};
-var validateType = async (type, { acceptDefault = false } = {}) => {
-  const templateOptions = Object.entries(templateMap).filter(([_3, { hidden: hidden2 }]) => !hidden2).map(([value, { label }]) => ({ value, label }));
-  type = await selectInput({
-    question: "What type of application do you want to create?",
-    options: templateOptions,
-    renderSubmitted: (option) => {
-      return `${brandColor("type")} ${dim(option.label)}`;
-    },
-    defaultValue: type ?? "hello-world",
-    acceptDefault
-  });
-  if (!type || !Object.keys(templateMap).includes(type)) {
-    crash("An application type must be specified to continue.");
-  }
-  return type;
-};
 var templateMap = {
   webFramework: {
     label: "Website or web app",
@@ -60996,7 +61000,9 @@ var templateMap = {
 main(process.argv).catch((e) => crash(e));
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  main
+  C3_DEFAULTS,
+  main,
+  parseArgs
 });
 /*! Bundled license information:
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "create-cloudflare",
-	"version": "0.0.0-b032bf2e",
+	"version": "0.0.0-b58663a8",
 	"description": "A CLI for creating and deploying new applications to Cloudflare.",
 	"keywords": [
 		"cloudflare",

package/templates/common/js/package.json

@@ -7,7 +7,6 @@
 		"start": "wrangler dev"
 	},
 	"devDependencies": {
-		"@cloudflare/workers-types": "^4.20230419.0",
 		"itty-router": "^3.0.12",
 		"wrangler": "^3.0.0"
 	}

package/templates/hello-world/js/package.json

@@ -7,8 +7,6 @@
 		"start": "wrangler dev"
 	},
 	"devDependencies": {
-		"@cloudflare/workers-types": "^4.20230419.0",
-		"typescript": "^5.0.4",
 		"wrangler": "^3.0.0"
 	}
 }

package/templates/queues/js/package.json

@@ -7,8 +7,6 @@
 		"start": "wrangler dev"
 	},
 	"devDependencies": {
-		"@cloudflare/workers-types": "^4.20230419.0",
-		"typescript": "^5.0.4",
 		"wrangler": "^3.0.0"
 	}
 }

package/templates/scheduled/js/package.json

@@ -7,8 +7,6 @@
 		"start": "wrangler dev"
 	},
 	"devDependencies": {
-		"@cloudflare/workers-types": "^4.20230419.0",
-		"typescript": "^5.0.4",
 		"wrangler": "^3.0.0"
 	}
 }