@beignet/cli 0.0.32 → 0.0.33

package/src/make/inbox.ts

@@ -7,6 +7,7 @@ import {
   resolveConfig,
 } from "../config.js";
 import { addNamedValueImport, appendToNamedArray } from "../registry-edits.js";
+import { testSupportTemplateFiles } from "../templates/testing.js";
 import {
   aliasModule,
   appendSharedErrorEntries,
@@ -160,7 +161,7 @@ export async function makeInbox(
   const files = generatedFiles.map((file) => file.path);
   const dryRun = Boolean(options.dryRun);
   const inboxSeedNames = seedNames("inbox/demo-inbox");
-  const seedScript = { "db:seed": `bun ${seedEntrypointPath(config)}` };
+  const seedScript = { "db:seed": `tsx ${seedEntrypointPath(config)}` };
 
   const recordSeedEntrypoint = (result: "created" | "updated" | "skipped") => {
     const entrypoint = seedEntrypointPath(config);
@@ -399,6 +400,7 @@ export function inboxFiles(
     path.join(config.paths.features, "inbox", file);
 
   const files: GeneratedFile[] = [
+    ...testSupportTemplateFiles,
     { path: featureDir("schemas.ts"), content: inboxSchemasFile() },
     { path: featureDir("ports.ts"), content: inboxPortsFile() },
     { path: featureDir("channel.ts"), content: inboxChannelFile(config) },
@@ -1109,7 +1111,7 @@ export function createMemoryInboxRepository(
 }
 
 export function inboxTestFile(config: ResolvedBeignetConfig): string {
-  return `import { describe, expect, it } from "bun:test";
+  return `import { describe, expect, it } from "@/lib/beignet-test";
 import { createUseCaseTester } from "@beignet/core/application";
 import { createAnonymousActor } from "@beignet/core/ports";
 import { createTestUserActor } from "@beignet/core/ports/testing";
@@ -1292,7 +1294,7 @@ export function inboxChannelTestFile(config: ResolvedBeignetConfig): string {
     path.join(config.paths.features, "inbox/channel.ts"),
   );
 
-  return `import { describe, expect, it } from "bun:test";
+  return `import { describe, expect, it } from "@/lib/beignet-test";
 import { createTestSystemActor } from "@beignet/core/ports/testing";
 import {
 \tcreateTestContextFactory,

package/src/make/payments.ts

@@ -7,6 +7,7 @@ import {
   resolveConfig,
 } from "../config.js";
 import { appendToNamedArray, insertAfterImports } from "../registry-edits.js";
+import { testSupportTemplateFiles } from "../templates/testing.js";
 import {
   addNamedTypeImport,
   aliasModule,
@@ -200,9 +201,11 @@ export function makePaymentsNextStepLines(
     'Gate paid actions once usage passes FREE_PLAN_LIMITS: await requireEntitlement(ctx, { entitlement: "todos.create", subject: { type: "tenant", id: tenantId } });',
     ...(hasPlanUi
       ? [
-          "Users manage their plan at /settings/plan; run bun run db:seed to create the demo billing account.",
+          "Users manage their plan at /settings/plan; run your db:seed package script to create the demo billing account.",
         ]
-      : ["Run bun run db:seed to create the demo billing account."]),
+      : [
+          "Run your db:seed package script to create the demo billing account.",
+        ]),
     "Use createMemoryPaymentsProvider() for local development, then swap server/providers.ts to stripePaymentsProvider when STRIPE_SECRET_KEY and STRIPE_WEBHOOK_SECRET are configured.",
     "Billing accounts fall back to the user id today; after beignet make tenancy they become workspace-scoped automatically.",
     "Run your app's test, lint, and typecheck commands, then beignet lint and beignet doctor.",
@@ -223,7 +226,7 @@ export async function updatePaymentsWiring(
   if (
     await updatePackageScripts(
       targetDir,
-      { "db:seed": `bun ${seedEntrypointPath(config)}` },
+      { "db:seed": `tsx ${seedEntrypointPath(config)}` },
       { dryRun: options.dryRun },
     )
   ) {
@@ -590,6 +593,7 @@ export function paymentsFiles(
     : [];
 
   return [
+    ...testSupportTemplateFiles,
     {
       path: path.join(config.paths.features, "billing/schemas.ts"),
       content: billingSchemasFile(),
@@ -755,6 +759,8 @@ export function billingEntitlementsFile(): string {
 \tcreateEntitlements,
 \tdenyEntitlement,
 } from "@beignet/core/entitlements";
+import { createTenant } from "@beignet/core/ports";
+import { createTenantScope } from "@beignet/core/tenancy";
 import { isBillingAccountActive, type BillingRepository } from "./ports";
 import { billingPlanIncludesEntitlement } from "./pricing";
 import type { BillingPlan } from "./schemas";
@@ -777,7 +783,9 @@ export function createBillingEntitlements(billing: BillingRepository) {
 \t\t\t\t});
 \t\t\t}
 
-\t\t\tconst account = await billing.findByTenantId(input.subject.id);
+\t\t\tconst account = await billing.findByTenantScope(
+\t\t\t\tcreateTenantScope(createTenant(input.subject.id)),
+\t\t\t);
 \t\t\tconst plan: BillingPlan = isBillingAccountActive(account)
 \t\t\t\t? account.plan
 \t\t\t\t: "free";
@@ -803,7 +811,8 @@ export function createBillingEntitlements(billing: BillingRepository) {
 }
 
 export function billingPortsFile(): string {
-  return `import type { BillingPlan, BillingStatus } from "./schemas";
+  return `import type { TenantScope } from "@beignet/core/tenancy";
+import type { BillingPlan, BillingStatus } from "./schemas";
 
 export type BillingAccount = {
 \ttenantId: string;
@@ -822,7 +831,7 @@ export type BillingAccount = {
 export type SaveBillingAccountInput = BillingAccount;
 
 export interface BillingRepository {
-\tfindByTenantId(tenantId: string): Promise<BillingAccount | null>;
+\tfindByTenantScope(scope: TenantScope): Promise<BillingAccount | null>;
 \tfindByCustomerId(
 \t\tcustomerId: string,
 \t\tprovider: string,
@@ -917,7 +926,12 @@ export function billingUseCasesFile(config: ResolvedBeignetConfig): string {
 \trunIdempotently,
 } from "@beignet/core/idempotency";
 import type { PaymentWebhookEvent } from "@beignet/core/payments";
-import { requireUser } from "@beignet/core/ports";
+import { createTenant, requireUser } from "@beignet/core/ports";
+import {
+	createTenantScope,
+	type TenantScope,
+	tenantScopeId,
+} from "@beignet/core/tenancy";
 import { z } from "zod";
 import type { AppContext } from "${aliasModule(config.paths.appContext)}";
 import { appError } from "@/features/shared/errors";
@@ -1029,9 +1043,9 @@ function cancelAtPeriodEndFromPayload(
 \t\t: undefined;
 }
 
-function billingTenantId(ctx: AppContext): string {
+function billingTenantScope(ctx: AppContext): TenantScope {
 \tconst user = requireUser(ctx);
-\treturn ctx.tenant?.id ?? user.id;
+\treturn createTenantScope(createTenant(ctx.tenant?.id ?? user.id));
 }
 
 function billingStatusOutput(tenantId: string, account: BillingAccount | null) {
@@ -1100,13 +1114,15 @@ async function saveBillingAccount(args: {
 async function applyCheckoutCompleted(
 \tevent: PaymentWebhookEvent,
 \tsave: (account: BillingAccount) => Promise<BillingAccount>,
-\tfindByTenantId: (tenantId: string) => Promise<BillingAccount | null>,
+\tfindByTenantScope: (scope: TenantScope) => Promise<BillingAccount | null>,
 ) {
 \tconst data = record(event.data);
 \tconst tenantId = tenantIdFromPayload(data);
 \tif (!tenantId) return null;
 
-\tconst existing = await findByTenantId(tenantId);
+\tconst existing = await findByTenantScope(
+\t\tcreateTenantScope(createTenant(tenantId)),
+\t);
 \treturn saveBillingAccount({
 \t\texisting,
 \t\ttenantId,
@@ -1128,13 +1144,13 @@ async function applySubscriptionEvent(
 \t\tcustomerId: string,
 \t\tprovider: string,
 \t) => Promise<BillingAccount | null>,
-\tfindByTenantId: (tenantId: string) => Promise<BillingAccount | null>,
+\tfindByTenantScope: (scope: TenantScope) => Promise<BillingAccount | null>,
 ) {
 \tconst data = record(event.data);
 \tconst customerId = providerId(data.customer);
 \tconst explicitTenantId = tenantIdFromPayload(data);
 \tconst existing = explicitTenantId
-\t\t? await findByTenantId(explicitTenantId)
+\t\t? await findByTenantScope(createTenantScope(createTenant(explicitTenantId)))
 \t\t: customerId
 \t\t\t? await findByCustomerId(customerId, event.provider)
 \t\t\t: null;
@@ -1224,8 +1240,9 @@ export const getBillingStatusUseCase = useCase
 \t.input(z.object({}))
 \t.output(billingStatusOutputSchema)
 \t.run(async ({ ctx }) => {
-\t\tconst tenantId = billingTenantId(ctx);
-\t\tconst account = await ctx.ports.billing.findByTenantId(tenantId);
+\t\tconst scope = billingTenantScope(ctx);
+\t\tconst tenantId = tenantScopeId(scope);
+\t\tconst account = await ctx.ports.billing.findByTenantScope(scope);
 \t\treturn billingStatusOutput(tenantId, account);
 \t});
 
@@ -1234,8 +1251,9 @@ export const createCheckoutSessionUseCase = useCase
 \t.input(createCheckoutSessionInputSchema)
 \t.output(createCheckoutSessionOutputSchema)
 \t.run(async ({ ctx, input }) => {
-\t\tconst tenantId = billingTenantId(ctx);
-\t\tconst account = await ctx.ports.billing.findByTenantId(tenantId);
+\t\tconst scope = billingTenantScope(ctx);
+\t\tconst tenantId = tenantScopeId(scope);
+\t\tconst account = await ctx.ports.billing.findByTenantScope(scope);
 \t\tconst plan = getBillingPlan(input.plan);
 \t\tconst session = await ctx.ports.payments.createCheckoutSession({
 \t\t\tmode: plan.mode,
@@ -1281,8 +1299,9 @@ export const createBillingPortalSessionUseCase = useCase
 \t.input(z.object({}))
 \t.output(createBillingPortalSessionOutputSchema)
 \t.run(async ({ ctx }) => {
-\t\tconst tenantId = billingTenantId(ctx);
-\t\tconst account = await ctx.ports.billing.findByTenantId(tenantId);
+\t\tconst scope = billingTenantScope(ctx);
+\t\tconst tenantId = tenantScopeId(scope);
+\t\tconst account = await ctx.ports.billing.findByTenantScope(scope);
 
 \t\tif (!account?.customerId) {
 \t\t\tthrow appError("BillingAccountNotFound", {
@@ -1322,14 +1341,14 @@ export const handlePaymentWebhookUseCase = useCase
 \t\t\t\t\t\taccount = await applyCheckoutCompleted(
 \t\t\t\t\t\t\tinput,
 \t\t\t\t\t\t\ttx.billing.save,
-\t\t\t\t\t\t\ttx.billing.findByTenantId,
+\t\t\t\t\t\t\ttx.billing.findByTenantScope,
 \t\t\t\t\t\t);
 \t\t\t\t\t} else if (input.type.startsWith("customer.subscription.")) {
 \t\t\t\t\t\taccount = await applySubscriptionEvent(
 \t\t\t\t\t\t\tinput,
 \t\t\t\t\t\t\ttx.billing.save,
 \t\t\t\t\t\t\ttx.billing.findByCustomerId,
-\t\t\t\t\t\t\ttx.billing.findByTenantId,
+\t\t\t\t\t\t\ttx.billing.findByTenantScope,
 \t\t\t\t\t\t);
 \t\t\t\t\t} else if (input.type === "invoice.payment_succeeded") {
 \t\t\t\t\t\taccount = await applyInvoiceSucceeded(
@@ -1384,11 +1403,12 @@ export const billingRoutes = defineRouteGroup<AppContext>()({
 }
 
 export function billingTestFile(config: ResolvedBeignetConfig): string {
-  return `import { describe, expect, it } from "bun:test";
+  return `import { describe, expect, it } from "@/lib/beignet-test";
 import { createUseCaseTester } from "@beignet/core/application";
 import { requireEntitlement } from "@beignet/core/entitlements";
-import { createAnonymousActor } from "@beignet/core/ports";
+import { createAnonymousActor, createTenant } from "@beignet/core/ports";
 import { createTestUserActor } from "@beignet/core/ports/testing";
+import { createTenantScope, tenantScopeId } from "@beignet/core/tenancy";
 import {
 \tcreateTestContextFactory,
 \tcreateTestPorts,
@@ -1409,7 +1429,8 @@ function createMemoryBillingRepository(): BillingRepository {
 \tconst accounts = new Map<string, BillingAccount>();
 
 \treturn {
-\t\tasync findByTenantId(tenantId) {
+\t\tasync findByTenantScope(scope) {
+\t\t\tconst tenantId = tenantScopeId(scope);
 \t\t\treturn accounts.get(tenantId) ?? null;
 \t\t},
 
@@ -1498,7 +1519,9 @@ describe("billing use cases", () => {
 \t\t\tharness.payments.checkoutSessions[0]?.input.idempotencyKey,
 \t\t).toBe(undefined);
 \t\tawait expect(
-\t\t\tharness.billing.findByTenantId("tenant_example"),
+\t\t\tharness.billing.findByTenantScope(
+\t\t\t\tcreateTenantScope(createTenant("tenant_example")),
+\t\t\t),
 \t\t).resolves.toMatchObject({
 \t\t\tcheckoutSessionId: checkout.sessionId,
 \t\t\tplan: "pro",
@@ -1690,7 +1713,9 @@ describe("billing use cases", () => {
 \t\t\t}),
 \t\t).resolves.toEqual({ received: true, accountUpdated: true });
 \t\tawait expect(
-\t\t\tharness.billing.findByTenantId("tenant_example"),
+\t\t\tharness.billing.findByTenantScope(
+\t\t\t\tcreateTenantScope(createTenant("tenant_example")),
+\t\t\t),
 \t\t).resolves.toMatchObject({
 \t\t\tstatus: "past_due",
 \t\t\tlastEventId: "evt_invoice_failed",
@@ -1722,7 +1747,9 @@ describe("billing use cases", () => {
 \t\t\t}),
 \t\t).resolves.toEqual({ received: true, accountUpdated: true });
 \t\tawait expect(
-\t\t\tharness.billing.findByTenantId("tenant_example"),
+\t\t\tharness.billing.findByTenantScope(
+\t\t\t\tcreateTenantScope(createTenant("tenant_example")),
+\t\t\t),
 \t\t).resolves.toMatchObject({
 \t\t\tstatus: "active",
 \t\t\tcancelAtPeriodEnd: true,
@@ -1814,7 +1841,8 @@ export function billingDrizzleRepositoryFile(
 
 \t\t\treturn toBillingAccount(row);`;
 
-  return `import type { ${dialect.dbTypeName} } from "@beignet/provider-db-drizzle/${dialect.subpath}";
+  return `import { tenantScopeId } from "@beignet/core/tenancy";
+import type { ${dialect.dbTypeName} } from "@beignet/provider-db-drizzle/${dialect.subpath}";
 import { and, eq } from "drizzle-orm";
 import type {
 \tBillingAccount,
@@ -1870,7 +1898,8 @@ export function createDrizzleBillingRepository(
 \tdb: ${dialect.dbTypeName}<typeof schema>,
 ): BillingRepository {
 \treturn {
-\t\tasync findByTenantId(tenantId) {
+\t\tasync findByTenantScope(scope) {
+\t\t\tconst tenantId = tenantScopeId(scope);
 \t\t\tconst [row] = await db
 \t\t\t\t.select()
 \t\t\t\t.from(schema.billingAccounts)

package/src/make/shared.ts

@@ -15,6 +15,11 @@ import {
   insertAfterImports,
   matchingDelimiterIndex,
 } from "../registry-edits.js";
+import {
+  currentGeneratedPackageScripts,
+  externalVersions,
+  legacyGeneratedPackageScripts,
+} from "../templates/shared.js";
 
 export type MakeResult = {
   schemaVersion: 1;
@@ -350,10 +355,43 @@ export function providersFilePath(config: ResolvedBeignetConfig): string {
   return `${directoryPath(path.dirname(config.paths.server))}/providers.ts`;
 }
 
+export function listenersFilePath(config: ResolvedBeignetConfig): string {
+  return (
+    config.paths.listeners ??
+    `${directoryPath(path.dirname(config.paths.server))}/listeners.ts`
+  );
+}
+
+export function createListenersRegistrySource(options: {
+  registryName: string;
+  listenerModule: string;
+}): string {
+  return `import { ${options.registryName} } from "${options.listenerModule}";
+
+export const listeners = [...${options.registryName}] as const;
+`;
+}
+
+export function updateListenersRegistrySource(
+  source: string,
+  options: {
+    registryName: string;
+    listenerModule: string;
+  },
+): AppendResult {
+  const importLine = `import { ${options.registryName} } from "${options.listenerModule}";`;
+  return appendToNamedArray(
+    source,
+    "listeners",
+    `...${options.registryName}`,
+    importLine,
+  );
+}
+
 /**
  * Wire a feature listener registry into the generated providers file by
- * adding a `<registry>Provider` lifecycle provider whose setup calls
- * `registerListeners(...)` and registering it in the providers array.
+ * registering the central `server/listeners.ts` registry with
+ * `registerListeners(...)`.
  *
  * Shared by `beignet make listener` and `beignet doctor --fix` so both write
  * paths produce byte-identical wiring. Returns `missing` when the exported
@@ -369,8 +407,8 @@ export function wireListenersProviderSource(
     config: ResolvedBeignetConfig;
   },
 ): AppendResult {
-  const { registryName, featureKebab, listenerModule, config } = options;
-  const providerName = `${registryName}Provider`;
+  const { config } = options;
+  const providerName = "listenersProvider";
   let next = source;
   next = addNamedImport(next, "registerListeners", "@beignet/core/events");
   next = addNamedImport(next, "createServiceActor", "@beignet/core/ports");
@@ -387,7 +425,10 @@ export function wireListenersProviderSource(
   );
   next = addNamedTypeImport(next, "AppPorts", aliasModule(config.paths.ports));
 
-  const listenerImport = `import { ${registryName} } from "${listenerModule}";`;
+  const listenerImport = `import { listeners } from "${relativeModule(
+    providersFilePath(config),
+    listenersFilePath(config),
+  )}";`;
   if (!next.includes(listenerImport)) {
     next = insertAfterImports(next, listenerImport);
   }
@@ -398,9 +439,9 @@ export function wireListenersProviderSource(
 \tAppContext,
 \tAppServiceContextInput
 >()({
-\tname: "${featureKebab}-listeners",
+\tname: "app-listeners",
 \tsetup({ ports, createServiceContext }) {
-\t\tconst unregister = registerListeners(ports.eventBus, ${registryName}, {
+\t\tconst unregister = registerListeners(ports.eventBus, listeners, {
 \t\t\tctx: () =>
 \t\t\t\tcreateServiceContext({
 \t\t\t\t\tactor: createServiceActor("beignet-listener"),
@@ -1027,9 +1068,22 @@ export async function updatePackageScripts(
   const original = await readFile(filePath, "utf8");
   const packageJson = JSON.parse(original) as PackageJsonLike;
   packageJson.scripts = packageJson.scripts ?? {};
+  let needsTsx = false;
 
   for (const [name, command] of Object.entries(scripts)) {
-    packageJson.scripts[name] ??= command;
+    if (
+      !packageJson.scripts[name] ||
+      packageJson.scripts[name] === legacyGeneratedPackageScripts[name]
+    ) {
+      packageJson.scripts[name] = command;
+    }
+    needsTsx ||=
+      command.startsWith("tsx ") && packageJson.scripts[name] === command;
+  }
+
+  if (needsTsx) {
+    packageJson.devDependencies = packageJson.devDependencies ?? {};
+    packageJson.devDependencies.tsx ??= externalVersions.tsx;
   }
 
   const next = `${JSON.stringify(packageJson, null, "\t")}\n`;
@@ -1064,11 +1118,11 @@ export async function updatePackageJson(
     devDependencies?: Record<string, string>;
   };
   packageJson.scripts = packageJson.scripts ?? {};
-
-  packageJson.scripts.test ??= "bun test";
+  updateGeneratedPackageScripts(packageJson.scripts);
+  packageJson.devDependencies = packageJson.devDependencies ?? {};
+  packageJson.devDependencies.tsx ??= externalVersions.tsx;
 
   if (options.webTestingDependency) {
-    packageJson.devDependencies = packageJson.devDependencies ?? {};
     packageJson.devDependencies["@beignet/web"] ??=
       packageJson.dependencies?.["@beignet/core"] ??
       packageJson.dependencies?.["@beignet/next"] ??
@@ -1080,6 +1134,19 @@ export async function updatePackageJson(
   return next !== original;
 }
 
+function updateGeneratedPackageScripts(scripts: Record<string, string>): void {
+  for (const [name, command] of Object.entries(
+    currentGeneratedPackageScripts,
+  )) {
+    if (
+      scripts[name] === legacyGeneratedPackageScripts[name] ||
+      (name === "test" && !scripts[name])
+    ) {
+      scripts[name] = command;
+    }
+  }
+}
+
 export async function updatePortsIndex(
   targetDir: string,
   names: ResourceNames,

package/src/make/tenancy.ts

@@ -11,6 +11,7 @@ import {
   arrayInitializerInfo,
 } from "../registry-edits.js";
 import { serverFiles } from "../templates/server.js";
+import { testSupportTemplateFiles } from "../templates/testing.js";
 import {
   addNamedImport,
   addNamedTypeImport,
@@ -428,7 +429,7 @@ async function registerTenancySeeds(
   if (
     await updatePackageScripts(
       targetDir,
-      { "db:seed": `bun ${seedEntrypointPath(config)}` },
+      { "db:seed": `tsx ${seedEntrypointPath(config)}` },
       options,
     )
   ) {
@@ -741,6 +742,7 @@ export function tenancyFiles(
     path.join(config.paths.features, "workspaces", file);
 
   return [
+    ...testSupportTemplateFiles,
     { path: featureDir("schemas.ts"), content: tenancySchemasFile() },
     { path: featureDir("contracts.ts"), content: tenancyContractsFile() },
     { path: featureDir("policy.ts"), content: tenancyPolicyFile() },
@@ -2621,7 +2623,7 @@ export const workspaceInviteFactory = createFactory<
 export function membershipTestFile(config: ResolvedBeignetConfig): string {
   const tenantModule = aliasModule(tenantHelperPath(config));
 
-  return `import { describe, expect, test } from "bun:test";
+  return `import { describe, expect, test } from "@/lib/beignet-test";
 import type { AuthSession } from "@/ports/auth";
 import {
 \tcreateWorkspaceUseCase,
@@ -2920,7 +2922,7 @@ describe("member management", () => {
 }
 
 export function invitesTestFile(): string {
-  return `import { describe, expect, test } from "bun:test";
+  return `import { describe, expect, test } from "@/lib/beignet-test";
 import { createInvite } from "@/features/workspaces/contracts";
 import {
 \tacceptInviteUseCase,
@@ -3131,7 +3133,7 @@ describe("revokeInviteUseCase", () => {
 }
 
 export function policyTestFile(): string {
-  return `import { describe, expect, it } from "bun:test";
+  return `import { describe, expect, it } from "@/lib/beignet-test";
 import { createPolicyTester } from "@beignet/core/ports/testing";
 import { workspacePolicy } from "@/features/workspaces/policy";
 import { workspaceFactory } from "./factories/workspace";