@craft-native/ios 0.0.238 → 0.0.241

package/dist/index.js

@@ -228,10 +228,18 @@ function serializeSimulatorSteps(steps) {
       if (!Number.isInteger(number(step.index)))
         throw new Error("field index must be an integer");
       arg = `${step.index} ${step.text}`;
+    } else if ("position" in step) {
+      if (number(step.position) > 1)
+        throw new Error("Slider position must be between 0 and 1");
+      arg = `${token(step.id)} ${step.position}`;
     } else if ("id" in step)
       arg = `${token(step.id)} ${step.text}`;
     else if ("text" in step) {
       arg = step.text;
+      if (step.command === "longpressid")
+        token(arg);
+      if (step.command === "expectapp" && !/^[A-Za-z0-9-]+(?:\.[A-Za-z0-9-]+)+$/.test(arg))
+        throw new Error("Expected an application bundle identifier");
       if ("seconds" in step && step.seconds !== undefined) {
         if (arg.includes("|"))
           throw new Error("A timed expectation cannot contain |");

package/dist/testing.d.ts

@@ -66,15 +66,27 @@ export type SimulatorStep = {
     index: number;
     text: string;
 } | {
-    command: 'typeid' | 'labelid';
+    command: 'typeid' | 'labelid' | 'valueid';
     id: string;
     text: string;
+}
+/** Adjust an actual native UISlider by identifier, using its normalized range. */
+ | {
+    command: 'sliderid';
+    id: string;
+    position: number;
+}
+/** Assert a handoff reached the foreground application without launching it. */
+ | {
+    command: 'expectapp';
+    text: string;
+    seconds?: number;
 } | {
     command: 'expect' | 'expectexact' | 'expectid' | 'systemexpect';
     text: string;
     seconds?: number;
 } | {
-    command: 'tap' | 'tapif' | 'tapid' | 'tapexact' | 'type' | 'absent' | 'absentid' | 'selected' | 'tab' | 'scrollto' | 'dismiss' | 'log' | 'systemtap' | 'systemabsent';
+    command: 'tap' | 'tapif' | 'tapid' | 'longpressid' | 'tapexact' | 'type' | 'absent' | 'absentid' | 'selected' | 'tab' | 'scrollto' | 'dismiss' | 'log' | 'systemtap' | 'systemabsent';
     text: string;
 } | {
     command: 'shot' | 'tree' | 'audit' | 'exec' | 'systemtree';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@craft-native/ios",
-  "version": "0.0.238",
+  "version": "0.0.241",
   "homepage": "https://github.com/craft-native/craft/tree/main/packages/ios#readme",
   "repository": {
     "type": "git",

package/templates/CraftApp.swift

@@ -1991,6 +1991,9 @@ struct CraftWebView: UIViewRepresentable {
         private var locationManager: CLLocationManager?
         private var singleLocationCallbackId: String?
         private var singleLocationTimeoutWorkItem: DispatchWorkItem?
+        private var singleLocationTimeoutMilliseconds: Double = 30_000
+        private var singleLocationAcquisitionStarted = false
+        private var singleLocationAuthorizationRequested = false
         private var locationPermissionCallbackId: String?
         private var locationPermissionRequiresAlways = false
         private var isWatchingLocation = false
@@ -2065,7 +2068,7 @@ struct CraftWebView: UIViewRepresentable {
         // SQLite database
         private var db: OpaquePointer?
 
-        init(config: CraftConfig, recordingDirectory: URL? = nil) {
+        init(config: CraftConfig, locationManager suppliedLocationManager: CLLocationManager? = nil, recordingDirectory: URL? = nil) {
             self.recordingDirectory = recordingDirectory
             self.config = config
             super.init()
@@ -2073,7 +2076,7 @@ struct CraftWebView: UIViewRepresentable {
                 speechRecognizer = SFSpeechRecognizer(locale: Locale(identifier: "en-US"))
             }
             if config.enableGeolocation {
-                locationManager = CLLocationManager()
+                locationManager = suppliedLocationManager ?? CLLocationManager()
                 locationManager?.desiredAccuracy = kCLLocationAccuracyBest
                 locationManager?.activityType = .fitness
                 locationManager?.pausesLocationUpdatesAutomatically = false
@@ -6400,7 +6403,7 @@ struct CraftWebView: UIViewRepresentable {
             }
             singleLocationCallbackId = callbackId
             let maximumAge = max(0, (body["maximumAge"] as? NSNumber)?.doubleValue ?? 0)
-            if maximumAge > 0,
+            if (manager.authorizationStatus == .authorizedAlways || manager.authorizationStatus == .authorizedWhenInUse), maximumAge > 0,
                let cachedLocation = manager.location,
                max(0, Date().timeIntervalSince(cachedLocation.timestamp) * 1000) <= maximumAge {
                 finishSingleLocationRequest()
@@ -6408,7 +6411,35 @@ struct CraftWebView: UIViewRepresentable {
                 return
             }
 
-            let timeoutMs = max(0, (body["timeout"] as? NSNumber)?.doubleValue ?? 30_000)
+            singleLocationTimeoutMilliseconds = max(0, (body["timeout"] as? NSNumber)?.doubleValue ?? 30_000)
+            continueSingleLocationRequest(manager)
+        }
+
+        private func continueSingleLocationRequest(_ manager: CLLocationManager) {
+            guard let callbackId = singleLocationCallbackId else { return }
+            switch manager.authorizationStatus {
+            case .notDetermined:
+                if !singleLocationAuthorizationRequested {
+                    singleLocationAuthorizationRequested = true
+                    manager.requestWhenInUseAuthorization()
+                }
+                return
+            case .denied, .restricted:
+                finishSingleLocationRequest()
+                rejectCallback(callbackId, error: "Location permission was denied.", code: "PERMISSION_DENIED")
+                return
+            case .authorizedAlways, .authorizedWhenInUse:
+                break
+            @unknown default:
+                finishSingleLocationRequest()
+                rejectCallback(callbackId, error: "Location authorization is unavailable.", code: "PERMISSION_DENIED")
+                return
+            }
+            guard !singleLocationAcquisitionStarted else { return }
+            singleLocationAcquisitionStarted = true
+            // The acquisition timeout starts after the person decides. A
+            // permission sheet is not a failed or timed-out GPS fix.
+            let timeoutMs = singleLocationTimeoutMilliseconds
             let timeoutWorkItem = DispatchWorkItem { [weak self] in
                 guard let self, self.singleLocationCallbackId == callbackId else { return }
                 self.finishSingleLocationRequest()
@@ -6416,7 +6447,6 @@ struct CraftWebView: UIViewRepresentable {
             }
             singleLocationTimeoutWorkItem = timeoutWorkItem
             DispatchQueue.main.asyncAfter(deadline: .now() + .milliseconds(Int(min(timeoutMs + 100, Double(Int.max)))), execute: timeoutWorkItem)
-            requestLocationAuthorization()
             manager.requestLocation()
         }
 
@@ -6424,6 +6454,8 @@ struct CraftWebView: UIViewRepresentable {
             singleLocationTimeoutWorkItem?.cancel()
             singleLocationTimeoutWorkItem = nil
             singleLocationCallbackId = nil
+            singleLocationAcquisitionStarted = false
+            singleLocationAuthorizationRequested = false
             locationManager?.desiredAccuracy = kCLLocationAccuracyBest
         }
 
@@ -6753,6 +6785,10 @@ struct CraftWebView: UIViewRepresentable {
 
         func locationManager(_ manager: CLLocationManager, didFailWithError error: Error) {
             let nativeError = error as NSError
+            if nativeError.domain == kCLErrorDomain, nativeError.code == CLError.Code.denied.rawValue,
+               manager.authorizationStatus == .notDetermined, singleLocationCallbackId != nil, !singleLocationAcquisitionStarted {
+                return
+            }
             // kCLErrorLocationUnknown is Core Location saying it has no fix
             // *yet*, not that it failed. requestLocation gives up on it, so a
             // one-shot asks again shortly instead of failing a caller whose
@@ -6761,7 +6797,7 @@ struct CraftWebView: UIViewRepresentable {
             if nativeError.domain == kCLErrorDomain && nativeError.code == CLError.Code.locationUnknown.rawValue {
                 if let waiting = singleLocationCallbackId {
                     DispatchQueue.main.asyncAfter(deadline: .now() + .seconds(1)) { [weak self] in
-                        guard let self, self.singleLocationCallbackId == waiting else { return }
+                        guard let self, self.singleLocationCallbackId == waiting, self.singleLocationAcquisitionStarted else { return }
                         self.locationManager?.requestLocation()
                     }
                 }
@@ -6777,6 +6813,7 @@ struct CraftWebView: UIViewRepresentable {
         }
 
         func locationManagerDidChangeAuthorization(_ manager: CLLocationManager) {
+            if singleLocationCallbackId != nil { continueSingleLocationRequest(manager) }
             guard let callbackId = locationPermissionCallbackId else { return }
             let status = manager.authorizationStatus
             if status == .notDetermined { return }

package/templates/CraftNativeScreen.swift

@@ -139,7 +139,7 @@ private enum CraftNativeTreeLayoutBridge {
         var alignItems: UInt32 = 3
         var alignSelf: UInt32 = 0
         var flexWrap: UInt32 = 0
-        var alignContent: UInt32 = 6
+        var alignContent: UInt32 = 5
         var marginTop: Float = 0
         var marginRight: Float = 0
         var marginBottom: Float = 0
@@ -180,7 +180,7 @@ private enum CraftNativeTreeLayoutBridge {
         var alignItems: UInt32 = 3
         var alignSelf: UInt32 = 0
         var flexWrap: UInt32 = 0
-        var alignContent: UInt32 = 6
+        var alignContent: UInt32 = 5
         var marginTop: Float = 0
         var marginRight: Float = 0
         var marginBottom: Float = 0
@@ -222,7 +222,7 @@ private enum CraftNativeTreeLayoutBridge {
         var alignItems: UInt32 = 3
         var alignSelf: UInt32 = 0
         var flexWrap: UInt32 = 0
-        var alignContent: UInt32 = 6
+        var alignContent: UInt32 = 5
         var marginTop: Float = 0
         var marginRight: Float = 0
         var marginBottom: Float = 0
@@ -1171,8 +1171,10 @@ private final class CraftNativeMapView: MKMapView, MKMapViewDelegate {
     private var authoredHeading: Double?
     private var edgePadding = UIEdgeInsets(top: 24, left: 24, bottom: 24, right: 24)
     private var markerBearings: [String: Double] = [:]
+    private var markerPinColors: [String: UIColor] = [:]
     private var tileOverlay: MKTileOverlay?
     private var tileTemplate: String?
+    private var tileAttributionBottom: NSLayoutConstraint?
     private lazy var tileAttribution: UILabel = {
         let label = UILabel()
         label.font = .systemFont(ofSize: 9)
@@ -1181,7 +1183,9 @@ private final class CraftNativeMapView: MKMapView, MKMapViewDelegate {
         label.translatesAutoresizingMaskIntoConstraints = false
         label.numberOfLines = 2
         addSubview(label)
-        NSLayoutConstraint.activate([label.trailingAnchor.constraint(equalTo: trailingAnchor, constant: -8), label.bottomAnchor.constraint(equalTo: bottomAnchor, constant: -8), label.leadingAnchor.constraint(greaterThanOrEqualTo: leadingAnchor, constant: 48)])
+        let bottom = label.bottomAnchor.constraint(equalTo: bottomAnchor, constant: -8)
+        tileAttributionBottom = bottom
+        NSLayoutConstraint.activate([label.trailingAnchor.constraint(equalTo: trailingAnchor, constant: -8), bottom, label.leadingAnchor.constraint(greaterThanOrEqualTo: leadingAnchor, constant: 48)])
         return label
     }()
 
@@ -1206,6 +1210,7 @@ private final class CraftNativeMapView: MKMapView, MKMapViewDelegate {
         isScrollEnabled = props["scrollEnabled"] as? Bool ?? true
         isZoomEnabled = props["zoomEnabled"] as? Bool ?? true
         isRotateEnabled = props["rotateEnabled"] as? Bool ?? false
+        isPitchEnabled = props["pitchEnabled"] as? Bool ?? true
         mapType = Self.mapType(props["mapType"] as? String)
         configureTiles(props["tileOverlay"] as? [String: Any])
         showsCompass = props["showsCompass"] as? Bool ?? false
@@ -1219,6 +1224,7 @@ private final class CraftNativeMapView: MKMapView, MKMapViewDelegate {
         }
         edgePadding = UIEdgeInsets(top: inset("top"), left: inset("left"), bottom: inset("bottom"), right: inset("right"))
         var nextBearings: [String: Double] = [:]
+        var nextPinColors: [String: UIColor] = [:]
         // Showing the user dot must not trigger a permission prompt from a
         // renderer pass. The app's existing location capability owns that
         // prompt; a map only opts in after authorization is already granted.
@@ -1227,6 +1233,7 @@ private final class CraftNativeMapView: MKMapView, MKMapViewDelegate {
         var nextMarkers: [String: (coordinate: CLLocationCoordinate2D, title: String?)] = [:]
         var nextHandlers: [String: String] = [:]
         var nextPolylines: [String: (coordinates: [CLLocationCoordinate2D], color: UIColor, width: CGFloat)] = [:]
+        var nextPolylineIDs: [String] = []
         for (index, child) in children.enumerated() {
             guard let node = child as? [String: Any], let rawType = node["type"] as? String else { continue }
             let type = rawType.lowercased()
@@ -1239,6 +1246,7 @@ private final class CraftNativeMapView: MKMapView, MKMapViewDelegate {
             if type == "mapmarker" || type == "marker" {
                 guard let point = points.first else { continue }
                 nextMarkers[id] = (point, childProps["title"] as? String)
+                if let color = childProps["pinColor"] as? String { nextPinColors[id] = Self.color(color) }
                 if let bearing = Self.numeric(childProps["bearing"]), bearing.isFinite {
                     nextBearings[id] = bearing.truncatingRemainder(dividingBy: 360)
                 }
@@ -1251,11 +1259,13 @@ private final class CraftNativeMapView: MKMapView, MKMapViewDelegate {
                 let authoredWidth = Self.numeric(childProps["strokeWidth"]) ?? 3
                 let width = CGFloat(authoredWidth)
                 guard authoredWidth.isFinite, width.isFinite, width > 0 else { continue }
+                if nextPolylines[id] == nil { nextPolylineIDs.append(id) }
                 nextPolylines[id] = (points, Self.color(childProps["strokeColor"] as? String), width)
             }
         }
 
         markerBearings = nextBearings
+        markerPinColors = nextPinColors
         let staleMarkers = annotationsByID.keys.filter { nextMarkers[$0] == nil }
         removeAnnotations(staleMarkers.compactMap { annotationsByID.removeValue(forKey: $0) })
         for (id, value) in nextMarkers {
@@ -1282,7 +1292,8 @@ private final class CraftNativeMapView: MKMapView, MKMapViewDelegate {
             }
             overlayCoordinatesByID.removeValue(forKey: id)
         }
-        for (id, value) in nextPolylines {
+        for id in nextPolylineIDs {
+            guard let value = nextPolylines[id] else { continue }
             if let overlay = overlaysByID[id],
                let coordinates = overlayCoordinatesByID[id],
                Self.coordinatesEqual(coordinates, value.coordinates),
@@ -1302,6 +1313,19 @@ private final class CraftNativeMapView: MKMapView, MKMapViewDelegate {
             overlayWidths[ObjectIdentifier(overlay)] = value.width
             addOverlay(overlay)
         }
+        // Keep authored casing/foreground order when an earlier line changes
+        // or retained children move. Exchanging native overlays preserves the
+        // unchanged objects, tile levels and current camera.
+        let ownedOverlayIDs = Set(overlaysByID.values.map { ObjectIdentifier($0) })
+        var orderedOverlays = overlays.compactMap { $0 as? MKPolyline }
+            .filter { ownedOverlayIDs.contains(ObjectIdentifier($0)) }
+        for (index, id) in nextPolylineIDs.enumerated() {
+            guard let overlay = overlaysByID[id], index < orderedOverlays.count,
+                  orderedOverlays[index] !== overlay,
+                  let previousIndex = orderedOverlays.firstIndex(where: { $0 === overlay }) else { continue }
+            exchangeOverlay(orderedOverlays[index], with: orderedOverlays[previousIndex])
+            orderedOverlays.swapAt(index, previousIndex)
+        }
 
         if let region = Self.region(props["region"]) {
             // `region` is controlled: an authored change is allowed to move
@@ -1411,20 +1435,27 @@ private final class CraftNativeMapView: MKMapView, MKMapViewDelegate {
 
     private func configureMarkerView(_ view: MKAnnotationView, id: String) {
         if let bearing = markerBearings[id] {
-            let configuration = UIImage.SymbolConfiguration(pointSize: 24, weight: .semibold)
+            let configuration = UIImage.SymbolConfiguration(pointSize: 16, weight: .semibold)
                 .applying(UIImage.SymbolConfiguration(paletteColors: [.white, .systemGreen]))
-            view.image = UIImage(systemName: "arrow.up.circle.fill", withConfiguration: configuration)
+            // MapKit otherwise tints this as a monochrome template and loses
+            // the contrasting route arrow when displayed over map content.
+            view.image = UIImage(systemName: "arrow.up.circle.fill", withConfiguration: configuration)?
+                .withRenderingMode(.alwaysOriginal)
             view.transform = CGAffineTransform(rotationAngle: CGFloat((bearing - camera.heading) * .pi / 180))
         } else {
+            view.tintColor = markerPinColors[id] ?? .systemRed
             view.image = UIImage(systemName: "mappin.circle.fill", withConfiguration: UIImage.SymbolConfiguration(pointSize: 28))?
-                .withTintColor(.systemRed, renderingMode: .alwaysOriginal)
+                .withTintColor(view.tintColor, renderingMode: .alwaysOriginal)
             view.transform = .identity
         }
     }
 
     override func layoutSubviews() {
         super.layoutSubviews()
-        if tileTemplate != nil { bringSubviewToFront(tileAttribution) }
+        if tileTemplate != nil {
+            tileAttributionBottom?.constant = -min(edgePadding.bottom, max(0, bounds.height - 40)) - 8
+            bringSubviewToFront(tileAttribution)
+        }
         if let region = pendingRegion, bounds.width > 0, bounds.height > 0 {
             pendingRegion = nil
             setRegion(region, animated: false)
@@ -2681,11 +2712,24 @@ private class CraftNativeFlowView: UIStackView {
                 var fixedHeight = style.top != nil && style.bottom != nil
                     ? max(0, content.height - (style.top ?? 0) - (style.bottom ?? 0))
                     : style.height?.resolve(content.height)
+                let authoredWidth = fixedWidth != nil
+                let authoredHeight = fixedHeight != nil
                 (fixedWidth, fixedHeight) = aspectDimensions(style, width: fixedWidth, height: fixedHeight)
-                let measured = CraftNativeFlexLayout.measure(child, width: fixedWidth, height: fixedHeight, maxWidth: content.width, maxHeight: content.height)
-                let x = style.left ?? (style.right.map { content.width - $0 - measured.width } ?? 0)
-                let y = style.top ?? (style.bottom.map { content.height - $0 - measured.height } ?? 0)
-                frames.append((child, CGRect(x: content.minX + x, y: content.minY + y, width: measured.width, height: measured.height)))
+                var measured = CraftNativeFlexLayout.measure(child, width: fixedWidth, height: fixedHeight, maxWidth: content.width, maxHeight: content.height)
+                var boundedWidth = clamp(measured.width, style.minWidth?.resolve(content.width), style.maxWidth?.resolve(content.width))
+                let proposedHeight = !authoredHeight && style.aspectRatio != nil ? boundedWidth / style.aspectRatio! : fixedHeight
+                if abs(boundedWidth - measured.width) > 0.0001 || proposedHeight != fixedHeight {
+                    // A narrower label or container must wrap before its
+                    // height and bottom anchor are resolved.
+                    measured = CraftNativeFlexLayout.measure(child, width: boundedWidth, height: proposedHeight, maxWidth: content.width, maxHeight: content.height)
+                }
+                let boundedHeight = clamp(measured.height, style.minHeight?.resolve(content.height), style.maxHeight?.resolve(content.height))
+                if !authoredWidth, authoredHeight, let ratio = style.aspectRatio {
+                    boundedWidth = clamp(boundedHeight * ratio, style.minWidth?.resolve(content.width), style.maxWidth?.resolve(content.width))
+                }
+                let x = style.left ?? (style.right.map { content.width - $0 - boundedWidth } ?? 0)
+                let y = style.top ?? (style.bottom.map { content.height - $0 - boundedHeight } ?? 0)
+                frames.append((child, CGRect(x: content.minX + x, y: content.minY + y, width: boundedWidth, height: boundedHeight)))
             }
         }
         return (size, frames)
@@ -3370,6 +3414,8 @@ private final class CraftNativeModalView: UIView {
         let generation = animationGeneration
         layer.removeAllAnimations()
         guard visible else {
+            craftScreenController?.forgetFocusedInput(in: self)
+            endEditing(true)
             if animationType == "slide" && wasVisible {
                 let distance = max(bounds.height, superview?.bounds.height ?? UIScreen.main.bounds.height)
                 UIView.animate(withDuration: 0.24, animations: {
@@ -3409,6 +3455,8 @@ private final class CraftNativeModalView: UIView {
     }
 
     func resetForTeardown() {
+        craftScreenController?.forgetFocusedInput(in: self)
+        endEditing(true)
         animationGeneration += 1
         layer.removeAllAnimations()
         isHidden = true
@@ -4326,6 +4374,11 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
     func forgetFocusedInput(_ input: UIView? = nil) {
         if input == nil || lastFocusedInput === input { lastFocusedInput = nil }
     }
+    func forgetFocusedInput(in container: UIView) {
+        if let input = lastFocusedInput, input === container || input.isDescendant(of: container) {
+            lastFocusedInput = nil
+        }
+    }
     private var flatListRows: [ObjectIdentifier: [String: RenderedNode]] = [:]
     private var flatListOwners: [String: String] = [:]
     /// A drawing's shapes are not views: a change to one redraws its `Svg`.
@@ -6054,6 +6107,11 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
     private func restoreFocus(_ focused: UIView?) {
         guard let focused, focused.window != nil, !focused.isFirstResponder,
               lastFocusedInput === focused, firstResponder(in: rootStack) == nil else { return }
+        var ancestor: UIView? = focused
+        while let view = ancestor {
+            if view.isHidden { return }
+            ancestor = view.superview
+        }
         // A delayed acknowledgement belongs to the input that scheduled it.
         // A newer field or an explicit dismissal owns focus now.
         _ = focused.becomeFirstResponder()

package/templates/testing/DriverTests.swift.template

@@ -21,6 +21,7 @@ import Darwin
 ///   tap <text>            first hittable element whose label contains text
 ///   tapif <text>          tap it when it is on screen, else carry on (the big timer's "Show the controls")
 ///   tapid <identifier>
+///   longpressid <identifier> holds a hittable native element to open its edit menu
 ///   touches <JSON>       timed normalized touch paths in one native dispatch
 ///   tapxy <x> <y>         normalised 0…1 of the screen
 ///   tapexact <label>      a button whose label is exactly this
@@ -29,11 +30,14 @@ import Darwin
 ///   return                the keyboard's return key (Go on a sign-in form)
 ///   field <n> <text>      tap the n-th text field (0-based, secure fields after plain) and type
 ///   typeid <identifier> <text>  tap the element with this identifier and type
+///   sliderid <identifier> <0…1> adjusts a hittable native slider
+///   expectapp <bundle-id> [| secs] asserts a native app handoff reached the foreground
 ///   expect <text> [| secs]  waits for an element containing text; logs PASS/FAIL
 ///   expectexact <label> [| secs]  a button or text whose label is exactly this
 ///   absent <text>         logs PASS when no element contains text
 ///   expectid <id> [| secs] / absentid <id>   the same by accessibility identifier (testID)
 ///   labelid <id> <text>   that element's label is exactly text (a count, a status)
+///   valueid <id> <text>   that element's actual string value is exactly text
 ///   tabbar shown|hidden   the native tab bar (Today, Calendar, …) can be tapped, or not
 ///   selected <tab>        the tab bar's selected button is this one
 ///   tab <name>            tap a tab bar button
@@ -297,6 +301,14 @@ final class DriverTests: XCTestCase {
             let target = identified(arg)
             if target.waitForExistence(timeout: 10) { press(target); note("tapid \(arg): ok") }
             else { XCTFail("Element not found"); note("FAIL tapid \(arg): NOT FOUND") }
+        case "longpressid":
+            let target = identified(arg)
+            guard target.waitForExistence(timeout: 10), target.isHittable else {
+                check(false, "longpressid \(arg) is hittable")
+                return
+            }
+            target.press(forDuration: 1.2)
+            note("longpressid \(arg): ok")
         case "touches":
             do {
                 guard let data = arg.data(using: .utf8),
@@ -367,6 +379,23 @@ final class DriverTests: XCTestCase {
                 app.typeText(idParts.count > 1 ? idParts[1] : "")
                 note("typeid \(idParts[0]): ok")
             } else { XCTFail("Element not found"); note("FAIL typeid \(idParts[0]): NOT FOUND") }
+        case "sliderid":
+            let parts = arg.split(separator: " ", maxSplits: 1).map(String.init)
+            guard parts.count == 2, let position = Double(parts[1]), position.isFinite, (0...1).contains(position) else {
+                check(false, "sliderid requires an identifier and normalized position")
+                return
+            }
+            let slider = app.sliders.matching(NSPredicate(format: "identifier == %@", parts[0])).firstMatch
+            guard slider.waitForExistence(timeout: 10), slider.isHittable else {
+                check(false, "sliderid \(parts[0]) is hittable")
+                return
+            }
+            slider.adjust(toNormalizedSliderPosition: CGFloat(position))
+            note("sliderid \(parts[0]): \(position)")
+        case "expectapp":
+            let (bundle, seconds) = split(arg)
+            let target = XCUIApplication(bundleIdentifier: bundle)
+            check(target.wait(for: .runningForeground, timeout: seconds), "expectapp \(bundle)")
         case "field":
             let fieldParts = arg.split(separator: " ", maxSplits: 1).map(String.init)
             let index = Int(fieldParts[0]) ?? 0
@@ -392,6 +421,14 @@ final class DriverTests: XCTestCase {
             let want = idParts.count > 1 ? idParts[1] : ""
             let seen = target.waitForExistence(timeout: 5) ? target.label : "(missing)"
             check(seen == want, "labelid \(idParts[0]) \(want) (saw \(seen))")
+        case "valueid":
+            let idParts = arg.split(separator: " ", maxSplits: 1).map(String.init)
+            let target = identified(idParts[0])
+            let want = idParts.count > 1 ? idParts[1] : ""
+            let matched = poll(5) {
+                target.exists && (target.value as? String) == want ? target : nil
+            }
+            check(matched != nil, "valueid \(idParts[0]) \(want)")
         case "absentid":
             check(!identified(arg).exists, "absentid \(arg)")
         case "absent":