Fixed issues in relating nodes with each other

Author: preeesha

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

@@ -41,7 +41,7 @@ export class TreeNode {
 	}
 
 	getID(): string {
-		return `${this.sourceFileRelativePath}:${this.name}:${this.type}`
+		return `${this.sourceFileRelativePath}:${this.name}`
 	}
 
 	pushUse(...uses: { name: string; type: string }[]) {

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

@@ -59,16 +59,34 @@ export class FileProcessor implements IFileProcessor {
 				.filter((node: any) => node.source.value.startsWith(".")) // Filter out all library/non-relative imports
 			for (const i of imports) {
 				const importName = (i as any).specifiers[0].local.name
+				const relativePath = (i as any).source.value
 
-				const projectPath = sourceFile.getProjectPath()
-				const targetFileAbsolutePath = path
-					.resolve(path.join(sourceFile.getFullPath(), (i as any).source.value))
-					.replace(/\\/g, "/")
-				const targetFileRelativePath = targetFileAbsolutePath.slice(
-					projectPath.length
-				)
+				const currentFileDirectory = sourceFile
+					.getFullPath()
+					.slice(0, sourceFile.getFullPath().lastIndexOf("/"))
+				console.log(currentFileDirectory)
 
-				parsedImports.set(importName, targetFileRelativePath)
+				let finalPath = ""
+				const backSteps = relativePath.match(/\.\.\//g)
+				if (backSteps) {
+					const backStepsCount = backSteps.length
+					const currentFileDirectoryParts = currentFileDirectory.split("/")
+					const finalPathParts = currentFileDirectoryParts.slice(
+						0,
+						currentFileDirectoryParts.length - backStepsCount
+					)
+					finalPath = path
+						.join(...finalPathParts, relativePath)
+						.replaceAll("\\", "/")
+				} else {
+					finalPath = path
+						.join(currentFileDirectory, relativePath)
+						.replaceAll("\\", "/")
+				}
+
+				console.log(relativePath, finalPath)
+
+				parsedImports.set(importName, finalPath)
 			}
 		}
 
@@ -79,7 +97,7 @@ export class FileProcessor implements IFileProcessor {
 				.filter((x) => x.name)
 				.map((x) => {
 					if (parsedImports.has(x.name)) {
-						x.name = `${parsedImports.get(x.name)!}:${x.name}`
+						x.name = `${parsedImports.get(x.name)!}.ts:${x.name}`
 					}
 					return x
 				})

rocket-chatter-ingestion-server/src/use.ts

@@ -1,12 +1,13 @@
+import { insertDataIntoDB } from "./process/ingest/ingest"
 import { Codebase } from "./process/prepare/codebase"
 import { FileProcessor } from "./process/prepare/processor/file"
 
 async function main() {
-	const codebase = new Codebase("./project2", new FileProcessor(), 1)
+	const codebase = new Codebase("./project", new FileProcessor(), 1)
 	await codebase.process()
-	// await codebase.embed()
+	await codebase.embed()
 
-	// insertDataIntoDB(codebase.embeddingsDirPath, 1)
+	insertDataIntoDB(codebase.embeddingsDirPath, 1)
 }
 
 main()