@nathapp/na-cli 1.0.0-rc.14 → 1.0.0-rc.15

package/src/utils/template.ts

@@ -17,7 +17,7 @@ export interface CliOptions {
     projectName: string
     templateName: string
     templatePath: string
-    tartgetPath: string
+    targetPath: string
     config: TemplateConfig
 }
 
@@ -30,8 +30,8 @@ export function render(content: string, data: TemplateData) {
     return ejs.render(content, data);
 }
 
+export async function generateTemplate(templateDir: string, targetDirectory: string) {
 
-export function generateTemplate(templateDir: string, targetDirectory: string) {
     const templateChoices = fs.readdirSync(templateDir);
 
     const QUESTIONS = [
@@ -65,11 +65,9 @@ export function generateTemplate(templateDir: string, targetDirectory: string) {
         },
     ];
 
-
     console.log(`Welcome to ${name} version ${version}`);
-    inquirer.prompt(QUESTIONS)
+    return inquirer.prompt(QUESTIONS)
         .then(answers => {
-
             answers = Object.assign({}, answers, yargs.argv);
             // @ts-ignore
             const projectChoice = answers['template'];
@@ -80,22 +78,22 @@ export function generateTemplate(templateDir: string, targetDirectory: string) {
             // @ts-ignore
             const runInstall = answers['run_install'];
             const templatePath = path.join(templateDir, projectChoice);
-            const tartgetPath = path.join(targetDirectory, projectName);
+            const targetPath = path.join(targetDirectory, projectName);
             const templateConfig = getTemplateConfig(templatePath);
 
             const options: CliOptions = {
                 projectName,
                 templateName: projectChoice,
                 templatePath,
-                tartgetPath,
+                targetPath: targetPath,
                 config: templateConfig
             }
 
-            if (!createProject(tartgetPath)) {
+            if (!createProject(targetPath)) {
                 return;
             }
 
-            createDirectoryContents(templatePath, projectName, templateConfig, author);
+            createDirectoryContents(targetDirectory, templatePath, projectName, templateConfig, author);
 
             if (runInstall && !postProcess(options)) {
                 return;
@@ -103,111 +101,113 @@ export function generateTemplate(templateDir: string, targetDirectory: string) {
 
             showMessage(options);
         });
+}
 
-    function showMessage(options: CliOptions) {
-        console.log('');
-        console.log(chalk.green('Done.'));
-        console.log(chalk.green(`Go into the project: cd ${options.projectName}`));
 
-        const message = options.config.postMessage;
 
-        if (message) {
-            console.log('');
-            console.log(chalk.yellow(message));
-            console.log('');
-        }
+function showMessage(options: CliOptions) {
+    console.log('');
+    console.log(chalk.green('Done.'));
+    console.log(chalk.green(`Go into the project: cd ${options.projectName}`));
+
+    const message = options.config.postMessage;
 
+    if (message) {
+        console.log('');
+        console.log(chalk.yellow(message));
+        console.log('');
     }
 
-    function getTemplateConfig(templatePath: string): TemplateConfig {
-        const configPath = path.join(templatePath, '.template.json');
+}
 
-        if (!fs.existsSync(configPath)) return {};
+function getTemplateConfig(templatePath: string): TemplateConfig {
+    const configPath = path.join(templatePath, '.template.json');
 
-        const templateConfigContent = fs.readFileSync(configPath);
+    if (!fs.existsSync(configPath)) return {};
 
-        if (templateConfigContent) {
-            return JSON.parse(templateConfigContent.toString());
-        }
+    const templateConfigContent = fs.readFileSync(configPath);
 
-        return {};
+    if (templateConfigContent) {
+        return JSON.parse(templateConfigContent.toString());
     }
 
-    function createProject(projectPath: string) {
-        if (fs.existsSync(projectPath)) {
-            console.log(chalk.red(`Folder ${projectPath} exists. Delete or use another name.`));
-            return false;
-        }
+    return {};
+}
 
-        fs.mkdirSync(projectPath);
-        return true;
+function createProject(projectPath: string) {
+    if (fs.existsSync(projectPath)) {
+        console.log(chalk.red(`Folder ${projectPath} exists. Delete or use another name.`));
+        return false;
     }
 
-    function postProcess(options: CliOptions) {
-        console.log('');
-        console.log("running post installation..please wait...")
-        if (isNode(options)) {
-            return postProcessNode(options);
-        }
-        return true;
-    }
+    fs.mkdirSync(projectPath);
+    return true;
+}
 
-    function isNode(options: CliOptions) {
-        return fs.existsSync(path.join(options.templatePath, 'package.json'));
+function postProcess(options: CliOptions) {
+    console.log('');
+    console.log("running post installation..please wait...")
+    if (isNode(options)) {
+        return postProcessNode(options);
     }
+    return true;
+}
 
-    function postProcessNode(options: CliOptions) {
-        shell.cd(options.tartgetPath);
+function isNode(options: CliOptions) {
+    return fs.existsSync(path.join(options.templatePath, 'package.json'));
+}
 
-        let cmd = '';
+function postProcessNode(options: CliOptions) {
+    shell.cd(options.targetPath);
 
-        if (shell.which('yarn')) {
-            cmd = 'yarn';
-        } else if (shell.which('npm')) {
-            cmd = 'npm install';
-        }
+    let cmd = '';
 
-        if (cmd) {
-            const result = shell.exec(cmd);
+    if (shell.which('yarn')) {
+        cmd = 'yarn';
+    } else if (shell.which('npm')) {
+        cmd = 'npm install';
+    }
 
-            if (result.code !== 0) {
-                return false;
-            }
-        } else {
-            console.log(chalk.red('No yarn or npm found. Cannot run installation.'));
-        }
+    if (cmd) {
+        const result = shell.exec(cmd);
 
-        return true;
+        if (result.code !== 0) {
+            return false;
+        }
+    } else {
+        console.log(chalk.red('No yarn or npm found. Cannot run installation.'));
     }
 
-    const SKIP_FILES = ['node_modules', '.template.json'];
+    return true;
+}
 
-    function createDirectoryContents(templatePath: string, projectName: string, config: TemplateConfig, author?: string) {
-        const filesToCreate = fs.readdirSync(templatePath);
+const SKIP_FILES = ['node_modules', '.template.json'];
 
-        filesToCreate.forEach(file => {
-            const origFilePath = path.join(templatePath, file);
+function createDirectoryContents(targetDirectory: string, projectTemplatePath: string, projectName: string, config: TemplateConfig, author?: string) {
+    const filesToCreate = fs.readdirSync(projectTemplatePath);
 
-            // get stats about the current file
-            const stats = fs.statSync(origFilePath);
+    filesToCreate.forEach(file => {
+        const origFilePath = path.join(projectTemplatePath, file);
 
-            if (SKIP_FILES.indexOf(file) > -1) return;
+        // get stats about the current file
+        const stats = fs.statSync(origFilePath);
 
-            if (stats.isFile()) {
-                let contents = fs.readFileSync(origFilePath, 'utf8');
+        if (SKIP_FILES.indexOf(file) > -1) return;
 
-                if (file === '.npmignore-rename') file = '.npmignore';
+        if (stats.isFile()) {
+            let contents = fs.readFileSync(origFilePath, 'utf8');
 
-                contents = render(contents, { projectName, author });
+            if (file === '.npmignore-rename') file = '.npmignore';
 
-                const writePath = path.join(targetDirectory, projectName, file);
-                fs.writeFileSync(writePath, contents, 'utf8');
-            } else if (stats.isDirectory()) {
-                fs.mkdirSync(path.join(targetDirectory, projectName, file));
+            contents = render(contents, { projectName, author });
 
-                // recursive call
-                createDirectoryContents(path.join(templatePath, file), path.join(projectName, file), config, author);
-            }
-        });
-    }
+            const writePath = path.join(targetDirectory, projectName, file);
+            fs.writeFileSync(writePath, contents, 'utf8');
+        } else if (stats.isDirectory()) {
+            fs.mkdirSync(path.join(targetDirectory, projectName, file));
+
+            // recursive call
+            createDirectoryContents(targetDirectory, path.join(projectTemplatePath, file), path.join(projectName, file), config, author);
+        }
+    });
 }