NamespaceNode fixes and renamed classes

Author: LeBoufty

packages/cli/src/languagePlugins/csharp/dependencyResolver/index.test.ts

@@ -1,13 +1,15 @@
 import { describe, expect, test } from "vitest";
 import { File } from "../namespaceResolver";
-import { NamespaceMapper } from "../namespaceMapper";
+import { CSharpNamespaceMapper } from "../namespaceMapper";
 import { getCSharpFilesMap } from "../testFiles";
-import { DependencyResolver } from ".";
+import { CSharpDependencyResolver } from ".";
 
 describe("DependencyResolver", () => {
   const files: Map<string, File> = getCSharpFilesMap();
-  const nsMapper = new NamespaceMapper(files);
-  const depResolver: DependencyResolver = new DependencyResolver(nsMapper);
+  const nsMapper = new CSharpNamespaceMapper(files);
+  const depResolver: CSharpDependencyResolver = new CSharpDependencyResolver(
+    nsMapper,
+  );
   const programcs: File = files.get("Program.cs") as File;
 
   test("Import resolver", () => {

packages/cli/src/languagePlugins/csharp/dependencyResolver/index.ts

@@ -1,20 +1,20 @@
 import Parser from "tree-sitter";
-import { Namespace, ExportedSymbol, File } from "../namespaceResolver";
-import { NamespaceMapper } from "../namespaceMapper";
+import { ExportedSymbol, File } from "../namespaceResolver";
+import { CSharpNamespaceMapper, NamespaceNode } from "../namespaceMapper";
 import { csharpParser } from "../../../helpers/treeSitter/parsers";
 
-export class DependencyResolver {
+export class CSharpDependencyResolver {
   parser: Parser = csharpParser;
-  private nsTree: Namespace;
+  private nsTree: NamespaceNode;
 
-  constructor(nsMapper: NamespaceMapper) {
+  constructor(nsMapper: CSharpNamespaceMapper) {
     this.nsTree = nsMapper.buildNamespaceTree();
   }
 
   #findNamespaceInTree(
-    tree: Namespace,
+    tree: NamespaceNode,
     namespaceName: string,
-  ): Namespace | null {
+  ): NamespaceNode | null {
     if (namespaceName.includes(".")) {
       const parts = namespaceName.split(".");
       const simpleNamespaceName = parts[0];
@@ -33,7 +33,10 @@ export class DependencyResolver {
     );
   }
 
-  #findClassInTree(tree: Namespace, className: string): ExportedSymbol | null {
+  #findClassInTree(
+    tree: NamespaceNode,
+    className: string,
+  ): ExportedSymbol | null {
     // Management of qualified names
     if (className.includes(".")) {
       const parts = className.split(".");
@@ -71,7 +74,7 @@ export class DependencyResolver {
   // Query may have to be updated to include more cases.
   #getCalledClasses(
     node: Parser.SyntaxNode,
-    namespaceTree: Namespace,
+    namespaceTree: NamespaceNode,
   ): ExportedSymbol[] {
     return new Parser.Query(
       this.parser.getLanguage(),

packages/cli/src/languagePlugins/csharp/namespaceMapper/index.test.ts

@@ -1,11 +1,11 @@
 import { describe, test, expect } from "vitest";
-import { NamespaceMapper } from ".";
+import { CSharpNamespaceMapper } from ".";
 import { getCSharpFilesMap } from "../testFiles";
 import { File } from "../namespaceResolver";
 
 describe("NamespaceMapper", () => {
   const files: Map<string, File> = getCSharpFilesMap();
-  const nsMapper = new NamespaceMapper(files);
+  const nsMapper = new CSharpNamespaceMapper(files);
 
   test("should build a namespace tree", () => {
     const nsTree = nsMapper.buildNamespaceTree();

packages/cli/src/languagePlugins/csharp/namespaceMapper/index.ts

@@ -1,6 +1,6 @@
 import Parser from "tree-sitter";
 import {
-  NamespaceResolver,
+  CSharpNamespaceResolver,
   Namespace,
   ExportedSymbol,
 } from "../namespaceResolver";
@@ -11,16 +11,16 @@ export interface NamespaceNode {
   childrenNamespaces: NamespaceNode[];
 }
 
-export class NamespaceMapper {
+export class CSharpNamespaceMapper {
   #files: Map<string, { path: string; rootNode: Parser.SyntaxNode }>;
   #namespaces: Namespace[] = [];
-  #nsResolver: NamespaceResolver;
+  #nsResolver: CSharpNamespaceResolver;
 
   constructor(
     files: Map<string, { path: string; rootNode: Parser.SyntaxNode }>,
   ) {
     this.#files = files;
-    this.#nsResolver = new NamespaceResolver();
+    this.#nsResolver = new CSharpNamespaceResolver();
   }
 
   // Adds a namespace to the final tree.

packages/cli/src/languagePlugins/csharp/namespaceResolver/index.test.ts

@@ -1,10 +1,10 @@
 import { describe, expect, test } from "vitest";
-import { NamespaceResolver, File } from ".";
+import { CSharpNamespaceResolver, File } from ".";
 import { getCSharpFilesMap } from "../testFiles";
 
 describe("NamespaceResolver", () => {
   const files: Map<string, File> = getCSharpFilesMap();
-  const nsResolver: NamespaceResolver = new NamespaceResolver();
+  const nsResolver: CSharpNamespaceResolver = new CSharpNamespaceResolver();
 
   test("2Namespaces1File.cs", () => {
     const file = files.get("2Namespaces1File.cs") as File;

packages/cli/src/languagePlugins/csharp/namespaceResolver/index.ts

@@ -36,7 +36,7 @@ export interface Namespace {
   childrenNamespaces: Namespace[];
 }
 
-export class NamespaceResolver {
+export class CSharpNamespaceResolver {
   parser: Parser = csharpParser;
   #currentFile: string;
   #cache: Map<string, Namespace[]> = new Map<string, Namespace[]>();

packages/cli/src/manifestos/dependencyManifesto/csharp/index.ts

@@ -1,9 +1,9 @@
 import Parser from "tree-sitter";
 import { DependencyManifesto, FileManifesto, SymbolType } from "..";
-import { NamespaceResolver } from "../../../languagePlugins/csharp/namespaceResolver";
-import { DependencyResolver } from "../../../languagePlugins/csharp/dependencyResolver";
+import { CSharpNamespaceResolver } from "../../../languagePlugins/csharp/namespaceResolver";
+import { CSharpDependencyResolver } from "../../../languagePlugins/csharp/dependencyResolver";
 import { csharpParser } from "../../../helpers/treeSitter/parsers";
-import { NamespaceMapper } from "../../../languagePlugins/csharp/namespaceMapper";
+import { CSharpNamespaceMapper } from "../../../languagePlugins/csharp/namespaceMapper";
 
 function generateDependentsForManifesto(
   manifesto: DependencyManifesto,
@@ -51,9 +51,11 @@ function generateDependentsForManifesto(
 export function generateCSharpDependencyManifesto(
   files: Map<string, { path: string; rootNode: Parser.SyntaxNode }>,
 ): DependencyManifesto {
-  const nsResolver: NamespaceResolver = new NamespaceResolver();
-  const nsMapper: NamespaceMapper = new NamespaceMapper(files);
-  const depResolver: DependencyResolver = new DependencyResolver(nsMapper);
+  const nsResolver: CSharpNamespaceResolver = new CSharpNamespaceResolver();
+  const nsMapper: CSharpNamespaceMapper = new CSharpNamespaceMapper(files);
+  const depResolver: CSharpDependencyResolver = new CSharpDependencyResolver(
+    nsMapper,
+  );
   let manifesto: DependencyManifesto = {};
 
   for (const [, f] of files) {