unityflow 0.9.0__tar.gz → 0.9.2__tar.gz

{unityflow-0.9.0/src/unityflow.egg-info → unityflow-0.9.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: unityflow
-Version: 0.9.0
+Version: 0.9.2
 Summary: Unity workflow automation - edit, diff, and merge prefabs, scenes, and assets without the Unity Editor
 Author: unityflow contributors
 License: MIT

{unityflow-0.9.0 → unityflow-0.9.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "unityflow"
-version = "0.9.0"
+version = "0.9.2"
 description = "Unity workflow automation - edit, diff, and merge prefabs, scenes, and assets without the Unity Editor"
 readme = "README.md"
 license = {text = "MIT"}

{unityflow-0.9.0 → unityflow-0.9.2}/src/unityflow/asset_resolver.py

@@ -621,35 +621,28 @@ def resolve_internal_reference(
 ) -> dict[str, int]:
     """Resolve an internal # reference to a fileID dict.
 
-    Args:
-        value: Internal reference string (e.g., "#Player/Child/Button")
-        doc: UnityYAMLDocument instance
-        hierarchy: Hierarchy instance built from the document
-
-    Returns:
-        Dict with fileID (e.g., {"fileID": 12345})
-
-    Raises:
-        ValueError: If the reference cannot be resolved
+    Resolution strategy:
+    1. Try the full path as a GameObject path
+    2. If not found, split last segment as component type on its parent
     """
-    ref_path, component_type = parse_internal_reference(value)
+    raw_path = value[1:] if value.startswith("#") else value
 
-    target_node = hierarchy.find(ref_path)
-    if target_node is None:
-        raise ValueError(f"Internal reference not found: {ref_path}")
+    target_node = hierarchy.find(raw_path)
+    if target_node is not None:
+        return {"fileID": target_node.file_id}
 
-    if component_type:
-        target_comp = None
-        for comp in target_node.components:
-            comp_name = comp.script_name or comp.class_name
-            if comp_name == component_type:
-                target_comp = comp
-                break
-        if target_comp is None:
-            raise ValueError(f"Component '{component_type}' not found on '{ref_path}'")
-        return {"fileID": target_comp.file_id}
+    parts = raw_path.rsplit("/", 1)
+    if len(parts) == 2:
+        parent_path, comp_name = parts
+        parent_node = hierarchy.find(parent_path)
+        if parent_node is not None:
+            for comp in parent_node.components:
+                name = comp.script_name or comp.class_name
+                if name == comp_name:
+                    return {"fileID": comp.file_id}
+            raise ValueError(f"Component '{comp_name}' not found on '{parent_path}'")
 
-    return {"fileID": target_node.file_id}
+    raise ValueError(f"Internal reference not found: {raw_path}")
 
 
 def resolve_value(
@@ -765,3 +758,78 @@ def get_asset_info(
             pass
 
     return info
+
+
+def _is_reference_dict(value: Any) -> bool:
+    return isinstance(value, dict) and "fileID" in value
+
+
+def _build_sprite_id_to_name(meta_path: Path) -> dict[int, str]:
+    from unityflow.sprite import parse_sprite_meta
+
+    info = parse_sprite_meta(meta_path)
+    if info is None or not info.is_multiple:
+        return {}
+    return {v: k for k, v in info.internal_id_table.items()}
+
+
+def _humanize_single_reference(
+    ref: dict[str, Any],
+    guid_index: Any,
+    hierarchy: Any | None,
+    project_root: Path | None,
+) -> Any:
+    file_id = ref.get("fileID", 0)
+    guid = ref.get("guid", "")
+
+    if file_id == 0 and not guid:
+        return ""
+
+    if guid:
+        asset_path = guid_index.get_path(guid) if guid_index else None
+        if asset_path is None:
+            return ref
+
+        suffix = asset_path.suffix.lower()
+        is_sprite_ext = suffix in (".png", ".jpg", ".jpeg", ".tga", ".psd", ".tiff", ".gif", ".bmp")
+        if is_sprite_ext and file_id != 21300000 and project_root:
+            meta_path = project_root / str(asset_path) / ".." / (asset_path.name + ".meta")
+            meta_path = (project_root / str(asset_path)).with_suffix(asset_path.suffix + ".meta")
+            id_to_name = _build_sprite_id_to_name(meta_path)
+            sprite_name = id_to_name.get(file_id)
+            if sprite_name:
+                return f"@{asset_path}:{sprite_name}"
+
+        return f"@{asset_path}"
+
+    if file_id and hierarchy:
+        ref_node = hierarchy._nodes_by_file_id.get(file_id)
+        if ref_node:
+            return f"#{ref_node.path}"
+
+        for n in hierarchy.iter_all():
+            for c in n.components:
+                if c.file_id == file_id:
+                    return f"#{n.path}/{c.script_name or c.class_name}"
+
+        return ref
+
+    return ref
+
+
+def humanize_references(
+    value: Any,
+    guid_index: Any,
+    hierarchy: Any | None = None,
+    project_root: Path | None = None,
+) -> Any:
+    if _is_reference_dict(value):
+        return _humanize_single_reference(value, guid_index, hierarchy, project_root)
+
+    if isinstance(value, dict):
+        return {k: humanize_references(v, guid_index, hierarchy, project_root) for k, v in value.items()}
+
+    if isinstance(value, list):
+        return [humanize_references(item, guid_index, hierarchy, project_root) for item in value]
+
+    return value

{unityflow-0.9.0 → unityflow-0.9.2}/src/unityflow/cli.py

@@ -986,6 +986,18 @@ def _build_disambiguation_message(
     return "\n".join(error_lines)
 
 
+def _resolve_script_name(guid_index, script_guid: str, script_file_id: int | None = None) -> str | None:
+    resolved = guid_index.resolve_name(script_guid)
+    if resolved:
+        path = guid_index.get_path(script_guid)
+        if path and path.suffix.lower() == ".dll" and script_file_id is not None:
+            dll_name = guid_index.resolve_dll_class_name(script_guid, script_file_id)
+            if dll_name:
+                return dll_name
+        return resolved
+    return None
+
+
 def _resolve_component_path(
     doc: UnityYAMLDocument,
     path_spec: str,
@@ -1089,7 +1101,11 @@ def _resolve_component_path(
                     comp_content = comp.get_content()
                     if comp_content:
                         script_ref = comp_content.get("m_Script", {})
-                        script_guid = script_ref.get("guid", "") if isinstance(script_ref, dict) else ""
+                        if isinstance(script_ref, dict):
+                            script_guid = script_ref.get("guid", "")
+                            script_fid = script_ref.get("fileID")
+                        else:
+                            script_guid, script_fid = "", None
                         if script_guid:
                             for key, guid in PACKAGE_COMPONENT_GUIDS.items():
                                 if key.lower() == last_component_type_lower and script_guid.lower() == guid.lower():
@@ -1097,7 +1113,7 @@ def _resolve_component_path(
                                     matched = True
                                     break
                             if not matched and guid_index:
-                                resolved = guid_index.resolve_name(script_guid)
+                                resolved = _resolve_script_name(guid_index, script_guid, script_fid)
                                 if resolved and resolved.lower() == last_component_type_lower:
                                     matching_components.append(comp_id)
 
@@ -1178,7 +1194,11 @@ def _resolve_component_path(
                     comp_content = comp.get_content()
                     if comp_content:
                         script_ref = comp_content.get("m_Script", {})
-                        script_guid = script_ref.get("guid", "") if isinstance(script_ref, dict) else ""
+                        if isinstance(script_ref, dict):
+                            script_guid = script_ref.get("guid", "")
+                            script_fid = script_ref.get("fileID")
+                        else:
+                            script_guid, script_fid = "", None
                         if script_guid:
                             for key, guid in PACKAGE_COMPONENT_GUIDS.items():
                                 if key.lower() == component_type_lower and script_guid.lower() == guid.lower():
@@ -1186,7 +1206,7 @@ def _resolve_component_path(
                                     matched = True
                                     break
                             if not matched and guid_index:
-                                resolved = guid_index.resolve_name(script_guid)
+                                resolved = _resolve_script_name(guid_index, script_guid, script_fid)
                                 if resolved and resolved.lower() == component_type_lower:
                                     matching_components.append(comp_id)
 
@@ -1245,6 +1265,7 @@ def _handle_add_component(
     output: Path | None,
     project_root: Path | None,
     explicit_script_guid: str | None = None,
+    before: str | None = None,
 ) -> None:
     from unityflow.asset_tracker import get_cached_guid_index
     from unityflow.formats import CLASS_NAME_TO_ID
@@ -1441,7 +1462,30 @@ def _handle_add_component(
         go_content = go_obj.get_content()
         if go_content:
             components = go_content.get("m_Component", [])
-            components.append({"component": {"fileID": new_file_id}})
+            new_entry = {"component": {"fileID": new_file_id}}
+            insert_idx = len(components)
+            if before is not None:
+                before_lower = before.lower()
+                for idx, comp_ref in enumerate(components):
+                    cid = comp_ref.get("component", {}).get("fileID", 0)
+                    comp_obj = doc.get_by_file_id(cid)
+                    if comp_obj:
+                        comp_name = comp_obj.class_name.lower()
+                        if comp_name == before_lower:
+                            insert_idx = idx
+                            break
+                        if comp_obj.class_id == 114 and guid_index:
+                            comp_content = comp_obj.get_content()
+                            if comp_content:
+                                sr = comp_content.get("m_Script", {})
+                                if isinstance(sr, dict):
+                                    sg = sr.get("guid", "")
+                                    sf = sr.get("fileID")
+                                    resolved = _resolve_script_name(guid_index, sg, sf) if sg else None
+                                    if resolved and resolved.lower() == before_lower:
+                                        insert_idx = idx
+                                        break
+            components.insert(insert_idx, new_entry)
             go_content["m_Component"] = components
 
     _normalize_and_save(doc, output_path, project_root)
@@ -1850,6 +1894,12 @@ def get_value_cmd(
     default=None,
     help="Script GUID for --add-component (for DLL-based scripts not discoverable by filename)",
 )
+@click.option(
+    "--before",
+    "before_component",
+    default=None,
+    help="Insert component before this component type (for --add-component ordering)",
+)
 def set_value_cmd(
     file: Path,
     set_path: str,
@@ -1864,6 +1914,7 @@ def set_value_cmd(
     remove_object: str | None,
     object_type: str,
     script_guid: str | None,
+    before_component: str | None,
 ) -> None:
     """Set a value at a specific path in a Unity YAML file.
 
@@ -1991,7 +2042,9 @@ def set_value_cmd(
 
     # Handle --add-component
     if add_component is not None:
-        _handle_add_component(doc, set_path, add_component, output_path, output, project_root, script_guid)
+        _handle_add_component(
+            doc, set_path, add_component, output_path, output, project_root, script_guid, before_component
+        )
         return
 
     # Handle --remove-component
@@ -2787,6 +2840,7 @@ def inspect_cmd(
     import json as json_module
 
     from unityflow import UnityYAMLDocument, build_hierarchy
+    from unityflow.asset_resolver import humanize_references
     from unityflow.asset_tracker import find_unity_project_root, get_lazy_guid_index
 
     # Load document
@@ -2881,38 +2935,36 @@ def inspect_cmd(
                     script_path = guid_index.resolve_path(comp.script_guid)
                     if script_path:
                         comp_data["script_path"] = str(script_path)
-            comp_data["properties"] = comp.data
+            filtered = {
+                k: v
+                for k, v in comp.data.items()
+                if k
+                not in {
+                    "m_ObjectHideFlags",
+                    "m_CorrespondingSourceObject",
+                    "m_PrefabInstance",
+                    "m_PrefabAsset",
+                    "m_GameObject",
+                    "m_Script",
+                }
+            }
+            comp_data["properties"] = humanize_references(filtered, guid_index, hier, resolved_project_root)
             result["components"].append(comp_data)
 
         click.echo(json_module.dumps(result, indent=2, default=str))
     else:
-        # Helper function to resolve file_id to path
-        def resolve_reference(file_id: int, guid: str = "") -> str:
-            """Resolve a reference to a human-readable path."""
-            if file_id == 0 and not guid:
-                return "None"
-
-            # Try to resolve internal reference (same file)
-            if file_id and not guid:
-                ref_node = hier._nodes_by_file_id.get(file_id)
-                if ref_node:
-                    return ref_node.path
-
-                # Try to find component by file_id
-                for n in hier.iter_all():
-                    for c in n.components:
-                        if c.file_id == file_id:
-                            return f"{n.path}/{c.script_name or c.class_name}"
-
-                return f"(internal ref #{file_id})"
-
-            # External reference (different asset)
-            if guid and guid_index:
-                asset_path = guid_index.get_path(guid)
-                if asset_path:
-                    return f"@{asset_path}"
-
-            return "(external ref)"
+
+        def format_value(value):
+            resolved = humanize_references(value, guid_index, hier, resolved_project_root)
+            if isinstance(resolved, str):
+                return resolved if resolved else "None"
+            if isinstance(resolved, dict):
+                if "fileID" in resolved:
+                    return f"(unresolved ref fileID={resolved['fileID']})"
+                return "{...}"
+            if isinstance(resolved, list):
+                return f"[{len(resolved)} items]"
+            return str(resolved)
 
         # Text output - Inspector-like format
         click.echo(f"GameObject: {node.name}")
@@ -3009,21 +3061,7 @@ def inspect_cmd(
             }
             for key, value in comp.data.items():
                 if key not in skip_keys:
-                    # Format value for display
-                    if isinstance(value, dict) and "fileID" in value:
-                        # Reference field - resolve to path
-                        file_id = value.get("fileID", 0)
-                        guid = value.get("guid", "")
-                        resolved = resolve_reference(file_id, guid)
-                        click.echo(f"  {key}: {resolved}")
-                    elif isinstance(value, dict | list):
-                        # Complex value - show abbreviated
-                        if isinstance(value, list):
-                            click.echo(f"  {key}: [{len(value)} items]")
-                        else:
-                            click.echo(f"  {key}: {{...}}")
-                    else:
-                        click.echo(f"  {key}: {value}")
+                    click.echo(f"  {key}: {format_value(value)}")
 
             click.echo()
 

{unityflow-0.9.0 → unityflow-0.9.2/src/unityflow.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: unityflow
-Version: 0.9.0
+Version: 0.9.2
 Summary: Unity workflow automation - edit, diff, and merge prefabs, scenes, and assets without the Unity Editor
 Author: unityflow contributors
 License: MIT