jaclang 0.8.1__py3-none-any.whl → 0.8.2__py3-none-any.whl

jaclang/runtimelib/importer.py

@@ -5,19 +5,16 @@ from __future__ import annotations
 import importlib
 import importlib.util
 import os
-import site
 import sys
 import types
 from os import getcwd, path
-from typing import Optional, TYPE_CHECKING, Union
+from typing import Optional, Union
 
 from jaclang.runtimelib.machine import JacMachineInterface
 from jaclang.runtimelib.utils import sys_path_context
 from jaclang.utils.helpers import dump_traceback
 from jaclang.utils.log import logging
-
-if TYPE_CHECKING:
-    from jaclang.runtimelib.machine import JacMachine
+from jaclang.utils.module_resolver import get_jac_search_paths
 
 logger = logging.getLogger(__name__)
 
@@ -98,49 +95,8 @@ class ImportReturn:
                     setattr(module, alias, item)
 
         for name, alias in items.items():
-            try:
-                item = getattr(module, name)
-                handle_item_loading(item, alias)
-            except AttributeError:
-                found = False
-                if lang == "jac":
-                    jac_file_path = (
-                        os.path.join(module.__path__[0], f"{name}.jac")
-                        if hasattr(module, "__path__")
-                        else module.__file__
-                    )
-                    if hasattr(module, "__path__"):
-                        init_jac = os.path.join(module.__path__[0], "__init__.jac")
-                        if os.path.isfile(init_jac):
-                            package_name = module.__name__
-                            init_mod = self.importer.jac_machine.loaded_modules.get(
-                                package_name,
-                                self.load_jac_mod_as_item(
-                                    module=module,
-                                    name="__init__",
-                                    jac_file_path=init_jac,
-                                ),
-                            )
-                            # Attach all public names from __init__.jac to the package module
-                            for k, v in init_mod.__dict__.items():
-                                if not k.startswith("_"):
-                                    setattr(module, k, v)
-                            if hasattr(module, name):
-                                item = getattr(module, name)
-                                handle_item_loading(item, alias)
-                                found = True
-                    if not found and jac_file_path and os.path.isfile(jac_file_path):
-                        item = self.load_jac_mod_as_item(
-                            module=module,
-                            name=name,
-                            jac_file_path=jac_file_path,
-                        )
-                        handle_item_loading(item, alias)
-                else:
-                    if hasattr(module, "__path__"):
-                        full_module_name = f"{module.__name__}.{name}"
-                        item = importlib.import_module(full_module_name)
-                        handle_item_loading(item, alias)
+            item = getattr(module, name)
+            handle_item_loading(item, alias)
 
     def load_jac_mod_as_item(
         self,
@@ -149,6 +105,8 @@ class ImportReturn:
         jac_file_path: str,
     ) -> Optional[types.ModuleType]:
         """Load a single .jac file into the specified module component."""
+        from jaclang.runtimelib.machine import JacMachine
+
         try:
             package_name = (
                 f"{module.__name__}.{name}"
@@ -156,7 +114,7 @@ class ImportReturn:
                 else module.__name__
             )
             if isinstance(self.importer, JacImporter):
-                new_module = self.importer.jac_machine.loaded_modules.get(
+                new_module = JacMachine.loaded_modules.get(
                     package_name,
                     self.importer.create_jac_py_module(
                         self.importer.get_sys_mod_name(jac_file_path),
@@ -164,9 +122,7 @@ class ImportReturn:
                         jac_file_path,
                     ),
                 )
-            codeobj = self.importer.jac_machine.program.get_bytecode(
-                full_target=jac_file_path
-            )
+            codeobj = JacMachine.program.get_bytecode(full_target=jac_file_path)
             if not codeobj:
                 raise ImportError(f"No bytecode found for {jac_file_path}")
 
@@ -180,28 +136,18 @@ class ImportReturn:
 class Importer:
     """Abstract base class for all importers."""
 
-    def __init__(self, jac_machine: JacMachine) -> None:
+    def __init__(self) -> None:
         """Initialize the Importer object."""
-        self.jac_machine = jac_machine
         self.result: Optional[ImportReturn] = None
 
     def run_import(self, spec: ImportPathSpec) -> ImportReturn:
         """Run the import process."""
         raise NotImplementedError
 
-    def update_sys(self, module: types.ModuleType, spec: ImportPathSpec) -> None:
-        """Update sys.modules with the newly imported module."""
-        if spec.module_name not in self.jac_machine.loaded_modules:
-            JacMachineInterface.load_module(self.jac_machine, spec.module_name, module)
-
 
 class PythonImporter(Importer):
     """Importer for Python modules."""
 
-    def __init__(self, jac_machine: JacMachine) -> None:
-        """Initialize the PythonImporter object."""
-        self.jac_machine = jac_machine
-
     def run_import(self, spec: ImportPathSpec) -> ImportReturn:
         """Run the import process for Python modules."""
         try:
@@ -273,12 +219,10 @@ class PythonImporter(Importer):
 class JacImporter(Importer):
     """Importer for Jac modules."""
 
-    def __init__(self, jac_machine: JacMachine) -> None:
-        """Initialize the JacImporter object."""
-        self.jac_machine = jac_machine
-
     def get_sys_mod_name(self, full_target: str) -> str:
         """Generate proper module names from file paths."""
+        from jaclang.runtimelib.machine import JacMachine
+
         full_target = os.path.abspath(full_target)
 
         # If the file is located within a site-packages directory, strip that prefix.
@@ -288,7 +232,7 @@ class JacImporter(Importer):
             rel = full_target[sp_index + len("site-packages") :]
             rel = rel.lstrip(os.sep)
         else:
-            rel = path.relpath(full_target, start=self.jac_machine.base_path_dir)
+            rel = path.relpath(full_target, start=JacMachine.base_path_dir)
         rel = os.path.splitext(rel)[0]
         if os.path.basename(rel) == "__init__":
             rel = os.path.dirname(rel)
@@ -304,10 +248,36 @@ class JacImporter(Importer):
         module.__name__ = module_name
         module.__path__ = [full_mod_path]
         module.__file__ = None
-        module.__dict__["__jac_mach__"] = self.jac_machine
 
-        if module_name not in self.jac_machine.loaded_modules:
-            JacMachineInterface.load_module(self.jac_machine, module_name, module)
+        JacMachineInterface.load_module(module_name, module)
+
+        # If the directory contains an __init__.jac, execute it so that the
+        # package namespace is populated immediately (mirrors Python's own
+        # package behaviour with __init__.py).
+        init_jac = os.path.join(full_mod_path, "__init__.jac")
+        if os.path.isfile(init_jac):
+            from jaclang.runtimelib.machine import JacMachine
+
+            # Point the package's __file__ to the init file for introspection
+            module.__file__ = init_jac
+
+            codeobj = JacMachine.program.get_bytecode(full_target=init_jac)
+            if not codeobj:
+                # Compilation should have provided bytecode for __init__.jac.
+                # Raising ImportError here surfaces compile-time issues clearly.
+                raise ImportError(f"No bytecode found for {init_jac}")
+
+            try:
+                # Ensure the directory is on sys.path while executing so that
+                # relative imports inside __init__.jac resolve correctly.
+                with sys_path_context(full_mod_path):
+                    exec(codeobj, module.__dict__)
+            except Exception as e:
+                # Log detailed traceback for easier debugging and re-raise.
+                logger.error(e)
+                logger.error(dump_traceback(e))
+                raise e
+
         return module
 
     def create_jac_py_module(
@@ -317,16 +287,17 @@ class JacImporter(Importer):
         full_target: str,
     ) -> types.ModuleType:
         """Create a module."""
+        from jaclang.runtimelib.machine import JacMachine
+
         module = types.ModuleType(module_name)
         module.__file__ = full_target
         module.__name__ = module_name
-        module.__dict__["__jac_mach__"] = self.jac_machine
         if package_path:
             base_path = full_target.split(package_path.replace(".", path.sep))[0]
             parts = package_path.split(".")
             for i in range(len(parts)):
                 package_name = ".".join(parts[: i + 1])
-                if package_name not in self.jac_machine.loaded_modules:
+                if package_name not in JacMachine.loaded_modules:
                     full_mod_path = path.join(
                         base_path, package_name.replace(".", path.sep)
                     )
@@ -334,36 +305,24 @@ class JacImporter(Importer):
                         module_name=package_name,
                         full_mod_path=full_mod_path,
                     )
-        JacMachineInterface.load_module(self.jac_machine, module_name, module)
+        JacMachineInterface.load_module(module_name, module)
         return module
 
     def run_import(
         self, spec: ImportPathSpec, reload: Optional[bool] = False
     ) -> ImportReturn:
         """Run the import process for Jac modules."""
+        from jaclang.runtimelib.machine import JacMachine
+
         unique_loaded_items: list[types.ModuleType] = []
         module = None
         # Gather all possible search paths
-        jacpaths = os.environ.get("JACPATH", "")
-        search_paths = [spec.caller_dir]
-        for site_dir in site.getsitepackages():
-            if site_dir and site_dir not in search_paths:
-                search_paths.append(site_dir)
-        user_site = getattr(site, "getusersitepackages", None)
-        if user_site:
-            user_dir = site.getusersitepackages()
-            if user_dir and user_dir not in search_paths:
-                search_paths.append(user_dir)
-        if jacpaths:
-            for p in jacpaths.split(":"):
-                p = p.strip()
-                if p and p not in search_paths:
-                    search_paths.append(p)
+        search_paths = get_jac_search_paths(spec.caller_dir)
 
         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))
+            candidate = os.path.join(search_path, *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
@@ -386,7 +345,7 @@ class JacImporter(Importer):
         else:
             module_name = self.get_sys_mod_name(spec.full_target)
 
-        module = self.jac_machine.loaded_modules.get(module_name)
+        module = JacMachine.loaded_modules.get(module_name)
 
         if not module or module.__name__ == "__main__" or reload:
             if os.path.isdir(spec.full_target):
@@ -398,9 +357,7 @@ class JacImporter(Importer):
                     spec.package_path,
                     spec.full_target,
                 )
-                codeobj = self.jac_machine.program.get_bytecode(
-                    full_target=spec.full_target
-                )
+                codeobj = JacMachine.program.get_bytecode(full_target=spec.full_target)
 
                 # Since this is a compile time error, we can safely raise an exception here.
                 if not codeobj: