@colbymchenry/codegraph 0.6.6 → 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/README.md +180 -502
- package/dist/bin/codegraph.d.ts +0 -5
- package/dist/bin/codegraph.d.ts.map +1 -1
- package/dist/bin/codegraph.js +217 -263
- package/dist/bin/codegraph.js.map +1 -1
- package/dist/bin/uninstall.d.ts +0 -1
- package/dist/bin/uninstall.d.ts.map +1 -1
- package/dist/bin/uninstall.js +3 -29
- package/dist/bin/uninstall.js.map +1 -1
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +0 -3
- package/dist/config.js.map +1 -1
- package/dist/context/index.d.ts +3 -5
- package/dist/context/index.d.ts.map +1 -1
- package/dist/context/index.js +497 -46
- package/dist/context/index.js.map +1 -1
- package/dist/db/migrations.d.ts +1 -1
- package/dist/db/migrations.d.ts.map +1 -1
- package/dist/db/migrations.js +10 -1
- package/dist/db/migrations.js.map +1 -1
- package/dist/db/queries.d.ts +53 -0
- package/dist/db/queries.d.ts.map +1 -1
- package/dist/db/queries.js +244 -24
- package/dist/db/queries.js.map +1 -1
- package/dist/db/schema.sql +1 -16
- package/dist/errors.d.ts +1 -1
- package/dist/errors.d.ts.map +1 -1
- package/dist/errors.js +1 -7
- package/dist/errors.js.map +1 -1
- package/dist/extraction/dfm-extractor.d.ts +31 -0
- package/dist/extraction/dfm-extractor.d.ts.map +1 -0
- package/dist/extraction/dfm-extractor.js +151 -0
- package/dist/extraction/dfm-extractor.js.map +1 -0
- package/dist/extraction/grammars.d.ts +9 -1
- package/dist/extraction/grammars.d.ts.map +1 -1
- package/dist/extraction/grammars.js +34 -2
- package/dist/extraction/grammars.js.map +1 -1
- package/dist/extraction/index.d.ts +7 -1
- package/dist/extraction/index.d.ts.map +1 -1
- package/dist/extraction/index.js +373 -29
- package/dist/extraction/index.js.map +1 -1
- package/dist/extraction/languages/c-cpp.d.ts +4 -0
- package/dist/extraction/languages/c-cpp.d.ts.map +1 -0
- package/dist/extraction/languages/c-cpp.js +126 -0
- package/dist/extraction/languages/c-cpp.js.map +1 -0
- package/dist/extraction/languages/csharp.d.ts +3 -0
- package/dist/extraction/languages/csharp.d.ts.map +1 -0
- package/dist/extraction/languages/csharp.js +72 -0
- package/dist/extraction/languages/csharp.js.map +1 -0
- package/dist/extraction/languages/dart.d.ts +3 -0
- package/dist/extraction/languages/dart.d.ts.map +1 -0
- package/dist/extraction/languages/dart.js +192 -0
- package/dist/extraction/languages/dart.js.map +1 -0
- package/dist/extraction/languages/go.d.ts +3 -0
- package/dist/extraction/languages/go.d.ts.map +1 -0
- package/dist/extraction/languages/go.js +58 -0
- package/dist/extraction/languages/go.js.map +1 -0
- package/dist/extraction/languages/index.d.ts +10 -0
- package/dist/extraction/languages/index.d.ts.map +1 -0
- package/dist/extraction/languages/index.js +43 -0
- package/dist/extraction/languages/index.js.map +1 -0
- package/dist/extraction/languages/java.d.ts +3 -0
- package/dist/extraction/languages/java.d.ts.map +1 -0
- package/dist/extraction/languages/java.js +64 -0
- package/dist/extraction/languages/java.js.map +1 -0
- package/dist/extraction/languages/javascript.d.ts +3 -0
- package/dist/extraction/languages/javascript.d.ts.map +1 -0
- package/dist/extraction/languages/javascript.js +90 -0
- package/dist/extraction/languages/javascript.js.map +1 -0
- package/dist/extraction/languages/kotlin.d.ts +3 -0
- package/dist/extraction/languages/kotlin.d.ts.map +1 -0
- package/dist/extraction/languages/kotlin.js +253 -0
- package/dist/extraction/languages/kotlin.js.map +1 -0
- package/dist/extraction/languages/pascal.d.ts +3 -0
- package/dist/extraction/languages/pascal.d.ts.map +1 -0
- package/dist/extraction/languages/pascal.js +66 -0
- package/dist/extraction/languages/pascal.js.map +1 -0
- package/dist/extraction/languages/php.d.ts +3 -0
- package/dist/extraction/languages/php.d.ts.map +1 -0
- package/dist/extraction/languages/php.js +107 -0
- package/dist/extraction/languages/php.js.map +1 -0
- package/dist/extraction/languages/python.d.ts +3 -0
- package/dist/extraction/languages/python.d.ts.map +1 -0
- package/dist/extraction/languages/python.js +56 -0
- package/dist/extraction/languages/python.js.map +1 -0
- package/dist/extraction/languages/ruby.d.ts +3 -0
- package/dist/extraction/languages/ruby.d.ts.map +1 -0
- package/dist/extraction/languages/ruby.js +114 -0
- package/dist/extraction/languages/ruby.js.map +1 -0
- package/dist/extraction/languages/rust.d.ts +3 -0
- package/dist/extraction/languages/rust.d.ts.map +1 -0
- package/dist/extraction/languages/rust.js +109 -0
- package/dist/extraction/languages/rust.js.map +1 -0
- package/dist/extraction/languages/swift.d.ts +3 -0
- package/dist/extraction/languages/swift.d.ts.map +1 -0
- package/dist/extraction/languages/swift.js +91 -0
- package/dist/extraction/languages/swift.js.map +1 -0
- package/dist/extraction/languages/typescript.d.ts +3 -0
- package/dist/extraction/languages/typescript.d.ts.map +1 -0
- package/dist/extraction/languages/typescript.js +129 -0
- package/dist/extraction/languages/typescript.js.map +1 -0
- package/dist/extraction/liquid-extractor.d.ts +52 -0
- package/dist/extraction/liquid-extractor.d.ts.map +1 -0
- package/dist/extraction/liquid-extractor.js +313 -0
- package/dist/extraction/liquid-extractor.js.map +1 -0
- package/dist/extraction/parse-worker.d.ts +8 -0
- package/dist/extraction/parse-worker.d.ts.map +1 -0
- package/dist/extraction/parse-worker.js +57 -0
- package/dist/extraction/parse-worker.js.map +1 -0
- package/dist/extraction/svelte-extractor.d.ts +47 -0
- package/dist/extraction/svelte-extractor.d.ts.map +1 -0
- package/dist/extraction/svelte-extractor.js +230 -0
- package/dist/extraction/svelte-extractor.js.map +1 -0
- package/dist/extraction/tree-sitter-helpers.d.ts +28 -0
- package/dist/extraction/tree-sitter-helpers.d.ts.map +1 -0
- package/dist/extraction/tree-sitter-helpers.js +103 -0
- package/dist/extraction/tree-sitter-helpers.js.map +1 -0
- package/dist/extraction/tree-sitter-types.d.ts +179 -0
- package/dist/extraction/tree-sitter-types.d.ts.map +1 -0
- package/dist/extraction/tree-sitter-types.js +10 -0
- package/dist/extraction/tree-sitter-types.js.map +1 -0
- package/dist/extraction/tree-sitter.d.ts +67 -125
- package/dist/extraction/tree-sitter.d.ts.map +1 -1
- package/dist/extraction/tree-sitter.js +1052 -1860
- package/dist/extraction/tree-sitter.js.map +1 -1
- package/dist/graph/traversal.d.ts.map +1 -1
- package/dist/graph/traversal.js +20 -2
- package/dist/graph/traversal.js.map +1 -1
- package/dist/index.d.ts +29 -53
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +88 -117
- package/dist/index.js.map +1 -1
- package/dist/installer/claude-md-template.d.ts +1 -1
- package/dist/installer/claude-md-template.d.ts.map +1 -1
- package/dist/installer/claude-md-template.js +15 -15
- package/dist/installer/config-writer.d.ts +2 -13
- package/dist/installer/config-writer.d.ts.map +1 -1
- package/dist/installer/config-writer.js +4 -87
- package/dist/installer/config-writer.js.map +1 -1
- package/dist/installer/index.d.ts +3 -4
- package/dist/installer/index.d.ts.map +1 -1
- package/dist/installer/index.js +118 -127
- package/dist/installer/index.js.map +1 -1
- package/dist/mcp/index.d.ts +5 -0
- package/dist/mcp/index.d.ts.map +1 -1
- package/dist/mcp/index.js +25 -4
- package/dist/mcp/index.js.map +1 -1
- package/dist/mcp/tools.d.ts +33 -0
- package/dist/mcp/tools.d.ts.map +1 -1
- package/dist/mcp/tools.js +405 -26
- package/dist/mcp/tools.js.map +1 -1
- package/dist/mcp/transport.d.ts.map +1 -1
- package/dist/mcp/transport.js +0 -2
- package/dist/mcp/transport.js.map +1 -1
- package/dist/resolution/frameworks/csharp.js +29 -84
- package/dist/resolution/frameworks/csharp.js.map +1 -1
- package/dist/resolution/frameworks/express.js +44 -48
- package/dist/resolution/frameworks/express.js.map +1 -1
- package/dist/resolution/frameworks/go.js +34 -70
- package/dist/resolution/frameworks/go.js.map +1 -1
- package/dist/resolution/frameworks/java.js +29 -87
- package/dist/resolution/frameworks/java.js.map +1 -1
- package/dist/resolution/frameworks/laravel.js +6 -6
- package/dist/resolution/frameworks/laravel.js.map +1 -1
- package/dist/resolution/frameworks/python.js +33 -98
- package/dist/resolution/frameworks/python.js.map +1 -1
- package/dist/resolution/frameworks/react.js +53 -76
- package/dist/resolution/frameworks/react.js.map +1 -1
- package/dist/resolution/frameworks/ruby.js +12 -24
- package/dist/resolution/frameworks/ruby.js.map +1 -1
- package/dist/resolution/frameworks/rust.js +26 -66
- package/dist/resolution/frameworks/rust.js.map +1 -1
- package/dist/resolution/frameworks/svelte.js +11 -31
- package/dist/resolution/frameworks/svelte.js.map +1 -1
- package/dist/resolution/frameworks/swift.js +42 -160
- package/dist/resolution/frameworks/swift.js.map +1 -1
- package/dist/resolution/index.d.ts +19 -6
- package/dist/resolution/index.d.ts.map +1 -1
- package/dist/resolution/index.js +300 -144
- package/dist/resolution/index.js.map +1 -1
- package/dist/resolution/name-matcher.d.ts +5 -0
- package/dist/resolution/name-matcher.d.ts.map +1 -1
- package/dist/resolution/name-matcher.js +148 -8
- package/dist/resolution/name-matcher.js.map +1 -1
- package/dist/resolution/types.d.ts +1 -1
- package/dist/resolution/types.d.ts.map +1 -1
- package/dist/search/query-utils.d.ts +26 -1
- package/dist/search/query-utils.d.ts.map +1 -1
- package/dist/search/query-utils.js +209 -9
- package/dist/search/query-utils.js.map +1 -1
- package/dist/sync/index.d.ts +2 -4
- package/dist/sync/index.d.ts.map +1 -1
- package/dist/sync/index.js +4 -3
- package/dist/sync/index.js.map +1 -1
- package/dist/sync/watcher.d.ts +81 -0
- package/dist/sync/watcher.d.ts.map +1 -0
- package/dist/sync/watcher.js +184 -0
- package/dist/sync/watcher.js.map +1 -0
- package/dist/types.d.ts +2 -2
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js +0 -1
- package/dist/types.js.map +1 -1
- package/dist/ui/shimmer-progress.d.ts +11 -0
- package/dist/ui/shimmer-progress.d.ts.map +1 -0
- package/dist/ui/shimmer-progress.js +90 -0
- package/dist/ui/shimmer-progress.js.map +1 -0
- package/dist/ui/shimmer-worker.d.ts +2 -0
- package/dist/ui/shimmer-worker.d.ts.map +1 -0
- package/dist/ui/shimmer-worker.js +112 -0
- package/dist/ui/shimmer-worker.js.map +1 -0
- package/dist/ui/types.d.ts +17 -0
- package/dist/ui/types.d.ts.map +1 -0
- package/dist/ui/types.js +3 -0
- package/dist/ui/types.js.map +1 -0
- package/dist/vectors/embedder.js +1 -1
- package/dist/vectors/embedder.js.map +1 -1
- package/dist/visualizer/server.d.ts.map +1 -1
- package/dist/visualizer/server.js +3 -11
- package/dist/visualizer/server.js.map +1 -1
- package/package.json +7 -12
- package/scripts/postinstall.js +0 -68
|
@@ -21,7 +21,7 @@ exports.goResolver = {
|
|
|
21
21
|
resolve(ref, context) {
|
|
22
22
|
// Pattern 1: Handler references
|
|
23
23
|
if (ref.referenceName.endsWith('Handler') || ref.referenceName.startsWith('Handle')) {
|
|
24
|
-
const result =
|
|
24
|
+
const result = resolveByNameAndKind(ref.referenceName, 'function', HANDLER_DIRS, context);
|
|
25
25
|
if (result) {
|
|
26
26
|
return {
|
|
27
27
|
original: ref,
|
|
@@ -33,7 +33,7 @@ exports.goResolver = {
|
|
|
33
33
|
}
|
|
34
34
|
// Pattern 2: Service/Repository references
|
|
35
35
|
if (ref.referenceName.endsWith('Service') || ref.referenceName.endsWith('Repository') || ref.referenceName.endsWith('Store')) {
|
|
36
|
-
const result =
|
|
36
|
+
const result = resolveByNameAndKind(ref.referenceName, null, SERVICE_DIRS, context, SERVICE_KINDS);
|
|
37
37
|
if (result) {
|
|
38
38
|
return {
|
|
39
39
|
original: ref,
|
|
@@ -45,7 +45,7 @@ exports.goResolver = {
|
|
|
45
45
|
}
|
|
46
46
|
// Pattern 3: Middleware references
|
|
47
47
|
if (ref.referenceName.endsWith('Middleware') || ref.referenceName.startsWith('Auth') || ref.referenceName.startsWith('Log')) {
|
|
48
|
-
const result =
|
|
48
|
+
const result = resolveByNameAndKind(ref.referenceName, 'function', MIDDLEWARE_DIRS, context);
|
|
49
49
|
if (result) {
|
|
50
50
|
return {
|
|
51
51
|
original: ref,
|
|
@@ -57,7 +57,7 @@ exports.goResolver = {
|
|
|
57
57
|
}
|
|
58
58
|
// Pattern 4: Model/Entity references (typically PascalCase structs)
|
|
59
59
|
if (/^[A-Z][a-zA-Z]+$/.test(ref.referenceName)) {
|
|
60
|
-
const result =
|
|
60
|
+
const result = resolveByNameAndKind(ref.referenceName, 'struct', MODEL_DIRS, context);
|
|
61
61
|
if (result) {
|
|
62
62
|
return {
|
|
63
63
|
original: ref,
|
|
@@ -155,71 +155,35 @@ exports.goResolver = {
|
|
|
155
155
|
return nodes;
|
|
156
156
|
},
|
|
157
157
|
};
|
|
158
|
-
//
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
const nodes = context.getNodesInFile(file);
|
|
189
|
-
const serviceNode = nodes.find((n) => (n.kind === 'struct' || n.kind === 'interface') && n.name === name);
|
|
190
|
-
if (serviceNode) {
|
|
191
|
-
return serviceNode.id;
|
|
192
|
-
}
|
|
193
|
-
}
|
|
194
|
-
}
|
|
195
|
-
return null;
|
|
196
|
-
}
|
|
197
|
-
function resolveMiddleware(name, context) {
|
|
198
|
-
const middlewareDirs = ['middleware', 'middlewares'];
|
|
199
|
-
const allFiles = context.getAllFiles();
|
|
200
|
-
for (const file of allFiles) {
|
|
201
|
-
if (file.endsWith('.go') && middlewareDirs.some((d) => file.includes(`/${d}/`))) {
|
|
202
|
-
const nodes = context.getNodesInFile(file);
|
|
203
|
-
const mwNode = nodes.find((n) => n.kind === 'function' && n.name === name);
|
|
204
|
-
if (mwNode) {
|
|
205
|
-
return mwNode.id;
|
|
206
|
-
}
|
|
207
|
-
}
|
|
208
|
-
}
|
|
209
|
-
return null;
|
|
210
|
-
}
|
|
211
|
-
function resolveModel(name, context) {
|
|
212
|
-
const modelDirs = ['model', 'models', 'entity', 'entities', 'domain', 'pkg'];
|
|
213
|
-
const allFiles = context.getAllFiles();
|
|
214
|
-
for (const file of allFiles) {
|
|
215
|
-
if (file.endsWith('.go') && modelDirs.some((d) => file.includes(`/${d}/`))) {
|
|
216
|
-
const nodes = context.getNodesInFile(file);
|
|
217
|
-
const modelNode = nodes.find((n) => n.kind === 'struct' && n.name === name);
|
|
218
|
-
if (modelNode) {
|
|
219
|
-
return modelNode.id;
|
|
220
|
-
}
|
|
221
|
-
}
|
|
222
|
-
}
|
|
223
|
-
return null;
|
|
158
|
+
// Directory patterns for framework resolution
|
|
159
|
+
const HANDLER_DIRS = ['handler', 'handlers', 'api', 'routes', 'controller', 'controllers'];
|
|
160
|
+
const SERVICE_DIRS = ['service', 'services', 'repository', 'store', 'pkg'];
|
|
161
|
+
const MIDDLEWARE_DIRS = ['middleware', 'middlewares'];
|
|
162
|
+
const MODEL_DIRS = ['model', 'models', 'entity', 'entities', 'domain', 'pkg'];
|
|
163
|
+
const SERVICE_KINDS = new Set(['struct', 'interface']);
|
|
164
|
+
/**
|
|
165
|
+
* Resolve a symbol by name using indexed queries instead of scanning all files.
|
|
166
|
+
* Uses getNodesByName (O(log n) indexed lookup) instead of iterating every file.
|
|
167
|
+
*/
|
|
168
|
+
function resolveByNameAndKind(name, kind, preferredDirs, context, kinds) {
|
|
169
|
+
const candidates = context.getNodesByName(name);
|
|
170
|
+
if (candidates.length === 0)
|
|
171
|
+
return null;
|
|
172
|
+
// Filter by kind
|
|
173
|
+
const kindFiltered = candidates.filter((n) => {
|
|
174
|
+
if (kinds)
|
|
175
|
+
return kinds.has(n.kind);
|
|
176
|
+
if (kind)
|
|
177
|
+
return n.kind === kind;
|
|
178
|
+
return true;
|
|
179
|
+
});
|
|
180
|
+
if (kindFiltered.length === 0)
|
|
181
|
+
return null;
|
|
182
|
+
// Prefer candidates in framework-conventional directories
|
|
183
|
+
const preferred = kindFiltered.filter((n) => preferredDirs.some((d) => n.filePath.includes(`/${d}/`)));
|
|
184
|
+
if (preferred.length > 0)
|
|
185
|
+
return preferred[0].id;
|
|
186
|
+
// Fall back to any match
|
|
187
|
+
return kindFiltered[0].id;
|
|
224
188
|
}
|
|
225
189
|
//# sourceMappingURL=go.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"go.js","sourceRoot":"","sources":["../../../src/resolution/frameworks/go.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAKU,QAAA,UAAU,GAAsB;IAC3C,IAAI,EAAE,IAAI;IAEV,MAAM,CAAC,OAA0B;QAC/B,qCAAqC;QACrC,MAAM,KAAK,GAAG,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACzC,IAAI,KAAK,EAAE,CAAC;YACV,OAAO,IAAI,CAAC;QACd,CAAC;QAED,sBAAsB;QACtB,MAAM,QAAQ,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;QACvC,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;IACjD,CAAC;IAED,OAAO,CAAC,GAAkB,EAAE,OAA0B;QACpD,gCAAgC;QAChC,IAAI,GAAG,CAAC,aAAa,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,GAAG,CAAC,aAAa,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YACpF,MAAM,MAAM,GAAG,
|
|
1
|
+
{"version":3,"file":"go.js","sourceRoot":"","sources":["../../../src/resolution/frameworks/go.ts"],"names":[],"mappings":"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"}
|
|
@@ -41,7 +41,7 @@ exports.springResolver = {
|
|
|
41
41
|
resolve(ref, context) {
|
|
42
42
|
// Pattern 1: Service references (dependency injection)
|
|
43
43
|
if (ref.referenceName.endsWith('Service')) {
|
|
44
|
-
const result =
|
|
44
|
+
const result = resolveByNameAndKind(ref.referenceName, SERVICE_KINDS, SERVICE_DIRS, context);
|
|
45
45
|
if (result) {
|
|
46
46
|
return {
|
|
47
47
|
original: ref,
|
|
@@ -53,7 +53,7 @@ exports.springResolver = {
|
|
|
53
53
|
}
|
|
54
54
|
// Pattern 2: Repository references
|
|
55
55
|
if (ref.referenceName.endsWith('Repository')) {
|
|
56
|
-
const result =
|
|
56
|
+
const result = resolveByNameAndKind(ref.referenceName, SERVICE_KINDS, REPO_DIRS, context);
|
|
57
57
|
if (result) {
|
|
58
58
|
return {
|
|
59
59
|
original: ref,
|
|
@@ -65,7 +65,7 @@ exports.springResolver = {
|
|
|
65
65
|
}
|
|
66
66
|
// Pattern 3: Controller references
|
|
67
67
|
if (ref.referenceName.endsWith('Controller')) {
|
|
68
|
-
const result =
|
|
68
|
+
const result = resolveByNameAndKind(ref.referenceName, CLASS_KINDS, CONTROLLER_DIRS, context);
|
|
69
69
|
if (result) {
|
|
70
70
|
return {
|
|
71
71
|
original: ref,
|
|
@@ -77,7 +77,7 @@ exports.springResolver = {
|
|
|
77
77
|
}
|
|
78
78
|
// Pattern 4: Entity/Model references
|
|
79
79
|
if (/^[A-Z][a-zA-Z]+$/.test(ref.referenceName)) {
|
|
80
|
-
const result =
|
|
80
|
+
const result = resolveByNameAndKind(ref.referenceName, CLASS_KINDS, ENTITY_DIRS, context);
|
|
81
81
|
if (result) {
|
|
82
82
|
return {
|
|
83
83
|
original: ref,
|
|
@@ -89,7 +89,7 @@ exports.springResolver = {
|
|
|
89
89
|
}
|
|
90
90
|
// Pattern 5: Component references
|
|
91
91
|
if (ref.referenceName.endsWith('Component') || ref.referenceName.endsWith('Config')) {
|
|
92
|
-
const result =
|
|
92
|
+
const result = resolveByNameAndKind(ref.referenceName, CLASS_KINDS, COMPONENT_DIRS, context);
|
|
93
93
|
if (result) {
|
|
94
94
|
return {
|
|
95
95
|
original: ref,
|
|
@@ -153,87 +153,29 @@ exports.springResolver = {
|
|
|
153
153
|
return nodes;
|
|
154
154
|
},
|
|
155
155
|
};
|
|
156
|
-
//
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
function resolveRepository(name, context) {
|
|
181
|
-
const allFiles = context.getAllFiles();
|
|
182
|
-
for (const file of allFiles) {
|
|
183
|
-
if (file.endsWith('.java') && (file.includes('/repository/') || file.includes('/repositories/'))) {
|
|
184
|
-
const nodes = context.getNodesInFile(file);
|
|
185
|
-
const repoNode = nodes.find((n) => (n.kind === 'class' || n.kind === 'interface') && n.name === name);
|
|
186
|
-
if (repoNode) {
|
|
187
|
-
return repoNode.id;
|
|
188
|
-
}
|
|
189
|
-
}
|
|
190
|
-
}
|
|
191
|
-
return null;
|
|
192
|
-
}
|
|
193
|
-
function resolveController(name, context) {
|
|
194
|
-
const allFiles = context.getAllFiles();
|
|
195
|
-
for (const file of allFiles) {
|
|
196
|
-
if (file.endsWith('.java') && (file.includes('/controller/') || file.includes('/controllers/'))) {
|
|
197
|
-
const nodes = context.getNodesInFile(file);
|
|
198
|
-
const controllerNode = nodes.find((n) => n.kind === 'class' && n.name === name);
|
|
199
|
-
if (controllerNode) {
|
|
200
|
-
return controllerNode.id;
|
|
201
|
-
}
|
|
202
|
-
}
|
|
203
|
-
}
|
|
204
|
-
return null;
|
|
205
|
-
}
|
|
206
|
-
function resolveEntity(name, context) {
|
|
207
|
-
const allFiles = context.getAllFiles();
|
|
208
|
-
// Check entity/model directories first
|
|
209
|
-
for (const file of allFiles) {
|
|
210
|
-
if (file.endsWith('.java') && (file.includes('/entity/') ||
|
|
211
|
-
file.includes('/entities/') ||
|
|
212
|
-
file.includes('/model/') ||
|
|
213
|
-
file.includes('/models/') ||
|
|
214
|
-
file.includes('/domain/'))) {
|
|
215
|
-
const nodes = context.getNodesInFile(file);
|
|
216
|
-
const entityNode = nodes.find((n) => n.kind === 'class' && n.name === name);
|
|
217
|
-
if (entityNode) {
|
|
218
|
-
return entityNode.id;
|
|
219
|
-
}
|
|
220
|
-
}
|
|
221
|
-
}
|
|
222
|
-
return null;
|
|
223
|
-
}
|
|
224
|
-
function resolveComponent(name, context) {
|
|
225
|
-
const allFiles = context.getAllFiles();
|
|
226
|
-
for (const file of allFiles) {
|
|
227
|
-
if (file.endsWith('.java') && (file.includes('/component/') ||
|
|
228
|
-
file.includes('/components/') ||
|
|
229
|
-
file.includes('/config/'))) {
|
|
230
|
-
const nodes = context.getNodesInFile(file);
|
|
231
|
-
const componentNode = nodes.find((n) => n.kind === 'class' && n.name === name);
|
|
232
|
-
if (componentNode) {
|
|
233
|
-
return componentNode.id;
|
|
234
|
-
}
|
|
235
|
-
}
|
|
236
|
-
}
|
|
237
|
-
return null;
|
|
156
|
+
// Directory patterns
|
|
157
|
+
const SERVICE_DIRS = ['/service/', '/services/'];
|
|
158
|
+
const REPO_DIRS = ['/repository/', '/repositories/'];
|
|
159
|
+
const CONTROLLER_DIRS = ['/controller/', '/controllers/'];
|
|
160
|
+
const ENTITY_DIRS = ['/entity/', '/entities/', '/model/', '/models/', '/domain/'];
|
|
161
|
+
const COMPONENT_DIRS = ['/component/', '/components/', '/config/'];
|
|
162
|
+
const CLASS_KINDS = new Set(['class']);
|
|
163
|
+
const SERVICE_KINDS = new Set(['class', 'interface']);
|
|
164
|
+
/**
|
|
165
|
+
* Resolve a symbol by name using indexed queries instead of scanning all files.
|
|
166
|
+
*/
|
|
167
|
+
function resolveByNameAndKind(name, kinds, preferredDirPatterns, context) {
|
|
168
|
+
const candidates = context.getNodesByName(name);
|
|
169
|
+
if (candidates.length === 0)
|
|
170
|
+
return null;
|
|
171
|
+
const kindFiltered = candidates.filter((n) => kinds.has(n.kind));
|
|
172
|
+
if (kindFiltered.length === 0)
|
|
173
|
+
return null;
|
|
174
|
+
// Prefer candidates in framework-conventional directories
|
|
175
|
+
const preferred = kindFiltered.filter((n) => preferredDirPatterns.some((d) => n.filePath.includes(d)));
|
|
176
|
+
if (preferred.length > 0)
|
|
177
|
+
return preferred[0].id;
|
|
178
|
+
// Fall back to any match
|
|
179
|
+
return kindFiltered[0].id;
|
|
238
180
|
}
|
|
239
181
|
//# sourceMappingURL=java.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"java.js","sourceRoot":"","sources":["../../../src/resolution/frameworks/java.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAKU,QAAA,cAAc,GAAsB;IAC/C,IAAI,EAAE,QAAQ;IAEd,MAAM,CAAC,OAA0B;QAC/B,gCAAgC;QAChC,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAC3C,IAAI,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC,EAAE,CAAC;YACrF,OAAO,IAAI,CAAC;QACd,CAAC;QAED,qCAAqC;QACrC,MAAM,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;QACrD,IAAI,WAAW,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,WAAW,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC,EAAE,CAAC;YACpG,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,cAAc,GAAG,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC;QAC5D,IAAI,cAAc,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,cAAc,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC,EAAE,CAAC;YAC7G,OAAO,IAAI,CAAC;QACd,CAAC;QAED,6CAA6C;QAC7C,MAAM,QAAQ,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;QACvC,KAAK,MAAM,IAAI,IAAI,QAAQ,EAAE,CAAC;YAC5B,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC3B,MAAM,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;gBACvC,IAAI,OAAO,IAAI,CACb,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAAC;oBAC1C,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAC;oBACnC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC;oBAC5B,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,CAChC,EAAE,CAAC;oBACF,OAAO,IAAI,CAAC;gBACd,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,CAAC,GAAkB,EAAE,OAA0B;QACpD,uDAAuD;QACvD,IAAI,GAAG,CAAC,aAAa,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;YAC1C,MAAM,MAAM,GAAG,
|
|
1
|
+
{"version":3,"file":"java.js","sourceRoot":"","sources":["../../../src/resolution/frameworks/java.ts"],"names":[],"mappings":"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"}
|
|
@@ -182,12 +182,12 @@ function resolveControllerMethod(controller, method, context) {
|
|
|
182
182
|
return methodNode.id;
|
|
183
183
|
}
|
|
184
184
|
}
|
|
185
|
-
// Try
|
|
186
|
-
const
|
|
187
|
-
for (const
|
|
188
|
-
if (
|
|
189
|
-
const
|
|
190
|
-
const methodNode =
|
|
185
|
+
// Try name-based lookup for namespaced controllers
|
|
186
|
+
const controllerCandidates = context.getNodesByName(controller);
|
|
187
|
+
for (const ctrl of controllerCandidates) {
|
|
188
|
+
if (ctrl.kind === 'class' && ctrl.filePath.includes('Controllers')) {
|
|
189
|
+
const nodesInFile = context.getNodesInFile(ctrl.filePath);
|
|
190
|
+
const methodNode = nodesInFile.find((n) => n.kind === 'method' && n.name === method);
|
|
191
191
|
if (methodNode) {
|
|
192
192
|
return methodNode.id;
|
|
193
193
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"laravel.js","sourceRoot":"","sources":["../../../src/resolution/frameworks/laravel.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"laravel.js","sourceRoot":"","sources":["../../../src/resolution/frameworks/laravel.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,7 +28,7 @@ exports.djangoResolver = {
|
|
|
28
28
|
resolve(ref, context) {
|
|
29
29
|
// Pattern 1: Model references
|
|
30
30
|
if (ref.referenceName.endsWith('Model') || /^[A-Z][a-z]+$/.test(ref.referenceName)) {
|
|
31
|
-
const result =
|
|
31
|
+
const result = resolveByNameAndKind(ref.referenceName, CLASS_KINDS, MODEL_DIRS, context);
|
|
32
32
|
if (result) {
|
|
33
33
|
return {
|
|
34
34
|
original: ref,
|
|
@@ -40,7 +40,7 @@ exports.djangoResolver = {
|
|
|
40
40
|
}
|
|
41
41
|
// Pattern 2: View references
|
|
42
42
|
if (ref.referenceName.endsWith('View') || ref.referenceName.endsWith('ViewSet')) {
|
|
43
|
-
const result =
|
|
43
|
+
const result = resolveByNameAndKind(ref.referenceName, VIEW_KINDS, VIEW_DIRS, context);
|
|
44
44
|
if (result) {
|
|
45
45
|
return {
|
|
46
46
|
original: ref,
|
|
@@ -52,7 +52,7 @@ exports.djangoResolver = {
|
|
|
52
52
|
}
|
|
53
53
|
// Pattern 3: Form references
|
|
54
54
|
if (ref.referenceName.endsWith('Form')) {
|
|
55
|
-
const result =
|
|
55
|
+
const result = resolveByNameAndKind(ref.referenceName, CLASS_KINDS, FORM_DIRS, context);
|
|
56
56
|
if (result) {
|
|
57
57
|
return {
|
|
58
58
|
original: ref,
|
|
@@ -120,7 +120,7 @@ exports.flaskResolver = {
|
|
|
120
120
|
resolve(ref, context) {
|
|
121
121
|
// Pattern 1: Blueprint references
|
|
122
122
|
if (ref.referenceName.endsWith('_bp') || ref.referenceName.endsWith('_blueprint')) {
|
|
123
|
-
const result =
|
|
123
|
+
const result = resolveByNameAndKind(ref.referenceName, VARIABLE_KINDS, [], context);
|
|
124
124
|
if (result) {
|
|
125
125
|
return {
|
|
126
126
|
original: ref,
|
|
@@ -183,7 +183,7 @@ exports.fastapiResolver = {
|
|
|
183
183
|
resolve(ref, context) {
|
|
184
184
|
// Pattern 1: Router references
|
|
185
185
|
if (ref.referenceName.endsWith('_router') || ref.referenceName === 'router') {
|
|
186
|
-
const result =
|
|
186
|
+
const result = resolveByNameAndKind(ref.referenceName, VARIABLE_KINDS, ROUTER_DIRS, context);
|
|
187
187
|
if (result) {
|
|
188
188
|
return {
|
|
189
189
|
original: ref,
|
|
@@ -195,7 +195,7 @@ exports.fastapiResolver = {
|
|
|
195
195
|
}
|
|
196
196
|
// Pattern 2: Dependency references
|
|
197
197
|
if (ref.referenceName.startsWith('get_') || ref.referenceName.startsWith('Depends')) {
|
|
198
|
-
const result =
|
|
198
|
+
const result = resolveByNameAndKind(ref.referenceName, FUNCTION_KINDS, DEP_DIRS, context);
|
|
199
199
|
if (result) {
|
|
200
200
|
return {
|
|
201
201
|
original: ref,
|
|
@@ -234,98 +234,33 @@ exports.fastapiResolver = {
|
|
|
234
234
|
return nodes;
|
|
235
235
|
},
|
|
236
236
|
};
|
|
237
|
-
//
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
if (viewNode) {
|
|
263
|
-
return viewNode.id;
|
|
264
|
-
}
|
|
265
|
-
}
|
|
266
|
-
}
|
|
267
|
-
}
|
|
268
|
-
return null;
|
|
269
|
-
}
|
|
270
|
-
function resolveForm(name, context) {
|
|
271
|
-
const formDirs = ['forms', 'app/forms', 'src/forms'];
|
|
272
|
-
for (const dir of formDirs) {
|
|
273
|
-
const allFiles = context.getAllFiles();
|
|
274
|
-
for (const file of allFiles) {
|
|
275
|
-
if (file.startsWith(dir) && file.endsWith('.py')) {
|
|
276
|
-
const nodes = context.getNodesInFile(file);
|
|
277
|
-
const formNode = nodes.find((n) => n.kind === 'class' && n.name === name);
|
|
278
|
-
if (formNode) {
|
|
279
|
-
return formNode.id;
|
|
280
|
-
}
|
|
281
|
-
}
|
|
282
|
-
}
|
|
283
|
-
}
|
|
284
|
-
return null;
|
|
285
|
-
}
|
|
286
|
-
function resolveBlueprint(name, context) {
|
|
287
|
-
const allFiles = context.getAllFiles();
|
|
288
|
-
for (const file of allFiles) {
|
|
289
|
-
if (file.endsWith('.py')) {
|
|
290
|
-
const nodes = context.getNodesInFile(file);
|
|
291
|
-
const bpNode = nodes.find((n) => n.kind === 'variable' && n.name === name);
|
|
292
|
-
if (bpNode) {
|
|
293
|
-
return bpNode.id;
|
|
294
|
-
}
|
|
295
|
-
}
|
|
296
|
-
}
|
|
297
|
-
return null;
|
|
298
|
-
}
|
|
299
|
-
function resolveRouter(name, context) {
|
|
300
|
-
const routerDirs = ['routers', 'api', 'routes', 'endpoints'];
|
|
301
|
-
for (const dir of routerDirs) {
|
|
302
|
-
const allFiles = context.getAllFiles();
|
|
303
|
-
for (const file of allFiles) {
|
|
304
|
-
if ((file.startsWith(dir) || file.includes('/routers/')) && file.endsWith('.py')) {
|
|
305
|
-
const nodes = context.getNodesInFile(file);
|
|
306
|
-
const routerNode = nodes.find((n) => n.kind === 'variable' && n.name === name);
|
|
307
|
-
if (routerNode) {
|
|
308
|
-
return routerNode.id;
|
|
309
|
-
}
|
|
310
|
-
}
|
|
311
|
-
}
|
|
312
|
-
}
|
|
313
|
-
return null;
|
|
314
|
-
}
|
|
315
|
-
function resolveDependency(name, context) {
|
|
316
|
-
const depDirs = ['dependencies', 'deps', 'core'];
|
|
317
|
-
for (const dir of depDirs) {
|
|
318
|
-
const allFiles = context.getAllFiles();
|
|
319
|
-
for (const file of allFiles) {
|
|
320
|
-
if ((file.startsWith(dir) || file.includes('/dependencies/')) && file.endsWith('.py')) {
|
|
321
|
-
const nodes = context.getNodesInFile(file);
|
|
322
|
-
const depNode = nodes.find((n) => n.kind === 'function' && n.name === name);
|
|
323
|
-
if (depNode) {
|
|
324
|
-
return depNode.id;
|
|
325
|
-
}
|
|
326
|
-
}
|
|
327
|
-
}
|
|
237
|
+
// Directory patterns
|
|
238
|
+
const MODEL_DIRS = ['models', 'app/models', 'src/models'];
|
|
239
|
+
const VIEW_DIRS = ['views', 'app/views', 'src/views', 'api/views'];
|
|
240
|
+
const FORM_DIRS = ['forms', 'app/forms', 'src/forms'];
|
|
241
|
+
const ROUTER_DIRS = ['/routers/', '/api/', '/routes/', '/endpoints/'];
|
|
242
|
+
const DEP_DIRS = ['/dependencies/', '/deps/', '/core/'];
|
|
243
|
+
const CLASS_KINDS = new Set(['class']);
|
|
244
|
+
const VIEW_KINDS = new Set(['class', 'function']);
|
|
245
|
+
const VARIABLE_KINDS = new Set(['variable']);
|
|
246
|
+
const FUNCTION_KINDS = new Set(['function']);
|
|
247
|
+
/**
|
|
248
|
+
* Resolve a symbol by name using indexed queries instead of scanning all files.
|
|
249
|
+
*/
|
|
250
|
+
function resolveByNameAndKind(name, kinds, preferredDirPatterns, context) {
|
|
251
|
+
const candidates = context.getNodesByName(name);
|
|
252
|
+
if (candidates.length === 0)
|
|
253
|
+
return null;
|
|
254
|
+
const kindFiltered = candidates.filter((n) => kinds.has(n.kind));
|
|
255
|
+
if (kindFiltered.length === 0)
|
|
256
|
+
return null;
|
|
257
|
+
// Prefer candidates in framework-conventional directories
|
|
258
|
+
if (preferredDirPatterns.length > 0) {
|
|
259
|
+
const preferred = kindFiltered.filter((n) => preferredDirPatterns.some((d) => n.filePath.includes(d)));
|
|
260
|
+
if (preferred.length > 0)
|
|
261
|
+
return preferred[0].id;
|
|
328
262
|
}
|
|
329
|
-
|
|
263
|
+
// Fall back to any match
|
|
264
|
+
return kindFiltered[0].id;
|
|
330
265
|
}
|
|
331
266
|
//# sourceMappingURL=python.js.map
|