@callstack/brownfield-cli 4.2.0 → 4.3.0

package/dist/expoPluginConfig.d.ts

@@ -22,6 +22,8 @@ export type BrownfieldPluginProps = {
         artifactId?: string;
         version?: string;
         useLocalGradlePlugin?: boolean;
+        minifyEnabled?: boolean;
+        extraProguardRules?: string[];
         useLocalMaven?: boolean;
         missingDimensionStrategies?: string[];
     };
@@ -36,6 +38,8 @@ export type ResolvedBrownfieldPluginAndroidConfig = {
     artifactId: string;
     version: string;
     useLocalGradlePlugin: boolean;
+    minifyEnabled: boolean;
+    extraProguardRules: string[];
     useLocalMaven: boolean;
     missingDimensionStrategies: string[];
 };

package/dist/expoPluginConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"expoPluginConfig.d.ts","sourceRoot":"","sources":["../src/expoPluginConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAEnD,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAEnD;;GAEG;AACH,MAAM,MAAM,qBAAqB,GAAG;IAClC,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,GAAG,CAAC,EAAE;QACJ,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAC1B,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,CAAC,CAAC;QAC1D,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAC1B,gBAAgB,CAAC,EAAE,MAAM,CAAC;KAC3B,CAAC;IACF,OAAO,CAAC,EAAE;QACR,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAC1B,iBAAiB,CAAC,EAAE,MAAM,CAAC;QAC3B,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,oBAAoB,CAAC,EAAE,OAAO,CAAC;QAC/B,aAAa,CAAC,EAAE,OAAO,CAAC;QACxB,0BAA0B,CAAC,EAAE,MAAM,EAAE,CAAC;KACvC,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,qCAAqC,GAAG;IAClD,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;IACzB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,oBAAoB,EAAE,OAAO,CAAC;IAC9B,aAAa,EAAE,OAAO,CAAC;IACvB,0BAA0B,EAAE,MAAM,EAAE,CAAC;CACtC,CAAC;AAEF,MAAM,MAAM,iCAAiC,GAAG;IAC9C,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;IACzB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,CAAC,CAAC;IACzD,gBAAgB,EAAE,MAAM,CAAC;IACzB,gBAAgB,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,8BAA8B,GAAG;IAC3C,KAAK,EAAE,OAAO,CAAC;IACf,GAAG,EAAE,iCAAiC,GAAG,IAAI,CAAC;IAC9C,OAAO,EAAE,qCAAqC,GAAG,IAAI,CAAC;CACvD,CAAC;AAEF,KAAK,oBAAoB,GAAG;IAC1B,GAAG,CAAC,EAAE;QACJ,gBAAgB,CAAC,EAAE,MAAM,CAAC;KAC3B,CAAC;IACF,OAAO,CAAC,EAAE;QACR,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB,CAAC;CACH,CAAC;AA0DF;;;;;;GAMG;AACH,wBAAgB,+BAA+B,CAC7C,UAAU,EAAE,gBAAgB,GAAG,IAAI,EACnC,WAAW,EAAE,qBAAqB,GACjC,IAAI,CAQN;AAED;;;;;;GAMG;AACH,wBAAgB,6BAA6B,CAC3C,WAAW,EAAE,qBAAqB,EAClC,UAAU,EAAE,gBAAgB,GAAG,IAAI,EACnC,UAAU,EAAE,oBAAoB,GAC/B,8BAA8B,CA8ChC"}
+{"version":3,"file":"expoPluginConfig.d.ts","sourceRoot":"","sources":["../src/expoPluginConfig.ts"],"names":[],"mappings":"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"}

package/dist/expoPluginConfig.js

@@ -66,6 +66,7 @@ export function assertNoConfigFilePluginOverlap(fileConfig, pluginProps) {
  */
 export function resolveBrownfieldPluginConfig(pluginProps, fileConfig, expoConfig) {
     const effectiveProps = fileConfig !== null ? fileConfigToPluginProps(fileConfig) : pluginProps;
+    const extraProguardRules = (effectiveProps.android?.extraProguardRules ?? []).filter((rule) => rule.trim().length > 0);
     const androidPackage = expoConfig.android?.package;
     /**
      * Below: android.moduleName may be provided in the fully-qualified Gradle format
@@ -97,6 +98,8 @@ export function resolveBrownfieldPluginConfig(pluginProps, fileConfig, expoConfi
                 artifactId: effectiveProps.android?.artifactId ?? androidModuleName,
                 version: effectiveProps.android?.version ?? '0.0.1-SNAPSHOT',
                 useLocalGradlePlugin: effectiveProps.android?.useLocalGradlePlugin ?? false,
+                minifyEnabled: effectiveProps.android?.minifyEnabled ?? false,
+                extraProguardRules,
                 useLocalMaven: effectiveProps.android?.useLocalMaven ?? false,
                 missingDimensionStrategies: effectiveProps.android?.missingDimensionStrategies ?? [],
             }

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

@@ -1 +1 @@
-{"version":3,"file":"android.d.ts","sourceRoot":"","sources":["../../../src/navigation/generators/android.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAUnD,UAAU,wBAAwB;IAChC,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;CAC3B;AA4BD,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,eAAe,EAAE,EAC1B,iBAAiB,EAAE,MAAM,EACzB,OAAO,GAAE,wBAA6B,GACrC,MAAM,CAuBR;AAED,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,eAAe,EAAE,EAC1B,iBAAiB,EAAE,MAAM,EACzB,OAAO,GAAE,wBAA6B,GACrC,MAAM,CAoCR"}
+{"version":3,"file":"android.d.ts","sourceRoot":"","sources":["../../../src/navigation/generators/android.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAe,eAAe,EAAE,MAAM,aAAa,CAAC;AAUhE,UAAU,wBAAwB;IAChC,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;CAC3B;AAuED,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,eAAe,EAAE,EAC1B,iBAAiB,EAAE,MAAM,EACzB,OAAO,GAAE,wBAA6B,GACrC,MAAM,CAgCR;AAED,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,eAAe,EAAE,EAC1B,iBAAiB,EAAE,MAAM,EACzB,OAAO,GAAE,wBAA6B,GACrC,MAAM,CAuCR"}

package/dist/navigation/generators/android.js

@@ -5,6 +5,12 @@ const TS_TO_KOTLIN_TYPE = {
     void: 'Unit',
     Object: 'ReadableMap',
 };
+function buildKotlinImports(imports) {
+    if (imports.length === 0) {
+        return '\n';
+    }
+    return `\n${[...new Set(imports)].sort().join('\n')}\n`;
+}
 function mapTsTypeToKotlin(tsType, optional = false, options = {}, layer = 'delegate') {
     if (tsType.startsWith('Promise<')) {
         const inner = tsType.slice(8, -1);
@@ -22,27 +28,57 @@ function mapTsTypeToKotlin(tsType, optional = false, options = {}, layer = 'dele
     }
     return optional ? 'Any?' : 'Any';
 }
+function mapParamToKotlin(param, options = {}, layer = 'delegate') {
+    if (param.callback) {
+        return param.optional ? 'Callback?' : 'Callback';
+    }
+    return mapTsTypeToKotlin(param.type, param.optional, options, layer);
+}
+function prepareKotlinArgs(method, options = {}) {
+    const preparedParams = [];
+    const args = method.params
+        .map((param) => {
+        if (options.modelTypeNames?.includes(param.type)) {
+            const convertedName = `${param.name}Model`;
+            preparedParams.push(`    val ${convertedName} = ${param.name}${param.optional
+                ? `?.let(::to${param.type})`
+                : `.let(::to${param.type})`}`);
+            return convertedName;
+        }
+        return param.name;
+    })
+        .join(', ');
+    return { preparedParams, args };
+}
 export function generateKotlinDelegate(methods, kotlinPackageName, options = {}) {
+    const hasAsyncMethod = methods.some((method) => method.isAsync);
+    const hasCallbackParam = methods.some((method) => method.params.some((param) => param.callback));
+    const imports = buildKotlinImports([
+        ...(hasCallbackParam ? ['import com.facebook.react.bridge.Callback'] : []),
+        ...(hasAsyncMethod ? ['import com.facebook.react.bridge.Promise'] : []),
+    ]);
     const methodSignatures = methods
         .map((method) => {
-        const params = method.params
-            .map((param) => `${param.name}: ${mapTsTypeToKotlin(param.type, param.optional, options)}`)
-            .join(', ');
-        const returnType = method.returnType === 'void'
+        const methodParams = method.params.map((param) => `${param.name}: ${mapParamToKotlin(param, options)}`);
+        const params = [
+            ...methodParams,
+            ...(method.isAsync ? ['promise: Promise'] : []),
+        ].join(', ');
+        const returnType = method.returnType === 'void' || method.isAsync
             ? ''
             : `: ${mapTsTypeToKotlin(method.returnType, false, options, 'delegate')}`;
         return `  fun ${method.name}(${params})${returnType}`;
     })
         .join('\n');
     return `package ${kotlinPackageName}
-
-interface BrownfieldNavigationDelegate {
+${imports}interface BrownfieldNavigationDelegate {
 ${methodSignatures}
 }
 `;
 }
 export function generateKotlinModule(methods, kotlinPackageName, options = {}) {
     const hasAsyncMethod = methods.some((method) => method.isAsync);
+    const hasCallbackParam = methods.some((method) => method.params.some((param) => param.callback));
     const hasObjectType = methods.some((method) => method.returnType.includes('Object') ||
         method.params.some((param) => param.type === 'Object' || options.modelTypeNames?.includes(param.type)));
     const methodImplementations = methods
@@ -53,7 +89,7 @@ export function generateKotlinModule(methods, kotlinPackageName, options = {}) {
     return `package ${kotlinPackageName}
 
 import com.facebook.react.bridge.ReactApplicationContext
-import com.facebook.react.bridge.ReactMethod${hasAsyncMethod ? '\nimport com.facebook.react.bridge.Promise' : ''}${hasObjectType ? '\nimport com.facebook.react.bridge.ReadableMap' : ''}
+import com.facebook.react.bridge.ReactMethod${hasCallbackParam ? '\nimport com.facebook.react.bridge.Callback' : ''}${hasAsyncMethod ? '\nimport com.facebook.react.bridge.Promise' : ''}${hasObjectType ? '\nimport com.facebook.react.bridge.ReadableMap' : ''}
 
 class NativeBrownfieldNavigationModule(
   reactContext: ReactApplicationContext
@@ -68,21 +104,9 @@ ${methodImplementations}
 }
 function generateSyncKotlinMethod(method, options = {}) {
     const params = method.params
-        .map((param) => `${param.name}: ${mapTsTypeToKotlin(param.type, param.optional, options, 'module')}`)
-        .join(', ');
-    const preparedParams = [];
-    const args = method.params
-        .map((param) => {
-        if (options.modelTypeNames?.includes(param.type)) {
-            const convertedName = `${param.name}Model`;
-            preparedParams.push(`    val ${convertedName} = ${param.name}${param.optional
-                ? `?.let(::to${param.type})`
-                : `.let(::to${param.type})`}`);
-            return convertedName;
-        }
-        return param.name;
-    })
+        .map((param) => `${param.name}: ${mapParamToKotlin(param, options, 'module')}`)
         .join(', ');
+    const { preparedParams, args } = prepareKotlinArgs(method, options);
     const signature = `  @ReactMethod\n  override fun ${method.name}(${params})${method.returnType === 'void'
         ? ''
         : `: ${mapTsTypeToKotlin(method.returnType, false, options, 'module')}`}`;
@@ -98,13 +122,16 @@ ${preparedPrefix}    return BrownfieldNavigationManager.getDelegate().${method.n
 }
 function generateAsyncKotlinMethod(method, options = {}) {
     const paramsWithTypes = method.params
-        .map((param) => `${param.name}: ${mapTsTypeToKotlin(param.type, param.optional, options, 'module')}`)
+        .map((param) => `${param.name}: ${mapParamToKotlin(param, options, 'module')}`)
         .join(', ');
     const params = paramsWithTypes.length > 0
         ? `${paramsWithTypes}, promise: Promise`
         : 'promise: Promise';
+    const { preparedParams, args } = prepareKotlinArgs(method, options);
+    const delegateArgs = args.length > 0 ? `${args}, promise` : 'promise';
+    const preparedPrefix = preparedParams.length > 0 ? `${preparedParams.join('\n')}\n` : '';
     return `  @ReactMethod
   override fun ${method.name}(${params}) {
-    promise.reject("not_implemented", "${method.name} is not implemented")
+${preparedPrefix}    BrownfieldNavigationManager.getDelegate().${method.name}(${delegateArgs})
   }`;
 }

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;AAkBnD,UAAU,sBAAsB;IAC9B,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;CAC3B;AA0BD,UAAU,uBAAuB;IAC/B,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;CAC3B;AAED,UAAU,qBAAsB,SAAQ,sBAAsB;CAAG;AAwBjE,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,eAAe,EAAE,EAC1B,OAAO,GAAE,uBAA4B,GACpC,MAAM,CA0BR;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;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"}

package/dist/navigation/generators/ios.js

@@ -28,6 +28,14 @@ function mapTsTypeToObjC(tsType, nullable = false, options = {}) {
     }
     return nullable ? 'id _Nullable' : 'id';
 }
+function mapParamToObjC(param, nullable = false, options = {}) {
+    if (param.callback) {
+        return param.optional
+            ? 'RCTResponseSenderBlock _Nullable'
+            : 'RCTResponseSenderBlock';
+    }
+    return mapTsTypeToObjC(param.type, nullable, options);
+}
 function mapTsTypeToSwift(tsType, optional = false, options = {}) {
     if (tsType.startsWith('Promise<')) {
         const inner = tsType.slice(8, -1);
@@ -42,17 +50,35 @@ function mapTsTypeToSwift(tsType, optional = false, options = {}) {
     }
     return optional ? 'Any?' : 'Any';
 }
+/** ObjC-compatible closures that match RCT typedefs without importing React. */
+const SWIFT_RESPONSE_SENDER_BLOCK = '@escaping ([Any]?) -> Void';
+const SWIFT_OPTIONAL_RESPONSE_SENDER_BLOCK = '(([Any]?) -> Void)?';
+const SWIFT_PROMISE_RESOLVE_BLOCK = '@escaping (Any?) -> Void';
+const SWIFT_PROMISE_REJECT_BLOCK = '@escaping (String?, String?, (any Error)?) -> Void';
+function mapParamToSwift(param, options = {}) {
+    if (param.callback) {
+        return param.optional
+            ? SWIFT_OPTIONAL_RESPONSE_SENDER_BLOCK
+            : SWIFT_RESPONSE_SENDER_BLOCK;
+    }
+    return mapTsTypeToSwift(param.type, param.optional, options);
+}
 export function generateSwiftDelegate(methods, options = {}) {
     const protocolMethods = methods
         .map((method) => {
-        const params = method.params
-            .map((param, index) => {
-            const swiftType = mapTsTypeToSwift(param.type, param.optional, options);
+        const methodParams = method.params.map((param, index) => {
+            const swiftType = mapParamToSwift(param, options);
             const label = index === 0 ? '_' : param.name;
             return `${label} ${param.name}: ${swiftType}`;
-        })
-            .join(', ');
-        const returnType = method.returnType === 'void'
+        });
+        const promiseParams = method.isAsync
+            ? [
+                `${methodParams.length === 0 ? '_ resolve' : 'resolve'}: ${SWIFT_PROMISE_RESOLVE_BLOCK}`,
+                `reject: ${SWIFT_PROMISE_REJECT_BLOCK}`,
+            ]
+            : [];
+        const params = [...methodParams, ...promiseParams].join(', ');
+        const returnType = method.returnType === 'void' || method.isAsync
             ? ''
             : ` -> ${mapTsTypeToSwift(method.returnType, false, options)}`;
         return `    @objc func ${method.name}(${params})${returnType}`;
@@ -97,20 +123,10 @@ ${methodImplementations}
 @end
 `;
 }
-function generateSyncObjCMethod(method, options) {
-    const { name, params, returnType } = method;
-    let signature = `- (${mapTsTypeToObjC(returnType, false, options)})${name}`;
-    if (params.length > 0) {
-        signature += params
-            .map((param, index) => {
-            const prefix = index === 0 ? ':' : ` ${param.name}:`;
-            return `${prefix}(${mapTsTypeToObjC(param.type, param.optional, options)})${param.name}`;
-        })
-            .join('');
-    }
+function prepareObjCArgs(method, options) {
     const preparedParams = [];
     const delegateArgs = [];
-    for (const param of params) {
+    for (const param of method.params) {
         if (options.modelTypeNames?.includes(param.type)) {
             const convertedParamName = `${param.name}Model`;
             preparedParams.push(`${param.type} *${convertedParamName} = ${param.name} == nil ? nil : [${param.type} fromDictionary:${param.name}];`);
@@ -120,6 +136,9 @@ function generateSyncObjCMethod(method, options) {
             delegateArgs.push(param.name);
         }
     }
+    return { preparedParams, delegateArgs };
+}
+function buildObjCDelegateCall(name, params, delegateArgs) {
     let delegateCall = `[[[BrownfieldNavigationManager shared] getDelegate] ${name}`;
     if (delegateArgs.length > 0) {
         delegateCall += delegateArgs
@@ -131,6 +150,21 @@ function generateSyncObjCMethod(method, options) {
             .join(' ');
     }
     delegateCall += ']';
+    return delegateCall;
+}
+function generateSyncObjCMethod(method, options) {
+    const { name, params, returnType } = method;
+    let signature = `- (${mapTsTypeToObjC(returnType, false, options)})${name}`;
+    if (params.length > 0) {
+        signature += params
+            .map((param, index) => {
+            const prefix = index === 0 ? ':' : ` ${param.name}:`;
+            return `${prefix}(${mapParamToObjC(param, param.optional, options)})${param.name}`;
+        })
+            .join('');
+    }
+    const { preparedParams, delegateArgs } = prepareObjCArgs(method, options);
+    const delegateCall = buildObjCDelegateCall(name, params, delegateArgs);
     const returnPrefix = returnType === 'void' ? '' : 'return ';
     const preparedLines = preparedParams.map((line) => `    ${line}`).join('\n');
     const bodyPrefix = preparedLines.length > 0 ? `${preparedLines}\n` : '';
@@ -141,24 +175,29 @@ ${bodyPrefix}    ${returnPrefix}${delegateCall};
 function generateAsyncObjCMethod(method, options) {
     const { name, params } = method;
     let signature = `- (void)${name}`;
-    const allParams = [
-        ...params,
+    const promiseParams = [
         { name: 'resolve', type: 'RCTPromiseResolveBlock', optional: false },
         { name: 'reject', type: 'RCTPromiseRejectBlock', optional: false },
     ];
+    const allParams = [...params, ...promiseParams];
     signature += ':';
     signature += allParams
         .map((param, index) => {
-        const prefix = index === 0 ? '' : param.name;
+        const prefix = index === 0 ? '' : `${param.name}:`;
         const type = param.type === 'RCTPromiseResolveBlock'
             ? 'RCTPromiseResolveBlock'
             : param.type === 'RCTPromiseRejectBlock'
                 ? 'RCTPromiseRejectBlock'
-                : mapTsTypeToObjC(param.type, param.optional, options);
+                : mapParamToObjC(param, param.optional, options);
         return `${prefix}(${type})${param.name}`;
     })
         .join(' ');
+    const { preparedParams, delegateArgs } = prepareObjCArgs(method, options);
+    const asyncDelegateArgs = [...delegateArgs, 'resolve', 'reject'];
+    const delegateCall = buildObjCDelegateCall(name, allParams, asyncDelegateArgs);
+    const preparedLines = preparedParams.map((line) => `    ${line}`).join('\n');
+    const bodyPrefix = preparedLines.length > 0 ? `${preparedLines}\n` : '';
     return `${signature} {
-    reject(@"not_implemented", @"${name} is not implemented", nil);
+${bodyPrefix}    ${delegateCall};
 }`;
 }

package/dist/navigation/parser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../../src/navigation/parser.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAKV,oBAAoB,EAErB,MAAM,YAAY,CAAC;AAkCpB,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,oBAAoB,CA4G1E"}
+{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../../src/navigation/parser.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAMV,oBAAoB,EAErB,MAAM,YAAY,CAAC;AAyFpB,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,oBAAoB,CAuH1E"}

package/dist/navigation/parser.js

@@ -29,6 +29,42 @@ function collectReferencedTypesFromText(typeText) {
     }
     return matches.filter((match) => !SKIP_TYPE_TOKENS.has(match));
 }
+function getPromiseInnerType(typeText) {
+    return typeText.startsWith('Promise<') && typeText.endsWith('>')
+        ? typeText.slice(8, -1)
+        : undefined;
+}
+function parseCallbackSignature(typeNode) {
+    if (!typeNode || !Node.isFunctionTypeNode(typeNode)) {
+        return undefined;
+    }
+    return {
+        params: typeNode.getParameters().map((param) => ({
+            name: param.getName(),
+            type: param.getTypeNode()?.getText() ?? 'unknown',
+            optional: param.isOptional(),
+        })),
+        returnType: typeNode.getReturnTypeNode()?.getText() ?? 'void',
+    };
+}
+const RESERVED_ASYNC_PARAM_NAMES = new Set(['promise', 'resolve', 'reject']);
+function validateMethodSignature(method) {
+    for (const param of method.params) {
+        if (getPromiseInnerType(param.type)) {
+            throw new Error(`Unsupported Promise parameter "${param.name}" in method "${method.name}": Promise<T> is only supported as a method return type.`);
+        }
+        if (method.isAsync &&
+            RESERVED_ASYNC_PARAM_NAMES.has(param.name)) {
+            throw new Error(`Reserved parameter name "${param.name}" in async method "${method.name}": this name is used by the generated bridging code. Rename the parameter.`);
+        }
+        if (!param.callback) {
+            continue;
+        }
+        if (param.callback.returnType !== 'void') {
+            throw new Error(`Unsupported callback parameter "${param.name}" in method "${method.name}": callback return type "${param.callback.returnType}" is not supported. Use a void callback or model the result as a Promise-returning navigation method.`);
+        }
+    }
+}
 export function parseNavigationSpec(specPath) {
     if (!fs.existsSync(specPath)) {
         throw new Error(`Spec file not found: ${specPath}`);
@@ -44,20 +80,31 @@ export function parseNavigationSpec(specPath) {
         const name = method.getName();
         const params = method.getParameters().map((param) => {
             const typeNode = param.getTypeNode();
-            return {
+            const callback = parseCallbackSignature(typeNode);
+            const methodParam = {
                 name: param.getName(),
                 type: typeNode?.getText() ?? 'unknown',
                 optional: param.isOptional(),
             };
+            if (callback) {
+                methodParam.callback = callback;
+            }
+            return methodParam;
         });
         const returnTypeNode = method.getReturnTypeNode();
         const returnType = returnTypeNode?.getText() ?? 'void';
-        return {
+        const promiseReturnType = getPromiseInnerType(returnType);
+        const methodSignature = {
             name,
             params,
             returnType,
-            isAsync: returnType.startsWith('Promise<'),
+            isAsync: Boolean(promiseReturnType),
         };
+        if (promiseReturnType) {
+            methodSignature.promiseReturnType = promiseReturnType;
+        }
+        validateMethodSignature(methodSignature);
+        return methodSignature;
     });
     const declarationNodes = [
         ...sourceFile.getTypeAliases(),

package/dist/navigation/types.d.ts

@@ -1,13 +1,24 @@
+export interface CallbackParam {
+    name: string;
+    type: string;
+    optional: boolean;
+}
+export interface CallbackSignature {
+    params: CallbackParam[];
+    returnType: string;
+}
 export interface MethodParam {
     name: string;
     type: string;
     optional: boolean;
+    callback?: CallbackSignature;
 }
 export interface MethodSignature {
     name: string;
     params: MethodParam[];
     returnType: string;
     isAsync: boolean;
+    promiseReturnType?: string;
 }
 export interface TypeDeclaration {
     name: string;

package/dist/navigation/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/navigation/types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,WAAW,EAAE,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,oBAAoB,EAAE,CAAC;CAChC;AAED,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,eAAe,EAAE,CAAC;IAC3B,0BAA0B,EAAE,eAAe,EAAE,CAAC;IAC9C,gBAAgB,EAAE,eAAe,EAAE,CAAC;CACrC;AAED,MAAM,WAAW,4BAA4B;IAC3C,eAAe,EAAE,MAAM,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;IACtB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/navigation/types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,aAAa,EAAE,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,iBAAiB,CAAC;CAC9B;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,WAAW,EAAE,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,OAAO,CAAC;IACjB,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,oBAAoB,EAAE,CAAC;CAChC;AAED,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,eAAe,EAAE,CAAC;IAC3B,0BAA0B,EAAE,eAAe,EAAE,CAAC;IAC9C,gBAAgB,EAAE,eAAe,EAAE,CAAC;CACrC;AAED,MAAM,WAAW,4BAA4B;IAC3C,eAAe,EAAE,MAAM,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;IACtB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB"}

package/dist/types.d.ts

@@ -39,6 +39,14 @@ export type BrownfieldExpoAndroidConfig = {
      * The package name for the Android library module.
      */
     packageName?: string;
+    /**
+     * Toggle minification for the generated Android library.
+     */
+    minifyEnabled?: boolean;
+    /**
+     * Extra Proguard rules appended to the default rules.
+     */
+    extraProguardRules?: string[];
     /**
      * Minimum SDK version for the Android library.
      */

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": "4.2.0",
+  "version": "4.3.0",
   "license": "MIT",
   "author": "Artur Morys-Magiera <artus9033@gmail.com>",
   "bin": {

package/schema.json

@@ -57,6 +57,13 @@
           "description": "Compile SDK version for the Android library.",
           "type": "number"
         },
+        "extraProguardRules": {
+          "description": "Extra Proguard rules appended to the default rules. Each entry must be a non-empty string.",
+          "items": {
+            "type": "string"
+          },
+          "type": "array"
+        },
         "groupId": {
           "description": "Maven group ID used when publishing the AAR.",
           "type": "string"
@@ -65,6 +72,10 @@
           "description": "Minimum SDK version for the Android library.",
           "type": "number"
         },
+        "minifyEnabled": {
+          "description": "Toggle minification for the generated Android library.",
+          "type": "boolean"
+        },
         "missingDimensionStrategies": {
           "description": "Missing dimension strategies as dimension + flavor(s), e.g. \"type, alpha\".",
           "items": {

package/src/expoPluginConfig.ts

@@ -24,6 +24,8 @@ export type BrownfieldPluginProps = {
     artifactId?: string;
     version?: string;
     useLocalGradlePlugin?: boolean;
+    minifyEnabled?: boolean;
+    extraProguardRules?: string[];
     useLocalMaven?: boolean;
     missingDimensionStrategies?: string[];
   };
@@ -39,6 +41,8 @@ export type ResolvedBrownfieldPluginAndroidConfig = {
   artifactId: string;
   version: string;
   useLocalGradlePlugin: boolean;
+  minifyEnabled: boolean;
+  extraProguardRules: string[];
   useLocalMaven: boolean;
   missingDimensionStrategies: string[];
 };
@@ -156,6 +160,9 @@ export function resolveBrownfieldPluginConfig(
 ): ResolvedBrownfieldPluginConfig {
   const effectiveProps =
     fileConfig !== null ? fileConfigToPluginProps(fileConfig) : pluginProps;
+  const extraProguardRules = (
+    effectiveProps.android?.extraProguardRules ?? []
+  ).filter((rule) => rule.trim().length > 0);
 
   const androidPackage = expoConfig.android?.package;
   /**
@@ -193,6 +200,8 @@ export function resolveBrownfieldPluginConfig(
           version: effectiveProps.android?.version ?? '0.0.1-SNAPSHOT',
           useLocalGradlePlugin:
             effectiveProps.android?.useLocalGradlePlugin ?? false,
+          minifyEnabled: effectiveProps.android?.minifyEnabled ?? false,
+          extraProguardRules,
           useLocalMaven: effectiveProps.android?.useLocalMaven ?? false,
           missingDimensionStrategies:
             effectiveProps.android?.missingDimensionStrategies ?? [],

package/src/navigation/generators/android.ts

@@ -1,4 +1,4 @@
-import type { MethodSignature } from '../types.js';
+import type { MethodParam, MethodSignature } from '../types.js';
 
 const TS_TO_KOTLIN_TYPE: Record<string, string> = {
   string: 'String',
@@ -12,6 +12,13 @@ interface KotlinTypeMappingOptions {
   modelTypeNames?: string[];
 }
 
+function buildKotlinImports(imports: string[]): string {
+  if (imports.length === 0) {
+    return '\n';
+  }
+  return `\n${[...new Set(imports)].sort().join('\n')}\n`;
+}
+
 function mapTsTypeToKotlin(
   tsType: string,
   optional: boolean = false,
@@ -38,21 +45,67 @@ function mapTsTypeToKotlin(
   return optional ? 'Any?' : 'Any';
 }
 
+function mapParamToKotlin(
+  param: MethodParam,
+  options: KotlinTypeMappingOptions = {},
+  layer: 'delegate' | 'module' = 'delegate'
+): string {
+  if (param.callback) {
+    return param.optional ? 'Callback?' : 'Callback';
+  }
+  return mapTsTypeToKotlin(param.type, param.optional, options, layer);
+}
+
+function prepareKotlinArgs(
+  method: MethodSignature,
+  options: KotlinTypeMappingOptions = {}
+): { preparedParams: string[]; args: string } {
+  const preparedParams: string[] = [];
+  const args = method.params
+    .map((param) => {
+      if (options.modelTypeNames?.includes(param.type)) {
+        const convertedName = `${param.name}Model`;
+        preparedParams.push(
+          `    val ${convertedName} = ${param.name}${
+            param.optional
+              ? `?.let(::to${param.type})`
+              : `.let(::to${param.type})`
+          }`
+        );
+        return convertedName;
+      }
+      return param.name;
+    })
+    .join(', ');
+
+  return { preparedParams, args };
+}
+
 export function generateKotlinDelegate(
   methods: MethodSignature[],
   kotlinPackageName: string,
   options: KotlinTypeMappingOptions = {}
 ): string {
+  const hasAsyncMethod = methods.some((method) => method.isAsync);
+  const hasCallbackParam = methods.some((method) =>
+    method.params.some((param) => param.callback)
+  );
+  const imports = buildKotlinImports([
+    ...(hasCallbackParam ? ['import com.facebook.react.bridge.Callback'] : []),
+    ...(hasAsyncMethod ? ['import com.facebook.react.bridge.Promise'] : []),
+  ]);
+
   const methodSignatures = methods
     .map((method) => {
-      const params = method.params
-        .map(
-          (param) =>
-            `${param.name}: ${mapTsTypeToKotlin(param.type, param.optional, options)}`
-        )
-        .join(', ');
+      const methodParams = method.params.map(
+        (param) => `${param.name}: ${mapParamToKotlin(param, options)}`
+      );
+      const params = [
+        ...methodParams,
+        ...(method.isAsync ? ['promise: Promise'] : []),
+      ].join(', ');
       const returnType =
-        method.returnType === 'void'
+        method.returnType === 'void' || method.isAsync
           ? ''
           : `: ${mapTsTypeToKotlin(method.returnType, false, options, 'delegate')}`;
       return `  fun ${method.name}(${params})${returnType}`;
@@ -60,8 +113,7 @@ export function generateKotlinDelegate(
     .join('\n');
 
   return `package ${kotlinPackageName}
-
-interface BrownfieldNavigationDelegate {
+${imports}interface BrownfieldNavigationDelegate {
 ${methodSignatures}
 }
 `;
@@ -73,6 +125,9 @@ export function generateKotlinModule(
   options: KotlinTypeMappingOptions = {}
 ): string {
   const hasAsyncMethod = methods.some((method) => method.isAsync);
+  const hasCallbackParam = methods.some((method) =>
+    method.params.some((param) => param.callback)
+  );
   const hasObjectType = methods.some(
     (method) =>
       method.returnType.includes('Object') ||
@@ -94,8 +149,8 @@ export function generateKotlinModule(
 
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactMethod${
-    hasAsyncMethod ? '\nimport com.facebook.react.bridge.Promise' : ''
-  }${hasObjectType ? '\nimport com.facebook.react.bridge.ReadableMap' : ''}
+    hasCallbackParam ? '\nimport com.facebook.react.bridge.Callback' : ''
+  }${hasAsyncMethod ? '\nimport com.facebook.react.bridge.Promise' : ''}${hasObjectType ? '\nimport com.facebook.react.bridge.ReadableMap' : ''}
 
 class NativeBrownfieldNavigationModule(
   reactContext: ReactApplicationContext
@@ -115,27 +170,10 @@ function generateSyncKotlinMethod(
 ): string {
   const params = method.params
     .map(
-      (param) =>
-        `${param.name}: ${mapTsTypeToKotlin(param.type, param.optional, options, 'module')}`
+      (param) => `${param.name}: ${mapParamToKotlin(param, options, 'module')}`
     )
     .join(', ');
-  const preparedParams: string[] = [];
-  const args = method.params
-    .map((param) => {
-      if (options.modelTypeNames?.includes(param.type)) {
-        const convertedName = `${param.name}Model`;
-        preparedParams.push(
-          `    val ${convertedName} = ${param.name}${
-            param.optional
-              ? `?.let(::to${param.type})`
-              : `.let(::to${param.type})`
-          }`
-        );
-        return convertedName;
-      }
-      return param.name;
-    })
-    .join(', ');
+  const { preparedParams, args } = prepareKotlinArgs(method, options);
 
   const signature = `  @ReactMethod\n  override fun ${method.name}(${params})${
     method.returnType === 'void'
@@ -161,17 +199,19 @@ function generateAsyncKotlinMethod(
 ): string {
   const paramsWithTypes = method.params
     .map(
-      (param) =>
-        `${param.name}: ${mapTsTypeToKotlin(param.type, param.optional, options, 'module')}`
+      (param) => `${param.name}: ${mapParamToKotlin(param, options, 'module')}`
     )
     .join(', ');
   const params =
     paramsWithTypes.length > 0
       ? `${paramsWithTypes}, promise: Promise`
       : 'promise: Promise';
+  const { preparedParams, args } = prepareKotlinArgs(method, options);
+  const delegateArgs = args.length > 0 ? `${args}, promise` : 'promise';
+  const preparedPrefix = preparedParams.length > 0 ? `${preparedParams.join('\n')}\n` : '';
 
   return `  @ReactMethod
   override fun ${method.name}(${params}) {
-    promise.reject("not_implemented", "${method.name} is not implemented")
+${preparedPrefix}    BrownfieldNavigationManager.getDelegate().${method.name}(${delegateArgs})
   }`;
 }

package/src/navigation/generators/ios.ts

@@ -1,4 +1,4 @@
-import type { MethodSignature } from '../types.js';
+import type { MethodParam, MethodSignature } from '../types.js';
 
 const TS_TO_OBJC_TYPE: Record<string, string> = {
   string: 'NSString *',
@@ -44,6 +44,19 @@ function mapTsTypeToObjC(
   return nullable ? 'id _Nullable' : 'id';
 }
 
+function mapParamToObjC(
+  param: MethodParam,
+  nullable: boolean = false,
+  options: ObjCTypeMappingOptions = {}
+): string {
+  if (param.callback) {
+    return param.optional
+      ? 'RCTResponseSenderBlock _Nullable'
+      : 'RCTResponseSenderBlock';
+  }
+  return mapTsTypeToObjC(param.type, nullable, options);
+}
+
 interface SwiftTypeMappingOptions {
   modelTypeNames?: string[];
 }
@@ -72,22 +85,46 @@ function mapTsTypeToSwift(
   return optional ? 'Any?' : 'Any';
 }
 
+/** ObjC-compatible closures that match RCT typedefs without importing React. */
+const SWIFT_RESPONSE_SENDER_BLOCK = '@escaping ([Any]?) -> Void';
+const SWIFT_OPTIONAL_RESPONSE_SENDER_BLOCK = '(([Any]?) -> Void)?';
+const SWIFT_PROMISE_RESOLVE_BLOCK = '@escaping (Any?) -> Void';
+const SWIFT_PROMISE_REJECT_BLOCK =
+  '@escaping (String?, String?, (any Error)?) -> Void';
+
+function mapParamToSwift(
+  param: MethodParam,
+  options: SwiftTypeMappingOptions = {}
+): string {
+  if (param.callback) {
+    return param.optional
+      ? SWIFT_OPTIONAL_RESPONSE_SENDER_BLOCK
+      : SWIFT_RESPONSE_SENDER_BLOCK;
+  }
+  return mapTsTypeToSwift(param.type, param.optional, options);
+}
+
 export function generateSwiftDelegate(
   methods: MethodSignature[],
   options: SwiftTypeMappingOptions = {}
 ): string {
   const protocolMethods = methods
     .map((method) => {
-      const params = method.params
-        .map((param, index) => {
-          const swiftType = mapTsTypeToSwift(param.type, param.optional, options);
-          const label = index === 0 ? '_' : param.name;
-          return `${label} ${param.name}: ${swiftType}`;
-        })
-        .join(', ');
+      const methodParams = method.params.map((param, index) => {
+        const swiftType = mapParamToSwift(param, options);
+        const label = index === 0 ? '_' : param.name;
+        return `${label} ${param.name}: ${swiftType}`;
+      });
+      const promiseParams = method.isAsync
+        ? [
+            `${methodParams.length === 0 ? '_ resolve' : 'resolve'}: ${SWIFT_PROMISE_RESOLVE_BLOCK}`,
+            `reject: ${SWIFT_PROMISE_REJECT_BLOCK}`,
+          ]
+        : [];
+      const params = [...methodParams, ...promiseParams].join(', ');
 
       const returnType =
-        method.returnType === 'void'
+        method.returnType === 'void' || method.isAsync
           ? ''
           : ` -> ${mapTsTypeToSwift(method.returnType, false, options)}`;
 
@@ -142,25 +179,13 @@ ${methodImplementations}
 `;
 }
 
-function generateSyncObjCMethod(
+function prepareObjCArgs(
   method: MethodSignature,
   options: ObjCGenerationOptions
-): string {
-  const { name, params, returnType } = method;
-
-  let signature = `- (${mapTsTypeToObjC(returnType, false, options)})${name}`;
-  if (params.length > 0) {
-    signature += params
-      .map((param, index) => {
-        const prefix = index === 0 ? ':' : ` ${param.name}:`;
-        return `${prefix}(${mapTsTypeToObjC(param.type, param.optional, options)})${param.name}`;
-      })
-      .join('');
-  }
-
+): { preparedParams: string[]; delegateArgs: string[] } {
   const preparedParams: string[] = [];
   const delegateArgs: string[] = [];
-  for (const param of params) {
+  for (const param of method.params) {
     if (options.modelTypeNames?.includes(param.type)) {
       const convertedParamName = `${param.name}Model`;
       preparedParams.push(
@@ -171,7 +196,14 @@ function generateSyncObjCMethod(
       delegateArgs.push(param.name);
     }
   }
+  return { preparedParams, delegateArgs };
+}
 
+function buildObjCDelegateCall(
+  name: string,
+  params: Array<{ name: string; type: string; optional: boolean }>,
+  delegateArgs: string[]
+): string {
   let delegateCall = `[[[BrownfieldNavigationManager shared] getDelegate] ${name}`;
   if (delegateArgs.length > 0) {
     delegateCall += delegateArgs
@@ -183,6 +215,27 @@ function generateSyncObjCMethod(
       .join(' ');
   }
   delegateCall += ']';
+  return delegateCall;
+}
+
+function generateSyncObjCMethod(
+  method: MethodSignature,
+  options: ObjCGenerationOptions
+): string {
+  const { name, params, returnType } = method;
+
+  let signature = `- (${mapTsTypeToObjC(returnType, false, options)})${name}`;
+  if (params.length > 0) {
+    signature += params
+      .map((param, index) => {
+        const prefix = index === 0 ? ':' : ` ${param.name}:`;
+        return `${prefix}(${mapParamToObjC(param, param.optional, options)})${param.name}`;
+      })
+      .join('');
+  }
+
+  const { preparedParams, delegateArgs } = prepareObjCArgs(method, options);
+  const delegateCall = buildObjCDelegateCall(name, params, delegateArgs);
 
   const returnPrefix = returnType === 'void' ? '' : 'return ';
   const preparedLines = preparedParams.map((line) => `    ${line}`).join('\n');
@@ -200,27 +253,33 @@ function generateAsyncObjCMethod(
   const { name, params } = method;
 
   let signature = `- (void)${name}`;
-  const allParams: Array<{ name: string; type: string; optional: boolean }> = [
-    ...params,
+  const promiseParams: Array<{ name: string; type: string; optional: boolean }> = [
     { name: 'resolve', type: 'RCTPromiseResolveBlock', optional: false },
     { name: 'reject', type: 'RCTPromiseRejectBlock', optional: false },
   ];
+  const allParams = [...params, ...promiseParams];
 
   signature += ':';
   signature += allParams
     .map((param, index) => {
-      const prefix = index === 0 ? '' : param.name;
+      const prefix = index === 0 ? '' : `${param.name}:`;
       const type =
         param.type === 'RCTPromiseResolveBlock'
           ? 'RCTPromiseResolveBlock'
           : param.type === 'RCTPromiseRejectBlock'
             ? 'RCTPromiseRejectBlock'
-            : mapTsTypeToObjC(param.type, param.optional, options);
+            : mapParamToObjC(param, param.optional, options);
       return `${prefix}(${type})${param.name}`;
     })
     .join(' ');
 
+  const { preparedParams, delegateArgs } = prepareObjCArgs(method, options);
+  const asyncDelegateArgs = [...delegateArgs, 'resolve', 'reject'];
+  const delegateCall = buildObjCDelegateCall(name, allParams, asyncDelegateArgs);
+  const preparedLines = preparedParams.map((line) => `    ${line}`).join('\n');
+  const bodyPrefix = preparedLines.length > 0 ? `${preparedLines}\n` : '';
+
   return `${signature} {
-    reject(@"not_implemented", @"${name} is not implemented", nil);
+${bodyPrefix}    ${delegateCall};
 }`;
 }

package/src/navigation/parser.ts

@@ -2,6 +2,7 @@ import fs from 'node:fs';
 import { Project } from 'ts-morph';
 
 import type {
+  CallbackSignature,
   ModelDefinition,
   ModelFieldDefinition,
   MethodParam,
@@ -10,6 +11,7 @@ import type {
   TypeDeclaration,
 } from './types.js';
 import { Node } from 'ts-morph';
+import type { TypeNode } from 'ts-morph';
 
 const SKIP_TYPE_TOKENS = new Set([
   'Array',
@@ -42,6 +44,60 @@ function collectReferencedTypesFromText(typeText: string): string[] {
   return matches.filter((match) => !SKIP_TYPE_TOKENS.has(match));
 }
 
+function getPromiseInnerType(typeText: string): string | undefined {
+  return typeText.startsWith('Promise<') && typeText.endsWith('>')
+    ? typeText.slice(8, -1)
+    : undefined;
+}
+
+function parseCallbackSignature(
+  typeNode: TypeNode | undefined
+): CallbackSignature | undefined {
+  if (!typeNode || !Node.isFunctionTypeNode(typeNode)) {
+    return undefined;
+  }
+
+  return {
+    params: typeNode.getParameters().map((param) => ({
+      name: param.getName(),
+      type: param.getTypeNode()?.getText() ?? 'unknown',
+      optional: param.isOptional(),
+    })),
+    returnType: typeNode.getReturnTypeNode()?.getText() ?? 'void',
+  };
+}
+
+const RESERVED_ASYNC_PARAM_NAMES = new Set(['promise', 'resolve', 'reject']);
+
+function validateMethodSignature(method: MethodSignature): void {
+  for (const param of method.params) {
+    if (getPromiseInnerType(param.type)) {
+      throw new Error(
+        `Unsupported Promise parameter "${param.name}" in method "${method.name}": Promise<T> is only supported as a method return type.`
+      );
+    }
+
+    if (
+      method.isAsync &&
+      RESERVED_ASYNC_PARAM_NAMES.has(param.name)
+    ) {
+      throw new Error(
+        `Reserved parameter name "${param.name}" in async method "${method.name}": this name is used by the generated bridging code. Rename the parameter.`
+      );
+    }
+
+    if (!param.callback) {
+      continue;
+    }
+
+    if (param.callback.returnType !== 'void') {
+      throw new Error(
+        `Unsupported callback parameter "${param.name}" in method "${method.name}": callback return type "${param.callback.returnType}" is not supported. Use a void callback or model the result as a Promise-returning navigation method.`
+      );
+    }
+  }
+}
+
 export function parseNavigationSpec(specPath: string): ParsedNavigationSpec {
   if (!fs.existsSync(specPath)) {
     throw new Error(`Spec file not found: ${specPath}`);
@@ -63,21 +119,32 @@ export function parseNavigationSpec(specPath: string): ParsedNavigationSpec {
     const name = method.getName();
     const params: MethodParam[] = method.getParameters().map((param) => {
       const typeNode = param.getTypeNode();
-      return {
+      const callback = parseCallbackSignature(typeNode);
+      const methodParam: MethodParam = {
         name: param.getName(),
         type: typeNode?.getText() ?? 'unknown',
         optional: param.isOptional(),
       };
+      if (callback) {
+        methodParam.callback = callback;
+      }
+      return methodParam;
     });
     const returnTypeNode = method.getReturnTypeNode();
     const returnType = returnTypeNode?.getText() ?? 'void';
+    const promiseReturnType = getPromiseInnerType(returnType);
 
-    return {
+    const methodSignature: MethodSignature = {
       name,
       params,
       returnType,
-      isAsync: returnType.startsWith('Promise<'),
+      isAsync: Boolean(promiseReturnType),
     };
+    if (promiseReturnType) {
+      methodSignature.promiseReturnType = promiseReturnType;
+    }
+    validateMethodSignature(methodSignature);
+    return methodSignature;
   });
 
   const declarationNodes = [

package/src/navigation/types.ts

@@ -1,7 +1,19 @@
+export interface CallbackParam {
+  name: string;
+  type: string;
+  optional: boolean;
+}
+
+export interface CallbackSignature {
+  params: CallbackParam[];
+  returnType: string;
+}
+
 export interface MethodParam {
   name: string;
   type: string;
   optional: boolean;
+  callback?: CallbackSignature;
 }
 
 export interface MethodSignature {
@@ -9,6 +21,7 @@ export interface MethodSignature {
   params: MethodParam[];
   returnType: string;
   isAsync: boolean;
+  promiseReturnType?: string;
 }
 
 export interface TypeDeclaration {

package/src/types.ts

@@ -56,6 +56,16 @@ export type BrownfieldExpoAndroidConfig = {
    */
   packageName?: string;
 
+  /**
+   * Toggle minification for the generated Android library.
+   */
+  minifyEnabled?: boolean;
+
+  /**
+   * Extra Proguard rules appended to the default rules.
+   */
+  extraProguardRules?: string[];
+
   /**
    * Minimum SDK version for the Android library.
    */