unity-devkit 0.1.16__py3-none-any.whl → 0.1.18__py3-none-any.whl

unity_devkit/build_unity.py

@@ -9,7 +9,7 @@ app = typer.Typer(add_completion=False, pretty_exceptions_show_locals=False)
 
 @app.command()
 def build_unity(
-    project: Annotated[str, typer.Option(help="Unity project name (catalog key in unity-devkit.json)")],
+    project: Annotated[str, typer.Option(help="Unity project name (the 'name' field of its unity-devkit.json)")],
     build: Annotated[str, typer.Option(help="Build target from the project's builds list (e.g. AndroidMobile)")],
     version: Annotated[
         str,

unity_devkit/ci_build_unity.py

@@ -63,7 +63,7 @@ def ci_build_unity(
         unity_project_path = resolve_unity_project(project).path
         if unity_project_path.resolve() != project_path.resolve():
             raise SystemExit(
-                f"--project-path {project_path} does not match catalog entry '{project}' at {unity_project_path}"
+                f"--project-path {project_path} does not match discovered project '{project}' at {unity_project_path}"
             )
 
     with ci_step(f"Build {project} [{platform}]"):

unity_devkit/compile_check_unity.py

@@ -11,7 +11,7 @@ COMPILE_ERROR_SIGNATURES = ("error CS",)
 
 @app.command()
 def compile_check_unity(
-    project: Annotated[str, typer.Option(help="Unity project name (catalog key in unity-devkit.json)")],
+    project: Annotated[str, typer.Option(help="Unity project name (the 'name' field of its unity-devkit.json)")],
     execute_method: Annotated[
         str | None,
         typer.Option(help="Static method to run after load (Class.Method) — one editor session per invocation"),

unity_devkit/dispatch_workflow_generator.py

@@ -1,4 +1,5 @@
 import json
+from collections import Counter
 from pathlib import Path
 from typing import Annotated
 
@@ -6,13 +7,14 @@ import typer
 from pydantic import BaseModel, ConfigDict
 
 from .compile_check_unity import COMPILE_ERROR_SIGNATURES
-from .projects import load_catalog
+from .projects import discover_projects
 from .player_build import prepare_unity_project, run_unity_batchmode
 
 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",
@@ -56,7 +58,7 @@ class EnvironmentDump(BaseModel):
 
 @app.command()
 def unity_dispatch(
-    project: Annotated[str, typer.Option(help="Unity project name (catalog key in unity-devkit.json)")],
+    project: Annotated[str, typer.Option(help="Unity project name (the 'name' field of its unity-devkit.json)")],
     output: Annotated[Path, typer.Option(help="Workflow file to write (or check with --check)")],
     build_workflow: Annotated[
         str,
@@ -67,13 +69,13 @@ def unity_dispatch(
     ],
     environment_config_class: Annotated[
         str | None,
-        typer.Option(help="Env class file path override (defaults to build-config.json's environment_config)"),
+        typer.Option(help="Env class file path override (defaults to unity-devkit.json's environment_config)"),
     ] = None,
     check: Annotated[
         bool, typer.Option("--check", help="Compare against the existing file instead of writing; fail on drift")
     ] = False,
 ) -> None:
-    projects = load_catalog()
+    projects = discover_projects()
     if project not in projects:
         raise SystemExit(f"Unknown project '{project}'. Valid: {', '.join(projects)}")
 
@@ -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/install.py

@@ -8,7 +8,7 @@ from typing import Annotated, Any
 import typer
 from bashrun.bash import bash, bash_handoff, bash_output
 
-from .projects import load_catalog
+from .projects import discover_projects
 from .player_build import build_player
 
 INSTALLABLE_TARGETS = {"AndroidMobile", "MagicLeap2", "Linux"}
@@ -43,7 +43,7 @@ def main(
         ),
     ] = False,
 ) -> None:
-    projects = load_catalog()
+    projects = discover_projects()
 
     project_name = next((name for name in projects if name.lower() == project.lower()), None)
     if project_name is None:

unity_devkit/lock_unity.py

@@ -2,7 +2,7 @@ from typing import Annotated
 
 import typer
 
-from .projects import load_catalog
+from .projects import discover_projects
 from .player_build import prepare_unity_project, run_unity_batchmode
 
 app = typer.Typer(add_completion=False, pretty_exceptions_show_locals=False)
@@ -10,7 +10,7 @@ app = typer.Typer(add_completion=False, pretty_exceptions_show_locals=False)
 
 @app.command()
 def lock_unity(project: Annotated[str | None, typer.Option(help="Limit to a specific project.")] = None) -> None:
-    config = load_catalog()
+    config = discover_projects()
 
     if project is not None and project not in config:
         raise typer.BadParameter(f"Unknown project '{project}'. Valid: {', '.join(config)}")

unity_devkit/matrix.py

@@ -1,12 +1,12 @@
 import json
 from pathlib import Path
 
-from .projects import load_catalog
+from .projects import discover_projects
 from .player_build import LICENSE_IMAGE_MODULE, PLATFORM_CONFIGS, UNITYCI_IMAGE_REVISION, read_editor_version
 
 
 def build_matrix() -> None:
-    projects = load_catalog()
+    projects = discover_projects()
     matrix: list[dict[str, str]] = []
     editor_versions: set[str] = set()
 
@@ -28,7 +28,7 @@ def build_matrix() -> None:
 
     if not editor_versions:
         raise SystemExit(
-            "No projects with builds declared — build-unity-matrix needs at least one unity-devkit.json entry with a 'builds' list"
+            "No projects with builds declared — build-unity-matrix needs at least one unity-devkit.json with a non-empty 'platforms' map"
         )
     license_version = max(editor_versions)
     print(f"matrix={json.dumps({'include': matrix})}")
@@ -36,7 +36,7 @@ def build_matrix() -> None:
 
 
 def compile_check_matrix() -> None:
-    projects = load_catalog()
+    projects = discover_projects()
     matrix: list[dict[str, str]] = []
     editor_versions: set[str] = set()
 

unity_devkit/player_build.py

@@ -9,7 +9,7 @@ from typing import TypedDict
 
 from bashrun.bash import CalledProcessError, bash, bash_pipe
 
-from .projects import CatalogEntry, load_catalog
+from .projects import ProjectEntry, discover_projects
 
 
 class PlatformConfig(TypedDict):
@@ -135,8 +135,8 @@ def editor_version(project_path: Path) -> str | None:
     return None
 
 
-def resolve_unity_project(project: str) -> CatalogEntry:
-    projects = load_catalog()
+def resolve_unity_project(project: str) -> ProjectEntry:
+    projects = discover_projects()
     if project not in projects:
         raise SystemExit(f"Unknown project '{project}'. Valid: {', '.join(projects)}")
     return projects[project]
@@ -182,7 +182,7 @@ def build_player(
     valid_builds = project_config.builds or []
     if not valid_builds:
         raise SystemExit(
-            f"Project '{project}' declares no builds — add a 'builds' list to its entry in unity-devkit.json"
+            f"Project '{project}' declares no builds — add platform keys to its unity-devkit.json 'platforms' map"
         )
     if build not in valid_builds:
         raise SystemExit(f"Unknown build '{build}' for project '{project}'. Valid: {', '.join(valid_builds)}")

unity_devkit/projects.py

@@ -1,46 +1,64 @@
 import os
 from collections.abc import Iterator
 from pathlib import Path
+from typing import Any
 
-from pydantic import BaseModel, ConfigDict, TypeAdapter, field_validator
+from pydantic import BaseModel, ConfigDict, field_validator
 
-CATALOG_FILENAME = "unity-devkit.json"
+BUILD_CONFIG_FILENAME = "unity-devkit.json"
 PROJECT_MARKER = Path("ProjectSettings") / "ProjectVersion.txt"
 PRUNE_DIRECTORIES = {".git", "Library", "Temp", "obj", "Build", "node_modules", "__pycache__"}
 
 
-class CatalogEntry(BaseModel):
-    model_config = ConfigDict(extra="forbid")
+class BuildConfigFile(BaseModel):
+    model_config = ConfigDict(extra="ignore")
 
-    path: Path
-    builds: list[str] | None = None
+    name: str
+    platforms: dict[str, Any] | None = None
 
-    @field_validator("path")
+    @field_validator("name")
     @classmethod
-    def anchor_relative_path(cls, value: Path) -> Path:
-        return value if value.is_absolute() else Path.cwd() / value
-
+    def nonempty_name(cls, value: str) -> str:
+        if not value.strip():
+            raise ValueError("unity-devkit.json 'name' must be a non-empty string")
+        return value
 
-CATALOG_ADAPTER = TypeAdapter(dict[str, CatalogEntry])
 
+class ProjectEntry(BaseModel):
+    path: Path
+    builds: list[str] | None = None
 
-def load_catalog() -> dict[str, CatalogEntry]:
-    catalog_path = Path.cwd() / CATALOG_FILENAME
-    if not catalog_path.is_file():
-        raise SystemExit(
-            f"No {CATALOG_FILENAME} catalog at {catalog_path} — declare Unity projects as catalog entries at the repo root"
-        )
 
-    catalog = CATALOG_ADAPTER.validate_json(catalog_path.read_text(encoding="utf-8"))
-    if not catalog:
-        raise SystemExit(f"{catalog_path} declares no projects — at least one catalog entry is required")
+def discover_projects() -> dict[str, ProjectEntry]:
+    root = Path.cwd()
+    discovered: dict[str, ProjectEntry] = {}
+    first_seen: dict[str, Path] = {}
 
-    for name, entry in catalog.items():
-        if not (entry.path / PROJECT_MARKER).is_file():
+    for directory in visible_directories(root):
+        config_path = directory / BUILD_CONFIG_FILENAME
+        if not config_path.is_file():
+            continue
+        if not (directory / PROJECT_MARKER).is_file():
+            raise SystemExit(
+                f"{config_path} sits in {directory}, which is not a Unity project: missing {PROJECT_MARKER}"
+            )
+        parsed = BuildConfigFile.model_validate_json(config_path.read_text(encoding="utf-8"))
+        if parsed.name in discovered:
             raise SystemExit(
-                f"Catalog entry '{name}' points at {entry.path}, which is not a Unity project: missing {PROJECT_MARKER}"
+                f"Duplicate project name '{parsed.name}' — declared at {config_path} "
+                f"and previously at {first_seen[parsed.name]}"
             )
-    return catalog
+        first_seen[parsed.name] = config_path
+        builds = list(parsed.platforms.keys()) if parsed.platforms else None
+        discovered[parsed.name] = ProjectEntry(path=directory, builds=builds)
+
+    if not discovered:
+        raise SystemExit(
+            f"No {BUILD_CONFIG_FILENAME} found under {root} — declare Unity projects with a "
+            f"{BUILD_CONFIG_FILENAME} per project root (carrying a 'name' field; 'platforms' "
+            f"keys are the build targets)"
+        )
+    return discovered
 
 
 def visible_directories(root: Path) -> Iterator[Path]:

unity_devkit/test_unity.py

@@ -5,7 +5,7 @@ from typing import Annotated
 
 import typer
 
-from .projects import load_catalog
+from .projects import discover_projects
 from .player_build import run_unity_batchmode
 
 app = typer.Typer(add_completion=False, pretty_exceptions_show_locals=False)
@@ -13,13 +13,13 @@ app = typer.Typer(add_completion=False, pretty_exceptions_show_locals=False)
 
 @app.command()
 def main(
-    project: Annotated[str, typer.Option(help="Unity project name (catalog key in unity-devkit.json)")],
+    project: Annotated[str, typer.Option(help="Unity project name (the 'name' field of its unity-devkit.json)")],
     test_platform: Annotated[str, typer.Option(help="Unity test platform (EditMode or PlayMode)")] = "EditMode",
     results: Annotated[Path, typer.Option(help="Output path for NUnit XML results")] = Path(
         "artifacts/unity-test-results.xml"
     ),
 ) -> None:
-    projects = load_catalog()
+    projects = discover_projects()
     if project not in projects:
         raise SystemExit(f"Unknown project '{project}'. Valid: {', '.join(projects)}")
 

{unity_devkit-0.1.16.dist-info → unity_devkit-0.1.18.dist-info}/METADATA

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

unity_devkit-0.1.18.dist-info/RECORD

@@ -0,0 +1,18 @@
+unity_devkit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+unity_devkit/build_unity.py,sha256=gYkfbMqZJ43DMvpRhp9WZ1zdkJhpRJ2uBXI2bGdIoGo,1545
+unity_devkit/ci_build_unity.py,sha256=93HyQhZl4IcG0dqkwjOq9SqKWBYP6WzzDlrfqfcwu6o,3931
+unity_devkit/compile_check_unity.py,sha256=WHg0YztiYes37dvnZrTNcUFO5T0MLSx_cCvA85wvr9k,1236
+unity_devkit/dispatch_workflow_generator.py,sha256=l85pGXl7XgHIzDJQmhFwuYONm5sz_90ziNE_8aQqhpM,9305
+unity_devkit/install.py,sha256=pKyweb7wrKU7UavmMWPV9wVdLB1Fs0G0cDgRBDro34c,5955
+unity_devkit/license.py,sha256=iiMdos8kMk4p5uYYroIWUzxvusXtcMRdPkIDXsYTC9c,1484
+unity_devkit/license_restore.py,sha256=Tbt2Kt1axszqj4H6K5Fx9_nqRL-dpL5XTVnxnmP4PZw,1077
+unity_devkit/lock_unity.py,sha256=-1d-mHva5XUOlki8LSO5qwABR52q7jzc7FTJnnTH9f8,1012
+unity_devkit/matrix.py,sha256=3fiHxkVyNFfCKzQRMXSo5c2P1tDHn0XteZXV-mQ8cxk,2057
+unity_devkit/player_build.py,sha256=AT6sZ1IoMzzRh0ECKcRL2YC1WrLqP7Kq7gGC0HRq8Iw,9914
+unity_devkit/projects.py,sha256=PO5plIj-mn8KkKOUhGRRIL_sDdd6ohl12neS2poILhs,2665
+unity_devkit/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+unity_devkit/test_unity.py,sha256=SpeWnV2hpdZBaGsstL8RTO50C2HEAcvantzBQYeaTpE,1075
+unity_devkit-0.1.18.dist-info/METADATA,sha256=547e4GP7RDUk_IEj4kDhq7Oi8asVScM-CzhFyEagYJI,290
+unity_devkit-0.1.18.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
+unity_devkit-0.1.18.dist-info/entry_points.txt,sha256=wdkAD7hjUPC4tDwe1ulAo5a0vWPXPO5sSGX1iN6VvJc,588
+unity_devkit-0.1.18.dist-info/RECORD,,

unity_devkit-0.1.16.dist-info/RECORD

@@ -1,18 +0,0 @@
-unity_devkit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-unity_devkit/build_unity.py,sha256=iROcoytNTlDnS2NeGxzARvOyNW08tee2PEBuKV54vFA,1536
-unity_devkit/ci_build_unity.py,sha256=XqYX--hUpvwYss7QCL1CNT8Jabiuz-DuEVrqqvK6PTE,3926
-unity_devkit/compile_check_unity.py,sha256=dLo2-c7y28SN88-oDsxQQPGLq3oV-MfFWABw3KB97IQ,1227
-unity_devkit/dispatch_workflow_generator.py,sha256=o0hri8uqUSENenE7WYwueXCiECAJAXSG4s4ECqml-Mw,9286
-unity_devkit/install.py,sha256=tUzqhobqAL0fI47w4vAMgP3IB69836cuK0iKsoO7btA,5945
-unity_devkit/license.py,sha256=iiMdos8kMk4p5uYYroIWUzxvusXtcMRdPkIDXsYTC9c,1484
-unity_devkit/license_restore.py,sha256=Tbt2Kt1axszqj4H6K5Fx9_nqRL-dpL5XTVnxnmP4PZw,1077
-unity_devkit/lock_unity.py,sha256=VPXlwKTGbbBGmQVjZRQdxX5JmYUY4n9Qu1Cylg8zQRE,1002
-unity_devkit/matrix.py,sha256=YlN2sJZsBRzzj1jBFSBkv0jYqhMQyihxIu3cqrH5GBk,2036
-unity_devkit/player_build.py,sha256=a3AgpqHk64WfN3TwUMzhF_NuhOOghcbfHhetdhfha8U,9899
-unity_devkit/projects.py,sha256=CBiIhnZUeGOSVznmlTCJ_Ey4P3FraBKSfZsvnVU0pXs,1971
-unity_devkit/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-unity_devkit/test_unity.py,sha256=ayjoleM4Rnj0vbfVxiL52CofBukf12CBwRSrUvirqEA,1056
-unity_devkit-0.1.16.dist-info/METADATA,sha256=seG2ICc6iog2GWsv4ReCiJ66sy1p3u_5BJvcyhrXVos,290
-unity_devkit-0.1.16.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
-unity_devkit-0.1.16.dist-info/entry_points.txt,sha256=wdkAD7hjUPC4tDwe1ulAo5a0vWPXPO5sSGX1iN6VvJc,588
-unity_devkit-0.1.16.dist-info/RECORD,,