@beignet/cli 0.0.33 → 0.0.35

package/src/inspect.ts

@@ -1519,6 +1519,11 @@ async function inspectCanonicalConformance(
       reason:
         "infra/app-ports.ts should wire concrete app ports for the selected runtime.",
     },
+    {
+      file: config.paths.routesBuilder,
+      reason:
+        "lib/routes.ts should bind route declarations to the shared AppContext type.",
+    },
   ];
 
   if (hasClientSurface) {
@@ -1657,6 +1662,30 @@ async function inspectCanonicalConformance(
     }
   }
 
+  if (files.includes(config.paths.routesBuilder)) {
+    const routesBuilderSource = await readCachedSource(
+      targetDir,
+      config.paths.routesBuilder,
+      sourceCache,
+    );
+    if (
+      !importsAppContext(
+        routesBuilderSource,
+        config.paths.routesBuilder,
+        config,
+        files,
+      ) ||
+      !/\bcreateRoutes\s*<\s*AppContext\s*>\s*\(\s*\)/.test(routesBuilderSource)
+    ) {
+      diagnostics.push({
+        severity: "warning",
+        code: "BEIGNET_ROUTE_BUILDER_CONTEXT",
+        file: config.paths.routesBuilder,
+        message: `${config.paths.routesBuilder} should import AppContext from ${config.paths.appContext} and export route builders from createRoutes<AppContext>().`,
+      });
+    }
+  }
+
   const featureRoutesPath = `${featuresPath}/`;
   for (const file of files) {
     if (!file.startsWith(featureRoutesPath) || !file.endsWith("/routes.ts")) {
@@ -1666,21 +1695,20 @@ async function inspectCanonicalConformance(
     const source = await readCachedSource(targetDir, file, sourceCache);
     if (!source.includes("defineRouteGroup")) continue;
 
-    if (!importsAppContext(source, file, config, files)) {
-      diagnostics.push({
-        severity: "warning",
-        code: "BEIGNET_FEATURE_ROUTE_APP_CONTEXT",
+    if (
+      !importsNamedFromFile(
+        source,
         file,
-        message: `${file} should import type { AppContext } from ${config.paths.appContext} so feature routes use the app-wide context type.`,
-      });
-    }
-
-    if (!/defineRouteGroup\s*<\s*AppContext\s*>\s*\(\s*\)\s*\(/.test(source)) {
+        config.paths.routesBuilder,
+        "defineRouteGroup",
+        files,
+      )
+    ) {
       diagnostics.push({
         severity: "warning",
-        code: "BEIGNET_FEATURE_ROUTE_GROUP_CONTEXT",
+        code: "BEIGNET_FEATURE_ROUTE_BUILDER",
         file,
-        message: `${file} should call defineRouteGroup<AppContext>()({ ... }) so route groups preserve per-route contract and use-case type checks.`,
+        message: `${file} should import { defineRouteGroup } from ${config.paths.routesBuilder} so route groups use the app-bound context type.`,
       });
     }
   }
@@ -1743,6 +1771,28 @@ function importsAppContext(
   return false;
 }
 
+function importsNamedFromFile(
+  source: string,
+  importerFile: string,
+  expectedFile: string,
+  importedName: string,
+  files: string[],
+): boolean {
+  const importRegex = /import\s+\{([^}]+)\}\s+from\s+["']([^"']+)["']/g;
+
+  for (const match of source.matchAll(importRegex)) {
+    const sourceFile = sourceFileFromImport(match[2], importerFile, files);
+    if (sourceFile !== expectedFile) continue;
+
+    for (const member of match[1].split(",")) {
+      const parsed = parseImportMember(member);
+      if (parsed?.importedName === importedName) return true;
+    }
+  }
+
+  return false;
+}
+
 async function inspectAuthzAuditDrift(
   targetDir: string,
   files: string[],
@@ -2429,7 +2479,7 @@ async function inspectPaymentsProductionReadiness(
       code: "BEIGNET_PAYMENTS_STRIPE_MEMORY_PROVIDER",
       file: serverProviderFiles(files, config)[0] ?? config.paths.server,
       message:
-        "@beignet/provider-payments-stripe is installed and Stripe env/config is present, but server/providers.ts still registers memory payments. Register stripePaymentsProvider before deploying Stripe-backed billing, or remove the Stripe provider/config until the app is ready to switch.",
+        "@beignet/provider-payments-stripe is installed and Stripe env/config is present, but server/providers.ts still registers memory payments. Register createStripePaymentsProvider() before deploying Stripe-backed billing, or remove the Stripe provider/config until the app is ready to switch.",
     });
   }
 
@@ -2531,7 +2581,8 @@ async function hasStripeMemoryProviderMismatch(
     return false;
   }
   if (
-    findProviderEntryIndex(providerEntries, ["stripePaymentsProvider"]) >= 0
+    findProviderEntryIndex(providerEntries, ["createStripePaymentsProvider"]) >=
+    0
   ) {
     return false;
   }
@@ -3940,10 +3991,27 @@ async function listenedEventNames(
     if (!listenerPattern.test(file) || isWorkflowTestFile(file)) continue;
 
     const source = await readFile(path.join(targetDir, file), "utf8");
-    for (const match of source.matchAll(
-      /\bdefineListener\s*(?:<[^>]*>\s*)?\(\s*([A-Za-z_$][\w$]*)/g,
-    )) {
-      listened.add(match[1]);
+    const callPattern = /\bdefineListener\s*\(/g;
+    for (const match of source.matchAll(callPattern)) {
+      const openIndex = source.indexOf("(", match.index ?? 0);
+      if (openIndex === -1) continue;
+
+      const closeIndex = matchingDelimiterIndex(source, openIndex, "(", ")");
+      if (closeIndex === -1) continue;
+
+      const args = splitTopLevelArguments(
+        source.slice(openIndex + 1, closeIndex),
+      );
+      const options = args[1]?.trim();
+      if (!options?.startsWith("{") || !options.endsWith("}")) continue;
+
+      const eventProperty = splitTopLevelArguments(options.slice(1, -1)).find(
+        (property) => /^\s*event\s*:/.test(property),
+      );
+      const eventName = /^\s*event\s*:\s*([A-Za-z_$][\w$]*)/.exec(
+        eventProperty ?? "",
+      )?.[1];
+      if (eventName) listened.add(eventName);
     }
   }
 
@@ -4690,7 +4758,7 @@ async function inspectTenantScopeRepositoryDrift(
         file: portFile,
         message: `${portFile} declares tenant-owned repository methods (${rawBoundaries.join(
           ", ",
-        )}) with raw tenant IDs. Use TenantScope at app-facing repository boundaries and unwrap it with tenantScopeId(scope) inside ${repositoryFile}; keep provider-correlation lookups separate from authorization.`,
+        )}) with raw tenant or workspace IDs. Use TenantScope at app-facing repository boundaries and unwrap it with tenantScopeId(scope) inside ${repositoryFile}; keep provider-correlation lookups separate from authorization.`,
       });
       continue;
     }
@@ -4832,9 +4900,7 @@ function rawTenantRepositoryMethodBoundaries(
   for (const method of repositoryMethodSignatures(block)) {
     if (isProviderCorrelationMethod(method.name)) continue;
 
-    const rawColumns = tenantColumnsUsedInSource(method.params, tables).filter(
-      (column) => column.property === "tenantId",
-    );
+    const rawColumns = tenantColumnsUsedInSource(method.params, tables);
     if (rawColumns.length === 0) continue;
 
     rawMethods.push(method.name);

package/src/lint.ts

@@ -1123,6 +1123,8 @@ const serverRuntimePackages = new Set([
   "@beignet/next",
   "@beignet/core/openapi",
   "@beignet/core/server",
+  "@beignet/webhooks-github",
+  "@beignet/webhooks-stripe",
 ]);
 
 function appImportMessage(
@@ -1185,6 +1187,7 @@ function classifyPath(
     const layerSegment = featurePath.split("/")[1];
     if (layerSegment === "domain") return "domain";
     if (layerSegment === "contracts") return "contract";
+    if (layerSegment?.endsWith("-contracts")) return "contract";
     if (layerSegment === "routes") return "route";
     if (layerSegment === "ports") return "feature-port";
     if (layerSegment === "policy") return "policy";
@@ -1205,13 +1208,22 @@ function classifyPath(
     if (layerSegment === "client") return "client";
   }
 
-  if (isUnder(normalizedPath, directoryPath(config.paths.contracts))) {
+  if (
+    directoryPath(config.paths.contracts) !== featuresPath &&
+    isUnder(normalizedPath, directoryPath(config.paths.contracts))
+  ) {
     return "contract";
   }
-  if (isUnder(normalizedPath, directoryPath(config.paths.useCases))) {
+  if (
+    directoryPath(config.paths.useCases) !== featuresPath &&
+    isUnder(normalizedPath, directoryPath(config.paths.useCases))
+  ) {
     return "use-case";
   }
-  if (isUnder(normalizedPath, directoryPath(config.paths.policies))) {
+  if (
+    directoryPath(config.paths.policies) !== featuresPath &&
+    isUnder(normalizedPath, directoryPath(config.paths.policies))
+  ) {
     return "policy";
   }
 

package/src/make/inbox.ts

@@ -856,8 +856,7 @@ export function inboxRoutesFile(config: ResolvedBeignetConfig): string {
     path.join(config.paths.features, "inbox/use-cases/index.ts"),
   );
 
-  return `import { defineRouteGroup } from "@beignet/next";
-import type { AppContext } from "${aliasModule(config.paths.appContext)}";
+  return `import { defineRouteGroup } from "${aliasModule(config.paths.routesBuilder)}";
 import {
 \tlistInbox,
 \tmarkAllRead,
@@ -871,7 +870,7 @@ import {
 \tmarkReadUseCase,
 } from "${useCasesModule}";
 
-export const inboxRoutes = defineRouteGroup<AppContext>()({
+export const inboxRoutes = defineRouteGroup({
 \tname: "inbox",
 \troutes: [
 \t\t{ contract: listInbox, useCase: listInboxUseCase },
@@ -1114,7 +1113,7 @@ export function inboxTestFile(config: ResolvedBeignetConfig): string {
   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";
+import { createTestUserActor } from "@beignet/core/testing";
 import {
 \tcreateTestContextFactory,
 \tcreateTestPorts,
@@ -1295,7 +1294,7 @@ export function inboxChannelTestFile(config: ResolvedBeignetConfig): string {
   );
 
   return `import { describe, expect, it } from "@/lib/beignet-test";
-import { createTestSystemActor } from "@beignet/core/ports/testing";
+import { createTestSystemActor } from "@beignet/core/testing";
 import {
 \tcreateTestContextFactory,
 \tcreateTestPorts,

package/src/make/payments.ts

@@ -31,7 +31,6 @@ import {
   planGeneratedFiles,
   type ResourceNames,
   readOptionalFile,
-  relativeModule,
   resourceNames,
   resourceSharedErrorsPath,
   seedEntrypointPath,
@@ -206,7 +205,7 @@ export function makePaymentsNextStepLines(
       : [
           "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.",
+    "Use createMemoryPaymentsProvider() for local development, then swap server/providers.ts to createStripePaymentsProvider() 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.",
   ];
@@ -1375,14 +1374,11 @@ export const handlePaymentWebhookUseCase = useCase
 }
 
 export function billingRoutesFile(config: ResolvedBeignetConfig): string {
-  const routeFilePath = path.join(config.paths.features, "billing/routes.ts");
-
-  return `import { defineRouteGroup } from "@beignet/next";
-import type { AppContext } from "${relativeModule(routeFilePath, config.paths.appContext)}";
+  return `import { defineRouteGroup } from "${aliasModule(config.paths.routesBuilder)}";
 import * as billingContracts from "@/features/billing/contracts";
 import * as billingUseCases from "@/features/billing/use-cases";
 
-export const billingRoutes = defineRouteGroup<AppContext>()({
+export const billingRoutes = defineRouteGroup({
 \tname: "billing",
 \troutes: [
 \t\t{
@@ -1407,7 +1403,7 @@ export function billingTestFile(config: ResolvedBeignetConfig): string {
 import { createUseCaseTester } from "@beignet/core/application";
 import { requireEntitlement } from "@beignet/core/entitlements";
 import { createAnonymousActor, createTenant } from "@beignet/core/ports";
-import { createTestUserActor } from "@beignet/core/ports/testing";
+import { createTestUserActor } from "@beignet/core/testing";
 import { createTenantScope, tenantScopeId } from "@beignet/core/tenancy";
 import {
 \tcreateTestContextFactory,

package/src/make/shared.ts

@@ -301,7 +301,7 @@ export function eventBusPortWiring(command: string): PortProviderWiring {
     portKey: "eventBus",
     portType: "EventBusPort",
     portTypeModule: "@beignet/core/ports",
-    providerFactory: "createInMemoryEventBusProvider",
+    providerFactory: "createMemoryEventBusProvider",
     providerModule: "@beignet/provider-event-bus-memory",
     dependency: "@beignet/provider-event-bus-memory",
   };

package/src/make/tenancy.ts

@@ -2041,13 +2041,7 @@ export const WorkspaceInviteNotification = defineNotification(
 }
 
 export function tenancyRoutesFile(config: ResolvedBeignetConfig): string {
-  const routeFilePath = path.join(
-    config.paths.features,
-    "workspaces/routes.ts",
-  );
-
-  return `import { defineRouteGroup } from "@beignet/next";
-import type { AppContext } from "${relativeModule(routeFilePath, config.paths.appContext)}";
+  return `import { defineRouteGroup } from "${aliasModule(config.paths.routesBuilder)}";
 import * as workspaceContracts from "@/features/workspaces/contracts";
 import * as workspaceUseCases from "@/features/workspaces/use-cases";
 import { WORKSPACE_COOKIE_NAME } from "@/lib/tenant";
@@ -2064,7 +2058,7 @@ function workspaceCookie(workspaceId: string): string {
 \t].join("; ");
 }
 
-export const workspaceRoutes = defineRouteGroup<AppContext>()({
+export const workspaceRoutes = defineRouteGroup({
 \tname: "workspaces",
 \troutes: [
 \t\t{
@@ -2263,7 +2257,7 @@ export function tenancyContextFactoryFile(
 import {
 \tcreateTestAnonymousActor,
 \tcreateTestUserActor,
-} from "@beignet/core/ports/testing";
+} from "@beignet/core/testing";
 import {
 \tcreateTestContextFactory,
 \tcreateTestPorts,
@@ -3134,7 +3128,7 @@ describe("revokeInviteUseCase", () => {
 
 export function policyTestFile(): string {
   return `import { describe, expect, it } from "@/lib/beignet-test";
-import { createPolicyTester } from "@beignet/core/ports/testing";
+import { createPolicyTester } from "@beignet/core/testing";
 import { workspacePolicy } from "@/features/workspaces/policy";
 import { workspaceFactory } from "./factories/workspace";
 

package/src/make.ts

@@ -4501,7 +4501,7 @@ function useCaseTestFile(
 import { createUseCaseTester } from "@beignet/core/application";
 import { createInMemoryDevtools } from "@beignet/devtools";
 import { createTestContextFactory, createTestPorts } from "@beignet/core/testing";
-import { createTestAnonymousActor } from "@beignet/core/ports/testing";
+import { createTestAnonymousActor } from "@beignet/core/testing";
 import type { AppContext } from "${aliasModule(config.paths.appContext)}";
 import { appPorts } from "${aliasModule(config.paths.infrastructurePorts)}";
 import { ${names.exportName} } from "${relativeModule(filePath, useCaseFilePath(names, config))}";
@@ -4670,7 +4670,7 @@ function resourcePolicyTestFile(
   options: ResourceGenerationOptions,
 ): string {
   return `import { describe, expect, it } from "@/lib/beignet-test";
-import { createPolicyTester } from "@beignet/core/ports/testing";
+import { createPolicyTester } from "@beignet/core/testing";
 import { ${names.singularCamel}Policy } from "../policy";
 import type { ${names.singularPascal} } from "../schemas";
 
@@ -4871,8 +4871,8 @@ function listenerFile(
   return `import { defineListener } from "${aliasModule(config.paths.listenersBuilder)}";
 import { ${names.event.eventExportName} } from "${relativeModule(filePath, eventFilePath(names.event, config))}";
 
-export const ${names.listenerExportName} = defineListener(${names.event.eventExportName}, {
-\tname: "${names.listenerName}",
+export const ${names.listenerExportName} = defineListener("${names.listenerName}", {
+\tevent: ${names.event.eventExportName},
 \tasync handle({ payload, ctx }) {
 \t\tctx.ports.logger.info("Listener handled", {
 \t\t\tlistenerName: "${names.listenerName}",
@@ -5249,8 +5249,7 @@ function routeGroupFile(
   const useCasesPath = resourceUseCaseIndexPath(names, config);
 
   return `import "@beignet/core/server-only";
-import { defineRouteGroup } from "@beignet/next";
-import type { AppContext } from "${relativeModule(routeFilePath, config.paths.appContext)}";
+import { defineRouteGroup } from "${relativeModule(routeFilePath, config.paths.routesBuilder)}";
 import {
 	create${names.singularPascal},
 ${mode === "resource" ? `	delete${names.singularPascal},\n	get${names.singularPascal},\n` : ""}	list${names.pluralPascal},
@@ -5260,7 +5259,7 @@ import {
 ${mode === "resource" ? `	delete${names.singularPascal}UseCase,\n	get${names.singularPascal}UseCase,\n` : ""}	list${names.pluralPascal}UseCase,
 ${mode === "resource" ? `	update${names.singularPascal}UseCase,\n` : ""}} from "${relativeModule(routeFilePath, useCasesPath)}";
 
-export const ${names.singularCamel}Routes = defineRouteGroup<AppContext>()({
+export const ${names.singularCamel}Routes = defineRouteGroup({
 	name: "${names.pluralKebab}",
 	routes: [
 		{ contract: list${names.pluralPascal}, useCase: list${names.pluralPascal}UseCase },
@@ -5289,11 +5288,11 @@ function testFile(
 
   return `import { describe, expect, it } from "@/lib/beignet-test";
 import { createUseCaseTester } from "@beignet/core/application";
-${mode === "resource" ? `import { isAppError } from "@beignet/core/errors";\n` : ""}import { defineRoutes } from "@beignet/web";
+${mode === "resource" ? `import { isAppError } from "@beignet/core/errors";\n` : ""}import { defineRoutes } from "@beignet/core/server";
 import { createTestApp } from "@beignet/web/testing";
 import { createInMemoryDevtools } from "@beignet/devtools";
 import { createTestContextFactory, createTestPorts } from "@beignet/core/testing";
-import { ${options.auth ? "createTestUserActor" : "createTestAnonymousActor"}${options.tenant ? ", createTestTenant" : ""} } from "@beignet/core/ports/testing";
+import { ${options.auth ? "createTestUserActor" : "createTestAnonymousActor"}${options.tenant ? ", createTestTenant" : ""} } from "@beignet/core/testing";
 import type { AppContext } from "${aliasModule(config.paths.appContext)}";
 import { appPorts } from "${aliasModule(config.paths.infrastructurePorts)}";
 import { appContext } from "${aliasModule(serverContextPath)}";