appium-webdriveragent 4.10.5 → 4.10.7

package/CHANGELOG.md

@@ -1,3 +1,7 @@
+## [4.10.7](https://github.com/appium/WebDriverAgent/compare/v4.10.6...v4.10.7) (2022-11-24)
+
+## [4.10.6](https://github.com/appium/WebDriverAgent/compare/v4.10.5...v4.10.6) (2022-11-23)
+
 ## [4.10.5](https://github.com/appium/WebDriverAgent/compare/v4.10.4...v4.10.5) (2022-11-22)
 
 ## [4.10.4](https://github.com/appium/WebDriverAgent/compare/v4.10.3...v4.10.4) (2022-11-22)

package/WebDriverAgentLib/Categories/XCUIElement+FBCaching.m

@@ -48,7 +48,7 @@ static char XCUIELEMENT_CACHE_ID_KEY;
     uid = self.fb_uid;
   } else {
     id<FBXCElementSnapshot> snapshot = self.fb_cachedSnapshot ?: self.fb_takeSnapshot;
-    uid = [FBXCElementSnapshotWrapper ensureWrapped:snapshot].wdUID;
+    uid = [FBXCElementSnapshotWrapper wdUIDWithSnapshot:snapshot];
   }
 
   objc_setAssociatedObject(self, &XCUIELEMENT_CACHE_ID_KEY, uid, OBJC_ASSOCIATION_RETAIN_NONATOMIC);

package/WebDriverAgentLib/Categories/XCUIElement+FBFind.m

@@ -16,6 +16,7 @@
 #import "FBXCElementSnapshotWrapper+Helpers.h"
 #import "FBXCodeCompatibility.h"
 #import "XCUIElement+FBCaching.h"
+#import "XCUIElement+FBUID.h"
 #import "XCUIElement+FBUtilities.h"
 #import "XCUIElement+FBWebDriverAttributes.h"
 #import "XCUIElementQuery.h"
@@ -48,7 +49,8 @@
   XCUIElementType type = [FBElementTypeTransformer elementTypeWithTypeName:className];
   XCUIElementQuery *query = [self.fb_query descendantsMatchingType:type];
   NSMutableArray *result = [NSMutableArray array];
-  [result addObjectsFromArray:[self.class fb_extractMatchingElementsFromQuery:query shouldReturnAfterFirstMatch:shouldReturnAfterFirstMatch]];
+  [result addObjectsFromArray:[self.class fb_extractMatchingElementsFromQuery:query
+                                                  shouldReturnAfterFirstMatch:shouldReturnAfterFirstMatch]];
   id<FBXCElementSnapshot> cachedSnapshot = [self fb_cachedSnapshotWithQuery:query];
   if (type == XCUIElementTypeAny || cachedSnapshot.elementType == type) {
     if (shouldReturnAfterFirstMatch || result.count == 0) {
@@ -66,40 +68,10 @@
                                                      value:(NSString *)value
                                              partialSearch:(BOOL)partialSearch
 {
-  NSMutableArray *elements = [NSMutableArray array];
-  [self descendantsWithProperty:property value:value partial:partialSearch results:elements];
-  return elements;
+  NSPredicate *searchPredicate = [NSPredicate predicateWithFormat:(partialSearch ? @"%K CONTAINS %@" : @"%K == %@"), property, value];
+  return [self fb_descendantsMatchingPredicate:searchPredicate shouldReturnAfterFirstMatch:NO];
 }
 
-- (void)descendantsWithProperty:(NSString *)property value:(NSString *)value
-                        partial:(BOOL)partialSearch
-                        results:(NSMutableArray<XCUIElement *> *)results
-{
-  if (partialSearch) {
-    NSString *text = [self fb_valueForWDAttributeName:property];
-    BOOL isString = [text isKindOfClass:[NSString class]];
-    if (isString && [text rangeOfString:value].location != NSNotFound) {
-      [results addObject:self];
-    }
-  } else {
-    if ([[self fb_valueForWDAttributeName:property] isEqual:value]) {
-      [results addObject:self];
-    }
-  }
-
-  property = [FBElementUtils wdAttributeNameForAttributeName:property];
-  NSPredicate *predicate = [NSPredicate predicateWithBlock:^BOOL(id<FBXCElementSnapshot> snapshot,
-                                                                 NSDictionary<NSString *,id> * _Nullable bindings) {
-    FBXCElementSnapshotWrapper *wrappedSnapshot = [FBXCElementSnapshotWrapper ensureWrapped:snapshot];
-    NSString *propertyValue = [NSString stringWithFormat:@"%@", [wrappedSnapshot fb_valueForWDAttributeName:property]];
-    return partialSearch ? [value containsString:propertyValue] : [value isEqualToString:propertyValue];
-  }];
-  XCUIElementQuery *query = [[self.fb_query descendantsMatchingType:XCUIElementTypeAny] matchingPredicate:predicate];
-  NSArray *childElements = query.fb_allMatches;
-  [results addObjectsFromArray:childElements];
-}
-
-
 #pragma mark - Search by Predicate String
 
 - (NSArray<XCUIElement *> *)fb_descendantsMatchingPredicate:(NSPredicate *)predicate
@@ -138,7 +110,7 @@
     matchingSnapshots = @[snapshot];
   }
   return [self fb_filterDescendantsWithSnapshots:matchingSnapshots
-                                         selfUID:[FBXCElementSnapshotWrapper ensureWrapped:self.lastSnapshot].wdUID
+                                         selfUID:[FBXCElementSnapshotWrapper wdUIDWithSnapshot:self.lastSnapshot]
                                     onlyChildren:NO];
 }
 
@@ -150,8 +122,7 @@
 {
   NSPredicate *predicate = [NSPredicate predicateWithBlock:^BOOL(id<FBXCElementSnapshot> snapshot,
                                                                  NSDictionary<NSString *,id> * _Nullable bindings) {
-    FBXCElementSnapshotWrapper *wrappedSnapshot = [FBXCElementSnapshotWrapper ensureWrapped:snapshot];
-    return [wrappedSnapshot.wdName isEqualToString:accessibilityId];
+    return [[FBXCElementSnapshotWrapper wdNameWithSnapshot:snapshot] isEqualToString:accessibilityId];
   }];
   return [self fb_descendantsMatchingPredicate:predicate
                    shouldReturnAfterFirstMatch:shouldReturnAfterFirstMatch];

package/WebDriverAgentLib/Categories/XCUIElement+FBIsVisible.m

@@ -34,9 +34,9 @@
 
 @implementation FBXCElementSnapshotWrapper (FBIsVisible)
 
-- (NSString *)fb_uniqId
++ (NSString *)fb_uniqIdWithSnapshot:(id<FBXCElementSnapshot>)snapshot
 {
-  return self.fb_uid ?: [NSString stringWithFormat:@"%p", (void *)self];
+  return [FBXCElementSnapshotWrapper wdUIDWithSnapshot:snapshot] ?: [NSString stringWithFormat:@"%p", (void *)snapshot];
 }
 
 - (nullable NSNumber *)fb_cachedVisibilityValue
@@ -46,14 +46,14 @@
     return nil;
   }
 
-  NSDictionary<NSString *, NSNumber *> *result = [cache objectForKey:@(self.generation)];
+  NSDictionary<NSString *, NSNumber *> *result = cache[@(self.generation)];
   if (nil == result) {
     // There is no need to keep the cached data for the previous generations
     [cache removeAllObjects];
-    [cache setObject:[NSMutableDictionary dictionary] forKey:@(self.generation)];
+    cache[@(self.generation)] = [NSMutableDictionary dictionary];
     return nil;
   }
-  return [result objectForKey:self.fb_uniqId];
+  return result[[self.class fb_uniqIdWithSnapshot:self.snapshot]];
 }
 
 - (BOOL)fb_cacheVisibilityWithValue:(BOOL)isVisible
@@ -63,19 +63,19 @@
   if (nil == cache) {
     return isVisible;
   }
-  NSMutableDictionary<NSString *, NSNumber *> *destination = [cache objectForKey:@(self.generation)];
+  NSMutableDictionary<NSString *, NSNumber *> *destination = cache[@(self.generation)];
   if (nil == destination) {
     return isVisible;
   }
 
   NSNumber *visibleObj = [NSNumber numberWithBool:isVisible];
-  [destination setObject:visibleObj forKey:self.fb_uniqId];
+  destination[[self.class fb_uniqIdWithSnapshot:self.snapshot]] = visibleObj;
   if (isVisible && nil != ancestors) {
     // if an element is visible then all its ancestors must be visible as well
     for (id<FBXCElementSnapshot> ancestor in ancestors) {
-      NSString *ancestorId = [FBXCElementSnapshotWrapper ensureWrapped:ancestor].fb_uniqId;
-      if (nil == [destination objectForKey:ancestorId]) {
-        [destination setObject:visibleObj forKey:ancestorId];
+      NSString *ancestorId = [self.class fb_uniqIdWithSnapshot:ancestor];
+      if (nil == destination[ancestorId]) {
+        destination[ancestorId] = visibleObj;
       }
     }
   }

package/WebDriverAgentLib/Categories/XCUIElement+FBResolve.m

@@ -41,13 +41,14 @@ static char XCUIELEMENT_IS_RESOLVED_NATIVELY_KEY;
   XCUIElementQuery *query = [self isKindOfClass:XCUIApplication.class]
     ? self.application.fb_query
     : [self.application.fb_query descendantsMatchingType:XCUIElementTypeAny];
-  FBXCElementSnapshotWrapper *cachedSnapshot = [FBXCElementSnapshotWrapper ensureWrapped:self.fb_cachedSnapshot];
-  NSString *uid = nil == cachedSnapshot ? self.fb_uid : cachedSnapshot.fb_uid;
+  NSString *uid = nil == self.fb_cachedSnapshot
+    ? self.fb_uid
+    : [FBXCElementSnapshotWrapper wdUIDWithSnapshot:(id)self.fb_cachedSnapshot];
   if (nil == uid) {
     return self;
   }
   NSPredicate *predicate = [NSPredicate predicateWithBlock:^BOOL(id<FBXCElementSnapshot> snapshot, NSDictionary *bindings) {
-    return [[FBXCElementSnapshotWrapper ensureWrapped:snapshot].fb_uid isEqualToString:uid];
+    return [[FBXCElementSnapshotWrapper wdUIDWithSnapshot:snapshot] isEqualToString:uid];
   }];
   return (XCUIElement *)[query matchingPredicate:predicate].fb_firstMatch;
 }

package/WebDriverAgentLib/Categories/XCUIElement+FBUID.h

@@ -30,6 +30,14 @@ NS_ASSUME_NONNULL_BEGIN
 /*! Represents unique internal element identifier, which is the same for an element and its snapshot */
 @property (nonatomic, readonly) unsigned long long fb_accessibiltyId;
 
+/**
+ Fetches wdUID attribute value for the given snapshot instance
+
+ @param snapshot snapshot instance
+ @return UID attribute value
+ */
++ (nullable NSString *)wdUIDWithSnapshot:(id<FBXCElementSnapshot>)snapshot;
+
 @end
 
 NS_ASSUME_NONNULL_END

package/WebDriverAgentLib/Categories/XCUIElement+FBUID.m

@@ -38,9 +38,14 @@
   return [FBElementUtils idWithAccessibilityElement:self.accessibilityElement];
 }
 
++ (nullable NSString *)wdUIDWithSnapshot:(id<FBXCElementSnapshot>)snapshot
+{
+  return [FBElementUtils uidWithAccessibilityElement:[snapshot accessibilityElement]];
+}
+
 - (NSString *)fb_uid
 {
-  return [FBElementUtils uidWithAccessibilityElement:[self accessibilityElement]];
+  return [self.class wdUIDWithSnapshot:self.snapshot];
 }
 
 @end

package/WebDriverAgentLib/Categories/XCUIElement+FBUtilities.m

@@ -134,13 +134,16 @@
   }
   NSMutableArray<NSString *> *sortedIds = [NSMutableArray new];
   for (id<FBXCElementSnapshot> snapshot in snapshots) {
-    [sortedIds addObject:(NSString *)[FBXCElementSnapshotWrapper ensureWrapped:snapshot].fb_uid];
+    NSString *uid = [FBXCElementSnapshotWrapper wdUIDWithSnapshot:snapshot];
+    if (nil != uid) {
+      [sortedIds addObject:uid];
+    }
   }
   NSMutableArray<XCUIElement *> *matchedElements = [NSMutableArray array];
   NSString *uid = selfUID;
   if (nil == uid) {
     uid = self.fb_isResolvedFromCache.boolValue
-      ? [FBXCElementSnapshotWrapper ensureWrapped:self.lastSnapshot].fb_uid
+      ? [FBXCElementSnapshotWrapper wdUIDWithSnapshot:self.lastSnapshot]
       : self.fb_uid;
   }
   if ([sortedIds containsObject:uid]) {
@@ -158,7 +161,7 @@
     ? [self.fb_query childrenMatchingType:type]
     : [self.fb_query descendantsMatchingType:type];
   NSPredicate *predicate = [NSPredicate predicateWithBlock:^BOOL(id<FBXCElementSnapshot> snapshot, NSDictionary *bindings) {
-    return [sortedIds containsObject:(NSString *)[FBXCElementSnapshotWrapper ensureWrapped:snapshot].fb_uid];
+    return [sortedIds containsObject:[FBXCElementSnapshotWrapper wdUIDWithSnapshot:snapshot] ?: @""];
   }];
   query = [query matchingPredicate:predicate];
   if (1 == snapshots.count) {

package/WebDriverAgentLib/Categories/XCUIElement+FBWebDriverAttributes.h

@@ -20,6 +20,14 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface FBXCElementSnapshotWrapper (WebDriverAttributes) <FBElement>
 
+/**
+ Fetches wdName attribute value for the given snapshot instance
+
+ @param snapshot snapshot instance
+ @return wdName attribute value or nil
+ */
++ (nullable NSString *)wdNameWithSnapshot:(id<FBXCElementSnapshot>)snapshot;
+
 @end
 
 NS_ASSUME_NONNULL_END

package/WebDriverAgentLib/Categories/XCUIElement+FBWebDriverAttributes.m

@@ -100,18 +100,23 @@
     value = [NSString stringWithFormat:@"%@", value];
   }
   return value;
- }
+}
 
-- (NSString *)wdName
++ (NSString *)wdNameWithSnapshot:(id<FBXCElementSnapshot>)snapshot
 {
-  NSString *identifier = self.identifier;
+  NSString *identifier = snapshot.identifier;
   if (nil != identifier && identifier.length != 0) {
     return identifier;
   }
-  NSString *label = self.label;
+  NSString *label = snapshot.label;
   return FBTransferEmptyStringToNil(label);
 }
 
+- (NSString *)wdName
+{
+  return [self.class wdNameWithSnapshot:self.snapshot];
+}
+
 - (NSString *)wdLabel
 {
   NSString *label = self.label;

package/WebDriverAgentLib/Commands/FBFindElementCommands.m

@@ -22,6 +22,7 @@
 #import "XCUIElement+FBClassChain.h"
 #import "XCUIElement+FBFind.h"
 #import "XCUIElement+FBIsVisible.h"
+#import "XCUIElement+FBUID.h"
 #import "XCUIElement+FBUtilities.h"
 #import "XCUIElement+FBWebDriverAttributes.h"
 
@@ -88,7 +89,7 @@ static id<FBResponsePayload> FBNoSuchElementErrorResponseForRequest(FBRouteReque
       && [FBXCElementSnapshotWrapper ensureWrapped:snapshot].wdVisible;
   }];
   NSArray *cells = [element fb_filterDescendantsWithSnapshots:visibleCellSnapshots
-                                                      selfUID:[FBXCElementSnapshotWrapper ensureWrapped:element.lastSnapshot].wdUID
+                                                      selfUID:[FBXCElementSnapshotWrapper wdUIDWithSnapshot:element.lastSnapshot]
                                                  onlyChildren:NO];
   return FBResponseWithCachedElements(cells, request.session.elementCache, FBConfiguration.shouldUseCompactResponses);
 }

package/WebDriverAgentLib/Utilities/NSPredicate+FBFormat.m

@@ -52,6 +52,10 @@
 
 + (instancetype)fb_snapshotBlockPredicateWithPredicate:(NSPredicate *)input
 {
+  if ([NSStringFromClass(input.class) isEqualToString:@"NSBlockPredicate"]) {
+    return input;
+  }
+
   NSPredicate *wdPredicate = [self.class fb_formatSearchPredicate:input];
   return [NSPredicate predicateWithBlock:^BOOL(id evaluatedObject,
                                                NSDictionary<NSString *,id> * _Nullable bindings) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "appium-webdriveragent",
-  "version": "4.10.5",
+  "version": "4.10.7",
   "description": "Package bundling WebDriverAgent",
   "main": "./build/index.js",
   "scripts": {