Implements NodeBase.depth and node ordering w/o TagNode.location_path

_delb/nodes.py

@@ -1960,9 +1960,12 @@ def css_select(
 
     @property
     def depth(self) -> int:
-        if self.parent is None:
-            return 0
-        return self.location_path.count("/")
+        result = 0
+        node = self
+        while node.parent:
+            node = node.parent
+            result += 1
+        return result
 
     @altered_default_filters()
     def detach(self, retain_child_nodes: bool = False) -> _ElementWrappingNode:

_delb/utils.py

@@ -362,19 +362,29 @@ def _random_unused_prefix(namespaces: etree._NSMap) -> str:
 
 
 def sort_nodes_in_document_order(nodes: Iterable[NodeBase]) -> Iterator[NodeBase]:
+    node_index_cache: dict[int, int] = {}
     sorter = _NodesSorter()
     for node in nodes:
         if not _is_node_of_type(node, "TagNode"):
             raise NotImplementedError(
                 "Support for sorting other node types than TagNodes isn't scheduled"
                 "yet."
             )
+
         node = cast("TagNode", node)
-        if node.parent is None:
-            path = []
-        else:
-            path = [int(x[2:-1]) for x in node.location_path.split("/")[1:]]
-        sorter.add(path, node)
+        ancestors_indexes = []
+
+        while node.parent is not None:
+            node_id = id(node)
+            if node_id in node_index_cache:
+                index = node_index_cache[node_id]
+            else:
+                assert node.index is not None
+                node_index_cache[node_id] = index = node.index
+            ancestors_indexes.append(index)
+            node = node.parent
+
+        sorter.add(tuple(reversed(ancestors_indexes)), node)
     yield from sorter.emit()