appium-webdriveragent 16.13.0 → 16.13.1

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+## [16.13.1](https://github.com/appium/WebDriverAgent/compare/v16.13.0...v16.13.1) (2026-09-30)
+
+### Performance Improvements
+
+* reuse sibling indices and geometry during XML serialization ([#1283](https://github.com/appium/WebDriverAgent/issues/1283)) ([f352660](https://github.com/appium/WebDriverAgent/commit/f352660deb52728c195a875b4172e38e1a1496b8))
+
 ## [16.13.0](https://github.com/appium/WebDriverAgent/compare/v16.12.11...v16.13.0) (2026-09-30)
 
 ### Features

package/WebDriverAgentLib/Info.plist

@@ -15,11 +15,11 @@
     <key>CFBundlePackageType</key>
     <string>FMWK</string>
     <key>CFBundleShortVersionString</key>
-    <string>16.13.0</string>
+    <string>16.13.1</string>
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleVersion</key>
-    <string>16.13.0</string>
+    <string>16.13.1</string>
     <key>NSPrincipalClass</key>
     <string/>
   </dict>

package/WebDriverAgentLib/Utilities/FBXPath.m

@@ -504,6 +504,18 @@ static NSString *const topNodeIndexPath = @"top";
                      indexPath:(nullable NSString *)indexPath
             includedAttributes:(nullable NSSet<Class> *)includedAttributes
 {
+  return [self recordElementAttributes:writer forElement:element indexPath:indexPath
+                   includedAttributes:includedAttributes siblingIndex:nil];
+}
+
++ (int)recordElementAttributes:(xmlTextWriterPtr)writer
+                    forElement:(id<FBXCElementSnapshot>)element
+                     indexPath:(nullable NSString *)indexPath
+            includedAttributes:(nullable NSSet<Class> *)includedAttributes
+                  siblingIndex:(nullable NSNumber *)siblingIndex
+{
+  FBXCElementSnapshotWrapper *wrapped = [FBXCElementSnapshotWrapper ensureWrapped:element];
+  NSDictionary *rect = nil;
   for (Class attributeCls in FBElementAttribute.supportedAttributes) {
     // include all supported attributes by default unless enumerated explicitly
     if (includedAttributes && ![includedAttributes containsObject:attributeCls]) {
@@ -519,8 +531,15 @@ static NSString *const topNodeIndexPath = @"top";
         !FBDoesElementSupportMinMaxValue(element.elementType)) {
       continue;
     }
-    int rc = [attributeCls recordWithWriter:writer
-                                 forElement:[FBXCElementSnapshotWrapper ensureWrapped:element]];
+    int rc;
+    if (attributeCls == FBIndexAttribute.class && nil != siblingIndex) {
+      rc = [attributeCls recordWithWriter:writer forValue:siblingIndex.stringValue];
+    } else if ([attributeCls isSubclassOfClass:FBDimensionAttribute.class]) {
+      rect = rect ?: wrapped.wdRect;
+      rc = [attributeCls recordWithWriter:writer forValue:[rect[[attributeCls name]] description]];
+    } else {
+      rc = [attributeCls recordWithWriter:writer forElement:wrapped];
+    }
     if (rc < 0) {
       return rc;
     }
@@ -559,6 +578,17 @@ static NSString *const topNodeIndexPath = @"top";
                   elementStore:(nullable NSMutableDictionary *)elementStore
             includedAttributes:(nullable NSSet<Class> *)includedAttributes
                         writer:(xmlTextWriterPtr)writer
+{
+  return [self writeXmlWithRootElement:root indexPath:indexPath elementStore:elementStore
+                   includedAttributes:includedAttributes writer:writer siblingIndex:nil];
+}
+
++ (int)writeXmlWithRootElement:(id<FBXCElementSnapshot>)root
+                     indexPath:(nullable NSString *)indexPath
+                  elementStore:(nullable NSMutableDictionary *)elementStore
+            includedAttributes:(nullable NSSet<Class> *)includedAttributes
+                        writer:(xmlTextWriterPtr)writer
+                  siblingIndex:(nullable NSNumber *)siblingIndex
 {
   NSAssert((indexPath == nil && elementStore == nil) || (indexPath != nil && elementStore != nil), @"Either both or none of indexPath and elementStore arguments should be equal to nil", nil);
 
@@ -578,7 +608,8 @@ static NSString *const topNodeIndexPath = @"top";
   rc = [self recordElementAttributes:writer
                           forElement:root
                            indexPath:indexPath
-                  includedAttributes:includedAttributes];
+                  includedAttributes:includedAttributes
+                        siblingIndex:siblingIndex];
   if (rc < 0) {
     return rc;
   }
@@ -594,7 +625,8 @@ static NSString *const topNodeIndexPath = @"top";
                                indexPath:newIndexPath
                             elementStore:elementStore
                       includedAttributes:includedAttributes
-                                  writer:writer];
+                                  writer:writer
+                            siblingIndex:@(i)];
       if (rc < 0) {
         return rc;
       }

package/WebDriverAgentTests/UnitTests/FBXPathTests.m

@@ -16,11 +16,47 @@
 #import "FBXCElementSnapshotWrapper+Helpers.h"
 #import "XCTestPrivateSymbols.h"
 
+@interface FBTraversalSnapshot : XCElementSnapshotDouble
+@property (nonatomic, copy) NSArray *childSnapshots;
+@property (nonatomic, weak) FBTraversalSnapshot *parentSnapshot;
+@property (nonatomic) NSUInteger childrenReads;
+@property (nonatomic) NSUInteger frameReads;
+@end
+@implementation FBTraversalSnapshot
+- (NSArray *)children { self.childrenReads++; return self.childSnapshots ?: @[]; }
+- (id)parent { return self.parentSnapshot; }
+- (CGRect)frame { self.frameReads++; return CGRectMake(1, 2, 3, 4); }
+@end
+
 @interface FBXPathTests : XCTestCase
 @end
 
 @implementation FBXPathTests
 
+- (void)testSerializationVisitsSiblingListAndFrameOnce
+{
+  FBTraversalSnapshot *root = [FBTraversalSnapshot new];
+  NSMutableArray *children = [NSMutableArray array];
+  for (NSUInteger index = 0; index < 64; index++) {
+    FBTraversalSnapshot *child = [FBTraversalSnapshot new];
+    child.parentSnapshot = root;
+    [children addObject:child];
+  }
+  root.childSnapshots = children;
+  NSString *query = @"//*[@index >= 0 and @x=1 and @y=2 and @width=3 and @height=4]";
+  xmlDocPtr doc = [self documentForSnapshot:root query:query];
+  @try {
+    XCTAssertEqual(root.childrenReads, 1u);
+    XCTAssertEqual(root.frameReads, 1u);
+    for (FBTraversalSnapshot *child in children) {
+      XCTAssertEqual(child.frameReads, 1u);
+    }
+    XCTAssertEqualObjects([self xpathStringResultForQuery:@"count(//*[@index=63])" document:doc], @"1");
+  } @finally {
+    xmlFreeDoc(doc);
+  }
+}
+
 - (NSString *)xmlStringWithElement:(id<FBXCElementSnapshot>)snapshot
                         xpathQuery:(nullable NSString *)query
                excludingAttributes:(nullable NSArray<NSString *> *)excludedAttributes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "appium-webdriveragent",
-  "version": "16.13.0",
+  "version": "16.13.1",
   "description": "Package bundling WebDriverAgent",
   "keywords": [
     "Appium",