From 26100160842db6405512f7c58f87762d2fb6e9e9 Mon Sep 17 00:00:00 2001
From: pwespi <pwespi@pm.me>
Date: Sat, 28 Dec 2019 14:19:42 +0100
Subject: [PATCH 1/2] chore(cli): add interface for new plugin answers

---
 cli/src/tasks/new-plugin.ts | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/cli/src/tasks/new-plugin.ts b/cli/src/tasks/new-plugin.ts
index 8cd071806..292afc3c5 100644
--- a/cli/src/tasks/new-plugin.ts
+++ b/cli/src/tasks/new-plugin.ts
@@ -8,6 +8,16 @@ import { copy, mkdirs, unlink } from 'fs-extra';
 import { dirname, join } from 'path';
 import { isInteractive } from '../util/term';
 
+interface NewPluginAnswers {
+  name: string
+  domain: string
+  className: string
+  description: string
+  git: string
+  author: string
+  license: string
+  confirm: boolean
+}
 
 export async function newPluginCommand(config: Config) {
   try {
@@ -26,7 +36,7 @@ export async function newPlugin(config: Config) {
   log(`${emoji('✏️', '*')}  Creating new Capacitor plugin`);
 
   const inquirer = await import('inquirer');
-  const answers = await inquirer.prompt([
+  const answers: NewPluginAnswers = await inquirer.prompt([
     {
       type: 'input',
       name: 'name',
@@ -98,7 +108,7 @@ export async function newPlugin(config: Config) {
       name: 'confirm',
       message: `package.json will be created, do you want to continue?`
     }
-  ]);
+  ]) as NewPluginAnswers;
 
   console.log('\n');
 
@@ -142,7 +152,7 @@ export async function newPlugin(config: Config) {
   }
 }
 
-async function createTSPlugin(config: Config, pluginPath: string, domain: string, className: string, answers: any) {
+async function createTSPlugin(config: Config, pluginPath: string, domain: string, className: string, answers: NewPluginAnswers) {
   const newPluginPath = join(pluginPath, 'src');
 
   const originalDefinitions = await readFileAsync(join(newPluginPath, 'definitions.ts'), 'utf8');
@@ -154,7 +164,7 @@ async function createTSPlugin(config: Config, pluginPath: string, domain: string
   await writeFileAsync(join(newPluginPath, `web.ts`), web, 'utf8');
 }
 
-async function createIosPlugin(config: Config, pluginPath: string, domain: string, className: string, answers: any) {
+async function createIosPlugin(config: Config, pluginPath: string, domain: string, className: string, answers: NewPluginAnswers) {
   const newPluginPath = join(pluginPath, 'ios', 'Plugin');
 
   const originalPluginSwift = await readFileAsync(join(newPluginPath, 'Plugin.swift'), 'utf8');
@@ -174,7 +184,7 @@ async function createIosPlugin(config: Config, pluginPath: string, domain: strin
   await writeFileAsync(join(newPluginPath, 'Plugin.m'), pluginObjc, 'utf8');
 }
 
-function generatePodspec(config: Config, answers: any) {
+function generatePodspec(config: Config, answers: NewPluginAnswers) {
   return `
   Pod::Spec.new do |s|
     s.name = '${fixName(answers.name)}'
@@ -222,7 +232,7 @@ function generateAndroidManifest(domain: string, pluginPath: string) {
   `;
 }
 
-function generatePackageJSON(answers: any) {
+function generatePackageJSON(answers: NewPluginAnswers) {
   return {
     name: answers.name,
     version: '0.0.1',

From cfb6909276889d714cd1d7fe0e5193ecb93c00a9 Mon Sep 17 00:00:00 2001
From: pwespi <pwespi@pm.me>
Date: Sat, 28 Dec 2019 14:20:59 +0100
Subject: [PATCH 2/2] chore(cli): use arrow function for input validation

---
 cli/src/tasks/new-plugin.ts | 41 ++++++++++---------------------------
 1 file changed, 11 insertions(+), 30 deletions(-)

diff --git a/cli/src/tasks/new-plugin.ts b/cli/src/tasks/new-plugin.ts
index 292afc3c5..be605d94b 100644
--- a/cli/src/tasks/new-plugin.ts
+++ b/cli/src/tasks/new-plugin.ts
@@ -36,61 +36,42 @@ export async function newPlugin(config: Config) {
   log(`${emoji('✏️', '*')}  Creating new Capacitor plugin`);
 
   const inquirer = await import('inquirer');
+  const requiredInput = (input: string): boolean => {
+    if (!input || input.trim() === '') {
+      return false;
+    }
+    return true;
+  }
   const answers: NewPluginAnswers = await inquirer.prompt([
     {
       type: 'input',
       name: 'name',
       message: 'Plugin NPM name (snake-case):',
-      validate: function(input) {
-        if (!input || input.trim() === '') {
-          return false;
-        }
-        return true;
-      }
+      validate: requiredInput
     },
     {
       type: 'input',
       name: 'domain',
       message: 'Plugin id (domain-style syntax. ex: com.example.plugin)',
-      validate: function(input) {
-        if (!input || input.trim() === '') {
-          return false;
-        }
-        return true;
-      }
+      validate: requiredInput
     },
     {
       type: 'input',
       name: 'className',
       message: 'Plugin class name (ex: AwesomePlugin)',
-      validate: function(input) {
-        if (!input || input.trim() === '') {
-          return false;
-        }
-        return true;
-      }
+      validate: requiredInput
     },
     {
       type: 'input',
       name: 'description',
       message: 'description:',
-      validate: function(input) {
-        if (!input || input.trim() === '') {
-          return false;
-        }
-        return true;
-      }
+      validate: requiredInput
     },
     {
       type: 'input',
       name: 'git',
       message: 'git repository:',
-      validate: function(input) {
-        if (!input || input.trim() === '') {
-          return false;
-        }
-        return true;
-      }
+      validate: requiredInput
     },
     {
       type: 'input',