cli: create: allow non-interactive create (#137)

This commit is contained in:
dswbx
2025-04-03 09:17:29 +02:00
committed by GitHub
parent a5ec40c517
commit 0b41aa5a2d
3 changed files with 30 additions and 20 deletions

View File

@@ -8,7 +8,7 @@ import { Option } from "commander";
import { env } from "core";
import color from "picocolors";
import { overridePackageJson, updateBkndPackages } from "./npm";
import { type Template, templates } from "./templates";
import { type Template, templates, type TemplateSetupCtx } from "./templates";
import { createScoped, flush } from "cli/utils/telemetry";
const config = {
@@ -35,6 +35,8 @@ export const create: CliCommand = (program) => {
.addOption(new Option("-i, --integration <integration>", "integration to use"))
.addOption(new Option("-t, --template <template>", "template to use"))
.addOption(new Option("-d --dir <directory>", "directory to create in"))
.addOption(new Option("-c, --clean", "cleans destination directory"))
.addOption(new Option("-y, --yes", "use defaults, skip skippable prompts"))
.description("create a new project")
.action(action);
};
@@ -53,7 +55,7 @@ async function onExit() {
await flush();
}
async function action(options: { template?: string; dir?: string; integration?: string }) {
async function action(options: { template?: string; dir?: string; integration?: string, yes?: boolean, clean?: boolean }) {
console.log("");
const $t = createScoped("create");
$t.capture("start", {
@@ -94,7 +96,7 @@ async function action(options: { template?: string; dir?: string; integration?:
$t.properties.at = "dir";
if (fs.existsSync(downloadOpts.dir)) {
const clean = await $p.confirm({
const clean = options.clean ?? await $p.confirm({
message: `Directory ${color.cyan(downloadOpts.dir)} exists. Clean it?`,
initialValue: false,
});
@@ -203,7 +205,7 @@ async function action(options: { template?: string; dir?: string; integration?:
}
$t.properties.template = template.key;
const ctx = { template, dir: downloadOpts.dir, name };
const ctx: TemplateSetupCtx = { template, dir: downloadOpts.dir, name, skip: !!options.yes };
{
const ref = env("cli_create_ref", `#v${version}`, {
@@ -259,7 +261,7 @@ async function action(options: { template?: string; dir?: string; integration?:
$p.log.success(`Updated package name to ${color.cyan(ctx.name)}`);
{
const install = await $p.confirm({
const install = options.yes ?? await $p.confirm({
message: "Install dependencies?",
});

View File

@@ -29,7 +29,7 @@ export const cloudflare = {
{ dir: ctx.dir },
);
const db = await $p.select({
const db = ctx.skip ? "d1" : await $p.select({
message: "What database do you want to use?",
options: [
{ label: "Cloudflare D1", value: "d1" },
@@ -63,10 +63,11 @@ export const cloudflare = {
} as const satisfies Template;
async function createD1(ctx: TemplateSetupCtx) {
const name = await $p.text({
const default_db = "data";
const name = ctx.skip ? default_db : await $p.text({
message: "Enter database name",
initialValue: "data",
placeholder: "data",
initialValue: default_db,
placeholder: default_db,
validate: (v) => {
if (!v) {
return "Invalid name";
@@ -84,12 +85,15 @@ async function createD1(ctx: TemplateSetupCtx) {
})(),
);
exec(`npx wrangler d1 create ${name}`);
await $p.stream.info(
(async function* () {
yield* typewriter("Please update your wrangler configuration with the output above.");
})(),
);
if (!ctx.skip) {
exec(`npx wrangler d1 create ${name}`);
await $p.stream.info(
(async function* () {
yield* typewriter("Please update your wrangler configuration with the output above.");
})(),
);
}
await overrideJson(
WRANGLER_FILE,
@@ -149,7 +153,7 @@ async function createLibsql(ctx: TemplateSetupCtx) {
}
async function createR2(ctx: TemplateSetupCtx) {
const create = await $p.confirm({
const create = ctx.skip ?? await $p.confirm({
message: "Do you want to use a R2 bucket?",
initialValue: true,
});
@@ -168,10 +172,11 @@ async function createR2(ctx: TemplateSetupCtx) {
return;
}
const name = await $p.text({
const default_bucket = "bucket";
const name = ctx.skip ? default_bucket : await $p.text({
message: "Enter bucket name",
initialValue: "bucket",
placeholder: "bucket",
initialValue: default_bucket,
placeholder: default_bucket,
validate: (v) => {
if (!v) {
return "Invalid name";
@@ -183,7 +188,9 @@ async function createR2(ctx: TemplateSetupCtx) {
process.exit(1);
}
exec(`npx wrangler r2 bucket create ${name}`);
if (!ctx.skip) {
exec(`npx wrangler r2 bucket create ${name}`);
}
await overrideJson(
WRANGLER_FILE,

View File

@@ -4,6 +4,7 @@ export type TemplateSetupCtx = {
template: Template;
dir: string;
name: string;
skip: boolean;
};
export type Integration =