@beignet/cli 0.0.37 → 0.0.39

package/src/make/shared.ts

@@ -45,8 +45,8 @@ export type ResourceNames = {
 export type ResourceGenerationMode = "feature" | "resource";
 
 export type ResourceGenerationOptions = {
-  auth: boolean;
-  tenant: boolean;
+  authorization: boolean;
+  tenantScoped: boolean;
   events: boolean;
   softDelete: boolean;
 };
@@ -220,6 +220,13 @@ export type UploadNames = FeatureArtifactNames & {
   uploadExportName: string;
   metadataSchemaName: string;
   metadataTypeName: string;
+  fileConstraintsExportName: string;
+  manifestExportName: string;
+  manifestFileName: string;
+  reactUploadsExportName: string;
+  clientFileName: string;
+  componentExportName: string;
+  componentFileName: string;
 };
 
 export type FeatureUiNames = ResourceNames & {
@@ -273,7 +280,7 @@ export type FileChangeSet = {
  * A provider-backed app port a generator depends on.
  *
  * Generated code that publishes events or sends notifications needs the
- * matching port in `AppPorts`, the key deferred in `infra/app-ports.ts`, and a
+ * matching port in `AppPorts`, the key deferred in `infra/port-wiring.ts`, and a
  * dev-default provider registered in `server/providers.ts`. Wiring is
  * generation-time by design: the starter stays lean and each generator wires
  * its own dependencies.
@@ -434,8 +441,13 @@ export function wireListenersProviderSource(
   }
 
   if (!new RegExp(`\\bconst\\s+${providerName}\\b`).test(next)) {
+    next = addNamedImport(
+      next,
+      "tryReportException",
+      "@beignet/core/error-reporting",
+    );
     const providerDefinition = `const ${providerName} = createProvider<
-\tPick<AppPorts, "eventBus" | "logger">,
+\tPick<AppPorts, "errorReporter" | "eventBus" | "logger">,
 \tAppContext,
 \tAppServiceContextInput
 >()({
@@ -451,6 +463,20 @@ export function wireListenersProviderSource(
 \t\t\t\t\terror,
 \t\t\t\t\tlistenerName: listener.name,
 \t\t\t\t});
+\t\t\t\tvoid tryReportException({
+\t\t\t\t\treporter: ports.errorReporter,
+\t\t\t\t\terror,
+\t\t\t\t\treportOptions: {
+\t\t\t\t\t\tlevel: "error",
+\t\t\t\t\t\tmechanism: "beignet.listener",
+\t\t\t\t\t\thandled: false,
+\t\t\t\t\t\ttags: {
+\t\t\t\t\t\t\t"beignet.kind": "listener",
+\t\t\t\t\t\t\t"beignet.listener": listener.name,
+\t\t\t\t\t\t},
+\t\t\t\t\t\tcontexts: { listener: { name: listener.name } },
+\t\t\t\t\t},
+\t\t\t\t});
 \t\t\t},
 \t\t});
 
@@ -483,7 +509,7 @@ export function wireListenersProviderSource(
  *
  * Each wiring is independent and skipped silently when its port key already
  * appears in the ports file, so apps that wired their own adapter (or scaffolds
- * whose integrations already contribute the port) are left untouched. All
+ * whose providers already contribute the port) are left untouched. All
  * anchors are computed before any file is written; an anchor miss aborts with a
  * copy-pasteable manual instruction so the generator never leaves partial
  * wiring behind. Callers validate anchors with `dryRun: true` before writing
@@ -496,7 +522,7 @@ export async function wirePortProviders(
   options: { dryRun: boolean },
 ): Promise<{ updatedFiles: string[] }> {
   const portsFile = config.paths.ports;
-  const infrastructureFile = config.paths.infrastructurePorts;
+  const infrastructureFile = config.paths.portWiring;
   const providersFile = providersFilePath(config);
   const manualFor = (wiring: PortProviderWiring) =>
     `Wire the ${wiring.portKey} port manually: add ${wiring.portKey}: ${wiring.portType}; to AppPorts in ${portsFile}, defer "${wiring.portKey}" in ${infrastructureFile}, and register ${wiring.providerFactory}() from ${wiring.providerModule} in ${providersFile}.`;
@@ -510,7 +536,7 @@ export async function wirePortProviders(
   }
 
   // A port key that already appears in the ports file means the app wired its
-  // own adapter or an integration already contributes the port.
+  // own adapter or a provider already contributes the port.
   const active = wirings.filter(
     (wiring) => !new RegExp(`\\b${wiring.portKey}\\b`).test(portsOriginal),
   );
@@ -536,7 +562,7 @@ export async function wirePortProviders(
   );
   if (infrastructureOriginal === undefined) {
     throw new Error(
-      `Could not find the generated infrastructure ports file ${infrastructureFile}. ${manualFor(active[0])}`,
+      `Could not find the generated port wiring file ${infrastructureFile}. ${manualFor(active[0])}`,
     );
   }
 
@@ -548,7 +574,7 @@ export async function wirePortProviders(
       !new RegExp(`["']${wiring.portKey}["']`).test(infrastructureNext)
     ) {
       throw new Error(
-        `Could not find the deferred port list in ${infrastructureFile}. ${manualFor(wiring)} Or restore the generated infrastructure ports file before running beignet ${wiring.command}.`,
+        `Could not find the deferred port list in ${infrastructureFile}. ${manualFor(wiring)} Or restore the generated port wiring file before running beignet ${wiring.command}.`,
       );
     }
     infrastructureNext = appended;
@@ -651,7 +677,7 @@ export async function assertStandardApp(
 ): Promise<void> {
   const requiredFiles = [
     config.paths.appContext,
-    config.paths.infrastructurePorts,
+    config.paths.portWiring,
     config.paths.ports,
     config.paths.server,
     config.paths.useCaseBuilder,
@@ -688,7 +714,7 @@ export async function assertTestApp(
 ): Promise<void> {
   const requiredFiles = [
     config.paths.appContext,
-    config.paths.infrastructurePorts,
+    config.paths.portWiring,
     useCaseFilePath(names, config),
   ];
 
@@ -707,7 +733,7 @@ export async function assertPortApp(
   targetDir: string,
   config: ResolvedBeignetConfig,
 ): Promise<void> {
-  const requiredFiles = [config.paths.ports, config.paths.infrastructurePorts];
+  const requiredFiles = [config.paths.ports, config.paths.portWiring];
 
   for (const file of requiredFiles) {
     try {
@@ -725,10 +751,7 @@ export async function assertAdapterApp(
   names: PortNames,
   config: ResolvedBeignetConfig,
 ): Promise<void> {
-  const requiredFiles = [
-    config.paths.infrastructurePorts,
-    portFilePath(names, config),
-  ];
+  const requiredFiles = [config.paths.portWiring, portFilePath(names, config)];
 
   for (const file of requiredFiles) {
     try {
@@ -740,16 +763,16 @@ export async function assertAdapterApp(
     }
   }
 
-  const infrastructurePorts = await readFile(
-    path.join(targetDir, config.paths.infrastructurePorts),
+  const portWiring = await readFile(
+    path.join(targetDir, config.paths.portWiring),
     "utf8",
   );
   if (
-    !infrastructurePorts.includes(portStubEntry(names)) &&
-    !infrastructurePorts.includes(adapterEntry(names))
+    !portWiring.includes(portStubEntry(names)) &&
+    !portWiring.includes(adapterEntry(names))
   ) {
     throw new Error(
-      `Could not find the generated ${names.interfaceName} infrastructure stub in ${config.paths.infrastructurePorts}. Wire ${names.adapterFactoryName}() manually or restore the generated stub before running make adapter.`,
+      `Could not find the generated ${names.interfaceName} infrastructure stub in ${config.paths.portWiring}. Wire ${names.adapterFactoryName}() manually or restore the generated stub before running make adapter.`,
     );
   }
 }
@@ -822,7 +845,7 @@ export async function assertServerRuntimeApp(
   const requiredFiles = [
     config.paths.appContext,
     config.paths.server,
-    config.paths.infrastructurePorts,
+    config.paths.portWiring,
   ];
 
   for (const file of requiredFiles) {
@@ -1163,7 +1186,7 @@ export async function updatePortsIndex(
     next = insertAfterImports(next, importLine);
   }
 
-  if (options.generationOptions?.auth) {
+  if (options.generationOptions?.authorization) {
     const policyPath = path.join(
       config.paths.features,
       names.pluralKebab,
@@ -1254,11 +1277,11 @@ export async function updateInfrastructurePortStub(
   config: ResolvedBeignetConfig,
   options: { dryRun: boolean },
 ): Promise<boolean> {
-  const filePath = path.join(targetDir, config.paths.infrastructurePorts);
+  const filePath = path.join(targetDir, config.paths.portWiring);
   const original = await readFile(filePath, "utf8");
   let next = original;
   const portPath = portFilePath(names, config);
-  const importLine = `import type { ${names.interfaceName} } from "${relativeModule(config.paths.infrastructurePorts, portPath)}";`;
+  const importLine = `import type { ${names.interfaceName} } from "${relativeModule(config.paths.portWiring, portPath)}";`;
 
   if (!next.includes(importLine)) {
     next = insertAfterImports(next, importLine);
@@ -1273,7 +1296,7 @@ export async function updateInfrastructurePortStub(
     next = insertDefinePortsProperty(
       next,
       entry.trim(),
-      `Could not find definePorts({ in ${config.paths.infrastructurePorts}. Add the ${names.interfaceName} stub manually, or restore the generated infrastructure ports file before running make port.`,
+      `Could not find definePorts({ in ${config.paths.portWiring}. Add the ${names.interfaceName} stub manually, or restore the generated port wiring file before running make port.`,
     );
   }
 
@@ -1288,18 +1311,18 @@ export async function updateInfrastructureAdapterWiring(
   config: ResolvedBeignetConfig,
   options: { dryRun: boolean },
 ): Promise<boolean> {
-  const filePath = path.join(targetDir, config.paths.infrastructurePorts);
+  const filePath = path.join(targetDir, config.paths.portWiring);
   const original = await readFile(filePath, "utf8");
   let next = original;
   const adapterPath = adapterFilePath(names, config);
-  const adapterImportLine = `import { ${names.adapterFactoryName} } from "${relativeModule(config.paths.infrastructurePorts, adapterPath)}";`;
+  const adapterImportLine = `import { ${names.adapterFactoryName} } from "${relativeModule(config.paths.portWiring, adapterPath)}";`;
 
   if (!next.includes(adapterImportLine)) {
     next = insertAfterImports(next, adapterImportLine);
   }
 
   const portPath = portFilePath(names, config);
-  const portImportLine = `import type { ${names.interfaceName} } from "${relativeModule(config.paths.infrastructurePorts, portPath)}";`;
+  const portImportLine = `import type { ${names.interfaceName} } from "${relativeModule(config.paths.portWiring, portPath)}";`;
   if (next.includes(portImportLine)) {
     next = next.replace(`${portImportLine}\n`, "");
   }
@@ -1310,7 +1333,7 @@ export async function updateInfrastructureAdapterWiring(
     next = next.replace(stub, adapter);
   } else if (!next.includes(adapter)) {
     throw new Error(
-      `Could not find the generated ${names.interfaceName} infrastructure stub in ${config.paths.infrastructurePorts}. Wire ${names.adapterFactoryName}() manually or restore the generated stub before running make adapter.`,
+      `Could not find the generated ${names.interfaceName} infrastructure stub in ${config.paths.portWiring}. Wire ${names.adapterFactoryName}() manually or restore the generated stub before running make adapter.`,
     );
   }
 
@@ -1325,15 +1348,15 @@ export async function updateInfrastructurePorts(
   config: ResolvedBeignetConfig,
   options: { dryRun: boolean },
 ): Promise<boolean> {
-  const filePath = path.join(targetDir, config.paths.infrastructurePorts);
+  const filePath = path.join(targetDir, config.paths.portWiring);
   const original = await readFile(filePath, "utf8");
   let next = original;
   const repositoryPath = path.join(
-    path.dirname(config.paths.infrastructurePorts),
+    path.dirname(config.paths.portWiring),
     names.pluralKebab,
     `in-memory-${names.singularKebab}-repository.ts`,
   );
-  const importLine = `import { createInMemory${names.singularPascal}Repository } from "${relativeModule(config.paths.infrastructurePorts, repositoryPath)}";`;
+  const importLine = `import { createInMemory${names.singularPascal}Repository } from "${relativeModule(config.paths.portWiring, repositoryPath)}";`;
 
   if (!next.includes(importLine)) {
     next = insertAfterImports(next, importLine);
@@ -1343,9 +1366,9 @@ export async function updateInfrastructurePorts(
   if (!next.includes(repositoryConst)) {
     next = replaceRequired(
       next,
-      /(\nexport const appPorts = definePorts(?:<[^>]+>)?\((?:\)\()?\{)/,
+      /(\nexport const initialPorts = definePorts(?:<[^>]+>)?\((?:\)\()?\{)/,
       `\n${repositoryConst}\n$1`,
-      `Could not find definePorts({ in ${config.paths.infrastructurePorts}. Add ${repositoryConst} manually, or restore the generated infrastructure ports file before running make resource.`,
+      `Could not find definePorts({ in ${config.paths.portWiring}. Add ${repositoryConst} manually, or restore the generated port wiring file before running make resource.`,
     );
   }
 
@@ -1358,7 +1381,7 @@ export async function updateInfrastructurePorts(
     next = insertDefinePortsProperty(
       next,
       entry.trim(),
-      `Could not find definePorts({ in ${config.paths.infrastructurePorts}. Add ${entry.trim()} to appPorts manually, or restore the generated infrastructure ports file before running make resource.`,
+      `Could not find definePorts({ in ${config.paths.portWiring}. Add ${entry.trim()} to initialPorts manually, or restore the generated port wiring file before running make resource.`,
     );
   }
 
@@ -1371,7 +1394,7 @@ export async function updateInfrastructurePorts(
     next = insertNoopUnitOfWorkProperty(
       next,
       transactionEntry.trim(),
-      `Could not find the generated Unit of Work port list in ${config.paths.infrastructurePorts}. Add ${transactionEntry.trim()} manually, or restore the generated infrastructure ports file before running make resource.`,
+      `Could not find the generated Unit of Work port list in ${config.paths.portWiring}. Add ${transactionEntry.trim()} manually, or restore the generated port wiring file before running make resource.`,
     );
   }
 
@@ -1386,7 +1409,7 @@ export async function updateInfrastructureGatePolicies(
   config: ResolvedBeignetConfig,
   options: { dryRun: boolean },
 ): Promise<boolean> {
-  const filePath = path.join(targetDir, config.paths.infrastructurePorts);
+  const filePath = path.join(targetDir, config.paths.portWiring);
   const original = await readFile(filePath, "utf8");
   let next = original;
   const policyPath = path.join(
@@ -1394,7 +1417,7 @@ export async function updateInfrastructureGatePolicies(
     names.pluralKebab,
     "policy.ts",
   );
-  const importLine = `import { ${names.singularCamel}Policy } from "${relativeModule(config.paths.infrastructurePorts, policyPath)}";`;
+  const importLine = `import { ${names.singularCamel}Policy } from "${relativeModule(config.paths.portWiring, policyPath)}";`;
 
   if (!next.includes(importLine)) {
     next = insertAfterImports(next, importLine);
@@ -1403,7 +1426,7 @@ export async function updateInfrastructureGatePolicies(
   next = appendCreateGatePolicy(
     next,
     `${names.singularCamel}Policy`,
-    `Could not find createGate({ policies: [...] }) in ${config.paths.infrastructurePorts}. Add ${names.singularCamel}Policy to the gate policies manually, or restore the generated infrastructure ports file before running make resource --auth.`,
+    `Could not find createGate({ policies: [...] }) in ${config.paths.portWiring}. Add ${names.singularCamel}Policy to the gate policies manually, or restore the generated port wiring file before running make resource --auth.`,
   );
 
   if (next === original) return false;
@@ -1713,7 +1736,7 @@ export async function updateInfrastructureDeferredPorts(
   config: ResolvedBeignetConfig,
   options: { dryRun: boolean },
 ): Promise<boolean> {
-  const filePath = path.join(targetDir, config.paths.infrastructurePorts);
+  const filePath = path.join(targetDir, config.paths.portWiring);
   const original = await readFile(filePath, "utf8");
   // Drizzle resources are provided by the app database provider at startup,
   // so deferred-form ports files defer the new repository key. Identity-form
@@ -1745,11 +1768,11 @@ export async function updateServerTransactionPorts(
 
   if (!/\bappPorts\b/.test(next)) {
     throw new Error(
-      `Could not find appPorts in ${config.paths.server}. Add ${names.pluralCamel}: appPorts.${names.pluralCamel} to createTransactionPorts manually, or restore the generated server file before running make resource.`,
+      `Could not find initialPorts in ${config.paths.server}. Add ${names.pluralCamel}: initialPorts.${names.pluralCamel} to createTransactionPorts manually, or restore the generated server file before running make resource.`,
     );
   }
 
-  const entry = `\t\t\t\t\t\t${names.pluralCamel}: appPorts.${names.pluralCamel},`;
+  const entry = `\t\t\t\t\t\t${names.pluralCamel}: initialPorts.${names.pluralCamel},`;
   next = insertDrizzleTransactionPortsProperty(
     next,
     entry.trim(),
@@ -2895,13 +2918,12 @@ export function artifactNameParts(
 ): [string, string] {
   const parts = input
     .trim()
-    .split("/")
-    .map((part) => part.trim())
-    .filter(Boolean);
+    .split(".")
+    .map((part) => part.trim());
 
-  if (parts.length !== 2) {
+  if (parts.length !== 2 || parts.some((part) => part.length === 0)) {
     throw new Error(
-      `${label} name must use feature/name format, for example posts/published.`,
+      `${label} name must use feature.name format, for example posts.published.`,
     );
   }
 
@@ -3048,14 +3070,14 @@ export function adapterFilePath(
   config: ResolvedBeignetConfig,
 ): string {
   return path.join(
-    path.dirname(config.paths.infrastructurePorts),
+    path.dirname(config.paths.portWiring),
     names.kebab,
     `${names.kebab}-adapter.ts`,
   );
 }
 
 export function infrastructureDir(config: ResolvedBeignetConfig): string {
-  return path.dirname(config.paths.infrastructurePorts);
+  return path.dirname(config.paths.portWiring);
 }
 
 export function drizzleSchemaIndexPath(config: ResolvedBeignetConfig): string {

package/src/make/tenancy.ts

@@ -330,7 +330,7 @@ export async function updateTenancyWiring(
   if (
     await updateWorkspaceInfrastructurePorts(targetDir, config, editOptions)
   ) {
-    updated.add(config.paths.infrastructurePorts);
+    updated.add(config.paths.portWiring);
   }
   if (
     await updateDrizzleSchemaIndexExports(
@@ -524,7 +524,7 @@ export async function updateWorkspaceInfrastructurePorts(
   config: ResolvedBeignetConfig,
   options: { dryRun: boolean },
 ): Promise<boolean> {
-  const filePath = path.join(targetDir, config.paths.infrastructurePorts);
+  const filePath = path.join(targetDir, config.paths.portWiring);
   const original = await readFile(filePath, "utf8");
   let next = original;
 
@@ -532,21 +532,21 @@ export async function updateWorkspaceInfrastructurePorts(
     const appended = appendDeferredPortKey(next, portKey);
     if (appended === next && !new RegExp(`["']${portKey}["']`).test(next)) {
       throw new Error(
-        `Could not find the deferred port list in ${config.paths.infrastructurePorts}. Add "${portKey}" manually, or restore the generated infrastructure ports file before running make tenancy.`,
+        `Could not find the deferred port list in ${config.paths.portWiring}. Add "${portKey}" manually, or restore the generated port wiring file before running make tenancy.`,
       );
     }
     next = appended;
   }
 
   const policyModule = relativeModule(
-    config.paths.infrastructurePorts,
+    config.paths.portWiring,
     path.join(config.paths.features, "workspaces/policy.ts"),
   );
   next = addNamedImport(next, "workspacePolicy", policyModule);
   next = appendCreateGatePolicy(
     next,
     "workspacePolicy",
-    `Could not find createGate({ policies: [...] }) in ${config.paths.infrastructurePorts}. Add workspacePolicy to the gate policies manually, or restore the generated infrastructure ports file before running make tenancy.`,
+    `Could not find createGate({ policies: [...] }) in ${config.paths.portWiring}. Add workspacePolicy to the gate policies manually, or restore the generated port wiring file before running make tenancy.`,
   );
 
   if (next === original) return false;
@@ -2274,7 +2274,7 @@ import type {
 \tWorkspaceMemberWithUser,
 \tWorkspaceRepository,
 } from "@/features/workspaces/ports";
-import { appPorts } from "@/infra/app-ports";
+import { initialPorts } from "@/infra/port-wiring";
 import type { AppTransactionPorts } from "@/ports";
 
 export type MemoryWorkspacePorts = {
@@ -2468,9 +2468,9 @@ export type WorkspaceTestFixture = TestPortsFixture<
 export function createWorkspaceFixture(): WorkspaceTestFixture {
 \tconst repositories = createMemoryWorkspacePorts();
 \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\t...repositories,
 \t\t},
 \t});