fix: ios literal array expressions (#398)

*sigh*

Author: josxha

maplibre_ios/ios/maplibre_ios.podspec

@@ -19,7 +19,6 @@ Helper package for maplibre that provides iOS FFI bindings
   # Needs to be the same version as in maplibre_ios/Package.swift
   # FOR PREBUILT LIBRARY
   s.dependency 'MapLibre', '~> 6.19'
-  s.dependency 'CwlCatchException', '~> 2.2'
 
   # FOR LOCAL LIBRARY
   # s.vendored_frameworks = '.build/MapLibre.xcframework'

maplibre_ios/ios/maplibre_ios/Package.swift

@@ -15,7 +15,6 @@ let package = Package(
     // Needs to be the same version as in ../maplibre_ios.podspec
     // FOR PREBUILT LIBRARY
     .package(url: "https://github.com/maplibre/maplibre-gl-native-distribution", .upToNextMinor(from: "6.19.0")),
-    .package(url: "https://github.com/mattgallagher/CwlCatchException.git", .upToNextMinor(from: "2.2.0")),
   ],
   targets: [
     .target(
@@ -26,8 +25,6 @@ let package = Package(
 
         // FOR LOCAL LIBRARY
         // "MapLibre",
-
-        .product(name: "CwlCatchException", package: "CwlCatchException"),
       ],
       cSettings: [
         .headerSearchPath("include/maplibre_ios"),

maplibre_ios/ios/maplibre_ios/Sources/maplibre_ios/Helpers.swift

@@ -1,4 +1,3 @@
-import CwlCatchException
 import Foundation
 import MapLibre
 import UIKit
@@ -11,81 +10,66 @@ import UIKit
   @objc public static func addImageToStyle(
     target: NSObject, field: String, expression: NSExpression
   ) {
-    if let exception = NSException.catchException(in: {
+    do {
       target.setValue(expression, forKey: field)
-    }) {
-      print("⚠️ Couldn't set expression in Helpers.addImageToStyle(): \(exception)")
+    } catch {
+      print("Couldn't set expression in Helpers.addImageToStyle()")
     }
   }
 
   @objc public static func setExpression(
     target: NSObject, field: String, expression: NSExpression
   ) {
-    if let exception = NSException.catchException(in: {
+    do {
       // https://developer.apple.com/documentation/objectivec/nsobject/1418139-setvalue
-      target.setValue(expression, forKey: field)
-    }) {
-      print("⚠️ Couldn't set expression in Helpers.setExpression(): \(exception)")
+      try target.setValue(expression, forKey: field)
+    } catch {
+      print("Couldn't set expression in Helpers.setExpression()")
     }
   }
 
   @objc public static func parseExpression(
     propertyName: String, expression: String
   ) -> NSExpression? {
-    print("Helpers.parseExpression(): \(propertyName): \(expression)")
-    var result: NSExpression? = nil
-
-    if let exception = NSException.catchException(in: {
+    print("\(propertyName): \(expression)")
+    do {
       // can't create an Expression using the default method if the data is a hex string
       if propertyName.contains("color"), expression.first == "#" {
-        guard let color = UIColor(hexString: expression) else {
-          print("⚠️ Couldn't create UIColor from hex string: \(expression)")
-          return
-        }
-        result = NSExpression(forConstantValue: color)
-        return
+        let color = UIColor(hexString: expression)
+        return NSExpression(forConstantValue: color)
       }
       if expression.starts(with: "[") {
         // can't create an Expression if the data of a literal is an array
-        do {
-          let json = try JSONSerialization.jsonObject(
-            with: expression.data(using: .utf8)!,
-            options: .fragmentsAllowed
-          )
-
-          // print("json: \(json)")
-          if let offset = json as? [Any] {
-            // Case 1: ["literal", [x, y]]
-            if let keyword = offset.first as? String,
-               keyword == "literal",
-               offset.count == 2,
-               let vector = offset.last as? [Any],
-               vector.count == 2,
-               let x = vector.first as? Double,
-               let y = vector.last as? Double
-            {
-              result = NSExpression(
-                forConstantValue: NSValue(cgVector: CGVector(dx: x, dy: y))
-              )
-              return
+        let json = try JSONSerialization.jsonObject(
+          with: expression.data(using: .utf8)!,
+          options: .fragmentsAllowed
+        )
+        // print("json: \(json)")
+        if let offset = json as? [Any] {
+          if offset.count == 2, offset.first as? String == "literal" {
+            if let vector = offset.last as? [Any] {
+              if vector.count == 2 {
+                if let x = vector.first as? Double,
+                   let y = vector.last as? Double
+                {
+                  return NSExpression(
+                    forConstantValue: NSValue(
+                      cgVector: CGVector(dx: x, dy: y)))
+                }
+              }
             }
-
-            // Case 2: simple array literal like [x, y] or [5,5]
-            result = NSExpression(forConstantValue: offset)
-            return
+          } else if let first = offset.first, !(first is String) {
+            return NSExpression(forConstantValue: offset)
           }
-          result = NSExpression(mglJSONObject: json)
-          return
-        } catch {
-          print("⚠️ JSON parsing error in Helpers.parseExpression(): \(error)")
-          return
         }
+        return NSExpression(mglJSONObject: json)
       }
       // parse as a constant value
-      result = NSExpression(forConstantValue: expression)
-    }) {
-      print("⚠️ Couldn't parse expression in Helpers.parseExpression(): \(exception)")
+      return NSExpression(forConstantValue: expression)
+
+    } catch {
+      print("Couldn't parse Expression: " + expression)
     }
-    return result
+    return nil
   }
 }

maplibre_ios/ios/maplibre_ios/Sources/maplibre_ios/gen_swift_headers.sh

@@ -1,18 +1,40 @@
 #!/usr/bin/env bash
+set -euo pipefail
 
-# Use for -target the same ios version that is returned by xcrun
-# Build the MapLibre iOS SDK before running this script
+# --- Resolve Flutter SDK root dynamically ---
+if ! command -v flutter >/dev/null 2>&1; then
+  echo "❌ Flutter not found in PATH. Please ensure 'flutter' is installed and available."
+  exit 1
+fi
 
-xcrun --sdk iphonesimulator --show-sdk-path
+FLUTTER_ROOT=$(dirname $(dirname $(which flutter)))
+SDK_PATH=$(xcrun --sdk iphonesimulator --show-sdk-path)
 
+# --- Locate Flutter framework for the iOS simulator ---
+FLUTTER_FRAMEWORK_PATH="$FLUTTER_ROOT/bin/cache/artifacts/engine/ios/Flutter.xcframework/ios-arm64_x86_64-simulator"
+
+if [ ! -d "$FLUTTER_FRAMEWORK_PATH" ]; then
+  echo "❌ Flutter.xcframework not found at: $FLUTTER_FRAMEWORK_PATH"
+  echo "Run 'flutter precache --ios' to download iOS engine artifacts."
+  exit 1
+fi
+
+echo "✅ Using Flutter framework at: $FLUTTER_FRAMEWORK_PATH"
+echo "✅ Using iOS SDK at: $SDK_PATH"
+
+# --- Compile Swift sources and emit Objective-C headers ---
 swiftc \
-    -c MapLibreRegistry.swift \
-    -c Extensions.swift \
-    -c Helpers.swift \
-    -module-name maplibre_ios \
-    -emit-objc-header-path MapLibreIos.h \
-    -emit-library -o libmaplibreios.dylib \
-    -target arm64-apple-ios18.5-simulator \
-    -sdk $(xcrun --sdk iphonesimulator --show-sdk-path) \
-    -F ../../../.build/MapLibre.xcframework/ios-arm64_x86_64-simulator/ \
-    -framework MapLibre
+  -c MapLibreRegistry.swift \
+  -c Extensions.swift \
+  -c Helpers.swift \
+  -module-name maplibre_ios \
+  -emit-objc-header-path MapLibreIos.h \
+  -emit-library -o libmaplibreios.dylib \
+  -target arm64-apple-ios18.5-simulator \
+  -sdk "$SDK_PATH" \
+  -F ../../../.build/MapLibre.xcframework/ios-arm64_x86_64-simulator/ \
+  -F "$FLUTTER_FRAMEWORK_PATH" \
+  -framework MapLibre \
+  -framework Flutter
+
+echo "✅ Swift headers generated successfully: MapLibreIos.h"