@nathapp/na-cli 1.0.0-rc.4 → 1.0.0-rc.41

package/dist/utils/template.js

@@ -1,9 +1,370 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.render = void 0;
+exports.generateTemplate = exports.render = exports.K8S_REGISTRY_HOST = exports.TEMPLATE_NAME = void 0;
 var ejs = require("ejs");
+var fs = require("fs");
+var inquirer = require("inquirer");
+var shell = require("shelljs");
+var chalk_1 = require("chalk");
+var yargs = require("yargs");
+var path = require("path");
+var _a = require("../../package.json"), name = _a.name, version = _a.version;
+/**TEMPLATE ENUM NAME */
+var TEMPLATE_NAME;
+(function (TEMPLATE_NAME) {
+    TEMPLATE_NAME["DB_SCHEMA"] = "db-schema";
+    TEMPLATE_NAME["K8S_DEPLOYMENT"] = "k8s-deployment";
+    TEMPLATE_NAME["K8S_DEPLOY_CHART"] = "k8s-helm-chart";
+    TEMPLATE_NAME["MXW_BASE_API"] = "mxw-base-api-express";
+    TEMPLATE_NAME["TS_LIBRARY"] = "ts-library";
+})(TEMPLATE_NAME = exports.TEMPLATE_NAME || (exports.TEMPLATE_NAME = {}));
+var K8S_REGISTRY_HOST;
+(function (K8S_REGISTRY_HOST) {
+    K8S_REGISTRY_HOST["ALIYUN"] = "aliyun";
+    K8S_REGISTRY_HOST["AWS"] = "aws";
+    K8S_REGISTRY_HOST["DOCKER_HUB"] = "dockerhub";
+    K8S_REGISTRY_HOST["CUSTOM"] = "custom";
+})(K8S_REGISTRY_HOST = exports.K8S_REGISTRY_HOST || (exports.K8S_REGISTRY_HOST = {}));
+var ALIYUN_REGION = [{
+        value: "cn-hongkong",
+        name: "HongKong",
+    },
+    {
+        value: "ap-southest-1",
+        name: "Singapore"
+    },
+    {
+        value: "ap-southest-3",
+        name: "Kuala Lumpur"
+    }];
+var AWS_REGION = [{
+        value: "ap-southeast-2",
+        name: "Syndey",
+    }];
 function render(content, data) {
     return ejs.render(content, data);
 }
 exports.render = render;
+function generateTemplate(templateDir, targetDirectory) {
+    return __awaiter(this, void 0, void 0, function () {
+        var templateChoices, template_specific, should_ask_install, should_ask_author, QUESTIONS;
+        return __generator(this, function (_a) {
+            templateChoices = fs.readdirSync(templateDir);
+            template_specific = function (answer, templateName) {
+                var projectChoice = answer["template"];
+                return projectChoice == templateName;
+            };
+            should_ask_install = function (answer) {
+                var projectChoice = answer["template"];
+                return projectChoice !== TEMPLATE_NAME.DB_SCHEMA &&
+                    projectChoice !== TEMPLATE_NAME.K8S_DEPLOYMENT &&
+                    projectChoice !== TEMPLATE_NAME.K8S_DEPLOY_CHART;
+            };
+            should_ask_author = function (answer) {
+                var projectChoice = answer["template"];
+                return !yargs.argv['author'] && projectChoice !== TEMPLATE_NAME.DB_SCHEMA
+                    && projectChoice !== TEMPLATE_NAME.K8S_DEPLOYMENT &&
+                    projectChoice !== TEMPLATE_NAME.K8S_DEPLOY_CHART;
+            };
+            QUESTIONS = [
+                {
+                    name: 'template',
+                    type: 'list',
+                    message: 'What project template would you like to generate?',
+                    choices: templateChoices,
+                    when: function () { return !yargs.argv['template']; }
+                },
+                {
+                    name: 'name',
+                    type: 'input',
+                    message: 'Project name:',
+                    when: function () { return !yargs.argv['name']; },
+                    validate: function (input) {
+                        if (/^([A-Za-z\-\_\d])+$/.test(input))
+                            return true;
+                        else
+                            return 'Project name may only include letters, numbers, underscores and hashes.';
+                    }
+                },
+                {
+                    name: 'author',
+                    type: 'input',
+                    message: 'Author:',
+                    when: function (answer) { return should_ask_author(answer); }
+                },
+                {
+                    name: "run_install",
+                    type: "confirm",
+                    message: "Do you want to run npm install after template created?",
+                    when: function (answer) { return should_ask_install(answer); }
+                },
+                {
+                    name: "db_master",
+                    type: "input",
+                    message: "what is the master database name?",
+                    when: function (answer) { return template_specific(answer, TEMPLATE_NAME.DB_SCHEMA); }
+                },
+                /** TEMPLATE_NAME.K8S_DEPLOY_CHART */
+                {
+                    name: "k8s_chart_registry_host",
+                    type: "list",
+                    message: "what is the registry host?",
+                    choices: [K8S_REGISTRY_HOST.ALIYUN, K8S_REGISTRY_HOST.AWS, K8S_REGISTRY_HOST.DOCKER_HUB, K8S_REGISTRY_HOST.CUSTOM],
+                    when: function (answer) { return template_specific(answer, TEMPLATE_NAME.K8S_DEPLOY_CHART); }
+                },
+                {
+                    name: "k8s_chart_aws_account_id",
+                    type: "input",
+                    message: "please enter AWS Account ID?",
+                    when: function (answer) {
+                        var registryHost = answer === null || answer === void 0 ? void 0 : answer.k8s_chart_registry_host;
+                        return template_specific(answer, TEMPLATE_NAME.K8S_DEPLOY_CHART) && registryHost == K8S_REGISTRY_HOST.AWS;
+                    }
+                },
+                {
+                    name: "k8s_chart_custom_registry_host",
+                    type: "input",
+                    message: "please enter custom registry host",
+                    when: function (answer) {
+                        var registryHost = answer === null || answer === void 0 ? void 0 : answer.k8s_chart_registry_host;
+                        return template_specific(answer, TEMPLATE_NAME.K8S_DEPLOY_CHART) && registryHost == K8S_REGISTRY_HOST.CUSTOM;
+                    }
+                },
+                {
+                    name: "k8s_chart_registry_region",
+                    type: "list",
+                    message: "what is the registry region?",
+                    choices: function (answer) {
+                        var registryHost = answer === null || answer === void 0 ? void 0 : answer.k8s_chart_registry_host;
+                        if (registryHost == K8S_REGISTRY_HOST.ALIYUN)
+                            return ALIYUN_REGION;
+                        else if (registryHost == K8S_REGISTRY_HOST.AWS)
+                            return AWS_REGION;
+                        return ["none"];
+                    },
+                    when: function (answer) {
+                        var registryHost = answer === null || answer === void 0 ? void 0 : answer.k8s_chart_registry_host;
+                        return template_specific(answer, TEMPLATE_NAME.K8S_DEPLOY_CHART) && (registryHost == K8S_REGISTRY_HOST.ALIYUN || registryHost == K8S_REGISTRY_HOST.AWS);
+                    }
+                },
+                {
+                    name: "k8s_image_name",
+                    type: "input",
+                    message: "what is the image name include namespace (eg: bitnami/kafka)?",
+                    when: function (answer) {
+                        return template_specific(answer, TEMPLATE_NAME.K8S_DEPLOY_CHART);
+                    }
+                },
+                {
+                    name: "k8s_image_version",
+                    type: "input",
+                    message: "what is the image version?",
+                    when: function (answer) { return template_specific(answer, TEMPLATE_NAME.K8S_DEPLOY_CHART); }
+                },
+                {
+                    name: "k8s_chart_kind",
+                    type: "list",
+                    message: "what is the chart kind?",
+                    choices: ["Deployment", "StatefulSet", "CronJob"],
+                    default: "Deployment",
+                    when: function (answer) { return template_specific(answer, TEMPLATE_NAME.K8S_DEPLOY_CHART); }
+                },
+                /** END TEMPLATE_NAME.K8S_DEPLOY_CHART */
+            ];
+            console.log("Welcome to ".concat(name, " version ").concat(version));
+            return [2 /*return*/, inquirer.prompt(QUESTIONS)
+                    .then(function (answers) {
+                    answers = Object.assign({}, answers, yargs.argv);
+                    // @ts-ignore
+                    var projectChoice = answers['template'];
+                    // @ts-ignore
+                    var projectName = answers['name'];
+                    // @ts-ignore
+                    var author = answers['author'];
+                    // @ts-ignore
+                    var runInstall = answers['run_install'] || false;
+                    var masterDbName = answers['db_master'] || "master";
+                    var templatePath = path.join(templateDir, projectChoice);
+                    var targetPath = path.join(targetDirectory, projectName);
+                    var templateConfig = getTemplateConfig(templatePath);
+                    var k8sChartParms = getK8sDeployChartParams(answers);
+                    var params = __assign({ masterDbName: masterDbName }, k8sChartParms);
+                    var options = {
+                        projectName: projectName,
+                        templateName: projectChoice,
+                        templatePath: templatePath,
+                        targetPath: targetPath,
+                        config: templateConfig
+                    };
+                    if (!createProject(targetPath)) {
+                        return;
+                    }
+                    createDirectoryContents(targetDirectory, templatePath, projectName, templateConfig, author, params);
+                    if (runInstall && !postProcess(options)) {
+                        return;
+                    }
+                    showMessage(options);
+                })];
+        });
+    });
+}
+exports.generateTemplate = generateTemplate;
+function showMessage(options) {
+    console.log('');
+    console.log(chalk_1.default.green('Done.'));
+    console.log(chalk_1.default.green("Go into the project: cd ".concat(options.projectName)));
+    var message = options.config.postMessage;
+    if (message) {
+        console.log('');
+        console.log(chalk_1.default.yellow(message));
+        console.log('');
+    }
+}
+function getTemplateConfig(templatePath) {
+    var configPath = path.join(templatePath, '.template.json');
+    if (!fs.existsSync(configPath))
+        return {};
+    var templateConfigContent = fs.readFileSync(configPath);
+    if (templateConfigContent) {
+        return JSON.parse(templateConfigContent.toString());
+    }
+    return {};
+}
+function createProject(projectPath) {
+    if (fs.existsSync(projectPath)) {
+        console.log(chalk_1.default.red("Folder ".concat(projectPath, " exists. Delete or use another name.")));
+        return false;
+    }
+    fs.mkdirSync(projectPath);
+    return true;
+}
+function postProcess(options) {
+    console.log('');
+    console.log("running post installation..please wait...");
+    if (isNode(options)) {
+        return postProcessNode(options);
+    }
+    return true;
+}
+function isNode(options) {
+    return fs.existsSync(path.join(options.templatePath, 'package.json'));
+}
+function postProcessNode(options) {
+    shell.cd(options.targetPath);
+    var cmd = '';
+    /*
+        if (shell.which('yarn')) {
+            cmd = 'yarn';
+        } else if (shell.which('npm')) {
+            cmd = 'npm install';
+        }
+    */
+    if (shell.which('npm')) {
+        cmd = 'npm install';
+    }
+    if (cmd) {
+        var result = shell.exec(cmd);
+        if (result.code !== 0) {
+            return false;
+        }
+    }
+    else {
+        console.log(chalk_1.default.red('No yarn or npm found. Cannot run installation.'));
+    }
+    return true;
+}
+var SKIP_FILES = ['node_modules', '.template.json'];
+function createDirectoryContents(targetDirectory, projectTemplatePath, projectName, config, author, params) {
+    var filesToCreate = fs.readdirSync(projectTemplatePath);
+    filesToCreate.forEach(function (file) {
+        var origFilePath = path.join(projectTemplatePath, file);
+        // get stats about the current file
+        var stats = fs.statSync(origFilePath);
+        if (SKIP_FILES.indexOf(file) > -1)
+            return;
+        if (stats.isFile()) {
+            var contents = fs.readFileSync(origFilePath, 'utf8');
+            if (file === '.npmignore-rename')
+                file = '.npmignore';
+            if (file === '.gitignore-rename')
+                file = '.gitignore';
+            contents = render(contents, __assign(__assign({}, params), { projectName: projectName, author: author }));
+            var 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, params);
+        }
+    });
+}
+function getK8sDeployChartParams(answer) {
+    var params = {};
+    // @ts-ignore
+    var projectChoice = answer['template'];
+    if (projectChoice != TEMPLATE_NAME.K8S_DEPLOY_CHART || !answer) {
+        return params;
+    }
+    if (answer.k8s_chart_registry_host == K8S_REGISTRY_HOST.ALIYUN) {
+        params.containerRegistry = "registry-intl.".concat(answer.k8s_chart_registry_region, ".aliyuncs.com/").concat(answer.k8s_image_name);
+    }
+    else if (answer.k8s_chart_registry_host == K8S_REGISTRY_HOST.AWS) {
+        params.containerRegistry = "".concat(answer.k8s_chart_aws_account_id.replace("-", ""), ".dkr.ecr.").concat(answer.k8s_chart_registry_region, ".amazonaws.com/").concat(answer.k8s_image_name);
+    }
+    else if (answer.k8s_chart_registry_host == K8S_REGISTRY_HOST.CUSTOM) {
+        params.containerRegistry = "".concat(answer.k8s_chart_custom_registry_host, "/").concat(answer.k8s_image_name);
+    }
+    params.chartName = answer.name;
+    params.containerVersion = answer.k8s_image_version;
+    params.chartKind = answer.k8s_chart_kind;
+    return params;
+}
 //# sourceMappingURL=template.js.map

package/dist/utils/template.js.map

@@ -1 +1 @@
-{"version":3,"file":"template.js","sourceRoot":"","sources":["../../src/utils/template.ts"],"names":[],"mappings":";;;AAAA,yBAA2B;AAM3B,SAAgB,MAAM,CAAC,OAAe,EAAE,IAAkB;IACtD,OAAO,GAAG,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;AACrC,CAAC;AAFD,wBAEC"}
+{"version":3,"file":"template.js","sourceRoot":"","sources":["../../src/utils/template.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,29 +1,33 @@
 {
   "name": "@nathapp/na-cli",
-  "version": "1.0.0-rc.4",
+  "version": "1.0.0-rc.41",
   "main": "dist/index.js",
   "scripts": {
-    "start": "ts-node src/index.ts",
+    "start": "npm run build && node dist/index.js",
     "build": "tsc && shx rm -rf dist/templates && shx cp -r templates dist"
   },
   "bin": {
-    "na-cli": "./dist/index.js"
+    "na-cli": "./dist/index.js",
+    "na": "./dist/index.js"
   },
   "license": "MIT",
   "devDependencies": {
     "@types/ejs": "^3.1.1",
     "@types/inquirer": "^0.0.43",
+    "@types/js-yaml": "^4.0.5",
     "@types/node": "^18.11.18",
-    "@types/shelljs": "^0.8.0",
+    "@types/shelljs": "^0.8.5",
     "@types/yargs": "^17.0.19",
     "shx": "^0.3.2",
     "ts-node": "^10.9.1",
     "typescript": "^4.3.5"
   },
   "dependencies": {
+    "dotenv": "^16.0.3",
     "ejs": "^3.1.8",
     "inquirer": "^6.2.0",
-    "shelljs": "^0.8.2",
+    "js-yaml": "^4.1.0",
+    "shelljs": "^0.8.5",
     "yargs": "^17.6.2"
   }
 }

package/src/index.ts

@@ -1,182 +0,0 @@
-#!/usr/bin/env node
-
-import * as inquirer from 'inquirer';
-import * as fs from 'fs';
-import * as path from 'path';
-import * as shell from 'shelljs';
-import * as template from './utils/template';
-import chalk from 'chalk';
-import * as yargs from 'yargs';
-
-const CHOICES = fs.readdirSync(path.join(__dirname, 'templates'));
-
-const QUESTIONS = [
-  {
-    name: 'template',
-    type: 'list',
-    message: 'What project template would you like to generate?',
-    choices: CHOICES,
-    when: () => !yargs.argv['template']
-  },
-  {
-    name: 'name',
-    type: 'input',
-    message: 'Project name:',
-    when: () => !yargs.argv['name'],
-    validate: (input: string) => {
-      if (/^([A-Za-z\-\_\d])+$/.test(input)) return true;
-      else return 'Project name may only include letters, numbers, underscores and hashes.';
-    }
-  }
-];
-
-const CURR_DIR = process.cwd();
-
-export interface TemplateConfig {
-  files?: string[]
-  postMessage?: string
-}
-
-export interface CliOptions {
-  projectName: string
-  templateName: string
-  templatePath: string
-  tartgetPath: string
-  config: TemplateConfig
-}
-
-inquirer.prompt(QUESTIONS)
-  .then(answers => {
-
-    answers = Object.assign({}, answers, yargs.argv);
-    // @ts-ignore
-    const projectChoice = answers['template'];
-    // @ts-ignore
-    const projectName = answers['name'];
-    const templatePath = path.join(__dirname, 'templates', projectChoice);
-    const tartgetPath = path.join(CURR_DIR, projectName);
-    const templateConfig = getTemplateConfig(templatePath);
-
-    const options: CliOptions = {
-      projectName,
-      templateName: projectChoice,
-      templatePath,
-      tartgetPath,
-      config: templateConfig
-    }
-
-    if (!createProject(tartgetPath)) {
-      return;
-    }
-
-    createDirectoryContents(templatePath, projectName, templateConfig);
-
-    if (!postProcess(options)) {
-      return;
-    }
-
-    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 getTemplateConfig(templatePath: string): TemplateConfig {
-  const configPath = path.join(templatePath, '.template.json');
-
-  if (!fs.existsSync(configPath)) return {};
-
-  const templateConfigContent = fs.readFileSync(configPath);
-
-  if (templateConfigContent) {
-    return JSON.parse(templateConfigContent.toString());
-  }
-
-  return {};
-}
-
-function createProject(projectPath: string) {
-  if (fs.existsSync(projectPath)) {
-    console.log(chalk.red(`Folder ${projectPath} exists. Delete or use another name.`));
-    return false;
-  }
-
-  fs.mkdirSync(projectPath);
-  return true;
-}
-
-function postProcess(options: CliOptions) {
-  if (isNode(options)) {
-    return postProcessNode(options);
-  }
-  return true;
-}
-
-function isNode(options: CliOptions) {
-  return fs.existsSync(path.join(options.templatePath, 'package.json'));
-}
-
-function postProcessNode(options: CliOptions) {
-  shell.cd(options.tartgetPath);
-
-  let cmd = '';
-
-  if (shell.which('yarn')) {
-    cmd = 'yarn';
-  } else if (shell.which('npm')) {
-    cmd = 'npm install';
-  }
-
-  if (cmd) {
-    const result = shell.exec(cmd);
-
-    if (result.code !== 0) {
-      return false;
-    }
-  } else {
-    console.log(chalk.red('No yarn or npm found. Cannot run installation.'));
-  }
-
-  return true;
-}
-
-const SKIP_FILES = ['node_modules', '.template.json'];
-
-function createDirectoryContents(templatePath: string, projectName: string, config: TemplateConfig) {
-  const filesToCreate = fs.readdirSync(templatePath);
-
-  filesToCreate.forEach(file => {
-    const origFilePath = path.join(templatePath, file);
-
-    // get stats about the current file
-    const stats = fs.statSync(origFilePath);
-
-    if (SKIP_FILES.indexOf(file) > -1) return;
-
-    if (stats.isFile()) {
-      let contents = fs.readFileSync(origFilePath, 'utf8');
-
-      contents = template.render(contents, { projectName });
-
-      const writePath = path.join(CURR_DIR, projectName, file);
-      fs.writeFileSync(writePath, contents, 'utf8');
-    } else if (stats.isDirectory()) {
-      fs.mkdirSync(path.join(CURR_DIR, projectName, file));
-
-      // recursive call
-      createDirectoryContents(path.join(templatePath, file), path.join(projectName, file), config);
-    }
-  });
-}

package/src/utils/template.ts

@@ -1,9 +0,0 @@
-import * as ejs from 'ejs';
-
-export interface TemplateData {
-    projectName: string
-}
-
-export function render(content: string, data: TemplateData) {
-    return ejs.render(content, data);
-}