@beignet/cli 0.0.42 → 0.0.44

package/src/analysis/workspace.ts

@@ -2,7 +2,6 @@ import { readdir, readFile, stat } from "node:fs/promises";
 import path from "node:path";
 import ts from "typescript";
 import {
-  directoryPath,
   loadBeignetConfig,
   normalizePath,
   type ResolvedBeignetConfig,
@@ -22,7 +21,7 @@ export type AnalysisWorkspace = {
   files: string[];
   fileSet: Set<string>;
   config: ResolvedBeignetConfig;
-  atAliasRoot: string;
+  compilerOptions: ts.CompilerOptions;
   readSource(file: string): Promise<string>;
   readSourceFile(file: string): Promise<ts.SourceFile>;
 };
@@ -35,7 +34,7 @@ export async function createAnalysisWorkspace(
   const files = await listProjectFiles(targetDir);
   const fileSet = new Set(files);
   const config = await loadBeignetConfig(targetDir, files);
-  const atAliasRoot = resolveAtAliasRoot(targetDir);
+  const compilerOptions = resolveCompilerOptions(targetDir);
   const sources = new Map<string, string>();
   const sourceFiles = new Map<string, ts.SourceFile>();
 
@@ -53,7 +52,7 @@ export async function createAnalysisWorkspace(
     files,
     fileSet,
     config,
-    atAliasRoot,
+    compilerOptions,
     readSource,
     async readSourceFile(file) {
       const cached = sourceFiles.get(file);
@@ -110,66 +109,109 @@ export async function listProjectFiles(targetDir: string): Promise<string[]> {
 }
 
 export function resolveLocalSourceFile(
-  workspace: Pick<AnalysisWorkspace, "atAliasRoot" | "fileSet">,
+  workspace: Pick<
+    AnalysisWorkspace,
+    "compilerOptions" | "fileSet" | "targetDir"
+  >,
   importerFile: string,
   importPath: string,
 ): string | undefined {
-  let candidate: string;
-  if (importPath.startsWith("@/")) {
-    candidate = path.posix.join(
-      workspace.atAliasRoot,
-      importPath.slice("@/".length),
+  const resolved = resolveModule(workspace, importerFile, importPath);
+  if (!resolved) return undefined;
+
+  const file = normalizePath(
+    path.relative(workspace.targetDir, resolved.resolvedFileName),
+  );
+  if (file === ".." || file.startsWith("../")) return undefined;
+  return workspace.fileSet.has(file) ? file : undefined;
+}
+
+export function isLocalModuleSpecifier(
+  workspace: Pick<
+    AnalysisWorkspace,
+    "compilerOptions" | "fileSet" | "targetDir"
+  >,
+  importerFile: string,
+  importPath: string,
+): boolean {
+  const extension = path.posix.extname(importPath);
+  if (
+    extension &&
+    ![".ts", ".tsx", ".mts", ".cts", ".js", ".jsx", ".mjs", ".cjs"].includes(
+      extension,
+    )
+  ) {
+    return false;
+  }
+  if (importPath.startsWith(".")) return true;
+
+  const resolved = resolveModule(workspace, importerFile, importPath);
+  if (resolved) {
+    const file = normalizePath(
+      path.relative(workspace.targetDir, resolved.resolvedFileName),
     );
-  } else if (importPath.startsWith(".")) {
-    candidate = normalizePath(
-      path.join(path.dirname(importerFile), importPath),
+    return (
+      file !== ".." && !file.startsWith("../") && workspace.fileSet.has(file)
     );
-  } else {
-    return undefined;
   }
 
-  const withoutExtension = candidate.replace(/\.(c|m)?tsx?$/, "");
-  const candidates = [
-    candidate,
-    `${withoutExtension}.ts`,
-    `${withoutExtension}.tsx`,
-    `${withoutExtension}.mts`,
-    `${withoutExtension}.cts`,
-    `${withoutExtension}/index.ts`,
-    `${withoutExtension}/index.tsx`,
-    `${withoutExtension}/index.mts`,
-    `${withoutExtension}/index.cts`,
-  ];
-
-  return candidates.find((file) => workspace.fileSet.has(file));
+  const pathPatterns = Object.keys(workspace.compilerOptions.paths ?? {});
+  if (
+    pathPatterns.some(
+      (pattern) =>
+        // A catch-all also matches every bare package name. Local matches for
+        // it resolve above or have an app-owned baseUrl prefix below.
+        pattern !== "*" && modulePatternMatches(pattern, importPath),
+    )
+  ) {
+    return true;
+  }
+
+  const baseUrl = workspace.compilerOptions.baseUrl;
+  if (!baseUrl) return false;
+  const firstSegment = importPath.split("/")[0];
+  const prefix = normalizePath(
+    path.relative(workspace.targetDir, path.resolve(baseUrl, firstSegment)),
+  );
+  for (const file of workspace.fileSet) {
+    if (file === prefix || file.startsWith(`${prefix}/`)) return true;
+  }
+  return false;
 }
 
-function resolveAtAliasRoot(targetDir: string): string {
-  const parsed = ts.getParsedCommandLineOfConfigFile(
-    path.join(targetDir, "tsconfig.json"),
-    {},
-    {
-      ...ts.sys,
-      onUnRecoverableConfigFileDiagnostic: () => {},
-    },
+function resolveModule(
+  workspace: Pick<AnalysisWorkspace, "compilerOptions" | "targetDir">,
+  importerFile: string,
+  importPath: string,
+): ts.ResolvedModuleFull | undefined {
+  return ts.resolveModuleName(
+    importPath,
+    path.join(workspace.targetDir, importerFile),
+    workspace.compilerOptions,
+    ts.sys,
+  ).resolvedModule;
+}
+
+function modulePatternMatches(pattern: string, importPath: string): boolean {
+  const wildcard = pattern.indexOf("*");
+  if (wildcard === -1) return pattern === importPath;
+  return (
+    importPath.startsWith(pattern.slice(0, wildcard)) &&
+    importPath.endsWith(pattern.slice(wildcard + 1))
   );
-  const aliasTarget = parsed?.options.paths?.["@/*"]?.[0];
-  if (!aliasTarget) return "";
+}
 
-  const targetWithoutWildcard = aliasTarget.replace(/[/\\]?\*$/, "");
-  const baseUrl = parsed.options.baseUrl ?? targetDir;
-  const relativeTarget = normalizePath(
-    path.relative(targetDir, path.resolve(baseUrl, targetWithoutWildcard)),
+function resolveCompilerOptions(targetDir: string): ts.CompilerOptions {
+  return (
+    ts.getParsedCommandLineOfConfigFile(
+      path.join(targetDir, "tsconfig.json"),
+      {},
+      {
+        ...ts.sys,
+        onUnRecoverableConfigFileDiagnostic: () => {},
+      },
+    )?.options ?? {}
   );
-  if (
-    relativeTarget === "" ||
-    relativeTarget === "." ||
-    relativeTarget === ".." ||
-    relativeTarget.startsWith("../")
-  ) {
-    return "";
-  }
-  return directoryPath(relativeTarget);
 }
 
 function scriptKind(file: string): ts.ScriptKind {

package/src/app-map.ts

@@ -276,6 +276,13 @@ export async function mapApp(
     }
   }
 
+  await addUnresolvedContractDeclarations({
+    workspace,
+    sourceIndex,
+    contractIds,
+    unresolved,
+  });
+
   const routeIds = new Map<string, string>();
   for (const route of inspection.routes) {
     const contractId = contractIds.get(symbolKey(route.file, route.exportName));
@@ -647,6 +654,7 @@ export async function mapApp(
   });
 
   await addTables({ workspace, sourceIndex, addNode });
+  await addUnresolvedLocalImports({ workspace, unresolved });
   await addFeatureDependencies({
     workspace,
     featuresPath,
@@ -894,8 +902,8 @@ async function addRouteGroups(args: {
       const missing = args.diagnostics.some(
         (diagnostic) =>
           diagnostic.code === "BEIGNET_ROUTE_GROUP_UNREGISTERED" &&
-          diagnostic.message.includes(file) &&
-          diagnostic.message.includes(exportName),
+          diagnostic.subject?.file === file &&
+          diagnostic.subject.exportName === exportName,
       );
       args.addNode({
         id,
@@ -1221,6 +1229,7 @@ async function addFeatureDependencies(args: {
     const from = featureForFile(file, args.featuresPath);
     if (!from || !args.featureNames.has(from)) continue;
     for (const reference of await localImportReferences(args.workspace, file)) {
+      if (!reference.resolvedFile) continue;
       const to = featureForFile(reference.resolvedFile, args.featuresPath);
       if (!to || to === from || !args.featureNames.has(to)) continue;
       const key = `${from}->${to}`;
@@ -1261,6 +1270,75 @@ async function addFeatureDependencies(args: {
   }
 }
 
+async function addUnresolvedLocalImports(args: {
+  workspace: AnalysisWorkspace;
+  unresolved: AppMapUnresolvedReference[];
+}): Promise<void> {
+  for (const file of args.workspace.files.filter(isTypeScriptSource)) {
+    for (const reference of await localImportReferences(args.workspace, file)) {
+      if (reference.resolvedFile) continue;
+      args.unresolved.push({
+        code: "local_import_unresolved",
+        message: `Could not resolve local module ${JSON.stringify(reference.importPath)} imported by ${file}.`,
+        source: {
+          file,
+          line: reference.line,
+          column: reference.column,
+        },
+      });
+    }
+  }
+}
+
+async function addUnresolvedContractDeclarations(args: {
+  workspace: AnalysisWorkspace;
+  sourceIndex: ReturnType<typeof createSourceIndex>;
+  contractIds: Map<string, string>;
+  unresolved: AppMapUnresolvedReference[];
+}): Promise<void> {
+  for (const file of appMapContractSourceFiles(args.workspace)) {
+    const sourceFile = await args.workspace.readSourceFile(file);
+    for (const { exportName, declaration } of exportedVariableDeclarations(
+      sourceFile,
+    )) {
+      if (args.contractIds.has(symbolKey(file, exportName))) continue;
+      const call = declaration.initializer
+        ? findCall(declaration.initializer, new Set(["defineContract"]))
+        : undefined;
+      if (!call) continue;
+
+      args.unresolved.push({
+        code: "contract_declaration_unresolved",
+        message: `Could not resolve the HTTP method and path for contract ${exportName}.`,
+        source: await args.sourceIndex.sourceLocation(
+          file,
+          declaration,
+          exportName,
+        ),
+      });
+    }
+  }
+}
+
+function appMapContractSourceFiles(workspace: AnalysisWorkspace): string[] {
+  const contractsPath = directoryPath(workspace.config.paths.contracts);
+  const featureOwned =
+    contractsPath === directoryPath(workspace.config.paths.features);
+
+  return workspace.files.filter((file) => {
+    if (!file.endsWith(".ts") || file.endsWith(".test.ts")) return false;
+    if (featureOwned) {
+      const prefix = `${contractsPath}/`;
+      if (!file.startsWith(prefix)) return false;
+      const parts = file.slice(prefix.length).split("/");
+      return parts.length === 2 && parts[1] === "contracts.ts";
+    }
+    return (
+      file === `${contractsPath}.ts` || file.startsWith(`${contractsPath}/`)
+    );
+  });
+}
+
 async function registryRecord(args: {
   workspace: AnalysisWorkspace;
   sourceIndex: ReturnType<typeof createSourceIndex>;
@@ -1488,8 +1566,8 @@ function definitionStatus(
   return diagnostics.some(
     (diagnostic) =>
       relevant.includes(diagnostic.code) &&
-      diagnostic.message.includes(file) &&
-      diagnostic.message.includes(exportName),
+      diagnostic.subject?.file === file &&
+      diagnostic.subject.exportName === exportName,
   )
     ? "missing"
     : "registered";

package/src/inspect.ts

@@ -59,6 +59,7 @@ import {
   appendToNamedArray,
   appendToOutboxRegistryArray,
   arrayInitializerInfo,
+  codeCharacterIndexes,
   identifiersFromArrayExpression,
   insertAfterImports,
   matchingDelimiterIndex,
@@ -130,6 +131,11 @@ export type InspectDiagnostic = {
   message: string;
   file?: string;
   contract?: string;
+  /** Stable declaration identity for diagnostics about a named app concept. */
+  subject?: {
+    file: string;
+    exportName: string;
+  };
 };
 
 export type { InspectFix } from "./doctor-fixes.js";
@@ -1065,73 +1071,19 @@ function balancedObjectSource(
   startIndex: number,
 ): string | undefined {
   if (source[startIndex] !== "{") return undefined;
-
-  let depth = 0;
-  let quote: '"' | "'" | "`" | undefined;
-  let escaped = false;
-
-  for (let index = startIndex; index < source.length; index += 1) {
-    const char = source[index];
-
-    if (quote) {
-      if (escaped) {
-        escaped = false;
-        continue;
-      }
-      if (char === "\\") {
-        escaped = true;
-        continue;
-      }
-      if (char === quote) quote = undefined;
-      continue;
-    }
-
-    if (char === '"' || char === "'" || char === "`") {
-      quote = char;
-      continue;
-    }
-
-    if (char === "{") {
-      depth += 1;
-      continue;
-    }
-
-    if (char === "}") {
-      depth -= 1;
-      if (depth === 0) return source.slice(startIndex, index + 1);
-    }
-  }
-
-  return undefined;
+  const endIndex = matchingDelimiterIndex(source, startIndex, "{", "}");
+  return endIndex === -1 ? undefined : source.slice(startIndex, endIndex + 1);
 }
 
 function topLevelObjectKeys(body: string): string[] {
   const keys: string[] = [];
   let depth = 0;
-  let quote: '"' | "'" | "`" | undefined;
-  let escaped = false;
+  let skipUntil = 0;
 
-  for (let index = 0; index < body.length; index += 1) {
+  for (const index of codeCharacterIndexes(body)) {
+    if (index < skipUntil) continue;
     const char = body[index];
 
-    if (quote) {
-      if (escaped) {
-        escaped = false;
-        continue;
-      }
-      if (char === "\\") {
-        escaped = true;
-        continue;
-      }
-      if (char === quote) quote = undefined;
-      continue;
-    }
-
-    if (char === '"' || char === "'" || char === "`") {
-      quote = char;
-      continue;
-    }
-
     if (char === "{" || char === "[" || char === "(") {
       depth += 1;
       continue;
@@ -1150,8 +1102,7 @@ function topLevelObjectKeys(body: string): string[] {
     const name = identifier[0];
     const next = body.slice(index + name.length).match(/^\s*:/);
     if (next) keys.push(name);
-
-    index += name.length - 1;
+    skipUntil = index + name.length;
   }
 
   return keys;
@@ -4018,6 +3969,7 @@ async function inspectWorkflowRegistrationDrift(
           severity: "error",
           code,
           file: centralExists ? centralFile : registry.indexFile,
+          subject: workflowArtifactSubject(registry, member),
           message: centralExists
             ? `${workflowArtifactOrigin(registry, member)}, but it is not registered in ${registrationTarget} in ${centralFile}, so the ${noun} never runs. Import ${registry.registryName} and spread it into the ${kind} list.`
             : `${workflowArtifactOrigin(registry, member)}, but ${centralFile} does not exist, so the ${noun} never runs. Register ${registry.registryName} in ${centralFile} (or run \`${makeCommand}\` to create it).`,
@@ -4033,6 +3985,7 @@ async function inspectWorkflowRegistrationDrift(
           severity: "warning",
           code: "BEIGNET_OUTBOX_EVENT_UNREGISTERED",
           file: config.paths.outbox,
+          subject: workflowArtifactSubject(registry, member),
           message: `${workflowArtifactOrigin(registry, member)} and listeners react to it, but it is not registered in the events list of defineOutboxRegistry({...}) in ${config.paths.outbox}, so outbox drain cannot deliver it. Import ${registry.registryName} and spread it into the events list.`,
         });
       }
@@ -4044,6 +3997,7 @@ async function inspectWorkflowRegistrationDrift(
           severity: "warning",
           code: "BEIGNET_OUTBOX_JOB_UNREGISTERED",
           file: config.paths.outbox,
+          subject: workflowArtifactSubject(registry, member),
           message: `${workflowArtifactOrigin(registry, member)}, but it is not registered in the jobs list of defineOutboxRegistry({...}) in ${config.paths.outbox}, so outbox drain cannot deliver it. Import ${registry.registryName} and spread it into the jobs list.`,
         });
       }
@@ -4065,6 +4019,7 @@ async function inspectWorkflowRegistrationDrift(
           drift.listeners.wiringFile ??
           drift.listeners.eventBusFile ??
           registry.indexFile,
+        subject: workflowArtifactSubject(registry, member),
         message: `${workflowArtifactOrigin(registry, member)}, but no registerListeners(...) call references it, so the listener never receives events. Register ${registry.registryName} with registerListeners(...) in ${listenerTarget}.`,
       });
     }
@@ -4170,6 +4125,16 @@ function workflowArtifactOrigin(
   return `${memberFile} declares ${member} (exported through ${registry.registryName} in ${registry.indexFile})`;
 }
 
+function workflowArtifactSubject(
+  registry: FeatureWorkflowRegistry,
+  member: string,
+): NonNullable<InspectDiagnostic["subject"]> {
+  return {
+    file: registry.memberFiles.get(member) ?? registry.indexFile,
+    exportName: member,
+  };
+}
+
 async function workflowRegistrationDrift(
   targetDir: string,
   files: string[],
@@ -5651,26 +5616,9 @@ function splitTopLevelArguments(source: string): string[] {
   const args: string[] = [];
   let start = 0;
   let depth = 0;
-  let inString: string | undefined;
-  let escaped = false;
 
-  for (let index = 0; index < source.length; index++) {
+  for (const index of codeCharacterIndexes(source)) {
     const char = source[index];
-    if (inString) {
-      if (escaped) {
-        escaped = false;
-      } else if (char === "\\") {
-        escaped = true;
-      } else if (char === inString) {
-        inString = undefined;
-      }
-      continue;
-    }
-
-    if (char === '"' || char === "'" || char === "`") {
-      inString = char;
-      continue;
-    }
     if (char === "(" || char === "{" || char === "[") {
       depth += 1;
       continue;
@@ -6455,6 +6403,8 @@ function dedupeDiagnostics(
       diagnostic.code,
       diagnostic.file ?? "",
       diagnostic.contract ?? "",
+      diagnostic.subject?.file ?? "",
+      diagnostic.subject?.exportName ?? "",
       diagnostic.message,
     ].join(":");
     if (seen.has(key)) continue;
@@ -6644,6 +6594,10 @@ async function inspectFeatureRouteRegistration(
         code: "BEIGNET_ROUTE_GROUP_UNREGISTERED",
         file: config.paths.server,
         contract: routeGroupContract.exportName,
+        subject: {
+          file: routeGroup.file,
+          exportName: routeGroup.name,
+        },
         message: contract
           ? `${routeGroup.file} declares ${routeGroup.name} for ${contract.exportName} (${contract.method} ${contract.path}), but ${routeGroup.name} is not registered in defineRoutes([...]) in ${config.paths.server}. Import ${routeGroup.name} and add it to the central route list.`
           : `${routeGroup.file} declares ${routeGroup.name} for ${routeGroupContract.exportName}, but ${routeGroup.name} is not registered in defineRoutes([...]) in ${config.paths.server}. Import ${routeGroup.name} and add it to the central route list.`,
@@ -6765,44 +6719,8 @@ function balancedArraySource(
   startIndex: number,
 ): string | undefined {
   if (source[startIndex] !== "[") return undefined;
-
-  let depth = 0;
-  let quote: '"' | "'" | "`" | undefined;
-  let escaped = false;
-
-  for (let index = startIndex; index < source.length; index += 1) {
-    const char = source[index];
-
-    if (quote) {
-      if (escaped) {
-        escaped = false;
-        continue;
-      }
-      if (char === "\\") {
-        escaped = true;
-        continue;
-      }
-      if (char === quote) quote = undefined;
-      continue;
-    }
-
-    if (char === '"' || char === "'" || char === "`") {
-      quote = char;
-      continue;
-    }
-
-    if (char === "[") {
-      depth += 1;
-      continue;
-    }
-
-    if (char === "]") {
-      depth -= 1;
-      if (depth === 0) return source.slice(startIndex, index + 1);
-    }
-  }
-
-  return undefined;
+  const endIndex = matchingDelimiterIndex(source, startIndex, "[", "]");
+  return endIndex === -1 ? undefined : source.slice(startIndex, endIndex + 1);
 }
 
 function routeGroupContractRef(
@@ -6832,21 +6750,10 @@ function routeGroupContractRef(
 }
 
 function registeredRouteGroups(source: string): Set<string> {
-  const defineRoutesMatch = /defineRoutes(?:<[^>]+>)?\(\[/.exec(source);
-  if (!defineRoutesMatch) return new Set();
-
-  const defineRoutesSource = source.slice(defineRoutesMatch.index);
-  const defineRoutesEnd = defineRoutesSource.indexOf("]),");
-  const searchSource =
-    defineRoutesEnd === -1
-      ? defineRoutesSource
-      : defineRoutesSource.slice(0, defineRoutesEnd);
-
-  return new Set(
-    [...searchSource.matchAll(/\b([A-Za-z_$][\w$]*)\b/g)].map(
-      (match) => match[1],
-    ),
-  );
+  const routes = firstDefineRoutesArgInfo(source);
+  return routes?.text.startsWith("[")
+    ? identifiersFromArrayExpression(routes.text)
+    : new Set();
 }
 
 async function registeredRouteGroupsForServer(
@@ -7699,26 +7606,9 @@ function firstCallArgInfo(
   argStart: number,
 ): { text: string; start: number; end: number } | undefined {
   let depth = 0;
-  let inString: string | undefined;
-  let escaped = false;
 
-  for (let index = argStart; index < source.length; index++) {
+  for (const index of codeCharacterIndexes(source, argStart)) {
     const char = source[index];
-    if (inString) {
-      if (escaped) {
-        escaped = false;
-      } else if (char === "\\") {
-        escaped = true;
-      } else if (char === inString) {
-        inString = undefined;
-      }
-      continue;
-    }
-
-    if (char === '"' || char === "'" || char === "`") {
-      inString = char;
-      continue;
-    }
 
     if (char === "[" || char === "(" || char === "{") {
       depth++;

package/src/make/inbox.ts

@@ -1437,17 +1437,17 @@ export const inboxNotifications = ${dialect.tableFunction}(
 \t\treadAt: ${column("read_at")},
 \t\tcreatedAt: ${column("created_at")}.notNull(),
 \t},
-\t(table) => ({
-\t\tunreadIdx: index("inbox_notifications_unread_idx").on(
+\t(table) => [
+\t\tindex("inbox_notifications_unread_idx").on(
 \t\t\ttable.userId,
 \t\t\ttable.readAt,
 \t\t),
-\t\tcursorIdx: index("inbox_notifications_cursor_idx").on(
+\t\tindex("inbox_notifications_cursor_idx").on(
 \t\t\ttable.userId,
 \t\t\ttable.createdAt,
 \t\t\ttable.id,
 \t\t),
-\t}),
+\t],
 );
 `;
 }

package/src/make/payments.ts

@@ -680,11 +680,11 @@ export const createCheckoutSessionInputSchema = z.object({
 
 export const createCheckoutSessionOutputSchema = z.object({
 \tsessionId: z.string(),
-\turl: z.string().url(),
+\turl: z.url(),
 });
 
 export const createBillingPortalSessionOutputSchema = z.object({
-\turl: z.string().url(),
+\turl: z.url(),
 });
 
 export const billingStatusOutputSchema = z.object({
@@ -1800,14 +1800,14 @@ export const billingAccounts = ${dialect.tableFunction}(
 \t\tlastEventId: ${idColumn("last_event_id")},
 \t\tupdatedAt: ${idColumn("updated_at")}.notNull(),
 \t},
-\t(table) => ({
-\t\tproviderCustomerUnique: uniqueIndex(
+\t(table) => [
+\t\tuniqueIndex(
 \t\t\t"billing_accounts_provider_customer_unique",
 \t\t).on(table.provider, table.customerId),
-\t\tproviderSubscriptionUnique: uniqueIndex(
+\t\tuniqueIndex(
 \t\t\t"billing_accounts_provider_subscription_unique",
 \t\t).on(table.provider, table.subscriptionId),
-\t}),
+\t],
 );
 `;
 }