fix(cli): do not generate icons for platforms not in config.xml (#103)

Author: Lindsor

src/__tests__/cli.ts

@@ -1,5 +1,7 @@
+import * as et from 'elementtree';
+
 import { Options } from '..';
-import { generateRunOptions, parseOptions } from '../cli';
+import { generateRunOptions, parseOptions, resolveOptions } from '../cli';
 import { Platform } from '../platform';
 
 function generatePlatformsConfig(resourcesDirectory: string) {
@@ -174,6 +176,54 @@ describe('cordova-res', () => {
 
     });
 
+    describe('resolveOptions', () => {
+
+      it('should pull platforms from config.xml if none provided', async () => {
+
+        const configXml: et.Element = et.Element('widget');
+        configXml.append(et.Element('platform', { name: 'android' }));
+        configXml.append(et.Element('platform', { name: 'ios' }));
+
+        const options: Options = await resolveOptions([], 'resources', new et.ElementTree(configXml));
+
+        expect(options.platforms).toEqual({
+          ...generatePlatformsConfig('resources'),
+          windows: undefined,
+        });
+      });
+
+      it('should use runtime platform if provided', async () => {
+
+        const configXml: et.Element = et.Element('widget');
+        configXml.append(et.Element('platform', { name: 'android' }));
+        configXml.append(et.Element('platform', { name: 'ios' }));
+
+        const options: Options = await resolveOptions(['android'], 'resources', new et.ElementTree(configXml));
+
+        expect(options.platforms).toEqual({
+          ...generatePlatformsConfig('resources'),
+          windows: undefined,
+          ios: undefined,
+        });
+      });
+
+      it('should generate for all platforms if no config.xml and no runtime platform', async () => {
+
+        const configXml: et.Element = et.Element('widget');
+        configXml.append(et.Element('platform', { name: 'android' }));
+        configXml.append(et.Element('platform', { name: 'ios' }));
+
+        const options: Options = await resolveOptions(['android'], 'resources', new et.ElementTree(configXml));
+
+        expect(options.platforms).toEqual({
+          ...generatePlatformsConfig('resources'),
+          windows: undefined,
+          ios: undefined,
+        });
+      });
+
+    });
+
   });
 
 });

src/cli.ts

@@ -17,17 +17,21 @@ export async function resolveOptions(args: readonly string[], directory: string,
   const platformList = filterSupportedPlatforms(doc ? getPlatforms(doc) : []);
   const parsedOptions = parseOptions(args);
   const { resourcesDirectory = DEFAULT_RESOURCES_DIRECTORY } = parsedOptions;
+  const platformOption = parsePlatformOption(args);
 
   return {
-    ...{ directory, ...platformList.length > 0 ? { platforms: generatePlatformOptions(platformList, resourcesDirectory, args) } : {} },
-    ...parsedOptions,
+  ...{
+      directory,
+      ...parsedOptions,
+      platforms: platformOption ? parsedOptions.platforms : generatePlatformOptions(platformList, resourcesDirectory, args),
+    },
   };
 }
 
 export function parseOptions(args: readonly string[]): Required<Options> {
   const json = args.includes('--json');
   const resourcesDirectory = getOptionValue(args, '--resources', DEFAULT_RESOURCES_DIRECTORY);
-  const platformArg = args[0] ? args[0] : undefined;
+  const platformArg = parsePlatformOption(args);
   const platformList = validatePlatforms(platformArg && !platformArg.startsWith('-') ? [platformArg] : PLATFORMS);
 
   return {
@@ -42,6 +46,10 @@ export function parseOptions(args: readonly string[]): Required<Options> {
   };
 }
 
+export function parsePlatformOption(args: readonly string[]): string | undefined {
+  return args[0] ? args[0] : undefined;
+}
+
 export function generatePlatformOptions(platforms: readonly Platform[], resourcesDirectory: string, args: readonly string[]): PlatformOptions {
   return platforms.reduce((acc, platform) => {
     acc[platform] = generateRunOptions(platform, resourcesDirectory, args);