craft-native 0.0.435 → 0.0.436

package/dist/cli.js

@@ -3047,7 +3047,7 @@ function pinCraftNativeDependency(packagePath, craftVersion) {
 `);
 }
 // package.json
-var version = "0.0.435";
+var version = "0.0.436";
 
 // bin/cli.ts
 var spawnedFrom = process6.env[CRAFT_CLI_SPAWN_MARKER];

package/dist/index.cjs

@@ -375,7 +375,7 @@ function craftBinaryNotFoundMessage(triedPath) {
 `);
 }
 // package.json
-var version = "0.0.435";
+var version = "0.0.436";
 
 // src/sdk-version.ts
 var SDK_VERSION = version;

package/dist/index.js

@@ -117,7 +117,7 @@ function craftBinaryNotFoundMessage(triedPath) {
 `);
 }
 // package.json
-var version = "0.0.435";
+var version = "0.0.436";
 
 // src/sdk-version.ts
 var SDK_VERSION = version;

package/dist/ios/templates/CraftNativeMutation.swift

@@ -18,10 +18,22 @@ struct CraftNativeMutationFailure: Error, Equatable {
 struct CraftNativeMutationResult {
     let batchId: String
     let revision: Int
-    let document: [String: Any]?
     let updatedNodeIds: [String]
     let affectedNodeIds: [String]
     let requiresFullRender: Bool
+    private let materialize: () -> [String: Any]?
+    /// The committed tree, built when asked for: a host that redraws only the
+    /// nodes a batch touched never needs the whole tree.
+    var document: [String: Any]? { materialize() }
+
+    init(batchId: String, revision: Int, document: @escaping () -> [String: Any]?, updatedNodeIds: [String], affectedNodeIds: [String], requiresFullRender: Bool) {
+        self.batchId = batchId
+        self.revision = revision
+        self.materialize = document
+        self.updatedNodeIds = updatedNodeIds
+        self.affectedNodeIds = affectedNodeIds
+        self.requiresFullRender = requiresFullRender
+    }
 }
 
 /// Validates and applies versioned native-tree mutations without touching UIKit.
@@ -91,6 +103,8 @@ final class CraftNativeMutationDocument {
         var updatedNodeIds: [String] = []
         var affectedNodeIds: [String] = []
         var requiresFullRender = false
+        // Only an operation that adds, moves or removes nodes can leave one unreachable.
+        var reshaped = false
         for (index, value) in operations.enumerated() {
             guard let operation = value as? [String: Any], let name = operation["op"] as? String else {
                 throw CraftNativeMutationFailure(
@@ -99,6 +113,7 @@ final class CraftNativeMutationDocument {
                     operationIndex: index
                 )
             }
+            if name != "updateNode" { reshaped = true }
             do {
                 switch name {
                 case "createNode":
@@ -147,7 +162,7 @@ final class CraftNativeMutationDocument {
             guard let root = candidateNodes[candidateRoot], root.parent == nil else {
                 throw CraftNativeMutationFailure("INVALID_TREE", "root node must not have a parent")
             }
-            guard descendants(of: candidateRoot, nodes: candidateNodes).count + 1 == candidateNodes.count else {
+            guard !reshaped || descendants(of: candidateRoot, nodes: candidateNodes).count + 1 == candidateNodes.count else {
                 throw CraftNativeMutationFailure("INVALID_TREE", "all nodes must be reachable from the root")
             }
         }
@@ -158,7 +173,7 @@ final class CraftNativeMutationDocument {
         return CraftNativeMutationResult(
             batchId: batchId,
             revision: nextRevision,
-            document: candidateRoot.flatMap { materialize($0, nodes: candidateNodes) },
+            document: { [candidateRoot, candidateNodes, weak self] in candidateRoot.flatMap { self?.materialize($0, nodes: candidateNodes) } },
             updatedNodeIds: updatedNodeIds,
             affectedNodeIds: affectedNodeIds,
             requiresFullRender: requiresFullRender

package/dist/ios/templates/testing/DriverTests.swift.template

@@ -285,8 +285,15 @@ final class DriverTests: XCTestCase {
         return (parts[0], parts.count > 1 ? Double(parts[1]) ?? 10 : 10)
     }
 
-    /// A tap that never fails the run: an element covered a moment (the big
-    /// timer coming up) is tapped where it is, and the check after says.
+    /// A switch reports "0" or "1". Any other value is not a switch state to
+    /// wait on, so the tap stands as it would for any other control.
+    func switchFlipped(from before: String?, to after: String?) -> Bool {
+        let states: Set<String> = ["0", "1"]
+        guard let before, let after, states.contains(before), states.contains(after) else { return true }
+        return before != after
+    }
+
+    /// Deliver one gesture; the command's observation determines success.
     func press(_ element: XCUIElement) {
         if element.isHittable { element.tap() }
         else { element.coordinate(withNormalizedOffset: CGVector(dx: 0.5, dy: 0.5)).tap() }
@@ -438,8 +445,21 @@ final class DriverTests: XCTestCase {
             else { XCTFail("Element not found"); note("FAIL tapexact \(arg): NOT FOUND") }
         case "tapid":
             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") }
+            if !target.waitForExistence(timeout: 10) { XCTFail("Element not found"); note("FAIL tapid \(arg): NOT FOUND") }
+            else if target.elementType == .switch {
+                // Observe one physical gesture. Retapping could conceal a
+                // renderer or hit-testing failure (HQ agreement job 7570).
+                let before = target.value as? String
+                press(target)
+                let settle = Date().addingTimeInterval(1.5)
+                var flipped = false
+                repeat {
+                    flipped = switchFlipped(from: before, to: target.value as? String)
+                    if !flipped { Thread.sleep(forTimeInterval: 0.25) }
+                } while !flipped && Date() < settle
+                check(flipped, "tapid \(arg) flips the switch")
+            }
+            else { press(target); note("tapid \(arg): ok") }
         case "longpressid":
             let target = identified(arg)
             guard target.waitForExistence(timeout: 10), target.isHittable else {

package/dist/macos/src/index.js

@@ -43,7 +43,7 @@ import process from "process";
 var macosToolchain = {
   zig: "0.18.0-dev.252+86dc5ce25",
   sources: {
-    "zig-js": { repository: "zig-utils/zig-js", revision: "59497a090677aeb317e52ac55329e6a680457727", paths: ["src", "include", "tests", "tools", "docs", "bench", "conformance"] },
+    "zig-js": { repository: "zig-utils/zig-js", revision: "44a0a2ba814a911ac701c44073bd8d7d8ff6a22d", paths: ["src", "include", "tests", "tools", "docs", "bench", "conformance"] },
     "zig-regex": { repository: "zig-utils/zig-regex", revision: "fdd9c2e333ea6ac2fd06d080d939ef7f11d61b1b", paths: ["src"] },
     "zig-gc": { repository: "zig-utils/zig-gc", revision: "73c802e05768a729614e9c4296abb118aa06faf9", paths: ["src"] }
   }

package/dist/macos/src/toolchain.d.ts

@@ -9,7 +9,7 @@ export declare const macosToolchain: {
     readonly sources: {
         readonly 'zig-js': {
             readonly repository: 'zig-utils/zig-js';
-            readonly revision: '59497a090677aeb317e52ac55329e6a680457727';
+            readonly revision: '44a0a2ba814a911ac701c44073bd8d7d8ff6a22d';
             readonly paths: readonly ['src', 'include', 'tests', 'tools', 'docs', 'bench', 'conformance'];
         };
         readonly 'zig-regex': {

package/dist/macos/templates/CraftMacRenderer.swift

@@ -288,6 +288,8 @@ final class CraftMacBox: NSView, NSTextFieldDelegate, NSTextViewDelegate, NSDrag
     static var measuredCount = 0
     private struct MeasureKey: Hashable { let width: CGFloat, stretch: Bool }
     private var measured: [MeasureKey: CGSize] = [:]
+    /// What this box measured is stale: it or something inside it changed (CraftMacRenderer.update).
+    func forgetMeasurements() { measured.removeAll(keepingCapacity: true) }
     private var measuredGeneration = -1
     var componentRoot: CraftMacBox? { props["data-stx-component-wrapper"] != nil && flow?.boxes.count == 1 && flow?.boxes.first?.kind != "Modal" ? flow?.boxes.first : nil }
     var layoutStyle: [String: Any] {
@@ -966,6 +968,77 @@ final class CraftMacRenderer {
     weak var window: NSWindow?
     var sheets: [String: NSPanel] = [:]
     init(runtime: CraftMacRuntime) { self.runtime = runtime }
+    /// The box for `node`, made or reconfigured, and its children's in order; every id drawn goes into `retained`.
+    func reconcile(_ node: [String: Any], retained: inout Set<String>) -> CraftMacBox {
+        let id = node["id"] as? String ?? "root", kind = node["type"] as? String ?? "View"
+        retained.insert(id)
+        let box = boxes[id] ?? CraftMacBox(id: id, kind: kind, renderer: self)
+        boxes[id] = box; box.configure(node)
+        if let flow = box.flow, kind != "Button" {
+            let children = (node["children"] as? [Any] ?? []).compactMap { $0 as? [String: Any] }.map { reconcile($0, retained: &retained) }
+            for child in flow.boxes where !children.contains(where: { $0 === child }) { child.removeFromSuperview() }
+            flow.boxes = children
+            for child in children where child.superview !== flow && sheets[child.id] == nil { flow.addSubview(child) }
+            // `zIndex` draws a child above its siblings (an overlay over a web page), highest last.
+            let raised = children.filter { (number($0.layoutStyle["zIndex"]) ?? 0) > 0 && $0.superview === flow }
+                .sorted { (number($0.layoutStyle["zIndex"]) ?? 0) < (number($1.layoutStyle["zIndex"]) ?? 0) }
+            if !raised.isEmpty, Array(flow.subviews.suffix(raised.count)) != raised {
+                for child in raised { flow.addSubview(child, positioned: .above, relativeTo: nil) }
+            }
+        }
+        return box
+    }
+
+    /// A batch drawn where it happened rather than across the window: each changed node's subtree
+    /// (or, for a node the batch created, its nearest drawn ancestor's) is reconciled again, and only
+    /// those boxes and the boxes above them measure and lay out again. A hover on one row used to
+    /// reconfigure every view in the window and forget every measurement. False when it cannot be
+    /// done in place (nothing drawn yet, a sheet, a node changing kind): the caller renders the tree.
+    func update(_ ids: [String], parentOf: (String) -> String?, node nodeFor: (String) -> [String: Any]?) -> Bool {
+        guard !boxes.isEmpty else { return false }
+        var targets: [String] = []
+        for id in ids {
+            var current: String? = id
+            while let candidate = current, boxes[candidate] == nil { current = parentOf(candidate) }
+            guard let target = current else { return false }
+            if !targets.contains(target) { targets.append(target) }
+        }
+        // A target inside another is drawn with it.
+        let chosen = targets.filter { target in
+            guard let box = boxes[target] else { return false }
+            return !targets.contains { other in other != target && boxes[other].map { box.isDescendant(of: $0) } == true }
+        }
+        CATransaction.begin(); CATransaction.setDisableActions(true)
+        defer { CATransaction.commit() }
+        for target in chosen {
+            guard let box = boxes[target], box.window === window, sheets[target] == nil, box.kind != "Modal",
+                  let node = nodeFor(target), (node["type"] as? String ?? "View") == box.kind else { return false }
+            var before = Set<String>()
+            collectIds(box, into: &before)
+            var retained = Set<String>()
+            _ = reconcile(node, retained: &retained)
+            for id in before where !retained.contains(id) {
+                guard let gone = boxes.removeValue(forKey: id) else { continue }
+                gone.imageTask?.cancel(); gone.removeFromSuperview()
+            }
+            for id in retained { if let drawn = boxes[id] { drawn.forgetMeasurements(); drawn.needsLayout = true } }
+            var above: NSView? = box.superview
+            while let view = above {
+                (view as? CraftMacBox)?.forgetMeasurements()
+                view.needsLayout = true
+                above = view.superview
+            }
+        }
+        root.needsLayout = true
+        root.layoutSubtreeIfNeeded()
+        return true
+    }
+
+    private func collectIds(_ box: CraftMacBox, into ids: inout Set<String>) {
+        ids.insert(box.id)
+        for child in box.flow?.boxes ?? [] { collectIds(child, into: &ids) }
+    }
+
     func render(_ document: [String: Any]) {
         CATransaction.begin(); CATransaction.setDisableActions(true)
         defer { CATransaction.commit() }
@@ -976,26 +1049,7 @@ final class CraftMacRenderer {
             let bottom = bounds.maxY >= (scroll.documentView?.bounds.height ?? 0) - 8
             scrolls.append((box, bounds.origin, bottom))
         } }
-        func reconcile(_ node: [String: Any]) -> CraftMacBox {
-            let id = node["id"] as? String ?? "root", kind = node["type"] as? String ?? "View"
-            retained.insert(id)
-            let box = boxes[id] ?? CraftMacBox(id: id, kind: kind, renderer: self)
-            boxes[id] = box; box.configure(node)
-            if let flow = box.flow, kind != "Button" {
-                let children = (node["children"] as? [Any] ?? []).compactMap { $0 as? [String: Any] }.map(reconcile)
-                for child in flow.boxes where !children.contains(where: { $0 === child }) { child.removeFromSuperview() }
-                flow.boxes = children
-                for child in children where child.superview !== flow && sheets[child.id] == nil { flow.addSubview(child) }
-                // `zIndex` draws a child above its siblings (an overlay over a web page), highest last.
-                let raised = children.filter { (number($0.layoutStyle["zIndex"]) ?? 0) > 0 && $0.superview === flow }
-                    .sorted { (number($0.layoutStyle["zIndex"]) ?? 0) < (number($1.layoutStyle["zIndex"]) ?? 0) }
-                if !raised.isEmpty, Array(flow.subviews.suffix(raised.count)) != raised {
-                    for child in raised { flow.addSubview(child, positioned: .above, relativeTo: nil) }
-                }
-            }
-            return box
-        }
-        let box = reconcile(document)
+        let box = reconcile(document, retained: &retained)
         // Boxes were reconfigured and children replaced: nothing measured before now holds.
         CraftMacBox.measureGeneration &+= 1
         for (id, box) in boxes where !retained.contains(id) {

package/dist/macos/templates/CraftMacRuntime.swift

@@ -173,7 +173,37 @@ final class CraftMacRuntime {
         """)
     }
 
-    func load(_ bundle: String) { context.evaluateScript(bundle); ZJSContextRunMicrotasks(context) }
+    func load(_ bundle: String) {
+        startProfileIfAsked()
+        context.evaluateScript(bundle); ZJSContextRunMicrotasks(context)
+    }
+
+    /// `CRAFT_JS_PROFILE=<file>`: sample this screen's JavaScript from the moment its bundle loads,
+    /// for `CRAFT_JS_PROFILE_MS` milliseconds (5000, every `CRAFT_JS_PROFILE_INTERVAL_US`, 1000),
+    /// and write it as Chrome's `.cpuprofile` (DevTools and speedscope open it). A window other
+    /// than Main writes beside it, its route in the name.
+    private func startProfileIfAsked() {
+        let env = ProcessInfo.processInfo.environment
+        guard let path = env["CRAFT_JS_PROFILE"], !path.isEmpty, let ref = context.jsGlobalContextRef else { return }
+        guard ZJSContextStartCPUProfile(ref, UInt32(env["CRAFT_JS_PROFILE_INTERVAL_US"] ?? "") ?? 0) else { return }
+        let seconds = (Double(env["CRAFT_JS_PROFILE_MS"] ?? "") ?? 5000) / 1000
+        DispatchQueue.main.asyncAfter(deadline: .now() + seconds) { [weak self] in self?.writeProfile(to: path) }
+    }
+
+    private func writeProfile(to path: String) {
+        guard !disposed, let ref = context.jsGlobalContextRef, let json = ZJSContextStopCPUProfile(ref) else { return }
+        defer { JSStringRelease(json) }
+        let size = JSStringGetMaximumUTF8CStringSize(json)
+        var bytes = [CChar](repeating: 0, count: size)
+        JSStringGetUTF8CString(json, &bytes, size)
+        let url = URL(fileURLWithPath: path)
+        let target = route == "Main" ? url : url.deletingPathExtension().appendingPathExtension("\(route).cpuprofile")
+        do {
+            try String(cString: bytes).write(to: target, atomically: true, encoding: .utf8)
+            fputs("[craft] JavaScript profile written to \(target.path)\n", stderr)
+        }
+        catch { fputs("[craft] could not write the JavaScript profile to \(target.path): \(error)\n", stderr) }
+    }
 
     func dispose() {
         guard !disposed else { return }
@@ -215,7 +245,9 @@ final class CraftMacRuntime {
         case "MUTATE":
             do {
                 let result = try document.apply(payload)
-                if let tree = result.document { scene?.renderer.render(tree) }
+                // Drawn where it changed; the whole tree only when the batch reshaped it.
+                if result.requiresFullRender || scene?.renderer.update(result.affectedNodeIds, parentOf: document.parentId(of:), node: document.node) != true,
+                   let tree = result.document { scene?.renderer.render(tree) }
                 send("MUTATION_ACK", ["version": 1, "batchId": result.batchId, "revision": result.revision])
             } catch let error as CraftNativeMutationFailure {
                 send("MUTATION_ERROR", ["version": 1, "batchId": payload["batchId"] ?? "", "code": error.code, "message": error.message])

package/dist/macos/templates/CraftNativeMutation.swift

@@ -18,10 +18,22 @@ struct CraftNativeMutationFailure: Error, Equatable {
 struct CraftNativeMutationResult {
     let batchId: String
     let revision: Int
-    let document: [String: Any]?
     let updatedNodeIds: [String]
     let affectedNodeIds: [String]
     let requiresFullRender: Bool
+    private let materialize: () -> [String: Any]?
+    /// The committed tree, built when asked for: a host that redraws only the
+    /// nodes a batch touched never needs the whole tree.
+    var document: [String: Any]? { materialize() }
+
+    init(batchId: String, revision: Int, document: @escaping () -> [String: Any]?, updatedNodeIds: [String], affectedNodeIds: [String], requiresFullRender: Bool) {
+        self.batchId = batchId
+        self.revision = revision
+        self.materialize = document
+        self.updatedNodeIds = updatedNodeIds
+        self.affectedNodeIds = affectedNodeIds
+        self.requiresFullRender = requiresFullRender
+    }
 }
 
 /// Validates and applies versioned native-tree mutations without touching UIKit.
@@ -91,6 +103,8 @@ final class CraftNativeMutationDocument {
         var updatedNodeIds: [String] = []
         var affectedNodeIds: [String] = []
         var requiresFullRender = false
+        // Only an operation that adds, moves or removes nodes can leave one unreachable.
+        var reshaped = false
         for (index, value) in operations.enumerated() {
             guard let operation = value as? [String: Any], let name = operation["op"] as? String else {
                 throw CraftNativeMutationFailure(
@@ -99,6 +113,7 @@ final class CraftNativeMutationDocument {
                     operationIndex: index
                 )
             }
+            if name != "updateNode" { reshaped = true }
             do {
                 switch name {
                 case "createNode":
@@ -147,7 +162,7 @@ final class CraftNativeMutationDocument {
             guard let root = candidateNodes[candidateRoot], root.parent == nil else {
                 throw CraftNativeMutationFailure("INVALID_TREE", "root node must not have a parent")
             }
-            guard descendants(of: candidateRoot, nodes: candidateNodes).count + 1 == candidateNodes.count else {
+            guard !reshaped || descendants(of: candidateRoot, nodes: candidateNodes).count + 1 == candidateNodes.count else {
                 throw CraftNativeMutationFailure("INVALID_TREE", "all nodes must be reachable from the root")
             }
         }
@@ -158,7 +173,7 @@ final class CraftNativeMutationDocument {
         return CraftNativeMutationResult(
             batchId: batchId,
             revision: nextRevision,
-            document: candidateRoot.flatMap { materialize($0, nodes: candidateNodes) },
+            document: { [candidateRoot, candidateNodes, weak self] in candidateRoot.flatMap { self?.materialize($0, nodes: candidateNodes) } },
             updatedNodeIds: updatedNodeIds,
             affectedNodeIds: affectedNodeIds,
             requiresFullRender: requiresFullRender

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "craft-native",
-  "version": "0.0.435",
+  "version": "0.0.436",
   "type": "module",
   "description": "Build desktop apps with web languages - TypeScript SDK for Craft",
   "author": "Chris Breuer <chris@stacksjs.org>",