unity-devkit 0.1.16__tar.gz → 0.1.17__tar.gz

{unity_devkit-0.1.16 → unity_devkit-0.1.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: unity-devkit
-Version: 0.1.16
+Version: 0.1.17
 Summary: Unity build, license, and CI tooling
 Requires-Python: >=3.13
 Requires-Dist: bashrun>=0.1.0

{unity_devkit-0.1.16 → unity_devkit-0.1.17}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "unity-devkit"
-version = "0.1.16"
+version = "0.1.17"
 description = "Unity build, license, and CI tooling"
 requires-python = ">=3.13"
 dependencies = [

{unity_devkit-0.1.16 → unity_devkit-0.1.17}/src/unity_devkit/dispatch_workflow_generator.py

@@ -1,4 +1,5 @@
 import json
+from collections import Counter
 from pathlib import Path
 from typing import Annotated
 
@@ -13,6 +14,7 @@ app = typer.Typer(add_completion=False, pretty_exceptions_show_locals=False)
 
 DUMP_EXECUTE_METHOD = "Outernet.PlayerBuild.DumpEnvironment"
 DISPATCH_INPUT_CAP = 25
+RESERVED_INPUT_IDS = frozenset({"environment-preset", "development"})
 NUMERIC_FIELD_TYPES = {
     "Byte",
     "SByte",
@@ -124,19 +126,26 @@ def extract_environment_dump(log_path: Path) -> EnvironmentDump:
 
 def render_dispatch_workflow(dump: EnvironmentDump, *, project: str, output: str, build_workflow: str) -> str:
     enums_by_name = {environment_enum.name: environment_enum for environment_enum in dump.enums}
-    input_blocks: list[tuple[str, str, list[str], str | None]] = [
+    emitted_fields = [field for field in dump.fields if field.path != dump.mode_field]
+    leaf_counts = Counter(field.path.rsplit(".", 1)[-1] for field in emitted_fields)
+    input_ids: dict[str, str] = {}
+    for field in emitted_fields:
+        leaf = field.path.rsplit(".", 1)[-1]
+        input_ids[field.path] = (
+            leaf if leaf_counts[leaf] == 1 and leaf not in RESERVED_INPUT_IDS else field.path.replace(".", "-")
+        )
+    default_preset = next(iter(dump.presets), "")
+    input_blocks: list[tuple[str, str | None, list[str], str | None]] = [
         (
             "environment-preset",
-            "Environment preset (Presets key) — empty leaves the workspace untouched",
+            "Preset to apply — blank leaves the workspace untouched; leave fields empty to keep the preset's values",
             ["type: choice", "options:", *indent_lines([*(f'- "{preset}"' for preset in ("", *dump.presets))], 2)],
-            'default: ""',
+            f'default: "{default_preset}"',
         ),
-        ("development", "Development build column", ["type: boolean"], "default: false"),
+        ("development", "Development build (debug symbols)", ["type: boolean"], "default: false"),
     ]
-    for field in dump.fields:
-        if field.path == dump.mode_field:
-            continue
-        input_blocks.append(field_input_block(field, enums_by_name))
+    for field in emitted_fields:
+        input_blocks.append(field_input_block(field, input_ids[field.path], enums_by_name))
 
     input_count = len(input_blocks)
     if input_count > DISPATCH_INPUT_CAP:
@@ -145,7 +154,7 @@ def render_dispatch_workflow(dump: EnvironmentDump, *, project: str, output: str
             "Shrink the env class or move configuration out of it."
         )
 
-    transport_lines = [field_transport_line(field) for field in dump.fields if field.path != dump.mode_field]
+    transport_lines = [field_transport_line(field, input_ids[field.path]) for field in emitted_fields]
     header = (
         f"# Generated by '{regen_command(project, output, build_workflow)}' from the environment class "
         f"{dump.class_name} —"
@@ -182,32 +191,23 @@ def regen_command(project: str, output: str, build_workflow: str) -> str:
 
 
 def field_input_block(
-    field: EnvironmentFieldDump, enums_by_name: dict[str, EnvironmentEnum]
-) -> tuple[str, str, list[str], str | None]:
-    input_id = field.path.replace(".", "-")
+    field: EnvironmentFieldDump, input_id: str, enums_by_name: dict[str, EnvironmentEnum]
+) -> tuple[str, str | None, list[str], str | None]:
     if field.field_type == "Boolean":
-        return (
-            input_id,
-            f"environment field {field.path} (bool) — checked overrides the preset value",
-            ["type: boolean"],
-            "default: false",
-        )
+        return (input_id, None, ["type: boolean"], "default: false")
 
     if field.field_type in enums_by_name:
         environment_enum = enums_by_name[field.field_type]
         if environment_enum.flags:
             return (
                 input_id,
-                (
-                    f"environment field {field.path} (flags: {', '.join(environment_enum.values)}) — "
-                    "comma-separated names, empty keeps the preset value"
-                ),
+                f"comma-separated: {', '.join(environment_enum.values)}",
                 ["type: string"],
                 'default: ""',
             )
         return (
             input_id,
-            f"environment field {field.path} ({environment_enum.name}) — empty keeps the preset value",
+            None,
             [
                 "type: choice",
                 "options:",
@@ -217,20 +217,10 @@ def field_input_block(
         )
 
     if field.field_type == "String":
-        return (
-            input_id,
-            f"environment field {field.path} (string) — empty keeps the preset value",
-            ["type: string"],
-            'default: ""',
-        )
+        return (input_id, None, ["type: string"], 'default: ""')
 
     if field.field_type in NUMERIC_FIELD_TYPES:
-        return (
-            input_id,
-            f"environment field {field.path} ({field.field_type}) — empty keeps the preset value",
-            ["type: number"],
-            None,
-        )
+        return (input_id, None, ["type: number"], None)
 
     raise SystemExit(
         f"Environment field '{field.path}' has type '{field.field_type}' — no dispatch input type maps to it "
@@ -238,8 +228,7 @@ def field_input_block(
     )
 
 
-def field_transport_line(field: EnvironmentFieldDump) -> str:
-    input_id = field.path.replace(".", "-")
+def field_transport_line(field: EnvironmentFieldDump, input_id: str) -> str:
     guard = "" if field.field_type == "Boolean" else " != ''"
     return (
         "${{ inputs['"
@@ -254,9 +243,12 @@ def field_transport_line(field: EnvironmentFieldDump) -> str:
     )
 
 
-def build_input_block(input_block: tuple[str, str, list[str], str | None]) -> list[str]:
+def build_input_block(input_block: tuple[str, str | None, list[str], str | None]) -> list[str]:
     input_id, description, type_lines, default_line = input_block
-    lines = [f"{input_id}:", f'  description: "{description}"', *[f"  {line}" for line in type_lines]]
+    lines = [f"{input_id}:"]
+    if description is not None:
+        lines.append(f'  description: "{description}"')
+    lines.extend(f"  {line}" for line in type_lines)
     if default_line is not None:
         lines.append(f"  {default_line}")
     return lines

{unity_devkit-0.1.16 → unity_devkit-0.1.17}/tests/test_dispatch_workflow_generator.py

@@ -38,22 +38,72 @@ def test_render_modes_are_deduped_into_the_preset_choice() -> None:
     assert 'options:\n          - ""\n          - "Airgapped"' in workflow
 
 
-def test_render_maps_field_types_to_dispatch_inputs() -> None:
+def test_render_defaults_the_preset_choice_to_the_first_map_key() -> None:
+    document = yaml.safe_load(render_fixture_workflow().replace("${{", "__EXPR_OPEN__").replace("}}", "__EXPR_CLOSE__"))
+
+    trigger = document.get("on", document[True])
+    preset = trigger["workflow_dispatch"]["inputs"]["environment-preset"]
+    assert preset["options"] == ["", "Airgapped"]
+    assert preset["default"] == "Airgapped"
+
+
+def test_render_states_the_override_law_once_on_the_preset_input() -> None:
+    workflow = render_fixture_workflow()
+
+    assert "environment field" not in workflow
+    assert "empty keeps the preset value" not in workflow
+    assert "checked overrides the preset value" not in workflow
+    assert workflow.count("description:") == 3
+
+
+def test_render_maps_field_types_to_dispatch_inputs_without_descriptions() -> None:
+    workflow = render_fixture_workflow()
+
+    assert "\n      username:\n        type: string" in workflow
+    assert "\n      verboseLogging:\n        type: boolean" in workflow
+    assert "\n      pollIntervalSeconds:\n        type: number" in workflow
+
+
+def test_render_uses_leaf_names_as_input_ids_when_unique() -> None:
     workflow = render_fixture_workflow()
 
-    assert 'username:\n        description: "environment field username (string)' in workflow
-    assert 'verboseLogging:\n        description: "environment field verboseLogging (bool)' in workflow
-    assert "type: number" in workflow
-    assert "localConfig-apiUrl" in workflow
-    assert "inputs['localConfig-apiUrl']" in workflow
+    assert "\n      apiUrl:" in workflow
+    assert "\n      portNumber:" in workflow
+    assert "localConfig-apiUrl" not in workflow
+    assert "${{ inputs['apiUrl'] != '' && format('localConfig.apiUrl={0}', inputs['apiUrl']) || '' }}" in workflow
+
+
+def test_render_falls_back_to_dashed_paths_on_leaf_collision() -> None:
+    dump = load_fixture_dump()
+    dump.fields.append(EnvironmentFieldDump(path="remoteConfig.apiUrl", field_type="String"))
+
+    workflow = render_dispatch_workflow(
+        dump, project="PlayerBuild", output=".github/workflows/build.yml", build_workflow=PINNED_BUILD_WORKFLOW
+    )
+
+    assert "\n      apiUrl:" not in workflow
+    assert "\n      localConfig-apiUrl:" in workflow
+    assert "\n      remoteConfig-apiUrl:" in workflow
+
+
+def test_render_falls_back_to_dashed_paths_on_control_id_collision() -> None:
+    dump = load_fixture_dump()
+    dump.fields.append(EnvironmentFieldDump(path="misc.development", field_type="Boolean"))
+
+    workflow = render_dispatch_workflow(
+        dump, project="PlayerBuild", output=".github/workflows/build.yml", build_workflow=PINNED_BUILD_WORKFLOW
+    )
+
+    assert "\n      misc-development:" in workflow
+    assert workflow.split("jobs:")[0].count("\n      development:") == 1
 
 
 def test_render_flags_enum_is_text_not_choice() -> None:
     workflow = render_fixture_workflow()
 
-    assert "comma-separated names" in workflow
-    capabilities_choice = "capabilities:\n        description:"
-    assert capabilities_choice in workflow
+    assert 'description: "comma-separated: None, Capture, Stream, Analyze"' in workflow
+    assert "\n      capabilities:\n        description:" in workflow
+    assert "\n      capabilities:\n        type: string" not in workflow
     assert "type: choice" in workflow
 
 
@@ -106,8 +156,8 @@ def test_rendered_workflow_is_valid_yaml() -> None:
         "verboseLogging",
         "pollIntervalSeconds",
         "capabilities",
-        "localConfig-apiUrl",
-        "localConfig-portNumber",
+        "apiUrl",
+        "portNumber",
     ]
     assert document["jobs"]["build"]["uses"] == PINNED_BUILD_WORKFLOW
     assert document["jobs"]["build"]["secrets"] == "inherit"