craft-native 0.0.146 → 0.0.148

package/dist/android/templates/MainActivityNative.kt.template

@@ -2094,6 +2094,21 @@ class MainActivity : AppCompatActivity() {
                 maxLines = if (multiline) props.optInt("numberOfLines", Int.MAX_VALUE).coerceAtLeast(1) else 1
                 isEnabled = props.optBoolean("editable", true)
                 configureTextStyle(this, style)
+                // The style's padding is where the text starts, as on iOS and
+                // the web; without one the field keeps its own.
+                if (listOf("padding", "paddingHorizontal", "paddingVertical", "paddingLeft", "paddingRight", "paddingTop", "paddingBottom").any { style.has(it) }) {
+                    val density = resources.displayMetrics.density
+                    val all = style.optDouble("padding", 0.0)
+                    val horizontal = style.optDouble("paddingHorizontal", all)
+                    val vertical = style.optDouble("paddingVertical", all)
+                    setPadding(
+                        (style.optDouble("paddingLeft", horizontal) * density).toInt(),
+                        (style.optDouble("paddingTop", vertical) * density).toInt(),
+                        (style.optDouble("paddingRight", horizontal) * density).toInt(),
+                        (style.optDouble("paddingBottom", vertical) * density).toInt(),
+                    )
+                }
+                autofillHintFor(props)?.let { setAutofillHints(it) }
                 val controlledValue = props.opt("value")?.takeUnless { it == JSONObject.NULL }?.toString()
                 if (controlledValue != null && text.toString() != controlledValue) {
                     screen.suppressedTextChanges.add(this)
@@ -2991,6 +3006,24 @@ class MainActivity : AppCompatActivity() {
         return (if (keyboard == 0) base else keyboard) or capitalization or correction or secure
     }
 
+    /// The autofill hint for `textContentType` (iOS's names) or `autoComplete`
+    /// (HTML's), so a password manager fills the field.
+    private fun autofillHintFor(props: JSONObject): String? {
+        val raw = props.optString("textContentType").ifBlank { props.optString("autoComplete") }
+        return when (raw.replace("-", "").replace("_", "").lowercase()) {
+            "username" -> View.AUTOFILL_HINT_USERNAME
+            "password", "currentpassword" -> View.AUTOFILL_HINT_PASSWORD
+            "newpassword" -> "newPassword"
+            "onetimecode" -> "smsOTPCode"
+            "emailaddress", "email" -> View.AUTOFILL_HINT_EMAIL_ADDRESS
+            "telephonenumber", "tel", "phone" -> View.AUTOFILL_HINT_PHONE
+            "name" -> View.AUTOFILL_HINT_NAME
+            "postalcode" -> View.AUTOFILL_HINT_POSTAL_CODE
+            "fullstreetaddress", "streetaddress" -> View.AUTOFILL_HINT_POSTAL_ADDRESS
+            else -> null
+        }
+    }
+
     private fun imeOptionsFor(props: JSONObject): Int = when (props.optString("returnKeyType")) {
         "done" -> EditorInfo.IME_ACTION_DONE
         "go" -> EditorInfo.IME_ACTION_GO

package/dist/cli.js

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

package/dist/index.cjs

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

package/dist/index.js

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

package/dist/ios/src/index.js

@@ -789,6 +789,7 @@ async function init(options) {
   cpSync(join(TEMPLATES_DIR, "CraftMusic.swift"), join(output, "Sources", "CraftMusic.swift"));
   cpSync(join(TEMPLATES_DIR, "CraftNativeMutation.swift"), join(output, "Sources", "CraftNativeMutation.swift"));
   cpSync(join(TEMPLATES_DIR, "CraftNativeUI.swift"), join(output, "Sources", "CraftNativeUI.swift"));
+  cpSync(join(TEMPLATES_DIR, "CraftNativeServices.swift"), join(output, "Sources", "CraftNativeServices.swift"));
   cpSync(join(TEMPLATES_DIR, "CraftHybrid.swift"), join(output, "Sources", "CraftHybrid.swift"));
   const infoPlistTemplate = readFileSync(join(TEMPLATES_DIR, "Info.plist.template"), "utf-8");
   const infoPlist = infoPlistTemplate.replace(/\{\{APP_NAME\}\}/g, xmlEscape(displayName)).replace(/\{\{BUNDLE_ID\}\}/g, finalBundleId).replace(/\{\{VERSION\}\}/g, config.version || "1.0.0").replace(/\{\{BUILD_NUMBER\}\}/g, config.buildNumber || "1").replace(/\{\{UI_STYLE\}\}/g, renderAppearance(config).interfaceStyle).replace(/\{\{STATUS_BAR_STYLE\}\}/g, renderAppearance(config).statusBarStyle).replace(/\{\{ORIENTATIONS\}\}/g, renderOrientations(config)).replace(/\{\{USAGE_DESCRIPTIONS\}\}/g, renderUsageDescriptions(config)).replace(/\{\{URL_TYPES\}\}/g, renderUrlTypes(config)).replace(/\{\{APP_BOUND_DOMAINS\}\}/g, renderAppBoundDomains(config)).replace(/\{\{BACKGROUND_MODES\}\}/g, renderBackgroundModes(config)).replace(/\{\{BACKGROUND_TASK_IDENTIFIERS\}\}/g, renderBackgroundTaskIdentifiers(config)).replace(/\{\{LAUNCH_SCREEN\}\}/g, renderLaunchScreen(config)).replace(/\{\{NON_EXEMPT_ENCRYPTION\}\}/g, config.usesNonExemptEncryption ? "true" : "false").replace(/\{\{LIVE_ACTIVITY_SUPPORT\}\}/g, config.enableLiveActivities ? `    <key>NSSupportsLiveActivities</key>

package/dist/ios/templates/CraftApp.swift

@@ -5174,6 +5174,8 @@ struct CraftWebView: UIViewRepresentable {
         // MARK: - Callback Helpers
         private func resolveCallback(_ callbackId: String?, result: Any) {
             guard let id = callbackId else { return }
+            // A native screen's call (CraftWebServices): answered in Swift.
+            if CraftWebServices.resolve(id, result: result) { return }
             let resultStr: String
             do {
                 let data = try JSONSerialization.data(withJSONObject: result, options: [.fragmentsAllowed])
@@ -5196,6 +5198,7 @@ struct CraftWebView: UIViewRepresentable {
 
         private func rejectCallback(_ callbackId: String?, error: String, code: String = "CRAFT_ERROR") {
             guard let id = callbackId else { return }
+            if CraftWebServices.reject(id, message: error, code: code) { return }
             // A hand-off rejection goes back through Zig's error route, so the
             // page's promise *rejects*. Delivering it as a result would run the
             // app's then-branch with an error-shaped object — fabricated
@@ -7883,6 +7886,7 @@ struct CraftWebView: UIViewRepresentable {
 
         // MARK: - Web Communication
         private func sendToWeb(_ event: String, data: [String: Any]) {
+            CraftWebServices.forward(event, data: data)
             guard let webView = webView else { return }
             do {
                 let jsonData = try JSONSerialization.data(withJSONObject: data)
@@ -8420,6 +8424,58 @@ final class CraftZigRuntime: NSObject {
     }
 }
 
+/// The page's services that live in the web view's coordinator, for native
+/// screens: GPS (one fix, a watch, and the route recording that keeps going
+/// in the background and survives a relaunch). A native screen asks with a
+/// callback id of the form "native:<uuid>", which the reply helpers answer
+/// here instead of in the page, and the coordinator's location events reach
+/// every native screen as well as the page. One recorder for both, so a run
+/// started on a page can be followed on a native screen.
+///
+/// The coordinator exists wherever the web view does: always in a hybrid app.
+/// Calls go to the Swift dispatcher; a build that links the Zig runtime keeps
+/// the page's calls on Zig.
+enum CraftWebServices {
+    private static var waiting: [String: (Result<Any, CraftNativeActionError>) -> Void] = [:]
+    /// Coordinator events a native screen hears too.
+    static let forwardedEvents: Set<String> = ["craftLocationUpdate", "craftLocationError", "craftMusicChange"]
+    static let event = Notification.Name("craftWebServicesEvent")
+
+    static var isAvailable: Bool { CraftSwiftShim.coordinator != nil }
+
+    static func perform(action: String, body: [String: Any], completion: @escaping (Result<Any, CraftNativeActionError>) -> Void) {
+        DispatchQueue.main.async {
+            guard let coordinator = CraftSwiftShim.coordinator else {
+                completion(.failure(CraftNativeActionError(code: "CAPABILITY_DISABLED", message: "\(action) needs the app's web view, which this app does not have")))
+                return
+            }
+            let id = "native:\(UUID().uuidString)"
+            waiting[id] = completion
+            coordinator.dispatch(action: action, body: body, callbackId: id)
+        }
+    }
+
+    /// True when `id` was a native screen's, which then has its answer.
+    static func resolve(_ id: String, result: Any) -> Bool {
+        guard id.hasPrefix("native:") else { return false }
+        DispatchQueue.main.async { waiting.removeValue(forKey: id)?(.success(result)) }
+        return true
+    }
+
+    static func reject(_ id: String, message: String, code: String) -> Bool {
+        guard id.hasPrefix("native:") else { return false }
+        DispatchQueue.main.async { waiting.removeValue(forKey: id)?(.failure(CraftNativeActionError(code: code, message: message))) }
+        return true
+    }
+
+    static func forward(_ name: String, data: [String: Any]) {
+        guard forwardedEvents.contains(name) else { return }
+        DispatchQueue.main.async {
+            NotificationCenter.default.post(name: event, object: nil, userInfo: ["event": name, "detail": data])
+        }
+    }
+}
+
 /// The seam the Zig dispatcher hands unmigrated actions through.
 ///
 /// Discovery is symmetric and both directions are runtime-only. Zig finds this

package/dist/ios/templates/CraftHybrid.swift

@@ -538,8 +538,10 @@ final class CraftHybrid: NSObject {
 
       // A shared key a native screen wrote (a sign-in there): into this
       // page's storage, which reports it back as the page's own write, and
-      // a `craftsharedstorage` event for whoever holds it in memory.
-      function adopt(values) {
+      // a `craftsharedstorage` event for whoever holds it in memory. Named
+      // apart from the router's adopt: function declarations hoist, so a
+      // second `adopt` replaced the first and the router went unwrapped.
+      function adoptShared(values) {
         Object.keys(values || {}).forEach(function (key) {
           if (SHARE.indexOf(key) < 0) return;
           var value = values[key];
@@ -555,7 +557,7 @@ final class CraftHybrid: NSObject {
 
       window.__craftHybrid = {
         match: function (url) { var path = local(url); return path === null ? null : match(path); },
-        adopt: adopt,
+        adopt: adoptShared,
         // The shell's own navigation: never handed back to it, and without
         // the page's slide, since the shell animates the push itself.
         // Answers once the page has drawn `path` (its router settles before
@@ -911,11 +913,18 @@ final class CraftHybridController: UIViewController, UINavigationControllerDeleg
         return nav
     }
 
+    /// A native screen's route params for `path`: the pattern's and the
+    /// query's, and the path itself.
+    private func params(for path: String, _ match: CraftHybridRoutes.Match) -> [String: Any] {
+        var params: [String: Any] = match.params
+        params["path"] = path
+        return params
+    }
+
     /// The entry for a path: its native screen, or a web entry.
     private func entry(for path: String, isTabRoot: Bool, depth: Int?, params extra: [String: Any] = [:]) -> UIViewController {
         if let match = hybrid.routes.match(path) {
-            var params: [String: Any] = match.params
-            params["path"] = path
+            var params = self.params(for: path, match)
             extra.forEach { params[$0.key] = $0.value }
             let screen = CraftNativeScreenController(config: config, routeName: match.screen, routeParams: params)
             screen.hybridEvents = self
@@ -928,6 +937,12 @@ final class CraftHybridController: UIViewController, UINavigationControllerDeleg
     private func show(tab id: String, rootPath: String? = nil) {
         cancelPendingTab()
         let nav = stacks[id] ?? makeStack(tab: id, rootPath: rootPath ?? (id.isEmpty ? hybrid.startPath : id))
+        // A stack is hidden and shown rather than moved, so UIKit tells its
+        // screens nothing: the shell says which went away and which is back.
+        if id != currentTab {
+            (visibleStack?.topViewController as? CraftNativeScreenController)?.screenVisibilityChanged(false)
+            (nav.topViewController as? CraftNativeScreenController)?.screenVisibilityChanged(true)
+        }
         currentTab = id
         for (key, other) in stacks { other.view.isHidden = key != id }
         view.bringSubviewToFront(nav.view)
@@ -994,6 +1009,8 @@ final class CraftHybridController: UIViewController, UINavigationControllerDeleg
             if let nav = stacks[tab], nav.viewControllers.count > 1 {
                 nav.popToRootViewController(animated: !fromLink)
             }
+            // `/m/store?coach=5`: the tab's own screen, with the query.
+            (stacks[tab]?.viewControllers.first as? CraftNativeScreenController)?.receiveRouteParams(params(for: raw, match))
             return
         }
         if fromLink, let owner = CraftHybridRoutes.tab(owning: match.path, among: tabs), owner != currentTab {
@@ -1002,6 +1019,9 @@ final class CraftHybridController: UIViewController, UINavigationControllerDeleg
         guard let nav = visibleStack ?? stacks.values.first else { return }
         if let existing = nav.viewControllers.last(where: { nativePaths[ObjectIdentifier($0)] == match.path }) {
             if existing !== nav.topViewController { nav.popToViewController(existing, animated: true) }
+            // Opened again, perhaps with another query (`?person=8`): the
+            // screen hears the params it was opened with this time.
+            (existing as? CraftNativeScreenController)?.receiveRouteParams(params(for: raw, match))
             return
         }
         let screen = entry(for: raw, isTabRoot: false, depth: nil)
@@ -1066,6 +1086,7 @@ final class CraftHybridController: UIViewController, UINavigationControllerDeleg
             guard top is CraftHybridWebSlot else { return }
             if let existing = nav.viewControllers.last(where: { nativePaths[ObjectIdentifier($0)] == match.path }) {
                 nav.popToViewController(existing, animated: direction != "pop")
+                (existing as? CraftNativeScreenController)?.receiveRouteParams(params(for: path, match))
             } else if !((top as? CraftHybridWebSlot)?.isTabRoot ?? false) {
                 nav.pushViewController(entry(for: path, isTabRoot: false, depth: nil), animated: true)
             }

package/dist/ios/templates/CraftNativeActions.swift

@@ -38,7 +38,9 @@ enum CraftNativeActions {
     private static let sqliteTransient = unsafeBitCast(-1, to: sqlite3_destructor_type.self)
 
     static func capabilities(config: CraftConfig) -> [String] {
-        var values = ["device", "clipboard", "haptics", "storage", "lifecycle", "fetch", "dialog"]
+        // `speech`, `audio` (background sound) and `eventStream` (a fetch read
+        // as it arrives) need nothing the app has to declare.
+        var values = ["device", "clipboard", "haptics", "storage", "lifecycle", "fetch", "dialog", "speech", "audio", "eventStream", "linking"]
         if config.enableBiometric { values.append("biometric") }
         if config.enableSecureStorage { values.append("secureStorage") }
         if config.enableLocalDatabase { values.append("database") }
@@ -48,6 +50,17 @@ enum CraftNativeActions {
         // The in-app browser and the system's web sign-in sheet (CraftBrowser).
         values.append("browser")
         if config.enableSocialAuth { values.append("appleSignIn") }
+        if config.enablePushNotifications { values.append("push") }
+        if config.enableShare { values.append("share") }
+        // The screen's brightness and the status bar's style need nothing
+        // declared; keeping the screen awake is the app's choice.
+        values.append(contentsOf: ["brightness", "statusBar"])
+        if config.enableKeepAwake { values.append("keepAwake") }
+        // GPS and the route recording are the web view's coordinator's
+        // (CraftWebServices), so a native-only app, which has none, has none.
+        if config.enableGeolocation && config.renderer != "native" { values.append("geolocation") }
+        // The Music app's song and transport are the coordinator's too.
+        if config.enableAppleMusic && config.renderer != "native" { values.append("music") }
         return values
     }
 
@@ -207,6 +220,149 @@ enum CraftNativeActions {
                 complete(requestToken, result.mapError { CraftNativeActionError(code: $0.code, message: $0.message) }, completion)
             }
             return
+        case ("KeepAwake", "set"):
+            guard config.enableKeepAwake else {
+                complete(requestToken, failure("CAPABILITY_DISABLED", "Keep awake is disabled"), completion)
+                return
+            }
+            let enabled = args.first as? Bool ?? true
+            DispatchQueue.main.async {
+                UIApplication.shared.isIdleTimerDisabled = enabled
+                complete(requestToken, .success(enabled), completion)
+            }
+            return
+        case ("Brightness", "get"):
+            DispatchQueue.main.async { complete(requestToken, .success(Double(UIScreen.main.brightness)), completion) }
+            return
+        case ("Brightness", "set"):
+            // The device's backlight, system-wide: a screen that dims it reads
+            // it first and puts it back, as @stacksjs/mobile's brightness does.
+            guard let level = (args.first as? NSNumber)?.doubleValue, level.isFinite else {
+                complete(requestToken, failure("INVALID_ARGUMENT", "Brightness.set needs a level from 0 to 1"), completion)
+                return
+            }
+            DispatchQueue.main.async {
+                UIScreen.main.brightness = CGFloat(min(max(level, 0), 1))
+                complete(requestToken, .success(Double(UIScreen.main.brightness)), completion)
+            }
+            return
+        case ("StatusBar", "setStyle"):
+            let style = args.first as? String ?? "default"
+            DispatchQueue.main.async {
+                complete(requestToken, .success(CraftStatusBar.setStyle(style == "light" || style == "dark" ? style : "default")), completion)
+            }
+            return
+        case ("Location", _):
+            // The page's own GPS and route recorder, in the web view's
+            // coordinator: one recorder, which keeps recording in the
+            // background and survives a relaunch, whichever side started it.
+            guard config.enableGeolocation else {
+                complete(requestToken, failure("CAPABILITY_DISABLED", "Geolocation is disabled"), completion)
+                return
+            }
+            let actions = [
+                "getCurrentPosition": "getCurrentPosition", "watchPosition": "watchPosition", "clearWatch": "clearWatch",
+                "startRecording": "startLocationRecording", "pauseRecording": "pauseLocationRecording",
+                "resumeRecording": "resumeLocationRecording", "stopRecording": "stopLocationRecording",
+                "getRecordingState": "getLocationRecordingState", "readRecording": "readLocationRecording",
+            ]
+            guard let action = actions[method] else {
+                complete(requestToken, failure("UNKNOWN_ACTION", "Unsupported Location method"), completion)
+                return
+            }
+            CraftWebServices.perform(action: action, body: args.first as? [String: Any] ?? [:]) { complete(requestToken, $0, completion) }
+            return
+        case ("Music", _):
+            // The page's own Music app bridge (CraftMusic.swift), in the web
+            // view's coordinator: one observer, whose changes reach the page
+            // and every native screen as `craftMusicChange`.
+            guard config.enableAppleMusic else {
+                complete(requestToken, failure("CAPABILITY_DISABLED", "Apple Music is disabled"), completion)
+                return
+            }
+            let actions = [
+                "getAuthorizationStatus": "musicGetAuthorization", "requestAuthorization": "musicRequestAuthorization",
+                "getNowPlaying": "musicGetNowPlaying", "control": "musicControl", "observe": "musicObserve",
+            ]
+            guard let action = actions[method] else {
+                complete(requestToken, failure("UNKNOWN_ACTION", "Unsupported Music method"), completion)
+                return
+            }
+            CraftWebServices.perform(action: action, body: args.first as? [String: Any] ?? [:]) { complete(requestToken, $0, completion) }
+            return
+        case ("Linking", "openURL"), ("Linking", "canOpenURL"):
+            // Another app or the system: `webcal:` subscriptions, `mailto:`,
+            // `tel:`, the App Store, this app's page in Settings
+            // (`UIApplication.openSettingsURLString`, which is `app-settings:`).
+            guard let address = args.first as? String, let url = URL(string: address), url.scheme != nil else {
+                complete(requestToken, failure("INVALID_ARGUMENT", "Linking.\(method) needs a URL it can parse"), completion)
+                return
+            }
+            DispatchQueue.main.async {
+                if method == "canOpenURL" {
+                    complete(requestToken, .success(UIApplication.shared.canOpenURL(url)), completion)
+                } else {
+                    UIApplication.shared.open(url) { complete(requestToken, .success($0), completion) }
+                }
+            }
+            return
+        case ("Share", "share"):
+            guard config.enableShare else {
+                complete(requestToken, failure("CAPABILITY_DISABLED", "Sharing is disabled"), completion)
+                return
+            }
+            let options = args.first as? [String: Any] ?? [:]
+            DispatchQueue.main.async {
+                CraftNativeShare.share(options) { complete(requestToken, $0, completion) }
+            }
+            return
+        case ("Speech", "speak"):
+            // Settles when the words have been said (true) or were cut off
+            // (false), as the page's `craft.speech.speak` does.
+            guard let text = args.first as? String, !text.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty else {
+                complete(requestToken, failure("INVALID_ARGUMENT", "speech.speak needs some text to say"), completion)
+                return
+            }
+            let options = args.count > 1 ? args[1] as? [String: Any] ?? [:] : [:]
+            DispatchQueue.main.async {
+                CraftNativeSpeech.shared.speak(
+                    text,
+                    language: options["language"] as? String,
+                    rate: (options["rate"] as? NSNumber)?.doubleValue,
+                    interrupt: options["interrupt"] as? Bool ?? true
+                ) { spoken in complete(requestToken, .success(spoken), completion) }
+            }
+            return
+        case ("Speech", "stop"):
+            DispatchQueue.main.async {
+                CraftNativeSpeech.shared.stop()
+                complete(requestToken, .success(true), completion)
+            }
+            return
+        case ("Push", _):
+            guard config.enablePushNotifications else {
+                complete(requestToken, failure("CAPABILITY_DISABLED", "Push notifications are disabled"), completion)
+                return
+            }
+            switch method {
+            case "getPermissionStatus":
+                CraftNativePush.status { complete(requestToken, .success($0), completion) }
+            case "requestPermission":
+                CraftNativePush.requestPermission { complete(requestToken, .success($0), completion) }
+            case "register":
+                CraftNativePush.register { complete(requestToken, $0, completion) }
+            case "openSettings":
+                DispatchQueue.main.async {
+                    guard let url = URL(string: UIApplication.openSettingsURLString) else {
+                        complete(requestToken, .success(false), completion)
+                        return
+                    }
+                    UIApplication.shared.open(url) { complete(requestToken, .success($0), completion) }
+                }
+            default:
+                complete(requestToken, failure("UNKNOWN_ACTION", "Unsupported Push method"), completion)
+            }
+            return
         case ("Notifications", _):
             guard config.enableLocalNotifications else {
                 complete(requestToken, failure("CAPABILITY_DISABLED", "Local notifications are disabled"), completion)