craft-native 0.0.156 → 0.0.160

package/dist/api/mobile.d.ts

@@ -1238,7 +1238,9 @@ export declare const pushNotifications: {
      */
     onReceive(callback: (data: Record<string, unknown>) => void): () => void;
 };
-export type HealthDataType = 'steps' | 'heartRate' | 'activeEnergy' | 'distance' | 'workouts' | 'restingHeartRate' | 'heartRateVariability' | 'bodyMass' | 'sleep';
+export type HealthDataType = 'steps' | 'heartRate' | 'activeEnergy' | 'distance' | 'workouts' | 'restingHeartRate' | 'heartRateVariability' | 'bodyMass' | 'sleep'
+/** Food logged by any app, per day: kcal eaten, then grams of protein, carbohydrate and fat. Read only. */
+ | 'dietaryEnergy' | 'dietaryProtein' | 'dietaryCarbohydrates' | 'dietaryFat';
 /** The types with one value per day. `sleep` is hours asleep, counted on the day you woke. */
 export type HealthDailyType = Exclude<HealthDataType, 'workouts'>;
 export interface HealthAuthorizationOptions {

package/dist/cli.js

@@ -3303,7 +3303,7 @@ function pinCraftNativeDependency(packagePath, craftVersion) {
 `);
 }
 // package.json
-var version = "0.0.156";
+var version = "0.0.160";
 
 // 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.156";
+var version = "0.0.160";
 
 // 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.156";
+var version = "0.0.160";
 
 // src/sdk-version.ts
 var SDK_VERSION = version;

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

@@ -3,6 +3,8 @@
  *
  * Generates native iOS apps from web content using WKWebView.
  */
+/** This package's version, which the app names in its user agent (`Craft/<version>`). */
+export declare function resolveCraftVersion(startDir?: string): string;
 export type CraftAppearance = 'light' | 'dark' | 'system';
 export interface CraftConfig {
     appName: string;

package/dist/ios/src/index.js

@@ -66,9 +66,11 @@ function serializeSimulatorSteps(steps) {
       throw new Error("Simulator identifiers must be nonempty single tokens");
     return value;
   };
-  return steps.map((step) => {
+  const line = (step) => {
     let arg = "";
-    if ("seconds" in step && !("text" in step))
+    if ("step" in step)
+      arg = `${token(step.id)} ${line(step.step)}`;
+    else if ("seconds" in step && !("text" in step))
       arg = String(number(step.seconds));
     else if ("milliseconds" in step)
       arg = String(number(step.milliseconds));
@@ -100,8 +102,9 @@ function serializeSimulatorSteps(steps) {
     if (/[\r\n]/.test(arg))
       throw new Error("Simulator arguments cannot contain newlines");
     return `${step.command}${arg ? ` ${arg}` : ""}`;
-  }).join(`
-`) + `
+  };
+  return `${steps.map(line).join(`
+`)}
 `;
 }
 function createNativeMutationValidator() {
@@ -141,13 +144,22 @@ function createNativeMutationValidator() {
 
 // ../ios/src/index.ts
 var TEMPLATES_DIR = join2(dirname2(import.meta.dir), "templates");
-var CRAFT_VERSION = (() => {
-  try {
-    return JSON.parse(readFileSync2(join2(dirname2(import.meta.dir), "package.json"), "utf8")).version ?? "0.0.0";
-  } catch {
-    return "0.0.0";
+function resolveCraftVersion(startDir = import.meta.dir) {
+  let directory = resolve(startDir);
+  while (true) {
+    try {
+      const packageJSON = JSON.parse(readFileSync2(join2(directory, "package.json"), "utf8"));
+      if (packageJSON.name === "@craft-native/ios" && typeof packageJSON.version === "string" && packageJSON.version.length > 0)
+        return packageJSON.version;
+    } catch {}
+    const parent = dirname2(directory);
+    if (parent === directory)
+      break;
+    directory = parent;
   }
-})();
+  return "0.0.0";
+}
+var CRAFT_VERSION = resolveCraftVersion();
 function normalizeNativePath(raw) {
   if (typeof raw !== "string")
     return null;
@@ -1274,6 +1286,7 @@ export {
   run,
   restoreShell,
   resolveRuntimeDir,
+  resolveCraftVersion,
   resolveAppearance,
   renderWatchEntitlements,
   renderUsageDescriptions,

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

@@ -36,7 +36,7 @@ export type SimulatorStep = {
     index: number;
     text: string;
 } | {
-    command: 'typeid';
+    command: 'typeid' | 'labelid';
     id: string;
     text: string;
 } | {
@@ -52,6 +52,12 @@ export type SimulatorStep = {
 } | {
     command: 'openurl';
     url: string;
+}
+/** Runs `step` only when the element with this identifier is there (a screen shown the first time). */
+ | {
+    command: 'ifid';
+    id: string;
+    step: SimulatorStep;
 };
 /** Typed journeys use the same wire protocol as existing line-based scripts. */
 export declare function serializeSimulatorSteps(steps: readonly SimulatorStep[]): string;

package/dist/ios/templates/CraftHealth.swift

@@ -106,6 +106,12 @@ final class CraftHealth {
                 if let sleepType = HKObjectType.categoryType(forIdentifier: .sleepAnalysis) {
                     readTypes.insert(sleepType)
                 }
+            case "dietaryEnergy", "dietaryProtein", "dietaryCarbohydrates", "dietaryFat":
+                // What a food log (MyFitnessPal, Lose It!, Cronometer...)
+                // writes to Apple Health: read only, never written back.
+                if let dietaryType = Self.healthQuantity(type)?.type {
+                    readTypes.insert(dietaryType)
+                }
             default:
                 break
             }
@@ -261,6 +267,11 @@ final class CraftHealth {
         case "restingHeartRate": return (HKQuantityType.quantityType(forIdentifier: .restingHeartRate), bpm, .discreteAverage)
         case "heartRateVariability": return (HKQuantityType.quantityType(forIdentifier: .heartRateVariabilitySDNN), .secondUnit(with: .milli), .discreteAverage)
         case "bodyMass": return (HKQuantityType.quantityType(forIdentifier: .bodyMass), .gramUnit(with: .kilo), .mostRecent)
+        // A day's food, summed over every meal any app logged: kcal and grams.
+        case "dietaryEnergy": return (HKQuantityType.quantityType(forIdentifier: .dietaryEnergyConsumed), .kilocalorie(), .cumulativeSum)
+        case "dietaryProtein": return (HKQuantityType.quantityType(forIdentifier: .dietaryProtein), .gram(), .cumulativeSum)
+        case "dietaryCarbohydrates": return (HKQuantityType.quantityType(forIdentifier: .dietaryCarbohydrates), .gram(), .cumulativeSum)
+        case "dietaryFat": return (HKQuantityType.quantityType(forIdentifier: .dietaryFatTotal), .gram(), .cumulativeSum)
         default: return nil
         }
     }

package/dist/ios/templates/CraftHybrid.swift

@@ -1457,6 +1457,19 @@ final class CraftHybridController: UIViewController, UINavigationControllerDeleg
         return popRecognizers(of: nav).contains { $0 === recognizer }
     }
 
+    private func nativeScreenContainsHorizontalScroll(_ screen: CraftNativeScreenController) -> Bool {
+        guard let root = screen.viewIfLoaded else { return false }
+        func visit(_ view: UIView) -> Bool {
+            if let scroll = view as? UIScrollView,
+               scroll.isScrollEnabled,
+               scroll.alwaysBounceHorizontal || scroll.contentSize.width > scroll.bounds.width + 1 {
+                return true
+            }
+            return view.subviews.contains(where: visit)
+        }
+        return visit(root)
+    }
+
     /// The edge swipe goes ahead of the web view's own gestures, which
     /// otherwise hold every touch over the page until the page has answered it.
     func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer) -> Bool {
@@ -1470,6 +1483,12 @@ final class CraftHybridController: UIViewController, UINavigationControllerDeleg
     func gestureRecognizerShouldBegin(_ gestureRecognizer: UIGestureRecognizer) -> Bool {
         guard let nav = visibleStack, isPopRecognizer(gestureRecognizer),
               nav.viewControllers.count > 1, nav.transitionCoordinator == nil else { return false }
+        if let native = nav.topViewController as? CraftNativeScreenController,
+           gestureRecognizer !== nav.interactivePopGestureRecognizer,
+           nativeScreenContainsHorizontalScroll(native) {
+            let moved = (gestureRecognizer as? UIPanGestureRecognizer)?.translation(in: nav.view).x ?? 0
+            if gestureRecognizer.location(in: nav.view).x - moved > 32 { return false }
+        }
         guard let slot = nav.topViewController as? CraftHybridWebSlot else { return true }
         // Over the page, only from its left edge: a swipe across the page is
         // the page's (a carousel, a slider).