Updated DBNode in accordance to the new TreeNode

Author: preeesha

rocket-chatter-ingestion-server/src/core/dbNode.ts

@@ -1,44 +1,14 @@
-import { SyntaxKind } from "ts-morph"
-import { Commons } from "./commons"
+import { TreeNode } from "../process/prepare/processor/core/treeNode"
 import { LLM } from "./llm"
-import { TreeNode } from "./treeNode"
 
-const DBNODE_NAMES_MAP: Record<string, string> = {
-	File: "File",
-	FunctionDeclaration: "Function",
-
-	Parameter: "Variable",
-	BindingElement: "Variable",
-	VariableDeclaration: "Variable",
-	VariableStatement: "Variable",
-
-	EnumDeclaration: "Enum",
-	ClassDeclaration: "Class",
-	TypeAliasDeclaration: "Type",
-	InterfaceDeclaration: "Interface",
-	NamespaceDeclaration: "Namespace",
-
-	MethodDeclaration: "Member",
-	PropertyDeclaration: "Member",
-	GetAccessor: "Member",
-	SetAccessor: "Member",
-
-	ImportDeclaration: "Import",
-	ExpressionStatement: "Variable",
-
-	ModuleDeclaration: "Module",
-}
-
-export type DBNodeRelation = "USED_IN" | "IN_FILE" | "CALLED_BY" | "LOCAL_OF"
+export type DBNodeRelation = "IN_FILE" | "USES"
 
 export class DBNode {
 	id: string
 	name: string
-	kind: string
 	type: string
 
 	code: string
-	comments: string[]
 
 	filePath: string
 	relations: { target: string; relation: DBNodeRelation }[]
@@ -52,10 +22,8 @@ export class DBNode {
 	constructor(node: {
 		id: string
 		name: string
-		kind: string
 		type: string
 		code: string
-		comments: string[]
 		filePath: string
 		relations: { target: string; relation: DBNodeRelation }[]
 		nameEmbeddings: number[]
@@ -66,11 +34,9 @@ export class DBNode {
 	}) {
 		this.id = node.id
 		this.name = node.name
-		this.kind = node.kind
 		this.type = node.type
 
 		this.code = node.code
-		this.comments = node.comments
 
 		this.filePath = node.filePath
 		this.relations = node.relations
@@ -83,41 +49,25 @@ export class DBNode {
 	}
 
 	static fromTreeNode(node: TreeNode): DBNode {
-		let name = node.getName()
-		const contents =
-			node.isFile ||
-			[
-				SyntaxKind.SourceFile,
-				SyntaxKind.ModuleDeclaration,
-				SyntaxKind.ModuleDeclaration,
-				SyntaxKind.ClassDeclaration,
-			].includes(node.getKind())
-				? ""
-				: node.node.getText().trim()
-		const comments =
-			node.node.getFullText().match(/\/\*[\s\S]*?\*\/|\/\/.*/g) || []
-
-		const n: DBNode = new DBNode({
+		return new DBNode({
 			id: node.getID(),
-			relations: [],
+			name: node.name,
+			type: node.type,
 
-			nameEmbeddings: [],
-			codeEmbeddings: [],
+			code: node.body,
 
-			name: name,
-			kind: node.getKindName(),
-			type: node.getType().replace(Commons.getProjectPath(), ""),
+			filePath: node.sourceFileRelativePath,
+			relations: node.uses.map((use) => ({
+				target: use.name,
+				relation: "USES",
+			})),
 
-			code: contents,
-			comments: comments.map((c) => c.trim()),
-
-			filePath: node.getFilePath(),
+			nameEmbeddings: [],
+			codeEmbeddings: [],
 
-			isFile: node.isFile,
+			isFile: false,
 			descriptor: "Node",
 		})
-
-		return n
 	}
 
 	static async fillEmbeddings(node: DBNode): Promise<DBNode> {
@@ -128,7 +78,7 @@ export class DBNode {
 	}
 
 	getNodeName(): string {
-		return DBNODE_NAMES_MAP[this.kind] || "Node"
+		return this.name
 	}
 
 	getDBInsertQuery(): string {
@@ -137,10 +87,9 @@ export class DBNode {
          CREATE (n:${this.descriptor} {
             id: $id,
             name: $name,
-            kind: $kind,
             type: $type,
+
             code: $code,
-            comments: $comments,
             filePath: $filePath,
 
             nameEmbeddings: $nameEmbeddings,

rocket-chatter-ingestion-server/src/process/prepare/processor/core/treeNode.ts

@@ -5,7 +5,7 @@ export class TreeNode {
 
 	lineNumber: number
 	columnNumber: number
-	sourceFilePath: string
+	sourceFileRelativePath: string
 
 	uses: {
 		name: string
@@ -25,15 +25,15 @@ export class TreeNode {
 		this.body = body
 		this.lineNumber = lineNumber
 		this.columnNumber = columnNumber
-		this.sourceFilePath = sourceFilePath
+		this.sourceFileRelativePath = sourceFilePath
 	}
 
 	toString() {
 		return `${this.name} (${this.type})`
 	}
 
 	getID(): string {
-		return `${this.sourceFilePath}:${this.name}:${this.type}:${this.lineNumber}:${this.columnNumber}`
+		return `${this.sourceFileRelativePath}:${this.name}:${this.type}:${this.lineNumber}:${this.columnNumber}`
 	}
 
 	pushUse(...uses: { name: string; type: string }[]) {

rocket-chatter-ingestion-server/src/process/prepare/processor/file.ts

@@ -67,7 +67,7 @@ export class FileProcessor implements IFileProcessor {
 
 		// Replace import names with absolute paths
 		for (const treeNode of treeNodes) {
-			treeNode.sourceFilePath = sourceFile.getFullPath()
+			treeNode.sourceFileRelativePath = sourceFile.getFullPath()
 			treeNode.uses = treeNode.uses
 				.filter((x) => x.name)
 				.map((x) => {