codeplain 0.3.6__py3-none-any.whl → 0.3.7__py3-none-any.whl

_version.py

@@ -1 +1 @@
-__version__ = "0.3.6"
+__version__ = "0.3.7"

{codeplain-0.3.6.dist-info → codeplain-0.3.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codeplain
-Version: 0.3.6
+Version: 0.3.7
 Summary: Transform plain language specifications into working code
 License-File: LICENSE
 Classifier: Environment :: Console
@@ -9,7 +9,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Topic :: Software Development :: Code Generators
 Requires-Python: ==3.11.*
 Requires-Dist: gitpython==3.1.50
-Requires-Dist: mistletoe==1.3.0
+Requires-Dist: mistletoe==1.5.1
 Requires-Dist: networkx==3.6.1
 Requires-Dist: python-frontmatter==1.3.0
 Requires-Dist: python-liquid2==0.4.0
@@ -21,9 +21,9 @@ Requires-Dist: textual>=7.5.0
 Requires-Dist: tiktoken==0.13.0
 Requires-Dist: transitions==0.9.3
 Provides-Extra: dev
-Requires-Dist: black==26.3.1; extra == 'dev'
+Requires-Dist: black==26.5.1; extra == 'dev'
 Requires-Dist: flake8==7.3.0; extra == 'dev'
-Requires-Dist: isort==5.13.2; extra == 'dev'
+Requires-Dist: isort==8.0.1; extra == 'dev'
 Requires-Dist: mypy==2.1.0; extra == 'dev'
 Requires-Dist: pytest==9.1.1; extra == 'dev'
 Description-Content-Type: text/markdown

{codeplain-0.3.6.dist-info → codeplain-0.3.7.dist-info}/RECORD

@@ -1,26 +1,27 @@
-_version.py,sha256=W_9dCm49nLvZulVAvvsafxLJjVBSKDBHz9K7szFZllo,22
+_version.py,sha256=J0I0c7-a50EOnWXMryTu_E6xhXSYFBPjVpeYP_a3vRI,22
 change_detection.py,sha256=CazORZrezeZSw2I6VBvieN-c2SEjieZPo6pNrKwmMVA,6915
 codeplain_REST_api.py,sha256=h_XoNws8fvf7OTtoVXhHh6OfLGg77UNFuggMBwaqBwE,21533
 concept_utils.py,sha256=D4qVHFBRvfJZwiIq1AD_SV0Ev-RnOMg2yGWo6Cal7PM,7913
 diff_utils.py,sha256=AjiQlqo5pRos_8hVXZo5yBurl5BzSrTMGrQv4dCtRCg,1198
 event_bus.py,sha256=g5XLwRfjrvTIcB6urjREuCJzZj5TA93hy8lKXLGXuCE,650
-file_utils.py,sha256=q-ApwiLLJCgmmoy6-nf1QM9DaFXwzCJek6B-jQTI9ak,11665
+file_utils.py,sha256=MNZ5li1ofIMOYB6FCrMa_UkX6nkGCgSZuaqzhqVc1Ok,11682
 git_utils.py,sha256=LQQnL5DAFpH5fDBQgUZX2WfjWY4YC5OEGBPIXryTmnY,16896
 memory_management.py,sha256=nHNudgaOqp5UGkIMi62TRCc2nUeFOM0w-I1FfxBFaQE,6120
-module_renderer.py,sha256=pXMXKKGMhUwLLlSxppE_hpZlwpJ3WSHSfR9FQxt6rSI,6860
+module_renderer.py,sha256=DZCIo_QzvhFw8EqQTKeF3HUbvfumrV2O1sz-gUhWpIA,6752
 partial_rendering.py,sha256=0ChOaGytogBUEGISpbWkbjT9Hqy8pnOkJdJXcitJDgk,12219
-plain2code.py,sha256=7VUE_q06VQinFHNfyh1I2u2Nt3EOa6WPkiPfqEF6x58,15452
-plain2code_arguments.py,sha256=J05NwaY-O04rIWVF2yIXysNB_ofZS0wJFn0u1WaCCSA,15399
-plain2code_console.py,sha256=YdE-Kz9qRAzIIAg7aYA1bnXRcwy_aTpbFtkR2zHbd-I,4918
+path_resolution.py,sha256=0tMqU0a1g4DYhTOp7QjLVSEkv_cgasb4NI1mK809dUM,2233
+plain2code.py,sha256=HGv3Or296pZRuqD5jcmuA3QnGl34aJD5f8619M7l5G4,15294
+plain2code_arguments.py,sha256=3tAA9Haw-j97zztjXdhi6LxFtURP0Tfg9J_rvJDoXmw,17685
+plain2code_console.py,sha256=6_PdrVBw9oDccqSGW_gVRYQjVgC_5W3ush4QT2_jGnw,4931
 plain2code_events.py,sha256=AM8KJS68uiVXRMLt861KaGhs2H4yzujlMB_xiYPfHQc,1478
 plain2code_exceptions.py,sha256=wkkEXw2k4LCd09PIH3_Hu0HyZvtXYjFaA653Sfey4FA,2287
-plain2code_logger.py,sha256=LdCaS29gWA7e1VhQijyXagsrFAnEi7VKU62b1dnlKnc,5114
+plain2code_logger.py,sha256=RJNhesE9y59lPILvGhiJpAB4snTwfsHpG1Ir6EaPhiQ,4989
 plain2code_nodes.py,sha256=IwjQqJxRSJKgP6eEnkYGy3VQHIyoazgkFxAEkxkjfJ8,4426
 plain2code_read_config.py,sha256=D5CxnmTRjddupecWvstcUm0kIJWWzq5-Zmk6sU0wbIg,2235
 plain2code_state.py,sha256=1VwyxgKdA13fAJNKSiPBfBb3A20TKfGCNnOm06YdcS4,2233
 plain2code_telemetry.py,sha256=7yuTH7mQE_wGVW2H1oiVZ3UJg98ArB5HcUUm9isnv9g,4354
 plain2code_utils.py,sha256=id04t9Iez5pYygrE3fKEyrcfWDcniKFT2iQoF2CzTJs,1409
-plain_file.py,sha256=xdaDm5BL2dIhwMQeyq9nTXsugS4PDnR25CyrKBtHlLU,34386
+plain_file.py,sha256=k2rcq53q0kOf9_8egrZILpkrVkZdfJt7HU0gHBFskU4,35116
 plain_modules.py,sha256=uvRPfxBJwstaWi5lgYKgtQdhhf0Naiy2mS41tLw_TjY,16186
 plain_spec.py,sha256=7nb5lLJKHZ3uu9THkSXyJ5brIKkbGW0ooVfRclLdlzA,16062
 system_config.py,sha256=trgytfXKXoCn0Pgy9u00x2D0ZRHlh_tADlbkwZnF8QE,1038
@@ -65,19 +66,25 @@ standard_template_library/typescript-react-app-boilerplate.plain,sha256=6LFxhEOz
 standard_template_library/typescript-react-app-template.plain,sha256=DN5wEJcT8ZqQTf0vFKi9Z1isi9cin2UVNOZb3r28d3M,715
 tests/__init__.py,sha256=Wk73Io62J15BtlLVIzxmASDWaaJkQLevS4BLK5LDAQg,16
 tests/conftest.py,sha256=QZcp08htUlJGgmHDlRWFgsWXZ8o8IBWTD5QqJaUMlU8,790
+tests/test_arg_provenance.py,sha256=Vp-ZtNbTlSNOE8iiHOin3YI9sobbN0tRPUIfrYjxttQ,3459
 tests/test_change_detection.py,sha256=jH8SEhndX400DNqIKmcYLzxHqq9WFdgmuvY3XPq-ZFc,13534
 tests/test_cli_output.py,sha256=owDP9pLHdErtPAr1paNKp1o044kuH-HxInHLIBLZQFI,18420
 tests/test_file_utils.py,sha256=R_ZIhrTtwlhHxgmbBtA8PFEU5-QB4Fi5skJ7PS2KzdU,3614
+tests/test_folder_path_resolution.py,sha256=_ZvVFu5m2-AH8iQNn0fCYkA0flVxVwdh1oQiWcPNIxw,6611
 tests/test_git_utils.py,sha256=h3rWhhs4XVRYqzVzdmj51siF_AYD-GkbZiefK2iGfWo,15614
 tests/test_imports.py,sha256=1ncbqQhtQW237kIjyV-Ufl7-R-PuduvoYFj2iS-DXW4,2608
+tests/test_log_file_name_resolution.py,sha256=99g9NgPF-BZ98CvNyqDcltBAx4sLBE8gpQPAAieKiPc,3619
+tests/test_logging_config_path_resolution.py,sha256=avz_ehRd18INwIXvAy1AwVzNNUz0vS8eu1nRe0bra8g,2650
 tests/test_partial_rendering.py,sha256=r0RUUd1pI4-2ZkRrM1j8_kUqv-70hrOGjuKBhZoRmH0,22758
+tests/test_path_resolution.py,sha256=yQpd-Unq1lwNv0wkRPwVs5pDT8JmyyDgbpiTQsyt--Y,2615
 tests/test_plain2code.py,sha256=DQYFc0JVSkMI8LZCNaQ__2Nph-DcZZW17rprJA54eyw,3851
 tests/test_plain_modules.py,sha256=S7sd4ZYNotXOgCyZzmBd714QFLih69nlZ3tV8WNtVPo,13766
 tests/test_plainfile.py,sha256=wZ_PN4GULPWIpl_AK_r_6jkgtX0Ch8EHmN5IhX7huOE,11027
-tests/test_plainfileparser.py,sha256=kXWwaGKtYnTDn5yDoYTqumlwW0iSu441wxj3WZVQOP0,22807
+tests/test_plainfileparser.py,sha256=xd9P0KqZJlJPn3RKT510IQbfBotk6nQ9O8p9iLwJiQk,22815
 tests/test_plainspec.py,sha256=ng55E8ajrH2-gPC1p_QDIe_zXplPvoqHJ-d57UWKFTw,3577
 tests/test_requires.py,sha256=6tnHYaKudxN-RiQjSFoi9nHe_x0ze3QF-f-j67zAE74,1250
 tests/test_resolve_config_file.py,sha256=b87tDOvyzbsnE-QRWbZ97ou7NuyaAgskv-dbYBum31c,2830
+tests/test_script_path_resolution.py,sha256=tiEqMevQRXr9YpfHN0xldOOQpLAUgnSqTzeZWkKHaUY,4156
 tests/test_telemetry.py,sha256=hjm81aRQQZcZ0RB6aVbS3WO46_nIAii_csmbbtnUh74,7110
 tests/e2e/conftest.py,sha256=5Dm67UTOE-M6hMb-mqZvwa6Ek_wmZgsR7fUv9ZEqCwY,4164
 tests/e2e/test_hello_world_python.py,sha256=PQy4elzB7WvpiWLKa6_HFO0K8HA6_6hGLaAqRi0J3OU,1627
@@ -91,8 +98,8 @@ tui/spinner.py,sha256=Ro6Gd9Przf-whuHqPRY6HwI0T57yJjyNPbhDbigZKZE,2471
 tui/state_handlers.py,sha256=4r_6m5YMcprQtgiTP0De3XFfGAF8VzgaWXHxPweYPbQ,16325
 tui/styles.css,sha256=c13WY1nOgmtkT_FH9Ad2PjXrfi8LYwr6zzD6rBOh9tU,6685
 tui/widget_helpers.py,sha256=mWDPrALsxLOzJg8KD9MXXafJKRiqG-EIp797jbOT77o,5972
-codeplain-0.3.6.dist-info/METADATA,sha256=tX12onr0DJU5GgIbceMo3m8Cys7eptunE_ISO681FqA,6352
-codeplain-0.3.6.dist-info/WHEEL,sha256=lCkmxWfQsSc9CfIClYeavTdQeEX2toPqufh9gI35EQA,87
-codeplain-0.3.6.dist-info/entry_points.txt,sha256=oDZkBqu9WhtZApb_K6ia8-fn9aojwmAsgnKELceX5T4,46
-codeplain-0.3.6.dist-info/licenses/LICENSE,sha256=pCeKgQ1mXE5OmNUuKOfOZh1T1vqkeCUxghE7N8qgnzc,11345
-codeplain-0.3.6.dist-info/RECORD,,
+codeplain-0.3.7.dist-info/METADATA,sha256=Gs_i0uMjyodZ11UAyrWIHyAp9vY4Zw_-todAZsYLRKg,6351
+codeplain-0.3.7.dist-info/WHEEL,sha256=lCkmxWfQsSc9CfIClYeavTdQeEX2toPqufh9gI35EQA,87
+codeplain-0.3.7.dist-info/entry_points.txt,sha256=oDZkBqu9WhtZApb_K6ia8-fn9aojwmAsgnKELceX5T4,46
+codeplain-0.3.7.dist-info/licenses/LICENSE,sha256=pCeKgQ1mXE5OmNUuKOfOZh1T1vqkeCUxghE7N8qgnzc,11345
+codeplain-0.3.7.dist-info/RECORD,,

file_utils.py

@@ -293,7 +293,7 @@ def get_template_directories(plain_file_path, custom_template_dir=None, default_
     3. Default template directory - for standard/fallback templates
     """
     template_dirs = [
-        os.path.dirname(plain_file_path),  # Highest precedence - directory containing plain file
+        os.path.dirname(os.path.abspath(plain_file_path)),  # Highest precedence - directory containing plain file
     ]
 
     if custom_template_dir:

module_renderer.py

@@ -158,13 +158,14 @@ class ModuleRenderer:
                     module.wipe_module()
 
         self.loaded_modules = list[PlainModule]()
+
         _, rendering_failed = self._render_module(self.plain_module, self.render_range, True)
+
         if not rendering_failed:
-            # Get the last module that completed rendering
             if self.args.copy_build:
                 rendered_code_path = f"{self.args.build_dest}/"
             else:
-                rendered_code_path = f"{os.path.join(self.args.build_folder, self.plain_module.module_name)}/"
+                rendered_code_path = self.args.build_folder
 
             self.run_state.set_render_generated_code_path(rendered_code_path)
             self.event_bus.publish(RenderCompleted(rendered_code_path=rendered_code_path))

path_resolution.py

@@ -0,0 +1,64 @@
+"""Path resolution for CLI / config / default path arguments.
+
+The rule, in one sentence: the resolution base for a relative path is determined
+by *where the value was written*, not by which option key it sets.
+
+- Values supplied on the command line resolve against the current working
+  directory (so they match what shell tab completion just produced).
+- Values read from ``config.yaml`` resolve against the directory containing
+  that config file.
+- Values left at their default (not supplied anywhere) resolve against the
+  directory containing the spec file.
+
+Paths are expanded for ``~`` and returned as absolute paths. Canonicalization
+(symlink resolution) is left to the caller, to be done just before I/O that
+needs it (writing output, executing scripts) so we don't accidentally
+dereference links the user wanted preserved.
+"""
+
+import os
+from typing import Literal, Optional
+
+PathSource = Literal["cli", "config", "default"]
+
+
+def resolve_path(
+    value: str,
+    source: PathSource,
+    *,
+    cwd: str,
+    config_dir: Optional[str] = None,
+    spec_dir: str,
+) -> str:
+    """Resolve *value* to an absolute path using the base anchor for *source*.
+
+    Args:
+        value: The path string as written by the user. May be absolute, relative,
+            or contain a leading ``~``.
+        source: Where the value came from -- ``"cli"``, ``"config"``, or
+            ``"default"``.
+        cwd: Base directory for ``"cli"`` values.
+        config_dir: Base directory for ``"config"`` values. Must be provided
+            whenever ``source == "config"``.
+        spec_dir: Base directory for ``"default"`` values.
+
+    Returns:
+        Absolute path with ``~`` expanded. Symlinks are not resolved.
+    """
+    expanded = os.path.expanduser(value)
+
+    if os.path.isabs(expanded):
+        return os.path.normpath(expanded)
+
+    if source == "cli":
+        base = cwd
+    elif source == "config":
+        if config_dir is None:
+            raise ValueError("config_dir must be provided when source == 'config'")
+        base = config_dir
+    elif source == "default":
+        base = spec_dir
+    else:
+        raise ValueError(f"Unknown path source: {source!r}")
+
+    return os.path.normpath(os.path.join(base, expanded))

plain2code.py

@@ -48,7 +48,6 @@ from plain2code_logger import (
     IndentedFormatter,
     LoggingHandler,
     dump_crash_logs,
-    get_log_file_path,
 )
 from plain2code_state import RunState
 from plain2code_telemetry import capture_crash, initialize_telemetry
@@ -89,8 +88,7 @@ def setup_logging(
     event_bus: EventBus,
     run_state: RunState,
     log_to_file: bool,
-    log_file_name: str,
-    plain_file_path: Optional[str],
+    log_file_path: str,
     headless: bool = False,
 ):
     default_level = logging.DEBUG if args.verbose else logging.INFO
@@ -101,10 +99,9 @@ def setup_logging(
     logging.getLogger("transitions").setLevel(logging.ERROR)
     logging.getLogger("transitions.extensions.diagrams").setLevel(logging.ERROR)
 
-    log_file_path = get_log_file_path(plain_file_path, log_file_name)
-
     # Try to load logging configuration from YAML file (takes precedence over --verbose)
     config_loaded = False
+
     if args.logging_config_path and os.path.exists(args.logging_config_path):
         try:
             with open(args.logging_config_path, "r") as f:
@@ -127,7 +124,7 @@ def setup_logging(
         handler.setFormatter(formatter)
         root_logger.addHandler(handler)
 
-    if log_to_file and log_file_path:
+    if log_to_file:
         try:
             file_handler = logging.FileHandler(log_file_path, mode="w", encoding="utf-8")
             file_handler.setFormatter(file_formatter)
@@ -356,7 +353,7 @@ def main():  # noqa: C901
     # Parse the plain file (and its required modules) once; reused by dry-run and rendering.
     try:
         plain_module = plain_modules.PlainModule(
-            args.filename,
+            os.path.basename(args.filename),
             args.build_folder,
             args.conformance_tests_folder,
             template_dirs,
@@ -383,9 +380,7 @@ def main():  # noqa: C901
         # Suppress Rich console output.
         console.quiet = True
 
-    default_log_level = setup_logging(
-        args, event_bus, run_state, args.log_to_file, args.log_file_name, args.filename, args.headless
-    )
+    default_log_level = setup_logging(args, event_bus, run_state, args.log_to_file, args.log_file_name, args.headless)
 
     initialize_telemetry()