plain-parser 0.1.2.dev6__py3-none-any.whl → 0.1.3.dev8__py3-none-any.whl

plain_parser/plain_file.py

@@ -715,11 +715,13 @@ def process_required_modules(
     all_required_modules: list[str],
     modules_trace: list[str],
     chain: list[tuple[str, dict]],
+    module_exports: dict[str, list[mistletoe.block_token.token]],
 ) -> list[mistletoe.block_token.token]:
     """Parse and fully validate every required module, deepest first.
 
-    Appends ``(module name, marshalled plain source tree)`` to ``chain`` for each module not already in it
-    and returns the exported definitions of the directly required modules.
+    Appends ``(module name, marshalled plain source tree)`` to ``chain`` for each module not already in it,
+    records each module's exported definitions in ``module_exports``, and returns the exported definitions
+    of the directly required modules.
     """
     exported_definitions = list[mistletoe.block_token.token]()
     for module_name in required_modules:
@@ -727,6 +729,8 @@ def process_required_modules(
             raise PlainSyntaxError(f"Plain syntax error: Circular required module detected: {module_name}.")
 
         if len(all_required_modules) > 0 and module_name == all_required_modules[-1]:
+            # Already processed as an earlier entry; its exports are still visible to this module.
+            exported_definitions.extend(module_exports[module_name])
             continue
 
         code_variables: dict = {}
@@ -750,8 +754,10 @@ def process_required_modules(
                 all_required_modules,
                 modules_trace + [module_name],
                 chain,
+                module_exports,
             )
 
+        own_exported_definitions = list[mistletoe.block_token.token]()
         if EXPORTED_CONCEPTS_DIRECTIVE in plain_file_parse_result.plain_source_obj.metadata:
             exported_concepts = list[str]()
             for concept in plain_file_parse_result.plain_source_obj.metadata[EXPORTED_CONCEPTS_DIRECTIVE]:
@@ -759,11 +765,13 @@ def process_required_modules(
 
             with PlainRenderer() as renderer:
                 for exported_concept in exported_concepts:
-                    exported_definitions.extend(
+                    own_exported_definitions.extend(
                         concept_utils.find_concept_definitions_in_plain_source(
                             exported_concept, plain_file_parse_result.plain_source, renderer
                         )
                     )
+        module_exports[module_name] = own_exported_definitions
+        exported_definitions.extend(own_exported_definitions)
 
         marshalled_plain_source = validate_and_marshall_module(
             plain_file_parse_result, module_name, ancestor_exported_definitions, code_variables, template_dirs
@@ -889,6 +897,7 @@ def _parse_module(
         all_required_modules=[],
         modules_trace=[],
         chain=chain,
+        module_exports={},
     )
 
     marshalled_plain_source = validate_and_marshall_module(

{plain_parser-0.1.2.dev6.dist-info → plain_parser-0.1.3.dev8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: plain-parser
-Version: 0.1.2.dev6
+Version: 0.1.3.dev8
 Summary: Parser for ***plain specification files
 License-Expression: MIT
 License-File: LICENSE

{plain_parser-0.1.2.dev6.dist-info → plain_parser-0.1.3.dev8.dist-info}/RECORD

@@ -5,10 +5,10 @@ plain_parser/exceptions.py,sha256=WcHK5g9K6bsE-ZZBKWl0lZtiMTQ6fif8-zdEx9qjmRw,79
 plain_parser/graph.py,sha256=xZfgzAXoL_hMfqre0Vj4kdvCC8vzfxZgvYptEK9W0Ho,6843
 plain_parser/liquid_nodes.py,sha256=CYmujdPJMK9hLjfFPmnSoKL3Ps4sb-2OOhH-fZUssis,3917
 plain_parser/loaders.py,sha256=o-I7u1NL8hZdTWztqwO7zw072aGxXTBBYSAFDBRG4q0,5136
-plain_parser/plain_file.py,sha256=NnPB9-xp2BIwJIaKmZnjTVjYCZPhlh4RLakR1CV6tUU,39867
+plain_parser/plain_file.py,sha256=7QCIh2PlGZoltilLgNirwjm0fdcvDJIMlk9NfR8ViKI,40431
 plain_parser/plain_spec.py,sha256=Z79Vi8bdRiOiM53QyWS8OLNSlGPrQObSZx11Eh8i8Mk,15308
-plain_parser-0.1.2.dev6.dist-info/METADATA,sha256=GpR9GL3i3D06Wc8fnNPvpExLV8kK8rRy5rkejgxzlto,2647
-plain_parser-0.1.2.dev6.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
-plain_parser-0.1.2.dev6.dist-info/entry_points.txt,sha256=pA31GGUyYrmZSpH1CuSzhjrv8pX5ac5HI5hFop1B4eI,55
-plain_parser-0.1.2.dev6.dist-info/licenses/LICENSE,sha256=QClWKncxgRjNUVOW8Axi7zK9HtsMdJEtUSMA4LEe8fo,1071
-plain_parser-0.1.2.dev6.dist-info/RECORD,,
+plain_parser-0.1.3.dev8.dist-info/METADATA,sha256=NI7l_hkUjP8fFa1qcvg-qICxofIM-EAq3yENX6xOeKQ,2647
+plain_parser-0.1.3.dev8.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
+plain_parser-0.1.3.dev8.dist-info/entry_points.txt,sha256=pA31GGUyYrmZSpH1CuSzhjrv8pX5ac5HI5hFop1B4eI,55
+plain_parser-0.1.3.dev8.dist-info/licenses/LICENSE,sha256=QClWKncxgRjNUVOW8Axi7zK9HtsMdJEtUSMA4LEe8fo,1071
+plain_parser-0.1.3.dev8.dist-info/RECORD,,