@beignet/cli 0.0.38 → 0.0.40

package/dist/index.js

@@ -2,7 +2,7 @@
 import { realpathSync } from "node:fs";
 import { fileURLToPath } from "node:url";
 import { buildApplication, buildCommand, buildRouteMap, proposeCompletions, run, text_en, } from "@stricli/core";
-import { completionShellChoices, createIntegrationChoices, databaseChoices, databaseStartCommand, makeFeatureAddonChoices, makeFeatureRecipeChoices, packageManagerChoices, providerPresetChoices, splitCreateIntegrations, templateChoices, } from "./choices.js";
+import { completionShellChoices, createProviderChoices, databaseChoices, databaseStartCommand, makeFeatureAddonChoices, makeFeatureRecipeChoices, packageManagerChoices, providerPresetChoices, splitCreateProviders, templateChoices, } from "./choices.js";
 import { getCliVersion } from "./version.js";
 const outputFormatChoices = [
     "human",
@@ -50,11 +50,17 @@ const parseDate = (input) => {
     }
     return value;
 };
-const forceFlag = {
+const createForceFlag = {
     kind: "boolean",
     optional: true,
     withNegated: false,
-    brief: "Overwrite conflicting files or write into a non-empty directory.",
+    brief: "Create the app in a non-empty directory and overwrite conflicts.",
+};
+const makeForceFlag = {
+    kind: "boolean",
+    optional: true,
+    withNegated: false,
+    brief: "Overwrite conflicting generated files.",
 };
 const dryRunFlag = {
     kind: "boolean",
@@ -86,7 +92,7 @@ const parsedDateFlag = (brief) => ({
     optional: true,
     brief,
 });
-const cwdFlag = parsedStringFlag("App directory to inspect. Defaults to the current working directory.");
+const cwdFlag = parsedStringFlag("App directory. Defaults to the current working directory.");
 const formatFlag = {
     kind: "enum",
     values: outputFormatChoices,
@@ -94,9 +100,10 @@ const formatFlag = {
     brief: "Output format. Defaults to human, or github when GITHUB_ACTIONS=true.",
 };
 const makeFlagParameters = {
-    force: forceFlag,
+    force: makeForceFlag,
     dryRun: dryRunFlag,
     json: jsonFlag,
+    cwd: cwdFlag,
 };
 const routesFlagParameters = {
     json: jsonFlag,
@@ -119,6 +126,7 @@ const providerAddFlagParameters = {
 const dbFlagParameters = {
     json: jsonFlag,
     dryRun: dryRunFlag,
+    cwd: cwdFlag,
 };
 const dbSchemaSyncFlagParameters = {
     ...dbFlagParameters,
@@ -142,6 +150,7 @@ const taskRunFlagParameters = {
     input: parsedStringFlag("JSON input passed to the task schema."),
     tenant: parsedStringFlag("Tenant id or slug passed to the app's createTaskContext, separate from task input."),
     module: parsedStringFlag("Task registry module. Defaults to server/tasks.ts."),
+    cwd: cwdFlag,
 };
 const outboxDrainFlagParameters = {
     json: jsonFlag,
@@ -152,6 +161,7 @@ const outboxDrainFlagParameters = {
         optional: true,
         brief: "Maximum messages to claim in one drain pass.",
     },
+    cwd: cwdFlag,
 };
 const outboxListFlagParameters = {
     json: jsonFlag,
@@ -175,10 +185,12 @@ const outboxListFlagParameters = {
         optional: true,
         brief: "Maximum messages to return. Defaults to 50.",
     },
+    cwd: cwdFlag,
 };
 const outboxShowFlagParameters = {
     json: jsonFlag,
     module: parsedStringFlag("Outbox registry module. Defaults to server/outbox.ts."),
+    cwd: cwdFlag,
 };
 const outboxRequeueFlagParameters = {
     json: jsonFlag,
@@ -190,6 +202,7 @@ const outboxRequeueFlagParameters = {
         withNegated: false,
         brief: "Reset attempts to zero before requeueing.",
     },
+    cwd: cwdFlag,
 };
 const outboxPurgeFlagParameters = {
     json: jsonFlag,
@@ -208,6 +221,7 @@ const outboxPurgeFlagParameters = {
         brief: "Maximum messages to purge.",
     },
     dryRun: operationDryRunFlag,
+    cwd: cwdFlag,
 };
 const outboxPruneFlagParameters = {
     json: jsonFlag,
@@ -220,12 +234,13 @@ const outboxPruneFlagParameters = {
         brief: "Maximum messages to prune.",
     },
     dryRun: operationDryRunFlag,
+    cwd: cwdFlag,
 };
 const scheduleRunFlagParameters = {
     json: jsonFlag,
     module: parsedStringFlag("Schedule registry module. Defaults to server/schedules.ts."),
     payload: parsedStringFlag("JSON payload passed to the schedule schema."),
-    id: parsedStringFlag("Provider or app schedule run ID."),
+    runId: parsedStringFlag("Provider or app schedule run ID."),
     attempt: {
         kind: "parsed",
         parse: parsePositiveInteger,
@@ -235,6 +250,7 @@ const scheduleRunFlagParameters = {
     scheduledAt: parsedStringFlag("Provider scheduled timestamp."),
     triggeredAt: parsedStringFlag("Schedule trigger timestamp."),
     source: parsedStringFlag("Provider or app source label."),
+    cwd: cwdFlag,
 };
 const namePositional = {
     kind: "tuple",
@@ -289,11 +305,11 @@ and a shadcn UI shell. Pass --api for an API-only scaffold without the
 UI shell, and --db to choose the database.
 
 Available databases: ${databaseChoices.join(", ")}
-Available integrations: ${createIntegrationChoices.join(", ")}
+Available providers: ${createProviderChoices.join(", ")}
 
---integrations accepts the starter template integrations plus the full
-beignet providers add preset catalog; presets are applied to the scaffold
-with the same machinery as beignet providers add.
+--providers accepts the full beignet provider add preset catalog. Providers
+with starter-native setup are rendered directly; the rest use the same
+machinery as beignet provider add.
 
 Running create on an interactive terminal without selection flags opens a
 prompt-based setup. Pass --yes or any selection flag to skip the prompts.`,
@@ -324,12 +340,12 @@ prompt-based setup. Pass --yes or any selection flag to skip the prompts.`,
                 optional: true,
                 brief: "Package manager to use in next-step commands.",
             },
-            integrations: {
+            providers: {
                 kind: "enum",
-                values: createIntegrationChoices,
+                values: createProviderChoices,
                 optional: true,
                 variadic: ",",
-                brief: "Add first-party integrations or provider presets as a comma-separated list.",
+                brief: "Add provider presets as a comma-separated list.",
             },
             yes: {
                 kind: "boolean",
@@ -337,7 +353,7 @@ prompt-based setup. Pass --yes or any selection flag to skip the prompts.`,
                 withNegated: false,
                 brief: "Skip interactive prompts and use the defaults.",
             },
-            force: forceFlag,
+            force: createForceFlag,
             dryRun: dryRunFlag,
             json: jsonFlag,
         },
@@ -354,14 +370,14 @@ prompt-based setup. Pass --yes or any selection flag to skip the prompts.`,
         },
     },
     loader: async () => {
-        const { createProject } = await import("./create.js");
+        const { createProject, planCreateProject } = await import("./create.js");
         const { promptCreateSelections, shouldPromptInteractively } = await import("./create-prompts.js");
         return async function runCreate(flags, directory) {
             let selections = {
                 directory,
                 api: flags.api,
                 db: flags.db,
-                integrations: flags.integrations,
+                providers: flags.providers,
                 packageManager: flags.packageManager,
             };
             const interactive = shouldPromptInteractively({ ...selections, yes: flags.yes }, {
@@ -382,34 +398,65 @@ prompt-based setup. Pass --yes or any selection flag to skip the prompts.`,
             }
             const api = selections.api ?? false;
             const database = selections.db ?? "sqlite";
-            const { integrations, presets } = splitCreateIntegrations(uniqueValues([...(selections.integrations ?? [])]));
+            const { starterProviders, presets } = splitCreateProviders(uniqueValues([...(selections.providers ?? [])]));
             let presetsNeedEnv = false;
             if (presets.length > 0) {
                 const { assertCompatibleCreatePresets, providerPresetNeedsEnv } = await import("./provider-add.js");
-                assertCompatibleCreatePresets(presets, integrations);
+                assertCompatibleCreatePresets(presets, starterProviders);
                 presetsNeedEnv = presets.some(providerPresetNeedsEnv);
             }
-            const result = await createProject({
+            const createOptions = {
                 name: selections.directory,
                 template: flags.template,
                 api,
                 packageManager: selections.packageManager,
-                integrations,
+                providers: starterProviders,
                 db: database,
                 force: Boolean(flags.force),
                 dryRun: Boolean(flags.dryRun),
-            });
+            };
+            let result;
+            if (flags.dryRun) {
+                const plan = await planCreateProject(createOptions);
+                if (presets.length === 0) {
+                    result = plan.result;
+                }
+                else {
+                    const { planProviderPresetsForCreate } = await import("./provider-add.js");
+                    const providerPlan = await planProviderPresetsForCreate({
+                        targetDir: plan.result.targetDir,
+                        files: plan.files,
+                        names: presets,
+                    });
+                    result = {
+                        ...plan.result,
+                        files: providerPlan.files.map((file) => file.path),
+                    };
+                }
+            }
+            else {
+                result = await createProject(createOptions);
+            }
             if (!flags.dryRun && presets.length > 0) {
                 const { addProviderPreset } = await import("./provider-add.js");
+                const presetFiles = [];
                 for (const preset of presets) {
-                    await addProviderPreset({ name: preset, cwd: result.targetDir });
+                    const presetResult = await addProviderPreset({
+                        name: preset,
+                        cwd: result.targetDir,
+                    });
+                    presetFiles.push(...presetResult.files);
                 }
+                result = {
+                    ...result,
+                    files: uniqueValues([...result.files, ...presetFiles]),
+                };
             }
             writeOutput(this, flags.json
-                ? JSON.stringify({ ...result, providerPresets: presets }, null, 2)
+                ? JSON.stringify({ ...result, providers: selections.providers ?? [] }, null, 2)
                 : nextSteps(result, {
                     api,
-                    integrations,
+                    providers: starterProviders,
                     database,
                     presets,
                     presetsNeedEnv,
@@ -679,6 +726,7 @@ function databaseCommand(command) {
             return async function runDb(flags) {
                 const result = await runDatabaseCommand({
                     command,
+                    cwd: flags.cwd,
                     captureOutput: Boolean(flags.json),
                     dryRun: Boolean(flags.dryRun),
                 });
@@ -704,6 +752,7 @@ const dbSchemaSyncCommand = buildCommand({
         const { syncDatabaseSchema } = await import("./db.js");
         return async function runDbSchemaSync(flags) {
             const result = await syncDatabaseSchema({
+                cwd: flags.cwd,
                 dialect: flags.dialect,
                 tables: flags.tables,
                 output: flags.output,
@@ -748,6 +797,7 @@ const taskRunCommand = buildCommand({
         return async function runTask(flags, name) {
             const result = await runAppTask({
                 name,
+                cwd: flags.cwd,
                 input: flags.input,
                 tenant: flags.tenant,
                 modulePath: flags.module,
@@ -777,6 +827,7 @@ const outboxDrainCommand = buildCommand({
         const { runOutboxDrain } = await import("./outbox.js");
         return async function runDrain(flags) {
             const result = await runOutboxDrain({
+                cwd: flags.cwd,
                 modulePath: flags.module,
                 batchSize: flags.batchSize,
             });
@@ -797,6 +848,7 @@ const outboxListCommand = buildCommand({
         const { runOutboxList } = await import("./outbox.js");
         return async function runList(flags) {
             const result = await runOutboxList({
+                cwd: flags.cwd,
                 modulePath: flags.module,
                 status: flags.status,
                 kind: flags.kind,
@@ -821,6 +873,7 @@ const outboxShowCommand = buildCommand({
         const { runOutboxShow } = await import("./outbox.js");
         return async function runShow(flags, id) {
             const result = await runOutboxShow({
+                cwd: flags.cwd,
                 modulePath: flags.module,
                 id,
             });
@@ -842,6 +895,7 @@ const outboxRequeueCommand = buildCommand({
         const { runOutboxRequeue } = await import("./outbox.js");
         return async function runRequeue(flags, id) {
             const result = await runOutboxRequeue({
+                cwd: flags.cwd,
                 modulePath: flags.module,
                 id,
                 availableAt: flags.availableAt,
@@ -864,6 +918,7 @@ const outboxPurgeCommand = buildCommand({
         const { runOutboxPurge } = await import("./outbox.js");
         return async function runPurge(flags) {
             const result = await runOutboxPurge({
+                cwd: flags.cwd,
                 modulePath: flags.module,
                 before: flags.before,
                 all: Boolean(flags.all),
@@ -890,6 +945,7 @@ const outboxPruneCommand = buildCommand({
                 throw new Error("Pass --before <date> to prune delivered messages.");
             }
             const result = await runOutboxPrune({
+                cwd: flags.cwd,
                 modulePath: flags.module,
                 before: flags.before,
                 limit: flags.limit,
@@ -927,9 +983,10 @@ const scheduleRunCommand = buildCommand({
         return async function runSchedule(flags, name) {
             const result = await runAppSchedule({
                 name,
+                cwd: flags.cwd,
                 modulePath: flags.module,
                 payload: flags.payload,
-                id: flags.id,
+                id: flags.runId,
                 attempt: flags.attempt,
                 scheduledAt: flags.scheduledAt,
                 triggeredAt: flags.triggeredAt,
@@ -1012,13 +1069,13 @@ const makeResourceCommand = buildCommand({
     parameters: {
         flags: {
             ...makeFlagParameters,
-            auth: {
+            authorization: {
                 kind: "boolean",
                 optional: true,
                 withNegated: false,
                 brief: "Generate policy metadata and use-case authorization checks for mutating routes.",
             },
-            tenant: {
+            tenantScoped: {
                 kind: "boolean",
                 optional: true,
                 withNegated: false,
@@ -1044,10 +1101,11 @@ const makeResourceCommand = buildCommand({
         return async function runMakeResource(flags, name) {
             const result = await makeResource({
                 name,
+                cwd: flags.cwd,
                 force: Boolean(flags.force),
                 dryRun: Boolean(flags.dryRun),
-                auth: Boolean(flags.auth),
-                tenant: Boolean(flags.tenant),
+                authorization: Boolean(flags.authorization),
+                tenantScoped: Boolean(flags.tenantScoped),
                 events: Boolean(flags.events),
                 softDelete: Boolean(flags.softDelete),
             });
@@ -1069,7 +1127,7 @@ const makeFeatureCommand = buildCommand({
                 values: makeFeatureAddonChoices,
                 optional: true,
                 variadic: ",",
-                brief: "Add feature-owned artifacts. Supports policy, factory/factories, seed/seeds, task/tasks, event/events, listener/listeners, job/jobs, notification/notifications, schedule/schedules, ui, and upload/uploads.",
+                brief: "Add feature-owned artifacts. Supports policy, factory, seed, task, event, listener, job, notification, schedule, ui, and upload.",
             },
             recipe: {
                 kind: "enum",
@@ -1085,6 +1143,7 @@ const makeFeatureCommand = buildCommand({
         return async function runMakeFeature(flags, name) {
             const result = await makeFeature({
                 name,
+                cwd: flags.cwd,
                 with: flags.with,
                 recipe: flags.recipe,
                 force: Boolean(flags.force),
@@ -1110,6 +1169,7 @@ function simpleMakeCommand(generator, brief, formatNextSteps) {
             return async function runMake(flags, name) {
                 const result = await generators[generator]({
                     name,
+                    cwd: flags.cwd,
                     force: Boolean(flags.force),
                     dryRun: Boolean(flags.dryRun),
                 });
@@ -1120,6 +1180,38 @@ function simpleMakeCommand(generator, brief, formatNextSteps) {
         },
     });
 }
+const makeUploadCommand = buildCommand({
+    docs: {
+        brief: "Generate a feature upload.",
+    },
+    parameters: {
+        flags: {
+            ...makeFlagParameters,
+            ui: {
+                kind: "boolean",
+                optional: true,
+                withNegated: false,
+                brief: "Generate a typed React upload client, uploader component, and component test.",
+            },
+        },
+        positional: namePositional,
+    },
+    loader: async () => {
+        const { makeUpload } = await import("./make.js");
+        return async function runMakeUpload(flags, name) {
+            const result = await makeUpload({
+                name,
+                cwd: flags.cwd,
+                force: Boolean(flags.force),
+                dryRun: Boolean(flags.dryRun),
+                ui: Boolean(flags.ui),
+            });
+            writeOutput(this, flags.json
+                ? JSON.stringify(result, null, 2)
+                : makeUploadNextSteps(result));
+        };
+    },
+});
 const makeListenerCommand = buildCommand({
     docs: {
         brief: "Generate a feature event listener.",
@@ -1127,7 +1219,7 @@ const makeListenerCommand = buildCommand({
     parameters: {
         flags: {
             ...makeFlagParameters,
-            event: parsedStringFlag("Event to listen to, for example posts/published."),
+            event: parsedStringFlag("Event to listen to, for example posts.published."),
         },
         positional: namePositional,
     },
@@ -1135,10 +1227,11 @@ const makeListenerCommand = buildCommand({
         const { makeListener } = await import("./make.js");
         return async function runMakeListener(flags, name) {
             if (!flags.event) {
-                throw new Error("beignet make listener requires --event feature/name, for example --event posts/published.");
+                throw new Error("beignet make listener requires --event feature.name, for example --event posts.published.");
             }
             const result = await makeListener({
                 name,
+                cwd: flags.cwd,
                 event: flags.event,
                 force: Boolean(flags.force),
                 dryRun: Boolean(flags.dryRun),
@@ -1172,6 +1265,7 @@ const makeScheduleCommand = buildCommand({
         return async function runMakeSchedule(flags, name) {
             const result = await makeSchedule({
                 name,
+                cwd: flags.cwd,
                 cron: flags.cron,
                 timezone: flags.timezone,
                 route: Boolean(flags.route),
@@ -1195,6 +1289,7 @@ const makePaymentsCommand = buildCommand({
         const { makePayments, makePaymentsNextStepLines } = await import("./make.js");
         return async function runMakePayments(flags) {
             const result = await makePayments({
+                cwd: flags.cwd,
                 force: Boolean(flags.force),
                 dryRun: Boolean(flags.dryRun),
             });
@@ -1215,6 +1310,7 @@ const makeTenancyCommand = buildCommand({
         const { makeTenancy, makeTenancyNextStepLines } = await import("./make.js");
         return async function runMakeTenancy(flags) {
             const result = await makeTenancy({
+                cwd: flags.cwd,
                 force: Boolean(flags.force),
                 dryRun: Boolean(flags.dryRun),
             });
@@ -1235,6 +1331,7 @@ const makeInboxCommand = buildCommand({
         const { makeInbox, makeInboxNextStepLines } = await import("./make.js");
         return async function runMakeInbox(flags) {
             const result = await makeInbox({
+                cwd: flags.cwd,
                 force: Boolean(flags.force),
                 dryRun: Boolean(flags.dryRun),
             });
@@ -1255,6 +1352,7 @@ const makeOutboxCommand = buildCommand({
         const { makeOutbox } = await import("./make.js");
         return async function runMakeOutbox(flags) {
             const result = await makeOutbox({
+                cwd: flags.cwd,
                 force: Boolean(flags.force),
                 dryRun: Boolean(flags.dryRun),
             });
@@ -1288,7 +1386,7 @@ const makeRoutes = buildRouteMap({
         task: simpleMakeCommand("makeTask", "Generate a feature operational task.", makeTaskNextSteps),
         tenancy: makeTenancyCommand,
         test: simpleMakeCommand("makeTest", "Generate a use case test.", makeTestNextSteps),
-        upload: simpleMakeCommand("makeUpload", "Generate a feature upload.", makeUploadNextSteps),
+        upload: makeUploadCommand,
         useCase: simpleMakeCommand("makeUseCase", "Generate a use case.", makeUseCaseNextSteps),
     },
 });
@@ -1310,15 +1408,11 @@ Run npm create beignet@latest (or bun create beignet) to scaffold a new app.`,
         mcp: mcpCommand,
         outbox: outboxRoutes,
         preflight: preflightCommand,
-        providers: providerRoutes,
+        provider: providerRoutes,
         routes: routesCommand,
         schedule: scheduleRoutes,
         task: taskRoutes,
     },
-    aliases: {
-        // The singular form is a common near-miss for the providers commands.
-        provider: "providers",
-    },
 });
 const cli = buildApplication(rootRoutes, {
     name: "beignet",
@@ -1433,7 +1527,7 @@ function nextSteps(result, options = {}) {
     if (result.dryRun) {
         const plannedFiles = result.files.map((file) => `  ${file}`).join("\n");
         const plannedPresets = options.presets && options.presets.length > 0
-            ? `\n\nProvider presets applied after scaffold (skipped in dry run):\n${options.presets
+            ? `\n\nProvider presets included in this plan:\n${options.presets
                 .map((preset) => `  ${preset}`)
                 .join("\n")}`
             : "";
@@ -1445,14 +1539,14 @@ ${plannedFiles}${plannedPresets}`;
     const pm = result.packageManager;
     const run = pm === "npm" ? "npm run" : `${pm} run`;
     const cli = packageRunnerFromPackageManager(pm);
-    const envRequiredIntegrations = options.integrations?.filter(isEnvRequiredProviderIntegration) ?? [];
-    const envStep = envRequiredIntegrations.length > 0 || options.presetsNeedEnv
-        ? "  Fill .env.local for selected provider integrations before starting the app.\n"
+    const envRequiredProviders = options.providers?.filter(isEnvRequiredStarterProvider) ?? [];
+    const envStep = envRequiredProviders.length > 0 || options.presetsNeedEnv
+        ? "  Fill .env.local for selected providers before starting the app.\n"
         : "";
     const presetSection = options.presets && options.presets.length > 0
         ? `\nProvider presets applied:\n${options.presets
             .map((preset) => `  ${preset}`)
-            .join("\n")}\n  See docs/integrations.md for setup notes and follow-up steps.\n`
+            .join("\n")}\n  See docs/providers.md for setup notes and follow-up steps.\n`
         : "";
     const openStep = options.api
         ? "  open http://localhost:3000 for the API landing page"
@@ -1502,10 +1596,10 @@ function packageRunnerFromPackageManager(pm) {
             return "bun beignet";
     }
 }
-function isEnvRequiredProviderIntegration(integration) {
-    return (integration === "inngest" ||
-        integration === "resend" ||
-        integration === "upstash-rate-limit");
+function isEnvRequiredStarterProvider(provider) {
+    return (provider === "jobs-inngest" ||
+        provider === "mail-resend" ||
+        provider === "rate-limit-upstash");
 }
 function changedFileLines(result) {
     return {
@@ -1676,8 +1770,16 @@ function makeScheduleNextSteps(result, options = {}) {
     ]);
 }
 function makeUploadNextSteps(result) {
+    const includesUi = result.files.some((file) => file.endsWith("-uploader.tsx"));
     return makeNextSteps(result, "upload", [
         "Replace the starter metadata, constraints, key, authorization, and onComplete behavior.",
+        ...(includesUi
+            ? [
+                "Render the generated uploader with its required resourceId and connect onComplete to refresh the owning view.",
+            ]
+            : [
+                "Add --ui in a full-stack app when you want a typed upload client, component, and component test.",
+            ]),
         "Use the generated upload route for local development, then swap the local storage provider for S3-compatible storage before production.",
     ]);
 }