@ankhorage/dependency-graph 0.7.1 → 0.7.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +6 -0
- package/dist/features/dependency-analysis/adapters/outbound/java/analyzeJavaProjectAsync.d.ts.map +1 -1
- package/dist/features/dependency-analysis/adapters/outbound/java/analyzeJavaProjectAsync.js +4 -2
- package/dist/features/dependency-analysis/adapters/outbound/java/analyzeJavaProjectAsync.js.map +1 -1
- package/dist/features/dependency-analysis/adapters/outbound/kotlin/analyzeKotlinProjectAsync.d.ts.map +1 -1
- package/dist/features/dependency-analysis/adapters/outbound/kotlin/analyzeKotlinProjectAsync.js +4 -2
- package/dist/features/dependency-analysis/adapters/outbound/kotlin/analyzeKotlinProjectAsync.js.map +1 -1
- package/dist/features/dependency-analysis/adapters/outbound/typescript/resolveTypeScriptImport.d.ts.map +1 -1
- package/dist/features/dependency-analysis/adapters/outbound/typescript/resolveTypeScriptImport.js +12 -3
- package/dist/features/dependency-analysis/adapters/outbound/typescript/resolveTypeScriptImport.js.map +1 -1
- package/dist/features/dependency-analysis/utils/findIntrinsicPackageForReference.d.ts +3 -0
- package/dist/features/dependency-analysis/utils/findIntrinsicPackageForReference.d.ts.map +1 -0
- package/dist/features/dependency-analysis/utils/findIntrinsicPackageForReference.js +8 -0
- package/dist/features/dependency-analysis/utils/findIntrinsicPackageForReference.js.map +1 -0
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,11 @@
|
|
|
1
1
|
# @ankhorage/dependency-graph
|
|
2
2
|
|
|
3
|
+
## 0.7.2
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- eee8614: Classify TypeScript vendors only from declared dependency evidence and resolve Java/Kotlin intrinsic member imports from source-declared package ownership before falling back to unknown references.
|
|
8
|
+
|
|
3
9
|
## 0.7.1
|
|
4
10
|
|
|
5
11
|
### Patch Changes
|
package/dist/features/dependency-analysis/adapters/outbound/java/analyzeJavaProjectAsync.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"analyzeJavaProjectAsync.d.ts","sourceRoot":"","sources":["../../../../../../src/features/dependency-analysis/adapters/outbound/java/analyzeJavaProjectAsync.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EACV,8BAA8B,EAE9B,uBAAuB,EAGxB,MAAM,yCAAyC,CAAC;
|
|
1
|
+
{"version":3,"file":"analyzeJavaProjectAsync.d.ts","sourceRoot":"","sources":["../../../../../../src/features/dependency-analysis/adapters/outbound/java/analyzeJavaProjectAsync.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EACV,8BAA8B,EAE9B,uBAAuB,EAGxB,MAAM,yCAAyC,CAAC;AAMjD,kFAAkF;AAClF,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE,8BAA8B,GACtC,OAAO,CAAC,uBAAuB,CAAC,CA+BlC"}
|
|
@@ -2,6 +2,7 @@ import { readFile } from 'node:fs/promises';
|
|
|
2
2
|
import path from 'node:path';
|
|
3
3
|
import { toPortablePath } from '@ankhorage/utility/node/path';
|
|
4
4
|
import { collectInspectedSourceFiles } from '../../../utils/collectInspectedSourceFiles.js';
|
|
5
|
+
import { findIntrinsicPackageForReference } from '../../../utils/findIntrinsicPackageForReference.js';
|
|
5
6
|
import { extractJavaDependencies } from './extractJavaDependencies.js';
|
|
6
7
|
import { extractJavaPackageFromImport } from './extractJavaPackageFromImport.js';
|
|
7
8
|
/*** Analyze one detected Java package into package/import dependency evidence. */
|
|
@@ -30,10 +31,11 @@ export async function analyzeJavaProjectAsync(context) {
|
|
|
30
31
|
}
|
|
31
32
|
/*** Aggregate one Java import into stable target nodes and weighted evidence. */
|
|
32
33
|
function addImport(context, sourceFile, sourceNodeId, specifier, intrinsicPackages, nodes, edges) {
|
|
33
|
-
const
|
|
34
|
+
const intrinsicPackage = findIntrinsicPackageForReference(specifier, intrinsicPackages);
|
|
35
|
+
const targetPackage = intrinsicPackage ?? extractJavaPackageFromImport(specifier);
|
|
34
36
|
if (targetPackage === '')
|
|
35
37
|
return;
|
|
36
|
-
const intrinsic =
|
|
38
|
+
const intrinsic = intrinsicPackage !== undefined;
|
|
37
39
|
const targetNodeId = intrinsic
|
|
38
40
|
? nodeIdForPackage(context, targetPackage)
|
|
39
41
|
: `unknown:${targetPackage}`;
|
package/dist/features/dependency-analysis/adapters/outbound/java/analyzeJavaProjectAsync.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"analyzeJavaProjectAsync.js","sourceRoot":"","sources":["../../../../../../src/features/dependency-analysis/adapters/outbound/java/analyzeJavaProjectAsync.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,IAAI,MAAM,WAAW,CAAC;AAG7B,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAS9D,OAAO,EAAE,2BAA2B,EAAE,MAAM,+CAA+C,CAAC;AAC5F,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,4BAA4B,EAAE,MAAM,mCAAmC,CAAC;AAEjF,kFAAkF;AAClF,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,OAAuC;IAEvC,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,KAAK,MAAM,CAAC,CAAC;IACrF,MAAM,KAAK,GAAG,2BAA2B,CACvC,OAAO,EACP,QAAQ,EAAE,WAAW,IAAI,CAAC,eAAe,EAAE,GAAG,CAAC,EAC/C,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAChC,CAAC,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,CAAC,CAChD,CAAC;IACF,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAC/B,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;QACzB,IAAI;QACJ,YAAY,EAAE,uBAAuB,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;KACpE,CAAC,CAAC,CACJ,CAAC;IACF,MAAM,iBAAiB,GAAG,IAAI,GAAG,CAC/B,OAAO;SACJ,GAAG,CAAC,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC,YAAY,CAAC,WAAW,CAAC;SACnD,MAAM,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,KAAK,EAAE,CAAC,CAC/C,CAAC;IACF,MAAM,KAAK,GAAG,IAAI,GAAG,EAA8C,CAAC;IACpE,KAAK,MAAM,WAAW,IAAI,iBAAiB;QAAE,qBAAqB,CAAC,OAAO,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC;IAChG,MAAM,KAAK,GAAG,IAAI,GAAG,EAA8C,CAAC;IAEpE,KAAK,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,OAAO,EAAE,CAAC;QAC7C,OAAO,CAAC,MAAM,EAAE,cAAc,EAAE,CAAC;QACjC,MAAM,YAAY,GAAG,gBAAgB,CAAC,OAAO,EAAE,YAAY,CAAC,WAAW,CAAC,CAAC;QACzE,KAAK,MAAM,SAAS,IAAI,YAAY,CAAC,OAAO,EAAE,CAAC;YAC7C,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,SAAS,EAAE,iBAAiB,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;QACrF,CAAC;IACH,CAAC;IACD,OAAO,EAAE,KAAK,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC;AACpE,CAAC;AAED,iFAAiF;AACjF,SAAS,SAAS,CAChB,OAAuC,EACvC,UAAkB,EAClB,YAAoB,EACpB,SAAiB,EACjB,iBAAsC,EACtC,KAAsD,EACtD,KAAsD;IAEtD,MAAM,aAAa,GAAG,4BAA4B,CAAC,SAAS,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"analyzeJavaProjectAsync.js","sourceRoot":"","sources":["../../../../../../src/features/dependency-analysis/adapters/outbound/java/analyzeJavaProjectAsync.ts"],"names":[],"mappings":"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","sourcesContent":["import { readFile } from 'node:fs/promises';\nimport path from 'node:path';\n\nimport type { GraphEdge, GraphNode } from '@ankhorage/graph';\nimport { toPortablePath } from '@ankhorage/utility/node/path';\n\nimport type {\n DependencyGraphAnalyzerContext,\n DependencyGraphEdgeData,\n DependencyGraphFragment,\n DependencyGraphNodeData,\n DependencyImportEvidence,\n} from '../../../../../types/dependencyGraph.js';\nimport { collectInspectedSourceFiles } from '../../../utils/collectInspectedSourceFiles.js';\nimport { findIntrinsicPackageForReference } from '../../../utils/findIntrinsicPackageForReference.js';\nimport { extractJavaDependencies } from './extractJavaDependencies.js';\nimport { extractJavaPackageFromImport } from './extractJavaPackageFromImport.js';\n\n/*** Analyze one detected Java package into package/import dependency evidence. */\nexport async function analyzeJavaProjectAsync(\n context: DependencyGraphAnalyzerContext,\n): Promise<DependencyGraphFragment> {\n const language = context.package.detection.languages.find(({ id }) => id === 'java');\n const files = collectInspectedSourceFiles(\n context,\n language?.sourceRoots ?? ['src/main/java', '.'],\n (file) => file.endsWith('.java'),\n ['.git', 'build', 'coverage', 'dist', 'target'],\n );\n const sources = await Promise.all(\n files.map(async (file) => ({\n file,\n dependencies: extractJavaDependencies(await readFile(file, 'utf8')),\n })),\n );\n const intrinsicPackages = new Set(\n sources\n .map(({ dependencies }) => dependencies.packageName)\n .filter((packageName) => packageName !== ''),\n );\n const nodes = new Map<string, GraphNode<DependencyGraphNodeData>>();\n for (const packageName of intrinsicPackages) addIntrinsicHierarchy(context, packageName, nodes);\n const edges = new Map<string, GraphEdge<DependencyGraphEdgeData>>();\n\n for (const { file, dependencies } of sources) {\n context.signal?.throwIfAborted();\n const sourceNodeId = nodeIdForPackage(context, dependencies.packageName);\n for (const specifier of dependencies.imports) {\n addImport(context, file, sourceNodeId, specifier, intrinsicPackages, nodes, edges);\n }\n }\n return { nodes: [...nodes.values()], edges: [...edges.values()] };\n}\n\n/*** Aggregate one Java import into stable target nodes and weighted evidence. */\nfunction addImport(\n context: DependencyGraphAnalyzerContext,\n sourceFile: string,\n sourceNodeId: string,\n specifier: string,\n intrinsicPackages: ReadonlySet<string>,\n nodes: Map<string, GraphNode<DependencyGraphNodeData>>,\n edges: Map<string, GraphEdge<DependencyGraphEdgeData>>,\n): void {\n const intrinsicPackage = findIntrinsicPackageForReference(specifier, intrinsicPackages);\n const targetPackage = intrinsicPackage ?? extractJavaPackageFromImport(specifier);\n if (targetPackage === '') return;\n const intrinsic = intrinsicPackage !== undefined;\n const targetNodeId = intrinsic\n ? nodeIdForPackage(context, targetPackage)\n : `unknown:${targetPackage}`;\n if (targetNodeId === sourceNodeId) return;\n if (!intrinsic && !nodes.has(targetNodeId)) {\n nodes.set(targetNodeId, {\n id: targetNodeId,\n data: {\n kind: 'package',\n classification: 'unknown',\n focus: false,\n label: targetPackage,\n packageName: targetPackage,\n },\n });\n }\n const edgeId = `${sourceNodeId}->${targetNodeId}`;\n const existing = edges.get(edgeId);\n const evidence: DependencyImportEvidence = {\n sourceFile: toPortablePath(path.relative(context.package.rootPath, sourceFile)),\n specifier,\n classification: intrinsic ? 'intrinsic' : 'unknown',\n declarations: [],\n };\n edges.set(edgeId, {\n id: edgeId,\n source: sourceNodeId,\n target: targetNodeId,\n data: {\n kind: 'import',\n analyzerId: 'java',\n weight: (existing?.data.weight ?? 0) + 1,\n evidence: [...(existing?.data.evidence ?? []), evidence],\n },\n });\n}\n\n/*** Materialize a Java package and all ancestor package nodes. */\nfunction addIntrinsicHierarchy(\n context: DependencyGraphAnalyzerContext,\n packageName: string,\n nodes: Map<string, GraphNode<DependencyGraphNodeData>>,\n): void {\n const segments = packageName.split('.');\n segments.forEach((_, index) => {\n const current = segments.slice(0, index + 1).join('.');\n const id = nodeIdForPackage(context, current);\n if (nodes.has(id)) return;\n nodes.set(id, {\n id,\n data: {\n kind: 'module',\n classification: 'intrinsic',\n focus: true,\n label: current.split('.').at(-1) ?? current,\n projectId: context.package.projectId,\n ...(context.package.name === undefined ? {} : { packageName: context.package.name }),\n path: current,\n parentPath: current.includes('.') ? current.split('.').slice(0, -1).join('.') : '',\n },\n });\n });\n}\n\n/*** Resolve a Java package node inside the current focus package. */\nfunction nodeIdForPackage(context: DependencyGraphAnalyzerContext, packageName: string): string {\n return packageName === '' ? context.package.nodeId : `${context.package.nodeId}#${packageName}`;\n}\n"]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"analyzeKotlinProjectAsync.d.ts","sourceRoot":"","sources":["../../../../../../src/features/dependency-analysis/adapters/outbound/kotlin/analyzeKotlinProjectAsync.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EACV,8BAA8B,EAE9B,uBAAuB,EAGxB,MAAM,yCAAyC,CAAC;
|
|
1
|
+
{"version":3,"file":"analyzeKotlinProjectAsync.d.ts","sourceRoot":"","sources":["../../../../../../src/features/dependency-analysis/adapters/outbound/kotlin/analyzeKotlinProjectAsync.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EACV,8BAA8B,EAE9B,uBAAuB,EAGxB,MAAM,yCAAyC,CAAC;AAMjD,oFAAoF;AACpF,wBAAsB,yBAAyB,CAC7C,OAAO,EAAE,8BAA8B,GACtC,OAAO,CAAC,uBAAuB,CAAC,CA+BlC"}
|
package/dist/features/dependency-analysis/adapters/outbound/kotlin/analyzeKotlinProjectAsync.js
CHANGED
|
@@ -2,6 +2,7 @@ import { readFile } from 'node:fs/promises';
|
|
|
2
2
|
import path from 'node:path';
|
|
3
3
|
import { toPortablePath } from '@ankhorage/utility/node/path';
|
|
4
4
|
import { collectInspectedSourceFiles } from '../../../utils/collectInspectedSourceFiles.js';
|
|
5
|
+
import { findIntrinsicPackageForReference } from '../../../utils/findIntrinsicPackageForReference.js';
|
|
5
6
|
import { extractKotlinDependencies } from './extractKotlinDependencies.js';
|
|
6
7
|
import { extractKotlinPackageFromImport } from './extractKotlinPackageFromImport.js';
|
|
7
8
|
/*** Analyze one detected Kotlin package into package/import dependency evidence. */
|
|
@@ -30,10 +31,11 @@ export async function analyzeKotlinProjectAsync(context) {
|
|
|
30
31
|
}
|
|
31
32
|
/*** Aggregate one Kotlin import into stable target nodes and weighted evidence. */
|
|
32
33
|
function addImport(context, sourceFile, sourceNodeId, specifier, intrinsicPackages, nodes, edges) {
|
|
33
|
-
const
|
|
34
|
+
const intrinsicPackage = findIntrinsicPackageForReference(specifier, intrinsicPackages);
|
|
35
|
+
const targetPackage = intrinsicPackage ?? extractKotlinPackageFromImport(specifier);
|
|
34
36
|
if (targetPackage === '')
|
|
35
37
|
return;
|
|
36
|
-
const intrinsic =
|
|
38
|
+
const intrinsic = intrinsicPackage !== undefined;
|
|
37
39
|
const targetNodeId = intrinsic
|
|
38
40
|
? nodeIdForPackage(context, targetPackage)
|
|
39
41
|
: `unknown:${targetPackage}`;
|
package/dist/features/dependency-analysis/adapters/outbound/kotlin/analyzeKotlinProjectAsync.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"analyzeKotlinProjectAsync.js","sourceRoot":"","sources":["../../../../../../src/features/dependency-analysis/adapters/outbound/kotlin/analyzeKotlinProjectAsync.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,IAAI,MAAM,WAAW,CAAC;AAG7B,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAS9D,OAAO,EAAE,2BAA2B,EAAE,MAAM,+CAA+C,CAAC;AAC5F,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,EAAE,8BAA8B,EAAE,MAAM,qCAAqC,CAAC;AAErF,oFAAoF;AACpF,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC7C,OAAuC;IAEvC,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,KAAK,QAAQ,CAAC,CAAC;IACvF,MAAM,KAAK,GAAG,2BAA2B,CACvC,OAAO,EACP,QAAQ,EAAE,WAAW,IAAI,CAAC,iBAAiB,EAAE,KAAK,EAAE,GAAG,CAAC,EACxD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EACvD,CAAC,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,CAAC,CAChD,CAAC;IACF,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAC/B,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;QACzB,IAAI;QACJ,YAAY,EAAE,yBAAyB,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;KACtE,CAAC,CAAC,CACJ,CAAC;IACF,MAAM,iBAAiB,GAAG,IAAI,GAAG,CAC/B,OAAO;SACJ,GAAG,CAAC,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC,YAAY,CAAC,WAAW,CAAC;SACnD,MAAM,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,KAAK,EAAE,CAAC,CAC/C,CAAC;IACF,MAAM,KAAK,GAAG,IAAI,GAAG,EAA8C,CAAC;IACpE,KAAK,MAAM,WAAW,IAAI,iBAAiB;QAAE,qBAAqB,CAAC,OAAO,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC;IAChG,MAAM,KAAK,GAAG,IAAI,GAAG,EAA8C,CAAC;IAEpE,KAAK,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,OAAO,EAAE,CAAC;QAC7C,OAAO,CAAC,MAAM,EAAE,cAAc,EAAE,CAAC;QACjC,MAAM,YAAY,GAAG,gBAAgB,CAAC,OAAO,EAAE,YAAY,CAAC,WAAW,CAAC,CAAC;QACzE,KAAK,MAAM,SAAS,IAAI,YAAY,CAAC,OAAO,EAAE,CAAC;YAC7C,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,SAAS,EAAE,iBAAiB,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;QACrF,CAAC;IACH,CAAC;IACD,OAAO,EAAE,KAAK,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC;AACpE,CAAC;AAED,mFAAmF;AACnF,SAAS,SAAS,CAChB,OAAuC,EACvC,UAAkB,EAClB,YAAoB,EACpB,SAAiB,EACjB,iBAAsC,EACtC,KAAsD,EACtD,KAAsD;IAEtD,MAAM,aAAa,GAAG,8BAA8B,CAAC,SAAS,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"analyzeKotlinProjectAsync.js","sourceRoot":"","sources":["../../../../../../src/features/dependency-analysis/adapters/outbound/kotlin/analyzeKotlinProjectAsync.ts"],"names":[],"mappings":"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","sourcesContent":["import { readFile } from 'node:fs/promises';\nimport path from 'node:path';\n\nimport type { GraphEdge, GraphNode } from '@ankhorage/graph';\nimport { toPortablePath } from '@ankhorage/utility/node/path';\n\nimport type {\n DependencyGraphAnalyzerContext,\n DependencyGraphEdgeData,\n DependencyGraphFragment,\n DependencyGraphNodeData,\n DependencyImportEvidence,\n} from '../../../../../types/dependencyGraph.js';\nimport { collectInspectedSourceFiles } from '../../../utils/collectInspectedSourceFiles.js';\nimport { findIntrinsicPackageForReference } from '../../../utils/findIntrinsicPackageForReference.js';\nimport { extractKotlinDependencies } from './extractKotlinDependencies.js';\nimport { extractKotlinPackageFromImport } from './extractKotlinPackageFromImport.js';\n\n/*** Analyze one detected Kotlin package into package/import dependency evidence. */\nexport async function analyzeKotlinProjectAsync(\n context: DependencyGraphAnalyzerContext,\n): Promise<DependencyGraphFragment> {\n const language = context.package.detection.languages.find(({ id }) => id === 'kotlin');\n const files = collectInspectedSourceFiles(\n context,\n language?.sourceRoots ?? ['src/main/kotlin', 'src', '.'],\n (file) => file.endsWith('.kt') || file.endsWith('.kts'),\n ['.git', 'build', 'coverage', 'dist', 'target'],\n );\n const sources = await Promise.all(\n files.map(async (file) => ({\n file,\n dependencies: extractKotlinDependencies(await readFile(file, 'utf8')),\n })),\n );\n const intrinsicPackages = new Set(\n sources\n .map(({ dependencies }) => dependencies.packageName)\n .filter((packageName) => packageName !== ''),\n );\n const nodes = new Map<string, GraphNode<DependencyGraphNodeData>>();\n for (const packageName of intrinsicPackages) addIntrinsicHierarchy(context, packageName, nodes);\n const edges = new Map<string, GraphEdge<DependencyGraphEdgeData>>();\n\n for (const { file, dependencies } of sources) {\n context.signal?.throwIfAborted();\n const sourceNodeId = nodeIdForPackage(context, dependencies.packageName);\n for (const specifier of dependencies.imports) {\n addImport(context, file, sourceNodeId, specifier, intrinsicPackages, nodes, edges);\n }\n }\n return { nodes: [...nodes.values()], edges: [...edges.values()] };\n}\n\n/*** Aggregate one Kotlin import into stable target nodes and weighted evidence. */\nfunction addImport(\n context: DependencyGraphAnalyzerContext,\n sourceFile: string,\n sourceNodeId: string,\n specifier: string,\n intrinsicPackages: ReadonlySet<string>,\n nodes: Map<string, GraphNode<DependencyGraphNodeData>>,\n edges: Map<string, GraphEdge<DependencyGraphEdgeData>>,\n): void {\n const intrinsicPackage = findIntrinsicPackageForReference(specifier, intrinsicPackages);\n const targetPackage = intrinsicPackage ?? extractKotlinPackageFromImport(specifier);\n if (targetPackage === '') return;\n const intrinsic = intrinsicPackage !== undefined;\n const targetNodeId = intrinsic\n ? nodeIdForPackage(context, targetPackage)\n : `unknown:${targetPackage}`;\n if (targetNodeId === sourceNodeId) return;\n if (!intrinsic && !nodes.has(targetNodeId)) {\n nodes.set(targetNodeId, {\n id: targetNodeId,\n data: {\n kind: 'package',\n classification: 'unknown',\n focus: false,\n label: targetPackage,\n packageName: targetPackage,\n },\n });\n }\n const edgeId = `${sourceNodeId}->${targetNodeId}`;\n const existing = edges.get(edgeId);\n const evidence: DependencyImportEvidence = {\n sourceFile: toPortablePath(path.relative(context.package.rootPath, sourceFile)),\n specifier,\n classification: intrinsic ? 'intrinsic' : 'unknown',\n declarations: [],\n };\n edges.set(edgeId, {\n id: edgeId,\n source: sourceNodeId,\n target: targetNodeId,\n data: {\n kind: 'import',\n analyzerId: 'kotlin',\n weight: (existing?.data.weight ?? 0) + 1,\n evidence: [...(existing?.data.evidence ?? []), evidence],\n },\n });\n}\n\n/*** Materialize a Kotlin package and all ancestor package nodes. */\nfunction addIntrinsicHierarchy(\n context: DependencyGraphAnalyzerContext,\n packageName: string,\n nodes: Map<string, GraphNode<DependencyGraphNodeData>>,\n): void {\n const segments = packageName.split('.');\n segments.forEach((_, index) => {\n const current = segments.slice(0, index + 1).join('.');\n const id = nodeIdForPackage(context, current);\n if (nodes.has(id)) return;\n nodes.set(id, {\n id,\n data: {\n kind: 'module',\n classification: 'intrinsic',\n focus: true,\n label: current.split('.').at(-1) ?? current,\n projectId: context.package.projectId,\n ...(context.package.name === undefined ? {} : { packageName: context.package.name }),\n path: current,\n parentPath: current.includes('.') ? current.split('.').slice(0, -1).join('.') : '',\n },\n });\n });\n}\n\n/*** Resolve a Kotlin package node inside the current focus package. */\nfunction nodeIdForPackage(context: DependencyGraphAnalyzerContext, packageName: string): string {\n return packageName === '' ? context.package.nodeId : `${context.package.nodeId}#${packageName}`;\n}\n"]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolveTypeScriptImport.d.ts","sourceRoot":"","sources":["../../../../../../src/features/dependency-analysis/adapters/outbound/typescript/resolveTypeScriptImport.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,qBAAqB,EACrB,sBAAsB,EACtB,iCAAiC,EAClC,MAAM,yCAAyC,CAAC;AAEjD,MAAM,WAAW,wBAAwB;IACvC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,cAAc,EAAE,iCAAiC,CAAC;IAC3D,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,YAAY,EAAE,SAAS,qBAAqB,EAAE,CAAC;CACzD;AAED,oGAAoG;AACpG,wBAAgB,uBAAuB,CACrC,cAAc,EAAE,sBAAsB,EACtC,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,WAAW,CAAC,MAAM,CAAC,EAChC,aAAa,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,GACzC,wBAAwB,
|
|
1
|
+
{"version":3,"file":"resolveTypeScriptImport.d.ts","sourceRoot":"","sources":["../../../../../../src/features/dependency-analysis/adapters/outbound/typescript/resolveTypeScriptImport.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,qBAAqB,EACrB,sBAAsB,EACtB,iCAAiC,EAClC,MAAM,yCAAyC,CAAC;AAEjD,MAAM,WAAW,wBAAwB;IACvC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,cAAc,EAAE,iCAAiC,CAAC;IAC3D,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,YAAY,EAAE,SAAS,qBAAqB,EAAE,CAAC;CACzD;AAED,oGAAoG;AACpG,wBAAgB,uBAAuB,CACrC,cAAc,EAAE,sBAAsB,EACtC,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,WAAW,CAAC,MAAM,CAAC,EAChC,aAAa,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,GACzC,wBAAwB,CA0C1B"}
|
package/dist/features/dependency-analysis/adapters/outbound/typescript/resolveTypeScriptImport.js
CHANGED
|
@@ -11,11 +11,20 @@ export function resolveTypeScriptImport(packageContext, sourceFile, specifier, s
|
|
|
11
11
|
const packageName = barePackageName(specifier);
|
|
12
12
|
if (packageName !== undefined) {
|
|
13
13
|
const focusNodeId = focusPackages.get(packageName);
|
|
14
|
+
if (focusNodeId !== undefined) {
|
|
15
|
+
return {
|
|
16
|
+
targetNodeId: focusNodeId,
|
|
17
|
+
classification: 'focus',
|
|
18
|
+
packageName,
|
|
19
|
+
declarations: declarationsFor(packageContext.declarations, packageName),
|
|
20
|
+
};
|
|
21
|
+
}
|
|
22
|
+
const declarations = declarationsFor(packageContext.declarations, packageName);
|
|
14
23
|
return {
|
|
15
|
-
targetNodeId:
|
|
16
|
-
classification:
|
|
24
|
+
targetNodeId: declarations.length > 0 ? `vendor:${packageName}` : `unknown:${packageName}`,
|
|
25
|
+
classification: declarations.length > 0 ? 'vendor' : 'unknown',
|
|
17
26
|
packageName,
|
|
18
|
-
declarations
|
|
27
|
+
declarations,
|
|
19
28
|
};
|
|
20
29
|
}
|
|
21
30
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolveTypeScriptImport.js","sourceRoot":"","sources":["../../../../../../src/features/dependency-analysis/adapters/outbound/typescript/resolveTypeScriptImport.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAgB9D,oGAAoG;AACpG,MAAM,UAAU,uBAAuB,CACrC,cAAsC,EACtC,UAAkB,EAClB,SAAiB,EACjB,WAAgC,EAChC,aAA0C;IAE1C,IAAI,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,SAAS,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;QAC9D,OAAO,gBAAgB,CACrB,cAAc,EACd,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,SAAS,CAAC,EACjD,WAAW,CACZ,CAAC;IACJ,CAAC;IACD,IAAI,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;QAC/B,OAAO,gBAAgB,CACrB,cAAc,EACd,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,QAAQ,EAAE,KAAK,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAChE,WAAW,CACZ,CAAC;IACJ,CAAC;IAED,MAAM,WAAW,GAAG,eAAe,CAAC,SAAS,CAAC,CAAC;IAC/C,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;QAC9B,MAAM,WAAW,GAAG,aAAa,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QACnD,OAAO;
|
|
1
|
+
{"version":3,"file":"resolveTypeScriptImport.js","sourceRoot":"","sources":["../../../../../../src/features/dependency-analysis/adapters/outbound/typescript/resolveTypeScriptImport.ts"],"names":[],"mappings":"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","sourcesContent":["import path from 'node:path';\n\nimport { toPortablePath } from '@ankhorage/utility/node/path';\n\nimport type {\n DependencyDeclaration,\n DependencyGraphPackage,\n DependencyReferenceClassification,\n} from '../../../../../types/dependencyGraph.js';\n\nexport interface ResolvedTypeScriptImport {\n readonly targetNodeId: string;\n readonly classification: DependencyReferenceClassification;\n readonly targetPath?: string;\n readonly packageName?: string;\n readonly declarations: readonly DependencyDeclaration[];\n}\n\n/*** Resolve one TypeScript import to an intrinsic module, focus package, vendor or unknown node. */\nexport function resolveTypeScriptImport(\n packageContext: DependencyGraphPackage,\n sourceFile: string,\n specifier: string,\n sourceFiles: ReadonlySet<string>,\n focusPackages: ReadonlyMap<string, string>,\n): ResolvedTypeScriptImport {\n if (specifier.startsWith('./') || specifier.startsWith('../')) {\n return resolveIntrinsic(\n packageContext,\n path.resolve(path.dirname(sourceFile), specifier),\n sourceFiles,\n );\n }\n if (specifier.startsWith('@/')) {\n return resolveIntrinsic(\n packageContext,\n path.resolve(packageContext.rootPath, 'src', specifier.slice(2)),\n sourceFiles,\n );\n }\n\n const packageName = barePackageName(specifier);\n if (packageName !== undefined) {\n const focusNodeId = focusPackages.get(packageName);\n if (focusNodeId !== undefined) {\n return {\n targetNodeId: focusNodeId,\n classification: 'focus',\n packageName,\n declarations: declarationsFor(packageContext.declarations, packageName),\n };\n }\n\n const declarations = declarationsFor(packageContext.declarations, packageName);\n return {\n targetNodeId: declarations.length > 0 ? `vendor:${packageName}` : `unknown:${packageName}`,\n classification: declarations.length > 0 ? 'vendor' : 'unknown',\n packageName,\n declarations,\n };\n }\n\n return {\n targetNodeId: `unknown:${specifier}`,\n classification: 'unknown',\n declarations: [],\n };\n}\n\n/*** Resolve a source-like path to the containing intrinsic package module. */\nfunction resolveIntrinsic(\n packageContext: DependencyGraphPackage,\n unresolvedPath: string,\n sourceFiles: ReadonlySet<string>,\n): ResolvedTypeScriptImport {\n const targetFile = sourceCandidates(unresolvedPath).find((candidate) =>\n sourceFiles.has(candidate),\n );\n const target = targetFile ?? unresolvedPath;\n const relative = toPortablePath(path.relative(packageContext.rootPath, target));\n if (relative === '..' || relative.startsWith('../')) {\n return {\n targetNodeId: `unknown:${relative}`,\n classification: 'unknown',\n declarations: [],\n };\n }\n\n const modulePath = toPortablePath(path.dirname(relative));\n const normalizedPath = modulePath === '.' ? '' : modulePath.split('/').join('.');\n return {\n targetNodeId:\n normalizedPath === '' ? packageContext.nodeId : `${packageContext.nodeId}#${normalizedPath}`,\n classification: 'intrinsic',\n targetPath: normalizedPath,\n declarations: [],\n };\n}\n\n/*** Read dependency declarations without dynamic object-key access. */\nfunction declarationsFor(\n declarations: Readonly<Record<string, readonly DependencyDeclaration[]>>,\n packageName: string,\n): readonly DependencyDeclaration[] {\n const entry = Object.entries(declarations).find(([name]) => name === packageName);\n return entry === undefined ? [] : entry[1];\n}\n\n/*** Generate deterministic TypeScript module resolution candidates without executing project config. */\nfunction sourceCandidates(base: string): readonly string[] {\n const extensions = ['.ts', '.tsx', '.mts', '.cts'];\n return [\n base,\n ...extensions.map((extension) => `${base}${extension}`),\n ...extensions.map((extension) => path.join(base, `index${extension}`)),\n ];\n}\n\n/*** Extract the npm package identity from a bare module specifier. */\nfunction barePackageName(specifier: string): string | undefined {\n if (\n specifier === '' ||\n specifier.startsWith('#') ||\n specifier.startsWith('/') ||\n specifier.startsWith('~')\n ) {\n return undefined;\n }\n\n const segments = specifier.split('/');\n if (specifier.startsWith('@')) {\n return segments.length >= 2 ? `${segments[0]}/${segments[1]}` : undefined;\n }\n return segments[0];\n}\n"]}
|
|
@@ -0,0 +1,3 @@
|
|
|
1
|
+
/*** Resolve the longest source-declared package that contains one dotted import reference. */
|
|
2
|
+
export declare function findIntrinsicPackageForReference(reference: string, intrinsicPackages: ReadonlySet<string>): string | undefined;
|
|
3
|
+
//# sourceMappingURL=findIntrinsicPackageForReference.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"findIntrinsicPackageForReference.d.ts","sourceRoot":"","sources":["../../../../src/features/dependency-analysis/utils/findIntrinsicPackageForReference.ts"],"names":[],"mappings":"AAAA,8FAA8F;AAC9F,wBAAgB,gCAAgC,CAC9C,SAAS,EAAE,MAAM,EACjB,iBAAiB,EAAE,WAAW,CAAC,MAAM,CAAC,GACrC,MAAM,GAAG,SAAS,CAKpB"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
/*** Resolve the longest source-declared package that contains one dotted import reference. */
|
|
2
|
+
export function findIntrinsicPackageForReference(reference, intrinsicPackages) {
|
|
3
|
+
return [...intrinsicPackages]
|
|
4
|
+
.filter((packageName) => reference === packageName || reference.startsWith(`${packageName}.`))
|
|
5
|
+
.sort((left, right) => right.length - left.length)
|
|
6
|
+
.at(0);
|
|
7
|
+
}
|
|
8
|
+
//# sourceMappingURL=findIntrinsicPackageForReference.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"findIntrinsicPackageForReference.js","sourceRoot":"","sources":["../../../../src/features/dependency-analysis/utils/findIntrinsicPackageForReference.ts"],"names":[],"mappings":"AAAA,8FAA8F;AAC9F,MAAM,UAAU,gCAAgC,CAC9C,SAAiB,EACjB,iBAAsC;IAEtC,OAAO,CAAC,GAAG,iBAAiB,CAAC;SAC1B,MAAM,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,SAAS,KAAK,WAAW,IAAI,SAAS,CAAC,UAAU,CAAC,GAAG,WAAW,GAAG,CAAC,CAAC;SAC7F,IAAI,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;SACjD,EAAE,CAAC,CAAC,CAAC,CAAC;AACX,CAAC","sourcesContent":["/*** Resolve the longest source-declared package that contains one dotted import reference. */\nexport function findIntrinsicPackageForReference(\n reference: string,\n intrinsicPackages: ReadonlySet<string>,\n): string | undefined {\n return [...intrinsicPackages]\n .filter((packageName) => reference === packageName || reference.startsWith(`${packageName}.`))\n .sort((left, right) => right.length - left.length)\n .at(0);\n}\n"]}
|