@callstack/brownfield-cli 6.1.0 → 6.1.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @callstack/brownfield-cli
 
+## 6.1.1
+
+### Patch Changes
+
+- [#519](https://github.com/callstack/react-native-brownfield/pull/519) [`a9726c1`](https://github.com/callstack/react-native-brownfield/commit/a9726c137c61fe2e59c039555a955632a5d86aec) Thanks [@RaphaelFakhri](https://github.com/RaphaelFakhri)! - `brownfield navigation:codegen` now generates `NSNumber` for optional `number` and `boolean` method parameters on iOS. Previously, the generated Swift delegate used `Double?` and `Bool?`, which can't be represented in an `@objc` protocol, so the iOS build failed.
+
 ## 6.1.0
 
 ### Minor Changes

package/dist/navigation/generators/ios.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ios.d.ts","sourceRoot":"","sources":["../../../src/navigation/generators/ios.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAe,eAAe,EAAE,MAAM,aAAa,CAAC;AAkBhE,UAAU,sBAAsB;IAC9B,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;CAC3B;AAuCD,UAAU,uBAAuB;IAC/B,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;CAC3B;AAED,UAAU,qBAAsB,SAAQ,sBAAsB;CAAG;AA2CjE,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,eAAe,EAAE,EAC1B,OAAO,GAAE,uBAA4B,GACpC,MAAM,CA+BR;AAED,wBAAgB,0BAA0B,CACxC,OAAO,EAAE,eAAe,EAAE,EAC1B,OAAO,GAAE,qBAA0B,GAClC,MAAM,CAkCR"}
+{"version":3,"file":"ios.d.ts","sourceRoot":"","sources":["../../../src/navigation/generators/ios.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAe,eAAe,EAAE,MAAM,aAAa,CAAC;AAyBhE,UAAU,sBAAsB;IAC9B,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;CAC3B;AA2CD,UAAU,uBAAuB;IAC/B,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;CAC3B;AAED,UAAU,qBAAsB,SAAQ,sBAAsB;CAAG;AA+CjE,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,eAAe,EAAE,EAC1B,OAAO,GAAE,uBAA4B,GACpC,MAAM,CA+BR;AAED,wBAAgB,0BAA0B,CACxC,OAAO,EAAE,eAAe,EAAE,EAC1B,OAAO,GAAE,qBAA0B,GAClC,MAAM,CAkCR"}

package/dist/navigation/generators/ios.js

@@ -12,6 +12,12 @@ const TS_TO_SWIFT_TYPE = {
     void: 'Void',
     Object: '[String: Any]',
 };
+/**
+ * Optional `number` and `boolean` values are boxed in `NSNumber`, both in the
+ * React Native codegen spec and because Swift `Double?` and `Bool?` can't be
+ * represented in an `@objc` protocol.
+ */
+const BOXED_OPTIONAL_TS_TYPES = new Set(['number', 'boolean']);
 function mapTsTypeToObjC(tsType, nullable = false, options = {}) {
     if (tsType.startsWith('Promise<')) {
         return 'void';
@@ -19,6 +25,9 @@ function mapTsTypeToObjC(tsType, nullable = false, options = {}) {
     if (options.modelTypeNames?.includes(tsType)) {
         return nullable ? 'NSDictionary * _Nullable' : 'NSDictionary *';
     }
+    if (nullable && BOXED_OPTIONAL_TS_TYPES.has(tsType)) {
+        return 'NSNumber * _Nullable';
+    }
     const mapped = TS_TO_OBJC_TYPE[tsType];
     if (mapped) {
         if (nullable && mapped.includes('*')) {
@@ -41,6 +50,9 @@ function mapTsTypeToSwift(tsType, optional = false, options = {}) {
         const inner = tsType.slice(8, -1);
         return mapTsTypeToSwift(inner, optional, options);
     }
+    if (optional && BOXED_OPTIONAL_TS_TYPES.has(tsType)) {
+        return 'NSNumber?';
+    }
     const mapped = TS_TO_SWIFT_TYPE[tsType];
     if (mapped) {
         return optional ? `${mapped}?` : mapped;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@callstack/brownfield-cli",
-  "version": "6.1.0",
+  "version": "6.1.1",
   "license": "MIT",
   "author": "Artur Morys-Magiera <artus9033@gmail.com>",
   "bin": {

package/src/navigation/generators/ios.ts

@@ -16,6 +16,13 @@ const TS_TO_SWIFT_TYPE: Record<string, string> = {
   Object: '[String: Any]',
 };
 
+/**
+ * Optional `number` and `boolean` values are boxed in `NSNumber`, both in the
+ * React Native codegen spec and because Swift `Double?` and `Bool?` can't be
+ * represented in an `@objc` protocol.
+ */
+const BOXED_OPTIONAL_TS_TYPES = new Set(['number', 'boolean']);
+
 interface ObjCTypeMappingOptions {
   modelTypeNames?: string[];
 }
@@ -33,6 +40,10 @@ function mapTsTypeToObjC(
     return nullable ? 'NSDictionary * _Nullable' : 'NSDictionary *';
   }
 
+  if (nullable && BOXED_OPTIONAL_TS_TYPES.has(tsType)) {
+    return 'NSNumber * _Nullable';
+  }
+
   const mapped = TS_TO_OBJC_TYPE[tsType];
   if (mapped) {
     if (nullable && mapped.includes('*')) {
@@ -73,6 +84,10 @@ function mapTsTypeToSwift(
     return mapTsTypeToSwift(inner, optional, options);
   }
 
+  if (optional && BOXED_OPTIONAL_TS_TYPES.has(tsType)) {
+    return 'NSNumber?';
+  }
+
   const mapped = TS_TO_SWIFT_TYPE[tsType];
   if (mapped) {
     return optional ? `${mapped}?` : mapped;