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

package/dist/utils/template.js

@@ -1,4 +1,40 @@
 "use strict";
+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.generateTemplate = exports.render = void 0;
 var ejs = require("ejs");
@@ -14,154 +50,159 @@ function render(content, data) {
 }
 exports.render = render;
 function generateTemplate(templateDir, targetDirectory) {
-    var templateChoices = fs.readdirSync(templateDir);
-    var 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 () { return !yargs.argv['author']; }
-        },
-        {
-            name: "run_install",
-            type: "confirm",
-            message: "Do you want to run npm install after template created?",
-        },
-    ];
-    console.log("Welcome to ".concat(name, " version ").concat(version));
-    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'];
-        var templatePath = path.join(templateDir, projectChoice);
-        var tartgetPath = path.join(targetDirectory, projectName);
-        var templateConfig = getTemplateConfig(templatePath);
-        var options = {
-            projectName: projectName,
-            templateName: projectChoice,
-            templatePath: templatePath,
-            tartgetPath: tartgetPath,
-            config: templateConfig
-        };
-        if (!createProject(tartgetPath)) {
-            return;
-        }
-        createDirectoryContents(templatePath, projectName, templateConfig, author);
-        if (runInstall && !postProcess(options)) {
-            return;
-        }
-        showMessage(options);
+    return __awaiter(this, void 0, void 0, function () {
+        var templateChoices, QUESTIONS;
+        return __generator(this, function (_a) {
+            templateChoices = fs.readdirSync(templateDir);
+            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 () { return !yargs.argv['author']; }
+                },
+                {
+                    name: "run_install",
+                    type: "confirm",
+                    message: "Do you want to run npm install after template created?",
+                },
+            ];
+            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'];
+                    var templatePath = path.join(templateDir, projectChoice);
+                    var targetPath = path.join(targetDirectory, projectName);
+                    var templateConfig = getTemplateConfig(templatePath);
+                    var options = {
+                        projectName: projectName,
+                        templateName: projectChoice,
+                        templatePath: templatePath,
+                        targetPath: targetPath,
+                        config: templateConfig
+                    };
+                    if (!createProject(targetPath)) {
+                        return;
+                    }
+                    createDirectoryContents(targetDirectory, templatePath, projectName, templateConfig, author);
+                    if (runInstall && !postProcess(options)) {
+                        return;
+                    }
+                    showMessage(options);
+                })];
+        });
     });
-    function 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('');
-        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());
-        }
+}
+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());
     }
-    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;
+    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;
     }
-    function postProcess(options) {
-        console.log('');
-        console.log("running post installation..please wait...");
-        if (isNode(options)) {
-            return postProcessNode(options);
-        }
-        return true;
+    fs.mkdirSync(projectPath);
+    return true;
+}
+function postProcess(options) {
+    console.log('');
+    console.log("running post installation..please wait...");
+    if (isNode(options)) {
+        return postProcessNode(options);
     }
-    function isNode(options) {
-        return fs.existsSync(path.join(options.templatePath, 'package.json'));
+    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';
     }
-    function postProcessNode(options) {
-        shell.cd(options.tartgetPath);
-        var cmd = '';
-        if (shell.which('yarn')) {
-            cmd = 'yarn';
-        }
-        else 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.'));
+    else if (shell.which('npm')) {
+        cmd = 'npm install';
+    }
+    if (cmd) {
+        var result = shell.exec(cmd);
+        if (result.code !== 0) {
+            return false;
         }
-        return true;
     }
-    var SKIP_FILES = ['node_modules', '.template.json'];
-    function createDirectoryContents(templatePath, projectName, config, author) {
-        var filesToCreate = fs.readdirSync(templatePath);
-        filesToCreate.forEach(function (file) {
-            var origFilePath = path.join(templatePath, 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';
-                contents = render(contents, { 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(path.join(templatePath, file), path.join(projectName, file), config, author);
-            }
-        });
+    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) {
+    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';
+            contents = render(contents, { 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);
+        }
+    });
 }
-exports.generateTemplate = generateTemplate;
 //# 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":"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"}
+{"version":3,"file":"template.js","sourceRoot":"","sources":["../../src/utils/template.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nathapp/na-cli",
-  "version": "1.0.0-rc.14",
+  "version": "1.0.0-rc.16",
   "main": "dist/index.js",
   "scripts": {
     "start": "npm run build && node dist/index.js",
@@ -14,6 +14,7 @@
   "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.5",
     "@types/yargs": "^17.0.19",
@@ -22,8 +23,10 @@
     "typescript": "^4.3.5"
   },
   "dependencies": {
+    "dotenv": "^16.0.3",
     "ejs": "^3.1.8",
     "inquirer": "^6.2.0",
+    "js-yaml": "^4.1.0",
     "shelljs": "^0.8.5",
     "yargs": "^17.6.2"
   }

package/src/index.ts

@@ -2,30 +2,78 @@
 
 import * as path from 'path';
 import { generateTemplate } from './utils/template';
+import { writeDotEnvToYaml, writeYamlToDotEnv } from './utils/env';
 import * as yargs from 'yargs';
 const { version } = require("../package.json");
 
-function runGenerateTemplate() {
+async function runGenerateTemplate() {
   const TEMPLATE_PATH = path.join(__dirname, 'templates');
   const CURR_DIR = process.cwd();
 
-  generateTemplate(TEMPLATE_PATH, CURR_DIR)
+  return generateTemplate(TEMPLATE_PATH, CURR_DIR)
 }
 
-yargs.version(version).command({
-  command: 'generate',
-  describe: 'generate project template',
-  builder: (yargs) => yargs.options({}),
-  handler: (argv: {}) => {
-    runGenerateTemplate()
-  }
-}).command({
-  command: 'gen',
-  describe: 'generate project template, "generate" command alias',
-  builder: (yargs) => yargs.options({}),
-  handler: (argv: {}) => {
-    runGenerateTemplate()
-  }
-}).help().alias("help", "h").showHelpOnFail(true);
+yargs.version(version).help().alias("help", "h").showHelpOnFail(true)
+  .command({
+    command: 'generate',
+    describe: 'generate project template',
+    builder: (yargs) => yargs.options({}),
+    handler: (argv: {}) => {
+      return runGenerateTemplate()
+    }
+  }).command({
+    command: 'gen',
+    describe: 'generate project template, "generate" command alias',
+    builder: (yargs) => yargs.options({}),
+    handler: (argv: {}) => {
+      return runGenerateTemplate()
+    }
+  }).command({
+    command: 'env-yml',
+    describe: 'convert dotenv to yaml',
+    builder: (yargs) => yargs.options({
+      input: {
+        alias: 'i',
+        demand: false,
+        describe: "dotenv input, eg: .env, dev.env",
+        type: 'string',
+        default: '.env'
+      },
+      output: {
+        alias: ['o', 'out'],
+        demand: false,
+        describe: "yaml output, eg: .env.yaml, config.yaml",
+        type: 'string',
+        default: 'config.yaml'
+      }
+    }),
+    handler: (argv: any) => {
+      console.log(`converting .env to yaml`);
+      return writeDotEnvToYaml(argv.input, argv.output);
+    }
+  }).command({
+    command: 'yml-env',
+    describe: 'convert yaml to dotenv',
+    builder: (yargs) => yargs.options({
+      input: {
+        alias: 'i',
+        demand: false,
+        describe: "yaml input, eg: .env.yaml, config.yaml",
+        type: 'string',
+        default: 'config.yaml'
+      },
+      output: {
+        alias: ['o', 'out'],
+        demand: false,
+        describe: "dotenv output, eg: .env, dev.env",
+        type: 'string',
+        default: '.env'
+      }
+    }),
+    handler: (argv: any) => {
+      console.log(`converting yaml to .env`);
+      return writeYamlToDotEnv(argv.input, argv.output);
+    }
+  });
 
 yargs.parse();

package/src/utils/env.ts

@@ -0,0 +1,79 @@
+import * as fs from 'fs';
+import * as dotenv from 'dotenv';
+import * as yaml from 'js-yaml';
+import * as path from 'path';
+
+export const writeDotEnvToYaml = async (inputPath: string, outputPath: string) => {
+
+  // take a snapshot of the environment variables before loading the .env file
+  const originalEnv = { ...process.env };
+
+  const inputFullPath = path.resolve(inputPath)
+
+  await validateFile(inputFullPath)
+
+  // load environment variables from the .env file passed as argument  
+  dotenv.config({ path: inputFullPath });
+
+  // create an object with the environment variables
+  const env = process.env;
+
+  // filter out the system environment variables
+  const envEntries = Object.entries(env)
+    .filter(([key]) => originalEnv[key] !== env[key])
+    .reduce((acc, [key, value]) => {
+      acc[key] = value;
+      return acc;
+    }, {});
+
+  const configEnv = {
+    env: {
+      ...envEntries
+    }
+  }
+
+  // convert the object to yaml
+  const yamlStr = yaml.dump(configEnv);
+
+  // write the yaml to a .yaml file
+  fs.writeFileSync(path.resolve(outputPath), yamlStr);
+}
+
+
+export const writeYamlToDotEnv = async (inputPath: string, outputPath: string) => {
+  // take a snapshot of the environment variables before loading the yaml file
+  const originalEnv = { ...process.env };
+
+  const inputFullPath = path.resolve(inputPath)
+
+  await validateFile(inputFullPath)
+
+  // read the yaml file
+  const yamlStr = fs.readFileSync(inputFullPath, 'utf8');
+
+  // parse the yaml string into an object
+  const config = yaml.load(yamlStr) as { [key: string]: string };;
+
+  // filter out the system environment variables
+  const envEntries = Object.entries(config.env)
+    .filter(([key]) => originalEnv[key] !== config.env[key])
+    .map(([key, value]) => `${key}=${value}`);
+
+  const envStr = envEntries.join('\n');
+
+  fs.writeFileSync(path.resolve(outputPath), envStr);
+}
+
+
+const validateFile = async (filePath: string) => {
+  try {
+    await fs.promises.stat(filePath);
+  } catch (err) {
+    if (err.code === 'ENOENT') {
+      console.error(`File ${filePath} not found`);
+      process.exit(1);
+    } else {
+      throw err;
+    }
+  }
+}