@beignet/cli 0.0.39 → 0.0.41

package/dist/inspect.js

@@ -19,10 +19,7 @@ export async function inspectApp(options = {}) {
         : await loadBeignetConfig(targetDir, files);
     const convention = inspectConvention(files, config);
     const contracts = await readContracts(targetDir, files, config);
-    const routeFiles = files.filter((file) => file.startsWith(`${directoryPath(config.paths.routes)}/`) &&
-        file.endsWith("/route.ts"));
-    const routeExports = await readRouteExports(targetDir, routeFiles, config);
-    const matchedRoutes = matchRoutes(contracts, routeExports);
+    const matchedRoutes = await inspectRouteSurface(targetDir, files, config, contracts);
     const diagnostics = await inspectDiagnostics(targetDir, files, config, convention, contracts, matchedRoutes, Boolean(options.strict));
     return {
         schemaVersion: 1,
@@ -45,10 +42,7 @@ export async function applyDoctorFixes(options = {}) {
         : await loadBeignetConfig(targetDir, files);
     const convention = inspectConvention(files, config);
     const contracts = await readContracts(targetDir, files, config);
-    const routeFiles = files.filter((file) => file.startsWith(`${directoryPath(config.paths.routes)}/`) &&
-        file.endsWith("/route.ts"));
-    const routeExports = await readRouteExports(targetDir, routeFiles, config);
-    const matchedRoutes = matchRoutes(contracts, routeExports);
+    const matchedRoutes = await inspectRouteSurface(targetDir, files, config, contracts);
     const fixes = [];
     const packageFix = await fixPackageScripts(targetDir, files, convention);
     if (packageFix)
@@ -85,7 +79,9 @@ export function formatRoutes(result) {
         contract: route.exportName,
         handler: route.handlerSource === "missing"
             ? "missing"
-            : `${route.handlerFile ?? "unknown"}:${route.handlerExport ?? route.method}`,
+            : route.handlerSource === "web-server"
+                ? `${route.handlerFile ?? "unknown"}:registry`
+                : `${route.handlerFile ?? "unknown"}:${route.handlerExport ?? route.method}`,
     }));
     return table([
         ["METHOD", "PATH", "CONTRACT", "HANDLER"],
@@ -265,6 +261,10 @@ function inspectConvention(files, config) {
         `${directoryPath(config.paths.routes)}/`,
         config.paths.server,
     ]);
+    const missingWebLayout = missingRequirements(files, [
+        `${directoryPath(config.paths.contracts)}/`,
+        config.paths.server,
+    ]);
     const missingResourceGenerator = missingRequirements(files, [
         config.paths.appContext,
         config.paths.portWiring,
@@ -273,13 +273,22 @@ function inspectConvention(files, config) {
         config.paths.useCaseBuilder,
     ]);
     const nextLayout = missingNextLayout.length === 0;
+    const webLayout = missingWebLayout.length === 0;
     const resourceGenerator = missingResourceGenerator.length === 0;
     return {
-        kind: resourceGenerator ? "standard" : nextLayout ? "next" : "custom",
+        kind: resourceGenerator
+            ? "standard"
+            : config.framework === "web" && webLayout
+                ? "web"
+                : nextLayout
+                    ? "next"
+                    : "custom",
         nextLayout,
+        webLayout,
         resourceGenerator,
         configFile: config.configFile,
         missingNextLayout,
+        missingWebLayout,
         missingResourceGenerator,
     };
 }
@@ -299,7 +308,7 @@ function parseContracts(source, file) {
     const exportRegex = /(?:^|\n)export const\s+([A-Za-z_$][\w$]*)\s*=([\s\S]*?)(?=\nexport const\s+[A-Za-z_$][\w$]*\s*=|$)/g;
     for (const exportMatch of source.matchAll(exportRegex)) {
         const block = exportMatch[2];
-        const methodMatch = /([A-Za-z_$][\w$]*)(?:\s*\.\s*[A-Za-z_$][\w$]*\([^)]*\))*\s*\.\s*(get|post|put|patch|delete|head|options)\(\s*["']([^"']+)["']\s*\)/.exec(block);
+        const methodMatch = /([A-Za-z_$][\w$]*)(?:\s*\.\s*[A-Za-z_$][\w$]*\([^)]*\))*\s*\.\s*(get|post|put|patch|delete|head|options)\(\s*["']([^"']+)["'](?:\s*,\s*["'][^"']+["'])?\s*\)/.exec(block);
         if (methodMatch) {
             const receiver = methodMatch[1];
             const pathPrefix = groupPrefixes.get(receiver) ?? "";
@@ -801,6 +810,42 @@ function matchRoutes(contracts, routeExports) {
         unmatchedRouteHandlers,
     };
 }
+async function inspectRouteSurface(targetDir, files, config, contracts) {
+    if (config.framework === "next") {
+        const routeFiles = files.filter((file) => file.startsWith(`${directoryPath(config.paths.routes)}/`) &&
+            file.endsWith("/route.ts"));
+        const routeExports = await readRouteExports(targetDir, routeFiles, config);
+        return matchRoutes(contracts, routeExports);
+    }
+    if (!files.includes(config.paths.server)) {
+        return {
+            routes: contracts.map((contract) => ({
+                ...contract,
+                handlerSource: "missing",
+            })),
+            unmatchedRouteHandlers: [],
+        };
+    }
+    const serverSource = await readFile(path.join(targetDir, config.paths.server), "utf8");
+    const routeGroups = await readFeatureRouteGroups(targetDir, files, config);
+    const registeredGroups = await registeredRouteGroupsForServer(targetDir, files, config, serverSource);
+    const registeredContracts = contractsForRegisteredRouteGroups(contracts, routeGroups, registeredGroups);
+    const registeredKeys = new Set(registeredContracts.map(contractKey));
+    const handlerFile = routeRegistryFileFromServerSource(serverSource, config.paths.server, files) ?? config.paths.server;
+    return {
+        routes: contracts.map((contract) => registeredKeys.has(contractKey(contract))
+            ? {
+                ...contract,
+                handlerFile,
+                handlerSource: "web-server",
+            }
+            : {
+                ...contract,
+                handlerSource: "missing",
+            }),
+        unmatchedRouteHandlers: [],
+    };
+}
 function findContract(contracts, routeExport) {
     return findContracts(contracts, routeExport)[0];
 }
@@ -828,30 +873,66 @@ function contractPathMatchesCatchAll(contractPath, catchAllPrefix) {
 }
 async function inspectDiagnostics(targetDir, files, config, convention, contracts, matchedRoutes, strict) {
     const diagnostics = [];
-    if (!convention.nextLayout) {
+    const frameworkLayout = config.framework === "next" ? convention.nextLayout : convention.webLayout;
+    const missingFrameworkLayout = config.framework === "next"
+        ? convention.missingNextLayout
+        : convention.missingWebLayout;
+    if (!frameworkLayout) {
+        const expectedLayout = config.framework === "next"
+            ? `${directoryPath(config.paths.contracts)}/, ${directoryPath(config.paths.routes)}/, and ${config.paths.server}`
+            : `${directoryPath(config.paths.contracts)}/ and ${config.paths.server}`;
+        const layoutName = config.framework === "next"
+            ? "standard Beignet app layout"
+            : "standard Beignet web app layout";
         diagnostics.push({
             severity: "warning",
             code: "BEIGNET_APP_LAYOUT_NOT_FOUND",
-            message: `This directory does not match the standard Beignet app layout. CLI inspection expects ${directoryPath(config.paths.contracts)}/, ${directoryPath(config.paths.routes)}/, and ${config.paths.server}. Missing: ${convention.missingNextLayout.join(", ")}. Add the missing app files or configure their paths in beignet.config.ts.`,
+            message: `This directory does not match the ${layoutName}. CLI inspection expects ${expectedLayout}. Missing: ${missingFrameworkLayout.join(", ")}. Add the missing app files or configure their paths in beignet.config.ts.`,
         });
     }
-    for (const route of matchedRoutes.routes) {
-        if (route.handlerSource !== "missing")
-            continue;
-        diagnostics.push({
-            severity: "error",
-            code: "BEIGNET_ROUTE_MISSING",
-            file: route.file,
-            contract: route.exportName,
-            message: `${route.exportName} (${route.method} ${route.path}) has no matching Next route handler. Add ${methodArticle(route.method)} ${route.method} export to ${directoryPath(config.paths.routes)}/[[...path]]/route.ts or a matching route file, or remove the unused contract.`,
-        });
+    diagnostics.push(...(await inspectFrameworkAdapter(targetDir, files, config)));
+    if (config.framework === "next" || !convention.resourceGenerator) {
+        for (const route of matchedRoutes.routes) {
+            if (route.handlerSource !== "missing")
+                continue;
+            diagnostics.push({
+                severity: "error",
+                code: "BEIGNET_ROUTE_MISSING",
+                file: route.file,
+                contract: route.exportName,
+                message: config.framework === "next"
+                    ? `${route.exportName} (${route.method} ${route.path}) has no matching Next route handler. Add ${methodArticle(route.method)} ${route.method} export to ${directoryPath(config.paths.routes)}/[[...path]]/route.ts or a matching route file, or remove the unused contract.`
+                    : `${route.exportName} (${route.method} ${route.path}) is not registered in the route surface passed to createFetchServer(...). Register the contract through defineRoutes(...) or remove the unused contract.`,
+            });
+        }
     }
-    for (const routeHandler of matchedRoutes.unmatchedRouteHandlers) {
-        diagnostics.push(unmatchedRouteDiagnostic(routeHandler));
+    if (config.framework === "next") {
+        for (const routeHandler of matchedRoutes.unmatchedRouteHandlers) {
+            diagnostics.push(unmatchedRouteDiagnostic(routeHandler));
+        }
     }
-    diagnostics.push(...(await inspectPackageScripts(targetDir, files, convention)), ...(await inspectOpenApiDrift(targetDir, files, config, convention, contracts, matchedRoutes)), ...(await inspectFeatureRouteRegistration(targetDir, files, config, convention, contracts)), ...(await inspectRouteErrorCatalogDrift(targetDir, files, config, convention, contracts, strict)), ...(await inspectCanonicalConformance(targetDir, files, config, convention, strict)), ...(await inspectVersionSkew(targetDir, files)), ...(await inspectProviderMetadataDrift(targetDir, files, convention)), ...(await inspectPortProviderDrift(targetDir, files, config, convention)), ...(await inspectProviderRegistrationDrift(targetDir, files, config, convention)), ...(await inspectDatabaseLifecycleDrift(targetDir, files, config, convention, strict)), ...(await inspectAuthzAuditDrift(targetDir, files, config, convention, contracts)), ...(await inspectServerlessFootguns(targetDir, files, config, convention)), ...(await inspectProductionReadiness(targetDir, files, config, convention)), ...(await inspectFeatureArtifactDrift(targetDir, files, config, convention)), ...(await inspectWorkflowRegistrationDrift(targetDir, files, config, convention)), ...(await inspectRuntimeManifestDrift(targetDir, files, config, convention)), ...(await inspectResourceSlices(targetDir, files, config, convention, strict)));
+    diagnostics.push(...(await inspectPackageScripts(targetDir, files, convention)), ...(await inspectOpenApiDrift(targetDir, files, config, convention, contracts, matchedRoutes)), ...(await inspectFeatureRouteRegistration(targetDir, files, config, convention, contracts)), ...(await inspectRouteErrorCatalogDrift(targetDir, files, config, convention, contracts, strict)), ...(await inspectCanonicalConformance(targetDir, files, config, convention, strict)), ...(await inspectVersionSkew(targetDir, files)), ...(await inspectProviderMetadataDrift(targetDir, files, convention)), ...(await inspectPortProviderDrift(targetDir, files, config, convention)), ...(await inspectProviderRegistrationDrift(targetDir, files, config, convention)), ...(await inspectInngestProductionPath(targetDir, files, config)), ...(await inspectDatabaseLifecycleDrift(targetDir, files, config, convention, strict)), ...(await inspectAuthzAuditDrift(targetDir, files, config, convention, contracts)), ...(await inspectServerlessFootguns(targetDir, files, config, convention)), ...(await inspectProductionReadiness(targetDir, files, config, convention)), ...(await inspectFeatureArtifactDrift(targetDir, files, config, convention)), ...(await inspectWorkflowRegistrationDrift(targetDir, files, config, convention)), ...(await inspectRuntimeManifestDrift(targetDir, files, config, convention)), ...(await inspectResourceSlices(targetDir, files, config, convention, strict)));
     return dedupeDiagnostics(diagnostics);
 }
+async function inspectFrameworkAdapter(targetDir, files, config) {
+    if (!files.includes(config.paths.server))
+        return [];
+    const source = await readFile(path.join(targetDir, config.paths.server), "utf8");
+    const expectedFactory = config.framework === "next" ? "createNextServer" : "createFetchServer";
+    const otherFactory = config.framework === "next" ? "createFetchServer" : "createNextServer";
+    if (containsCallExpression(source, expectedFactory) ||
+        !containsCallExpression(source, otherFactory)) {
+        return [];
+    }
+    return [
+        {
+            severity: "error",
+            code: "BEIGNET_FRAMEWORK_MISMATCH",
+            file: config.paths.server,
+            message: `${config.configFile ?? "beignet.config.*"} selects framework: "${config.framework}", but ${config.paths.server} calls ${otherFactory}(...). Use ${expectedFactory}(...) or update the configured framework profile.`,
+        },
+    ];
+}
 async function inspectCanonicalConformance(targetDir, files, config, convention, strict) {
     if (!strict || !convention.resourceGenerator)
         return [];
@@ -967,11 +1048,12 @@ async function inspectCanonicalConformance(targetDir, files, config, convention,
             });
         }
         if (!importsAppContext(serverSource, config.paths.server, config, files)) {
+            const serverFactory = config.framework === "next" ? "createNextServer" : "createFetchServer";
             diagnostics.push({
                 severity: "warning",
                 code: "BEIGNET_SERVER_APP_CONTEXT",
                 file: config.paths.server,
-                message: `${config.paths.server} should import type { AppContext } from ${config.paths.appContext} and thread that context through createNextServer and hooks.`,
+                message: `${config.paths.server} should import type { AppContext } from ${config.paths.appContext} and thread that context through ${serverFactory} and hooks.`,
             });
         }
         // Apps may keep the context blueprint in a sibling server/context.ts
@@ -1427,7 +1509,7 @@ async function inspectProductionReadiness(targetDir, files, config, convention)
         }
     }
     if (installedPackages.has("@beignet/provider-auth-better-auth")) {
-        if (!hasBetterAuthRoute(files, config)) {
+        if (config.framework === "next" && !hasBetterAuthRoute(files, config)) {
             diagnostics.push({
                 severity: "warning",
                 code: "BEIGNET_AUTH_ROUTE_MISSING",
@@ -1573,7 +1655,8 @@ async function inspectPaymentsProductionReadiness(targetDir, files, config, sour
             message: "@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.",
         });
     }
-    if (!(await hasPaymentWebhookRoute(targetDir, files, config, sourceCache))) {
+    if (config.framework === "next" &&
+        !(await hasPaymentWebhookRoute(targetDir, files, config, sourceCache))) {
         diagnostics.push({
             severity: "warning",
             code: "BEIGNET_PAYMENTS_WEBHOOK_ROUTE_MISSING",
@@ -1817,6 +1900,56 @@ async function inspectProviderRegistrationDrift(targetDir, files, config, conven
     }
     return diagnostics;
 }
+async function inspectInngestProductionPath(targetDir, files, config) {
+    const packageJson = await readPackageJson(targetDir, files);
+    if (!installedPackageNames(packageJson).has("@beignet/provider-jobs-inngest")) {
+        return [];
+    }
+    const diagnostics = [];
+    const serverDir = directoryPath(path.dirname(config.paths.server));
+    const registryFile = `${serverDir}/inngest.ts`;
+    const routeFile = `${directoryPath(config.paths.routes)}/inngest/route.ts`;
+    if (!files.includes(registryFile)) {
+        diagnostics.push({
+            severity: "warning",
+            code: "BEIGNET_INNGEST_REGISTRY_MISSING",
+            file: registryFile,
+            message: `@beignet/provider-jobs-inngest is installed, but ${registryFile} is missing. Run beignet provider add jobs-inngest or create a central createInngestJobFunctions(...) registry so dispatched jobs can execute.`,
+        });
+    }
+    else {
+        const registrySource = await readFile(path.join(targetDir, registryFile), "utf8");
+        const registry = arrayInitializerInfo(registrySource, "inngestJobs");
+        const registeredJobs = registry
+            ? identifiersFromArrayExpression(registry.text)
+            : new Set();
+        const featureRoot = directoryPath(config.paths.features);
+        const jobIndexes = files.filter((file) => new RegExp(`^${escapeRegExp(featureRoot)}/[^/]+/jobs/index\\.ts$`).test(file));
+        for (const jobIndex of jobIndexes) {
+            const source = await readFile(path.join(targetDir, jobIndex), "utf8");
+            const match = source.match(/export const\s+([A-Za-z_$][\w$]*Jobs)\s*=/);
+            const registryName = match?.[1];
+            if (!registryName || registeredJobs.has(registryName)) {
+                continue;
+            }
+            diagnostics.push({
+                severity: "warning",
+                code: "BEIGNET_INNGEST_JOB_REGISTRATION_MISSING",
+                file: registryFile,
+                message: `${jobIndex} exports ${registryName}, but it is not registered in inngestJobs in ${registryFile}. Add ...${registryName} so Inngest can execute the job.`,
+            });
+        }
+    }
+    if (config.framework === "next" && !files.includes(routeFile)) {
+        diagnostics.push({
+            severity: "warning",
+            code: "BEIGNET_INNGEST_ROUTE_MISSING",
+            file: routeFile,
+            message: `@beignet/provider-jobs-inngest is installed in a Next.js app, but ${routeFile} is missing. Expose the shared Inngest client and function registry with serve(...) so Inngest can discover and invoke jobs.`,
+        });
+    }
+    return diagnostics;
+}
 function isFeatureUploadDefinition(file, config) {
     const featuresPath = directoryPath(config.paths.features);
     return new RegExp(`^${escapeRegExp(featuresPath)}/[^/]+/uploads/[^/]+\\.ts$`).test(file);
@@ -2589,7 +2722,7 @@ function callReferencesCentralListenerRegistry(args) {
     }
     for (const identifier of args.callIdentifiers) {
         const imported = args.namedImports.get(identifier);
-        if (!imported || imported.importedName !== "listeners")
+        if (imported?.importedName !== "listeners")
             continue;
         const importedFile = sourceFileFromImport(imported.sourcePath, args.importerFile, args.files);
         if (importedFile === args.listenerRegistryFile)
@@ -2615,7 +2748,8 @@ async function inspectServerlessFootguns(targetDir, files, config, convention) {
         const isProviderFile = /(^|\/)provider(s)?\.ts$/.test(file) ||
             /(^|\/)[^/]*provider[^/]*\.ts$/.test(file);
         const source = await readFile(path.join(targetDir, file), "utf8");
-        if (convention.resourceGenerator &&
+        if (config.framework === "next" &&
+            convention.resourceGenerator &&
             isNextRouteFile(file, config) &&
             importsEagerServer(source, file, files, config)) {
             diagnostics.push({
@@ -4039,13 +4173,15 @@ function registeredRouteGroups(source) {
 }
 async function registeredRouteGroupsForServer(targetDir, files, config, serverSource) {
     const registeredGroups = registeredRouteGroups(serverSource);
-    const imports = parseNamedImports(serverSource, config, config.paths.server);
+    const imports = parseNamedImportSources(serverSource);
     for (const identifier of routeOptionIdentifiers(serverSource)) {
         const imported = imports.get(identifier);
-        if (!imported?.contractFile || !files.includes(imported.contractFile)) {
+        if (!imported)
             continue;
-        }
-        const source = await readFile(path.join(targetDir, imported.contractFile), {
+        const importedFile = sourceFileFromImport(imported.sourcePath, config.paths.server, files);
+        if (!importedFile || !files.includes(importedFile))
+            continue;
+        const source = await readFile(path.join(targetDir, importedFile), {
             encoding: "utf8",
         });
         for (const routeGroup of registeredRouteGroups(source)) {
@@ -4661,7 +4797,8 @@ async function inspectResourceSlices(targetDir, files, config, convention, stric
         if (!hasRequirement(files, infrastructureDir)) {
             diagnostics.push(resourceDiagnostic("BEIGNET_RESOURCE_INFRASTRUCTURE_MISSING", resource, infrastructureDir));
         }
-        if (!hasRequirement(files, routeFile) &&
+        if (config.framework === "next" &&
+            !hasRequirement(files, routeFile) &&
             !hasRequirement(files, catchAllRouteFile)) {
             diagnostics.push(resourceDiagnostic("BEIGNET_RESOURCE_ROUTE_MISSING", resource, routeFile));
         }