codeplain 0.3.11.dev13__py3-none-any.whl → 0.3.11.dev14__py3-none-any.whl

{codeplain-0.3.11.dev13.dist-info → codeplain-0.3.11.dev14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: codeplain
-Version: 0.3.11.dev13
+Version: 0.3.11.dev14
 Summary: Transform plain language specifications into working code
 License-File: LICENSE
 Classifier: Environment :: Console

{codeplain-0.3.11.dev13.dist-info → codeplain-0.3.11.dev14.dist-info}/RECORD

@@ -23,7 +23,7 @@ plain2code_read_config.py,sha256=D5CxnmTRjddupecWvstcUm0kIJWWzq5-Zmk6sU0wbIg,223
 plain2code_state.py,sha256=uePQlC29Pbhm1yXfdCFebONYdy6jo13gTTmXSwC11cQ,3168
 plain2code_telemetry.py,sha256=e4UCAoFklJMDWGQsL50i7nTLiOBy8gs86A0XO4WLgPo,4597
 plain2code_utils.py,sha256=unOxuqSQRpwG8YF6uoQhnZ3ZSTJRIUCPLdJ-1lRZR5M,1534
-plain_file.py,sha256=Kn8m_w6c04_RR-FBjAU05UcLOTDk4zcctpJXghYdZ8I,35757
+plain_file.py,sha256=c7VFzJUXLM3oBFrA9JePDwdxXTR1T8hxWeyGZg4O4wA,36968
 plain_modules.py,sha256=nXlmw0J2rKkuU1Y3A68LVtZ1Ffdc-D5iMjxaXSaSHTQ,25963
 plain_spec.py,sha256=7nb5lLJKHZ3uu9THkSXyJ5brIKkbGW0ooVfRclLdlzA,16062
 system_config.py,sha256=sA8wiPmBMtRsLwSQ40U5pVdLazAafbV-1Z19Yp0HiSQ,5314
@@ -93,7 +93,7 @@ tests/test_plain2code_state.py,sha256=cowPZS9oRbv9J49CE4P3Rc47Q5oQOby4bTf2OlnRlB
 tests/test_plain2code_utils.py,sha256=-W8a7FquMJQ_pTdBoBF1XprzNL2G555QhdtXCy6BDyQ,1237
 tests/test_plain_modules.py,sha256=Fn3FeH-M4exnyFJDZzc9YWaLEfBmiqPH5TpiBT9jgAs,33033
 tests/test_plainfile.py,sha256=wZ_PN4GULPWIpl_AK_r_6jkgtX0Ch8EHmN5IhX7huOE,11027
-tests/test_plainfileparser.py,sha256=l8GfXkVaSzgH74fX45Wp5jX0q3QlO6t_TgDG72dc28o,23867
+tests/test_plainfileparser.py,sha256=lFUnOEOOBOTvmB6b-VQgRRDiM2Ojein7lUzGdsT9pdk,24874
 tests/test_plainspec.py,sha256=ng55E8ajrH2-gPC1p_QDIe_zXplPvoqHJ-d57UWKFTw,3577
 tests/test_prepare_repositories_layout.py,sha256=PhJQLnHfjfjo6CTWoicyEKgL0_GtjwB2OKYAWSBVHtk,14638
 tests/test_requires.py,sha256=6tnHYaKudxN-RiQjSFoi9nHe_x0ze3QF-f-j67zAE74,1250
@@ -116,8 +116,8 @@ tui/spinner.py,sha256=Ro6Gd9Przf-whuHqPRY6HwI0T57yJjyNPbhDbigZKZE,2471
 tui/state_handlers.py,sha256=zbUS_D9eU8qIwVpaxPEp9zL9bpg8gXsWNoUaqg9TLrQ,16664
 tui/styles.css,sha256=kiC7Og_2G1E7owoiZgV95-3_dSeQnsNj3qzaY04xkDg,6727
 tui/widget_helpers.py,sha256=jitm2WHiKj-NVFL-hULxWzckPreRbUTl9OIZLN31-ek,6997
-codeplain-0.3.11.dev13.dist-info/METADATA,sha256=KVfLUeUZa4B9EB2D8iLyUz7RqGDLrDGSNrGCDwp1MIE,7257
-codeplain-0.3.11.dev13.dist-info/WHEEL,sha256=zOwg4jB6zX2kU910N-cMawjivD6tO8NEWvE12je1bVk,87
-codeplain-0.3.11.dev13.dist-info/entry_points.txt,sha256=oDZkBqu9WhtZApb_K6ia8-fn9aojwmAsgnKELceX5T4,46
-codeplain-0.3.11.dev13.dist-info/licenses/LICENSE,sha256=pCeKgQ1mXE5OmNUuKOfOZh1T1vqkeCUxghE7N8qgnzc,11345
-codeplain-0.3.11.dev13.dist-info/RECORD,,
+codeplain-0.3.11.dev14.dist-info/METADATA,sha256=cDHh3AdeuhUTdXAIyBUSa8uztsFrV-9kUrKEt-08SqA,7257
+codeplain-0.3.11.dev14.dist-info/WHEEL,sha256=zOwg4jB6zX2kU910N-cMawjivD6tO8NEWvE12je1bVk,87
+codeplain-0.3.11.dev14.dist-info/entry_points.txt,sha256=oDZkBqu9WhtZApb_K6ia8-fn9aojwmAsgnKELceX5T4,46
+codeplain-0.3.11.dev14.dist-info/licenses/LICENSE,sha256=pCeKgQ1mXE5OmNUuKOfOZh1T1vqkeCUxghE7N8qgnzc,11345
+codeplain-0.3.11.dev14.dist-info/RECORD,,

plain_file.py

@@ -615,15 +615,45 @@ def parse_plain_source(  # noqa: C901
                 f"Plain syntax error: Syntax error at line {nested_acceptance_test_heading.line_number}: {plain_spec.ACCEPTANCE_TEST_HEADING} heading should be nested under specific functional spec."
             )
 
+    defined_concepts = set[str]()
     if plain_source[plain_spec.DEFINITIONS] is not None:
         with PlainRenderer() as renderer:
             for token in plain_source[plain_spec.DEFINITIONS].children:
                 rendered_token = renderer.render(token)
                 new_concepts, _ = concept_utils.extract_concepts_from_definition(rendered_token)
+                defined_concepts.update(new_concepts)
                 for concept in new_concepts:
                     if concept in required_concepts:
                         required_concepts.remove(concept)
 
+    if EXPORTED_CONCEPTS_DIRECTIVE in plain_source_obj.metadata:
+        module_name = modules_trace[-1] if modules_trace else None
+        subject = f"Module '{module_name}'" if module_name else "Module"
+
+        for entry in plain_source_obj.metadata[EXPORTED_CONCEPTS_DIRECTIVE]:
+            exported_concepts, errors = concept_utils.extract_concepts_from_definition(entry)
+            if errors:
+                raise PlainSyntaxError(
+                    f"Plain syntax error: {subject} exports an invalid concept (`{entry}`). "
+                    f"Expected a concept token, e.g. :ConceptName:."
+                )
+
+            for exported_concept in exported_concepts:
+                if exported_concept in concept_utils.DEFAULT_CONCEPTS:
+                    raise PlainSyntaxError(
+                        f"Plain syntax error: {subject} cannot export default concept {exported_concept}. "
+                        f"Only user-defined concepts can be exported."
+                    )
+
+                if exported_concept not in defined_concepts:
+                    message = f"Plain syntax error: {subject} exports undefined concept {exported_concept}."
+                    if REQUIRES_DIRECTIVE in plain_source_obj.metadata:
+                        message += (
+                            " An exported concept must be defined in this module's definitions or in an "
+                            "imported module; a concept inherited through requires cannot be re-exported."
+                        )
+                    raise PlainSyntaxError(message)
+
     required_modules = []
     if REQUIRES_DIRECTIVE in plain_source_obj.metadata:
         required_modules = plain_source_obj.metadata[REQUIRES_DIRECTIVE]
@@ -710,15 +740,7 @@ def process_required_modules(
         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]:
-                if concept in concept_utils.DEFAULT_CONCEPTS:
-                    raise PlainSyntaxError(
-                        f"Plain syntax error: Default concept cannot be exported: {concept}. Only user-defined concepts can be exported."
-                    )
-
-                if isinstance(concept, str):
-                    exported_concepts.extend(concept_utils.extract_concepts_from_definition(concept)[0])
-                else:
-                    raise PlainSyntaxError(f"Plain syntax error: Invalid exported concept: {concept}.")
+                exported_concepts.extend(concept_utils.extract_concepts_from_definition(concept)[0])
 
             with PlainRenderer() as renderer:
                 for exported_concept in exported_concepts:

tests/test_plainfileparser.py

@@ -632,6 +632,11 @@ def test_concept_validation_acceptance_tests(get_test_data_path):
         )
 
 
+def test_concept_validation_cyclic_definitions(get_test_data_path):
+    with pytest.raises(PlainSyntaxError, match="cycles in the concept graph"):
+        plain_file.plain_file_parser("cyclic_definitions.plain", [get_test_data_path("data/plainfileparser")])
+
+
 def test_required_concepts(get_test_data_path):
     plain_file.plain_file_parser(
         "required_concepts_example.plain",
@@ -661,28 +666,36 @@ def test_required_concepts(get_test_data_path):
         )
 
 
-def test_exported_concepts(get_test_data_path):
-    plain_file.plain_file_parser(
+@pytest.mark.parametrize(
+    "fixture",
+    [
         "exported_concepts_example.plain",
-        [get_test_data_path("data/plainfileparser")],
-    )
-
-    plain_file.plain_file_parser(
+        "exported_concepts_imported_exported.plain",
+        "exported_concepts_multiple_per_bullet.plain",
         "exported_concepts_nested_example.plain",
-        [get_test_data_path("data/plainfileparser")],
-    )
-
-    with pytest.raises(PlainSyntaxError):
-        plain_file.plain_file_parser(
-            "exported_concepts_missing_example.plain",
-            [get_test_data_path("data/plainfileparser")],
-        )
-
-    with pytest.raises(PlainSyntaxError):
-        plain_file.plain_file_parser(
-            "exported_concepts_transitive_example.plain",
-            [get_test_data_path("data/plainfileparser")],
-        )
+    ],
+)
+def test_exported_concepts_valid(get_test_data_path, fixture):
+    plain_file.plain_file_parser(fixture, [get_test_data_path("data/plainfileparser")])
+
+
+@pytest.mark.parametrize(
+    ("fixture", "expected_word"),
+    [
+        ("exported_concepts_defaults_exported.plain", "cannot export default concept"),
+        ("exported_concepts_inherited_reexported.plain", "cannot be re-exported"),
+        ("exported_concepts_malformed.plain", "exports an invalid concept"),
+        ("exported_concepts_missing_definition_example.plain", "'exported_concepts_missing_definition' exports"),
+        ("exported_concepts_missing_definition.plain", "exports undefined concept"),
+        ("exported_concepts_multiple_per_bullet_undefined.plain", "exports undefined concept"),
+        ("exported_concepts_no_definitions.plain", "exports undefined concept"),
+        ("exported_concepts_not_declared_example.plain", "not defined"),
+        ("exported_concepts_transitive_example.plain", "not defined"),
+    ],
+)
+def test_exported_concepts_invalid(get_test_data_path, fixture, expected_word):
+    with pytest.raises(PlainSyntaxError, match=expected_word):
+        plain_file.plain_file_parser(fixture, [get_test_data_path("data/plainfileparser")])
 
 
 def test_topological_sort(get_test_data_path):