@topogram/cli 0.3.77 → 0.3.78

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,7 +3,7 @@
 import path from "node:path";
 
 import {
-  findImportFiles,
+  findPrimaryImportFiles,
   idHintify,
   isPrimaryImportSource,
   makeCandidateRecord,
@@ -251,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,7 +3,7 @@ import path from "node:path";
 import {
   canonicalCandidateTerm,
   dedupeCandidateRecords,
-  findImportFiles,
+  findPrimaryImportFiles,
   idHintify,
   isPrimaryImportSource,
   makeCandidateRecord,
@@ -168,7 +168,7 @@ function parseDrizzleTables(schemaText) {
 }
 
 function drizzleConfigFiles(context) {
-  return findImportFiles(context.paths, (filePath) =>
+  return findPrimaryImportFiles(context.paths, (filePath) =>
     /drizzle\.config\.(ts|js|mjs|cjs)$/i.test(path.basename(filePath)) &&
     isPrimaryImportSource(context.paths, filePath)
   );
@@ -180,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);
       }
     }
@@ -195,7 +198,7 @@ function isDrizzleSchemaSource(context, filePath) {
 
 function findDrizzleSchemaFiles(context) {
   const configFiles = drizzleConfigFiles(context);
-  const conventionalSchemaFiles = findImportFiles(context.paths, (filePath) =>
+  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)
   );
@@ -209,11 +212,10 @@ 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: [] };
 

package/src/import/extractors/db/flutter-entities.js

@@ -1,7 +1,7 @@
 import {
   canonicalCandidateTerm,
   dedupeCandidateRecords,
-  findImportFiles,
+  findPrimaryImportFiles,
   idHintify,
   makeCandidateRecord,
   relativeTo,
@@ -82,7 +82,7 @@ export const flutterEntitiesExtractor = {
   id: "db.flutter-entities",
   track: "db",
   detect(context) {
-    const entityFiles = findImportFiles(
+    const entityFiles = findPrimaryImportFiles(
       context.paths,
       (filePath) => /\/lib\/features\/.+\/domain\/entities\/.+_entity\.dart$/i.test(filePath)
     );
@@ -93,7 +93,7 @@ export const flutterEntitiesExtractor = {
     };
   },
   extract(context) {
-    const entityFiles = findImportFiles(
+    const entityFiles = findPrimaryImportFiles(
       context.paths,
       (filePath) => /\/lib\/features\/.+\/domain\/entities\/.+_entity\.dart$/i.test(filePath)
     );

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

@@ -1,4 +1,4 @@
-import { canonicalCandidateTerm, dedupeCandidateRecords, findImportFiles, makeCandidateRecord, relativeTo, slugify, titleCase } from "../../core/shared.js";
+import { canonicalCandidateTerm, dedupeCandidateRecords, findPrimaryImportFiles, makeCandidateRecord, relativeTo, slugify, titleCase } from "../../core/shared.js";
 
 function extractAnnotatedFields(text) {
   const fields = [];
@@ -44,7 +44,7 @@ export const jpaExtractor = {
   id: "db.jpa",
   track: "db",
   detect(context) {
-    const entityFiles = findImportFiles(context.paths, (filePath) => /\.java$/i.test(filePath));
+    const entityFiles = findPrimaryImportFiles(context.paths, (filePath) => /\.java$/i.test(filePath));
     const count = entityFiles.filter((filePath) => /@Entity\b/.test(context.helpers.readTextIfExists(filePath) || "")).length;
     return {
       score: count > 0 ? 87 : 0,
@@ -52,7 +52,7 @@ export const jpaExtractor = {
     };
   },
   extract(context) {
-    const files = findImportFiles(context.paths, (filePath) => /\.java$/i.test(filePath));
+    const files = findPrimaryImportFiles(context.paths, (filePath) => /\.java$/i.test(filePath));
     const findings = [];
     const candidates = { entities: [], enums: [], relations: [], indexes: [] };
 

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

@@ -1,7 +1,7 @@
 import {
   canonicalCandidateTerm,
   dedupeCandidateRecords,
-  findImportFiles,
+  findPrimaryImportFiles,
   idHintify,
   makeCandidateRecord,
   relativeTo,
@@ -109,14 +109,14 @@ export const liquibaseExtractor = {
   id: "db.liquibase",
   track: "db",
   detect(context) {
-    const files = findImportFiles(context.paths, (filePath) => /db\/changelog\/.+\.(xml|ya?ml)$/i.test(filePath));
+    const files = findPrimaryImportFiles(context.paths, (filePath) => /db\/changelog\/.+\.(xml|ya?ml)$/i.test(filePath));
     return {
       score: files.length > 0 ? 88 : 0,
       reasons: files.length > 0 ? ["Found Liquibase changelog files"] : []
     };
   },
   extract(context) {
-    const changelogFiles = findImportFiles(context.paths, (filePath) => /db\/changelog\/.+\.xml$/i.test(filePath));
+    const changelogFiles = findPrimaryImportFiles(context.paths, (filePath) => /db\/changelog\/.+\.xml$/i.test(filePath));
     const findings = [];
     const candidates = { entities: [], enums: [], relations: [], indexes: [] };
 

package/src/import/extractors/db/maintained-seams.js

@@ -2,7 +2,7 @@
 
 import path from "node:path";
 
-import { findImportFiles, isPrimaryImportSource, makeCandidateRecord, relativeTo } from "../../core/shared.js";
+import { findPrimaryImportFiles, isPrimaryImportSource, makeCandidateRecord, relativeTo } from "../../core/shared.js";
 
 /** @param {string} value @returns {string} */
 function toPosix(value) {
@@ -139,7 +139,7 @@ export function inferPrismaMaintainedDbSeams(context, prismaFiles) {
     return [];
   }
   const schemaPath = appRelativePath(context, prismaFiles[0]);
-  const migrationFiles = /** @type {string[]} */ (findImportFiles(context.paths, /** @param {string} filePath */ (filePath) =>
+  const migrationFiles = /** @type {string[]} */ (findPrimaryImportFiles(context.paths, /** @param {string} filePath */ (filePath) =>
     toPosix(filePath).includes("/prisma/migrations/") &&
     isPrimaryImportSource(context.paths, filePath)
   ));
@@ -167,11 +167,11 @@ export function inferDrizzleMaintainedDbSeams(context, schemaFiles) {
   if (!schemaFiles.length) {
     return [];
   }
-  const configFiles = /** @type {string[]} */ (findImportFiles(context.paths, /** @param {string} filePath */ (filePath) =>
+  const configFiles = /** @type {string[]} */ (findPrimaryImportFiles(context.paths, /** @param {string} filePath */ (filePath) =>
     /drizzle\.config\.(ts|js|mjs|cjs)$/i.test(path.basename(filePath)) &&
     isPrimaryImportSource(context.paths, filePath)
   ));
-  const drizzleFiles = /** @type {string[]} */ (findImportFiles(context.paths, /** @param {string} filePath */ (filePath) =>
+  const drizzleFiles = /** @type {string[]} */ (findPrimaryImportFiles(context.paths, /** @param {string} filePath */ (filePath) =>
     appRelativePath(context, filePath).startsWith("drizzle/") &&
     isPrimaryImportSource(context.paths, filePath)
   ));

package/src/import/extractors/db/mybatis-xml.js

@@ -1,4 +1,4 @@
-import { dedupeCandidateRecords, findImportFiles, makeCandidateRecord, relativeTo, selectPreferredImportFiles, slugify, titleCase, idHintify, canonicalCandidateTerm } from "../../core/shared.js";
+import { dedupeCandidateRecords, findPrimaryImportFiles, makeCandidateRecord, relativeTo, selectPreferredImportFiles, slugify, titleCase, idHintify, canonicalCandidateTerm } from "../../core/shared.js";
 import { parseSqlSchema } from "./sql.js";
 
 function classifyNoiseEntity(tableName, fields) {
@@ -36,15 +36,15 @@ export const myBatisXmlExtractor = {
   id: "db.mybatis-xml",
   track: "db",
   detect(context) {
-    const mapperFiles = findImportFiles(context.paths, (filePath) => /\/mapper\/.+\.xml$/i.test(filePath));
+    const mapperFiles = findPrimaryImportFiles(context.paths, (filePath) => /\/mapper\/.+\.xml$/i.test(filePath));
     return {
       score: mapperFiles.length > 0 ? 86 : 0,
       reasons: mapperFiles.length > 0 ? ["Found MyBatis mapper XML files"] : []
     };
   },
   extract(context) {
-    const mapperFiles = findImportFiles(context.paths, (filePath) => /\/mapper\/.+\.xml$/i.test(filePath));
-    const allSqlFiles = findImportFiles(context.paths, (filePath) => filePath.endsWith(".sql"));
+    const mapperFiles = findPrimaryImportFiles(context.paths, (filePath) => /\/mapper\/.+\.xml$/i.test(filePath));
+    const allSqlFiles = findPrimaryImportFiles(context.paths, (filePath) => filePath.endsWith(".sql"));
     const schemaSqlFiles = allSqlFiles.filter((filePath) => !/\/src\/test\//i.test(filePath));
     const sqlFiles = selectPreferredImportFiles(context.paths, schemaSqlFiles, "sql");
     const findings = [];

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

@@ -1,5 +1,5 @@
 import {
-  findImportFiles,
+  findPrimaryImportFiles,
   isPrimaryImportSource,
   makeCandidateRecord,
   normalizePrismaType,
@@ -114,7 +114,7 @@ export const prismaExtractor = {
   id: "db.prisma",
   track: "db",
   detect(context) {
-    const files = findImportFiles(context.paths, (filePath) =>
+    const files = findPrimaryImportFiles(context.paths, (filePath) =>
       (filePath.endsWith("/prisma/schema.prisma") || filePath.endsWith("prisma/schema.prisma")) &&
       isPrimaryImportSource(context.paths, filePath)
     );
@@ -126,7 +126,7 @@ export const prismaExtractor = {
   extract(context) {
     const prismaFiles = selectPreferredImportFiles(
       context.paths,
-      findImportFiles(context.paths, (filePath) =>
+      findPrimaryImportFiles(context.paths, (filePath) =>
         (filePath.endsWith("/prisma/schema.prisma") || filePath.endsWith("prisma/schema.prisma")) &&
         isPrimaryImportSource(context.paths, filePath)
       ),

package/src/import/extractors/db/rails-schema.js

@@ -3,7 +3,7 @@ import path from "node:path";
 import {
   canonicalCandidateTerm,
   dedupeCandidateRecords,
-  findImportFiles,
+  findPrimaryImportFiles,
   idHintify,
   makeCandidateRecord,
   relativeTo,
@@ -107,14 +107,14 @@ export const railsSchemaExtractor = {
   id: "db.rails-schema",
   track: "db",
   detect(context) {
-    const schemaFiles = findImportFiles(context.paths, (filePath) => /db\/schema\.rb$/i.test(filePath));
+    const schemaFiles = findPrimaryImportFiles(context.paths, (filePath) => /db\/schema\.rb$/i.test(filePath));
     return {
       score: schemaFiles.length > 0 ? 92 : 0,
       reasons: schemaFiles.length > 0 ? ["Found Rails schema.rb"] : []
     };
   },
   extract(context) {
-    const schemaFiles = findImportFiles(context.paths, (filePath) => /db\/schema\.rb$/i.test(filePath));
+    const schemaFiles = findPrimaryImportFiles(context.paths, (filePath) => /db\/schema\.rb$/i.test(filePath));
     const findings = [];
     const candidates = { entities: [], enums: [], relations: [], indexes: [] };
 

package/src/import/extractors/db/react-native-entities.js

@@ -1,7 +1,7 @@
 import {
   canonicalCandidateTerm,
   dedupeCandidateRecords,
-  findImportFiles,
+  findPrimaryImportFiles,
   idHintify,
   makeCandidateRecord,
   relativeTo,
@@ -60,7 +60,7 @@ export const reactNativeEntitiesExtractor = {
   id: "db.react-native-entities",
   track: "db",
   detect(context) {
-    const entityFiles = findImportFiles(
+    const entityFiles = findPrimaryImportFiles(
       context.paths,
       (filePath) => /\/src\/.+\/domain\/entities\/.+Entity\.ts$/i.test(filePath)
     );
@@ -71,7 +71,7 @@ export const reactNativeEntitiesExtractor = {
     };
   },
   extract(context) {
-    const entityFiles = findImportFiles(
+    const entityFiles = findPrimaryImportFiles(
       context.paths,
       (filePath) => /\/src\/.+\/domain\/entities\/.+Entity\.ts$/i.test(filePath)
     );

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

@@ -1,7 +1,7 @@
 import {
   canonicalCandidateTerm,
   dedupeCandidateRecords,
-  findImportFiles,
+  findPrimaryImportFiles,
   idHintify,
   makeCandidateRecord,
   relativeTo,
@@ -151,8 +151,8 @@ export const roomExtractor = {
   id: "db.room",
   track: "db",
   detect(context) {
-    const entityFiles = findImportFiles(context.paths, (filePath) => /Entity\.kt$/i.test(filePath) || /\/entitiy\/.+\.kt$/i.test(filePath) || /\/entity\/.+\.kt$/i.test(filePath));
-    const daoFiles = findImportFiles(context.paths, (filePath) => /Dao\.kt$/i.test(filePath));
+    const entityFiles = findPrimaryImportFiles(context.paths, (filePath) => /Entity\.kt$/i.test(filePath) || /\/entitiy\/.+\.kt$/i.test(filePath) || /\/entity\/.+\.kt$/i.test(filePath));
+    const daoFiles = findPrimaryImportFiles(context.paths, (filePath) => /Dao\.kt$/i.test(filePath));
     const score = entityFiles.length > 0 && daoFiles.length > 0 ? 89 : 0;
     return {
       score,
@@ -160,8 +160,8 @@ export const roomExtractor = {
     };
   },
   extract(context) {
-    const entityFiles = findImportFiles(context.paths, (filePath) => /Entity\.kt$/i.test(filePath) || /\/entitiy\/.+\.kt$/i.test(filePath) || /\/entity\/.+\.kt$/i.test(filePath));
-    const daoFiles = findImportFiles(context.paths, (filePath) => /Dao\.kt$/i.test(filePath));
+    const entityFiles = findPrimaryImportFiles(context.paths, (filePath) => /Entity\.kt$/i.test(filePath) || /\/entitiy\/.+\.kt$/i.test(filePath) || /\/entity\/.+\.kt$/i.test(filePath));
+    const daoFiles = findPrimaryImportFiles(context.paths, (filePath) => /Dao\.kt$/i.test(filePath));
     const findings = [];
     const candidates = { entities: [], enums: [], relations: [], indexes: [] };
 

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

@@ -1,4 +1,4 @@
-import { findImportFiles, makeCandidateRecord, relativeTo, slugify, titleCase, idHintify } from "../../core/shared.js";
+import { findPrimaryImportFiles, makeCandidateRecord, relativeTo, slugify, titleCase, idHintify } from "../../core/shared.js";
 
 function parseDbSchemaSnapshot(snapshot) {
   return {
@@ -42,14 +42,14 @@ export const snapshotExtractor = {
   id: "db.snapshot",
   track: "db",
   detect(context) {
-    const files = findImportFiles(context.paths, (filePath) => filePath.endsWith(".db-schema-snapshot.json"));
+    const files = findPrimaryImportFiles(context.paths, (filePath) => filePath.endsWith(".db-schema-snapshot.json"));
     return {
       score: files.length > 0 ? 40 : 0,
       reasons: files.length > 0 ? ["Found DB schema snapshot artifacts"] : []
     };
   },
   extract(context) {
-    const snapshotFiles = findImportFiles(context.paths, (filePath) => filePath.endsWith(".db-schema-snapshot.json"));
+    const snapshotFiles = findPrimaryImportFiles(context.paths, (filePath) => filePath.endsWith(".db-schema-snapshot.json"));
     const findings = [];
     const candidates = { entities: [], enums: [], relations: [], indexes: [] };
     for (const filePath of snapshotFiles) {

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

@@ -1,4 +1,4 @@
-import { canonicalCandidateTerm, findImportFiles, isPrimaryImportSource, makeCandidateRecord, relativeTo, selectPreferredImportFiles, slugify, titleCase, idHintify } from "../../core/shared.js";
+import { canonicalCandidateTerm, findPrimaryImportFiles, isPrimaryImportSource, makeCandidateRecord, relativeTo, selectPreferredImportFiles, slugify, titleCase, idHintify } from "../../core/shared.js";
 import { inferSqlMaintainedDbSeams } from "./maintained-seams.js";
 
 function parseTableConstraint(line, tableName) {
@@ -105,14 +105,14 @@ export const sqlExtractor = {
   id: "db.sql",
   track: "db",
   detect(context) {
-    const files = findImportFiles(context.paths, (filePath) => filePath.endsWith(".sql") && isPrimaryImportSource(context.paths, filePath));
+    const files = findPrimaryImportFiles(context.paths, (filePath) => filePath.endsWith(".sql") && isPrimaryImportSource(context.paths, filePath));
     return {
       score: files.length > 0 ? 80 : 0,
       reasons: files.length > 0 ? ["Found SQL schema or migration files"] : []
     };
   },
   extract(context) {
-    const allSqlFiles = findImportFiles(context.paths, (filePath) => filePath.endsWith(".sql") && isPrimaryImportSource(context.paths, filePath));
+    const allSqlFiles = findPrimaryImportFiles(context.paths, (filePath) => filePath.endsWith(".sql") && isPrimaryImportSource(context.paths, filePath));
     const schemaSqlFiles = allSqlFiles.filter((filePath) => !/migration/i.test(filePath) && !/\/src\/test\//i.test(filePath));
     const migrationSqlFiles = allSqlFiles.filter((filePath) => /migration/i.test(filePath));
     const sqlFiles =

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

@@ -1,7 +1,7 @@
 import {
   canonicalCandidateTerm,
   dedupeCandidateRecords,
-  findImportFiles,
+  findPrimaryImportFiles,
   idHintify,
   makeCandidateRecord,
   relativeTo,
@@ -106,7 +106,7 @@ export const swiftDataExtractor = {
   id: "db.swiftdata",
   track: "db",
   detect(context) {
-    const files = findImportFiles(context.paths, (filePath) => /\.swift$/i.test(filePath))
+    const files = findPrimaryImportFiles(context.paths, (filePath) => /\.swift$/i.test(filePath))
       .filter((filePath) => /@Model/.test(context.helpers.readTextIfExists(filePath) || ""));
     return {
       score: files.length > 0 ? 86 : 0,
@@ -114,7 +114,7 @@ export const swiftDataExtractor = {
     };
   },
   extract(context) {
-    const files = findImportFiles(context.paths, (filePath) => /\.swift$/i.test(filePath))
+    const files = findPrimaryImportFiles(context.paths, (filePath) => /\.swift$/i.test(filePath))
       .filter((filePath) => /@Model/.test(context.helpers.readTextIfExists(filePath) || ""));
     const findings = [];
     const candidates = { entities: [], enums: [], relations: [], indexes: [] };

package/src/import/extractors/ui/android-compose.js

@@ -1,7 +1,7 @@
 import {
   canonicalCandidateTerm,
   dedupeCandidateRecords,
-  findImportFiles,
+  findPrimaryImportFiles,
   idHintify,
   makeCandidateRecord,
   relativeTo,
@@ -85,7 +85,7 @@ export const androidComposeUiExtractor = {
   id: "ui.android-compose",
   track: "ui",
   detect(context) {
-    const composeFiles = findImportFiles(context.paths, (filePath) => /\.kt$/i.test(filePath))
+    const composeFiles = findPrimaryImportFiles(context.paths, (filePath) => /\.kt$/i.test(filePath))
       .filter((filePath) => /@Composable/.test(context.helpers.readTextIfExists(filePath) || ""));
     const score = composeFiles.length > 0 ? 84 : 0;
     return {
@@ -94,8 +94,8 @@ export const androidComposeUiExtractor = {
     };
   },
   extract(context) {
-    const navFiles = findImportFiles(context.paths, (filePath) => /NavHost\.kt$/i.test(filePath) || /navigation\/.+\.kt$/i.test(filePath));
-    const composeFiles = findImportFiles(context.paths, (filePath) => /\.kt$/i.test(filePath))
+    const navFiles = findPrimaryImportFiles(context.paths, (filePath) => /NavHost\.kt$/i.test(filePath) || /navigation\/.+\.kt$/i.test(filePath));
+    const composeFiles = findPrimaryImportFiles(context.paths, (filePath) => /\.kt$/i.test(filePath))
       .filter((filePath) => /@Composable/.test(context.helpers.readTextIfExists(filePath) || ""));
     const findings = [];
     const candidates = { screens: [], routes: [], actions: [], stacks: [] };

package/src/import/extractors/ui/backend-only.js

@@ -1,9 +1,9 @@
 import path from "node:path";
 
-import { findImportFiles, relativeTo } from "../../core/shared.js";
+import { findPrimaryImportFiles, relativeTo } from "../../core/shared.js";
 
 function readPackageJson(context) {
-  const packageFile = findImportFiles(context.paths, (filePath) => /package\.json$/i.test(filePath))[0];
+  const packageFile = findPrimaryImportFiles(context.paths, (filePath) => /package\.json$/i.test(filePath))[0];
   if (!packageFile) return null;
   try {
     return {
@@ -24,7 +24,7 @@ function hasFrontendSignals(context) {
   if (deps.react || deps.next || deps["@remix-run/react"] || deps["@sveltejs/kit"] || deps.svelte || deps.vue || deps.nuxt) {
     return true;
   }
-  const uiFiles = findImportFiles(
+  const uiFiles = findPrimaryImportFiles(
     context.paths,
     (filePath) =>
       /(app\/.+\/page\.(tsx|ts|jsx|js|mdx)|src\/App\.tsx|src\/routes\/.+\.(svelte|tsx|jsx)|pages\/.+\.(tsx|ts|jsx|js))$/i.test(filePath)

package/src/import/extractors/ui/blazor.js

@@ -1,7 +1,7 @@
 import {
   canonicalCandidateTerm,
   dedupeCandidateRecords,
-  findImportFiles,
+  findPrimaryImportFiles,
   idHintify,
   makeCandidateRecord,
   relativeTo,
@@ -98,7 +98,7 @@ export const blazorUiExtractor = {
   id: "ui.blazor",
   track: "ui",
   detect(context) {
-    const razorFiles = findImportFiles(context.paths, (filePath) => /\.razor$/i.test(filePath))
+    const razorFiles = findPrimaryImportFiles(context.paths, (filePath) => /\.razor$/i.test(filePath))
       .filter((filePath) => !shouldIgnoreFile(filePath));
     const score = razorFiles.length > 0 ? 86 : 0;
     return {
@@ -107,7 +107,7 @@ export const blazorUiExtractor = {
     };
   },
   extract(context) {
-    const razorFiles = findImportFiles(context.paths, (filePath) => /\.razor$/i.test(filePath))
+    const razorFiles = findPrimaryImportFiles(context.paths, (filePath) => /\.razor$/i.test(filePath))
       .filter((filePath) => !shouldIgnoreFile(filePath));
     const findings = [];
     const candidates = { screens: [], routes: [], actions: [], stacks: [] };

package/src/import/extractors/ui/flutter-screens.js

@@ -1,7 +1,7 @@
 import {
   canonicalCandidateTerm,
   dedupeCandidateRecords,
-  findImportFiles,
+  findPrimaryImportFiles,
   idHintify,
   makeCandidateRecord,
   relativeTo,
@@ -110,7 +110,7 @@ export const flutterScreensUiExtractor = {
   id: "ui.flutter-screens",
   track: "ui",
   detect(context) {
-    const files = findImportFiles(
+    const files = findPrimaryImportFiles(
       context.paths,
       (filePath) => /\/lib\/features\/.+\/presentation\/screens\/.+_screen\.dart$/i.test(filePath)
     );
@@ -121,7 +121,7 @@ export const flutterScreensUiExtractor = {
     };
   },
   extract(context) {
-    const files = findImportFiles(
+    const files = findPrimaryImportFiles(
       context.paths,
       (filePath) => /\/lib\/features\/.+\/presentation\/screens\/.+_screen\.dart$/i.test(filePath)
     );