refactor fn signatures to be more explicit instead of using api

Author: thymikee

packages/platform-android/src/lib/commands/aar/packageAar.ts

@@ -13,35 +13,24 @@ export type PackageAarFlags = {
   moduleName?: string;
 };
 
-export async function packageAar(
-  aarProject: AarProject,
-  args: PackageAarFlags,
-) {
-  normalizeArgs(args);
+export async function packageAar(aarProject: AarProject, variant: string) {
+  normalizeVariant(variant);
+  const tasks = [`assemble${toPascalCase(variant)}`];
 
-  const tasks = [`assemble${toPascalCase(args.variant)}`];
-
-  await runGradleAar({ tasks, aarProject, variant: args.variant });
+  await runGradleAar({ tasks, aarProject, variant });
   outro('Success 🎉.');
 }
 
-export async function localPublishAar(
-  aarProject: AarProject,
-  args: PackageAarFlags,
-) {
+export async function localPublishAar(aarProject: AarProject, variant: string) {
   const tasks = ['publishToMavenLocal'];
 
-  await runGradleAar({
-    tasks,
-    aarProject,
-    variant: args.variant,
-  });
+  await runGradleAar({ tasks, aarProject, variant });
   outro('Success 🎉.');
 }
 
-function normalizeArgs(args: PackageAarFlags) {
-  if (!args.variant) {
-    args.variant = 'debug';
+function normalizeVariant(variant: string) {
+  if (!variant) {
+    variant = 'debug';
   }
 }
 

packages/platform-ios/src/lib/commands/signIos.ts

@@ -1,6 +1,6 @@
 import type { PluginApi } from '@rock-js/config';
 import { modifyApp, modifyIpa } from '@rock-js/platform-apple-helpers';
-import type { RockCLIOptions } from 'packages/tools/dist/src/index.js';
+import type { RockCLIOptions } from '@rock-js/tools';
 
 export type SignFlags = {
   app: string;

packages/plugin-brownfield-android/src/lib/pluginBrownfieldAndroid.ts

@@ -11,44 +11,54 @@ import {
 import { intro, RockError } from '@rock-js/tools';
 
 const getAarConfig = (
-  args: PackageAarFlags,
+  moduleName: string | undefined,
   androidConfig: AndroidProjectConfig,
 ) => {
   const config = {
     sourceDir: androidConfig.sourceDir,
-    moduleName: args.moduleName ?? '',
+    moduleName: moduleName ?? '',
   };
   return config;
 };
 
-export const pluginBrownfieldAndroidPackageAction = async (
-  args: PackageAarFlags,
-  apiSubset: Pick<PluginApi, 'getProjectRoot'>,
-  pluginConfig?: AndroidProjectConfig,
-) => {
+export const packageAarAction = async ({
+  variant,
+  moduleName,
+  projectRoot,
+  pluginConfig,
+}: {
+  variant: string;
+  moduleName: string | undefined;
+  projectRoot: string;
+  pluginConfig?: AndroidProjectConfig;
+}) => {
   intro('Creating an AAR file');
 
-  const androidConfig = projectConfig(apiSubset.getProjectRoot(), pluginConfig);
+  const androidConfig = projectConfig(projectRoot, pluginConfig);
 
   if (androidConfig) {
-    const config = getAarConfig(args, androidConfig);
-    await packageAar(config, args);
+    const config = getAarConfig(moduleName, androidConfig);
+    await packageAar(config, variant);
   } else {
     throw new RockError('Android project not found.');
   }
 };
 
-export const pluginBrownfieldAndroidPublishAction = async (
-  args: PackageAarFlags,
-  apiSubset: Pick<PluginApi, 'getProjectRoot'>,
-  pluginConfig?: AndroidProjectConfig,
-) => {
+export const publishLocalAarAction = async ({
+  moduleName,
+  projectRoot,
+  pluginConfig,
+}: {
+  moduleName: string | undefined;
+  projectRoot: string;
+  pluginConfig?: AndroidProjectConfig;
+}) => {
   intro('Publishing AAR');
 
-  const androidConfig = projectConfig(apiSubset.getProjectRoot(), pluginConfig);
+  const androidConfig = projectConfig(projectRoot, pluginConfig);
 
   if (androidConfig) {
-    const config = getAarConfig(args, androidConfig);
+    const config = getAarConfig(moduleName, androidConfig);
     await publishLocalAar(config);
   } else {
     throw new RockError('Android project not found.');
@@ -62,16 +72,27 @@ export const pluginBrownfieldAndroid =
       name: 'package:aar',
       description:
         'Produces an AAR file suitable for including React Native app in native projects.',
-      action: (args: PackageAarFlags) =>
-        pluginBrownfieldAndroidPackageAction(args, api, pluginConfig),
+      action: (args: PackageAarFlags) => {
+        return packageAarAction({
+          variant: args.variant,
+          moduleName: args.moduleName,
+          projectRoot: api.getProjectRoot(),
+          pluginConfig,
+        });
+      },
       options: packageAarOptions,
     });
 
     api.registerCommand({
       name: 'publish-local:aar',
       description: 'Publishes a AAR to local maven repo',
-      action: async (args: PackageAarFlags) =>
-        pluginBrownfieldAndroidPublishAction(args, api, pluginConfig),
+      action: async (args: PackageAarFlags) => {
+        return publishLocalAarAction({
+          moduleName: args.moduleName,
+          projectRoot: api.getProjectRoot(),
+          pluginConfig,
+        });
+      },
       options: publishLocalAarOptions,
     });
 

packages/plugin-brownfield-ios/src/lib/pluginBrownfieldIos.ts

@@ -10,28 +10,34 @@ import {
   getValidProjectConfig,
   mergeFrameworks,
 } from '@rock-js/platform-apple-helpers';
+import type { FingerprintSources, RemoteBuildCache } from '@rock-js/tools';
 import { colorLink, intro, logger, outro, relativeToCwd } from '@rock-js/tools';
 import { copyHermesXcframework } from './copyHermesXcframework.js';
 
 const buildOptions = getBuildOptions({ platformName: 'ios' });
 
-export const pluginBrownfieldIosPackageAction = async (
+export const packageIosAction = async (
   args: BuildFlags,
-  apiSubset: Pick<
-    PluginApi,
-    | 'getReactNativeVersion'
-    | 'getProjectRoot'
-    | 'getReactNativePath'
-    | 'getFingerprintOptions'
-    | 'getRemoteCacheProvider'
-    | 'getUsePrebuiltRNCore'
-  >,
+  {
+    projectRoot,
+    reactNativePath,
+    reactNativeVersion,
+    fingerprintOptions,
+    remoteCacheProvider,
+    usePrebuiltRNCore,
+  }: {
+    projectRoot: string;
+    reactNativePath: string;
+    reactNativeVersion: string;
+    fingerprintOptions: FingerprintSources;
+    remoteCacheProvider: null | (() => RemoteBuildCache) | undefined;
+    usePrebuiltRNCore: number | undefined;
+  },
   pluginConfig?: IOSProjectConfig,
 ) => {
   intro('Packaging iOS project');
 
   // 1) Build the project
-  const projectRoot = apiSubset.getProjectRoot();
   const iosConfig = getValidProjectConfig('ios', projectRoot, pluginConfig);
   const { derivedDataDir } = getBuildPaths('ios');
 
@@ -50,11 +56,11 @@ export const pluginBrownfieldIosPackageAction = async (
     projectConfig: iosConfig,
     args: { ...args, destination, buildFolder },
     projectRoot,
-    reactNativePath: apiSubset.getReactNativePath(),
-    fingerprintOptions: apiSubset.getFingerprintOptions(),
+    reactNativePath,
+    fingerprintOptions,
     brownfield: true,
-    remoteCacheProvider: await apiSubset.getRemoteCacheProvider(),
-    usePrebuiltRNCore: apiSubset.getUsePrebuiltRNCore(),
+    remoteCacheProvider,
+    usePrebuiltRNCore,
   });
 
   // 2) Merge the .framework outputs of the framework target
@@ -105,7 +111,7 @@ export const pluginBrownfieldIosPackageAction = async (
   copyHermesXcframework({
     sourceDir,
     destinationDir: frameworkTargetOutputDir,
-    reactNativeVersion: apiSubset.getReactNativeVersion(),
+    reactNativeVersion,
   });
 
   // 5) Inform the user
@@ -124,8 +130,19 @@ export const pluginBrownfieldIos =
     api.registerCommand({
       name: 'package:ios',
       description: 'Emit a .xcframework file from React Native code.',
-      action: (args: BuildFlags) =>
-        pluginBrownfieldIosPackageAction(args, api, pluginConfig),
+      action: async (args: BuildFlags) =>
+        packageIosAction(
+          args,
+          {
+            projectRoot: api.getProjectRoot(),
+            reactNativePath: api.getReactNativePath(),
+            reactNativeVersion: api.getReactNativeVersion(),
+            fingerprintOptions: api.getFingerprintOptions(),
+            remoteCacheProvider: await api.getRemoteCacheProvider(),
+            usePrebuiltRNCore: api.getUsePrebuiltRNCore(),
+          },
+          pluginConfig,
+        ),
       options: buildOptions,
     });