Refactor import path resolution and cleanup debug print statements

Author: AshishMahendra

jac/jaclang/compiler/absyntree.py

@@ -1013,11 +1013,9 @@ def resolve_relative_path(self, target_item: Optional[str] = None) -> str:
         target = self.dot_path_str
         if target_item:
             target += f".{target_item}"
-        print("in resolve_relative_path")
         base_path = (
             os.getenv("JACPATH") or os.path.dirname(self.loc.mod_path) or os.getcwd()
         )
-        print("base_path", base_path)
         parts = target.split(".")
         traversal_levels = self.level - 1 if self.level > 0 else 0
         actual_parts = parts[traversal_levels:]
@@ -1029,7 +1027,6 @@ def resolve_relative_path(self, target_item: Optional[str] = None) -> str:
             if os.path.exists(relative_path + ".jac")
             else relative_path
         )
-        print(f"relative: {relative_path}")
         return relative_path
 
     def normalize(self, deep: bool = False) -> bool:

jac/jaclang/compiler/passes/main/import_pass.py

@@ -151,14 +151,12 @@ def import_jac_module(self, node: ast.ModulePath) -> None:
                                 i, self.import_jac_mod_from_file(from_mod_target)
                             )
         else:
-            print("I'm before attach")
             self.attach_mod_to_node(node, self.import_jac_mod_from_file(target))
 
     def import_jac_mod_from_dir(self, target: str) -> ast.Module | None:
         """Import a module from a directory."""
         with_init = os.path.join(target, "__init__.jac")
         if os.path.exists(with_init):
-            print(f"Importing in the dir ")
             return self.import_jac_mod_from_file(with_init)
         else:
             return ast.Module(
@@ -177,11 +175,8 @@ def import_jac_mod_from_file(self, target: str) -> ast.Module | None:
         from jaclang.compiler.compile import jac_file_to_pass
         from jaclang.compiler.passes.main import SubNodeTabPass
 
-        print(f"Importing {target}")
         if not os.path.exists(target):
-            print("I'm before error")
             self.error(f"Could not find module {target}")
-            print("I'm after error")
             return None
         if target in self.import_table:
             return self.import_table[target]

jac/jaclang/runtimelib/importer.py

@@ -316,63 +316,43 @@ def run_import(
         """Run the import process for Jac modules."""
         unique_loaded_items: list[types.ModuleType] = []
         module = None
-
-        # Construct search paths
-        search_paths = []
-        # Process base_path and include all its parent directories
-        if isinstance(spec.base_path, str):
-            base_path = os.path.abspath(spec.base_path)
-            while base_path and base_path not in search_paths:
-                search_paths.append(base_path)
-                base_path = os.path.dirname(base_path)
-        elif isinstance(spec.base_path, list):
-            for path_item in spec.base_path:
-                base_path = os.path.abspath(path_item)
-                while base_path and base_path not in search_paths:
-                    search_paths.append(base_path)
-                    base_path = os.path.dirname(base_path)
-
-        # Add caller_dir
-        search_paths.append(os.path.abspath(spec.caller_dir))
-
-        # Add directories from JACPATH
+        # Gather all possible search paths
         jacpaths = os.environ.get("JACPATH", "")
+        search_paths = [spec.caller_dir]
         if jacpaths:
             for p in jacpaths.split(os.pathsep):
                 p = p.strip()
-                if p and os.path.isdir(p) and os.path.abspath(p) not in search_paths:
-                    search_paths.append(os.path.abspath(p))
-
-        # Locate the module
-        found_path = None
-        target_path_components = spec.target.split(".")
-        for search_path in search_paths:
-            candidate = os.path.join(search_path, *target_path_components)
-            if os.path.isdir(candidate) or os.path.isfile(candidate + ".jac"):
-                found_path = candidate
-                break
-
-        if not found_path:
-            raise ImportError(
-                f"Unable to locate module '{spec.target}' in {search_paths}"
-            )
-
-        spec.full_target = os.path.abspath(found_path)
-        # Determine the module name using `get_sys_mod_name`
+                if p and p not in search_paths:
+                    search_paths.append(p)
+
+            # Attempt to locate the module file or directory
+            found_path = None
+            target_path_components = spec.target.split(".")
+            for search_path in search_paths:
+                candidate = os.path.join(search_path, "/".join(target_path_components))
+                # Check if the candidate is a directory or a .jac file
+                if (os.path.isdir(candidate)) or (os.path.isfile(candidate + ".jac")):
+                    found_path = candidate
+                    break
+
+            # If a suitable path was found, update spec.full_target; otherwise, raise an error
+            if found_path:
+                spec.full_target = os.path.abspath(found_path)
+            else:
+                raise ImportError(
+                    f"Unable to locate module '{spec.target}' in {search_paths}"
+                )
         if os.path.isfile(spec.full_target + ".jac"):
             module_name = self.get_sys_mod_name(spec.full_target + ".jac")
+            module_name = spec.override_name if spec.override_name else module_name
         else:
             module_name = self.get_sys_mod_name(spec.full_target)
 
-        module_name = spec.override_name if spec.override_name else module_name
-
-        # Check if module is already loaded
         module = self.jac_machine.loaded_modules.get(module_name)
 
-        # Load module if not already loaded or if reload is requested
         if not module or module.__name__ == "__main__" or reload:
             if os.path.isdir(spec.full_target):
-                module = self.handle_directory(module_name, spec.full_target)
+                module = self.handle_directory(spec.module_name, spec.full_target)
             else:
                 spec.full_target += ".jac" if spec.language == "jac" else ".py"
                 module = self.create_jac_py_module(
@@ -388,6 +368,7 @@ def run_import(
                     reload=reload if reload else False,
                 )
 
+                # Since this is a compile time error, we can safely raise an exception here.
                 if not codeobj:
                     raise ImportError(f"No bytecode found for {spec.full_target}")