plain-parser 0.1.0__tar.gz → 0.1.1.dev2__tar.gz

{plain_parser-0.1.0 → plain_parser-0.1.1.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: plain-parser
-Version: 0.1.0
+Version: 0.1.1.dev2
 Summary: Parser for ***plain specification files
 License-Expression: MIT
 License-File: LICENSE
@@ -13,6 +13,7 @@ Requires-Dist: mistletoe<2,>=1.6.0
 Requires-Dist: networkx<4,>=3.6.1
 Requires-Dist: python-frontmatter<2,>=1.3.0
 Requires-Dist: python-liquid2<0.5,>=0.4.0
+Requires-Dist: pyyaml<7,>=6
 Provides-Extra: dev
 Requires-Dist: black==26.5.1; extra == 'dev'
 Requires-Dist: flake8==7.3.0; extra == 'dev'
@@ -37,6 +38,20 @@ pip install plain-parser
 
 ## Usage
 
+Validate a module and its `requires` chain from the command line (`<file>: OK` and exit `0` when valid; `Error: …` on stderr and exit `1` otherwise):
+
+```bash
+plain-parser check my_spec.plain [--template-dir DIR] [--config-name NAME]
+```
+
+Modules and `{% include %}` templates are looked up in the `.plain` file's directory, then in `--template-dir`.
+When `--template-dir` is not given, it is read from the `template-dir` key of `config.yaml` (or the file named by
+`--config-name`), found next to the `.plain` file or in the working directory. Finding it in both is a usage error
+(exit `2`). The config file is read even when `--template-dir` is given, so a malformed one fails the run either way.
+Other config keys are ignored.
+
+Or from Python:
+
 ```python
 from plain_parser import plain_file_parser
 

{plain_parser-0.1.0 → plain_parser-0.1.1.dev2}/README.md

@@ -14,6 +14,20 @@ pip install plain-parser
 
 ## Usage
 
+Validate a module and its `requires` chain from the command line (`<file>: OK` and exit `0` when valid; `Error: …` on stderr and exit `1` otherwise):
+
+```bash
+plain-parser check my_spec.plain [--template-dir DIR] [--config-name NAME]
+```
+
+Modules and `{% include %}` templates are looked up in the `.plain` file's directory, then in `--template-dir`.
+When `--template-dir` is not given, it is read from the `template-dir` key of `config.yaml` (or the file named by
+`--config-name`), found next to the `.plain` file or in the working directory. Finding it in both is a usage error
+(exit `2`). The config file is read even when `--template-dir` is given, so a malformed one fails the run either way.
+Other config keys are ignored.
+
+Or from Python:
+
 ```python
 from plain_parser import plain_file_parser
 

{plain_parser-0.1.0 → plain_parser-0.1.1.dev2}/pyproject.toml

@@ -21,6 +21,7 @@ dependencies = [
     "mistletoe>=1.6.0,<2",
     "python-frontmatter>=1.3.0,<2",
     "networkx>=3.6.1,<4",
+    "pyyaml>=6,<7",
 ]
 
 [project.optional-dependencies]
@@ -32,6 +33,9 @@ dev = [
     "mypy==2.3.0",
 ]
 
+[project.scripts]
+plain-parser = "plain_parser.cli:main"
+
 [tool.hatch.version]
 source = "vcs"
 

{plain_parser-0.1.0 → plain_parser-0.1.1.dev2}/src/plain_parser/__init__.py

@@ -6,6 +6,7 @@ from plain_parser.plain_file import (
     get_filename_from_module_name,
     get_module_name_from_filename,
     marshall_plain_source,
+    parse_module_chain,
     parse_plain_file,
     parse_plain_source,
     plain_file_parser,
@@ -19,6 +20,7 @@ __all__ = [
     "get_module_name_from_filename",
     "loaders",
     "marshall_plain_source",
+    "parse_module_chain",
     "parse_plain_file",
     "parse_plain_source",
     "plain_file",

plain_parser-0.1.1.dev2/src/plain_parser/cli.py

@@ -0,0 +1,117 @@
+"""Command-line entry point: ``plain-parser check <file.plain> [--template-dir DIR] [--config-name NAME]``."""
+
+import argparse
+import os
+import sys
+
+import yaml
+
+from plain_parser import loaders, plain_file, plain_spec
+
+DEFAULT_CONFIG_NAME = "config.yaml"
+TEMPLATE_DIR_CONFIG_KEYS = ("template_dir", "template-dir")
+
+
+class AmbiguousConfigFileError(Exception):
+    pass
+
+
+def build_parser() -> argparse.ArgumentParser:
+    parser = argparse.ArgumentParser(prog="plain-parser", description="Tools for ***plain specification files.")
+    subparsers = parser.add_subparsers(dest="command", required=True)
+
+    check_parser = subparsers.add_parser("check", help="Validate a .plain module and its requires chain.")
+    check_parser.add_argument("plain_file", help="Path to the .plain module.")
+    check_parser.add_argument(
+        "--template-dir",
+        help="Directory searched for modules and templates after the .plain file's own directory. "
+        "Overrides the template-dir value of the config file.",
+    )
+    check_parser.add_argument(
+        "--config-name",
+        default=DEFAULT_CONFIG_NAME,
+        help="Name of the config file to read template-dir from. Looked up in the .plain file's directory "
+        "and the current working directory. Defaults to %(default)s.",
+    )
+    return parser
+
+
+def resolve_config_file(config_name: str, plain_file_path: str) -> str | None:
+    """The config file next to the .plain file, else the one in the working directory, else None."""
+    plain_file_dir = os.path.dirname(os.path.abspath(plain_file_path))
+    plain_dir_config = os.path.normpath(os.path.join(plain_file_dir, config_name))
+    cwd_config = os.path.normpath(os.path.join(os.getcwd(), config_name))
+
+    in_plain_dir = os.path.exists(plain_dir_config)
+    in_cwd = os.path.exists(cwd_config)
+    if in_plain_dir and in_cwd and plain_dir_config != cwd_config:
+        raise AmbiguousConfigFileError(
+            f"Config file '{config_name}' was found in two locations:\n"
+            f"  - Plain file directory: {plain_file_dir}\n"
+            f"  - Current working directory: {os.getcwd()}\n"
+            f"Remove the config file from one of these locations to resolve the ambiguity."
+        )
+    if in_plain_dir:
+        return plain_dir_config
+    if in_cwd:
+        return cwd_config
+    return None
+
+
+def template_dir_from_config(config_file: str) -> str | None:
+    """The template-dir value of the config file, resolved against the file's directory. Other keys are ignored."""
+    with open(config_file) as f:
+        config = yaml.safe_load(f) or {}
+
+    for key in TEMPLATE_DIR_CONFIG_KEYS:
+        value = config.get(key)
+        if value:
+            value = os.path.expanduser(str(value))
+            return value if os.path.isabs(value) else os.path.join(os.path.dirname(config_file), value)
+    return None
+
+
+def check(plain_file_path: str, template_dir: str | None) -> None:
+    """Raise if the module, its requires chain, or its linked resources are invalid."""
+    template_dirs = [os.path.dirname(os.path.abspath(plain_file_path))]
+    if template_dir:
+        template_dirs.append(template_dir)
+
+    chain = plain_file.parse_module_chain(os.path.basename(plain_file_path), template_dirs)
+
+    for module_name, plain_source_tree in chain:
+        resources_list: list[dict] = []
+        plain_spec.collect_linked_resources(plain_source_tree, resources_list, None, True)
+        loaders.load_linked_resources(template_dirs, resources_list, module_name)
+
+    _, top_plain_source_tree = chain[-1]
+    for frid in plain_spec.get_frids(top_plain_source_tree):
+        plain_spec.get_specifications_for_frid(top_plain_source_tree, frid)
+
+
+def main(argv: list[str] | None = None) -> int:
+    parser = build_parser()
+    args = parser.parse_args(argv)
+
+    try:
+        # The config file is resolved even when --template-dir is given, so an ambiguous config is always an error.
+        config_template_dir = _template_dir_from_config(parser, args)
+        check(args.plain_file, args.template_dir or config_template_dir)
+    except KeyboardInterrupt:
+        return 130
+    except Exception as e:
+        print(f"Error: {e}", file=sys.stderr)
+        return 1
+
+    print(f"{args.plain_file}: OK")
+    return 0
+
+
+def _template_dir_from_config(parser: argparse.ArgumentParser, args: argparse.Namespace) -> str | None:
+    try:
+        config_file = resolve_config_file(args.config_name, args.plain_file)
+        return template_dir_from_config(config_file) if config_file is not None else None
+    except AmbiguousConfigFileError as e:
+        parser.error(str(e))
+    except Exception as e:
+        parser.error(f"Error reading config file: {e}")

{plain_parser-0.1.0 → plain_parser-0.1.1.dev2}/src/plain_parser/plain_file.py

@@ -701,11 +701,16 @@ def parse_plain_file(
 
 def process_required_modules(
     required_modules: list[str],
-    code_variables: dict,
     template_dirs: list[str],
     all_required_modules: list[str],
     modules_trace: list[str],
+    chain: list[tuple[str, dict]],
 ) -> 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.
+    """
     exported_definitions = list[mistletoe.block_token.token]()
     for module_name in required_modules:
         if module_name in modules_trace:
@@ -714,10 +719,12 @@ def process_required_modules(
         if len(all_required_modules) > 0 and module_name == all_required_modules[-1]:
             continue
 
+        code_variables: dict = {}
         plain_file_parse_result = parse_plain_file(
             module_name, code_variables, template_dirs, imported_modules=[], modules_trace=[]
         )
 
+        ancestor_exported_definitions: list[mistletoe.block_token.token] = []
         if len(plain_file_parse_result.required_modules) == 0:
             if len(all_required_modules) > 0:
                 # For now we require that there is fixed order how required modules are dependent.
@@ -727,12 +734,12 @@ def process_required_modules(
                     f"Plain syntax error: There must be a fixed order how required modules are dependent ({module_name})."
                 )
         else:
-            process_required_modules(
+            ancestor_exported_definitions = process_required_modules(
                 plain_file_parse_result.required_modules,
-                code_variables,
                 template_dirs,
                 all_required_modules,
                 modules_trace + [module_name],
+                chain,
             )
 
         if EXPORTED_CONCEPTS_DIRECTIVE in plain_file_parse_result.plain_source_obj.metadata:
@@ -748,6 +755,12 @@ def process_required_modules(
                         )
                     )
 
+        marshalled_plain_source = validate_and_marshall_module(
+            plain_file_parse_result, module_name, ancestor_exported_definitions, code_variables
+        )
+        if module_name not in (chain_module_name for chain_module_name, _ in chain):
+            chain.append((module_name, marshalled_plain_source))
+
         all_required_modules.append(module_name)
 
     return exported_definitions
@@ -775,35 +788,13 @@ def process_exported_definitions(plain_source: dict, exported_definitions: list[
                 plain_source[plain_spec.DEFINITIONS].children.append(exported_definition)
 
 
-def plain_file_parser(  # noqa: C901
-    plain_source_file_name: str,
-    template_dirs: list[str],
-) -> tuple[str, dict, list[str]]:
-    # code_variables are used to pass code variables to the plain source
-    # they need to be passed as an argument to the function because they populated when liquid templating is applied
-    # and we need to pass them to the marshalled_plain_source_tree after it's rendered
-    plain_source_file_path = Path(plain_source_file_name)
-    if plain_source_file_path.suffix != PLAIN_SOURCE_FILE_EXTENSION:
-        raise PlainSyntaxError(
-            f"Plain syntax error: Invalid plain file extension: {plain_source_file_path.suffix}. Expected: {PLAIN_SOURCE_FILE_EXTENSION}."
-        )
-
-    module_name = (
-        plain_source_file_path.stem
-        if plain_source_file_path.is_absolute()
-        else plain_source_file_path.with_suffix("").as_posix()
-    )
-
-    code_variables = {}
-
-    plain_file_parse_result = parse_plain_file(
-        module_name,
-        code_variables,
-        template_dirs,
-        imported_modules=[],
-        modules_trace=[],
-    )
-
+def validate_and_marshall_module(
+    plain_file_parse_result: PlainFileParseResult,
+    module_name: str,
+    exported_definitions: list[mistletoe.block_token.token],
+    code_variables: dict,
+) -> dict:
+    """Every check a module must pass after parsing, and its marshalled plain source tree."""
     if len(plain_file_parse_result.required_concepts) > 0:
         missing_required_concepts_msg = "Missing required concepts: "
         missing_required_concepts_msg += ", ".join(plain_file_parse_result.required_concepts)
@@ -831,14 +822,6 @@ def plain_file_parser(  # noqa: C901
         has_requires=bool(plain_file_parse_result.required_modules),
     )
 
-    exported_definitions = process_required_modules(
-        plain_file_parse_result.required_modules,
-        code_variables={},
-        template_dirs=template_dirs,
-        all_required_modules=[],
-        modules_trace=[],
-    )
-
     process_exported_definitions(plain_file_parse_result.plain_source, exported_definitions)
 
     process_acceptance_tests(plain_file_parse_result.plain_source)
@@ -858,4 +841,64 @@ def plain_file_parser(  # noqa: C901
     if plain_spec.DEFINITIONS in marshalled_plain_source:
         concept_utils.sort_definitions(marshalled_plain_source[plain_spec.DEFINITIONS])
 
-    return module_name, marshalled_plain_source, plain_file_parse_result.required_modules
+    return marshalled_plain_source
+
+
+def _parse_module(
+    plain_source_file_name: str, template_dirs: list[str]
+) -> tuple[str, dict, list[str], list[tuple[str, dict]]]:
+    plain_source_file_path = Path(plain_source_file_name)
+    if plain_source_file_path.suffix != PLAIN_SOURCE_FILE_EXTENSION:
+        raise PlainSyntaxError(
+            f"Plain syntax error: Invalid plain file extension: {plain_source_file_path.suffix}. Expected: {PLAIN_SOURCE_FILE_EXTENSION}."
+        )
+
+    module_name = (
+        plain_source_file_path.stem
+        if plain_source_file_path.is_absolute()
+        else plain_source_file_path.with_suffix("").as_posix()
+    )
+
+    # code_variables are populated when liquid templating is applied and consumed by process_code_variables
+    # once the plain source is marshalled.
+    code_variables: dict = {}
+
+    plain_file_parse_result = parse_plain_file(
+        module_name,
+        code_variables,
+        template_dirs,
+        imported_modules=[],
+        modules_trace=[],
+    )
+
+    chain: list[tuple[str, dict]] = []
+    exported_definitions = process_required_modules(
+        plain_file_parse_result.required_modules,
+        template_dirs=template_dirs,
+        all_required_modules=[],
+        modules_trace=[],
+        chain=chain,
+    )
+
+    marshalled_plain_source = validate_and_marshall_module(
+        plain_file_parse_result, module_name, exported_definitions, code_variables
+    )
+
+    return module_name, marshalled_plain_source, plain_file_parse_result.required_modules, chain
+
+
+def plain_file_parser(plain_source_file_name: str, template_dirs: list[str]) -> tuple[str, dict, list[str]]:
+    """Parse a module, validating it and every module in its ``requires`` chain."""
+    module_name, marshalled_plain_source, required_modules, _ = _parse_module(plain_source_file_name, template_dirs)
+    return module_name, marshalled_plain_source, required_modules
+
+
+def parse_module_chain(plain_file_name: str, template_dirs: list[str]) -> list[tuple[str, dict]]:
+    """Parse a module and every module in its ``requires`` chain.
+
+    Returns ``(module name, marshalled plain source tree)`` pairs: every required module
+    first, deepest ancestors first, then the module itself. A module reached through more
+    than one ``requires`` path appears once, at its first (deepest) position.
+    """
+    module_name, marshalled_plain_source, _, chain = _parse_module(plain_file_name, template_dirs)
+    return chain + [(module_name, marshalled_plain_source)]

plain_parser-0.1.1.dev2/tests/data/cli/acceptance_test_binary_resource.plain

@@ -0,0 +1,10 @@
+***implementation reqs***
+
+- An implementation requirement.
+
+***functional specs***
+
+- A functionality.
+
+  ***acceptance tests***
+  - Behaves as described in [the binary](binary.bin).

plain_parser-0.1.1.dev2/tests/data/cli/acceptance_test_resource.plain

@@ -0,0 +1,10 @@
+***implementation reqs***
+
+- An implementation requirement.
+
+***functional specs***
+
+- A functionality.
+
+  ***acceptance tests***
+  - Behaves as described in [the notes](notes.md).

plain_parser-0.1.1.dev2/tests/data/cli/base64_resource.plain

@@ -0,0 +1,7 @@
+***implementation reqs***
+
+- Follow [the sample](../sample_base64_image.txt).
+
+***functional specs***
+
+- A functionality.

plain_parser-0.1.1.dev2/tests/data/cli/binary_resource.plain

@@ -0,0 +1,7 @@
+***implementation reqs***
+
+- Follow [the binary](binary.bin).
+
+***functional specs***
+
+- A functionality.

plain_parser-0.1.1.dev2/tests/data/cli/code_variable_conflict.plain

@@ -0,0 +1,9 @@
+***implementation reqs***
+
+- An implementation requirement.
+
+***functional specs***
+
+- Implement {% include "code_variable_template.plain", variable_name: "first" %}
+
+- Implement {% include "code_variable_template.plain", variable_name: "second" %}

plain_parser-0.1.1.dev2/tests/data/cli/code_variable_template.plain

@@ -0,0 +1 @@
+something named {{ variable_name | code_variable }}

plain_parser-0.1.1.dev2/tests/data/cli/missing_resource.plain

@@ -0,0 +1,7 @@
+***implementation reqs***
+
+- Follow [the missing notes](does_not_exist.md).
+
+***functional specs***
+
+- A functionality.

plain_parser-0.1.1.dev2/tests/data/cli/not_plain.md

@@ -0,0 +1 @@
+Not a plain file.

plain_parser-0.1.1.dev2/tests/data/cli/notes.md

@@ -0,0 +1,3 @@
+# Notes
+
+Plain text notes.

plain_parser-0.1.1.dev2/tests/data/cli/requires_binary_resource_base.plain

@@ -0,0 +1,7 @@
+***implementation reqs***
+
+- Follow [the binary](binary.bin).
+
+***functional specs***
+
+- A base functionality.

plain_parser-0.1.1.dev2/tests/data/cli/requires_binary_resource_top.plain

@@ -0,0 +1,12 @@
+---
+requires:
+  - requires_binary_resource_base
+---
+
+***implementation reqs***
+
+- Top implementation requirement.
+
+***functional specs***
+
+- A top functionality.

plain_parser-0.1.1.dev2/tests/data/cli/subdir/nested.plain

@@ -0,0 +1,7 @@
+***implementation reqs***
+
+- Nested implementation requirement.
+
+***functional specs***
+
+- A nested functionality.

plain_parser-0.1.1.dev2/tests/data/cli/undefined_concept.plain

@@ -0,0 +1,13 @@
+***definitions***
+
+- :App: is a console application.
+
+***implementation reqs***
+
+- :App: is written in Python.
+
+***functional specs***
+
+- :App: greets the :User:.
+
+- :App: says goodbye to the :Visitor:.

plain_parser-0.1.1.dev2/tests/data/cli/valid.plain

@@ -0,0 +1,11 @@
+***definitions***
+
+- :App: is a console application.
+
+***implementation reqs***
+
+- :App: is written in Python.
+
+***functional specs***
+
+- :App: prints "hello, world".

plain_parser-0.1.1.dev2/tests/data/requires/chain_base.plain

@@ -0,0 +1,7 @@
+***implementation reqs***
+
+- Base implementation requirement.
+
+***functional specs***
+
+- A base functionality.

plain_parser-0.1.1.dev2/tests/data/requires/chain_fork_top.plain

@@ -0,0 +1,13 @@
+---
+requires:
+  - chain_base
+  - chain_middle
+---
+
+***implementation reqs***
+
+- Fork implementation requirement.
+
+***functional specs***
+
+- A fork functionality.

plain_parser-0.1.1.dev2/tests/data/requires/chain_middle.plain

@@ -0,0 +1,12 @@
+---
+requires:
+  - chain_base
+---
+
+***implementation reqs***
+
+- Middle implementation requirement.
+
+***functional specs***
+
+- A middle functionality.

plain_parser-0.1.1.dev2/tests/data/requires/chain_top.plain

@@ -0,0 +1,12 @@
+---
+requires:
+  - chain_middle
+---
+
+***implementation reqs***
+
+- Top implementation requirement.
+
+***functional specs***
+
+- A top functionality.

{plain_parser-0.1.0 → plain_parser-0.1.1.dev2}/tests/data/requires/diamond_requires_1.plain

@@ -7,6 +7,10 @@ requires:
 
 - :App: is a web application.
 
+***implementation reqs***
+
+- An implementation requirement.
+
 ***functional specs***
 
 - Implement the entry point for :App:.

{plain_parser-0.1.0 → plain_parser-0.1.1.dev2}/tests/data/requires/diamond_requires_2.plain

@@ -7,6 +7,10 @@ requires:
 
 - :User: is the end-user of the application.
 
+***implementation reqs***
+
+- An implementation requirement.
+
 ***functional specs***
 
 - :User: should be able to log in using their email and password.

{plain_parser-0.1.0 → plain_parser-0.1.1.dev2}/tests/data/requires/independent_requires_1.plain

@@ -2,6 +2,10 @@
 
 - :App: is a web application.
 
+***implementation reqs***
+
+- An implementation requirement.
+
 ***functional specs***
 
 - Implement the entry point for :App:.

{plain_parser-0.1.0 → plain_parser-0.1.1.dev2}/tests/data/requires/independent_requires_2.plain

@@ -2,6 +2,10 @@
 
 - :User: is the end-user of the application.
 
+***implementation reqs***
+
+- An implementation requirement.
+
 ***functional specs***
 
 - :User: should be able to log in using their email and password.

plain_parser-0.1.1.dev2/tests/data/requires/invalid_ancestor_base.plain

@@ -0,0 +1,7 @@
+***implementation reqs***
+
+- Base implementation requirement.
+
+***functional specs***
+
+- A base functionality that uses :UndefinedThing:.

plain_parser-0.1.1.dev2/tests/data/requires/invalid_ancestor_top.plain

@@ -0,0 +1,12 @@
+---
+requires:
+  - invalid_ancestor_base
+---
+
+***implementation reqs***
+
+- Top implementation requirement.
+
+***functional specs***
+
+- A top functionality.

{plain_parser-0.1.0 → plain_parser-0.1.1.dev2}/tests/data/requires/normal_requires_1.plain

@@ -7,6 +7,10 @@ requires:
 
 - :App: is a web application.
 
+***implementation reqs***
+
+- An implementation requirement.
+
 ***functional specs***
 
 - Implement the entry point for :App:.

{plain_parser-0.1.0 → plain_parser-0.1.1.dev2}/tests/data/requires/normal_requires_2.plain

@@ -7,6 +7,10 @@ requires:
 
 - :User: is the end-user of the application.
 
+***implementation reqs***
+
+- An implementation requirement.
+
 ***functional specs***
 
 - :User: should be able to log in using their email and password.