mushroom-cli 1.1.0-alpha.2 → 1.1.0-alpha.21

package/init.js

@@ -1,120 +1,16 @@
-const fs = require("fs");
-const fetch = require('node-fetch');
-const readlineSync = require("readline-sync");
 const help = require("./help.js");
-const common = require("./common.js");
 
-function initJson(args) {
-    const path = args[2];
-    if (!path) {
-        help(args);
-        return;
-    }
-
-    if (fs.existsSync(path)){
-        console.error(`File ${path} is already existed`);
-        return;
-    }
-
-    if (args[3] === "silent") {
-        console.log("Fetch http://api.siten.vn/gen/template/default.json");
-        fetch("http://api.siten.vn/gen/template/default.json").then(res => res.text()).then(text => {
-            common.ensureFolder(path);
-    
-            fs.writeFile(path, text, err => {
-                if (err)
-                    throw err;
-                console.log(`Initialized json at ${path}`);
-            });
-        });
-        return;
-    }
-
-    console.log("Fetch http://api.siten.vn/gen/template/template-def.json");
-    fetch("http://api.siten.vn/gen/template/template-def.json").then(res => res.json()).then(templateConfig => {
-        const info = {};
-        templateConfig.fields.forEach(field => {
-            while (true)
-            {
-                let question = `${field.required ? "[Required] " : ""}${field.label || field.name}`;
-                if (Array.isArray(field.list)) {
-                    question += "\n";
-                    let i = 1;
-                    field.list.forEach(item => { question += "\t" + i++ + ". " + item + "\n"; });
-                    question += "Please choose";
-                }
-                if (field.defaultValue !== undefined) {
-                    question += ` (default: '${field.defaultValue}')`;
-                }
-                question += ": ";
-                let choice = readlineSync.question(question);
-                if (choice === "") {
-                    if (field.defaultValue != undefined)
-                        choice = field.defaultValue;
-                }
-                else if (Array.isArray(field.list)) {
-                    if (choice !== null && choice !== "" && !isNaN(choice))
-                        choice = field.list[choice - 1];
-                    else
-                        choice = undefined;
-                    if (choice === undefined) {
-                        console.warn("Invalid input");
-                        continue;
-                    }
-                }
-
-                if (choice === "" || choice === undefined || choice == null) {
-                    choice = "";
-
-                    if (field.required) {
-                        console.warn("Required input value");
-                        continue;
-                    }
-                }
-
-                if (choice !== "" && field.pattern) {
-                    const re = new RegExp(field.pattern, field.patternFlags);
-                    if (!re.test(choice)) {
-                        console.warn("Input doesn't match with pattern " + field.pattern);
-                        continue;
-                    }
-                }
-
-                info[field.name] = choice;
-                break;
-            }
-        });
-        //console.log(info);
-
-        console.log(`Fetch ${templateConfig.templateUrl}`);
-        fetch(templateConfig.templateUrl).then(res => res.text()).then(json => {
-            json = json.replace(/\"\$\{([\w]+)\}\"/g, (s0, s1) => JSON.stringify(info[s1]));
-            json = json.replace(/\$\{([\w]+)\}/g, (s0, s1) => JSON.stringify(info[s1]).replace(/^\"|\"$/g, ""));
-
-            common.ensureFolder(path);
-            //console.log(json);
-    
-            fs.writeFile(path, json, err => {
-                if (err)
-                    throw err;
-                console.log(`Initialized json at ${path}`);
-            });
-        });
-    })
-}
-
-function initNetCore(args) {
-    console.log("init netcore is comming soon");
-}
+const initJson = require("./init/init-json");
+const initNetCore = require("./init/init-netcore");
 
-function init(args) {
+async function init(args) {
     const configCommand = args[1];
     switch(configCommand) {
         case "json":
             initJson(args);
             break;
         case "netcore":
-            initNetCore(args);
+            await initNetCore(args);
             break;
         case "":
         case undefined:

package/master-file/master-file.js

@@ -205,7 +205,7 @@ function processMasterFile(basePath, master) {
                     action.defaultSortings = action.sorting.split(',').map(f => {
                         const c = f.charAt(0);
                         return {
-                            field: c === "+" || c === "-" ? f.substr(1) : f,
+                            field: c === "+" || c === "-" ? f.substring(1) : f,
                             type: c === "-" ? "Desc" : "Asc"
                         }
                     });
@@ -216,7 +216,7 @@ function processMasterFile(basePath, master) {
                     action.allowSortings = action.allowSorting.split(',').map(f => {
                         const c = f.charAt(0);
                         return {
-                            field: c === "+" || c === "-" ? f.substr(1) : f,
+                            field: c === "+" || c === "-" ? f.substring(1) : f,
                             type: c === "-" ? "Desc" : c === "+" ? "Asc" : "Both"
                         }
                     });

package/mr.js

@@ -3,11 +3,16 @@
 const init = require("./init.js");
 const config = require("./config.js");
 const gen = require("./gen.js");
+const update = require("./update.js");
 const help = require("./help.js");
 
-const package = require("./package.json");
+const pkg = require("./package.json");
 const checkUpdate = require("./check-update");
 
+const versionGroup = pkg.version.match(/([^-]+)(-(\w+).*)?/);
+const currentDistTag = versionGroup[3] ? versionGroup[3] : "latest";
+console.log("Mushroom CLI version " +  pkg.version);
+
 async function run(args) {
     let debugMode = false;
     if (args.indexOf("--debug") !== -1) {
@@ -15,10 +20,8 @@ async function run(args) {
         args = args.filter(arg => arg !== "--debug");
     }
 
-    let noCheckUpdate = false;
     let checkUpdateTask;
     if (args.indexOf("--no-check-update") !== -1){
-        noCheckUpdate = true;
         args = args.filter(arg => arg !== "--no-check-update");
         checkUpdateTask = null;
     }
@@ -38,6 +41,9 @@ async function run(args) {
             case "gen":
                 await gen(args);
                 break;
+            case "update":
+                await update(args);
+                break;
             case "":
             case undefined:
                 console.log(`Mushroom CLI`);
@@ -59,8 +65,8 @@ async function run(args) {
     if (checkUpdateTask !== null)
         try {
             var data = await checkUpdateTask;
-            if (data.version && data.version !== package.version) {
-                console.warn("YOUR mushroom-cli VERSION IS NOT LATEST. PLEASE RUN: npm i mushroom-cli@" + data.version);
+            if (data["dist-tags"] && data["dist-tags"][currentDistTag] && data["dist-tags"][currentDistTag] !== pkg.version) {
+                console.warn(`YOUR mushroom-cli VERSION IS NOT LATEST (dist-tags: ${currentDistTag}). PLEASE RUN: npm i mushroom-cli@${data["dist-tags"][currentDistTag]}`);
             }
         }
         catch(e) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mushroom-cli",
-  "version": "1.1.0-alpha.2",
+  "version": "1.1.0-alpha.21",
   "description": "Mushroom CLI",
   "main": "mr.js",
   "scripts": {
@@ -17,10 +17,10 @@
   "author": "suco2007",
   "license": "ISC",
   "dependencies": {
-    "jsdom": "^16.2.2",
-    "json5": "^2.1.2",
-    "node-fetch": "^2.6.0",
-    "open": "^7.0.3",
+    "jsdom": "^20.0.0",
+    "json5": "^2.2.1",
+    "node-fetch": "^2.6.7",
+    "open": "^8.4.0",
     "readline-sync": "^1.4.10",
     "targz": "^1.0.1"
   }

package/update/tsCode.js

@@ -0,0 +1,20 @@
+const fs = require("fs");
+const fetch = require('node-fetch');
+
+async function updateTsCode(options) {
+    if (!options.output) {
+        console.error("Missing output file path");
+        return;
+    }
+    if (!options.input) {
+        console.error("Missing remote url");
+        return;
+    }
+    console.log(`Fetch ${options.input}`);
+    const res = await fetch(options.input);
+    console.log(`Write to ${options.output}`);
+    fs.writeFileSync(options.output, await res.text());
+    console.log(`Finish update ts-code`);
+}
+
+module.exports = updateTsCode;

package/update.js

@@ -0,0 +1,24 @@
+const help = require("./help.js");
+const updateTsCode = require("./update/tsCode");
+
+async function update(args) {
+    let command = args[1];
+    
+    switch (command) {
+        case "ts-code":
+            await updateTsCode({
+                input: args[3],
+                output: args[2]
+            });
+            break;
+        case "help":
+        case "man":
+            help(args);
+            break;
+        default:
+            help(args, true);
+            break;
+    }
+}
+
+module.exports = update;