mushroom-cli 1.1.0 → 1.1.2

package/gen.js

@@ -1,120 +1,146 @@
-const fs = require("fs");
-const path = require('path');
-const JSON5 = require("json5");
-const help = require("./help.js");
-
-const masterFile = require("./master-file/master-file");
-
-const genApiDocs = require("./gen/gen-api-docs");
-const genDatabaseDocs = require("./gen/gen-db-docs");
-const javascriptDriverGenerator = require("./gen/gen-js-driver");
-const genJavascriptDriverTarball = require("./gen/gen-js-driver-tarball");
-const typescriptDriverGenerator = require("./gen/gen-ts-driver");
-const csharp = require("./gen/gen-csharp");
-
-
-async function gen(args) {
-    let projectName = args[1];
-    let alias = "default";
-
-    if (!projectName) {
-        help(args);
-        return;
-    }
-
-    const atIndex = projectName.indexOf("@");
-    if (atIndex !== -1) {
-        alias = projectName.substring(atIndex + 1);
-        projectName = projectName.substring(0, atIndex);
-        if (!projectName) {
-            help(args);
-            return;
-        }
-
-        if (!alias)
-            alias = "default";
-    }
-
-    let mushroomConfig;
-    try {
-        const mushroomConfigContent = fs.readFileSync("./mushroom-config.json").toString();
-        mushroomConfig = JSON.parse(mushroomConfigContent);
-    }
-    catch (e) {
-        console.error("mushroom-config.json not found or unable to parse");
-        throw e;
-    }
-
-    if (!mushroomConfig || typeof mushroomConfig !== "object") 
-        throw new Error(`Invalid configuration. Please re-check file mushroom-config.json`);
-
-    if (!mushroomConfig || !mushroomConfig.projects || !mushroomConfig.projects[projectName])
-        throw new Error(`Project not found (${projectName})`);
-
-    const project = mushroomConfig.projects[projectName];
-    if (!project.src)
-        throw new Error("Project source (src) not found");
-    
-    var source;
-    try {
-        const sourceContent = fs.readFileSync(project.src).toString();
-        source = JSON5.parse(sourceContent);
-    }
-    catch(e) {
-        console.error(project.src + " not found or unable to parse");
-        throw e;
-    }
-
-    if (!source || typeof source !== "object") 
-        throw new Error(`Invalid api project configuration. Please re-check file ${project.src}`);
-    
-    if (Array.isArray(source.fragments)) {
-        console.log("Process master file: " + project.src);
-        source = masterFile.processMasterFile(path.dirname(project.src), source);
-        //console.log(source);
-    }
-
-    if (!source || typeof source !== "object") {
-        throw new Error(`${!source}\t${typeof source}\tInvalid api project configuration. Please re-check file ${project.src}`);
-    }
-
-    if (source.name !== projectName) {
-        throw new Error(`Project name is mismatched (${projectName} & ${source.name})`);
-    }
-
-    const type = args[2];
-    switch (type) {
-        case "docs":
-            await genApiDocs(args, projectName, project, alias, source);
-            break;
-        case "db-docs":
-            genDatabaseDocs(args, projectName, project, alias, source);
-            break;
-        case "js-driver":
-            javascriptDriverGenerator.genJavascriptDriver(args, projectName, project, alias, source);
-            break;
-        case "js-driver-tarball":
-            await genJavascriptDriverTarball(args, projectName, project, alias, source);
-            break;
-        case "ts-driver":
-            typescriptDriverGenerator.genTypescriptDriver(args, projectName, project, alias, source);
-            break;
-        case "c#-mongo":
-            csharp.genCSharpMongoDbClasses(args, projectName, project, alias, source);
-            break;
-        case "c#-driver":
-            csharp.genCSharpDriver(args, projectName, project, alias, source);
-            break;
-        case "":
-        case undefined:
-        case "help":
-        case "man":
-            help(args);
-            break;
-        default:
-            help(args, true);
-            break;
-    }
-}
-
-module.exports = gen;
+const fs = require("fs");
+const path = require("path");
+const JSON5 = require("json5");
+const help = require("./help.js");
+
+const masterFile = require("./master-file/master-file");
+
+const genApiDocs = require("./gen/gen-api-docs");
+const genDatabaseDocs = require("./gen/gen-db-docs");
+const javascriptDriverGenerator = require("./gen/gen-js-driver");
+const genJavascriptDriverTarball = require("./gen/gen-js-driver-tarball");
+const typescriptDriverGenerator = require("./gen/gen-ts-driver");
+const csharp = require("./gen/gen-csharp");
+
+async function gen(args) {
+  let projectName = args[1];
+  let alias = "default";
+
+  if (!projectName) {
+    help(args);
+    return;
+  }
+
+  const atIndex = projectName.indexOf("@");
+  if (atIndex !== -1) {
+    alias = projectName.substring(atIndex + 1);
+    projectName = projectName.substring(0, atIndex);
+    if (!projectName) {
+      help(args);
+      return;
+    }
+
+    if (!alias) alias = "default";
+  }
+
+  let mushroomConfig;
+  try {
+    const mushroomConfigContent = fs
+      .readFileSync("./mushroom-config.json")
+      .toString();
+    mushroomConfig = JSON.parse(mushroomConfigContent);
+  } catch (e) {
+    console.error("mushroom-config.json not found or unable to parse");
+    throw e;
+  }
+
+  if (!mushroomConfig || typeof mushroomConfig !== "object")
+    throw new Error(
+      `Invalid configuration. Please re-check file mushroom-config.json`,
+    );
+
+  if (
+    !mushroomConfig ||
+    !mushroomConfig.projects ||
+    !mushroomConfig.projects[projectName]
+  )
+    throw new Error(`Project not found (${projectName})`);
+
+  const project = mushroomConfig.projects[projectName];
+  if (!project.src) throw new Error("Project source (src) not found");
+
+  let source;
+  try {
+    const sourceContent = fs.readFileSync(project.src).toString();
+    source = JSON5.parse(sourceContent);
+  } catch (e) {
+    console.error(project.src + " not found or unable to parse");
+    throw e;
+  }
+
+  if (!source || typeof source !== "object")
+    throw new Error(
+      `Invalid api project configuration. Please re-check file ${project.src}`,
+    );
+
+  if (Array.isArray(source.fragments)) {
+    console.log("Process master file: " + project.src);
+    source = masterFile.processMasterFile(path.dirname(project.src), source);
+  }
+
+  if (!source || typeof source !== "object") {
+    throw new Error(
+      `${!source}\t${typeof source}\tInvalid api project configuration. Please re-check file ${project.src}`,
+    );
+  }
+
+  if (source.name !== projectName) {
+    throw new Error(
+      `Project name is mismatched (${projectName} & ${source.name})`,
+    );
+  }
+
+  const type = args[2];
+  switch (type) {
+    case "docs":
+      await genApiDocs(args, projectName, project, alias, source);
+      break;
+    case "db-docs":
+      genDatabaseDocs(args, projectName, project, alias, source);
+      break;
+    case "js-driver":
+      javascriptDriverGenerator.genJavascriptDriver(
+        args,
+        projectName,
+        project,
+        alias,
+        source,
+      );
+      break;
+    case "js-driver-tarball":
+      await genJavascriptDriverTarball(
+        args,
+        projectName,
+        project,
+        alias,
+        source,
+      );
+      break;
+    case "ts-driver":
+      typescriptDriverGenerator.genTypescriptDriver(
+        args,
+        projectName,
+        project,
+        alias,
+        source,
+      );
+      break;
+    case "c#-mongo":
+      csharp.genCSharpMongoDbClasses(args, projectName, project, alias, source);
+      break;
+    case "c#-driver":
+      csharp.genCSharpDriver(args, projectName, project, alias, source);
+      break;
+    case "":
+    case undefined:
+    case "help":
+    case "man":
+      help(args);
+      break;
+    default:
+      help(args, true);
+      break;
+  }
+}
+
+module.exports = gen;

package/help.js

@@ -1,55 +1,51 @@
-function help(key, wrong) {
-    if (Array.isArray(key))
-        key = key.join(" ");
-
-    if (key){
-        if (wrong)
-            console.log(`Invalid command '${key}'`);
-        else
-            console.log(`Document for '${key}' is comming soon`);
-    }
-    else
-        console.log(`Init a mushroom json file
-    npx mushroom-cli init json ./api/SampleProject.json [silent]
-
-Init a dotnet core project which pre-install Mushroom Server
-    npx mushroom-cli init netcore
-
-Add the mushroom json file into mushroom-config.json
-    npx mushroom-cli config add ./api/yourProjectName.json
-
-Config gen docs api
-    npx mushroom-cli config gen projectName docs ./wwwroot/docs.html [alias aliasName] [features file,auth,mail,driver] [roles Admin,User-Contributor]
-
-Generate docs api (html format)
-    npx mushroom-cli gen projectName[@aliasName] docs [tmp]
-
-Config gen database docs
-    npx mushroom-cli config gen projectName db-docs ./wwwroot/db-docs.html [alias aliasName] [features file,auth,mail]
-
-Generate database docs (html format)
-    npx mushroom-cli gen projectName[@aliasName] db-docs [tmp]
-
-Config gen javascript driver
-    npx mushroom-cli config gen projectName js-driver ./src/api/mushroom.api.js [alias aliasName] [roles Admin,User-Contributor] [tarball tarballName]
-
-Generate javascript driver
-    npx mushroom-cli gen projectName[@aliasName] js-driver
-
-Config gen entities for Mushroom project in CSharp and using MongoDb
-    npx mushroom-cli config gen projectName c#-mongo ./API/Generated.cs [alias aliasName]
-
-Generate entities for Mushroom project in CSharp and using MongoDb
-    npx mushroom-cli gen projectName[@aliasName] c#-mongo
-
-Config gen entities for CSharp project which calls Mushroom API
-    npx mushroom-cli config gen projectName c#-driver ./API/Generated.cs [roles Admin,User-Contributor] [alias aliasName]
-
-Generate entities for CSharp project which calls Mushroom API
-    npx mushroom-cli gen projectName[@aliasName] c#-driver
-
-Disable checking for update:
-    npx mushroom-cli parameters --no-check-update`);
-}
-
-module.exports = help;
+function help(key, wrong) {
+  if (Array.isArray(key)) key = key.join(" ");
+
+  if (key) {
+    if (wrong) console.log(`Invalid command '${key}'`);
+    else console.log(`Document for '${key}' is comming soon`);
+  } else
+    console.log(`Init a mushroom json file
+    npx mushroom-cli init json ./api/SampleProject.json [silent]
+
+Init a dotnet core project which pre-install Mushroom Server
+    npx mushroom-cli init netcore
+
+Add the mushroom json file into mushroom-config.json
+    npx mushroom-cli config add ./api/yourProjectName.json
+
+Config gen docs api
+    npx mushroom-cli config gen projectName docs ./wwwroot/docs.html [alias aliasName] [features file,auth,mail,driver] [roles Admin,User-Contributor]
+
+Generate docs api (html format)
+    npx mushroom-cli gen projectName[@aliasName] docs [tmp]
+
+Config gen database docs
+    npx mushroom-cli config gen projectName db-docs ./wwwroot/db-docs.html [alias aliasName] [features file,auth,mail]
+
+Generate database docs (html format)
+    npx mushroom-cli gen projectName[@aliasName] db-docs [tmp]
+
+Config gen javascript driver
+    npx mushroom-cli config gen projectName js-driver ./src/api/mushroom.api.js [alias aliasName] [roles Admin,User-Contributor] [tarball tarballName]
+
+Generate javascript driver
+    npx mushroom-cli gen projectName[@aliasName] js-driver
+
+Config gen entities for Mushroom project in CSharp and using MongoDb
+    npx mushroom-cli config gen projectName c#-mongo ./API/Generated.cs [alias aliasName]
+
+Generate entities for Mushroom project in CSharp and using MongoDb
+    npx mushroom-cli gen projectName[@aliasName] c#-mongo
+
+Config gen entities for CSharp project which calls Mushroom API
+    npx mushroom-cli config gen projectName c#-driver ./API/Generated.cs [roles Admin,User-Contributor] [alias aliasName]
+
+Generate entities for CSharp project which calls Mushroom API
+    npx mushroom-cli gen projectName[@aliasName] c#-driver
+
+Disable checking for update:
+    npx mushroom-cli parameters --no-check-update`);
+}
+
+module.exports = help;

package/init/init-json.js

@@ -1,106 +1,110 @@
-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}`);
-            });
-        });
-    })
-}
-
-module.exports = initJson;
+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 https://api.siten.vn/gen/template/default.json");
+    fetch("https://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 https://api.siten.vn/gen/template/template-def.json");
+  fetch("https://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(`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);
+
+          fs.writeFile(path, json, (err) => {
+            if (err) throw err;
+            console.log(`Initialized json at ${path}`);
+          });
+        });
+    });
+}
+
+module.exports = initJson;