@beignet/cli 0.0.36 → 0.0.38

package/src/inspect.ts

@@ -558,7 +558,7 @@ function inspectConvention(
   ]);
   const missingResourceGenerator = missingRequirements(files, [
     config.paths.appContext,
-    config.paths.infrastructurePorts,
+    config.paths.portWiring,
     config.paths.ports,
     config.paths.server,
     config.paths.useCaseBuilder,
@@ -1515,9 +1515,9 @@ async function inspectCanonicalConformance(
         "server/providers.ts should own provider registration, even when the provider list is small.",
     },
     {
-      file: config.paths.infrastructurePorts,
+      file: config.paths.portWiring,
       reason:
-        "infra/app-ports.ts should wire concrete app ports for the selected runtime.",
+        "infra/port-wiring.ts should wire concrete app ports for the selected runtime.",
     },
     {
       file: config.paths.routesBuilder,
@@ -2067,7 +2067,7 @@ async function inspectProductionReadiness(
   );
   const configFiles = operationalConfigFiles(files, config);
   const infrastructurePath = directoryPath(
-    path.dirname(config.paths.infrastructurePorts),
+    path.dirname(config.paths.portWiring),
   );
   const schemaDir = `${infrastructurePath}/db/schema`;
   let hasSecurityHeadersHook = false;
@@ -2228,7 +2228,10 @@ async function inspectProductionReadiness(
         provider.variants,
         providerEntries,
       )) {
-        for (const envVar of variant.requiredEnv) {
+        for (const envVar of configuredProviderRequiredEnv(
+          variant.requiredEnv,
+          config,
+        )) {
           if (
             await providerRequiredEnvExists(
               targetDir,
@@ -2275,7 +2278,10 @@ async function inspectProductionReadiness(
       continue;
     }
 
-    for (const envVar of provider.requiredEnv ?? []) {
+    for (const envVar of configuredProviderRequiredEnv(
+      provider.requiredEnv ?? [],
+      config,
+    )) {
       if (
         await providerRequiredEnvExists(
           targetDir,
@@ -2561,7 +2567,7 @@ async function inspectPaymentsProductionReadiness(
     diagnostics.push({
       severity: "warning",
       code: "BEIGNET_BILLING_ENTITLEMENTS_PROVIDER_MISSING",
-      file: path.dirname(config.paths.infrastructurePorts),
+      file: path.dirname(config.paths.portWiring),
       message:
         "features/billing/entitlements.ts exists, but no infra or server provider appears to call createBillingEntitlements(...). Wire the billing-backed entitlements port into AppPorts so paid feature gates use app billing state.",
     });
@@ -3028,7 +3034,7 @@ async function hasBillingEntitlementsProviderWiring(
   config: ResolvedBeignetConfig,
   sourceCache: Map<string, string>,
 ): Promise<boolean> {
-  const infraPath = path.dirname(config.paths.infrastructurePorts);
+  const infraPath = path.dirname(config.paths.portWiring);
   const serverPath = path.dirname(config.paths.server);
   const candidateFiles = files.filter(
     (file) =>
@@ -3413,13 +3419,13 @@ function isInfraOrServerFile(
 ): boolean {
   const serverDir = directoryPath(path.dirname(config.paths.server));
   const infrastructureDir = directoryPath(
-    path.dirname(config.paths.infrastructurePorts),
+    path.dirname(config.paths.portWiring),
   );
 
   return (
     file === config.paths.server ||
     file.startsWith(`${serverDir}/`) ||
-    file === config.paths.infrastructurePorts ||
+    file === config.paths.portWiring ||
     file.startsWith(`${infrastructureDir}/`)
   );
 }
@@ -3544,9 +3550,7 @@ async function inspectWorkflowRegistrationDrift(
     }
   }
 
-  const infraDir = directoryPath(
-    path.dirname(config.paths.infrastructurePorts),
-  );
+  const infraDir = directoryPath(path.dirname(config.paths.portWiring));
   const listenerTarget = drift.listeners.wiringFile
     ? `${drift.listeners.wiringFile}, which already calls registerListeners(...)`
     : drift.listeners.eventBusFile
@@ -4376,7 +4380,7 @@ async function inspectDatabaseLifecycleDrift(
   const sourceCache = new Map<string, string>();
   const resources = await collectResourceNames(targetDir, files, config);
   const infrastructurePath = directoryPath(
-    path.dirname(config.paths.infrastructurePorts),
+    path.dirname(config.paths.portWiring),
   );
   const featuresPath = directoryPath(config.paths.features);
   const repositoriesPath = path.join(
@@ -5539,6 +5543,14 @@ function configuredProviderRequiredTables(
   );
 }
 
+function configuredProviderRequiredEnv(
+  envVars: readonly string[],
+  config: ResolvedBeignetConfig,
+): string[] {
+  const ignored = new Set(config.providerAudit.ignoreRequiredEnv);
+  return envVars.filter((envVar) => !ignored.has(envVar));
+}
+
 function configuredProviderRequiredTable(
   tableName: string,
   config: ResolvedBeignetConfig,
@@ -7287,21 +7299,21 @@ async function inspectResourceSlices(
       "errors.ts",
     );
     const infrastructureDir = `${directoryPath(
-      path.dirname(config.paths.infrastructurePorts),
+      path.dirname(config.paths.portWiring),
     )}/${resource}/`;
     const drizzleSchemaFile = path.join(
-      path.dirname(config.paths.infrastructurePorts),
+      path.dirname(config.paths.portWiring),
       "db",
       "schema",
       `${resource}.ts`,
     );
     const drizzleRepositoryFile = path.join(
-      path.dirname(config.paths.infrastructurePorts),
+      path.dirname(config.paths.portWiring),
       resource,
       `drizzle-${singular}-repository.ts`,
     );
     const memoryRepositoryFile = path.join(
-      path.dirname(config.paths.infrastructurePorts),
+      path.dirname(config.paths.portWiring),
       resource,
       `in-memory-${singular}-repository.ts`,
     );
@@ -7639,7 +7651,7 @@ async function collectResourceNames(
   const portsPath = directoryPath(path.dirname(config.paths.ports));
   const featuresPath = directoryPath(config.paths.features);
   const infrastructurePath = directoryPath(
-    path.dirname(config.paths.infrastructurePorts),
+    path.dirname(config.paths.portWiring),
   );
 
   for (const file of files) {

package/src/lint.ts

@@ -1,5 +1,6 @@
 import { readdir, readFile, stat } from "node:fs/promises";
 import path from "node:path";
+import ts from "typescript";
 import { createPainter } from "./ansi.js";
 import {
   type BeignetConfig,
@@ -89,6 +90,7 @@ export async function lintApp(
   const diagnostics: LintDiagnostic[] = [];
   const sourceFiles = lintSourceFiles(files);
   const sourceFileSet = new Set(sourceFiles);
+  const atAliasRoot = resolveAtAliasRoot(targetDir);
   const sourceByFile = new Map<string, string>();
   const importGraph: ImportGraph = new Map();
 
@@ -96,7 +98,10 @@ export async function lintApp(
     const sourceLayer = classifyPath(file, config);
     const source = await readFile(path.join(targetDir, file), "utf8");
     sourceByFile.set(file, source);
-    importGraph.set(file, parseImports(source, file, sourceFileSet));
+    importGraph.set(
+      file,
+      parseImports(source, file, sourceFileSet, atAliasRoot),
+    );
 
     if (sourceLayer === "test" || sourceLayer === "unknown") continue;
 
@@ -281,15 +286,40 @@ function parseImports(
   source: string,
   importerFile: string,
   files: Set<string>,
+  atAliasRoot: string,
 ): ImportReference[] {
   const references = parseImportSpecifiers(source);
 
   return references.map((reference) => ({
     ...reference,
-    ...resolveImport(reference.importPath, importerFile, files),
+    ...resolveImport(reference.importPath, importerFile, files, atAliasRoot),
   }));
 }
 
+function resolveAtAliasRoot(targetDir: string): string {
+  const tsconfigPath = path.join(targetDir, "tsconfig.json");
+  const parsed = ts.getParsedCommandLineOfConfigFile(
+    tsconfigPath,
+    {},
+    {
+      ...ts.sys,
+      onUnRecoverableConfigFileDiagnostic: () => {},
+    },
+  );
+  const aliasTarget = parsed?.options.paths?.["@/*"]?.[0];
+  if (!aliasTarget) return "";
+
+  const targetWithoutWildcard = aliasTarget.replace(/[/\\]?\*$/, "");
+  const baseUrl = parsed.options.baseUrl ?? targetDir;
+  const absoluteTarget = path.resolve(baseUrl, targetWithoutWildcard);
+  const relativeTarget = normalizePath(
+    path.relative(targetDir, absoluteTarget),
+  );
+  if (relativeTarget === "" || relativeTarget === ".") return "";
+  if (relativeTarget === ".." || relativeTarget.startsWith("../")) return "";
+  return directoryPath(relativeTarget);
+}
+
 function parseImportSpecifiers(
   source: string,
 ): Array<{ importPath: string; kind: ImportKind; offset: number }> {
@@ -590,11 +620,12 @@ function resolveImport(
   importPath: string,
   importerFile: string,
   files: Set<string>,
+  atAliasRoot: string,
 ): Pick<ImportReference, "packageName" | "resolvedPath"> {
   if (importPath.startsWith("@/")) {
     return {
       resolvedPath: resolveLocalImportPath(
-        stripKnownExtension(importPath.slice(2)),
+        stripKnownExtension(path.posix.join(atAliasRoot, importPath.slice(2))),
         files,
       ),
     };
@@ -1171,7 +1202,7 @@ function classifyPath(
   if (
     isUnder(
       normalizedPath,
-      directoryPath(path.dirname(config.paths.infrastructurePorts)),
+      directoryPath(path.dirname(config.paths.portWiring)),
     )
   ) {
     return "infra";

package/src/make/inbox.ts

@@ -265,7 +265,7 @@ export async function updateInboxWiring(
       options,
     )
   ) {
-    updated.add(config.paths.infrastructurePorts);
+    updated.add(config.paths.portWiring);
   }
   if (
     await updateDrizzleSchemaIndexExports(
@@ -1119,7 +1119,7 @@ import {
 \tcreateTestPorts,
 } from "@beignet/core/testing";
 import type { AppContext } from "${aliasModule(config.paths.appContext)}";
-import { appPorts } from "${aliasModule(config.paths.infrastructurePorts)}";
+import { initialPorts } from "${aliasModule(config.paths.portWiring)}";
 import type { AppTransactionPorts } from "${aliasModule(config.paths.ports)}";
 import { getUnreadCountUseCase } from "../use-cases/get-unread-count";
 import { listInboxUseCase } from "../use-cases/list-inbox";
@@ -1140,9 +1140,9 @@ function createHarness(
 \tconst inbox = options.inbox ?? createMemoryInboxRepository();
 \tconst actor = options.actor ?? createTestUserActor("user_test");
 \tconst fixture = createTestPorts<AppContext["ports"], AppTransactionPorts>({
-\t\tbase: appPorts,
+\t\tbase: initialPorts,
 \t\toverrides: {
-\t\t\tgate: appPorts.gate,
+\t\t\tgate: initialPorts.gate,
 \t\t\tinbox,
 \t\t},
 \t});
@@ -1305,7 +1305,7 @@ import {
 \tdefineInboxNotificationChannel,
 \ttype InboxNotificationInput,
 } from "${channelModule}";
-import { appPorts } from "${aliasModule(config.paths.infrastructurePorts)}";
+import { initialPorts } from "${aliasModule(config.paths.portWiring)}";
 import { defineNotification } from "${aliasModule(config.paths.notificationsBuilder)}";
 import type { AppTransactionPorts } from "${aliasModule(config.paths.ports)}";
 import { createMemoryInboxRepository } from "./factories/inbox-notification";
@@ -1340,9 +1340,9 @@ const skippingNotification = defineNotification("inbox.channel-skip-test", {
 function createHarness() {
 \tconst inbox = createMemoryInboxRepository();
 \tconst fixture = createTestPorts<AppContext["ports"], AppTransactionPorts>({
-\t\tbase: appPorts,
+\t\tbase: initialPorts,
 \t\toverrides: {
-\t\t\tgate: appPorts.gate,
+\t\t\tgate: initialPorts.gate,
 \t\t\tinbox,
 \t\t},
 \t});

package/src/make/payments.ts

@@ -82,7 +82,13 @@ export async function makePayments(
 
   const database = await detectResourceDatabase(targetDir, config);
   const ui = await detectUiShell(targetDir, config);
-  const generatedFiles = paymentsFiles(config, database, { ui });
+  const tenantScoped = await fileExists(
+    path.join(targetDir, config.paths.features, "workspaces/contracts.ts"),
+  );
+  const generatedFiles = paymentsFiles(config, database, {
+    ui,
+    idempotencyScope: tenantScoped ? "actor-tenant" : "actor",
+  });
   const plannedFiles = await planGeneratedFiles(targetDir, generatedFiles, {
     force: Boolean(options.force),
   });
@@ -246,7 +252,7 @@ export async function updatePaymentsWiring(
   }
   if (await updatePaymentsEntitlementsPort(targetDir, config, options)) {
     updated.add(config.paths.ports);
-    updated.add(config.paths.infrastructurePorts);
+    updated.add(config.paths.portWiring);
   }
   if (
     await updateInfrastructureDeferredPorts(
@@ -256,7 +262,7 @@ export async function updatePaymentsWiring(
       options,
     )
   ) {
-    updated.add(config.paths.infrastructurePorts);
+    updated.add(config.paths.portWiring);
   }
   if (
     await updateDrizzleSchemaIndexExports(
@@ -354,10 +360,7 @@ export async function updatePaymentsEntitlementsPort(
     if (!options.dryRun) await writeFile(portsFilePath, portsNext);
   }
 
-  const infrastructureFilePath = path.join(
-    targetDir,
-    config.paths.infrastructurePorts,
-  );
+  const infrastructureFilePath = path.join(targetDir, config.paths.portWiring);
   const infrastructureOriginal = await readFile(infrastructureFilePath, "utf8");
   const infrastructureNext = appendDeferredPortKey(
     infrastructureOriginal,
@@ -368,7 +371,7 @@ export async function updatePaymentsEntitlementsPort(
     !/["']entitlements["']/.test(infrastructureOriginal)
   ) {
     throw new Error(
-      `Could not find the deferred port list in ${config.paths.infrastructurePorts}. Add "entitlements" manually, or restore the generated infrastructure ports file before running make payments.`,
+      `Could not find the deferred port list in ${config.paths.portWiring}. Add "entitlements" manually, or restore the generated port wiring file before running make payments.`,
     );
   }
   if (infrastructureNext !== infrastructureOriginal) {
@@ -558,7 +561,10 @@ export async function updateBillingSettingsNav(
 export function paymentsFiles(
   config: ResolvedBeignetConfig,
   database: DatabaseName,
-  options: { ui: boolean } = { ui: false },
+  options: {
+    ui: boolean;
+    idempotencyScope?: "actor" | "actor-tenant";
+  } = { ui: false },
 ): GeneratedFile[] {
   const uiFiles: GeneratedFile[] = options.ui
     ? [
@@ -611,7 +617,7 @@ export function paymentsFiles(
     },
     {
       path: path.join(config.paths.features, "billing/contracts.ts"),
-      content: billingContractsFile(),
+      content: billingContractsFile(options.idempotencyScope ?? "actor"),
     },
     {
       path: path.join(config.paths.features, "billing/use-cases/index.ts"),
@@ -846,7 +852,9 @@ export function isBillingAccountActive(
 `;
 }
 
-export function billingContractsFile(): string {
+export function billingContractsFile(
+  idempotencyScope: "actor" | "actor-tenant" = "actor",
+): string {
   return `import { defineContractGroup } from "@beignet/core/contracts";
 import { z } from "zod";
 import {
@@ -883,7 +891,7 @@ export const createCheckoutSession = checkoutBilling
 \t\tidempotency: {
 \t\t\trequired: true,
 \t\t\theader: "idempotency-key",
-\t\t\tscope: "actor-tenant",
+\t\t\tscope: "${idempotencyScope}",
 \t\t\tttlSec: 86_400,
 \t\t},
 \t})
@@ -1410,7 +1418,7 @@ import {
 \tcreateTestPorts,
 } from "@beignet/core/testing";
 import type { AppContext } from "${aliasModule(config.paths.appContext)}";
-import { appPorts } from "@/infra/app-ports";
+import { initialPorts } from "@/infra/port-wiring";
 import type { AppTransactionPorts } from "@/ports";
 import { createBillingEntitlements } from "../entitlements";
 import type { BillingAccount, BillingRepository } from "../ports";
@@ -1451,11 +1459,11 @@ function createHarness(options: { actor?: AppContext["actor"] } = {}) {
 \tconst billing = createMemoryBillingRepository();
 \tconst actor = options.actor ?? createTestUserActor("user_test");
 \tconst fixture = createTestPorts<AppContext["ports"], AppTransactionPorts>({
-\t\tbase: appPorts,
+\t\tbase: initialPorts,
 \t\toverrides: {
 \t\t\tbilling,
 \t\t\tentitlements: createBillingEntitlements(billing),
-\t\t\tgate: appPorts.gate,
+\t\t\tgate: initialPorts.gate,
 \t\t},
 \t});
 \tconst createContext = createTestContextFactory<