Incluse resolver completed

Author: LeBoufty

src/languagePlugins/php/incluseResolver/index.test.ts

@@ -0,0 +1,35 @@
+import { describe, test } from "@std/testing/bdd";
+import { expect } from "@std/expect";
+import { getPHPFilesMap } from "../testFiles/index.ts";
+import { PHPRegistree } from "../registree/index.ts";
+import { PHPIncluseResolver } from "./index.ts";
+import { INCLUDE, USE } from "../testFiles/constants.ts";
+
+describe("PHP Incluse resolver", () => {
+  const files = getPHPFilesMap();
+  const registree = new PHPRegistree(files);
+  const resolver = new PHPIncluseResolver(registree);
+
+  test("resolves use directives", () => {
+    const imports = resolver.resolveImports(registree.registry.files.get(USE)!);
+    expect(imports.unresolved.namespaces.length).toBe(1);
+    expect(imports.unresolved.namespaces).toContainEqual("I\\Do\\Not\\Exist");
+    expect(imports.resolved.get("f")).toBeDefined(); // nested.php
+    expect(imports.resolved.get("my_function")).toBeDefined(); // learnphp function
+    expect(imports.resolved.get("MyClass")).toBeDefined(); // learnphp class
+    expect(imports.resolved.get("wheels")).toBeDefined(); // leanrphp variable
+  });
+
+  test("resolves include directives", () => {
+    const imports = resolver.resolveImports(
+      registree.registry.files.get(INCLUDE)!,
+    );
+    expect(imports.unresolved.paths.length).toBe(1);
+    expect(imports.unresolved.paths).toContainEqual("unresolved.php");
+    expect(imports.resolved.get("f")).toBeDefined(); // nested.php
+    expect(imports.resolved.get("defined_in_used_file")).toBeDefined(); // use.php
+    expect(imports.resolved.get("my_function")).toBeDefined(); // learnphp function
+    expect(imports.resolved.get("MyClass")).toBeDefined(); // learnphp class
+    expect(imports.resolved.get("wheels")).toBeDefined(); // leanrphp variable
+  });
+});

src/languagePlugins/php/incluseResolver/index.ts

@@ -1,13 +1,9 @@
 import type { PHPRegistree } from "../registree/index.ts";
 import { type PHPFile, type PHPNode, SymbolNode } from "../registree/types.ts";
 import type { PHPImports } from "./types.ts";
-import {
-  PHP_INCLUDE_QUERY,
-  PHP_USE_DETECTION_QUERY,
-  PHP_USE_QUERY,
-} from "./queries.ts";
+import { PHP_INCLUDE_QUERY, PHP_USE_DETECTION_QUERY } from "./queries.ts";
 import type Parser from "tree-sitter";
-import { dirname } from "@std/path";
+import { dirname, join } from "@std/path";
 
 export class PHPIncluseResolver {
   registree: PHPRegistree;
@@ -57,19 +53,17 @@ export class PHPIncluseResolver {
       },
     };
     for (const use of useDirectives) {
-      const useClause = PHP_USE_QUERY.captures(use.node);
-      if (!useClause) continue;
       let name: string | undefined = undefined;
       let node: PHPNode | undefined = undefined;
-      for (const clause of useClause) {
-        if (clause.name === "alias") {
-          name = clause.node.text;
+      for (const clause of use.node.namedChildren) {
+        if (clause.type === "namespace_aliasing_clause") {
+          name = clause.text;
         } else {
-          node = this.registree.tree.findNode(clause.node.text);
+          node = this.registree.tree.findNode(clause.text);
           if (node && !name) {
             name = node.name;
           } else if (!node && !name) {
-            name = clause.node.text;
+            name = clause.text;
           }
         }
       }
@@ -136,11 +130,11 @@ export class PHPIncluseResolver {
           imports.unresolved.paths.push(path);
         }
       } else if (include.name === "includebin") {
-        const filepath = this.#splitBinary(include.node)
+        const fileparts = this.#splitBinary(include.node)
           .map((n) => n.text === "__DIR__" ? dirname(file.path) : n.text)
           .filter((n) => n !== "")
-          .map((n) => n.replace(/['"]/g, ""))
-          .join("/");
+          .map((n) => n.replace(/['"]/g, ""));
+        const filepath = join(fileparts[0], ...fileparts.slice(1));
         const importedfile = this.registree.registry.getFile(
           filepath,
           file.path,

src/languagePlugins/php/incluseResolver/queries.ts

@@ -2,19 +2,11 @@ import Parser from "tree-sitter";
 import { phpParser } from "../../../helpers/treeSitter/parsers.ts";
 
 export const PHP_USE_DETECTION_QUERY = new Parser.Query(
-  phpParser.getLanguage(),
-  `
-  (namespace_use_declaration)
-  `,
-);
-
-export const PHP_USE_QUERY = new Parser.Query(
   phpParser.getLanguage(),
   `
   (namespace_use_declaration
-  (namespace_use_clause
-  . (_) @ns (namespace_aliasing_clause (_) @alias)?
-  ))
+    (namespace_use_clause) @use
+  )
   `,
 );
 

src/languagePlugins/php/registree/types.ts

@@ -44,18 +44,26 @@ export class PHPTree extends NamespaceNode {
   }
 
   findNode(name: string): PHPNode | undefined {
-    const parts = name.split("\\");
-    let current: Map<string, PHPNode> = this.children;
-    for (const part of parts) {
+    if (name === "") {
+      return this;
+    } else {
+      const packageparts = name.split("\\").reverse();
+      let part = packageparts.pop()!;
       if (part === "") {
-        continue;
+        part = packageparts.pop()!;
       }
-      if (!current.has(part)) {
+      let current = this.children.get(part);
+      if (!current) {
         return undefined;
       }
-      current = current.get(part)!.children;
+      while (packageparts.length > 0) {
+        if (!current) {
+          return undefined;
+        }
+        current = current.children.get(packageparts.pop()!);
+      }
+      return current;
     }
-    return current.get(parts[parts.length - 1]);
   }
 
   addNamespaces(namespaces: ExportedNamespace[]) {

src/languagePlugins/php/testFiles/constants.ts

@@ -3,3 +3,5 @@ import { join } from "@std/path";
 
 export const LEARN_PHP = join(phpFilesFolder, "learnphp.php");
 export const NESTED = join(phpFilesFolder, "nested.php");
+export const INCLUDE = join(phpFilesFolder, "include.php");
+export const USE = join(phpFilesFolder, "use.php");

src/languagePlugins/php/testFiles/phpFiles/imports.php

@@ -0,0 +1,6 @@
+<?php
+
+include 'learnphp.php';
+include __DIR__ . '/nested.php';
+include __DIR__ . '/../phpFiles/use.php';
+include 'unresolved.php';

src/languagePlugins/php/testFiles/phpFiles/include.php

@@ -0,0 +1,8 @@
+<?php
+namespace All\My;
+
+$defined_in_used_file = 0;
+
+use All\My\Fellas;
+use My\Namespace;
+use I\Do\Not\Exist;