Skip to content

armgit / Ix

Public Imported from GitHub
0

Understand any codebase instantly. System intelligence for codebases, built for humans and AI.

refactor: normalize all parser DEFINES edges to CONTAINS

riley0227f58f24a72043
diff --git a/ix-cli/src/cli/commands/contains.ts b/ix-cli/src/cli/commands/contains.ts
index 22cd6461..50f4e937 100644
--- a/ix-cli/src/cli/commands/contains.ts
+++ b/ix-cli/src/cli/commands/contains.ts
@@ -15,7 +15,7 @@ export function registerContainsCommand(program: Command): void {
const target = await resolveEntity(client, symbol, ["class", "object", "trait", "interface", "module", "file"], opts);
if (!target) return;
printResolved(target);
- const result = await client.expand(target.id, { direction: "out", predicates: ["CONTAINS", "DEFINES"] });
+ const result = await client.expand(target.id, { direction: "out", predicates: ["CONTAINS"] });
formatEdgeResults(result.nodes, "contains", target.name, opts.format, target);
});
}
diff --git a/ix-cli/src/cli/commands/explain.ts b/ix-cli/src/cli/commands/explain.ts
index be860a1a..173f85d6 100644
--- a/ix-cli/src/cli/commands/explain.ts
+++ b/ix-cli/src/cli/commands/explain.ts
@@ -24,7 +24,7 @@ export function registerExplainCommand(program: Command): void {
const edges = (details.edges ?? []) as any[];
const containsEdge = edges.find((e: any) =>
- (e.predicate === "CONTAINS" || e.predicate === "DEFINES") && e.dst === target.id
+ e.predicate === "CONTAINS" && e.dst === target.id
);
let container: any = undefined;
if (containsEdge) {
@@ -36,7 +36,7 @@ export function registerExplainCommand(program: Command): void {
const callEdges = edges.filter((e: any) => e.predicate === "CALLS");
const containedEdges = edges.filter((e: any) =>
- (e.predicate === "CONTAINS" || e.predicate === "DEFINES") && e.src === target.id
+ e.predicate === "CONTAINS" && e.src === target.id
);
const node = details.node as any;
diff --git a/memory-layer/src/main/scala/ix/memory/ingestion/parsers/ConfigParser.scala b/memory-layer/src/main/scala/ix/memory/ingestion/parsers/ConfigParser.scala
index 5978f604..bd396ed7 100644
--- a/memory-layer/src/main/scala/ix/memory/ingestion/parsers/ConfigParser.scala
+++ b/memory-layer/src/main/scala/ix/memory/ingestion/parsers/ConfigParser.scala
@@ -63,7 +63,7 @@ class ConfigParser extends Parser {
}
val relationships = entries.map { case (key, _, _) =>
- ParsedRelationship(fileName, key, "DEFINES")
+ ParsedRelationship(fileName, key, "CONTAINS")
}
ParseResult(
diff --git a/memory-layer/src/main/scala/ix/memory/ingestion/parsers/ScalaParser.scala b/memory-layer/src/main/scala/ix/memory/ingestion/parsers/ScalaParser.scala
index 4bc016ed..75957c84 100644
--- a/memory-layer/src/main/scala/ix/memory/ingestion/parsers/ScalaParser.scala
+++ b/memory-layer/src/main/scala/ix/memory/ingestion/parsers/ScalaParser.scala
@@ -79,7 +79,7 @@ class ScalaParser extends Parser {
lineStart = lineNum,
lineEnd = endLine
)
- relationships = relationships :+ ParsedRelationship(fileName, name, "DEFINES")
+ relationships = relationships :+ ParsedRelationship(fileName, name, "CONTAINS")
typeRanges = typeRanges :+ (name, lineNum, endLine)
true
@@ -97,7 +97,7 @@ class ScalaParser extends Parser {
lineStart = lineNum,
lineEnd = endLine
)
- relationships = relationships :+ ParsedRelationship(fileName, name, "DEFINES")
+ relationships = relationships :+ ParsedRelationship(fileName, name, "CONTAINS")
typeRanges = typeRanges :+ (name, lineNum, endLine)
true
@@ -115,7 +115,7 @@ class ScalaParser extends Parser {
lineStart = lineNum,
lineEnd = endLine
)
- relationships = relationships :+ ParsedRelationship(fileName, name, "DEFINES")
+ relationships = relationships :+ ParsedRelationship(fileName, name, "CONTAINS")
typeRanges = typeRanges :+ (name, lineNum, endLine)
true
@@ -133,7 +133,7 @@ class ScalaParser extends Parser {
lineStart = lineNum,
lineEnd = endLine
)
- relationships = relationships :+ ParsedRelationship(fileName, name, "DEFINES")
+ relationships = relationships :+ ParsedRelationship(fileName, name, "CONTAINS")
typeRanges = typeRanges :+ (name, lineNum, endLine)
true
case None => false
@@ -158,7 +158,7 @@ class ScalaParser extends Parser {
val (kind, edgePredicate, edgeSrc) = enclosing match {
case Some((typeName, _, _)) => (NodeKind.Method, "CONTAINS", typeName)
- case None => (NodeKind.Function, "DEFINES", fileName)
+ case None => (NodeKind.Function, "CONTAINS", fileName)
}
entities = entities :+ ParsedEntity(
diff --git a/memory-layer/src/main/scala/ix/memory/ingestion/parsers/TreeSitterPythonParser.scala b/memory-layer/src/main/scala/ix/memory/ingestion/parsers/TreeSitterPythonParser.scala
index a855be85..b78d81d9 100644
--- a/memory-layer/src/main/scala/ix/memory/ingestion/parsers/TreeSitterPythonParser.scala
+++ b/memory-layer/src/main/scala/ix/memory/ingestion/parsers/TreeSitterPythonParser.scala
@@ -103,8 +103,8 @@ class TreeSitterPythonParser extends Parser {
lineStart = lineNum,
lineEnd = classEnd
)
- // File DEFINES class
- relationships = relationships :+ ParsedRelationship(fileName, className, "DEFINES")
+ // File CONTAINS class
+ relationships = relationships :+ ParsedRelationship(fileName, className, "CONTAINS")
classRanges = classRanges :+ (className, lineNum, classEnd)
}
@@ -130,7 +130,7 @@ class TreeSitterPythonParser extends Parser {
relationships = relationships :+ ParsedRelationship(className, funcName, "CONTAINS")
case None =>
// Top-level function — file defines it
- relationships = relationships :+ ParsedRelationship(fileName, funcName, "DEFINES")
+ relationships = relationships :+ ParsedRelationship(fileName, funcName, "CONTAINS")
}
// Extract function calls within the function body
diff --git a/memory-layer/src/main/scala/ix/memory/ingestion/parsers/TypeScriptParser.scala b/memory-layer/src/main/scala/ix/memory/ingestion/parsers/TypeScriptParser.scala
index 5bc7d3f0..895e3edf 100644
--- a/memory-layer/src/main/scala/ix/memory/ingestion/parsers/TypeScriptParser.scala
+++ b/memory-layer/src/main/scala/ix/memory/ingestion/parsers/TypeScriptParser.scala
@@ -57,7 +57,7 @@ class TypeScriptParser extends Parser {
lineStart = lineNum,
lineEnd = classEnd
)
- relationships = relationships :+ ParsedRelationship(fileName, className, "DEFINES")
+ relationships = relationships :+ ParsedRelationship(fileName, className, "CONTAINS")
relationships = relationships :+ ParsedRelationship(fileName, className, "CONTAINS")
classRanges = classRanges :+ (className, lineNum, classEnd)
@@ -85,7 +85,7 @@ class TypeScriptParser extends Parser {
lineStart = lineNum,
lineEnd = funcEnd
)
- relationships = relationships :+ ParsedRelationship(fileName, funcName, "DEFINES")
+ relationships = relationships :+ ParsedRelationship(fileName, funcName, "CONTAINS")
// Extract calls within this function
val calls = extractCalls(lines, idx, funcEnd, funcName)
@@ -114,7 +114,7 @@ class TypeScriptParser extends Parser {
lineStart = lineNum,
lineEnd = funcEnd
)
- relationships = relationships :+ ParsedRelationship(fileName, funcName, "DEFINES")
+ relationships = relationships :+ ParsedRelationship(fileName, funcName, "CONTAINS")
val callRels = extractCalls(lines, idx, funcEnd, funcName)
relationships = relationships ++ callRels
@@ -168,7 +168,7 @@ class TypeScriptParser extends Parser {
lineStart = lineNum,
lineEnd = ifaceEnd
)
- relationships = relationships :+ ParsedRelationship(fileName, ifaceName, "DEFINES")
+ relationships = relationships :+ ParsedRelationship(fileName, ifaceName, "CONTAINS")
}
}
@@ -186,7 +186,7 @@ class TypeScriptParser extends Parser {
lineStart = lineNum,
lineEnd = lineNum
)
- relationships = relationships :+ ParsedRelationship(fileName, typeName, "DEFINES")
+ relationships = relationships :+ ParsedRelationship(fileName, typeName, "CONTAINS")
}
}