@callstack/brownfield-cli 6.1.0 → 6.2.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @callstack/brownfield-cli
 
+## 6.2.0
+
+### Minor Changes
+
+- [#514](https://github.com/callstack/react-native-brownfield/pull/514) [`6517ec5`](https://github.com/callstack/react-native-brownfield/commit/6517ec5666269007f10c28efb7a748beba476998) Thanks [@DanielPotorCK](https://github.com/DanielPotorCK)! - Allow `ios.extraSpmXcframeworks` in brownfield config so `package:ios --add-spm-package` can include project-declared XCFrameworks as additional SPM binary targets.
+
+## 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/brownfield/commands/packageIos.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"packageIos.d.ts","sourceRoot":"","sources":["../../../src/brownfield/commands/packageIos.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,OAAO,EAAU,MAAM,WAAW,CAAC;AAU5C,OAAO,EAGL,YAAY,EACb,MAAM,uBAAuB,CAAC;AAgD/B,wBAAgB,8BAA8B,CAC5C,KAAK,EAAE,MAAM,GAAG,OAAO,GACtB,OAAO,CAET;AAED,wBAAgB,4BAA4B,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,GAAG,OAAO,CAE7E;AAcD,eAAO,MAAM,iBAAiB,SAkX3B,CAAC;AAEJ,qGAAqG;AACrG,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,OAAO,GAAG,SAAS,oBAEnE;AAED,eAAO,MAAM,iBAAiB,cAG7B,CAAC"}
+{"version":3,"file":"packageIos.d.ts","sourceRoot":"","sources":["../../../src/brownfield/commands/packageIos.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,OAAO,EAAU,MAAM,WAAW,CAAC;AAU5C,OAAO,EAGL,YAAY,EACb,MAAM,uBAAuB,CAAC;AAgD/B,wBAAgB,8BAA8B,CAC5C,KAAK,EAAE,MAAM,GAAG,OAAO,GACtB,OAAO,CAET;AAED,wBAAgB,4BAA4B,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,GAAG,OAAO,CAE7E;AAcD,eAAO,MAAM,iBAAiB,SAoX3B,CAAC;AAEJ,qGAAqG;AACrG,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,OAAO,GAAG,SAAS,oBAEnE;AAED,eAAO,MAAM,iBAAiB,cAG7B,CAAC"}

package/dist/brownfield/commands/packageIos.js

@@ -290,6 +290,8 @@ export const packageIosCommand = curryOptions(new Command('package:ios').descrip
             packageDir,
             frameworkName: frameworkName ?? undefined,
             usePrebuiltExpo: options.usePrebuiltExpo,
+            projectRoot,
+            extraSpmXcframeworks: options.extraSpmXcframeworks ?? [],
         });
         logger.success(`Local SPM package manifest created at ${colorLink(relativeToCwd(packageManifestPath))}`);
         logger.info(`Add the local package folder in Xcode: ${colorLink(relativeToCwd(packageDir))}`);

package/dist/brownfield/utils/createLocalSpmPackage.d.ts

@@ -1,11 +1,14 @@
+import type { ExtraSpmXcframework } from '../../types.js';
 type CreateLocalSpmPackageOptions = {
     packageDir: string;
     frameworkName?: string;
     usePrebuiltExpo?: boolean;
+    projectRoot?: string;
+    extraSpmXcframeworks?: ExtraSpmXcframework[];
 };
 type CreateLocalSpmPackageResult = {
     packageManifestPath: string;
 };
-export declare function createLocalSpmPackage({ packageDir, frameworkName, usePrebuiltExpo, }: CreateLocalSpmPackageOptions): CreateLocalSpmPackageResult;
+export declare function createLocalSpmPackage({ packageDir, frameworkName, usePrebuiltExpo, projectRoot, extraSpmXcframeworks, }: CreateLocalSpmPackageOptions): CreateLocalSpmPackageResult;
 export {};
 //# sourceMappingURL=createLocalSpmPackage.d.ts.map

package/dist/brownfield/utils/createLocalSpmPackage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createLocalSpmPackage.d.ts","sourceRoot":"","sources":["../../../src/brownfield/utils/createLocalSpmPackage.ts"],"names":[],"mappings":"AAYA,KAAK,4BAA4B,GAAG;IAClC,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B,CAAC;AAEF,KAAK,2BAA2B,GAAG;IACjC,mBAAmB,EAAE,MAAM,CAAC;CAC7B,CAAC;AA0JF,wBAAgB,qBAAqB,CAAC,EACpC,UAAU,EACV,aAAa,EACb,eAAsB,GACvB,EAAE,4BAA4B,GAAG,2BAA2B,CA2C5D"}
+{"version":3,"file":"createLocalSpmPackage.d.ts","sourceRoot":"","sources":["../../../src/brownfield/utils/createLocalSpmPackage.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAU1D,KAAK,4BAA4B,GAAG;IAClC,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,oBAAoB,CAAC,EAAE,mBAAmB,EAAE,CAAC;CAC9C,CAAC;AAEF,KAAK,2BAA2B,GAAG;IACjC,mBAAmB,EAAE,MAAM,CAAC;CAC7B,CAAC;AAwOF,wBAAgB,qBAAqB,CAAC,EACpC,UAAU,EACV,aAAa,EACb,eAAsB,EACtB,WAA2B,EAC3B,oBAAyB,GAC1B,EAAE,4BAA4B,GAAG,2BAA2B,CA2D5D"}

package/dist/brownfield/utils/createLocalSpmPackage.js

@@ -12,6 +12,8 @@ const RESERVED_FRAMEWORK_NAMES = new Set([
     'ReactNativeDependencies',
     ...ALL_EXPO_SUPPORT_XCFRAMEWORK_NAMES,
 ]);
+const SWIFT_TARGET_NAME_PATTERN = /^[A-Za-z_][A-Za-z0-9_]*$/;
+const RESERVED_FRAMEWORK_NAME_KEYS = new Set([...RESERVED_FRAMEWORK_NAMES].map((name) => name.toLowerCase()));
 function requireXcframework(packageDir, name) {
     const xcframeworkPath = path.join(packageDir, `${name}.xcframework`);
     if (!fs.existsSync(xcframeworkPath)) {
@@ -28,7 +30,7 @@ function requireHermesXcframework(packageDir) {
     return (optionalXcframework(packageDir, 'hermesvm') ??
         requireXcframework(packageDir, 'hermes'));
 }
-function resolveAppFrameworkName(packageDir, explicitFrameworkName) {
+function resolveAppFrameworkName(packageDir, reservedFrameworkNames, explicitFrameworkName) {
     if (explicitFrameworkName) {
         return requireXcframework(packageDir, explicitFrameworkName);
     }
@@ -36,7 +38,7 @@ function resolveAppFrameworkName(packageDir, explicitFrameworkName) {
         .readdirSync(packageDir, { withFileTypes: true })
         .filter((entry) => entry.isDirectory() &&
         entry.name.endsWith('.xcframework') &&
-        !RESERVED_FRAMEWORK_NAMES.has(path.basename(entry.name, '.xcframework')))
+        !reservedFrameworkNames.has(path.basename(entry.name, '.xcframework')))
         .map((entry) => path.basename(entry.name, '.xcframework'))
         .sort();
     if (candidates.length === 1 && candidates[0]) {
@@ -47,6 +49,45 @@ function resolveAppFrameworkName(packageDir, explicitFrameworkName) {
     }
     throw new Error(`Found multiple packaged app XCFramework candidates (${candidates.join(', ')}). Pass --scheme explicitly when packaging.`);
 }
+function resolveExtraSpmXcframeworkPath(projectRoot, entry) {
+    return path.isAbsolute(entry.path)
+        ? entry.path
+        : path.resolve(projectRoot, entry.path);
+}
+function validateExtraSpmXcframeworks(extraSpmXcframeworks, frameworkName) {
+    const nameKeys = new Set();
+    for (const entry of extraSpmXcframeworks) {
+        if (!SWIFT_TARGET_NAME_PATTERN.test(entry.name)) {
+            throw new Error(`Invalid extra SPM XCFramework name "${entry.name}". Names must start with a letter or underscore and contain only letters, numbers, and underscores.`);
+        }
+        const nameKey = entry.name.toLowerCase();
+        if (RESERVED_FRAMEWORK_NAME_KEYS.has(nameKey) ||
+            nameKey === frameworkName?.toLowerCase()) {
+            throw new Error(`Extra SPM XCFramework name "${entry.name}" conflicts with a generated package target.`);
+        }
+        if (nameKeys.has(nameKey)) {
+            throw new Error(`Duplicate extra SPM XCFramework name: ${entry.name}`);
+        }
+        nameKeys.add(nameKey);
+    }
+}
+function stageExtraSpmXcframeworks({ packageDir, projectRoot, extraSpmXcframeworks, }) {
+    const stagedNames = [];
+    for (const entry of extraSpmXcframeworks) {
+        const sourcePath = resolveExtraSpmXcframeworkPath(projectRoot, entry);
+        if (!fs.existsSync(sourcePath)) {
+            throw new Error(`Missing extra SPM XCFramework "${entry.name}" at ${entry.path}`);
+        }
+        const destinationPath = path.join(packageDir, `${entry.name}.xcframework`);
+        fs.rmSync(destinationPath, { recursive: true, force: true });
+        fs.cpSync(fs.realpathSync(sourcePath), destinationPath, {
+            recursive: true,
+            verbatimSymlinks: true,
+        });
+        stagedNames.push(entry.name);
+    }
+    return stagedNames;
+}
 function renderPackageSwift({ packageName, libraryName, targetNames, }) {
     const binaryTargets = targetNames
         .map((targetName) => `    .binaryTarget(name: "${targetName}", path: "./${SPM_ARTIFACTS_DIR_NAME}/${targetName}.xcframework")`)
@@ -107,19 +148,32 @@ If Xcode builds your host app but the simulator installation fails, check the ho
 This folder is generated by \`brownfield package:ios --add-spm-package\`. Re-run that command whenever the packaged XCFrameworks change so this package stays in sync.
 `;
 }
-export function createLocalSpmPackage({ packageDir, frameworkName, usePrebuiltExpo = true, }) {
-    const resolvedFrameworkName = resolveAppFrameworkName(packageDir, frameworkName);
+export function createLocalSpmPackage({ packageDir, frameworkName, usePrebuiltExpo = true, projectRoot = process.cwd(), extraSpmXcframeworks = [], }) {
+    validateExtraSpmXcframeworks(extraSpmXcframeworks, frameworkName);
+    const reservedFrameworkNames = new Set([
+        ...RESERVED_FRAMEWORK_NAMES,
+        ...extraSpmXcframeworks.map((entry) => entry.name),
+    ]);
+    const extraTargetNames = stageExtraSpmXcframeworks({
+        packageDir,
+        projectRoot,
+        extraSpmXcframeworks,
+    });
+    const resolvedFrameworkName = resolveAppFrameworkName(packageDir, reservedFrameworkNames, frameworkName);
     const expoSupportXcframeworkNames = getExpoSupportXcframeworkNames(usePrebuiltExpo);
     const targetNames = [
-        resolvedFrameworkName,
-        requireHermesXcframework(packageDir),
-        requireXcframework(packageDir, 'ReactBrownfield'),
-        optionalXcframework(packageDir, 'Brownie'),
-        optionalXcframework(packageDir, 'BrownfieldNavigation'),
-        ...expoSupportXcframeworkNames.map((frameworkName) => optionalXcframework(packageDir, frameworkName)),
-        optionalXcframework(packageDir, 'React'),
-        optionalXcframework(packageDir, 'ReactNativeDependencies'),
-    ].filter((targetName) => targetName !== null);
+        ...new Set([
+            resolvedFrameworkName,
+            requireHermesXcframework(packageDir),
+            requireXcframework(packageDir, 'ReactBrownfield'),
+            optionalXcframework(packageDir, 'Brownie'),
+            optionalXcframework(packageDir, 'BrownfieldNavigation'),
+            ...expoSupportXcframeworkNames.map((expoFrameworkName) => optionalXcframework(packageDir, expoFrameworkName)),
+            optionalXcframework(packageDir, 'React'),
+            optionalXcframework(packageDir, 'ReactNativeDependencies'),
+            ...extraTargetNames,
+        ].filter((targetName) => targetName !== null)),
+    ];
     const packageManifestPath = path.join(packageDir, 'Package.swift');
     const readmePath = path.join(packageDir, 'README.md');
     prepareLocalSpmArtifacts({

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/dist/types.d.ts

@@ -20,6 +20,21 @@ export type BrownieConfig = {
      */
     kotlinPackageName?: string;
 };
+/**
+ * Extra XCFramework declared for inclusion as a binary target in the
+ * local SPM package generated by `package:ios --add-spm-package`.
+ */
+export type ExtraSpmXcframework = {
+    /**
+     * Binary target / module name used in Package.swift.
+     * @pattern ^[A-Za-z_][A-Za-z0-9_]*$
+     */
+    name: string;
+    /**
+     * Path to the XCFramework directory, absolute or relative to the project root.
+     */
+    path: string;
+};
 export type PackageIosOptions = Omit<AppleBuildFlags, 'archive' | 'local'> & {
     /** Set when `--use-prebuilt-rn-core` is passed; omitted when the flag is absent (Rock applies RN version defaults). */
     usePrebuiltRnCore?: boolean;
@@ -27,6 +42,11 @@ export type PackageIosOptions = Omit<AppleBuildFlags, 'archive' | 'local'> & {
     usePrebuiltExpo?: boolean;
     /** When set, generate a local Swift Package Manager manifest next to the packaged XCFramework outputs. */
     addSpmPackage?: boolean;
+    /**
+     * Additional XCFrameworks copied into the generated local SPM package as
+     * binary targets. Only consumed when `--add-spm-package` is set. Defaults to [].
+     */
+    extraSpmXcframeworks?: ExtraSpmXcframework[];
 };
 export type BrownfieldPackageAndroidOptions = BrownfieldCommonOptions & Partial<PackageAarFlags>;
 export type BrownfieldPublishAndroidOptions = BrownfieldCommonOptions & Partial<PublishLocalAarFlags>;

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}

package/package.json

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

package/schema.json

@@ -183,6 +183,13 @@
           },
           "type": "array"
         },
+        "extraSpmXcframeworks": {
+          "description": "Additional XCFrameworks copied into the generated local SPM package as binary targets. Only consumed when `--add-spm-package` is set. Defaults to [].",
+          "items": {
+            "$ref": "#/definitions/ExtraSpmXcframework"
+          },
+          "type": "array"
+        },
         "installPods": {
           "description": "Whether to install CocoaPods.",
           "type": "boolean"
@@ -223,6 +230,23 @@
         }
       },
       "type": "object"
+    },
+    "ExtraSpmXcframework": {
+      "additionalProperties": false,
+      "description": "Extra XCFramework declared for inclusion as a binary target in the local SPM package generated by `package:ios --add-spm-package`.",
+      "properties": {
+        "name": {
+          "description": "Binary target / module name used in Package.swift.",
+          "pattern": "^[A-Za-z_][A-Za-z0-9_]*$",
+          "type": "string"
+        },
+        "path": {
+          "description": "Path to the XCFramework directory, absolute or relative to the project root.",
+          "type": "string"
+        }
+      },
+      "required": ["name", "path"],
+      "type": "object"
     }
   }
 }

package/src/brownfield/commands/packageIos.ts

@@ -449,6 +449,8 @@ export const packageIosCommand = curryOptions(
           packageDir,
           frameworkName: frameworkName ?? undefined,
           usePrebuiltExpo: options.usePrebuiltExpo,
+          projectRoot,
+          extraSpmXcframeworks: options.extraSpmXcframeworks ?? [],
         });
 
         logger.success(

package/src/brownfield/utils/createLocalSpmPackage.ts

@@ -1,6 +1,7 @@
 import fs from 'node:fs';
 import path from 'node:path';
 
+import type { ExtraSpmXcframework } from '../../types.js';
 import {
   prepareLocalSpmArtifacts,
   SPM_ARTIFACTS_DIR_NAME,
@@ -14,6 +15,8 @@ type CreateLocalSpmPackageOptions = {
   packageDir: string;
   frameworkName?: string;
   usePrebuiltExpo?: boolean;
+  projectRoot?: string;
+  extraSpmXcframeworks?: ExtraSpmXcframework[];
 };
 
 type CreateLocalSpmPackageResult = {
@@ -31,6 +34,11 @@ const RESERVED_FRAMEWORK_NAMES = new Set([
   ...ALL_EXPO_SUPPORT_XCFRAMEWORK_NAMES,
 ]);
 
+const SWIFT_TARGET_NAME_PATTERN = /^[A-Za-z_][A-Za-z0-9_]*$/;
+const RESERVED_FRAMEWORK_NAME_KEYS = new Set(
+  [...RESERVED_FRAMEWORK_NAMES].map((name) => name.toLowerCase())
+);
+
 function requireXcframework(packageDir: string, name: string) {
   const xcframeworkPath = path.join(packageDir, `${name}.xcframework`);
 
@@ -56,6 +64,7 @@ function requireHermesXcframework(packageDir: string) {
 
 function resolveAppFrameworkName(
   packageDir: string,
+  reservedFrameworkNames: Set<string>,
   explicitFrameworkName?: string
 ) {
   if (explicitFrameworkName) {
@@ -68,7 +77,7 @@ function resolveAppFrameworkName(
       (entry) =>
         entry.isDirectory() &&
         entry.name.endsWith('.xcframework') &&
-        !RESERVED_FRAMEWORK_NAMES.has(path.basename(entry.name, '.xcframework'))
+        !reservedFrameworkNames.has(path.basename(entry.name, '.xcframework'))
     )
     .map((entry) => path.basename(entry.name, '.xcframework'))
     .sort();
@@ -88,6 +97,78 @@ function resolveAppFrameworkName(
   );
 }
 
+function resolveExtraSpmXcframeworkPath(
+  projectRoot: string,
+  entry: ExtraSpmXcframework
+) {
+  return path.isAbsolute(entry.path)
+    ? entry.path
+    : path.resolve(projectRoot, entry.path);
+}
+
+function validateExtraSpmXcframeworks(
+  extraSpmXcframeworks: ExtraSpmXcframework[],
+  frameworkName?: string
+) {
+  const nameKeys = new Set<string>();
+
+  for (const entry of extraSpmXcframeworks) {
+    if (!SWIFT_TARGET_NAME_PATTERN.test(entry.name)) {
+      throw new Error(
+        `Invalid extra SPM XCFramework name "${entry.name}". Names must start with a letter or underscore and contain only letters, numbers, and underscores.`
+      );
+    }
+
+    const nameKey = entry.name.toLowerCase();
+    if (
+      RESERVED_FRAMEWORK_NAME_KEYS.has(nameKey) ||
+      nameKey === frameworkName?.toLowerCase()
+    ) {
+      throw new Error(
+        `Extra SPM XCFramework name "${entry.name}" conflicts with a generated package target.`
+      );
+    }
+
+    if (nameKeys.has(nameKey)) {
+      throw new Error(`Duplicate extra SPM XCFramework name: ${entry.name}`);
+    }
+
+    nameKeys.add(nameKey);
+  }
+}
+
+function stageExtraSpmXcframeworks({
+  packageDir,
+  projectRoot,
+  extraSpmXcframeworks,
+}: {
+  packageDir: string;
+  projectRoot: string;
+  extraSpmXcframeworks: ExtraSpmXcframework[];
+}) {
+  const stagedNames: string[] = [];
+
+  for (const entry of extraSpmXcframeworks) {
+    const sourcePath = resolveExtraSpmXcframeworkPath(projectRoot, entry);
+
+    if (!fs.existsSync(sourcePath)) {
+      throw new Error(
+        `Missing extra SPM XCFramework "${entry.name}" at ${entry.path}`
+      );
+    }
+
+    const destinationPath = path.join(packageDir, `${entry.name}.xcframework`);
+    fs.rmSync(destinationPath, { recursive: true, force: true });
+    fs.cpSync(fs.realpathSync(sourcePath), destinationPath, {
+      recursive: true,
+      verbatimSymlinks: true,
+    });
+    stagedNames.push(entry.name);
+  }
+
+  return stagedNames;
+}
+
 function renderPackageSwift({
   packageName,
   libraryName,
@@ -176,25 +257,43 @@ export function createLocalSpmPackage({
   packageDir,
   frameworkName,
   usePrebuiltExpo = true,
+  projectRoot = process.cwd(),
+  extraSpmXcframeworks = [],
 }: CreateLocalSpmPackageOptions): CreateLocalSpmPackageResult {
+  validateExtraSpmXcframeworks(extraSpmXcframeworks, frameworkName);
+  const reservedFrameworkNames = new Set([
+    ...RESERVED_FRAMEWORK_NAMES,
+    ...extraSpmXcframeworks.map((entry) => entry.name),
+  ]);
+  const extraTargetNames = stageExtraSpmXcframeworks({
+    packageDir,
+    projectRoot,
+    extraSpmXcframeworks,
+  });
   const resolvedFrameworkName = resolveAppFrameworkName(
     packageDir,
+    reservedFrameworkNames,
     frameworkName
   );
   const expoSupportXcframeworkNames =
     getExpoSupportXcframeworkNames(usePrebuiltExpo);
   const targetNames = [
-    resolvedFrameworkName,
-    requireHermesXcframework(packageDir),
-    requireXcframework(packageDir, 'ReactBrownfield'),
-    optionalXcframework(packageDir, 'Brownie'),
-    optionalXcframework(packageDir, 'BrownfieldNavigation'),
-    ...expoSupportXcframeworkNames.map((frameworkName) =>
-      optionalXcframework(packageDir, frameworkName)
+    ...new Set(
+      [
+        resolvedFrameworkName,
+        requireHermesXcframework(packageDir),
+        requireXcframework(packageDir, 'ReactBrownfield'),
+        optionalXcframework(packageDir, 'Brownie'),
+        optionalXcframework(packageDir, 'BrownfieldNavigation'),
+        ...expoSupportXcframeworkNames.map((expoFrameworkName) =>
+          optionalXcframework(packageDir, expoFrameworkName)
+        ),
+        optionalXcframework(packageDir, 'React'),
+        optionalXcframework(packageDir, 'ReactNativeDependencies'),
+        ...extraTargetNames,
+      ].filter((targetName): targetName is string => targetName !== null)
     ),
-    optionalXcframework(packageDir, 'React'),
-    optionalXcframework(packageDir, 'ReactNativeDependencies'),
-  ].filter((targetName): targetName is string => targetName !== null);
+  ];
 
   const packageManifestPath = path.join(packageDir, 'Package.swift');
   const readmePath = path.join(packageDir, 'README.md');

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;

package/src/types.ts

@@ -29,6 +29,23 @@ export type BrownieConfig = {
   kotlinPackageName?: string;
 };
 
+/**
+ * Extra XCFramework declared for inclusion as a binary target in the
+ * local SPM package generated by `package:ios --add-spm-package`.
+ */
+export type ExtraSpmXcframework = {
+  /**
+   * Binary target / module name used in Package.swift.
+   * @pattern ^[A-Za-z_][A-Za-z0-9_]*$
+   */
+  name: string;
+
+  /**
+   * Path to the XCFramework directory, absolute or relative to the project root.
+   */
+  path: string;
+};
+
 export type PackageIosOptions = Omit<AppleBuildFlags, 'archive' | 'local'> & {
   /** Set when `--use-prebuilt-rn-core` is passed; omitted when the flag is absent (Rock applies RN version defaults). */
   usePrebuiltRnCore?: boolean;
@@ -38,6 +55,12 @@ export type PackageIosOptions = Omit<AppleBuildFlags, 'archive' | 'local'> & {
 
   /** When set, generate a local Swift Package Manager manifest next to the packaged XCFramework outputs. */
   addSpmPackage?: boolean;
+
+  /**
+   * Additional XCFrameworks copied into the generated local SPM package as
+   * binary targets. Only consumed when `--add-spm-package` is set. Defaults to [].
+   */
+  extraSpmXcframeworks?: ExtraSpmXcframework[];
 };
 
 export type BrownfieldPackageAndroidOptions = BrownfieldCommonOptions &