appium-novawindows2-driver 0.2.6 → 0.2.8

package/build/lib/powershell/elements.js

@@ -252,10 +252,10 @@ const FIND_ALL_CHILDREN_OR_SELF = (0, core_1.pwsh$ /* ps1 */) `
 
     Write-Output $els
 `;
-const FIND_DESCENDANTS = (0, core_1.pwsh$ /* ps1 */) `if ($null -ne ${0}) { Find-ChildrenRecursively -element (${0}) -condition (${1}) }`;
-const FIND_ALL_DESCENDANTS = (0, core_1.pwsh$ /* ps1 */) `if ($null -ne ${0}) { Find-AllChildrenRecursively -element (${0}) -condition (${1}) }`;
-const FIND_DESCENDANTS_OR_SELF = (0, core_1.pwsh$ /* ps1 */) `if ($null -ne ${0}) { Find-ChildrenRecursively -element (${0}) -condition (${1}) -includeSelf $true }`;
-const FIND_ALL_DESCENDANTS_OR_SELF = (0, core_1.pwsh$ /* ps1 */) `if ($null -ne ${0}) { Find-AllChildrenRecursively -element (${0}) -condition (${1}) -includeSelf $true }`;
+const FIND_DESCENDANTS = (0, core_1.pwsh$ /* ps1 */) `Find-ChildrenRecursively -element (${0}) -condition (${1})`;
+const FIND_ALL_DESCENDANTS = (0, core_1.pwsh$ /* ps1 */) `Find-AllChildrenRecursively -element (${0}) -condition (${1})`;
+const FIND_DESCENDANTS_OR_SELF = (0, core_1.pwsh$ /* ps1 */) `Find-ChildrenRecursively -element (${0}) -condition (${1}) -includeSelf $true`;
+const FIND_ALL_DESCENDANTS_OR_SELF = (0, core_1.pwsh$ /* ps1 */) `Find-AllChildrenRecursively -element (${0}) -condition (${1}) -includeSelf $true`;
 const FIND_FIRST = (0, core_1.pwsh$ /* ps1 */) `if ($null -ne ${0}) { ${0}.FindFirst([TreeScope]::${1}, ${2}) }`;
 const FIND_ALL = (0, core_1.pwsh$ /* ps1 */) `if ($null -ne ${0}) { ${0}.FindAll([TreeScope]::${1}, ${2}) }`;
 const AUTOMATION_ROOT = /* ps1 */ `$rootElement`;
@@ -393,173 +393,137 @@ const GET_ELEMENT_RECT = (0, core_1.pwsh$ /* ps1 */) `
     }
 `;
 const GET_ELEMENT_LEGACY_VALUE = (0, core_1.pwsh$ /* ps1 */) `
-    try {
-        ${0}.GetCurrentPattern([System.Windows.Automation.LegacyIAccessiblePattern]::Pattern).Current.Value
-    } catch {
-        try {
-             $hwnd = ${0}.Current.NativeWindowHandle
-             if ($hwnd -gt 0) {
-                 [MSAAHelper]::GetLegacyProperty([IntPtr]$hwnd, "accValue")
-             } else { $null }
-        } catch { $null }
-    }
+    Get-LegacyPropertySafe -element ${0} -propName "Value" -accPropName "accValue"
 `;
 const GET_ELEMENT_LEGACY_NAME = (0, core_1.pwsh$ /* ps1 */) `
-    if ($null -ne ${0}) {
-        try {
-            ${0}.GetCurrentPattern([System.Windows.Automation.LegacyIAccessiblePattern]::Pattern).Current.Name
-        } catch {
-            try {
-                 $hwnd = ${0}.Current.NativeWindowHandle
-                 if ($hwnd -gt 0) {
-                     [MSAAHelper]::GetLegacyProperty([IntPtr]$hwnd, "accName")
-                 } else { $null }
-            } catch { $null }
-        }
-    }
+    $val = Get-LegacyPropertySafe -element ${0} -propName "Name" -accPropName "accName"
+    if ($null -eq $val) { $val = ${0}.Current.Name }
+    $val
 `;
 const GET_ELEMENT_LEGACY_DESCRIPTION = (0, core_1.pwsh$ /* ps1 */) `
-    if ($null -ne ${0}) {
-        try {
-            ${0}.GetCurrentPattern([System.Windows.Automation.LegacyIAccessiblePattern]::Pattern).Current.Description
-        } catch {
-            try {
-                 $hwnd = ${0}.Current.NativeWindowHandle
-                 if ($hwnd -gt 0) {
-                     [MSAAHelper]::GetLegacyProperty([IntPtr]$hwnd, "accDescription")
-                 } else { $null }
-            } catch { $null }
-        }
-    }
+    $val = Get-LegacyPropertySafe -element ${0} -propName "Description" -accPropName "accDescription"
+    if ($null -eq $val) { $val = ${0}.Current.HelpText }
+    $val
 `;
 const GET_ELEMENT_LEGACY_ROLE = (0, core_1.pwsh$ /* ps1 */) `
-    if ($null -ne ${0}) {
-        try {
-            ${0}.GetCurrentPattern([System.Windows.Automation.LegacyIAccessiblePattern]::Pattern).Current.Role
-        } catch {
-            try {
-                 $hwnd = ${0}.Current.NativeWindowHandle
-                 if ($hwnd -gt 0) {
-                     [MSAAHelper]::GetLegacyProperty([IntPtr]$hwnd, "accRole")
-                 } else { $null }
-            } catch { $null }
-        }
-    }
+    $val = Get-LegacyPropertySafe -element ${0} -propName "Role" -accPropName "accRole"
+    if ($null -eq $val) { $val = ${0}.Current.LocalizedControlType }
+    $val
 `;
 const GET_ELEMENT_LEGACY_STATE = (0, core_1.pwsh$ /* ps1 */) `
     if ($null -ne ${0}) {
-        try {
-            ${0}.GetCurrentPattern([System.Windows.Automation.LegacyIAccessiblePattern]::Pattern).Current.State
-        } catch {
-             try {
-                 $hwnd = ${0}.Current.NativeWindowHandle
-                 if ($hwnd -gt 0) {
-                     [MSAAHelper]::GetLegacyProperty([IntPtr]$hwnd, "accState")
-                 } else { $null }
-            } catch { $null }
-        }
+         Get-LegacyPropertySafe -element ${0} -propName "State" -accPropName "accState"
     }
 `;
 const GET_ELEMENT_LEGACY_HELP = (0, core_1.pwsh$ /* ps1 */) `
     if ($null -ne ${0}) {
-        try {
-            ${0}.GetCurrentPattern([System.Windows.Automation.LegacyIAccessiblePattern]::Pattern).Current.Help
-        } catch {
-            try {
-                 $hwnd = ${0}.Current.NativeWindowHandle
-                 if ($hwnd -gt 0) {
-                     [MSAAHelper]::GetLegacyProperty([IntPtr]$hwnd, "accHelp")
-                 } else { $null }
-            } catch { $null }
-        }
+         Get-LegacyPropertySafe -element ${0} -propName "Help" -accPropName "accHelp"
     }
 `;
 const GET_ELEMENT_LEGACY_KEYBOARD_SHORTCUT = (0, core_1.pwsh$ /* ps1 */) `
     if ($null -ne ${0}) {
-        try {
-            ${0}.GetCurrentPattern([System.Windows.Automation.LegacyIAccessiblePattern]::Pattern).Current.KeyboardShortcut
-        } catch {
-            try {
-                 $hwnd = ${0}.Current.NativeWindowHandle
-                 if ($hwnd -gt 0) {
-                     [MSAAHelper]::GetLegacyProperty([IntPtr]$hwnd, "accKeyboardShortcut")
-                 } else { $null }
-            } catch { $null }
-        }
+         Get-LegacyPropertySafe -element ${0} -propName "KeyboardShortcut" -accPropName "accKeyboardShortcut"
     }
 `;
 const GET_ELEMENT_LEGACY_DEFAULT_ACTION = (0, core_1.pwsh$ /* ps1 */) `
     if ($null -ne ${0}) {
-        try {
-            ${0}.GetCurrentPattern([System.Windows.Automation.LegacyIAccessiblePattern]::Pattern).Current.DefaultAction
-        } catch {
-            try {
-                 $hwnd = ${0}.Current.NativeWindowHandle
-                 if ($hwnd -gt 0) {
-                     [MSAAHelper]::GetLegacyProperty([IntPtr]$hwnd, "accDefaultAction")
-                 } else { $null }
-            } catch { $null }
-        }
+         Get-LegacyPropertySafe -element ${0} -propName "DefaultAction" -accPropName "accDefaultAction"
     }
 `;
-const GET_ELEMENT_WINDOW_CAN_MAXIMIZE = (0, core_1.pwsh$ /* ps1 */) `if ($null -ne ${0}) { try { ${0}.GetCurrentPattern([WindowPattern]::Pattern).Current.CanMaximize } catch { $null } }`;
-const GET_ELEMENT_WINDOW_CAN_MINIMIZE = (0, core_1.pwsh$ /* ps1 */) `if ($null -ne ${0}) { try { ${0}.GetCurrentPattern([WindowPattern]::Pattern).Current.CanMinimize } catch { $null } }`;
-const GET_ELEMENT_WINDOW_IS_MODAL = (0, core_1.pwsh$ /* ps1 */) `if ($null -ne ${0}) { try { ${0}.GetCurrentPattern([WindowPattern]::Pattern).Current.IsModal } catch { $null } }`;
-const GET_ELEMENT_WINDOW_IS_TOPMOST = (0, core_1.pwsh$ /* ps1 */) `if ($null -ne ${0}) { try { ${0}.GetCurrentPattern([WindowPattern]::Pattern).Current.IsTopmost } catch { $null } }`;
-const GET_ELEMENT_WINDOW_INTERACTION_STATE = (0, core_1.pwsh$ /* ps1 */) `if ($null -ne ${0}) { try { ${0}.GetCurrentPattern([WindowPattern]::Pattern).Current.WindowInteractionState.ToString() } catch { $null } }`;
-const GET_ELEMENT_WINDOW_VISUAL_STATE = (0, core_1.pwsh$ /* ps1 */) `if ($null -ne ${0}) { try { ${0}.GetCurrentPattern([WindowPattern]::Pattern).Current.WindowVisualState.ToString() } catch { $null } }`;
-const GET_ELEMENT_TRANSFORM_CAN_MOVE = (0, core_1.pwsh$ /* ps1 */) `if ($null -ne ${0}) { try { ${0}.GetCurrentPattern([TransformPattern]::Pattern).Current.CanMove } catch { $null } }`;
-const GET_ELEMENT_TRANSFORM_CAN_RESIZE = (0, core_1.pwsh$ /* ps1 */) `if ($null -ne ${0}) { try { ${0}.GetCurrentPattern([TransformPattern]::Pattern).Current.CanResize } catch { $null } }`;
-const GET_ELEMENT_TRANSFORM_CAN_ROTATE = (0, core_1.pwsh$ /* ps1 */) `if ($null -ne ${0}) { try { ${0}.GetCurrentPattern([TransformPattern]::Pattern).Current.CanRotate } catch { $null } }`;
+const GET_ELEMENT_WINDOW_CAN_MAXIMIZE = (0, core_1.pwsh$ /* ps1 */) `try { ${0}.GetCurrentPattern([WindowPattern]::Pattern).Current.CanMaximize } catch { $null }`;
+const GET_ELEMENT_WINDOW_CAN_MINIMIZE = (0, core_1.pwsh$ /* ps1 */) `try { ${0}.GetCurrentPattern([WindowPattern]::Pattern).Current.CanMinimize } catch { $null }`;
+const GET_ELEMENT_WINDOW_IS_MODAL = (0, core_1.pwsh$ /* ps1 */) `try { ${0}.GetCurrentPattern([WindowPattern]::Pattern).Current.IsModal } catch { $null }`;
+const GET_ELEMENT_WINDOW_IS_TOPMOST = (0, core_1.pwsh$ /* ps1 */) `try { ${0}.GetCurrentPattern([WindowPattern]::Pattern).Current.IsTopmost } catch { $null }`;
+const GET_ELEMENT_WINDOW_INTERACTION_STATE = (0, core_1.pwsh$ /* ps1 */) `try { ${0}.GetCurrentPattern([WindowPattern]::Pattern).Current.WindowInteractionState.ToString() } catch { $null }`;
+const GET_ELEMENT_WINDOW_VISUAL_STATE = (0, core_1.pwsh$ /* ps1 */) `try { ${0}.GetCurrentPattern([WindowPattern]::Pattern).Current.WindowVisualState.ToString() } catch { $null }`;
+const GET_ELEMENT_TRANSFORM_CAN_MOVE = (0, core_1.pwsh$ /* ps1 */) `try { ${0}.GetCurrentPattern([TransformPattern]::Pattern).Current.CanMove } catch { $null }`;
+const GET_ELEMENT_TRANSFORM_CAN_RESIZE = (0, core_1.pwsh$ /* ps1 */) `try { ${0}.GetCurrentPattern([TransformPattern]::Pattern).Current.CanResize } catch { $null }`;
+const GET_ELEMENT_TRANSFORM_CAN_ROTATE = (0, core_1.pwsh$ /* ps1 */) `try { ${0}.GetCurrentPattern([TransformPattern]::Pattern).Current.CanRotate } catch { $null }`;
 const GET_ELEMENT_LEGACY_CHILD_ID = (0, core_1.pwsh$ /* ps1 */) `
-    if ($null -ne ${0}) {
+if ($null -ne ${0}) {
+    try {
+        ${0}.GetCurrentPattern([System.Windows.Automation.LegacyIAccessiblePattern]::Pattern).Current.ChildId
+    } catch {
+        # For HWND based elements, ChildId is usually 0
         try {
-            ${0}.GetCurrentPattern([System.Windows.Automation.LegacyIAccessiblePattern]::Pattern).Current.ChildId
-        } catch {
-            # For HWND based elements, ChildId is usually 0
-            try {
-                 $hwnd = ${0}.Current.NativeWindowHandle
-                 if ($hwnd -gt 0) {
-                     0
-                 } else { $null }
-            } catch { $null }
-        }
+            $rect = ${0}.Current.BoundingRectangle
+            if ($null -ne $rect -and $rect.Width -gt 0) {
+                $cx = [int]($rect.Left + $rect.Width / 2)
+                $cy = [int]($rect.Top + $rect.Height / 2)
+                $props = [MSAAHelper]::GetLegacyPropsFromPoint($cx, $cy)
+                $props["ChildId"]
+            } else {
+                $hwnd = ${0}.Current.NativeWindowHandle
+                if ($hwnd -gt 0) {
+                    0
+                } else { $null }
+            }
+        } catch { $null }
     }
+}
 `;
 const IS_LEGACY_PATTERN_AVAILABLE = (0, core_1.pwsh$ /* ps1 */) `
-    if ($null -ne ${0}) {
+if ($null -ne ${0}) {
+    try {
+        if ($null -ne ${0}.GetCurrentPattern([System.Windows.Automation.LegacyIAccessiblePattern]::Pattern)) {
+            $true
+        } else {
+            # Only check HWND / Point if managed pattern retrieval explicitly failed / returned null
+            $result = $false
+            try {
+                $rect = ${0}.Current.BoundingRectangle
+                if ($null -ne $rect -and $rect.Width -gt 0) {
+                    $cx = [int]($rect.Left + $rect.Width / 2)
+                    $cy = [int]($rect.Top + $rect.Height / 2)
+                    $props = [MSAAHelper]::GetLegacyPropsFromPoint($cx, $cy)
+                    if ($null -ne $props) { $result = $true }
+                }
+            } catch { }
+
+            if (-not $result) {
+                try {
+                    $hwnd = ${0}.Current.NativeWindowHandle
+                    if ($hwnd -gt 0) { $result = $true }
+                } catch { }
+            }
+            $result
+        }
+    } catch {
+        # Fallback for TypeNotFound or other UIA errors
+        $result = $false
         try {
-            if ($null -ne ${0}.GetCurrentPattern([System.Windows.Automation.LegacyIAccessiblePattern]::Pattern)) {
-                $true
-            } else {
-                 # Only check HWND if managed pattern retrieval explicitly failed/returned null, but we are inside try block
-                 # Actually if GetCurrentPattern throws, we go to catch. 
-                 # If it returns null (not supported), we go to else.
-                 $hwnd = ${0}.Current.NativeWindowHandle
-                 $hwnd -gt 0
+            $rect = ${0}.Current.BoundingRectangle
+            if ($null -ne $rect -and $rect.Width -gt 0) {
+                $cx = [int]($rect.Left + $rect.Width / 2)
+                $cy = [int]($rect.Top + $rect.Height / 2)
+                $props = [MSAAHelper]::GetLegacyPropsFromPoint($cx, $cy)
+                if ($null -ne $props) { $result = $true }
             }
-        } catch {
-             # Fallback for TypeNotFound or other UIA errors
-             try {
-                 $hwnd = ${0}.Current.NativeWindowHandle
-                 $hwnd -gt 0
-             } catch { $false }
+        } catch { }
+
+        if (-not $result) {
+            try {
+                $hwnd = ${0}.Current.NativeWindowHandle
+                if ($hwnd -gt 0) { $result = $true }
+            } catch { }
         }
-    } else {
-        $false
+        $result
     }
+} else {
+    $false
+}
 `;
 const GET_ELEMENT_TAG_NAME = (0, core_1.pwsh$ /* ps1 */) `
-    if ($null -ne ${0}) {
-        try { $ct = ${0}.Cached.ControlType } catch { $ct = ${0}.Current.ControlType }
-        $ct.ProgrammaticName |
+if ($null -ne ${0}) {
+    try { $ct = ${0}.Cached.ControlType } catch { $ct = ${0}.Current.ControlType }
+    $ct.ProgrammaticName |
         ForEach-Object {
-            $type = $_.Split('.')[-1]
-            if ($type -eq 'DataGrid') { 'List' }
-            elseif ($type -eq 'DataItem') { 'ListItem' }
-            else { $type }
-        }
+        $type = $_.Split('.')[-1]
+        if ($type -eq 'DataGrid') { 'List' }
+        elseif($type -eq 'DataItem') { 'ListItem' }
+        else { $type }
     }
+}
 `;
 // ... (rest of file)
 // Inside AutomationElement class (implicit connection via line numbers, I will target the class method efficiently)
@@ -567,276 +531,315 @@ const GET_ELEMENT_TAG_NAME = (0, core_1.pwsh$ /* ps1 */) `
 // The replace tool works on line ranges. I will convert this to 2 separate edits or use multi_replace.
 // Let's use multi_replace for cleaner insertion.
 const GET_ALL_ELEMENT_PROPERTIES = (0, core_1.pwsh$ /* ps1 */) `
-    if ($null -ne ${0}) {
-        $result = @{}
-        
-        # 1. Standard Properties from AutomationElement
-        $standardProps = @(
-            "Name", "AutomationId", "ClassName", "ControlType", "LocalizedControlType", 
-            "BoundingRectangle", "IsEnabled", "IsOffscreen", "IsKeyboardFocusable", 
-            "HasKeyboardFocus", "AccessKey", "ProcessId", "RuntimeId", "FrameworkId", 
-            "NativeWindowHandle", "IsContentElement", "IsControlElement", "IsPassword", 
-            "HelpText", "ItemStatus", "ItemType", "AcceleratorKey"
-        )
-        
-        foreach ($pName in $standardProps) {
-            try {
-                $prop = [AutomationElement]::($pName + "Property")
-                $val = ${0}.GetCurrentPropertyValue($prop)
-                if ($null -ne $val) {
-                    if ($pName -eq "RuntimeId") { $result[$pName] = $val -join "." }
-                    else { $result[$pName] = $val.ToString() }
-                }
-            } catch {}
-        }
-        
-        # UIA 3.0+ Compatibility (Safe Defaults for UIA 2.0)
-        $result["IsDialog"] = "False"
-        $result["ProviderDescription"] = ""
-
-        # 2. Pattern Availability check
-        $patterns = @(
-            "Annotation", "Dock", "Drag", "DropTarget", "ExpandCollapse", "GridItem", 
-            "Grid", "Invoke", "ItemContainer", "LegacyIAccessible", "MultipleView", 
-            "ObjectModel", "RangeValue", "ScrollItem", "Scroll", "SelectionItem", 
-            "Selection", "SpreadsheetItem", "Spreadsheet", "Styles", "SynchronizedInput", 
-            "TableItem", "Table", "TextChild", "TextEdit", "Text", "Toggle", "Transform", 
-            "Value", "VirtualizedItem", "Window", "CustomNavigation"
-        )
-        
-        foreach ($pName in $patterns) {
-            $propName = "Is" + $pName + "PatternAvailable"
-            try {
-                $prop = [AutomationElement]::($propName + "Property")
-                $val = ${0}.GetCurrentPropertyValue($prop)
-                $result[$propName] = $val.ToString()
-            } catch {
-                $result[$propName] = "False"
+if ($null -ne ${0}) {
+    $result = @{}
+    
+    # 1. Standard Properties from AutomationElement
+    $standardProps = @(
+        "Name", "AutomationId", "ClassName", "ControlType", "LocalizedControlType",
+        "BoundingRectangle", "IsEnabled", "IsOffscreen", "IsKeyboardFocusable",
+        "HasKeyboardFocus", "AccessKey", "ProcessId", "RuntimeId", "FrameworkId",
+        "NativeWindowHandle", "IsContentElement", "IsControlElement", "IsPassword",
+        "HelpText", "ItemStatus", "ItemType", "AcceleratorKey"
+    )
+
+    foreach($pName in $standardProps) {
+        try {
+            $prop = [AutomationElement]::($pName + "Property")
+            $val = ${0}.GetCurrentPropertyValue($prop)
+            if ($null -ne $val) {
+                if ($pName -eq "RuntimeId") { $result[$pName] = $val -join "." }
+                else { $result[$pName] = $val.ToString() }
             }
+        } catch { }
+    }
+
+    # UIA 3.0 + Compatibility(Safe Defaults for UIA 2.0)
+    $result["IsDialog"] = "False"
+    $result["ProviderDescription"] = ""
+
+    # 2. Pattern Availability check
+    $patterns = @(
+        "Annotation", "Dock", "Drag", "DropTarget", "ExpandCollapse", "GridItem",
+        "Grid", "Invoke", "ItemContainer", "LegacyIAccessible", "MultipleView",
+        "ObjectModel", "RangeValue", "ScrollItem", "Scroll", "SelectionItem",
+        "Selection", "SpreadsheetItem", "Spreadsheet", "Styles", "SynchronizedInput",
+        "TableItem", "Table", "TextChild", "TextEdit", "Text", "Toggle", "Transform",
+        "Value", "VirtualizedItem", "Window", "CustomNavigation"
+    )
+
+    foreach($pName in $patterns) {
+        $propName = "Is" + $pName + "PatternAvailable"
+        try {
+            $prop = [AutomationElement]::($propName + "Property")
+            $val = ${0}.GetCurrentPropertyValue($prop)
+            $result[$propName] = $val.ToString()
+        } catch {
+            $result[$propName] = "False"
         }
-        
-        # Pattern2 Compatibility (UIA 3.0)
-        $result["IsTextPattern2Available"] = "False"
-        $result["IsTransform2PatternAvailable"] = "False"
-        $result["IsSelectionPattern2Available"] = "False"
-
-        # 3. Pattern Specific Properties (Force Retrieval)
-        $patternsToQuery = @{
-            "Value" = @("Value", "IsReadOnly");
-            "RangeValue" = @("Value", "IsReadOnly", "Minimum", "Maximum", "LargeChange", "SmallChange");
-            "ExpandCollapse" = @("ExpandCollapseState");
-            "Toggle" = @("ToggleState");
-            "Window" = @("CanMaximize", "CanMinimize", "IsModal", "IsTopmost", "WindowInteractionState", "WindowVisualState");
-            "Transform" = @("CanMove", "CanResize", "CanRotate");
-            "Scroll" = @("HorizontalScrollPercent", "HorizontalViewSize", "VerticalScrollPercent", "VerticalViewSize", "HorizontallyScrollable", "VerticallyScrollable");
-            "Selection" = @("CanSelectMultiple", "IsSelectionRequired");
-            "SelectionItem" = @("IsSelected");
-            "Grid" = @("ColumnCount", "RowCount");
-            "GridItem" = @("Column", "Row", "ColumnSpan", "RowSpan");
-            "Table" = @("RowOrColumnMajor");
-        }
+    }
 
-        foreach ($pKey in $patternsToQuery.Keys) {
-            try {
-                $pTypeName = "System.Windows.Automation.$($pKey)Pattern"
-                $pPropField = Invoke-Expression "[$pTypeName]::Pattern"
-                $pObj = ${0}.GetCurrentPattern($pPropField)
-                if ($null -ne $pObj) {
-                    $result["Is" + $pKey + "PatternAvailable"] = "True"
-                    foreach ($propName in $patternsToQuery[$pKey]) {
-                        try {
+    # Pattern2 Compatibility(UIA 3.0)
+    $result["IsTextPattern2Available"] = "False"
+    $result["IsTransform2PatternAvailable"] = "False"
+    $result["IsSelectionPattern2Available"] = "False"
+
+    # 3. Pattern Specific Properties(Force Retrieval)
+    $patternsToQuery = @{
+        "Value" = @("Value", "IsReadOnly");
+        "RangeValue" = @("Value", "IsReadOnly", "Minimum", "Maximum", "LargeChange", "SmallChange");
+        "ExpandCollapse" = @("ExpandCollapseState");
+        "Toggle" = @("ToggleState");
+        "Window" = @("CanMaximize", "CanMinimize", "IsModal", "IsTopmost", "WindowInteractionState", "WindowVisualState");
+        "Transform" = @("CanMove", "CanResize", "CanRotate");
+        "Scroll" = @("HorizontalScrollPercent", "HorizontalViewSize", "VerticalScrollPercent", "VerticalViewSize", "HorizontallyScrollable", "VerticallyScrollable");
+        "Selection" = @("CanSelectMultiple", "IsSelectionRequired");
+        "SelectionItem" = @("IsSelected");
+        "Grid" = @("ColumnCount", "RowCount");
+        "GridItem" = @("Column", "Row", "ColumnSpan", "RowSpan");
+        "Table" = @("RowOrColumnMajor");
+    }
+
+    foreach($pKey in $patternsToQuery.Keys) {
+        try {
+            $pTypeName = "System.Windows.Automation.$($pKey)Pattern"
+            $pPropField = Invoke-Expression "[$pTypeName]::Pattern"
+            $pObj = ${0}.GetCurrentPattern($pPropField)
+            if ($null -ne $pObj) {
+                $result["Is" + $pKey + "PatternAvailable"] = "True"
+                foreach($propName in $patternsToQuery[$pKey]) {
+                    try {
                             # Key used for dotted names in Inspect.exe
                             $dottedKey = $pKey + "." + $propName
                             
                             # Try to get value from pattern object
-                            $val = $pObj.Current.$propName
-                            if ($null -ne $val) {
-                                $result[$dottedKey] = $val.ToString()
+                        $val = $pObj.Current.$propName
+                        if ($null -ne $val) {
+                            $result[$dottedKey] = $val.ToString()
                                 # Also provide short name if not already set
-                                if (-not $result.ContainsKey($propName)) {
-                                    $result[$propName] = $val.ToString()
-                                }
+                            if (-not $result.ContainsKey($propName)) {
+                                $result[$propName] = $val.ToString()
                             }
-                        } catch {}
-                    }
+                        }
+                    } catch { }
                 }
-            } catch {}
-        }
+            }
+        } catch { }
+    }
 
-        # 4. Legacy Properties (Force Retrieval)
-        try {
-            $legacy = ${0}.GetCurrentPattern([System.Windows.Automation.LegacyIAccessiblePattern]::Pattern).Current
-            if ($null -ne $legacy) {
-                $result["IsLegacyIAccessiblePatternAvailable"] = "True"
+    # 4. Legacy Properties(Force Retrieval)
+    try {
+        $legacy = ${0}.GetCurrentPattern([System.Windows.Automation.LegacyIAccessiblePattern]::Pattern).Current
+        if ($null -ne $legacy) {
+            $result["IsLegacyIAccessiblePatternAvailable"] = "True"
                 
-                # Standard Aliases (Backward Compatibility)
-                $result['LegacyName'] = $legacy.Name
-                $result['LegacyDescription'] = $legacy.Description
-                $result['LegacyRole'] = $legacy.Role.ToString()
-                $result['LegacyState'] = $legacy.State.ToString()
-                $result['LegacyValue'] = $legacy.Value
-                $result['LegacyHelp'] = $legacy.Help
-                $result['LegacyKeyboardShortcut'] = $legacy.KeyboardShortcut
-                $result['LegacyDefaultAction'] = $legacy.DefaultAction
-                $result['LegacyChildId'] = $legacy.ChildId.ToString()
-
-                # Dotted Names (Inspect.exe matching)
-                $result['LegacyIAccessible.Name'] = $legacy.Name
-                $result['LegacyIAccessible.Description'] = $legacy.Description
-                $result['LegacyIAccessible.Role'] = $legacy.Role.ToString()
-                $result['LegacyIAccessible.State'] = $legacy.State.ToString()
-                $result['LegacyIAccessible.Value'] = $legacy.Value
-                $result['LegacyIAccessible.Help'] = $legacy.Help
-                $result['LegacyIAccessible.KeyboardShortcut'] = $legacy.KeyboardShortcut
-                $result['LegacyIAccessible.DefaultAction'] = $legacy.DefaultAction
-                $result['LegacyIAccessible.ChildId'] = $legacy.ChildId.ToString()
+                # Standard Aliases(Backward Compatibility)
+            $result['LegacyName'] = $legacy.Name
+            $result['LegacyDescription'] = $legacy.Description
+            $result['LegacyRole'] = $legacy.Role.ToString()
+            $result['LegacyState'] = $legacy.State.ToString()
+            $result['LegacyValue'] = $legacy.Value
+            $result['LegacyHelp'] = $legacy.Help
+            $result['LegacyKeyboardShortcut'] = $legacy.KeyboardShortcut
+            $result['LegacyDefaultAction'] = $legacy.DefaultAction
+            $result['LegacyChildId'] = $legacy.ChildId.ToString()
+
+                # Dotted Names(Inspect.exe matching)
+            $result['LegacyIAccessible.Name'] = $legacy.Name
+            $result['LegacyIAccessible.Description'] = $legacy.Description
+            $result['LegacyIAccessible.Role'] = $legacy.Role.ToString()
+            $result['LegacyIAccessible.State'] = $legacy.State.ToString()
+            $result['LegacyIAccessible.Value'] = $legacy.Value
+            $result['LegacyIAccessible.Help'] = $legacy.Help
+            $result['LegacyIAccessible.KeyboardShortcut'] = $legacy.KeyboardShortcut
+            $result['LegacyIAccessible.DefaultAction'] = $legacy.DefaultAction
+            $result['LegacyIAccessible.ChildId'] = $legacy.ChildId.ToString()
+        }
+    } catch { }
+
+    # MSAA Fallback
+    try {
+        $msaaProps = $null
+        $rect = ${0}.Current.BoundingRectangle
+
+        # Check if rect is valid / not - empty to calculate center for Point lookup
+        if ($null -ne $rect -and $rect.Width -gt 0 -and $rect.Height -gt 0) {
+            $cx = [int]($rect.Left + ($rect.Width / 2))
+            $cy = [int]($rect.Top + ($rect.Height / 2))
+            $msaaProps = [MSAAHelper]::GetLegacyPropsFromPoint($cx, $cy)
+        }
+
+        # Fallback to HWND if Point lookup didn't work or rect was empty (e.g. offscreen?)
+        if ($null -eq $msaaProps) {
+            if ($result.ContainsKey("NativeWindowHandle")) {
+                $hwnd = $result["NativeWindowHandle"]
+            } else {
+                $hwnd = ${0}.Current.NativeWindowHandle
             }
-        } catch {}
-        
-        # 5. GetSupportedProperties (Final sweep)
-        try {
-            foreach ($prop in ${0}.GetSupportedProperties()) {
-                $name = $prop.ProgrammaticName.Split('.')[-1].Replace('Property', '')
-                if (-not $result.ContainsKey($name)) {
-                    $val = ${0}.GetCurrentPropertyValue($prop)
-                    if ($null -ne $val) { $result[$name] = $val.ToString() }
+            if ($hwnd -ne 0) {
+                $msaaProps = [MSAAHelper]::GetAllLegacyProperties([IntPtr]$hwnd)
+            }
+        }
+
+        if ($null -ne $msaaProps) {
+            # If we found props via MSAA(Point or HWND), mark pattern as available
+            $result["IsLegacyIAccessiblePatternAvailable"] = "True"
+            foreach($key in $msaaProps.Keys) {
+                $val = $msaaProps[$key]
+                if ($null -ne $val) {
+                    # Inspect.exe style: LegacyIAccessible.Name
+                    $result["LegacyIAccessible." + $key] = $val
+                    # Driver Internal Alias: LegacyName
+                    $result["Legacy" + $key] = $val
                 }
             }
-        } catch {}
+        }
+    } catch { }
 
-        $result | ConvertTo-Json -Compress
-    }
+    # 5. GetSupportedProperties(Final sweep)
+    try {
+        foreach($prop in ${0}.GetSupportedProperties()) {
+            $name = $prop.ProgrammaticName.Split('.')[-1].Replace('Property', '')
+            if (-not $result.ContainsKey($name)) {
+                $val = ${0}.GetCurrentPropertyValue($prop)
+                if ($null -ne $val) { $result[$name] = $val.ToString() }
+            }
+        }
+    } catch { }
+
+    $result | ConvertTo-Json -Compress
+}
 `;
-const SET_FOCUS_TO_ELEMENT = (0, core_1.pwsh$ /* ps1 */) `if ($null -ne ${0}) { ${0}.SetFocus() }`;
+const SET_FOCUS_TO_ELEMENT = (0, core_1.pwsh$ /* ps1 */) `if ($null -ne ${0}) { ${0}.SetFocus() } `;
 const GET_ELEMENT_TEXT = (0, core_1.pwsh$ /* ps1 */) `
-    if ($null -ne ${0}) {
+if ($null -ne ${0}) {
+    try {
+        ${0}.GetCurrentPattern([TextPattern]::Pattern).DocumentRange.GetText(-1)
+    } catch {
         try {
-            ${0}.GetCurrentPattern([TextPattern]::Pattern).DocumentRange.GetText(-1)
+            ${0}.GetCurrentPattern([SelectionPattern]::Pattern).Current.GetSelection().Current.Name
         } catch {
-            try {
-                ${0}.GetCurrentPattern([SelectionPattern]::Pattern).Current.GetSelection().Current.Name
-            } catch {
-                ${0}.Current.Name
-            }
+            ${0}.Current.Name
         }
     }
+}
 `;
-const INVOKE_ELEMENT = (0, core_1.pwsh$ /* ps1 */) `if ($null -ne ${0}) { ${0}.GetCurrentPattern([InvokePattern]::Pattern).Invoke() }`;
-const EXPAND_ELEMENT = (0, core_1.pwsh$ /* ps1 */) `if ($null -ne ${0}) { ${0}.GetCurrentPattern([ExpandCollapsePattern]::Pattern).Expand() }`;
-const COLLAPSE_ELEMENT = (0, core_1.pwsh$ /* ps1 */) `if ($null -ne ${0}) { ${0}.GetCurrentPattern([ExpandCollapsePattern]::Pattern).Collapse() }`;
+const INVOKE_ELEMENT = (0, core_1.pwsh$ /* ps1 */) `if ($null -ne ${0}) { ${0}.GetCurrentPattern([InvokePattern]::Pattern).Invoke() } `;
+const EXPAND_ELEMENT = (0, core_1.pwsh$ /* ps1 */) `if ($null -ne ${0}) { ${0}.GetCurrentPattern([ExpandCollapsePattern]::Pattern).Expand() } `;
+const COLLAPSE_ELEMENT = (0, core_1.pwsh$ /* ps1 */) `if ($null -ne ${0}) { ${0}.GetCurrentPattern([ExpandCollapsePattern]::Pattern).Collapse() } `;
 const SCROLL_ELEMENT_INTO_VIEW = (0, core_1.pwsh$ /* ps1 */) `
-    if ($null -ne ${0}) {
-        $pattern = ${0}.GetCurrentPattern([ScrollItemPattern]::Pattern);
-        if ($null -ne $pattern) {
-            $pattern.ScrollIntoView()
-        } else {
-            $success = $false
-            try {
-                ${0}.SetFocus()
-                $success = $true
-            } catch {}
+if ($null -ne ${0}) {
+    $pattern = ${0}.GetCurrentPattern([ScrollItemPattern]::Pattern);
+    if ($null -ne $pattern) {
+        $pattern.ScrollIntoView()
+    } else {
+        $success = $false
+        try {
+            ${0}.SetFocus()
+            $success = $true
+        } catch { }
 
-            if (-not $success) {
-                try {
-                    $legacy = ${0}.GetCurrentPattern([System.Windows.Automation.LegacyIAccessiblePattern]::Pattern);
-                    if ($null -ne $legacy) {
-                        $legacy.Select(3);
-                        $success = $true
-                    }
-                } catch {}
-            }
+        if (-not $success) {
+            try {
+                $legacy = ${0}.GetCurrentPattern([System.Windows.Automation.LegacyIAccessiblePattern]::Pattern);
+                if ($null -ne $legacy) {
+                    $legacy.Select(3);
+                    $success = $true
+                }
+            } catch { }
+        }
 
-            if (-not $success) {
-                 # Try ItemContainerPattern on parent
-                try {
-                    $parent = [TreeWalker]::ControlViewWalker.GetParent(${0});
-                    if ($null -ne $parent) {
-                        $containerPattern = $parent.GetCurrentPattern([ItemContainerPattern]::Pattern);
-                        if ($null -ne $containerPattern) {
-                            # We have the element, so we pass it directly to be realized/scrolled to
-                            $found = $containerPattern.FindItemByProperty($null, [AutomationElement]::RuntimeIdProperty, ${0}.GetRuntimeId());
-                            if ($null -ne $found) {
-                                 # Accessing the found item usually brings it into view or realizes it?
-                                 # Actually FindItemByProperty returns the element. We might need to ScrollIntoView THAT element?
-                                 # But we already have the element. The docs say "retrieves an element... and scrolls it into view".
-                                 $success = $true
-                            }
+        if (-not $success) {
+            # Try ItemContainerPattern on parent
+            try {
+                $parent = [TreeWalker]::ControlViewWalker.GetParent(${0});
+                if ($null -ne $parent) {
+                    $containerPattern = $parent.GetCurrentPattern([ItemContainerPattern]::Pattern);
+                    if ($null -ne $containerPattern) {
+                        # We have the element, so we pass it directly to be realized / scrolled to
+                        $found = $containerPattern.FindItemByProperty($null, [AutomationElement]::RuntimeIdProperty, ${0}.GetRuntimeId());
+                        if ($null -ne $found) {
+                            # Accessing the found item usually brings it into view or realizes it ?
+                            # Actually FindItemByProperty returns the element.We might need to ScrollIntoView THAT element ?
+                            # But we already have the element.The docs say "retrieves an element... and scrolls it into view".
+                            $success = $true
                         }
                     }
-                } catch {}
-            }
+                }
+            } catch { }
+        }
 
-            if (-not $success) {
-                throw "Failed to scroll into view: ScrollItemPattern not supported, and SetFocus/LegacySelect/ItemContainerPattern failed."
-            }
+        if (-not $success) {
+            throw "Failed to scroll into view: ScrollItemPattern not supported, and SetFocus/LegacySelect/ItemContainerPattern failed."
         }
     }
+}
 `;
-const IS_MULTIPLE_SELECT_ELEMENT = (0, core_1.pwsh$ /* ps1 */) `if ($null -ne ${0}) { ${0}.GetCurrentPattern([SelectionPattern]::Pattern).Current.CanSelectMultiple }`;
-const GET_SELECTED_ELEMENT = (0, core_1.pwsh$ /* ps1 */) `if ($null -ne ${0}) { ${0}.GetCurrentPattern([SelectionPattern]::Pattern).Current.GetSelection() }`;
-const IS_ELEMENT_SELECTED = (0, core_1.pwsh$ /* ps1 */) `if ($null -ne ${0}) { ${0}.GetCurrentPattern([SelectionItemPattern]::Pattern).Current.IsSelected }`;
-const ADD_ELEMENT_TO_SELECTION = (0, core_1.pwsh$ /* ps1 */) `if ($null -ne ${0}) { ${0}.GetCurrentPattern([SelectionItemPattern]::Pattern).AddToSelection() }`;
-const REMOVE_ELEMENT_FROM_SELECTION = (0, core_1.pwsh$ /* ps1 */) `if ($null -ne ${0}) { ${0}.GetCurrentPattern([SelectionItemPattern]::Pattern).RemoveFromSelection() }`;
-const SELECT_ELEMENT = (0, core_1.pwsh$ /* ps1 */) `if ($null -ne ${0}) { ${0}.GetCurrentPattern([SelectionItemPattern]::Pattern).Select() }`;
-const TOGGLE_ELEMENT = (0, core_1.pwsh$ /* ps1 */) `if ($null -ne ${0}) { ${0}.GetCurrentPattern([TogglePattern]::Pattern).Toggle() }`;
+const IS_MULTIPLE_SELECT_ELEMENT = (0, core_1.pwsh$ /* ps1 */) `if ($null -ne ${0}) { ${0}.GetCurrentPattern([SelectionPattern]::Pattern).Current.CanSelectMultiple } `;
+const GET_SELECTED_ELEMENT = (0, core_1.pwsh$ /* ps1 */) `if ($null -ne ${0}) { ${0}.GetCurrentPattern([SelectionPattern]::Pattern).Current.GetSelection() } `;
+const IS_ELEMENT_SELECTED = (0, core_1.pwsh$ /* ps1 */) `if ($null -ne ${0}) { ${0}.GetCurrentPattern([SelectionItemPattern]::Pattern).Current.IsSelected } `;
+const ADD_ELEMENT_TO_SELECTION = (0, core_1.pwsh$ /* ps1 */) `if ($null -ne ${0}) { ${0}.GetCurrentPattern([SelectionItemPattern]::Pattern).AddToSelection() } `;
+const REMOVE_ELEMENT_FROM_SELECTION = (0, core_1.pwsh$ /* ps1 */) `if ($null -ne ${0}) { ${0}.GetCurrentPattern([SelectionItemPattern]::Pattern).RemoveFromSelection() } `;
+const SELECT_ELEMENT = (0, core_1.pwsh$ /* ps1 */) `if ($null -ne ${0}) { ${0}.GetCurrentPattern([SelectionItemPattern]::Pattern).Select() } `;
+const TOGGLE_ELEMENT = (0, core_1.pwsh$ /* ps1 */) `if ($null -ne ${0}) { ${0}.GetCurrentPattern([TogglePattern]::Pattern).Toggle() } `;
 const SET_ELEMENT_VALUE = (0, core_1.pwsh$ /* ps1 */) `
-    if ($null -ne ${0}) { 
+if ($null -ne ${0}) {
+    try {
+        ${0}.GetCurrentPattern([ValuePattern]::Pattern).SetValue(${1})
+    } catch {
         try {
-            ${0}.GetCurrentPattern([ValuePattern]::Pattern).SetValue(${1}) 
-        } catch {
-            try {
-                 $hwnd = ${0}.Current.NativeWindowHandle
-                 if ($hwnd -gt 0) {
-                     [MSAAHelper]::SetLegacyValue([IntPtr]$hwnd, ${1})
-                 }
-            } catch {}
-        }
+            $hwnd = ${0}.Current.NativeWindowHandle
+            if ($hwnd -gt 0) {
+                [MSAAHelper]::SetLegacyValue([IntPtr]$hwnd, ${1})
+            }
+        } catch { }
     }
+}
 `;
 const GET_ELEMENT_EXPAND_COLLAPSE_STATE = (0, core_1.pwsh$ /* ps1 */) `
-    if ($null -ne ${0}) { 
-        try {
-            ${0}.GetCurrentPattern([ExpandCollapsePattern]::Pattern).Current.ExpandCollapseState 
-        } catch { $null }
-    }
+if ($null -ne ${0}) {
+    try {
+        ${0}.GetCurrentPattern([ExpandCollapsePattern]::Pattern).Current.ExpandCollapseState
+    } catch { $null }
+}
 `;
-const SET_ELEMENT_RANGE_VALUE = (0, core_1.pwsh$ /* ps1 */) `if ($null -ne ${0}) { ${0}.GetCurrentPattern([RangeValuePattern]::Pattern).SetValue(${1}) }`;
+const SET_ELEMENT_RANGE_VALUE = (0, core_1.pwsh$ /* ps1 */) `if ($null -ne ${0}) { ${0}.GetCurrentPattern([RangeValuePattern]::Pattern).SetValue(${1}) } `;
 const GET_ELEMENT_VALUE = (0, core_1.pwsh$ /* ps1 */) `
-    if ($null -ne ${0}) { 
+if ($null -ne ${0}) {
+    try {
+        ${0}.GetCurrentPattern([ValuePattern]::Pattern).Current.Value
+    } catch {
         try {
-            ${0}.GetCurrentPattern([ValuePattern]::Pattern).Current.Value 
-        } catch {
-            try {
-                 $hwnd = ${0}.Current.NativeWindowHandle
-                 if ($hwnd -gt 0) {
-                     [MSAAHelper]::GetLegacyProperty([IntPtr]$hwnd, "accValue")
-                 } else { $null }
-            } catch { $null }
-        }
+            $hwnd = ${0}.Current.NativeWindowHandle
+            if ($hwnd -gt 0) {
+                [MSAAHelper]::GetLegacyProperty([IntPtr]$hwnd, "accValue")
+            } else { $null }
+        } catch { $null }
     }
+}
 `;
 const GET_ELEMENT_VALUE_IS_READ_ONLY = (0, core_1.pwsh$ /* ps1 */) `
-    if ($null -ne ${0}) { 
+if ($null -ne ${0}) {
+    try {
+        ${0}.GetCurrentPattern([ValuePattern]::Pattern).Current.IsReadOnly
+    } catch {
+        # Fallback for Value Pattern missing via MSAA ? 
+        # MSAA doesn't strictly have IsReadOnly, but if accValue is settable?
+        # accState includes generic STATE_SYSTEM_READONLY(0x40) ?
         try {
-            ${0}.GetCurrentPattern([ValuePattern]::Pattern).Current.IsReadOnly 
-        } catch {
-            # Fallback for Value Pattern missing via MSAA? 
-            # MSAA doesn't strictly have IsReadOnly, but if accValue is settable?
-            # accState includes generic STATE_SYSTEM_READONLY (0x40)?
-            try {
-                 $hwnd = ${0}.Current.NativeWindowHandle
-                 if ($hwnd -gt 0) {
-                     $state = [MSAAHelper]::GetLegacyProperty([IntPtr]$hwnd, "accState");
-                     if ($null -ne $state) {
-                        # STATE_SYSTEM_READONLY = 0x40 (64)
-                        ($state -band 64) -eq 64
-                     } else { $false }
-                 } else { $false }
-            } catch { $false }
-        }
+            $hwnd = ${0}.Current.NativeWindowHandle
+            if ($hwnd -gt 0) {
+                $state = [MSAAHelper]::GetLegacyProperty([IntPtr]$hwnd, "accState");
+                if ($null -ne $state) {
+                    # STATE_SYSTEM_READONLY = 0x40(64)
+                    ($state -band 64) -eq 64
+                } else { $false }
+            } else { $false }
+        } catch { $false }
     }
+}
 `;
-const GET_ELEMENT_TOGGLE_STATE = (0, core_1.pwsh$ /* ps1 */) `if ($null -ne ${0}) { ${0}.GetCurrentPattern([TogglePattern]::Pattern).Current.ToggleState }`;
+const GET_ELEMENT_TOGGLE_STATE = (0, core_1.pwsh$ /* ps1 */) `try { ${0}.GetCurrentPattern([TogglePattern]::Pattern).Current.ToggleState } catch { $null }`;
 const MAXIMIZE_WINDOW = (0, core_1.pwsh$ /* ps1 */) `if ($null -ne ${0}) { ${0}.GetCurrentPattern([WindowPattern]::Pattern).SetWindowVisualState([WindowVisualState]::Maximized) }`;
 const MINIMIZE_WINDOW = (0, core_1.pwsh$ /* ps1 */) `if ($null -ne ${0}) { ${0}.GetCurrentPattern([WindowPattern]::Pattern).SetWindowVisualState([WindowVisualState]::Minimized) }`;
 const RESTORE_WINDOW = (0, core_1.pwsh$ /* ps1 */) `if ($null -ne ${0}) { ${0}.GetCurrentPattern([WindowPattern]::Pattern).SetWindowVisualState([WindowVisualState]::Normal) }`;
@@ -946,31 +949,31 @@ class AutomationElement extends core_1.PSObject {
         if (property.toLowerCase() === 'controltype') {
             return GET_ELEMENT_TAG_NAME.format(this);
         }
-        if (property.toLowerCase() === 'legacyvalue') {
+        if (property.toLowerCase() === 'legacyvalue' || property.toLowerCase() === 'legacyiaccessible.value') {
             return GET_ELEMENT_LEGACY_VALUE.format(this);
         }
-        if (property.toLowerCase() === 'legacyname') {
+        if (property.toLowerCase() === 'legacyname' || property.toLowerCase() === 'legacyiaccessible.name') {
             return GET_ELEMENT_LEGACY_NAME.format(this);
         }
-        if (property.toLowerCase() === 'legacydescription') {
+        if (property.toLowerCase() === 'legacydescription' || property.toLowerCase() === 'legacyiaccessible.description') {
             return GET_ELEMENT_LEGACY_DESCRIPTION.format(this);
         }
-        if (property.toLowerCase() === 'legacyrole') {
+        if (property.toLowerCase() === 'legacyrole' || property.toLowerCase() === 'legacyiaccessible.role') {
             return GET_ELEMENT_LEGACY_ROLE.format(this);
         }
-        if (property.toLowerCase() === 'legacystate') {
+        if (property.toLowerCase() === 'legacystate' || property.toLowerCase() === 'legacyiaccessible.state') {
             return GET_ELEMENT_LEGACY_STATE.format(this);
         }
-        if (property.toLowerCase() === 'legacyhelp') {
+        if (property.toLowerCase() === 'legacyhelp' || property.toLowerCase() === 'legacyiaccessible.help') {
             return GET_ELEMENT_LEGACY_HELP.format(this);
         }
-        if (property.toLowerCase() === 'legacykeyboardshortcut') {
+        if (property.toLowerCase() === 'legacykeyboardshortcut' || property.toLowerCase() === 'legacyiaccessible.keyboardshortcut') {
             return GET_ELEMENT_LEGACY_KEYBOARD_SHORTCUT.format(this);
         }
-        if (property.toLowerCase() === 'legacydefaultaction') {
+        if (property.toLowerCase() === 'legacydefaultaction' || property.toLowerCase() === 'legacyiaccessible.defaultaction') {
             return GET_ELEMENT_LEGACY_DEFAULT_ACTION.format(this);
         }
-        if (property.toLowerCase() === 'legacychildid') {
+        if (property.toLowerCase() === 'legacychildid' || property.toLowerCase() === 'legacyiaccessible.childid') {
             return GET_ELEMENT_LEGACY_CHILD_ID.format(this);
         }
         if (property.toLowerCase() === 'islegacyiaccessiblepatternavailable') {
@@ -1054,7 +1057,7 @@ exports.AutomationElement = AutomationElement;
 class AutomationElementGroup extends AutomationElement {
     groups;
     constructor(...automationElements) {
-        super(`@( ${automationElements.map((el) => `(${el.buildCommand()})`).join(', ')} )`);
+        super(`@(${automationElements.map((el) => `(${el.buildCommand()})`).join(', ')} )`);
         this.groups = automationElements;
     }
     findAllGroups(scope, condition) {