Revert "fix: make 'android-lang' optional, with java as default (#149)" (#150)

This reverts commit c2274d0.

Author: markemer

README.md

@@ -30,5 +30,5 @@ As of the `0.8.0` release, example apps for testing are included when initializi
 --author <author> ......... Author name and email (e.g. "Name <name@example.com>")
 --license <id> ............ SPDX License ID (e.g. "MIT")
 --description <text> ...... Short description of plugin features
---android-lang <text> ..... Language for Android plugin development (either "kotlin" or "java", default is "java")
+--android-lang <text> ..... Language for Android plugin development (either "kotlin" or "java")
 ```

src/help.ts

@@ -10,7 +10,7 @@ const help = `
     --author <author> ......... Author name and email (e.g. "Name <name@example.com>")
     --license <id> ............ SPDX License ID (e.g. "MIT")
     --description <text> ...... Short description of plugin features
-    --android-lang ............ Language for Android plugin development (either "kotlin" or "java", default is "java")
+    --android-lang ............ Language for Android plugin development (either "kotlin" or "java")
 
     -h, --help ................ Print help, then quit
     --verbose ................. Print verbose output to stderr

src/options.ts

@@ -68,7 +68,7 @@ export const VALIDATORS: Validators = {
   description: (value) =>
     typeof value !== 'string' || value.trim().length === 0 ? `Must provide a description` : true,
   'android-lang': (value) =>
-    value === undefined || value === '' || (typeof value === 'string' && /^(kotlin|java)$/i.test(value))
+    typeof value === 'string' && value.trim().length > 0 && /^(kotlin|kt|java)$/i.test(value)
       ? true
       : `Must be either "kotlin" or "java"`,
   dir: (value) =>
@@ -99,24 +99,12 @@ export const getOptions = (): Options => {
 
     if (typeof validatorResult === 'string') {
       debug(`invalid option: --%s %O: %s`, option, value, validatorResult);
-
-      // 'android-lang' is not prompted, so it should fail if invalid
-      if (option === 'android-lang') {
-        process.stderr.write(`ERR: Invalid --android-lang value "${value}": ${validatorResult}\n`);
-        process.exit(1);
-      }
     }
 
     opts[option] = validatorResult === true ? value : undefined;
 
     return opts;
   }, {} as Options);
 
-  const allOptions = { ...argValues, ...optionValues };
-
-  if (!allOptions['android-lang']) {
-    allOptions['android-lang'] = 'java';
-  }
-
-  return allOptions;
+  return { ...argValues, ...optionValues };
 };

src/prompt.ts

@@ -82,6 +82,15 @@ export const gatherDetails = (initialOptions: Options): Promise<OptionValues> =>
         message: `Enter a SPDX license identifier for your plugin.\n`,
         validate: VALIDATORS.license,
       },
+      {
+        type: 'select',
+        name: 'android-lang',
+        message: `What language would you like to use for your Android plugin?\n`,
+        choices: [
+          { title: 'Kotlin', value: 'kotlin' },
+          { title: 'Java', value: 'java' },
+        ],
+      },
       {
         type: 'text',
         name: 'description',
@@ -96,11 +105,5 @@ export const gatherDetails = (initialOptions: Options): Promise<OptionValues> =>
         process.exit(1);
       },
     },
-  ).then(
-    (result) =>
-      ({
-        ...result,
-        'android-lang': initialOptions['android-lang'],
-      }) as OptionValues,
   );
 };