Merge pull request #245 from Jaseci-Labs/recursive_imports

Recursive imports

.pre-commit-config.yaml

@@ -5,7 +5,6 @@ repos:
       - id: check-yaml
         args: [--allow-multiple-documents]
       - id: check-json
-      - id: end-of-file-fixer
       - id: trailing-whitespace
   - repo: https://github.com/psf/black
     rev: 22.3.0

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 ### Updates
 
+- Improvement: import now works recursively through chain of files
 - Improvement: JSCTL shows token on login
 - Major Feature: JSCTL has persistent log in sessions, and can logout
 - Improvement: `*` and `&` precedence hierarch locations improved.

jaseci_core/jaseci/actions/standard/file.py

@@ -1,5 +1,6 @@
 """Built in actions for Jaseci"""
 from jaseci.actions.live_actions import jaseci_action
+import os
 import json
 
 
@@ -40,3 +41,13 @@ def dump_json(fn: str, obj, indent: int = None):
     """Standard built in for dumping json to file from dictionary"""
     with open(fn, "w") as file:
         json.dump(obj, file, indent=indent)
+
+
+@jaseci_action()
+def delete(fn: str):
+    """Standard built in for deleting a file"""
+    if os.path.exists(fn):
+        os.remove(fn)
+        return True
+    else:
+        return False

jaseci_core/jaseci/actions/tests/std_test_code.py

@@ -20,6 +20,7 @@
         file.append_str(fn, c);
         c=file.load_str(fn);
         report c;
+        file.delete(fn);
     }
     """
 

jaseci_core/jaseci/jac/interpreter/sentinel_interp.py

@@ -17,7 +17,7 @@ class sentinel_interp(interp):
 
     def run_start(self, jac_ast):
         """
-        start: ver_label? element+ EOF;
+        start: ver_label? element* EOF;
         """
         kid = self.set_cur_ast(jac_ast)
         if kid[0].name == "ver_label":

jaseci_core/jaseci/jac/ir/ast.py

@@ -38,6 +38,7 @@ def __init__(
         self._start_rule = start_rule
         self.mod_name = mod_name if mod_name is not None else "@default"
         self._mod_dir = mod_dir
+        self._keep = False
         self.line = 0
         self.column = 0
         self.kid = []
@@ -159,9 +160,12 @@ def run_import_module(self, jac_ast):
                     filter(lambda x: x.name == "element", parsed_ast.kid)
                 )
                 if kid[2].name == "STAR_MUL":
-                    return import_elements
+                    ret = import_elements
                 else:
-                    return self.run_import_items(kid[2], import_elements)
+                    ret = self.run_import_items(kid[2], import_elements)
+                for i in ret:
+                    i._keep = True
+                return ret
             else:
                 return []
 
@@ -176,13 +180,17 @@ def run_import_items(self, jac_ast, import_elements):
             """
             kid = jac_ast.kid
             ret_elements = list(
-                filter(lambda x: x.kid[0].kid[0].name == kid[0].name, import_elements)
+                filter(
+                    lambda x: x._keep or x.kid[0].kid[0].name == kid[0].name,
+                    import_elements,
+                )
             )
             if kid[1].name == "import_names":
                 import_names = self.run_import_names(kid[1])
                 ret_elements = list(
                     filter(
-                        lambda x: x.kid[0].kid[1].token_text() in import_names,
+                        lambda x: x._keep
+                        or x.kid[0].kid[1].token_text() in import_names,
                         ret_elements,
                     )
                 )
@@ -192,6 +200,7 @@ def run_import_items(self, jac_ast, import_elements):
                         + "Module name not found!"
                     )
                     self.tree_root._parse_errors.append(err)
+
             if kid[-1].name == "import_items":
                 return ret_elements + self.run_import_items(kid[-1], import_elements)
 

jaseci_core/jaseci/jsctl/tests/base5.jac

@@ -0,0 +1,6 @@
+import {walker::gen} with 'indirect1.jac';
+
+walker init {
+    spawn here walker::gen;
+    report -->[0].details['name'];
+}

jaseci_core/jaseci/jsctl/tests/indirect1.jac

@@ -0,0 +1,5 @@
+import {node::plain} with 'indirect2.jac';
+
+walker gen {
+    spawn here --> node::plain;
+}

jaseci_core/jaseci/jsctl/tests/indirect2.jac

@@ -0,0 +1 @@
+node plain;

jaseci_core/jaseci/jsctl/tests/test_jsctl.py

@@ -223,6 +223,15 @@ def test_jsctl_import_globals(self):
         r = self.call_cast("walker run init")
         self.assertEqual(len(r["report"]), 8)
 
+    def test_jsctl_import_recursive(self):
+        self.call(
+            "sentinel register "
+            "jaseci/jsctl/tests/base5.jac -code_dir jaseci/jsctl/tests/ "
+            "-set_active true"
+        )
+        r = self.call_cast("walker run init")
+        self.assertEqual(r["report"][0], "plain")
+
     def test_jsctl_run_tests(self):
         self.call("sentinel register " "jaseci/jsctl/tests/teststest.jac")
         r = self.call_split("sentinel test")

jaseci_core/setup.py

@@ -2,7 +2,7 @@
 
 setup(
     name="jaseci",
-    version="1.3.3.14",
+    version="1.3.3.15",
     packages=find_packages(include=["jaseci", "jaseci.*"]),
     install_requires=[
         "click>=8.1.0,<8.2.0",

jaseci_kit/setup.py

@@ -2,7 +2,7 @@
 
 setup(
     name="jaseci_kit",
-    version="1.3.3.14",
+    version="1.3.3.15",
     packages=find_packages(include=["jaseci_kit", "jaseci_kit.*"]),
     install_requires=[
         "jaseci",

jaseci_serv/setup.py

@@ -3,7 +3,7 @@
 
 setup(
     name="jaseci_serv",
-    version="1.3.3.14",
+    version="1.3.3.15",
     packages=find_packages(include=["jaseci_serv", "jaseci_serv.*"]),
     install_requires=[
         "jaseci",