@yalehwang/archguard 0.1.9 → 0.1.10
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/dist/cli/analyze/normalize-to-diagrams.d.ts.map +1 -1
- package/dist/cli/analyze/normalize-to-diagrams.js +17 -4
- package/dist/cli/analyze/normalize-to-diagrams.js.map +1 -1
- package/dist/cli/cache/render-hash-cache.d.ts +1 -1
- package/dist/cli/cache/render-hash-cache.d.ts.map +1 -1
- package/dist/cli/cache/render-hash-cache.js +1 -1
- package/dist/cli/cache/render-hash-cache.js.map +1 -1
- package/dist/cli/utils/java-project-structure-detector.d.ts +7 -0
- package/dist/cli/utils/java-project-structure-detector.d.ts.map +1 -0
- package/dist/cli/utils/java-project-structure-detector.js +97 -0
- package/dist/cli/utils/java-project-structure-detector.js.map +1 -0
- package/dist/cli/utils/project-structure-detector.d.ts +3 -2
- package/dist/cli/utils/project-structure-detector.d.ts.map +1 -1
- package/dist/cli/utils/project-structure-detector.js +8 -7
- package/dist/cli/utils/project-structure-detector.js.map +1 -1
- package/dist/mermaid/grouper.d.ts +1 -0
- package/dist/mermaid/grouper.d.ts.map +1 -1
- package/dist/mermaid/grouper.js +30 -10
- package/dist/mermaid/grouper.js.map +1 -1
- package/dist/mermaid/renderer.d.ts.map +1 -1
- package/dist/mermaid/renderer.js +30 -0
- package/dist/mermaid/renderer.js.map +1 -1
- package/dist/parser/archjson-aggregator.d.ts +1 -0
- package/dist/parser/archjson-aggregator.d.ts.map +1 -1
- package/dist/parser/archjson-aggregator.js +26 -8
- package/dist/parser/archjson-aggregator.js.map +1 -1
- package/dist/plugins/java/archjson-mapper.js +1 -1
- package/dist/plugins/java/archjson-mapper.js.map +1 -1
- package/dist/plugins/java/dependency-extractor.js +2 -2
- package/dist/plugins/java/dependency-extractor.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalize-to-diagrams.d.ts","sourceRoot":"","sources":["../../../src/cli/analyze/normalize-to-diagrams.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"normalize-to-diagrams.d.ts","sourceRoot":"","sources":["../../../src/cli/analyze/normalize-to-diagrams.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAKvE,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,UAAU,EACtB,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,aAAa,EAAE,CAAC,CAuJ1B;AAED,wBAAgB,cAAc,CAAC,QAAQ,EAAE,aAAa,EAAE,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,GAAG,aAAa,EAAE,CAM5F"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import path from 'path';
|
|
2
2
|
import { detectProjectStructure } from '../utils/project-structure-detector.js';
|
|
3
3
|
import { detectCppProjectStructure } from '../utils/cpp-project-structure-detector.js';
|
|
4
|
+
import { detectJavaProjectStructure } from '../utils/java-project-structure-detector.js';
|
|
4
5
|
import { createProjectRootLanguageDiagrams, planDefaultDiagrams, } from '../utils/default-scope-planner.js';
|
|
5
6
|
import { detectProjectLanguages } from '../utils/project-language-detector.js';
|
|
6
7
|
export async function normalizeToDiagrams(config, cliOptions, rootDir) {
|
|
@@ -51,7 +52,15 @@ export async function normalizeToDiagrams(config, cliOptions, rootDir) {
|
|
|
51
52
|
});
|
|
52
53
|
return filterByLevels(diagrams, cliOptions.diagrams);
|
|
53
54
|
}
|
|
54
|
-
if (language === '
|
|
55
|
+
if (language === 'java') {
|
|
56
|
+
const sourcePath = path.resolve(cliOptions.sources[0]);
|
|
57
|
+
return filterByLevels(await detectJavaProjectStructure(sourcePath, {
|
|
58
|
+
label: path.basename(sourcePath),
|
|
59
|
+
format: cliOptions.format,
|
|
60
|
+
exclude: cliOptions.exclude,
|
|
61
|
+
}), cliOptions.diagrams);
|
|
62
|
+
}
|
|
63
|
+
if (language === 'python' || language === 'typescript') {
|
|
55
64
|
const sourcePath = path.resolve(cliOptions.sources[0]);
|
|
56
65
|
return filterByLevels(createProjectRootLanguageDiagrams(resolvedRoot, language, {
|
|
57
66
|
label: path.basename(sourcePath),
|
|
@@ -91,9 +100,13 @@ export async function normalizeToDiagrams(config, cliOptions, rootDir) {
|
|
|
91
100
|
exclude: cliOptions.exclude,
|
|
92
101
|
}), cliOptions.diagrams);
|
|
93
102
|
}
|
|
94
|
-
if (cliOptions.lang === '
|
|
95
|
-
|
|
96
|
-
|
|
103
|
+
if (cliOptions.lang === 'java') {
|
|
104
|
+
return filterByLevels(await detectJavaProjectStructure(resolvedRoot, {
|
|
105
|
+
format: cliOptions.format,
|
|
106
|
+
exclude: cliOptions.exclude,
|
|
107
|
+
}), cliOptions.diagrams);
|
|
108
|
+
}
|
|
109
|
+
if (cliOptions.lang === 'python' || cliOptions.lang === 'typescript') {
|
|
97
110
|
return filterByLevels(createProjectRootLanguageDiagrams(resolvedRoot, cliOptions.lang, {
|
|
98
111
|
format: cliOptions.format,
|
|
99
112
|
exclude: cliOptions.exclude,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalize-to-diagrams.js","sourceRoot":"","sources":["../../../src/cli/analyze/normalize-to-diagrams.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"normalize-to-diagrams.js","sourceRoot":"","sources":["../../../src/cli/analyze/normalize-to-diagrams.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render-hash-cache.d.ts","sourceRoot":"","sources":["../../../src/cli/cache/render-hash-cache.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"render-hash-cache.d.ts","sourceRoot":"","sources":["../../../src/cli/cache/render-hash-cache.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,oBAAoB,QAAQ,CAAC;AAE1C,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,qBAAqB,EAAE,OAAO,CAAC;CAChC;AAED,qBAAa,eAAe;IAK1B,UAAU,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,GAAG,MAAM;IASxD,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC;IAgBvF,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IASrF,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAS7C,MAAM,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;CAG5C"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { createHash } from 'crypto';
|
|
2
2
|
import fs from 'fs-extra';
|
|
3
3
|
import path from 'path';
|
|
4
|
-
export const RENDER_CACHE_VERSION = '1.
|
|
4
|
+
export const RENDER_CACHE_VERSION = '1.1';
|
|
5
5
|
export class RenderHashCache {
|
|
6
6
|
computeKey(mmdContent, options) {
|
|
7
7
|
const input = `${RENDER_CACHE_VERSION}|${options.theme}|${String(options.transparentBackground)}|${mmdContent}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render-hash-cache.js","sourceRoot":"","sources":["../../../src/cli/cache/render-hash-cache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1B,OAAO,IAAI,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"render-hash-cache.js","sourceRoot":"","sources":["../../../src/cli/cache/render-hash-cache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1B,OAAO,IAAI,MAAM,MAAM,CAAC;AAGxB,MAAM,CAAC,MAAM,oBAAoB,GAAG,KAAK,CAAC;AAO1C,MAAM,OAAO,eAAe;IAK1B,UAAU,CAAC,UAAkB,EAAE,OAAsB;QACnD,MAAM,KAAK,GAAG,GAAG,oBAAoB,IAAI,OAAO,CAAC,KAAK,IAAI,MAAM,CAAC,OAAO,CAAC,qBAAqB,CAAC,IAAI,UAAU,EAAE,CAAC;QAChH,OAAO,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACnE,CAAC;IAMD,KAAK,CAAC,QAAQ,CAAC,OAAe,EAAE,UAAkB,EAAE,OAAsB;QACxE,MAAM,OAAO,GAAG,eAAe,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QACrD,IAAI,CAAC;YACH,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;gBAAE,OAAO,KAAK,CAAC;YAClD,MAAM,UAAU,GAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;YAChE,IAAI,UAAU,KAAK,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,OAAO,CAAC;gBAAE,OAAO,KAAK,CAAC;YACtE,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;YAClD,OAAO,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QAChC,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAKD,KAAK,CAAC,SAAS,CAAC,OAAe,EAAE,UAAkB,EAAE,OAAsB;QACzE,MAAM,OAAO,GAAG,eAAe,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QACrD,MAAM,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;QAC1C,MAAM,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,CAAC;IAC7E,CAAC;IAKD,KAAK,CAAC,WAAW,CAAC,GAAW;QAC3B,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,CAAC;QACtC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,sBAAsB,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;QAC/E,MAAM,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACpD,CAAC;IAKD,MAAM,CAAC,WAAW,CAAC,OAAe;QAChC,OAAO,GAAG,OAAO,cAAc,CAAC;IAClC,CAAC;CACF"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import type { DiagramConfig } from '../../types/config.js';
|
|
2
|
+
export declare function detectJavaProjectStructure(projectRoot: string, options?: {
|
|
3
|
+
label?: string;
|
|
4
|
+
format?: DiagramConfig['format'];
|
|
5
|
+
exclude?: string[];
|
|
6
|
+
}): Promise<DiagramConfig[]>;
|
|
7
|
+
//# sourceMappingURL=java-project-structure-detector.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"java-project-structure-detector.d.ts","sourceRoot":"","sources":["../../../src/cli/utils/java-project-structure-detector.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAgE3D,wBAAsB,0BAA0B,CAC9C,WAAW,EAAE,MAAM,EACnB,OAAO,CAAC,EAAE;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,aAAa,CAAC,QAAQ,CAAC,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;CAAE,GACjF,OAAO,CAAC,aAAa,EAAE,CAAC,CA+C1B"}
|
|
@@ -0,0 +1,97 @@
|
|
|
1
|
+
import fs from 'fs-extra';
|
|
2
|
+
import path from 'path';
|
|
3
|
+
const JAVA_EXTENSIONS = ['.java'];
|
|
4
|
+
const EXCLUDED_DIRS = new Set([
|
|
5
|
+
'.git',
|
|
6
|
+
'.idea',
|
|
7
|
+
'.gradle',
|
|
8
|
+
'.settings',
|
|
9
|
+
'node_modules',
|
|
10
|
+
'target',
|
|
11
|
+
'build',
|
|
12
|
+
'dist',
|
|
13
|
+
'.archguard',
|
|
14
|
+
]);
|
|
15
|
+
function isExcluded(name) {
|
|
16
|
+
return name.startsWith('.') || EXCLUDED_DIRS.has(name);
|
|
17
|
+
}
|
|
18
|
+
async function directoryHasJavaFiles(dir) {
|
|
19
|
+
let entries;
|
|
20
|
+
try {
|
|
21
|
+
entries = await fs.readdir(dir, { withFileTypes: true });
|
|
22
|
+
}
|
|
23
|
+
catch {
|
|
24
|
+
return false;
|
|
25
|
+
}
|
|
26
|
+
for (const entry of entries) {
|
|
27
|
+
if (entry.isFile() && JAVA_EXTENSIONS.includes(path.extname(entry.name).toLowerCase())) {
|
|
28
|
+
return true;
|
|
29
|
+
}
|
|
30
|
+
if (entry.isDirectory() && !isExcluded(entry.name)) {
|
|
31
|
+
if (await directoryHasJavaFiles(path.join(dir, entry.name))) {
|
|
32
|
+
return true;
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
return false;
|
|
37
|
+
}
|
|
38
|
+
async function readMavenModules(projectRoot) {
|
|
39
|
+
const pomPath = path.join(projectRoot, 'pom.xml');
|
|
40
|
+
let pom;
|
|
41
|
+
try {
|
|
42
|
+
pom = await fs.readFile(pomPath, 'utf-8');
|
|
43
|
+
}
|
|
44
|
+
catch {
|
|
45
|
+
return [];
|
|
46
|
+
}
|
|
47
|
+
const modules = [];
|
|
48
|
+
const moduleRegex = /<module>\s*([^<\s][^<]*)\s*<\/module>/g;
|
|
49
|
+
for (const match of pom.matchAll(moduleRegex)) {
|
|
50
|
+
const moduleName = match[1]?.trim();
|
|
51
|
+
if (moduleName) {
|
|
52
|
+
modules.push(moduleName);
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
return modules;
|
|
56
|
+
}
|
|
57
|
+
export async function detectJavaProjectStructure(projectRoot, options) {
|
|
58
|
+
const label = options?.label ?? path.basename(projectRoot);
|
|
59
|
+
const common = {
|
|
60
|
+
language: 'java',
|
|
61
|
+
...(options?.format !== undefined && { format: options.format }),
|
|
62
|
+
...(options?.exclude !== undefined && { exclude: options.exclude }),
|
|
63
|
+
};
|
|
64
|
+
const diagrams = [
|
|
65
|
+
{
|
|
66
|
+
...common,
|
|
67
|
+
name: `${label}/overview/package`,
|
|
68
|
+
sources: [projectRoot],
|
|
69
|
+
level: 'package',
|
|
70
|
+
},
|
|
71
|
+
{
|
|
72
|
+
...common,
|
|
73
|
+
name: `${label}/class/all-classes`,
|
|
74
|
+
sources: [projectRoot],
|
|
75
|
+
level: 'class',
|
|
76
|
+
},
|
|
77
|
+
];
|
|
78
|
+
const modules = await readMavenModules(projectRoot);
|
|
79
|
+
const validModules = [];
|
|
80
|
+
for (const moduleName of modules) {
|
|
81
|
+
const moduleRoot = path.join(projectRoot, moduleName);
|
|
82
|
+
if (await directoryHasJavaFiles(moduleRoot)) {
|
|
83
|
+
validModules.push(moduleName);
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
validModules.sort();
|
|
87
|
+
return [
|
|
88
|
+
...diagrams,
|
|
89
|
+
...validModules.map((moduleName) => ({
|
|
90
|
+
...common,
|
|
91
|
+
name: `${label}/class/${moduleName}`,
|
|
92
|
+
sources: [path.join(projectRoot, moduleName)],
|
|
93
|
+
level: 'class',
|
|
94
|
+
})),
|
|
95
|
+
];
|
|
96
|
+
}
|
|
97
|
+
//# sourceMappingURL=java-project-structure-detector.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"java-project-structure-detector.js","sourceRoot":"","sources":["../../../src/cli/utils/java-project-structure-detector.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { DiagramConfig } from '../../types/config.js';
|
|
2
|
+
export declare const DEFAULT_SOURCE_EXTENSIONS: string[];
|
|
2
3
|
export declare function findSourceRoot(rootDir: string): Promise<string>;
|
|
3
|
-
export declare function getTopLevelModules(rootDir: string, sourceRoot: string): Promise<string[]>;
|
|
4
|
-
export declare function hasTopLevelSourceFiles(sourceRootPath: string): Promise<boolean>;
|
|
4
|
+
export declare function getTopLevelModules(rootDir: string, sourceRoot: string, extensions?: string[]): Promise<string[]>;
|
|
5
|
+
export declare function hasTopLevelSourceFiles(sourceRootPath: string, extensions?: string[]): Promise<boolean>;
|
|
5
6
|
export declare function detectProjectStructure(rootDir: string, externalSourceRoot?: string): Promise<DiagramConfig[]>;
|
|
6
7
|
//# sourceMappingURL=project-structure-detector.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-structure-detector.d.ts","sourceRoot":"","sources":["../../../src/cli/utils/project-structure-detector.ts"],"names":[],"mappings":"AAoBA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"project-structure-detector.d.ts","sourceRoot":"","sources":["../../../src/cli/utils/project-structure-detector.ts"],"names":[],"mappings":"AAoBA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAI3D,eAAO,MAAM,yBAAyB,UAAiB,CAAC;AAuBxD,wBAAsB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAarE;AAWD,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAClB,UAAU,GAAE,MAAM,EAA8B,GAC/C,OAAO,CAAC,MAAM,EAAE,CAAC,CA0BnB;AAQD,wBAAsB,sBAAsB,CAC1C,cAAc,EAAE,MAAM,EACtB,UAAU,GAAE,MAAM,EAA8B,GAC/C,OAAO,CAAC,OAAO,CAAC,CAiBlB;AA4CD,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE,MAAM,EACf,kBAAkB,CAAC,EAAE,MAAM,GAC1B,OAAO,CAAC,aAAa,EAAE,CAAC,CAmE1B"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import fs from 'fs-extra';
|
|
2
2
|
import path from 'path';
|
|
3
3
|
const SOURCE_ROOT_CANDIDATES = ['src', 'lib', 'app', 'source'];
|
|
4
|
+
export const DEFAULT_SOURCE_EXTENSIONS = ['.ts', '.js'];
|
|
4
5
|
const EXCLUDED_DIRS = new Set([
|
|
5
6
|
'node_modules',
|
|
6
7
|
'.git',
|
|
@@ -28,7 +29,7 @@ export async function findSourceRoot(rootDir) {
|
|
|
28
29
|
}
|
|
29
30
|
return './';
|
|
30
31
|
}
|
|
31
|
-
export async function getTopLevelModules(rootDir, sourceRoot) {
|
|
32
|
+
export async function getTopLevelModules(rootDir, sourceRoot, extensions = DEFAULT_SOURCE_EXTENSIONS) {
|
|
32
33
|
const absoluteRoot = path.resolve(rootDir, sourceRoot);
|
|
33
34
|
let entries;
|
|
34
35
|
try {
|
|
@@ -45,14 +46,14 @@ export async function getTopLevelModules(rootDir, sourceRoot) {
|
|
|
45
46
|
continue;
|
|
46
47
|
if (entry.name.startsWith('.'))
|
|
47
48
|
continue;
|
|
48
|
-
const hasSource = await directoryHasSourceFiles(path.join(absoluteRoot, entry.name));
|
|
49
|
+
const hasSource = await directoryHasSourceFiles(path.join(absoluteRoot, entry.name), extensions);
|
|
49
50
|
if (hasSource) {
|
|
50
51
|
modules.push(entry.name);
|
|
51
52
|
}
|
|
52
53
|
}
|
|
53
54
|
return modules.sort();
|
|
54
55
|
}
|
|
55
|
-
export async function hasTopLevelSourceFiles(sourceRootPath) {
|
|
56
|
+
export async function hasTopLevelSourceFiles(sourceRootPath, extensions = DEFAULT_SOURCE_EXTENSIONS) {
|
|
56
57
|
let entries;
|
|
57
58
|
try {
|
|
58
59
|
entries = await fs.readdir(sourceRootPath, { withFileTypes: true });
|
|
@@ -64,13 +65,13 @@ export async function hasTopLevelSourceFiles(sourceRootPath) {
|
|
|
64
65
|
if (!entry.isFile())
|
|
65
66
|
continue;
|
|
66
67
|
const ext = path.extname(entry.name).toLowerCase();
|
|
67
|
-
if (
|
|
68
|
+
if (extensions.includes(ext)) {
|
|
68
69
|
return true;
|
|
69
70
|
}
|
|
70
71
|
}
|
|
71
72
|
return false;
|
|
72
73
|
}
|
|
73
|
-
async function directoryHasSourceFiles(dir) {
|
|
74
|
+
async function directoryHasSourceFiles(dir, extensions = DEFAULT_SOURCE_EXTENSIONS) {
|
|
74
75
|
let entries;
|
|
75
76
|
try {
|
|
76
77
|
entries = await fs.readdir(dir, { withFileTypes: true });
|
|
@@ -81,12 +82,12 @@ async function directoryHasSourceFiles(dir) {
|
|
|
81
82
|
for (const entry of entries) {
|
|
82
83
|
if (entry.isFile()) {
|
|
83
84
|
const ext = path.extname(entry.name).toLowerCase();
|
|
84
|
-
if (
|
|
85
|
+
if (extensions.includes(ext)) {
|
|
85
86
|
return true;
|
|
86
87
|
}
|
|
87
88
|
}
|
|
88
89
|
else if (entry.isDirectory() && !EXCLUDED_DIRS.has(entry.name)) {
|
|
89
|
-
const nested = await directoryHasSourceFiles(path.join(dir, entry.name));
|
|
90
|
+
const nested = await directoryHasSourceFiles(path.join(dir, entry.name), extensions);
|
|
90
91
|
if (nested)
|
|
91
92
|
return true;
|
|
92
93
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-structure-detector.js","sourceRoot":"","sources":["../../../src/cli/utils/project-structure-detector.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1B,OAAO,IAAI,MAAM,MAAM,CAAC;AAIxB,MAAM,sBAAsB,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"project-structure-detector.js","sourceRoot":"","sources":["../../../src/cli/utils/project-structure-detector.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"grouper.d.ts","sourceRoot":"","sources":["../../src/mermaid/grouper.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,KAAK,EAAE,gBAAgB,EAAgC,aAAa,EAAE,MAAM,YAAY,CAAC;AAMhG,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA0B;gBAErC,MAAM,CAAC,EAAE,OAAO,CAAC,aAAa,CAAC;IAY3C,KAAK,CAAC,QAAQ,EAAE,QAAQ,GAAG,gBAAgB;IAsC3C,OAAO,CAAC,gBAAgB;IAmDxB,OAAO,CAAC,WAAW;
|
|
1
|
+
{"version":3,"file":"grouper.d.ts","sourceRoot":"","sources":["../../src/mermaid/grouper.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,KAAK,EAAE,gBAAgB,EAAgC,aAAa,EAAE,MAAM,YAAY,CAAC;AAMhG,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA0B;gBAErC,MAAM,CAAC,EAAE,OAAO,CAAC,aAAa,CAAC;IAY3C,KAAK,CAAC,QAAQ,EAAE,QAAQ,GAAG,gBAAgB;IAsC3C,OAAO,CAAC,gBAAgB;IAmDxB,OAAO,CAAC,WAAW;IAwCnB,OAAO,CAAC,0BAA0B;IAsBlC,OAAO,CAAC,kBAAkB;IAqD1B,OAAO,CAAC,iBAAiB;IAkBzB,OAAO,CAAC,kBAAkB;IA2C1B,OAAO,CAAC,WAAW;IAyBnB,OAAO,CAAC,sBAAsB;CAiB/B"}
|
package/dist/mermaid/grouper.js
CHANGED
|
@@ -70,29 +70,47 @@ export class HeuristicGrouper {
|
|
|
70
70
|
}
|
|
71
71
|
groupByPath(archJson) {
|
|
72
72
|
const packageMap = new Map();
|
|
73
|
-
const
|
|
73
|
+
const reasoningMap = new Map();
|
|
74
74
|
for (const entity of archJson.entities) {
|
|
75
75
|
const isPathBased = entity.type === 'package' || entity.name.includes('/');
|
|
76
|
+
const javaModuleName = archJson.language === 'java'
|
|
77
|
+
? this.extractJavaMavenModuleName(entity.sourceLocation.file)
|
|
78
|
+
: null;
|
|
76
79
|
const packageName = isPathBased
|
|
77
80
|
? entity.name.split('/')[0]
|
|
78
|
-
: this.extractPackageName(entity.sourceLocation.file);
|
|
81
|
+
: javaModuleName ?? this.extractPackageName(entity.sourceLocation.file);
|
|
79
82
|
if (!packageMap.has(packageName)) {
|
|
80
83
|
packageMap.set(packageName, []);
|
|
81
|
-
|
|
84
|
+
}
|
|
85
|
+
if (javaModuleName) {
|
|
86
|
+
reasoningMap.set(packageName, `Grouped by Maven module: ${packageName}`);
|
|
82
87
|
}
|
|
83
88
|
packageMap.get(packageName).push(entity.id);
|
|
84
89
|
if (isPathBased) {
|
|
85
|
-
|
|
90
|
+
reasoningMap.set(packageName, `Grouped by path: ${packageName}/`);
|
|
86
91
|
}
|
|
87
92
|
}
|
|
88
93
|
return Array.from(packageMap.entries()).map(([rawName, entities]) => ({
|
|
89
94
|
name: this.formatPackageName(rawName),
|
|
90
95
|
entities,
|
|
91
|
-
reasoning:
|
|
92
|
-
? `Grouped by path: ${rawName}/`
|
|
93
|
-
: `Grouped by path: ${rawName}`,
|
|
96
|
+
reasoning: reasoningMap.get(rawName) ?? `Grouped by path: ${rawName}`,
|
|
94
97
|
}));
|
|
95
98
|
}
|
|
99
|
+
extractJavaMavenModuleName(filePath) {
|
|
100
|
+
if (!filePath || filePath.trim() === '') {
|
|
101
|
+
return null;
|
|
102
|
+
}
|
|
103
|
+
const normalizedPath = filePath.replace(/\\/g, '/');
|
|
104
|
+
const match = normalizedPath.match(/\/([^/]+)\/src\/(?:main|test)\/java\//);
|
|
105
|
+
if (!match) {
|
|
106
|
+
return null;
|
|
107
|
+
}
|
|
108
|
+
const moduleName = match[1];
|
|
109
|
+
if (!moduleName || moduleName === 'src') {
|
|
110
|
+
return null;
|
|
111
|
+
}
|
|
112
|
+
return moduleName;
|
|
113
|
+
}
|
|
96
114
|
extractPackageName(filePath) {
|
|
97
115
|
if (!filePath || filePath.trim() === '') {
|
|
98
116
|
return 'core';
|
|
@@ -144,10 +162,12 @@ export class HeuristicGrouper {
|
|
|
144
162
|
const current = packages[i];
|
|
145
163
|
if (!current)
|
|
146
164
|
continue;
|
|
147
|
-
const
|
|
148
|
-
if (current.entities.length <= threshold && !
|
|
165
|
+
const isProtectedGroup = current.reasoning?.includes('/') || current.reasoning?.startsWith('Grouped by Maven module:');
|
|
166
|
+
if (current.entities.length <= threshold && !isProtectedGroup && i + 1 < packages.length) {
|
|
149
167
|
const next = packages[i + 1];
|
|
150
|
-
|
|
168
|
+
const nextIsProtectedGroup = next?.reasoning?.includes('/') ||
|
|
169
|
+
next?.reasoning?.startsWith('Grouped by Maven module:');
|
|
170
|
+
if (next && !skipIndices.has(i + 1) && !nextIsProtectedGroup) {
|
|
151
171
|
merged.push({
|
|
152
172
|
name: `${current.name} & ${next.name}`,
|
|
153
173
|
entities: [...current.entities, ...next.entities],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"grouper.js","sourceRoot":"","sources":["../../src/mermaid/grouper.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"grouper.js","sourceRoot":"","sources":["../../src/mermaid/grouper.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"renderer.d.ts","sourceRoot":"","sources":["../../src/mermaid/renderer.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,sBAAsB,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAQ7E,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"renderer.d.ts","sourceRoot":"","sources":["../../src/mermaid/renderer.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,sBAAsB,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAQ7E,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAkJpD;AAKD,qBAAa,yBAAyB;IACpC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAmC;IAC3D,OAAO,CAAC,WAAW,CAAS;gBAEhB,OAAO,CAAC,EAAE,OAAO,CAAC,sBAAsB,CAAC;IAa/C,SAAS,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAsC/C,SAAS,CAAC,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAejE,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAkD/D,aAAa,CAAC,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IA+BlF,OAAO,CAAC,iBAAiB;IAkBzB,OAAO,CAAC,UAAU;IAOlB,UAAU,IAAI,sBAAsB;IAOpC,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,sBAAsB,CAAC,GAAG,IAAI;IA2B1D,OAAO,CAAC,oBAAoB;CAgC7B"}
|
package/dist/mermaid/renderer.js
CHANGED
|
@@ -37,6 +37,24 @@ export function inlineEdgeStyles(svg) {
|
|
|
37
37
|
flowchartLinkStroke = value;
|
|
38
38
|
}
|
|
39
39
|
}
|
|
40
|
+
const relationRuleMatch = svg.match(/\.relation[^{]*\{([^}]+)\}/);
|
|
41
|
+
let relationFill = 'none';
|
|
42
|
+
let relationStroke = '';
|
|
43
|
+
if (relationRuleMatch) {
|
|
44
|
+
for (const decl of relationRuleMatch[1].split(';')) {
|
|
45
|
+
const [rawProp, ...rawValueParts] = decl.split(':');
|
|
46
|
+
if (!rawProp || rawValueParts.length === 0)
|
|
47
|
+
continue;
|
|
48
|
+
const prop = rawProp.trim().toLowerCase();
|
|
49
|
+
const value = rawValueParts.join(':').trim();
|
|
50
|
+
if (!value)
|
|
51
|
+
continue;
|
|
52
|
+
if (prop === 'fill')
|
|
53
|
+
relationFill = value;
|
|
54
|
+
if (prop === 'stroke')
|
|
55
|
+
relationStroke = value;
|
|
56
|
+
}
|
|
57
|
+
}
|
|
40
58
|
let result = svg.replace(/(<path\b[^>]*class="[^"]*\bflowchart-link\b[^"]*"[^>]*\bstyle=")([^"]*?)(")/g, (_, pre, style, post) => {
|
|
41
59
|
const hasFill = /\bfill\s*:/.test(style);
|
|
42
60
|
const hasStroke = /\bstroke\s*:/.test(style);
|
|
@@ -49,6 +67,18 @@ export function inlineEdgeStyles(svg) {
|
|
|
49
67
|
].join('');
|
|
50
68
|
return `${pre}${trimmed ? trimmed + ';' : ''}${injected}${post}`;
|
|
51
69
|
});
|
|
70
|
+
result = result.replace(/(<path\b[^>]*class="[^"]*\brelation\b[^"]*"[^>]*\bstyle=")([^"]*?)(")/g, (_, pre, style, post) => {
|
|
71
|
+
const hasFill = /\bfill\s*:/.test(style);
|
|
72
|
+
const hasStroke = /\bstroke\s*:/.test(style);
|
|
73
|
+
if (hasFill && (hasStroke || relationStroke.length === 0))
|
|
74
|
+
return _;
|
|
75
|
+
const trimmed = style.replace(/^[\s;]+|[\s;]+$/g, '');
|
|
76
|
+
const injected = [
|
|
77
|
+
!hasFill ? `fill:${relationFill};` : '',
|
|
78
|
+
!hasStroke && relationStroke ? `stroke:${relationStroke};` : '',
|
|
79
|
+
].join('');
|
|
80
|
+
return `${pre}${trimmed ? trimmed + ';' : ''}${injected}${post}`;
|
|
81
|
+
});
|
|
52
82
|
result = result.replace(/(<rect\b[^>]*class="[^"]*\bbackground\b[^"]*"[^>]*\bstyle=")([^"]*?)(")/g, (_, pre, style, post) => {
|
|
53
83
|
if (/\bfill\s*:/.test(style))
|
|
54
84
|
return _;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"renderer.js","sourceRoot":"","sources":["../../src/mermaid/renderer.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"renderer.js","sourceRoot":"","sources":["../../src/mermaid/renderer.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ export declare class ArchJSONAggregator {
|
|
|
6
6
|
private aggregateToPackageLevel;
|
|
7
7
|
private extractPackages;
|
|
8
8
|
private extractPackageFromFile;
|
|
9
|
+
private extractJavaMavenModule;
|
|
9
10
|
private analyzePackageDependencies;
|
|
10
11
|
}
|
|
11
12
|
//# sourceMappingURL=archjson-aggregator.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"archjson-aggregator.d.ts","sourceRoot":"","sources":["../../src/parser/archjson-aggregator.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,QAAQ,EAAoB,MAAM,kBAAkB,CAAC;AACnE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAQrD,qBAAa,kBAAkB;IAQ7B,SAAS,CAAC,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,GAAG,QAAQ;IAuB3D,OAAO,CAAC,qBAAqB;IAkB7B,OAAO,CAAC,uBAAuB;
|
|
1
|
+
{"version":3,"file":"archjson-aggregator.d.ts","sourceRoot":"","sources":["../../src/parser/archjson-aggregator.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,QAAQ,EAAoB,MAAM,kBAAkB,CAAC;AACnE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAQrD,qBAAa,kBAAkB;IAQ7B,SAAS,CAAC,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,GAAG,QAAQ;IAuB3D,OAAO,CAAC,qBAAqB;IAkB7B,OAAO,CAAC,uBAAuB;IA+C/B,OAAO,CAAC,eAAe;IAgCvB,OAAO,CAAC,sBAAsB;IAkD9B,OAAO,CAAC,sBAAsB;IAsB9B,OAAO,CAAC,0BAA0B;CAkDnC"}
|
|
@@ -23,10 +23,11 @@ export class ArchJSONAggregator {
|
|
|
23
23
|
}
|
|
24
24
|
aggregateToPackageLevel(archJSON) {
|
|
25
25
|
const { workspaceRoot } = archJSON;
|
|
26
|
-
const packages = this.extractPackages(archJSON.entities, workspaceRoot);
|
|
27
|
-
const packageRelations = this.analyzePackageDependencies(archJSON.entities, archJSON.relations, workspaceRoot);
|
|
26
|
+
const packages = this.extractPackages(archJSON.entities, workspaceRoot, archJSON.language);
|
|
27
|
+
const packageRelations = this.analyzePackageDependencies(archJSON.entities, archJSON.relations, workspaceRoot, archJSON.language);
|
|
28
28
|
const packageEntities = packages.map((pkg) => {
|
|
29
|
-
const firstEntityInPackage = archJSON.entities.find((e) => this.extractPackageFromFile(e.sourceLocation.file, workspaceRoot) ===
|
|
29
|
+
const firstEntityInPackage = archJSON.entities.find((e) => this.extractPackageFromFile(e.sourceLocation.file, workspaceRoot, archJSON.language) ===
|
|
30
|
+
pkg);
|
|
30
31
|
return {
|
|
31
32
|
id: pkg,
|
|
32
33
|
name: pkg,
|
|
@@ -44,19 +45,27 @@ export class ArchJSONAggregator {
|
|
|
44
45
|
relations: packageRelations,
|
|
45
46
|
};
|
|
46
47
|
}
|
|
47
|
-
extractPackages(entities, workspaceRoot) {
|
|
48
|
+
extractPackages(entities, workspaceRoot, language) {
|
|
48
49
|
const packages = new Set();
|
|
49
50
|
for (const entity of entities) {
|
|
50
|
-
const packageName = this.extractPackageFromFile(entity.sourceLocation.file, workspaceRoot);
|
|
51
|
+
const packageName = this.extractPackageFromFile(entity.sourceLocation.file, workspaceRoot, language);
|
|
51
52
|
packages.add(packageName);
|
|
52
53
|
}
|
|
53
54
|
return Array.from(packages)
|
|
54
55
|
.filter((pkg) => pkg !== '')
|
|
55
56
|
.sort();
|
|
56
57
|
}
|
|
57
|
-
extractPackageFromFile(filePath, workspaceRoot) {
|
|
58
|
+
extractPackageFromFile(filePath, workspaceRoot, language) {
|
|
59
|
+
const directJavaModule = this.extractJavaMavenModule(filePath.replace(/\\/g, '/'), language);
|
|
60
|
+
if (directJavaModule) {
|
|
61
|
+
return directJavaModule;
|
|
62
|
+
}
|
|
58
63
|
if (workspaceRoot && path.isAbsolute(filePath)) {
|
|
59
64
|
const rel = path.relative(workspaceRoot, filePath).replace(/\\/g, '/');
|
|
65
|
+
const javaModule = this.extractJavaMavenModule(rel, language);
|
|
66
|
+
if (javaModule) {
|
|
67
|
+
return javaModule;
|
|
68
|
+
}
|
|
60
69
|
const parts = rel.split('/');
|
|
61
70
|
if (parts.length <= 1)
|
|
62
71
|
return '';
|
|
@@ -80,10 +89,19 @@ export class ArchJSONAggregator {
|
|
|
80
89
|
}
|
|
81
90
|
return afterSrc.substring(0, firstSlashIndex);
|
|
82
91
|
}
|
|
83
|
-
|
|
92
|
+
extractJavaMavenModule(relativePath, language) {
|
|
93
|
+
if (language !== 'java') {
|
|
94
|
+
return null;
|
|
95
|
+
}
|
|
96
|
+
const normalized = relativePath.replace(/\\/g, '/');
|
|
97
|
+
const match = normalized.match(/^([^/]+)\/src\/(?:main|test)\/java\//) ??
|
|
98
|
+
normalized.match(/\/([^/]+)\/src\/(?:main|test)\/java\//);
|
|
99
|
+
return match?.[1] ?? null;
|
|
100
|
+
}
|
|
101
|
+
analyzePackageDependencies(entities, relations, workspaceRoot, language) {
|
|
84
102
|
const entityToPackage = new Map();
|
|
85
103
|
for (const entity of entities) {
|
|
86
|
-
const packageName = this.extractPackageFromFile(entity.sourceLocation.file, workspaceRoot);
|
|
104
|
+
const packageName = this.extractPackageFromFile(entity.sourceLocation.file, workspaceRoot, language);
|
|
87
105
|
entityToPackage.set(entity.id, packageName);
|
|
88
106
|
}
|
|
89
107
|
const packageRelationsMap = new Map();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"archjson-aggregator.js","sourceRoot":"","sources":["../../src/parser/archjson-aggregator.ts"],"names":[],"mappings":"AAYA,OAAO,IAAI,MAAM,MAAM,CAAC;AAUxB,MAAM,OAAO,kBAAkB;IAQ7B,SAAS,CAAC,QAAkB,EAAE,KAAkB;QAC9C,QAAQ,KAAK,EAAE,CAAC;YACd,KAAK,QAAQ;gBAEX,OAAO,QAAQ,CAAC;YAElB,KAAK,OAAO;gBACV,OAAO,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC;YAE9C,KAAK,SAAS;gBACZ,OAAO,IAAI,CAAC,uBAAuB,CAAC,QAAQ,CAAC,CAAC;YAEhD;gBACE,MAAM,IAAI,KAAK,CAAC,yBAAyB,KAAK,EAAE,CAAC,CAAC;QACtD,CAAC;IACH,CAAC;IAQO,qBAAqB,CAAC,QAAkB;QAC9C,OAAO;YACL,GAAG,QAAQ;YACX,QAAQ,EAAE,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;gBAC3C,GAAG,MAAM;gBACT,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAC5B,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,UAAU,KAAK,QAAQ,IAAI,MAAM,CAAC,UAAU,KAAK,SAAS,CAC9E;aACF,CAAC,CAAC;SACJ,CAAC;IACJ,CAAC;IAQO,uBAAuB,CAAC,QAAkB;QAChD,MAAM,EAAE,aAAa,EAAE,GAAG,QAAQ,CAAC;QACnC,MAAM,QAAQ,GAAG,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"archjson-aggregator.js","sourceRoot":"","sources":["../../src/parser/archjson-aggregator.ts"],"names":[],"mappings":"AAYA,OAAO,IAAI,MAAM,MAAM,CAAC;AAUxB,MAAM,OAAO,kBAAkB;IAQ7B,SAAS,CAAC,QAAkB,EAAE,KAAkB;QAC9C,QAAQ,KAAK,EAAE,CAAC;YACd,KAAK,QAAQ;gBAEX,OAAO,QAAQ,CAAC;YAElB,KAAK,OAAO;gBACV,OAAO,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC;YAE9C,KAAK,SAAS;gBACZ,OAAO,IAAI,CAAC,uBAAuB,CAAC,QAAQ,CAAC,CAAC;YAEhD;gBACE,MAAM,IAAI,KAAK,CAAC,yBAAyB,KAAK,EAAE,CAAC,CAAC;QACtD,CAAC;IACH,CAAC;IAQO,qBAAqB,CAAC,QAAkB;QAC9C,OAAO;YACL,GAAG,QAAQ;YACX,QAAQ,EAAE,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;gBAC3C,GAAG,MAAM;gBACT,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAC5B,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,UAAU,KAAK,QAAQ,IAAI,MAAM,CAAC,UAAU,KAAK,SAAS,CAC9E;aACF,CAAC,CAAC;SACJ,CAAC;IACJ,CAAC;IAQO,uBAAuB,CAAC,QAAkB;QAChD,MAAM,EAAE,aAAa,EAAE,GAAG,QAAQ,CAAC;QACnC,MAAM,QAAQ,GAAG,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,QAAQ,EAAE,aAAa,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAC3F,MAAM,gBAAgB,GAAG,IAAI,CAAC,0BAA0B,CACtD,QAAQ,CAAC,QAAQ,EACjB,QAAQ,CAAC,SAAS,EAClB,aAAa,EACb,QAAQ,CAAC,QAAQ,CAClB,CAAC;QAGF,MAAM,eAAe,GAAa,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YACrD,MAAM,oBAAoB,GAAG,QAAQ,CAAC,QAAQ,CAAC,IAAI,CACjD,CAAC,CAAC,EAAE,EAAE,CACJ,IAAI,CAAC,sBAAsB,CAAC,CAAC,CAAC,cAAc,CAAC,IAAI,EAAE,aAAa,EAAE,QAAQ,CAAC,QAAQ,CAAC;gBACpF,GAAG,CACN,CAAC;YAEF,OAAO;gBACL,EAAE,EAAE,GAAG;gBACP,IAAI,EAAE,GAAG;gBACT,IAAI,EAAE,SAAgB;gBACtB,UAAU,EAAE,QAAiB;gBAC7B,OAAO,EAAE,EAAE;gBACX,cAAc,EAAE,oBAAoB;oBAClC,CAAC,CAAC,oBAAoB,CAAC,cAAc;oBACrC,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE;aAC3C,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,OAAO;YACL,GAAG,QAAQ;YACX,QAAQ,EAAE,eAAe;YACzB,SAAS,EAAE,gBAAgB;SAC5B,CAAC;IACJ,CAAC;IAYO,eAAe,CACrB,QAAkB,EAClB,aAAsB,EACtB,QAA+B;QAE/B,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAU,CAAC;QAEnC,KAAK,MAAM,MAAM,IAAI,QAAQ,EAAE,CAAC;YAC9B,MAAM,WAAW,GAAG,IAAI,CAAC,sBAAsB,CAC7C,MAAM,CAAC,cAAc,CAAC,IAAI,EAC1B,aAAa,EACb,QAAQ,CACT,CAAC;YACF,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAC5B,CAAC;QAED,OAAO,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC;aACxB,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC;aAC3B,IAAI,EAAE,CAAC;IACZ,CAAC;IAaO,sBAAsB,CAC5B,QAAgB,EAChB,aAAsB,EACtB,QAA+B;QAE/B,MAAM,gBAAgB,GAAG,IAAI,CAAC,sBAAsB,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,QAAQ,CAAC,CAAC;QAC7F,IAAI,gBAAgB,EAAE,CAAC;YACrB,OAAO,gBAAgB,CAAC;QAC1B,CAAC;QAGD,IAAI,aAAa,IAAI,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC/C,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;YACvE,MAAM,UAAU,GAAG,IAAI,CAAC,sBAAsB,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;YAC9D,IAAI,UAAU,EAAE,CAAC;gBACf,OAAO,UAAU,CAAC;YACpB,CAAC;YACD,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC7B,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC;gBAAE,OAAO,EAAE,CAAC;YAEjC,OAAO,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACtC,CAAC;QAGD,MAAM,cAAc,GAAG,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAGpD,IAAI,QAAgB,CAAC;QACrB,MAAM,QAAQ,GAAG,cAAc,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACjD,IAAI,QAAQ,KAAK,CAAC,CAAC,EAAE,CAAC;YAEpB,QAAQ,GAAG,cAAc,CAAC,SAAS,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC;QACpD,CAAC;aAAM,IAAI,cAAc,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;YAE7C,QAAQ,GAAG,cAAc,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QACzC,CAAC;aAAM,CAAC;YAEN,QAAQ,GAAG,cAAc,CAAC;QAC5B,CAAC;QAGD,MAAM,eAAe,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC9C,IAAI,eAAe,KAAK,CAAC,CAAC,EAAE,CAAC;YAE3B,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,OAAO,QAAQ,CAAC,SAAS,CAAC,CAAC,EAAE,eAAe,CAAC,CAAC;IAChD,CAAC;IAEO,sBAAsB,CAAC,YAAoB,EAAE,QAA+B;QAClF,IAAI,QAAQ,KAAK,MAAM,EAAE,CAAC;YACxB,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,UAAU,GAAG,YAAY,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QACpD,MAAM,KAAK,GACT,UAAU,CAAC,KAAK,CAAC,sCAAsC,CAAC;YACxD,UAAU,CAAC,KAAK,CAAC,uCAAuC,CAAC,CAAC;QAC5D,OAAO,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC;IAC5B,CAAC;IAYO,0BAA0B,CAChC,QAAkB,EAClB,SAAqB,EACrB,aAAsB,EACtB,QAA+B;QAG/B,MAAM,eAAe,GAAG,IAAI,GAAG,EAAkB,CAAC;QAClD,KAAK,MAAM,MAAM,IAAI,QAAQ,EAAE,CAAC;YAC9B,MAAM,WAAW,GAAG,IAAI,CAAC,sBAAsB,CAC7C,MAAM,CAAC,cAAc,CAAC,IAAI,EAC1B,aAAa,EACb,QAAQ,CACT,CAAC;YACF,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,EAAE,WAAW,CAAC,CAAC;QAC9C,CAAC;QAGD,MAAM,mBAAmB,GAAG,IAAI,GAAG,EAAoB,CAAC;QAExD,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;YACjC,MAAM,aAAa,GAAG,eAAe,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YAC3D,MAAM,aAAa,GAAG,eAAe,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YAG3D,IACE,aAAa,KAAK,SAAS;gBAC3B,aAAa,KAAK,SAAS;gBAC3B,aAAa,KAAK,EAAE;gBACpB,aAAa,KAAK,EAAE;gBACpB,aAAa,KAAK,aAAa,EAC/B,CAAC;gBACD,SAAS;YACX,CAAC;YAGD,MAAM,GAAG,GAAG,GAAG,aAAa,IAAI,aAAa,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC;YAEjE,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;gBAClC,mBAAmB,CAAC,GAAG,CAAC,GAAG,EAAE;oBAC3B,EAAE,EAAE,OAAO,aAAa,IAAI,aAAa,EAAE;oBAC3C,IAAI,EAAE,QAAQ,CAAC,IAAI;oBACnB,MAAM,EAAE,aAAa;oBACrB,MAAM,EAAE,aAAa;iBACtB,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAED,OAAO,KAAK,CAAC,IAAI,CAAC,mBAAmB,CAAC,MAAM,EAAE,CAAC,CAAC;IAClD,CAAC;CACF"}
|
|
@@ -62,7 +62,7 @@ export class ArchJsonMapper {
|
|
|
62
62
|
return {
|
|
63
63
|
id: this.createEntityId(cls.packageName, cls.name),
|
|
64
64
|
name: cls.name,
|
|
65
|
-
type: 'class',
|
|
65
|
+
type: cls.isAbstract ? 'abstract_class' : 'class',
|
|
66
66
|
visibility: this.mapVisibility(cls.modifiers),
|
|
67
67
|
members,
|
|
68
68
|
sourceLocation: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"archjson-mapper.js","sourceRoot":"","sources":["../../../src/plugins/java/archjson-mapper.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"archjson-mapper.js","sourceRoot":"","sources":["../../../src/plugins/java/archjson-mapper.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,7 +28,7 @@ export class DependencyExtractor {
|
|
|
28
28
|
version: version.trim(),
|
|
29
29
|
type: 'maven',
|
|
30
30
|
scope: this.mapMavenScope(scope?.trim() || 'compile'),
|
|
31
|
-
source:
|
|
31
|
+
source: 'pom.xml',
|
|
32
32
|
isDirect: true,
|
|
33
33
|
});
|
|
34
34
|
}
|
|
@@ -55,7 +55,7 @@ export class DependencyExtractor {
|
|
|
55
55
|
version: version.trim(),
|
|
56
56
|
type: 'maven',
|
|
57
57
|
scope: this.mapGradleScope(scope.trim()),
|
|
58
|
-
source:
|
|
58
|
+
source: 'build.gradle',
|
|
59
59
|
isDirect: true,
|
|
60
60
|
});
|
|
61
61
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dependency-extractor.js","sourceRoot":"","sources":["../../../src/plugins/java/dependency-extractor.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1B,OAAO,IAAI,MAAM,MAAM,CAAC;AAYxB,MAAM,OAAO,mBAAmB;IAI9B,KAAK,CAAC,mBAAmB,CAAC,aAAqB;QAC7C,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;QACpD,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC;QAG5D,IAAI,MAAM,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;YACjC,OAAO,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;QACxC,CAAC;QAGD,IAAI,MAAM,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;YACpC,OAAO,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;QAC5C,CAAC;QAED,OAAO,EAAE,CAAC;IACZ,CAAC;IAKD,KAAK,CAAC,gBAAgB,CAAC,OAAe;QACpC,IAAI,CAAC;YACH,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC;gBACpC,OAAO,EAAE,CAAC;YACZ,CAAC;YAED,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YACpD,MAAM,YAAY,GAAiB,EAAE,CAAC;YAItC,MAAM,iBAAiB,GACrB,uIAAuI,CAAC;YAE1I,IAAI,KAAK,CAAC;YACV,OAAO,CAAC,KAAK,GAAG,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;gBAC1D,MAAM,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,KAAK,CAAC,GAAG,KAAK,CAAC;gBAEtD,YAAY,CAAC,IAAI,CAAC;oBAChB,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE;oBACvB,OAAO,EAAE,OAAO,CAAC,IAAI,EAAE;oBACvB,IAAI,EAAE,OAAO;oBACb,KAAK,EAAE,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,SAAS,CAAC;oBACrD,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"dependency-extractor.js","sourceRoot":"","sources":["../../../src/plugins/java/dependency-extractor.ts"],"names":[],"mappings":"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"}
|