feat: sort the element keys

Author: codematrixer

uiviewer/parser/android_hierarchy.py

@@ -63,7 +63,7 @@ def _parse_uiautomator_node(node):
     return attributes
 
 
-def get_android_hierarchy(page_xml: bytes) -> Dict:
+def get_android_hierarchy(page_xml: str) -> Dict:
     dom = xml.dom.minidom.parseString(page_xml)
     root = dom.documentElement
 
@@ -72,9 +72,20 @@ def travel(node):
             return
         json_node = _parse_uiautomator_node(node)
         json_node['_id'] = str(uuid.uuid4())
+        json_node.pop("package", None)
         if node.childNodes:
-            children = [travel(n) for n in node.childNodes if travel(n)]
+            children = []
+            for n in node.childNodes:
+                child = travel(n)
+                if child:
+                    children.append(child)
             json_node['children'] = children
-        return json_node
+
+        # Sort the keys
+        keys_order = ['_type', 'resourceId', 'text', 'description']
+        sorted_node = {k: json_node[k] for k in keys_order if k in json_node}
+        sorted_node.update({k: json_node[k] for k in json_node if k not in keys_order})
+
+        return sorted_node
 
     return travel(root)

uiviewer/parser/ios_hierarchy.py

@@ -9,11 +9,20 @@ def convert_ios_hierarchy(data: Dict, scale: int) -> Dict:
     def __travel(node):
         node['_id'] = str(uuid.uuid4())
         node['_type'] = node.pop('type', "null")
+        node['id'] = node.pop('rawIdentifier', "null")
         if 'rect' in node:
             rect = node['rect']
             node['rect'] = {k: v * scale for k, v in rect.items()}
-        for child in node.get('children', []):
-            __travel(child)
-        return node
+
+        # Recursively process children nodes
+        if 'children' in node:
+            node['children'] = [__travel(child) for child in node['children']]
+
+        # Sort the keys
+        keys_order = ['_type', 'label', 'name', 'id', 'value']
+        sorted_node = {k: node[k] for k in keys_order if k in node}
+        sorted_node.update({k: node[k] for k in node if k not in keys_order})
+
+        return sorted_node
 
     return __travel(data)