@rock-js/plugin-brownfield-android 0.12.4 → 0.12.5

package/dist/src/index.d.ts

@@ -1 +1,2 @@
 export * from './lib/pluginBrownfieldAndroid.js';
+//# sourceMappingURL=index.d.ts.map

package/dist/src/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,kCAAkC,CAAC"}

package/dist/src/lib/pluginBrownfieldAndroid.d.ts

@@ -1,3 +1,15 @@
 import type { AndroidProjectConfig } from '@react-native-community/cli-types';
 import type { PluginApi, PluginOutput } from '@rock-js/config';
+export declare const packageAarAction: ({ variant, moduleName, projectRoot, pluginConfig, }: {
+    variant: string;
+    moduleName: string | undefined;
+    projectRoot: string;
+    pluginConfig?: AndroidProjectConfig;
+}) => Promise<void>;
+export declare const publishLocalAarAction: ({ moduleName, projectRoot, pluginConfig, }: {
+    moduleName: string | undefined;
+    projectRoot: string;
+    pluginConfig?: AndroidProjectConfig;
+}) => Promise<void>;
 export declare const pluginBrownfieldAndroid: (pluginConfig?: AndroidProjectConfig) => (api: PluginApi) => PluginOutput;
+//# sourceMappingURL=pluginBrownfieldAndroid.d.ts.map

package/dist/src/lib/pluginBrownfieldAndroid.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"pluginBrownfieldAndroid.d.ts","sourceRoot":"","sources":["../../../src/lib/pluginBrownfieldAndroid.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAC9E,OAAO,KAAK,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAsB/D,eAAO,MAAM,gBAAgB,GAAU,qDAKpC;IACD,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,oBAAoB,CAAC;CACrC,kBAWA,CAAC;AAEF,eAAO,MAAM,qBAAqB,GAAU,4CAIzC;IACD,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,oBAAoB,CAAC;CACrC,kBAWA,CAAC;AAEF,eAAO,MAAM,uBAAuB,GACjC,eAAe,oBAAoB,MACnC,KAAK,SAAS,KAAG,YAiCjB,CAAC"}

package/dist/src/lib/pluginBrownfieldAndroid.js

@@ -1,28 +1,46 @@
 import { projectConfig } from '@react-native-community/cli-config-android';
 import { packageAar, packageAarOptions, publishLocalAar, publishLocalAarOptions, } from '@rock-js/platform-android';
 import { intro, RockError } from '@rock-js/tools';
-const getAarConfig = (args, androidConfig) => {
+const getAarConfig = (moduleName, androidConfig) => {
     const config = {
         sourceDir: androidConfig.sourceDir,
-        moduleName: args.moduleName ?? '',
+        moduleName: moduleName ?? '',
     };
     return config;
 };
+export const packageAarAction = async ({ variant, moduleName, projectRoot, pluginConfig, }) => {
+    intro('Creating an AAR file');
+    const androidConfig = projectConfig(projectRoot, pluginConfig);
+    if (androidConfig) {
+        const config = getAarConfig(moduleName, androidConfig);
+        await packageAar(config, variant);
+    }
+    else {
+        throw new RockError('Android project not found.');
+    }
+};
+export const publishLocalAarAction = async ({ moduleName, projectRoot, pluginConfig, }) => {
+    intro('Publishing AAR');
+    const androidConfig = projectConfig(projectRoot, pluginConfig);
+    if (androidConfig) {
+        const config = getAarConfig(moduleName, androidConfig);
+        await publishLocalAar(config);
+    }
+    else {
+        throw new RockError('Android project not found.');
+    }
+};
 export const pluginBrownfieldAndroid = (pluginConfig) => (api) => {
-    const projectRoot = api.getProjectRoot();
     api.registerCommand({
         name: 'package:aar',
         description: 'Produces an AAR file suitable for including React Native app in native projects.',
-        action: async (args) => {
-            intro('Creating an AAR file');
-            const androidConfig = projectConfig(projectRoot, pluginConfig);
-            if (androidConfig) {
-                const config = getAarConfig(args, androidConfig);
-                await packageAar(config, args);
-            }
-            else {
-                throw new RockError('Android project not found.');
-            }
+        action: (args) => {
+            return packageAarAction({
+                variant: args.variant,
+                moduleName: args.moduleName,
+                projectRoot: api.getProjectRoot(),
+                pluginConfig,
+            });
         },
         options: packageAarOptions,
     });
@@ -30,15 +48,11 @@ export const pluginBrownfieldAndroid = (pluginConfig) => (api) => {
         name: 'publish-local:aar',
         description: 'Publishes a AAR to local maven repo',
         action: async (args) => {
-            intro('Publishing AAR');
-            const androidConfig = projectConfig(projectRoot, pluginConfig);
-            if (androidConfig) {
-                const config = getAarConfig(args, androidConfig);
-                await publishLocalAar(config);
-            }
-            else {
-                throw new RockError('Android project not found.');
-            }
+            return publishLocalAarAction({
+                moduleName: args.moduleName,
+                projectRoot: api.getProjectRoot(),
+                pluginConfig,
+            });
         },
         options: publishLocalAarOptions,
     });

package/dist/src/lib/pluginBrownfieldAndroid.js.map

@@ -1 +1 @@
-{"version":3,"file":"pluginBrownfieldAndroid.js","sourceRoot":"","sources":["../../../src/lib/pluginBrownfieldAndroid.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,4CAA4C,CAAC;AAG3E,OAAO,EACL,UAAU,EAEV,iBAAiB,EACjB,eAAe,EACf,sBAAsB,GACvB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAElD,MAAM,YAAY,GAAG,CACnB,IAAqB,EACrB,aAAmC,EACnC,EAAE;IACF,MAAM,MAAM,GAAG;QACb,SAAS,EAAE,aAAa,CAAC,SAAS;QAClC,UAAU,EAAE,IAAI,CAAC,UAAU,IAAI,EAAE;KAClC,CAAC;IACF,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AACF,MAAM,CAAC,MAAM,uBAAuB,GAClC,CAAC,YAAmC,EAAE,EAAE,CACxC,CAAC,GAAc,EAAgB,EAAE;IAC/B,MAAM,WAAW,GAAG,GAAG,CAAC,cAAc,EAAE,CAAC;IAEzC,GAAG,CAAC,eAAe,CAAC;QAClB,IAAI,EAAE,aAAa;QACnB,WAAW,EACT,kFAAkF;QACpF,MAAM,EAAE,KAAK,EAAE,IAAqB,EAAE,EAAE;YACtC,KAAK,CAAC,sBAAsB,CAAC,CAAC;YAE9B,MAAM,aAAa,GAAG,aAAa,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;YAE/D,IAAI,aAAa,EAAE,CAAC;gBAClB,MAAM,MAAM,GAAG,YAAY,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;gBACjD,MAAM,UAAU,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;YACjC,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,SAAS,CAAC,4BAA4B,CAAC,CAAC;YACpD,CAAC;QACH,CAAC;QACD,OAAO,EAAE,iBAAiB;KAC3B,CAAC,CAAC;IAEH,GAAG,CAAC,eAAe,CAAC;QAClB,IAAI,EAAE,mBAAmB;QACzB,WAAW,EAAE,qCAAqC;QAClD,MAAM,EAAE,KAAK,EAAE,IAAqB,EAAE,EAAE;YACtC,KAAK,CAAC,gBAAgB,CAAC,CAAC;YAExB,MAAM,aAAa,GAAG,aAAa,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;YAE/D,IAAI,aAAa,EAAE,CAAC;gBAClB,MAAM,MAAM,GAAG,YAAY,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;gBACjD,MAAM,eAAe,CAAC,MAAM,CAAC,CAAC;YAChC,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,SAAS,CAAC,4BAA4B,CAAC,CAAC;YACpD,CAAC;QACH,CAAC;QACD,OAAO,EAAE,sBAAsB;KAChC,CAAC,CAAC;IAEH,OAAO;QACL,IAAI,EAAE,2BAA2B;QACjC,WAAW,EAAE,qCAAqC;KACnD,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"pluginBrownfieldAndroid.js","sourceRoot":"","sources":["../../../src/lib/pluginBrownfieldAndroid.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,4CAA4C,CAAC;AAG3E,OAAO,EACL,UAAU,EAEV,iBAAiB,EACjB,eAAe,EAEf,sBAAsB,GACvB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAElD,MAAM,YAAY,GAAG,CACnB,UAA8B,EAC9B,aAAmC,EACnC,EAAE;IACF,MAAM,MAAM,GAAG;QACb,SAAS,EAAE,aAAa,CAAC,SAAS;QAClC,UAAU,EAAE,UAAU,IAAI,EAAE;KAC7B,CAAC;IACF,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,EAAE,EACrC,OAAO,EACP,UAAU,EACV,WAAW,EACX,YAAY,GAMb,EAAE,EAAE;IACH,KAAK,CAAC,sBAAsB,CAAC,CAAC;IAE9B,MAAM,aAAa,GAAG,aAAa,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;IAE/D,IAAI,aAAa,EAAE,CAAC;QAClB,MAAM,MAAM,GAAG,YAAY,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;QACvD,MAAM,UAAU,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACpC,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,SAAS,CAAC,4BAA4B,CAAC,CAAC;IACpD,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,qBAAqB,GAAG,KAAK,EAAE,EAC1C,UAAU,EACV,WAAW,EACX,YAAY,GAKb,EAAE,EAAE;IACH,KAAK,CAAC,gBAAgB,CAAC,CAAC;IAExB,MAAM,aAAa,GAAG,aAAa,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;IAE/D,IAAI,aAAa,EAAE,CAAC;QAClB,MAAM,MAAM,GAAG,YAAY,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;QACvD,MAAM,eAAe,CAAC,MAAM,CAAC,CAAC;IAChC,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,SAAS,CAAC,4BAA4B,CAAC,CAAC;IACpD,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,uBAAuB,GAClC,CAAC,YAAmC,EAAE,EAAE,CACxC,CAAC,GAAc,EAAgB,EAAE;IAC/B,GAAG,CAAC,eAAe,CAAC;QAClB,IAAI,EAAE,aAAa;QACnB,WAAW,EACT,kFAAkF;QACpF,MAAM,EAAE,CAAC,IAAqB,EAAE,EAAE;YAChC,OAAO,gBAAgB,CAAC;gBACtB,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,WAAW,EAAE,GAAG,CAAC,cAAc,EAAE;gBACjC,YAAY;aACb,CAAC,CAAC;QACL,CAAC;QACD,OAAO,EAAE,iBAAiB;KAC3B,CAAC,CAAC;IAEH,GAAG,CAAC,eAAe,CAAC;QAClB,IAAI,EAAE,mBAAmB;QACzB,WAAW,EAAE,qCAAqC;QAClD,MAAM,EAAE,KAAK,EAAE,IAA0B,EAAE,EAAE;YAC3C,OAAO,qBAAqB,CAAC;gBAC3B,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,WAAW,EAAE,GAAG,CAAC,cAAc,EAAE;gBACjC,YAAY;aACb,CAAC,CAAC;QACL,CAAC;QACD,OAAO,EAAE,sBAAsB;KAChC,CAAC,CAAC;IAEH,OAAO;QACL,IAAI,EAAE,2BAA2B;QACjC,WAAW,EAAE,qCAAqC;KACnD,CAAC;AACJ,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rock-js/plugin-brownfield-android",
-  "version": "0.12.4",
+  "version": "0.12.5",
   "description": "Plugin for integrating Rock projects with existing Android apps",
   "type": "module",
   "types": "./dist/src/index.d.ts",
@@ -20,13 +20,13 @@
     "publish:verdaccio": "npm publish --registry http://localhost:4873 --userconfig ../../.npmrc"
   },
   "dependencies": {
-    "@rock-js/tools": "^0.12.4",
-    "@rock-js/platform-android": "^0.12.4",
+    "@rock-js/tools": "^0.12.5",
+    "@rock-js/platform-android": "^0.12.5",
     "@react-native-community/cli-config-android": "^20.0.0",
     "tslib": "^2.3.0"
   },
   "devDependencies": {
-    "@rock-js/config": "^0.12.4",
+    "@rock-js/config": "^0.12.5",
     "@react-native-community/cli-types": "^20.0.0"
   },
   "publishConfig": {

package/src/lib/pluginBrownfieldAndroid.ts

@@ -6,40 +6,80 @@ import {
   type PackageAarFlags,
   packageAarOptions,
   publishLocalAar,
+  type PublishLocalAarFlags,
   publishLocalAarOptions,
 } from '@rock-js/platform-android';
 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 packageAarAction = async ({
+  variant,
+  moduleName,
+  projectRoot,
+  pluginConfig,
+}: {
+  variant: string;
+  moduleName: string | undefined;
+  projectRoot: string;
+  pluginConfig?: AndroidProjectConfig;
+}) => {
+  intro('Creating an AAR file');
+
+  const androidConfig = projectConfig(projectRoot, pluginConfig);
+
+  if (androidConfig) {
+    const config = getAarConfig(moduleName, androidConfig);
+    await packageAar(config, variant);
+  } else {
+    throw new RockError('Android project not found.');
+  }
+};
+
+export const publishLocalAarAction = async ({
+  moduleName,
+  projectRoot,
+  pluginConfig,
+}: {
+  moduleName: string | undefined;
+  projectRoot: string;
+  pluginConfig?: AndroidProjectConfig;
+}) => {
+  intro('Publishing AAR');
+
+  const androidConfig = projectConfig(projectRoot, pluginConfig);
+
+  if (androidConfig) {
+    const config = getAarConfig(moduleName, androidConfig);
+    await publishLocalAar(config);
+  } else {
+    throw new RockError('Android project not found.');
+  }
+};
+
 export const pluginBrownfieldAndroid =
   (pluginConfig?: AndroidProjectConfig) =>
   (api: PluginApi): PluginOutput => {
-    const projectRoot = api.getProjectRoot();
-
     api.registerCommand({
       name: 'package:aar',
       description:
         'Produces an AAR file suitable for including React Native app in native projects.',
-      action: async (args: PackageAarFlags) => {
-        intro('Creating an AAR file');
-
-        const androidConfig = projectConfig(projectRoot, pluginConfig);
-
-        if (androidConfig) {
-          const config = getAarConfig(args, androidConfig);
-          await packageAar(config, args);
-        } else {
-          throw new RockError('Android project not found.');
-        }
+      action: (args: PackageAarFlags) => {
+        return packageAarAction({
+          variant: args.variant,
+          moduleName: args.moduleName,
+          projectRoot: api.getProjectRoot(),
+          pluginConfig,
+        });
       },
       options: packageAarOptions,
     });
@@ -47,17 +87,12 @@ export const pluginBrownfieldAndroid =
     api.registerCommand({
       name: 'publish-local:aar',
       description: 'Publishes a AAR to local maven repo',
-      action: async (args: PackageAarFlags) => {
-        intro('Publishing AAR');
-
-        const androidConfig = projectConfig(projectRoot, pluginConfig);
-
-        if (androidConfig) {
-          const config = getAarConfig(args, androidConfig);
-          await publishLocalAar(config);
-        } else {
-          throw new RockError('Android project not found.');
-        }
+      action: async (args: PublishLocalAarFlags) => {
+        return publishLocalAarAction({
+          moduleName: args.moduleName,
+          projectRoot: api.getProjectRoot(),
+          pluginConfig,
+        });
       },
       options: publishLocalAarOptions,
     });

package/template/package.json

@@ -8,6 +8,6 @@
     "@callstack/react-native-brownfield": "^2.0.0"
   },
   "devDependencies": {
-    "@rock-js/plugin-brownfield-android": "^0.12.4"
+    "@rock-js/plugin-brownfield-android": "^0.12.5"
   }
 }