@beignet/cli 0.0.31 → 0.0.32

package/src/provider-add.ts

@@ -1,6 +1,10 @@
 import { mkdir, readFile, stat, writeFile } from "node:fs/promises";
 import path from "node:path";
-import { type ProviderPresetName, providerPresetChoices } from "./choices.js";
+import {
+  type IntegrationName,
+  type ProviderPresetName,
+  providerPresetChoices,
+} from "./choices.js";
 import {
   directoryPath,
   loadBeignetConfig,
@@ -104,12 +108,105 @@ const presets: Record<ProviderPresetName, ProviderPreset> = {
       "Run beignet providers audit and beignet doctor --strict.",
     ],
   },
+  "jobs-bullmq": {
+    name: "jobs-bullmq",
+    displayName: "BullMQ jobs",
+    importName: "bullMQJobsProvider",
+    importFrom: "@beignet/provider-jobs-bullmq",
+    providerEntry: "bullMQJobsProvider",
+    dependencies: (packageJson) => ({
+      "@beignet/provider-jobs-bullmq": beignetDependencyVersion(packageJson),
+      bullmq: externalVersions.bullmq,
+    }),
+    appPort: {
+      key: "jobs",
+      typeName: "JobDispatcherPort",
+      importName: "JobDispatcherPort",
+      importFrom: "@beignet/core/ports",
+    },
+    envVars: ["BULLMQ_REDIS_URL"],
+    envExample: [
+      "# BullMQ jobs provider",
+      "BULLMQ_REDIS_URL=redis://localhost:6379",
+      "# BULLMQ_QUEUE_NAME=beignet-jobs",
+      "# BULLMQ_PREFIX=beignet",
+      "# BULLMQ_CONCURRENCY=5",
+      "",
+    ].join("\n"),
+    docs: [
+      "## BullMQ jobs",
+      "",
+      "- Package: `@beignet/provider-jobs-bullmq`",
+      "- Peer dependency: `bullmq`",
+      "- The preset wires `bullMQJobsProvider` in `server/providers.ts` and defers `jobs` in `infra/app-ports.ts`.",
+      "- Set `BULLMQ_REDIS_URL` before booting the app; the default points at local Redis.",
+      "- Dispatching enqueues jobs, but nothing executes them until a worker entrypoint runs `createBullMQJobWorker(...)` in a worker process. See the jobs docs page.",
+      "- Use `ctx.ports.jobs.dispatch(...)` in app code; `ctx.ports.bullMQJobs` is available as an escape hatch.",
+      "",
+    ].join("\n"),
+    nextSteps: [
+      "Run your package manager install command.",
+      "Set BULLMQ_REDIS_URL in .env.local or your deployment environment.",
+      "Add a worker entrypoint that runs createBullMQJobWorker(...) in a worker process; dispatched jobs do not execute without one. See the jobs docs page.",
+      "Run beignet providers audit and beignet doctor --strict.",
+    ],
+    conflictingProviderEntries: [
+      "inngestJobsProvider",
+      "createInngestJobsProvider",
+      "createBullMQJobsProvider",
+    ],
+  },
+  "jobs-inngest": {
+    name: "jobs-inngest",
+    displayName: "Inngest jobs",
+    importName: "inngestJobsProvider",
+    importFrom: "@beignet/provider-jobs-inngest",
+    providerEntry: "inngestJobsProvider",
+    dependencies: (packageJson) => ({
+      "@beignet/provider-jobs-inngest": beignetDependencyVersion(packageJson),
+      inngest: externalVersions.inngest,
+    }),
+    appPort: {
+      key: "jobs",
+      typeName: "JobDispatcherPort",
+      importName: "JobDispatcherPort",
+      importFrom: "@beignet/core/ports",
+    },
+    envVars: ["INNGEST_APP_NAME", "INNGEST_EVENT_KEY"],
+    envExample: [
+      "# Inngest jobs provider",
+      "INNGEST_APP_NAME=beignet-app",
+      "# INNGEST_EVENT_KEY=",
+      "",
+    ].join("\n"),
+    docs: [
+      "## Inngest jobs",
+      "",
+      "- Package: `@beignet/provider-jobs-inngest`",
+      "- Peer dependency: `inngest`",
+      "- The preset wires `inngestJobsProvider` in `server/providers.ts` and defers `jobs` in `infra/app-ports.ts`.",
+      "- Define jobs with `defineJob(...)` and dispatch them through `ctx.ports.jobs.dispatch(...)`.",
+      "- Execution needs an Inngest serve route built from `createInngestJobFunction(...)` and `serve(...)`. See the jobs docs page.",
+      "- Use `ctx.ports.inngest` only as an escape hatch for Inngest-specific workflow APIs; prefer `ctx.ports.jobs.dispatch(...)` for Beignet jobs.",
+      "",
+    ].join("\n"),
+    nextSteps: [
+      "Run your package manager install command.",
+      "Set INNGEST_APP_NAME and, for Inngest cloud, INNGEST_EVENT_KEY in .env.local or your deployment environment.",
+      "Expose an Inngest serve route with createInngestJobFunction(...) so dispatched jobs execute. See the jobs docs page.",
+      "Run beignet providers audit and beignet doctor --strict.",
+    ],
+    conflictingProviderEntries: [
+      "bullMQJobsProvider",
+      "createBullMQJobsProvider",
+    ],
+  },
   "mail-resend": {
     name: "mail-resend",
     displayName: "Resend mail",
-    importName: "mailResendProvider",
+    importName: "resendMailProvider",
     importFrom: "@beignet/provider-mail-resend",
-    providerEntry: "mailResendProvider",
+    providerEntry: "resendMailProvider",
     dependencies: (packageJson) => ({
       "@beignet/provider-mail-resend": beignetDependencyVersion(packageJson),
       resend: externalVersions.resend,
@@ -132,7 +229,7 @@ const presets: Record<ProviderPresetName, ProviderPreset> = {
       "",
       "- Package: `@beignet/provider-mail-resend`",
       "- Peer dependency: `resend`",
-      "- The preset wires `mailResendProvider` in `server/providers.ts` and defers `mailer` in `infra/app-ports.ts`.",
+      "- The preset wires `resendMailProvider` in `server/providers.ts` and defers `mailer` in `infra/app-ports.ts`.",
       "- `.env.example` ships dev placeholders so the app boots; set real `RESEND_API_KEY` and `RESEND_FROM` values before sending mail.",
       "- Use `ctx.ports.mailer` in app code; `ctx.ports.resend` is available as an escape hatch.",
       "",
@@ -143,16 +240,16 @@ const presets: Record<ProviderPresetName, ProviderPreset> = {
       "Run beignet providers audit and beignet doctor --strict.",
     ],
     conflictingProviderEntries: [
-      "mailSmtpProvider",
+      "smtpMailProvider",
       "createMemoryMailerProvider",
     ],
   },
   "mail-smtp": {
     name: "mail-smtp",
     displayName: "SMTP mail",
-    importName: "mailSmtpProvider",
+    importName: "smtpMailProvider",
     importFrom: "@beignet/provider-mail-smtp",
-    providerEntry: "mailSmtpProvider",
+    providerEntry: "smtpMailProvider",
     dependencies: (packageJson) => ({
       "@beignet/provider-mail-smtp": beignetDependencyVersion(packageJson),
       nodemailer: externalVersions.nodemailer,
@@ -178,7 +275,7 @@ const presets: Record<ProviderPresetName, ProviderPreset> = {
       "",
       "- Package: `@beignet/provider-mail-smtp`",
       "- Peer dependency: `nodemailer`",
-      "- The preset wires `mailSmtpProvider` in `server/providers.ts` and defers `mailer` in `infra/app-ports.ts`.",
+      "- The preset wires `smtpMailProvider` in `server/providers.ts` and defers `mailer` in `infra/app-ports.ts`.",
       "- `.env.example` ships dev placeholders so the app boots; set real `MAIL_*` values before sending mail.",
       "- Use `ctx.ports.mailer` in app code; `ctx.ports.smtp` is available as an escape hatch.",
       "",
@@ -189,10 +286,61 @@ const presets: Record<ProviderPresetName, ProviderPreset> = {
       "Run beignet providers audit and beignet doctor --strict.",
     ],
     conflictingProviderEntries: [
-      "mailResendProvider",
+      "resendMailProvider",
       "createMemoryMailerProvider",
     ],
   },
+  "payments-stripe": {
+    name: "payments-stripe",
+    displayName: "Stripe payments",
+    importName: "stripePaymentsProvider",
+    importFrom: "@beignet/provider-payments-stripe",
+    providerEntry: "stripePaymentsProvider",
+    dependencies: (packageJson) => ({
+      "@beignet/provider-payments-stripe":
+        beignetDependencyVersion(packageJson),
+      stripe: externalVersions.stripe,
+    }),
+    appPort: {
+      key: "payments",
+      typeName: "PaymentsPort",
+      importName: "PaymentsPort",
+      importFrom: "@beignet/core/payments",
+    },
+    envVars: [
+      "STRIPE_SECRET_KEY",
+      "STRIPE_WEBHOOK_SECRET",
+      "STRIPE_PUBLISHABLE_KEY",
+    ],
+    envExample: [
+      "# Stripe payments provider",
+      "STRIPE_SECRET_KEY=sk_test_dev-placeholder-change-me",
+      "STRIPE_WEBHOOK_SECRET=whsec_dev-placeholder-change-me",
+      "# STRIPE_PUBLISHABLE_KEY=",
+      "",
+    ].join("\n"),
+    docs: [
+      "## Stripe payments",
+      "",
+      "- Package: `@beignet/provider-payments-stripe`",
+      "- Peer dependency: `stripe`",
+      "- The preset wires `stripePaymentsProvider` in `server/providers.ts` and defers `payments` in `infra/app-ports.ts`.",
+      "- `.env.example` ships dev placeholders so the app boots; set real `STRIPE_SECRET_KEY` and `STRIPE_WEBHOOK_SECRET` values before taking payments.",
+      "- Stripe requires a webhook route: run `beignet make payments` for the full billing slice, including a `createPaymentWebhookRoute(...)` route.",
+      "- Use `ctx.ports.payments` in app code; `ctx.ports.stripe` is available as an escape hatch.",
+      "",
+    ].join("\n"),
+    nextSteps: [
+      "Run your package manager install command.",
+      "Set STRIPE_SECRET_KEY and STRIPE_WEBHOOK_SECRET in .env.local or your deployment environment.",
+      "Run beignet make payments for the full billing slice; Stripe needs its webhook route before subscription state can sync.",
+      "Run beignet providers audit and beignet doctor --strict.",
+    ],
+    conflictingProviderEntries: [
+      "createMemoryPaymentsProvider",
+      "createStripePaymentsProvider",
+    ],
+  },
   "search-meilisearch": {
     name: "search-meilisearch",
     displayName: "Meilisearch search",
@@ -271,11 +419,11 @@ const presets: Record<ProviderPresetName, ProviderPreset> = {
   "redis-cache": {
     name: "redis-cache",
     displayName: "Redis cache",
-    importName: "redisProvider",
-    importFrom: "@beignet/provider-redis",
-    providerEntry: "redisProvider",
+    importName: "redisCacheProvider",
+    importFrom: "@beignet/provider-cache-redis",
+    providerEntry: "redisCacheProvider",
     dependencies: (packageJson) => ({
-      "@beignet/provider-redis": beignetDependencyVersion(packageJson),
+      "@beignet/provider-cache-redis": beignetDependencyVersion(packageJson),
       ioredis: externalVersions.ioredis,
     }),
     appPort: {
@@ -294,9 +442,9 @@ const presets: Record<ProviderPresetName, ProviderPreset> = {
     docs: [
       "## Redis cache",
       "",
-      "- Package: `@beignet/provider-redis`",
+      "- Package: `@beignet/provider-cache-redis`",
       "- Peer dependency: `ioredis`",
-      "- The preset wires `redisProvider` in `server/providers.ts` and defers `cache` in `infra/app-ports.ts`.",
+      "- The preset wires `redisCacheProvider` in `server/providers.ts` and defers `cache` in `infra/app-ports.ts`.",
       "- Set `REDIS_URL` before booting the app.",
       "- Use `ctx.ports.cache` in app code; `ctx.ports.redis` is available as an escape hatch.",
       "",
@@ -364,7 +512,19 @@ const presets: Record<ProviderPresetName, ProviderPreset> = {
       importName: "StoragePort",
       importFrom: "@beignet/core/storage",
     },
-    envVars: ["STORAGE_S3_BUCKET"],
+    envVars: [
+      "STORAGE_S3_BUCKET",
+      "STORAGE_S3_REGION",
+      "STORAGE_S3_ENDPOINT",
+      "STORAGE_S3_PUBLIC_BASE_URL",
+      "STORAGE_S3_FORCE_PATH_STYLE",
+      "STORAGE_S3_KEY_PREFIX",
+      "STORAGE_S3_MAX_ATTEMPTS",
+      "STORAGE_S3_RETRY_MODE",
+      "STORAGE_S3_ACCESS_KEY_ID",
+      "STORAGE_S3_SECRET_ACCESS_KEY",
+      "STORAGE_S3_SESSION_TOKEN",
+    ],
     envExample: [
       "# S3-compatible storage provider",
       "STORAGE_S3_BUCKET=beignet-assets",
@@ -373,6 +533,8 @@ const presets: Record<ProviderPresetName, ProviderPreset> = {
       "# STORAGE_S3_PUBLIC_BASE_URL=",
       "# STORAGE_S3_FORCE_PATH_STYLE=false",
       "# STORAGE_S3_KEY_PREFIX=",
+      "# STORAGE_S3_MAX_ATTEMPTS=3",
+      "# STORAGE_S3_RETRY_MODE=standard",
       "# STORAGE_S3_ACCESS_KEY_ID=",
       "# STORAGE_S3_SECRET_ACCESS_KEY=",
       "# STORAGE_S3_SESSION_TOKEN=",
@@ -496,6 +658,51 @@ const presets: Record<ProviderPresetName, ProviderPreset> = {
 
 const providerPresetSet = new Set<string>(providerPresetChoices);
 
+/**
+ * Provider entries the starter template wires for each create-time
+ * integration, used to pre-validate preset selections at create time.
+ */
+const integrationProviderEntries: Record<IntegrationName, string> = {
+  inngest: "inngestJobsProvider",
+  resend: "resendMailProvider",
+  "upstash-rate-limit": "upstashRateLimitProvider",
+};
+
+/**
+ * Whether a preset ships `.env.example` entries the user must fill in.
+ */
+export function providerPresetNeedsEnv(name: ProviderPresetName): boolean {
+  return presets[name].envVars.length > 0;
+}
+
+/**
+ * Fail fast when a create-time selection combines presets or template
+ * integrations that fill the same app port, before any files are written.
+ */
+export function assertCompatibleCreatePresets(
+  presetNames: readonly ProviderPresetName[],
+  integrations: readonly IntegrationName[],
+): void {
+  const selectedEntries = new Map<string, string>();
+  for (const integration of integrations) {
+    selectedEntries.set(integrationProviderEntries[integration], integration);
+  }
+  for (const name of presetNames) {
+    selectedEntries.set(presets[name].providerEntry, name);
+  }
+
+  for (const name of presetNames) {
+    for (const conflict of presets[name].conflictingProviderEntries ?? []) {
+      const other = selectedEntries.get(conflict);
+      if (other !== undefined && other !== name) {
+        throw new Error(
+          `--integrations selections "${name}" and "${other}" fill the same app port. Pick one of them.`,
+        );
+      }
+    }
+  }
+}
+
 export async function addProviderPreset(
   options: AddProviderPresetOptions,
 ): Promise<AddProviderPresetResult> {

package/src/templates/base.ts

@@ -159,18 +159,10 @@ export function readme(ctx: TemplateContext): string {
     ctx.packageManager === "npm"
       ? "npm run test"
       : `${ctx.packageManager} run test`;
-  const lint =
-    ctx.packageManager === "npm"
-      ? "npm run lint"
-      : `${ctx.packageManager} run lint`;
   const format =
     ctx.packageManager === "npm"
       ? "npm run format"
       : `${ctx.packageManager} run format`;
-  const typecheck =
-    ctx.packageManager === "npm"
-      ? "npm run typecheck"
-      : `${ctx.packageManager} run typecheck`;
   const cli = packageRunner(ctx);
 
   const firstOpen = ctx.api
@@ -393,7 +385,7 @@ export function integrationsDoc(ctx: TemplateContext): string {
   for (const integration of ctx.integrations) {
     if (integration === "inngest") {
       lines.push(
-        "## Inngest",
+        "## Inngest jobs",
         "",
         "- Package: `@beignet/core` (`@beignet/core/events`, `@beignet/core/jobs`)",
         "- Package: `@beignet/provider-jobs-inngest`",
@@ -411,7 +403,7 @@ export function integrationsDoc(ctx: TemplateContext): string {
         "",
         "- Package: `@beignet/provider-mail-resend`",
         "- Peer dependency: `resend`",
-        "- The starter wires `mailResendProvider` in `server/providers.ts`.",
+        "- The starter wires `resendMailProvider` in `server/providers.ts`.",
         "- `.env.example` ships dev placeholders so the app boots; set real `RESEND_API_KEY` and `RESEND_FROM` values before sending mail.",
         "",
       );

package/src/templates/server.ts

@@ -15,9 +15,9 @@ export function serverProviders(ctx: TemplateContext): string {
     hasIntegration(ctx, "inngest")
       ? 'import { inngestJobsProvider } from "@beignet/provider-jobs-inngest";'
       : undefined,
-    'import { loggerPinoProvider } from "@beignet/provider-logger-pino";',
+    'import { pinoLoggerProvider } from "@beignet/provider-logger-pino";',
     hasIntegration(ctx, "resend")
-      ? 'import { mailResendProvider } from "@beignet/provider-mail-resend";'
+      ? 'import { resendMailProvider } from "@beignet/provider-mail-resend";'
       : undefined,
     hasIntegration(ctx, "upstash-rate-limit")
       ? 'import { upstashRateLimitProvider } from "@beignet/provider-rate-limit-upstash";'
@@ -31,11 +31,11 @@ export function serverProviders(ctx: TemplateContext): string {
   const entries = [
     "\tcreateDevtoolsProvider(),",
     "\tcreateAuthBetterAuthProvider<AuthUser, AuthSessionMetadata>(auth),",
-    "\tloggerPinoProvider,",
+    "\tpinoLoggerProvider,",
     `\t${db.providerInstance},`,
     "\tstarterDatabaseProvider,",
     hasIntegration(ctx, "inngest") ? "\tinngestJobsProvider," : undefined,
-    hasIntegration(ctx, "resend") ? "\tmailResendProvider," : undefined,
+    hasIntegration(ctx, "resend") ? "\tresendMailProvider," : undefined,
     hasIntegration(ctx, "upstash-rate-limit")
       ? "\tupstashRateLimitProvider,"
       : undefined,

package/src/templates/shared.ts

@@ -45,6 +45,7 @@ export const externalVersions = {
   hookformResolvers: "^5.0.0",
   reactHookForm: "^7.74.0",
   betterAuth: "1.6.20",
+  bullmq: "^5.0.0",
   drizzleKit: "^0.31.10",
   drizzleOrm: "^0.45.2",
   inngest: "^3.0.0",
@@ -56,6 +57,7 @@ export const externalVersions = {
   pino: "^9.7.0",
   resend: "^6.14.0",
   sentryNode: "^10.58.0",
+  stripe: "^22.2.1",
   nodemailer: "^8.0.5",
   openFeatureServerSdk: "^1.22.0",
   typesPg: "^8.11.0",