craft-native 0.0.105 → 0.0.107

package/dist/index.cjs

@@ -310,7 +310,7 @@ function craftBinaryNotFoundMessage(triedPath) {
 `);
 }
 // package.json
-var version = "0.0.105";
+var version = "0.0.107";
 
 // 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.105";
+var version = "0.0.107";
 
 // src/sdk-version.ts
 var SDK_VERSION = version;

package/dist/ios/src/index.d.ts

@@ -7,6 +7,8 @@ export type CraftAppearance = 'light' | 'dark' | 'system';
 export interface CraftConfig {
     appName: string;
     bundleId: string;
+    /** Opt in to UIKit + JavaScriptCore instead of the default WebView. */
+    renderer?: 'web' | 'native';
     version?: string;
     buildNumber?: string;
     darkMode?: boolean;
@@ -108,6 +110,8 @@ export interface InitOptions {
 }
 export interface BuildOptions {
     htmlPath?: string;
+    /** JavaScript bundle emitted by `stx-native compile Screen.stx --format bundle`. */
+    nativeBundlePath?: string;
     devServer?: string;
     output: string;
     generateProject?: boolean;

package/dist/ios/src/index.js

@@ -5,6 +5,7 @@ import { dirname, join, resolve } from "path";
 var {$ } = globalThis.Bun;
 var TEMPLATES_DIR = join(dirname(import.meta.dir), "templates");
 var DEFAULT_CONFIG = {
+  renderer: "web",
   version: "1.0.0",
   buildNumber: "1",
   darkMode: true,
@@ -393,12 +394,17 @@ async function init(options) {
     teamId: teamId || "",
     ...given
   };
+  if (config.renderer !== "web" && config.renderer !== "native") {
+    throw new Error(`Unknown iOS renderer: ${config.renderer}. Expected web or native.`);
+  }
   if (config.enableBackgroundLocation)
     config.enableGeolocation = true;
   writeFileSync(join(output, "craft.config.json"), JSON.stringify(config, null, 2));
   const swiftTemplate = readFileSync(join(TEMPLATES_DIR, "CraftApp.swift"), "utf-8");
   const swiftSource = swiftTemplate.replace(/CraftApp/g, `${name}App`).replace(/\{\{BUNDLE_ID\}\}/g, finalBundleId);
   writeFileSync(join(output, "Sources", `${name}App.swift`), swiftSource);
+  cpSync(join(TEMPLATES_DIR, "CraftNativeScreen.swift"), join(output, "Sources", "CraftNativeScreen.swift"));
+  cpSync(join(TEMPLATES_DIR, "CraftNativeActions.swift"), join(output, "Sources", "CraftNativeActions.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(/\{\{BACKGROUND_MODES\}\}/g, renderBackgroundModes(config)).replace(/\{\{LIVE_ACTIVITY_SUPPORT\}\}/g, config.enableLiveActivities ? `    <key>NSSupportsLiveActivities</key>
     <true/>
@@ -533,13 +539,18 @@ ${nativeDependencies.join(`
   console.log("");
   console.log("Next steps:");
   console.log(`  1. cd ${output}`);
-  console.log("  2. Add your web content to dist/index.html");
-  console.log("  3. Run: craft ios build");
+  if (config.renderer === "native") {
+    console.log("  2. Compile your screen: stx-native compile Screen.stx --format bundle --output screen.js");
+    console.log("  3. Run: craft ios build --native-bundle screen.js");
+  } else {
+    console.log("  2. Add your web content to dist/index.html");
+    console.log("  3. Run: craft ios build");
+  }
   console.log("  4. Run: craft ios open");
   console.log("");
 }
 async function build(options) {
-  const { htmlPath, devServer, output, generateProject = true } = options;
+  const { htmlPath, nativeBundlePath, devServer, output, generateProject = true } = options;
   console.log(`
 \uD83D\uDCE6 Building Craft iOS project...`);
   const configPath = join(output, "craft.config.json");
@@ -547,6 +558,24 @@ async function build(options) {
     throw new Error(`No craft.config.json found in ${output}. Run 'craft ios init' first.`);
   }
   const config = JSON.parse(readFileSync(configPath, "utf-8"));
+  if (config.renderer !== undefined && config.renderer !== "web" && config.renderer !== "native") {
+    throw new Error(`Unknown iOS renderer: ${config.renderer}. Expected web or native.`);
+  }
+  if (config.renderer === "native") {
+    if (htmlPath || devServer) {
+      throw new Error("A native iOS screen cannot use --html-path or --dev-server.");
+    }
+    if (nativeBundlePath) {
+      const destination = join(output, "dist", "native-screen.js");
+      if (resolve(nativeBundlePath) !== resolve(destination))
+        cpSync(nativeBundlePath, destination);
+    }
+    if (!existsSync(join(output, "dist", "native-screen.js"))) {
+      throw new Error("Native iOS mode needs dist/native-screen.js. Compile a .stx screen with stx-native first.");
+    }
+  } else if (nativeBundlePath) {
+    throw new Error('--native-bundle requires renderer: "native" in craft.config.json.');
+  }
   if (devServer) {
     config.devServerURL = devServer;
     const origin = new URL(devServer).origin;

package/dist/ios/templates/CraftApp.swift

@@ -221,8 +221,14 @@ struct CraftApp: App {
 
     var body: some SwiftUI.Scene {
         WindowGroup {
-            CraftWebView(config: appState.config)
-                .ignoresSafeArea()
+            Group {
+                if appState.config.renderer == "native" {
+                    CraftNativeScreen(config: appState.config)
+                } else {
+                    CraftWebView(config: appState.config)
+                        .ignoresSafeArea()
+                }
+            }
                 .preferredColorScheme(appState.config.colorScheme)
                 .environmentObject(appState)
                 .onOpenURL { url in
@@ -375,6 +381,8 @@ extension CraftConfig {
 struct CraftConfig: Codable {
     var appName: String = "Craft App"
     var bundleId: String = "com.craft.app"
+    /// Opt-in UIKit + JavaScriptCore screen; existing apps keep WKWebView.
+    var renderer: String = "web"
     var darkMode: Bool = true
     /// "light", "dark" or "system". Absent in configs older than the field,
     /// which keep what `darkMode` pinned.
@@ -873,6 +881,13 @@ struct CraftWebView: UIViewRepresentable {
         /// `craft_ios_deliver_result` instead of evaluating JavaScript here —
         /// one reply path, owned by whichever side received the page's message.
         func dispatch(action: String, body: [String: Any], callbackId: String?) {
+            if let answer = CraftNativeActions.perform(action: action, body: body, config: config) {
+                switch answer {
+                case .success(let value): resolveCallback(callbackId, result: value)
+                case .failure(let error): rejectCallback(callbackId, error: error.message, code: error.code)
+                }
+                return
+            }
             switch action {
             case "startListening":
                 if config.enableSpeechRecognition {
@@ -888,14 +903,6 @@ struct CraftWebView: UIViewRepresentable {
             case "stopListening":
                 stopSpeechRecognition()
                 resolveCallback(callbackId, result: true)
-            case "haptic":
-                if config.enableHaptics {
-                    let style = body["style"] as? String ?? "medium"
-                    triggerHaptic(style: style)
-                    resolveCallback(callbackId, result: true)
-                } else {
-                    rejectCallback(callbackId, error: "Haptics is disabled", code: "CAPABILITY_DISABLED")
-                }
             case "share":
                 if config.enableShare {
                     if let options = body["options"] as? [String: Any] {
@@ -1028,28 +1035,6 @@ struct CraftWebView: UIViewRepresentable {
                 getLocationRecordingState(callbackId: callbackId)
             case "readLocationRecording":
                 readLocationRecording(callbackId: callbackId)
-            // Clipboard
-            case "clipboardWrite":
-            if config.enableClipboard {
-                    if let text = body["text"] as? String {
-                            UIPasteboard.general.string = text
-                            resolveCallback(callbackId, result: true)
-                    } else {
-                        rejectCallback(callbackId, error: "clipboardWrite was called without the values it needs", code: "INVALID_ARGUMENT")
-                    }
-            } else {
-                rejectCallback(callbackId, error: "Clipboard is disabled", code: "CAPABILITY_DISABLED")
-            }
-            case "clipboardRead":
-                if config.enableClipboard {
-                    let text = UIPasteboard.general.string ?? ""
-                    resolveCallback(callbackId, result: text)
-                } else {
-                    rejectCallback(callbackId, error: "Clipboard is disabled", code: "CAPABILITY_DISABLED")
-                }
-            // Device Info
-            case "getDeviceInfo":
-                getDeviceInfo(callbackId: callbackId)
             // App Badge
             case "setBadge":
                 if let count = body["count"] as? Int {
@@ -1078,7 +1063,7 @@ struct CraftWebView: UIViewRepresentable {
                 if let pattern = body["pattern"] as? [Int] {
                     vibratePattern(pattern)
                 } else {
-                    triggerHaptic(style: "medium")
+                    CraftNativeActions.triggerHaptic(style: "medium")
                 }
                 resolveCallback(callbackId, result: true)
             // Open URL
@@ -3693,7 +3678,7 @@ struct CraftWebView: UIViewRepresentable {
             do {
                 try audioEngine.start()
                 sendToWeb("craftSpeechStart", data: [:])
-                triggerHaptic(style: "light")
+                CraftNativeActions.triggerHaptic(style: "light")
             } catch {
                 sendToWeb("craftSpeechError", data: ["error": "Audio engine failed"])
             }
@@ -3707,27 +3692,7 @@ struct CraftWebView: UIViewRepresentable {
             recognitionTask?.cancel()
             recognitionTask = nil
             sendToWeb("craftSpeechEnd", data: [:])
-            triggerHaptic(style: "light")
-        }
-
-        // MARK: - Haptics
-        private func triggerHaptic(style: String) {
-            switch style {
-            case "light":
-                UIImpactFeedbackGenerator(style: .light).impactOccurred()
-            case "heavy":
-                UIImpactFeedbackGenerator(style: .heavy).impactOccurred()
-            case "success":
-                UINotificationFeedbackGenerator().notificationOccurred(.success)
-            case "warning":
-                UINotificationFeedbackGenerator().notificationOccurred(.warning)
-            case "error":
-                UINotificationFeedbackGenerator().notificationOccurred(.error)
-            case "selection":
-                UISelectionFeedbackGenerator().selectionChanged()
-            default:
-                UIImpactFeedbackGenerator(style: .medium).impactOccurred()
-            }
+            CraftNativeActions.triggerHaptic(style: "light")
         }
 
         // MARK: - Share
@@ -4412,43 +4377,6 @@ struct CraftWebView: UIViewRepresentable {
             }
         }
 
-        // MARK: - Device Info
-        private func getDeviceInfo(callbackId: String?) {
-            let device = UIDevice.current
-            let screen = UIScreen.main
-            #if targetEnvironment(simulator)
-            let isSimulator = true
-            #else
-            let isSimulator = false
-            #endif
-            let info: [String: Any] = [
-                "platform": "ios",
-                "model": device.model,
-                "name": device.name,
-                "systemName": device.systemName,
-                "systemVersion": device.systemVersion,
-                "identifierForVendor": device.identifierForVendor?.uuidString ?? "",
-                "isSimulator": isSimulator,
-                "screenWidth": screen.bounds.width,
-                "screenHeight": screen.bounds.height,
-                "screenScale": screen.scale,
-                "batteryLevel": device.batteryLevel,
-                "batteryState": getBatteryState(device.batteryState),
-                "locale": Locale.current.identifier,
-                "timezone": TimeZone.current.identifier
-            ]
-            resolveCallback(callbackId, result: info)
-        }
-
-        private func getBatteryState(_ state: UIDevice.BatteryState) -> String {
-            switch state {
-            case .charging: return "charging"
-            case .full: return "full"
-            case .unplugged: return "unplugged"
-            default: return "unknown"
-            }
-        }
-
         // MARK: - App Badge
         private func setBadgeCount(_ count: Int, callbackId: String?) {
             UNUserNotificationCenter.current().requestAuthorization(options: .badge) { granted, _ in

package/dist/ios/templates/CraftNativeActions.swift

@@ -0,0 +1,93 @@
+import UIKit
+
+/// The result of a Craft action, independent of whether the caller is a
+/// WebKit page or the JavaScriptCore native-screen runtime.
+struct CraftNativeActionError: Error {
+    let code: String
+    let message: String
+}
+
+enum CraftNativeActions {
+    /// Nil means this small shared router does not own the action. Both hosts
+    /// can then continue through their existing unsupported-action path.
+    static func perform(action: String, body: [String: Any], config: CraftConfig) -> Result<Any, CraftNativeActionError>? {
+        switch action {
+        case "getDeviceInfo":
+            return .success(deviceInfo())
+        case "haptic":
+            guard config.enableHaptics else {
+                return .failure(CraftNativeActionError(code: "CAPABILITY_DISABLED", message: "Haptics is disabled"))
+            }
+            triggerHaptic(style: body["style"] as? String ?? "medium")
+            return .success(true)
+        case "clipboardWrite":
+            guard config.enableClipboard else {
+                return .failure(CraftNativeActionError(code: "CAPABILITY_DISABLED", message: "Clipboard is disabled"))
+            }
+            guard let text = body["text"] as? String else {
+                return .failure(CraftNativeActionError(code: "INVALID_ARGUMENT", message: "clipboardWrite was called without the values it needs"))
+            }
+            UIPasteboard.general.string = text
+            return .success(true)
+        case "clipboardRead":
+            guard config.enableClipboard else {
+                return .failure(CraftNativeActionError(code: "CAPABILITY_DISABLED", message: "Clipboard is disabled"))
+            }
+            return .success(UIPasteboard.general.string ?? "")
+        default:
+            return nil
+        }
+    }
+
+    static func triggerHaptic(style: String) {
+        switch style {
+        case "light":
+            UIImpactFeedbackGenerator(style: .light).impactOccurred()
+        case "heavy":
+            UIImpactFeedbackGenerator(style: .heavy).impactOccurred()
+        case "success":
+            UINotificationFeedbackGenerator().notificationOccurred(.success)
+        case "warning":
+            UINotificationFeedbackGenerator().notificationOccurred(.warning)
+        case "error":
+            UINotificationFeedbackGenerator().notificationOccurred(.error)
+        case "selection":
+            UISelectionFeedbackGenerator().selectionChanged()
+        default:
+            UIImpactFeedbackGenerator(style: .medium).impactOccurred()
+        }
+    }
+
+    private static func deviceInfo() -> [String: Any] {
+        let device = UIDevice.current
+        let screen = UIScreen.main
+        #if targetEnvironment(simulator)
+        let isSimulator = true
+        #else
+        let isSimulator = false
+        #endif
+        let batteryState: String
+        switch device.batteryState {
+        case .charging: batteryState = "charging"
+        case .full: batteryState = "full"
+        case .unplugged: batteryState = "unplugged"
+        default: batteryState = "unknown"
+        }
+        return [
+            "platform": "ios",
+            "model": device.model,
+            "name": device.name,
+            "systemName": device.systemName,
+            "systemVersion": device.systemVersion,
+            "identifierForVendor": device.identifierForVendor?.uuidString ?? "",
+            "isSimulator": isSimulator,
+            "screenWidth": screen.bounds.width,
+            "screenHeight": screen.bounds.height,
+            "screenScale": screen.scale,
+            "batteryLevel": device.batteryLevel,
+            "batteryState": batteryState,
+            "locale": Locale.current.identifier,
+            "timezone": TimeZone.current.identifier
+        ]
+    }
+}