@beignet/cli 0.0.52 → 0.0.53

package/src/inspect.ts

@@ -22,7 +22,13 @@ import {
   stripSourceFileExtension,
   typescriptAnalysisSourceFileExtensions,
 } from "./analysis/source-files.js";
-import { exportedVariableDeclarations } from "./analysis/source-index.js";
+import {
+  createSourceIndex,
+  exportedVariableDeclarations,
+  type SourceIndex,
+} from "./analysis/source-index.js";
+import { createAnalysisWorkspace, projectPath } from "./analysis/workspace.js";
+import { workspaceRouteContracts } from "./analysis/workspace-routes.js";
 import { createPainter } from "./ansi.js";
 import type { DatabaseSchemaDialect, DatabaseSchemaTable } from "./choices.js";
 import {
@@ -213,6 +219,7 @@ type RouteExport = {
   handlerFile: string;
   contractRef?: string;
   contractFile?: string;
+  contractUnresolved?: boolean;
   catchAllPrefix?: string;
   source: "next-route" | "route-local";
 };
@@ -261,19 +268,76 @@ export async function inspectApp(
   const targetDir = path.resolve(options.cwd ?? process.cwd());
   await assertDirectory(targetDir);
 
-  const files = await listFiles(targetDir);
-  const config = options.config
-    ? resolveConfig(options.config)
-    : await loadBeignetConfig(targetDir, files);
-  const convention = inspectConvention(files, config);
+  const workspace = await createAnalysisWorkspace(targetDir, {
+    config: options.config,
+  });
+  const { config } = workspace;
+  const files = workspace.projects[0].files;
   const inspectedContracts = await readContracts(targetDir, files, config);
+  for (const project of workspace.projects.slice(1)) {
+    const shared = await readContracts(
+      project.targetDir,
+      project.files,
+      project.config,
+    );
+    inspectedContracts.contracts.push(
+      ...shared.contracts.map((contract) => ({
+        ...contract,
+        file: projectPath(project, contract.file),
+      })),
+    );
+    inspectedContracts.queryTransportDiagnostics.push(
+      ...shared.queryTransportDiagnostics.map((diagnostic) => ({
+        ...diagnostic,
+        ...(diagnostic.file
+          ? { file: projectPath(project, diagnostic.file) }
+          : {}),
+        ...(diagnostic.subject
+          ? {
+              subject: {
+                ...diagnostic.subject,
+                file: projectPath(project, diagnostic.subject.file),
+              },
+            }
+          : {}),
+      })),
+    );
+  }
   const { contracts } = inspectedContracts;
+  contracts.sort(compareContracts);
+  const convention = inspectConvention(
+    files,
+    config,
+    contracts.length > 0 && workspace.projects.length > 1,
+  );
   const matchedRoutes = await inspectRouteSurface(
     targetDir,
     files,
     config,
     contracts,
-  );
+    workspace.projects.length > 1 ? createSourceIndex(workspace) : undefined,
+  );
+  let workspaceRoutesUnresolved = false;
+  if (workspace.projects.length > 1) {
+    const registration = await workspaceRouteContracts(workspace);
+    workspaceRoutesUnresolved = registration.unresolved;
+    matchedRoutes.routes = matchedRoutes.routes.map((route) => {
+      if (route.handlerSource === "route-local") return route;
+      if (!registration.contracts.has(`${route.file}#${route.exportName}`))
+        return {
+          ...route,
+          handlerFile: undefined,
+          handlerSource: "missing" as const,
+        };
+      return config.framework === "web"
+        ? {
+            ...route,
+            handlerFile: config.paths.server,
+            handlerSource: "web-server" as const,
+          }
+        : route;
+    });
+  }
   const diagnostics = await inspectDiagnostics(
     targetDir,
     files,
@@ -285,6 +349,15 @@ export async function inspectApp(
     inspectedContracts.queryTransportDiagnostics,
   );
 
+  if (workspaceRoutesUnresolved)
+    diagnostics.push({
+      severity: "warning",
+      code: "BEIGNET_WORKSPACE_ROUTES_UNRESOLVED",
+      file: config.paths.server,
+      message:
+        "Could not fully resolve workspace route composition. Use explicit defineRoutes arrays and defineRouteGroup bindings reachable from the server routes option.",
+    });
+
   return {
     schemaVersion: 1,
     targetDir,
@@ -367,11 +440,15 @@ async function buildDoctorFixPlan(
     : await loadBeignetConfig(targetDir, files);
   const convention = inspectConvention(files, config);
   const { contracts } = await readContracts(targetDir, files, config);
+  const sourceIndex = config.workspace.packages.length
+    ? createSourceIndex(await createAnalysisWorkspace(targetDir, { config }))
+    : undefined;
   const matchedRoutes = await inspectRouteSurface(
     targetDir,
     files,
     config,
     contracts,
+    sourceIndex,
   );
   const operations: PlannedDoctorFixOperation[] = [];
 
@@ -896,14 +973,15 @@ async function readContracts(
 function inspectConvention(
   files: string[],
   config: ResolvedBeignetConfig,
+  sharedContracts = false,
 ): InspectConvention {
   const missingNextLayout = missingRequirements(files, [
-    `${directoryPath(config.paths.contracts)}/`,
+    ...(sharedContracts ? [] : [`${directoryPath(config.paths.contracts)}/`]),
     `${directoryPath(config.paths.routes)}/`,
     config.paths.server,
   ]);
   const missingWebLayout = missingRequirements(files, [
-    `${directoryPath(config.paths.contracts)}/`,
+    ...(sharedContracts ? [] : [`${directoryPath(config.paths.contracts)}/`]),
     config.paths.server,
   ]);
   const missingResourceGenerator = missingRequirements(files, [
@@ -1571,6 +1649,7 @@ async function readRouteExports(
   routeFiles: string[],
   files: string[],
   config: ResolvedBeignetConfig,
+  sourceIndex?: SourceIndex,
 ): Promise<Map<string, RouteExport[]>> {
   const routeExports = new Map<string, RouteExport[]>();
 
@@ -1579,20 +1658,28 @@ async function readRouteExports(
     const source = await readFile(path.join(targetDir, file), "utf8");
     routeExports.set(
       file,
-      parseRouteExports(source, file, routePath, files, config),
+      await parseRouteExports(
+        source,
+        file,
+        routePath,
+        files,
+        config,
+        sourceIndex,
+      ),
     );
   }
 
   return routeExports;
 }
 
-function parseRouteExports(
+async function parseRouteExports(
   source: string,
   handlerFile: string,
   routePath: string,
   files: string[],
   config: ResolvedBeignetConfig,
-): RouteExport[] {
+  sourceIndex?: SourceIndex,
+): Promise<RouteExport[]> {
   const exports: RouteExport[] = [];
   const sourceFile = ts.createSourceFile(
     handlerFile,
@@ -1651,11 +1738,17 @@ function parseRouteExports(
 
     if (localName) {
       const imported = imports.get(localName);
+      const resolved = await sourceIndex?.resolveValue(
+        handlerFile,
+        ts.factory.createIdentifier(localName),
+      );
       exports.push({
         method,
         handlerFile,
-        contractRef: imported?.importedName ?? localName,
-        contractFile: imported?.contractFile,
+        contractRef:
+          resolved?.exportName ?? imported?.importedName ?? localName,
+        contractFile: resolved?.file ?? imported?.contractFile,
+        ...(sourceIndex && !resolved ? { contractUnresolved: true } : {}),
         source: "route-local",
       });
       continue;
@@ -2065,6 +2158,7 @@ async function inspectRouteSurface(
   files: string[],
   config: ResolvedBeignetConfig,
   contracts: InspectedContract[],
+  sourceIndex?: SourceIndex,
 ): Promise<MatchedRoutesResult> {
   if (config.framework === "next") {
     const routeFiles = files.filter(
@@ -2077,6 +2171,7 @@ async function inspectRouteSurface(
       routeFiles,
       files,
       config,
+      sourceIndex,
     );
     return matchRoutes(contracts, routeExports);
   }
@@ -2144,6 +2239,7 @@ function findContracts(
   routeExport: RouteExport,
 ): InspectedContract[] {
   if (routeExport.source === "route-local") {
+    if (routeExport.contractUnresolved) return [];
     const contract = contracts.find(
       (contract) =>
         contract.exportName === routeExport.contractRef &&
@@ -2391,6 +2487,7 @@ async function inspectCanonicalConformance(
     files.some((file) => file.startsWith(`${clientDir}/`)) ||
     [
       "@beignet/react-query",
+      "@beignet/react-form",
       "@beignet/react-hook-form",
       "@beignet/react-uploads",
       "@beignet/nuqs",
@@ -2437,12 +2534,13 @@ async function inspectCanonicalConformance(
   }
 
   if (
+    installedPackages.has("@beignet/react-form") ||
     installedPackages.has("@beignet/react-hook-form") ||
     files.includes(clientForms)
   ) {
     requiredFiles.push({
       file: clientForms,
-      reason: `${clientForms} should own React Hook Form adapter setup when form helpers are used.`,
+      reason: `${clientForms} should own form adapter setup (createReactForm or createReactHookForm) when form helpers are used.`,
     });
   }
 
@@ -6338,6 +6436,10 @@ async function inspectPortProviderDrift(
   const portsSource = files.includes(config.paths.ports)
     ? await readFile(path.join(targetDir, config.paths.ports), "utf8")
     : "";
+  const sharedPorts =
+    config.workspace.packages.length > 0
+      ? await analyzePortWiringFiles({ targetDir, files, config })
+      : undefined;
   const packageJson = files.includes("package.json")
     ? await readPackageJson(targetDir, files)
     : undefined;
@@ -6361,7 +6463,12 @@ async function inspectPortProviderDrift(
 
   for (const expected of providerPortRequirements) {
     if (!installedPackages.has(expected.packageName)) continue;
-    if (portsSource.includes(`${expected.portName}:`)) continue;
+    if (
+      sharedPorts
+        ? sharedPorts.declared.has(expected.portName)
+        : portsSource.includes(`${expected.portName}:`)
+    )
+      continue;
     diagnostics.push({
       severity: "warning",
       code: "BEIGNET_PROVIDER_PORT_MISSING",