@topogram/cli 0.3.76 → 0.3.78

package/src/import/extractors/api/fastify.js

@@ -2,7 +2,7 @@ import path from "node:path";
 
 import {
   dedupeCandidateRecords,
-  findImportFiles,
+  findPrimaryImportFiles,
   inferApiCapabilityIdFromOperation,
   inferApiEntityIdFromPath,
   makeCandidateRecord,
@@ -263,8 +263,8 @@ export const fastifyExtractor = {
   id: "api.fastify",
   track: "api",
   detect(context) {
-    const routeFiles = findImportFiles(context.paths, (filePath) => /src\/routes\/api\/.+\.(ts|js|mjs|cjs)$/i.test(filePath));
-    const packageJsonFiles = findImportFiles(context.paths, (filePath) => /package\.json$/i.test(filePath));
+    const routeFiles = findPrimaryImportFiles(context.paths, (filePath) => /src\/routes\/api\/.+\.(ts|js|mjs|cjs)$/i.test(filePath));
+    const packageJsonFiles = findPrimaryImportFiles(context.paths, (filePath) => /package\.json$/i.test(filePath));
     const hasFastifyDependency = packageJsonFiles.some((filePath) => /"fastify"\s*:/.test(context.helpers.readTextIfExists(filePath) || ""));
     return {
       score: routeFiles.length > 0 && hasFastifyDependency ? 86 : 0,
@@ -272,16 +272,16 @@ export const fastifyExtractor = {
     };
   },
   extract(context) {
-    const apiRoutesRoot = findImportFiles(context.paths, (filePath) => /src\/routes\/api\/index\.(ts|js|mjs|cjs)$/i.test(filePath))[0]
-      ? path.join(path.dirname(findImportFiles(context.paths, (filePath) => /src\/routes\/api\/index\.(ts|js|mjs|cjs)$/i.test(filePath))[0]))
+    const apiRoutesRoot = findPrimaryImportFiles(context.paths, (filePath) => /src\/routes\/api\/index\.(ts|js|mjs|cjs)$/i.test(filePath))[0]
+      ? path.join(path.dirname(findPrimaryImportFiles(context.paths, (filePath) => /src\/routes\/api\/index\.(ts|js|mjs|cjs)$/i.test(filePath))[0]))
       : null;
     if (!apiRoutesRoot) {
       return { findings: [], candidates: { capabilities: [], routes: [], stacks: [] } };
     }
 
-    const routeFiles = findImportFiles(context.paths, (filePath) => /src\/routes\/api\/.+\.(ts|js|mjs|cjs)$/i.test(filePath))
+    const routeFiles = findPrimaryImportFiles(context.paths, (filePath) => /src\/routes\/api\/.+\.(ts|js|mjs|cjs)$/i.test(filePath))
       .filter((filePath) => !/\/autohooks\.(ts|js|mjs|cjs)$/i.test(filePath));
-    const schemaFiles = findImportFiles(context.paths, (filePath) => /src\/schemas\/.+\.(ts|js|mjs|cjs)$/i.test(filePath));
+    const schemaFiles = findPrimaryImportFiles(context.paths, (filePath) => /src\/schemas\/.+\.(ts|js|mjs|cjs)$/i.test(filePath));
     const namedSchemas = parseNamedTypeboxSchemas(schemaFiles, context.helpers.readTextIfExists);
 
     const routes = [];

package/src/import/extractors/api/flutter-dio.js

@@ -1,7 +1,7 @@
 import {
   canonicalCandidateTerm,
   dedupeCandidateRecords,
-  findImportFiles,
+  findPrimaryImportFiles,
   makeCandidateRecord,
   pluralizeCandidateTerm,
   relativeTo,
@@ -31,7 +31,7 @@ function capabilityIdFor(featureStem, methodName, httpMethod) {
 }
 
 function extractApiConfigPaths(context) {
-  const configFile = findImportFiles(context.paths, (filePath) => /\/lib\/common\/network\/api_config\.dart$/i.test(filePath))[0];
+  const configFile = findPrimaryImportFiles(context.paths, (filePath) => /\/lib\/common\/network\/api_config\.dart$/i.test(filePath))[0];
   const mapping = new Map();
   if (!configFile) return mapping;
   const text = context.helpers.readTextIfExists(configFile) || "";
@@ -87,7 +87,7 @@ export const flutterDioExtractor = {
   id: "api.flutter-dio",
   track: "api",
   detect(context) {
-    const files = findImportFiles(
+    const files = findPrimaryImportFiles(
       context.paths,
       (filePath) => /\/lib\/features\/.+\/data\/datasources\/.+_remote_data_source\.dart$/i.test(filePath)
     );
@@ -98,7 +98,7 @@ export const flutterDioExtractor = {
     };
   },
   extract(context) {
-    const files = findImportFiles(
+    const files = findPrimaryImportFiles(
       context.paths,
       (filePath) => /\/lib\/features\/.+\/data\/datasources\/.+_remote_data_source\.dart$/i.test(filePath)
     );

package/src/import/extractors/api/generic-route-fallback.js

@@ -1,4 +1,4 @@
-import { findImportFiles, inferRouteAuthHint, inferRouteCapabilityId, inferRouteQueryParams, makeCandidateRecord, normalizeOpenApiPath, relativeTo } from "../../core/shared.js";
+import { findPrimaryImportFiles, inferRouteAuthHint, inferRouteCapabilityId, inferRouteQueryParams, isPrimaryImportSource, makeCandidateRecord, normalizeOpenApiPath, relativeTo } from "../../core/shared.js";
 
 function extractHandlerContext(text, handlerName) {
   if (!handlerName) return "";
@@ -15,10 +15,11 @@ function extractHandlerContext(text, handlerName) {
 
 function inferServerRoutes(context) {
   const routes = [];
-  const routeFiles = findImportFiles(
+  const routeFiles = findPrimaryImportFiles(
     context.paths,
     (filePath) =>
       /\.(ts|tsx|js|jsx|mjs|cjs)$/.test(filePath) &&
+      isPrimaryImportSource(context.paths, filePath) &&
       /(server|api|routes|src)/i.test(filePath)
   );
   for (const filePath of routeFiles) {

package/src/import/extractors/api/graphql-code-first.js

@@ -1,7 +1,7 @@
 import {
   canonicalCandidateTerm,
   dedupeCandidateRecords,
-  findImportFiles,
+  findPrimaryImportFiles,
   idHintify,
   makeCandidateRecord,
   pluralizeCandidateTerm,
@@ -464,7 +464,7 @@ export const graphQlCodeFirstExtractor = {
   id: "api.graphql-code-first",
   track: "api",
   detect(context) {
-    const files = findImportFiles(context.paths, (filePath) => /(\/src\/.+|\/pages\/api\/.+)\.(ts|tsx|js|jsx)$/i.test(filePath));
+    const files = findPrimaryImportFiles(context.paths, (filePath) => /(\/src\/.+|\/pages\/api\/.+)\.(ts|tsx|js|jsx)$/i.test(filePath));
     const hasNestResolvers = files.some((filePath) => {
       const text = readTextIfExists(filePath) || "";
       return /@nestjs\/graphql/.test(text) && /@(Query|Mutation)\s*\(/.test(text);
@@ -489,7 +489,7 @@ export const graphQlCodeFirstExtractor = {
     };
   },
   extract(context) {
-    const files = findImportFiles(context.paths, (filePath) => /(\/src\/.+|\/pages\/api\/.+)\.(ts|tsx|js|jsx)$/i.test(filePath)).filter((filePath) => !/\.test\./i.test(filePath));
+    const files = findPrimaryImportFiles(context.paths, (filePath) => /(\/src\/.+|\/pages\/api\/.+)\.(ts|tsx|js|jsx)$/i.test(filePath)).filter((filePath) => !/\.test\./i.test(filePath));
     const nestTypes = parseNestTypes(files);
     const pothosTypes = parsePothosTypes(files);
     const nexusTypes = parseNexusTypes(files);

package/src/import/extractors/api/graphql-sdl.js

@@ -1,7 +1,7 @@
 import {
   canonicalCandidateTerm,
   dedupeCandidateRecords,
-  findImportFiles,
+  findPrimaryImportFiles,
   idHintify,
   makeCandidateRecord,
   pluralizeCandidateTerm,
@@ -174,7 +174,7 @@ function inferEndpointPath(context, graphqlFiles) {
       return endpointMatch[1];
     }
   }
-  const packageJsonPath = findImportFiles(context.paths, (filePath) => /package\.json$/i.test(filePath))[0];
+  const packageJsonPath = findPrimaryImportFiles(context.paths, (filePath) => /package\.json$/i.test(filePath))[0];
   const packageText = packageJsonPath ? readTextIfExists(packageJsonPath) : null;
   if (packageText && /graphql-yoga|apollo-server|@apollo\/server/.test(packageText)) {
     return "/graphql";
@@ -183,7 +183,7 @@ function inferEndpointPath(context, graphqlFiles) {
 }
 
 function extractGraphqlSchemaSources(context) {
-  const files = findImportFiles(
+  const files = findPrimaryImportFiles(
     context.paths,
     (filePath) =>
       /\/src\/.+\.(ts|tsx|js|jsx)$/i.test(filePath) ||
@@ -210,7 +210,7 @@ export const graphQlSdlExtractor = {
   detect(context) {
     const schemaSources = extractGraphqlSchemaSources(context);
     const hasOperations = schemaSources.some(({ schema }) => /\btype\s+Query\b|\btype\s+Mutation\b/.test(schema));
-    const packageJsonPath = findImportFiles(context.paths, (filePath) => /package\.json$/i.test(filePath))[0];
+    const packageJsonPath = findPrimaryImportFiles(context.paths, (filePath) => /package\.json$/i.test(filePath))[0];
     const packageText = packageJsonPath ? readTextIfExists(packageJsonPath) : "";
     const hasGraphqlRuntime = /graphql-yoga|graphql|apollo-server|@apollo\/server/.test(packageText || "");
     return {
@@ -220,7 +220,7 @@ export const graphQlSdlExtractor = {
   },
   extract(context) {
     const schemaSources = extractGraphqlSchemaSources(context);
-    const endpointPath = inferEndpointPath(context, findImportFiles(context.paths, (filePath) => /\/src\/.+\.(ts|tsx|js|jsx)$/i.test(filePath)));
+    const endpointPath = inferEndpointPath(context, findPrimaryImportFiles(context.paths, (filePath) => /\/src\/.+\.(ts|tsx|js|jsx)$/i.test(filePath)));
     const mergedSchema = schemaSources.map(({ schema }) => schema).join("\n\n");
     const blocks = parseGraphqlSchemaBlocks(mergedSchema);
     const inputTypes = new Map([...blocks.entries()].filter(([, block]) => block.kind === "input"));

package/src/import/extractors/api/jaxrs.js

@@ -1,6 +1,6 @@
 import {
   dedupeCandidateRecords,
-  findImportFiles,
+  findPrimaryImportFiles,
   inferApiEntityIdFromPath,
   inferRouteCapabilityId,
   makeCandidateRecord,
@@ -11,7 +11,7 @@ import {
 } from "../../core/shared.js";
 
 function buildJavaFileIndex(paths) {
-  const files = findImportFiles(paths, (filePath) => /\.java$/i.test(filePath));
+  const files = findPrimaryImportFiles(paths, (filePath) => /\.java$/i.test(filePath));
   return files.map((filePath) => ({
     filePath,
     relativePath: relativeTo(paths.repoRoot, filePath),
@@ -253,7 +253,7 @@ export const jaxRsExtractor = {
   id: "api.jaxrs",
   track: "api",
   detect(context) {
-    const javaFiles = findImportFiles(context.paths, (filePath) => /\.java$/i.test(filePath));
+    const javaFiles = findPrimaryImportFiles(context.paths, (filePath) => /\.java$/i.test(filePath));
     const jaxrsCount = javaFiles.filter((filePath) => /@Path\(|@(GET|POST|PUT|PATCH|DELETE)\b/.test(readTextIfExists(filePath) || "")).length;
     return {
       score: jaxrsCount > 0 ? 92 : 0,

package/src/import/extractors/api/micronaut.js

@@ -1,6 +1,6 @@
 import {
   dedupeCandidateRecords,
-  findImportFiles,
+  findPrimaryImportFiles,
   inferApiEntityIdFromPath,
   inferRouteCapabilityId,
   makeCandidateRecord,
@@ -11,7 +11,7 @@ import {
 } from "../../core/shared.js";
 
 function buildJavaFileIndex(paths) {
-  const files = findImportFiles(paths, (filePath) => /\.java$/i.test(filePath));
+  const files = findPrimaryImportFiles(paths, (filePath) => /\.java$/i.test(filePath));
   return files.map((filePath) => ({
     filePath,
     relativePath: relativeTo(paths.repoRoot, filePath),
@@ -163,7 +163,7 @@ export const micronautExtractor = {
   id: "api.micronaut",
   track: "api",
   detect(context) {
-    const javaFiles = findImportFiles(context.paths, (filePath) => /\.java$/i.test(filePath));
+    const javaFiles = findPrimaryImportFiles(context.paths, (filePath) => /\.java$/i.test(filePath));
     const count = javaFiles.filter((filePath) => /io\.micronaut\.http\.annotation|@Controller\(|@Get\(|@Post\(|@Put\(|@Delete\(/.test(readTextIfExists(filePath) || "")).length;
     return {
       score: count > 0 ? 95 : 0,

package/src/import/extractors/api/openapi-code.js

@@ -2,7 +2,7 @@ import path from "node:path";
 
 import {
   dedupeCandidateRecords,
-  findImportFiles,
+  findPrimaryImportFiles,
   inferApiCapabilityIdFromOperation,
   inferApiEntityIdFromPath,
   makeCandidateRecord,
@@ -183,15 +183,15 @@ export const openApiCodeExtractor = {
   id: "api.openapi-code",
   track: "api",
   detect(context) {
-    const openApiFiles = findImportFiles(context.paths, (filePath) => /src\/docs\/openapi\.(ts|js|mjs|cjs)$/i.test(filePath));
+    const openApiFiles = findPrimaryImportFiles(context.paths, (filePath) => /src\/docs\/openapi\.(ts|js|mjs|cjs)$/i.test(filePath));
     return {
       score: openApiFiles.length > 0 ? 92 : 0,
       reasons: openApiFiles.length > 0 ? ["Found code-generated OpenAPI source"] : []
     };
   },
   extract(context) {
-    const openApiFiles = findImportFiles(context.paths, (filePath) => /src\/docs\/openapi\.(ts|js|mjs|cjs)$/i.test(filePath));
-    const schemaFile = findImportFiles(context.paths, (filePath) => /src\/docs\/openapi-schemas\.(ts|js|mjs|cjs)$/i.test(filePath))[0];
+    const openApiFiles = findPrimaryImportFiles(context.paths, (filePath) => /src\/docs\/openapi\.(ts|js|mjs|cjs)$/i.test(filePath));
+    const schemaFile = findPrimaryImportFiles(context.paths, (filePath) => /src\/docs\/openapi-schemas\.(ts|js|mjs|cjs)$/i.test(filePath))[0];
     const schemaFields = schemaFile ? parseZodObjectSchemaFields(context.helpers.readTextIfExists(schemaFile) || "") : new Map();
     const findings = [];
     const candidates = { capabilities: [], routes: [], stacks: [] };

package/src/import/extractors/api/openapi.js

@@ -1,4 +1,4 @@
-import { findImportFiles, makeCandidateRecord, normalizeOpenApiPath, relativeTo, selectPreferredImportFiles, slugify, titleCase } from "../../core/shared.js";
+import { findPrimaryImportFiles, isPrimaryImportSource, makeCandidateRecord, normalizeOpenApiPath, relativeTo, selectPreferredImportFiles, slugify, titleCase } from "../../core/shared.js";
 
 function openApiRefName(ref) {
   return typeof ref === "string" ? ref.split("/").pop() || null : null;
@@ -196,7 +196,7 @@ export const openApiExtractor = {
   detect(context) {
     const files = selectPreferredImportFiles(
       context.paths,
-      findImportFiles(context.paths, (filePath) => /(openapi|swagger)\.(json|ya?ml)$/i.test(filePath)),
+      findPrimaryImportFiles(context.paths, (filePath) => /(openapi|swagger)\.(json|ya?ml)$/i.test(filePath) && isPrimaryImportSource(context.paths, filePath)),
       "openapi"
     );
     return {
@@ -207,7 +207,7 @@ export const openApiExtractor = {
   extract(context) {
     const openApiFiles = selectPreferredImportFiles(
       context.paths,
-      findImportFiles(context.paths, (filePath) => /(openapi|swagger)\.(json|ya?ml)$/i.test(filePath)),
+      findPrimaryImportFiles(context.paths, (filePath) => /(openapi|swagger)\.(json|ya?ml)$/i.test(filePath) && isPrimaryImportSource(context.paths, filePath)),
       "openapi"
     );
     const findings = [];

package/src/import/extractors/api/rails-routes.js

@@ -2,7 +2,7 @@ import path from "node:path";
 
 import {
   dedupeCandidateRecords,
-  findImportFiles,
+  findPrimaryImportFiles,
   inferApiEntityIdFromPath,
   inferRouteCapabilityId,
   makeCandidateRecord,
@@ -167,14 +167,14 @@ export const railsRoutesExtractor = {
   id: "api.rails-routes",
   track: "api",
   detect(context) {
-    const routeFiles = findImportFiles(context.paths, (filePath) => /config\/routes\.rb$/i.test(filePath));
+    const routeFiles = findPrimaryImportFiles(context.paths, (filePath) => /config\/routes\.rb$/i.test(filePath));
     return {
       score: routeFiles.length > 0 ? 90 : 0,
       reasons: routeFiles.length > 0 ? ["Found Rails routes.rb"] : []
     };
   },
   extract(context) {
-    const routeFiles = findImportFiles(context.paths, (filePath) => /config\/routes\.rb$/i.test(filePath));
+    const routeFiles = findPrimaryImportFiles(context.paths, (filePath) => /config\/routes\.rb$/i.test(filePath));
     const findings = [];
     const candidates = { capabilities: [], routes: [], stacks: [] };
 

package/src/import/extractors/api/react-native-repository.js

@@ -1,7 +1,7 @@
 import {
   canonicalCandidateTerm,
   dedupeCandidateRecords,
-  findImportFiles,
+  findPrimaryImportFiles,
   makeCandidateRecord,
   pluralizeCandidateTerm,
   relativeTo,
@@ -82,7 +82,7 @@ export const reactNativeRepositoryExtractor = {
   id: "api.react-native-repository",
   track: "api",
   detect(context) {
-    const files = findImportFiles(
+    const files = findPrimaryImportFiles(
       context.paths,
       (filePath) => /\/src\/.+\/infrastructure\/implementations\/.+Repository\.ts$/i.test(filePath)
     );
@@ -93,7 +93,7 @@ export const reactNativeRepositoryExtractor = {
     };
   },
   extract(context) {
-    const files = findImportFiles(
+    const files = findPrimaryImportFiles(
       context.paths,
       (filePath) => /\/src\/.+\/infrastructure\/implementations\/.+Repository\.ts$/i.test(filePath)
     );

package/src/import/extractors/api/retrofit.js

@@ -1,7 +1,7 @@
 import {
   canonicalCandidateTerm,
   dedupeCandidateRecords,
-  findImportFiles,
+  findPrimaryImportFiles,
   makeCandidateRecord,
   relativeTo,
   titleCase
@@ -66,7 +66,7 @@ export const retrofitExtractor = {
   id: "api.retrofit",
   track: "api",
   detect(context) {
-    const serviceFiles = findImportFiles(context.paths, (filePath) => /Service\.kt$/i.test(filePath) || /retrofit\/.+\.kt$/i.test(filePath));
+    const serviceFiles = findPrimaryImportFiles(context.paths, (filePath) => /Service\.kt$/i.test(filePath) || /retrofit\/.+\.kt$/i.test(filePath));
     const score = serviceFiles.some((filePath) => /@GET|@POST|@PUT|@PATCH|@DELETE/.test(context.helpers.readTextIfExists(filePath) || "")) ? 87 : 0;
     return {
       score,
@@ -74,7 +74,7 @@ export const retrofitExtractor = {
     };
   },
   extract(context) {
-    const serviceFiles = findImportFiles(context.paths, (filePath) => /Service\.kt$/i.test(filePath) || /retrofit\/.+\.kt$/i.test(filePath));
+    const serviceFiles = findPrimaryImportFiles(context.paths, (filePath) => /Service\.kt$/i.test(filePath) || /retrofit\/.+\.kt$/i.test(filePath));
     const capabilities = [];
     for (const filePath of serviceFiles) {
       const provenance = relativeTo(context.paths.repoRoot, filePath);

package/src/import/extractors/api/spring-web.js

@@ -1,6 +1,6 @@
 import {
   dedupeCandidateRecords,
-  findImportFiles,
+  findPrimaryImportFiles,
   inferApiEntityIdFromPath,
   inferRouteCapabilityId,
   makeCandidateRecord,
@@ -13,7 +13,7 @@ import {
 const JAVA_ANNOTATION_PATTERN = String.raw`@[\w.]+(?:\((?:[^()]|\([^)]*\))*\))?`;
 
 function buildJavaFileIndex(paths) {
-  const files = findImportFiles(paths, (filePath) => /\.java$/i.test(filePath));
+  const files = findPrimaryImportFiles(paths, (filePath) => /\.java$/i.test(filePath));
   return files.map((filePath) => ({
     filePath,
     relativePath: relativeTo(paths.repoRoot, filePath),
@@ -318,7 +318,7 @@ export const springWebExtractor = {
   id: "api.spring-web",
   track: "api",
   detect(context) {
-    const javaFiles = findImportFiles(context.paths, (filePath) => /\.java$/i.test(filePath));
+    const javaFiles = findPrimaryImportFiles(context.paths, (filePath) => /\.java$/i.test(filePath));
     const springCount = javaFiles.filter((filePath) => /@(RestController|Controller)|@(?:Get|Post|Put|Patch|Delete)Exchange|@(GetMapping|PostMapping|PutMapping|PatchMapping|DeleteMapping)|@RequestMapping/.test(readTextIfExists(filePath) || "")).length;
     return {
       score: springCount > 0 ? 90 : 0,

package/src/import/extractors/api/swift-webapi.js

@@ -1,7 +1,7 @@
 import {
   canonicalCandidateTerm,
   dedupeCandidateRecords,
-  findImportFiles,
+  findPrimaryImportFiles,
   idHintify,
   makeCandidateRecord,
   relativeTo,
@@ -78,7 +78,7 @@ export const swiftWebApiExtractor = {
   id: "api.swift-webapi",
   track: "api",
   detect(context) {
-    const files = findImportFiles(context.paths, (filePath) => /WebRepository\.swift$/i.test(filePath) || /WebAPI\/.+\.swift$/i.test(filePath));
+    const files = findPrimaryImportFiles(context.paths, (filePath) => /WebRepository\.swift$/i.test(filePath) || /WebAPI\/.+\.swift$/i.test(filePath));
     const score = files.some((filePath) => /APICall|URLSession/.test(context.helpers.readTextIfExists(filePath) || "")) ? 85 : 0;
     return {
       score,
@@ -86,7 +86,7 @@ export const swiftWebApiExtractor = {
     };
   },
   extract(context) {
-    const files = findImportFiles(context.paths, (filePath) => /WebAPI\/.+\.swift$/i.test(filePath))
+    const files = findPrimaryImportFiles(context.paths, (filePath) => /WebAPI\/.+\.swift$/i.test(filePath))
       .filter((filePath) => /struct\s+Real/.test(context.helpers.readTextIfExists(filePath) || ""));
     const capabilities = [];
     for (const filePath of files) {

package/src/import/extractors/api/trpc.js

@@ -1,6 +1,6 @@
 import {
   dedupeCandidateRecords,
-  findImportFiles,
+  findPrimaryImportFiles,
   inferApiEntityIdFromPath,
   makeCandidateRecord,
   pluralizeCandidateTerm,
@@ -156,15 +156,15 @@ export const trpcExtractor = {
   id: "api.trpc",
   track: "api",
   detect(context) {
-    const routerFiles = findImportFiles(context.paths, (filePath) => /src\/server\/routers\/.+\.(ts|tsx|js|jsx)$/i.test(filePath));
-    const trpcHandler = findImportFiles(context.paths, (filePath) => /src\/pages\/api\/trpc\/\[trpc\]\.(ts|tsx|js|jsx)$/i.test(filePath));
+    const routerFiles = findPrimaryImportFiles(context.paths, (filePath) => /src\/server\/routers\/.+\.(ts|tsx|js|jsx)$/i.test(filePath));
+    const trpcHandler = findPrimaryImportFiles(context.paths, (filePath) => /src\/pages\/api\/trpc\/\[trpc\]\.(ts|tsx|js|jsx)$/i.test(filePath));
     return {
       score: routerFiles.length > 0 && trpcHandler.length > 0 ? 88 : 0,
       reasons: routerFiles.length > 0 && trpcHandler.length > 0 ? ["Found tRPC router modules and Next.js tRPC handler"] : []
     };
   },
   extract(context) {
-    const routerFiles = findImportFiles(context.paths, (filePath) => /src\/server\/routers\/.+\.(ts|tsx|js|jsx)$/i.test(filePath))
+    const routerFiles = findPrimaryImportFiles(context.paths, (filePath) => /src\/server\/routers\/.+\.(ts|tsx|js|jsx)$/i.test(filePath))
       .filter((filePath) => !/\/_app\.(ts|tsx|js|jsx)$/i.test(filePath) && !/\.test\./i.test(filePath));
     const procedures = routerFiles.flatMap((filePath) => parseRouterProcedures(filePath, context.helpers.readTextIfExists(filePath) || ""));
     const findings = [];

package/src/import/extractors/cli/generic.js

@@ -3,8 +3,9 @@
 import path from "node:path";
 
 import {
-  findImportFiles,
+  findPrimaryImportFiles,
   idHintify,
+  isPrimaryImportSource,
   makeCandidateRecord,
   normalizeImportRelativePath,
   readJsonIfExists,
@@ -33,7 +34,7 @@ function normalizePath(value) {
  */
 function isAuthoritativeCliSource(paths, filePath) {
   const normalized = normalizePath(normalizeImportRelativePath(paths, filePath));
-  return !NON_AUTHORITATIVE_CLI_PATH_PATTERN.test(normalized);
+  return isPrimaryImportSource(paths, filePath) && !NON_AUTHORITATIVE_CLI_PATH_PATTERN.test(normalized);
 }
 
 /**
@@ -250,9 +251,9 @@ function inspectPackageCliMetadata(context, packageFiles) {
  * @returns {{ packageFiles: string[], sourceFiles: string[], binNames: Set<string>, findings: any[], provenance: string[] }}
  */
 function discoverCliSources(context) {
-  const packageFiles = findImportFiles(context.paths, (/** @type {string} */ filePath) => /package\.json$/i.test(filePath));
+  const packageFiles = findPrimaryImportFiles(context.paths, (/** @type {string} */ filePath) => /package\.json$/i.test(filePath));
   const packageMetadata = inspectPackageCliMetadata(context, packageFiles);
-  const sourceFiles = findImportFiles(context.paths, (/** @type {string} */ filePath) => {
+  const sourceFiles = findPrimaryImportFiles(context.paths, (/** @type {string} */ filePath) => {
     const normalized = normalizePath(filePath);
     if (!isAuthoritativeCliSource(context.paths, filePath)) {
       return false;

package/src/import/extractors/db/django-models.js

@@ -3,7 +3,7 @@ import path from "node:path";
 import {
   canonicalCandidateTerm,
   dedupeCandidateRecords,
-  findImportFiles,
+  findPrimaryImportFiles,
   idHintify,
   makeCandidateRecord,
   relativeTo,
@@ -169,8 +169,8 @@ export const djangoModelsExtractor = {
   id: "db.django-models",
   track: "db",
   detect(context) {
-    const modelFiles = findImportFiles(context.paths, (filePath) => /\/models\.py$/i.test(filePath));
-    const manageFiles = findImportFiles(context.paths, (filePath) => /\/manage\.py$/i.test(filePath));
+    const modelFiles = findPrimaryImportFiles(context.paths, (filePath) => /\/models\.py$/i.test(filePath));
+    const manageFiles = findPrimaryImportFiles(context.paths, (filePath) => /\/manage\.py$/i.test(filePath));
     const score = modelFiles.length > 0 && manageFiles.length > 0 ? 91 : 0;
     return {
       score,
@@ -178,7 +178,7 @@ export const djangoModelsExtractor = {
     };
   },
   extract(context) {
-    const modelFiles = findImportFiles(context.paths, (filePath) => /\/models\.py$/i.test(filePath));
+    const modelFiles = findPrimaryImportFiles(context.paths, (filePath) => /\/models\.py$/i.test(filePath));
     const findings = [];
     const candidates = { entities: [], enums: [], relations: [], indexes: [] };
 

package/src/import/extractors/db/dotnet-models.js

@@ -1,7 +1,7 @@
 import {
   canonicalCandidateTerm,
   dedupeCandidateRecords,
-  findImportFiles,
+  findPrimaryImportFiles,
   idHintify,
   makeCandidateRecord,
   relativeTo,
@@ -61,8 +61,8 @@ export const dotnetModelsExtractor = {
   id: "db.dotnet-models",
   track: "db",
   detect(context) {
-    const modelFiles = findImportFiles(context.paths, (filePath) => /\/Models\/.+\.cs$/i.test(filePath));
-    const csprojFiles = findImportFiles(context.paths, (filePath) => /\.csproj$/i.test(filePath));
+    const modelFiles = findPrimaryImportFiles(context.paths, (filePath) => /\/Models\/.+\.cs$/i.test(filePath));
+    const csprojFiles = findPrimaryImportFiles(context.paths, (filePath) => /\.csproj$/i.test(filePath));
     const score = modelFiles.length > 0 && csprojFiles.length > 0 ? 78 : 0;
     return {
       score,
@@ -70,7 +70,7 @@ export const dotnetModelsExtractor = {
     };
   },
   extract(context) {
-    const modelFiles = findImportFiles(context.paths, (filePath) => /\/Models\/.+\.cs$/i.test(filePath));
+    const modelFiles = findPrimaryImportFiles(context.paths, (filePath) => /\/Models\/.+\.cs$/i.test(filePath));
     const findings = [];
     const entities = [];
     for (const filePath of modelFiles) {

package/src/import/extractors/db/drizzle.js

@@ -3,8 +3,9 @@ import path from "node:path";
 import {
   canonicalCandidateTerm,
   dedupeCandidateRecords,
-  findImportFiles,
+  findPrimaryImportFiles,
   idHintify,
+  isPrimaryImportSource,
   makeCandidateRecord,
   relativeTo,
   slugify,
@@ -167,7 +168,10 @@ function parseDrizzleTables(schemaText) {
 }
 
 function drizzleConfigFiles(context) {
-  return findImportFiles(context.paths, (filePath) => /drizzle\.config\.(ts|js|mjs|cjs)$/i.test(path.basename(filePath)));
+  return findPrimaryImportFiles(context.paths, (filePath) =>
+    /drizzle\.config\.(ts|js|mjs|cjs)$/i.test(path.basename(filePath)) &&
+    isPrimaryImportSource(context.paths, filePath)
+  );
 }
 
 function configuredSchemaFiles(context, configFiles) {
@@ -176,7 +180,10 @@ function configuredSchemaFiles(context, configFiles) {
     const configText = context.helpers.readTextIfExists(configFile) || "";
     for (const match of configText.matchAll(/\bschema\s*:\s*["'`]([^"'`*]+)["'`]/g)) {
       const absoluteSchemaPath = path.resolve(path.dirname(configFile), match[1]);
-      if (context.helpers.readTextIfExists(absoluteSchemaPath) !== null) {
+      if (
+        context.helpers.readTextIfExists(absoluteSchemaPath) !== null &&
+        isPrimaryImportSource(context.paths, absoluteSchemaPath)
+      ) {
         files.push(absoluteSchemaPath);
       }
     }
@@ -184,26 +191,31 @@ function configuredSchemaFiles(context, configFiles) {
   return files;
 }
 
+function isDrizzleSchemaSource(context, filePath) {
+  const text = context.helpers.readTextIfExists(filePath) || "";
+  return /\b(?:pgTable|sqliteTable|mysqlTable)\s*\(/.test(text);
+}
+
 function findDrizzleSchemaFiles(context) {
   const configFiles = drizzleConfigFiles(context);
-  const conventionalSchemaFiles = findImportFiles(context.paths, (filePath) =>
-    /(?:^|\/)(?:src\/db\/schema|src\/schema|db\/schema|schema)\.(ts|js|mjs|cjs)$/i.test(relativeTo(context.paths.workspaceRoot, filePath).replaceAll(path.sep, "/"))
+  const conventionalSchemaFiles = findPrimaryImportFiles(context.paths, (filePath) =>
+    /(?:^|\/)(?:src\/db\/schema|src\/schema|db\/schema|schema)\.(ts|js|mjs|cjs)$/i.test(relativeTo(context.paths.workspaceRoot, filePath).replaceAll(path.sep, "/")) &&
+    isPrimaryImportSource(context.paths, filePath)
   );
   return [...new Set([
     ...configuredSchemaFiles(context, configFiles),
     ...conventionalSchemaFiles
-  ])].sort();
+  ])].filter((filePath) => isDrizzleSchemaSource(context, filePath)).sort();
 }
 
 export const drizzleExtractor = {
   id: "db.drizzle",
   track: "db",
   detect(context) {
-    const hasConfig = drizzleConfigFiles(context).length > 0;
     const hasSchema = findDrizzleSchemaFiles(context).length > 0;
     return {
-      score: hasConfig || hasSchema ? 95 : 0,
-      reasons: hasConfig || hasSchema ? ["Found Drizzle config/schema source"] : []
+      score: hasSchema ? 95 : 0,
+      reasons: hasSchema ? ["Found Drizzle schema source"] : []
     };
   },
   extract(context) {

package/src/import/extractors/db/ef-core.js

@@ -1,7 +1,7 @@
 import {
   canonicalCandidateTerm,
   dedupeCandidateRecords,
-  findImportFiles,
+  findPrimaryImportFiles,
   makeCandidateRecord,
   readTextIfExists,
   relativeTo,
@@ -155,8 +155,8 @@ export const efCoreExtractor = {
   id: "db.ef-core",
   track: "db",
   detect(context) {
-    const csprojFiles = findImportFiles(context.paths, (filePath) => /\.csproj$/i.test(filePath));
-    const dbContextFiles = findImportFiles(context.paths, (filePath) => /DbContext|Context\.cs$/i.test(filePath));
+    const csprojFiles = findPrimaryImportFiles(context.paths, (filePath) => /\.csproj$/i.test(filePath));
+    const dbContextFiles = findPrimaryImportFiles(context.paths, (filePath) => /DbContext|Context\.cs$/i.test(filePath));
     const score = csprojFiles.length > 0 && dbContextFiles.some((filePath) => /DbContext/.test(readTextIfExists(filePath) || "")) ? 89 : 0;
     return {
       score,
@@ -164,8 +164,8 @@ export const efCoreExtractor = {
     };
   },
   extract(context) {
-    const dbContextFiles = findImportFiles(context.paths, (filePath) => /DbContext|Context\.cs$/i.test(filePath));
-    const domainFiles = findImportFiles(context.paths, (filePath) => /\/Domain\/.+\.cs$/i.test(filePath));
+    const dbContextFiles = findPrimaryImportFiles(context.paths, (filePath) => /DbContext|Context\.cs$/i.test(filePath));
+    const domainFiles = findPrimaryImportFiles(context.paths, (filePath) => /\/Domain\/.+\.cs$/i.test(filePath));
     const findings = [];
     const candidates = { entities: [], enums: [], relations: [], indexes: [] };