mushroom-cli 1.1.0-alpha.18 → 1.1.0-alpha.19

package/common.js

@@ -1,4 +1,6 @@
 const fs = require("fs");
+const path = require('path');
+const readlineSync = require("readline-sync");
 
 function ensureFolder(path, isFolder) {
     const index = path.lastIndexOf("/");
@@ -125,8 +127,109 @@ function getEntities(projectApiConfiguration, roles, getAll) {
     return entities;
 }
 
+function processTemplate(basePath, templatePath) {
+    const templateJsonContent = fs.readFileSync(path.join(basePath, templatePath)).toString();
+    const template = JSON.parse(templateJsonContent);
+    if (template && typeof template !== "object") {
+        throw new TypeError(`Invalid template file ${templatePath}`);
+    }
+    const commands = template.steps;
+    if (!Array.isArray(commands)) {
+        throw new TypeError(`Invalid template file ${templatePath}`);
+    }
+
+    const variables = {};
+    commands.forEach(command => processCommand(command, basePath, variables));
+    return variables;
+}
+
+function processCommand(command, basePath, variables) {
+    switch (command.command) {
+        case "input":
+            processInputCommand(command, variables);
+            return;
+        case "set":
+            processSetCommand(command, variables);
+            return;
+        case "rename":
+            processRenameCommand(command, basePath, variables);
+            return;
+        case "delete":
+            processDeleteCommand(command, basePath, variables);
+            return;
+        case "replace":
+            processReplaceCommand(command, basePath, variables);
+            return;
+    }
+}
+
+function processInputCommand(command, variables) {
+    const value = readlineSync.question(command.message ?? "");
+    if (command.validation) {
+        if (command.validation.required) {
+            if (value === "") throw new TypeError(`${command.variable} is required`);
+        }
+        if (command.validation.pattern) {
+            if (!new RegExp(command.validation.pattern).test(value)) throw new Error(`${value} is not valid`);
+        }
+    }
+    variables[command.variable] = value;
+}
+
+function processSetCommand(command, variables) {
+    switch (command["function"]) {
+        case "New-GUID":
+            processSetGuidCommand(command.variable, variables);
+            break;
+    }
+}
+
+function processSetGuidCommand(variable, variables) {
+    variables[variable] = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, c => {
+        var r = Math.random() * 16 | 0, v = c == 'x' ? r : (r & 0x3 | 0x8);
+        return v.toString(16);
+    }).toUpperCase();
+}
+
+function processRenameCommand(command, basePath, variables) {
+    const input = replaceVariables(command.input, variables);
+    const output = replaceVariables(command.output, variables);
+
+    fs.renameSync(path.join(basePath, input), path.join(basePath, output));
+}
+
+function processDeleteCommand(command, basePath, variables) {
+    const input = replaceVariables(command.input, variables);
+
+    const deletedPath = path.join(basePath, input);
+    if (fs.lstatSync(deletedPath).isDirectory()) {
+        fs.rmdirSync(deletedPath, {recursive: true, force: true});
+    }
+    else {
+        fs.rmSync(deletedPath, {force: true});
+    }
+}
+
+function processReplaceCommand(command, basePath, variables) {
+    const files = command.input;
+    const pattern = new RegExp(command.pattern, "g");
+    const replacement = replaceVariables(command.replacement, variables);
+
+    files.forEach(file => {
+        const filePath = replaceVariables(file, variables);
+        let content = fs.readFileSync(path.join(basePath, filePath)).toString();
+        content = content.replace(pattern, () => replacement);
+        fs.writeFileSync(path.join(basePath, filePath), content);
+    });
+}
+
+function replaceVariables(str, variables) {
+    return str.replace(/\$\{(\w+)\}/g, (_, varName) => variables[varName] ?? "");
+}
+
 module.exports = {
     ensureFolder: ensureFolder,
-    getRootUrl : getRootUrl,
-    getEntities : getEntities
+    getRootUrl: getRootUrl,
+    getEntities: getEntities,
+    processTemplate: processTemplate
 };

package/docs/docs.html

@@ -4418,7 +4418,7 @@ API.getAuthentication().changePasswordAsync("your account", "your old password",
                     Request header
                     <pre>FileName: string, optional, tên file
 MD5: string, optional, giá trị băm md5 của file
-Tags: string, optional, giá trị các tag của ảnh, mỗi tag cách nhau bởi dấu phải
+Tags: string, optional, giá trị các tag của ảnh, mỗi tag cách nhau bởi dấu phảy
 Content-Format: optional, string, định dạng dữ liệu truyền lên, nhận một trong các giá trị: BINARY, BASE64 hoặc FORMDATA, mặc định là BINARY</pre>
                     Request body
                     <pre>BINARY hoặc BASE64 hoặc FORMDATA</pre>

package/gen/gen-csharp.js

@@ -134,8 +134,10 @@ function generateEnumClass(source, out, field, defaultClassName) {
                 strEnumClasses += `    /// <summary>
     /// ${singleLine(validation.codeHint.validValues.description || field.description)}
     /// </summary>
-    public static class ${enumClassName}
+    public class ${enumClassName}
     {
+        private ${enumClassName}() { }
+
 `;
                 const enumProperties = validation.codeHint.validValues.nameMap || validation.validValues;
                 for (let i = 0; i < enumProperties.length && i < validation.validValues.length; i++) {
@@ -214,7 +216,7 @@ function generateCSharpClassMongoDb(source, className, fields, isRoot, descripti
         }
         content += `        [MongoDB.Bson.Serialization.Attributes.BsonElement("${isRoot && fieldName === "id" ? "_id" : fieldName}")]
         [MongoDB.Bson.Serialization.Attributes.BsonIgnoreIfNull]
-        [Newtonsoft.Json.JsonProperty(PropertyName = "${fieldName}", NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
+        [Newtonsoft.Json.JsonProperty(PropertyName = "${fieldName}", NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore${type === "System.DateTime" ? ", DefaultValueHandling = Newtonsoft.Json.DefaultValueHandling.Ignore" : ""})]
 `;
         if ((field.type === "AutoId" || field.type === "IdRef") && source.idType === "ObjectId") {
             content += "        [MongoDB.Bson.Serialization.Attributes.BsonRepresentation(MongoDB.Bson.BsonType.ObjectId)]" + newLine;
@@ -471,12 +473,16 @@ ${collectionNames}
         }
     }
 
-    public static class ResourceNames
+    public class ResourceNames
     {
+        private ResourceNames() { }
+
 ${resourceNames}
     }
 
-    public static class RoleNames {
+    public class RoleNames {
+        private RoleNames() { }
+
 ${roleNames}
     }
 }
@@ -584,7 +590,7 @@ function generateCSharpClassMongoDbToFolder(source, className, fields, isRoot, d
         }
         content += `        [MongoDB.Bson.Serialization.Attributes.BsonElement("${isRoot && fieldName === "id" ? "_id" : fieldName}")]
         [MongoDB.Bson.Serialization.Attributes.BsonIgnoreIfNull]
-        [Newtonsoft.Json.JsonProperty(PropertyName = "${fieldName}", NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
+        [Newtonsoft.Json.JsonProperty(PropertyName = "${fieldName}", NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore${type === "System.DateTime" ? ", DefaultValueHandling = Newtonsoft.Json.DefaultValueHandling.Ignore" : ""})]
 `;
         if ((field.type === "AutoId" || field.type === "IdRef") && source.idType === "ObjectId") {
             content += "        [MongoDB.Bson.Serialization.Attributes.BsonRepresentation(MongoDB.Bson.BsonType.ObjectId)]" + newLine;
@@ -613,7 +619,7 @@ function generateCSharpClassMongoDbToFolder(source, className, fields, isRoot, d
 
         let strEnumClasses = generateEnumClass(source, {}, field, `${className.toUpperCase()}_${propertyName.toUpperCase()}_ENUM`);
 
-        const match = strEnumClasses.match(/public static class\s+(\w+)/);
+        const match = strEnumClasses.match(/public class\s+(\w+)/);
         if (!match) continue;
         common.ensureFolder(aliasProject.output + "/Enums", true);
         strEnumClasses = `${header}
@@ -860,8 +866,10 @@ ${collectionNames}
 
 namespace ${namespace}
 {
-    public static class ResourceNames
+    public class ResourceNames
     {
+        private ResourceNames() { }
+
 ${resourceNames}
     }
 }
@@ -871,8 +879,10 @@ const roleNamesFileContent = `${header}
 
 namespace ${namespace}
 {
-    public static class RoleNames
+    public class RoleNames
     {
+        private RoleNames() { }
+
 ${roleNames}
     }
 }
@@ -959,7 +969,7 @@ function generateCSharpClassDriver(source, className, fields, description, out)
 `        /// <summary>
         /// ${singleLine(field.description)}
         /// </summary>
-        [Newtonsoft.Json.JsonProperty(PropertyName ="${fieldName}", NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
+        [Newtonsoft.Json.JsonProperty(PropertyName ="${fieldName}", NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore${type === "System.Datetime" ? ", DefaultValueHandling = Newtonsoft.Json.DefaultValueHandling.Ignore" : ""})]
         public ${type} ${propertyName} { get; set; }
 
 `;

package/help.js

@@ -13,7 +13,7 @@ function help(key, wrong) {
     npx mr init json ./api/SampleProject.json [silent]
 
 Init a dotnet core project which pre-install Mushroom Server
-    npx mr init netcore projectName [features file,auth,mail]
+    npx mr init netcore
 
 Add the mushroom json file into mushroom-config.json
     npx mr config add ./api/yourProjectName.json

package/init/init-json.js

@@ -0,0 +1,106 @@
+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;

package/init/init-netcore.js

@@ -0,0 +1,32 @@
+const fs = require("fs");
+const { spawn } = require("child_process");
+const common = require("../common.js");
+
+
+function fetchFromGit() {
+    return new Promise((resolve, reject) => {
+        const git = spawn("git", ["clone", "https://tfs.siten.vn/tfs/Siten/CodeBase/_git/Mushroom", "-b", "full_extensions", "--single-branch"]);
+        git.stdout.on('data', (data) => {
+            console.log(`GIT: ${data}`);
+        });
+        
+        git.stderr.on('data', (data) => {
+            console.error(`GIT: ${data}`);
+        });
+        
+        git.on('close', (code) => {
+            if (code) {
+                reject(new Error(`GIT exited with code ${code}`));
+                return;
+            }
+            resolve();
+        });
+    })
+}
+
+async function initNetCore(args) {
+    await fetchFromGit();
+    common.processTemplate("Mushroom", "mushroom-template.json");
+}
+
+module.exports = initNetCore;

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mushroom-cli",
-  "version": "1.1.0-alpha.18",
+  "version": "1.1.0-alpha.19",
   "description": "Mushroom CLI",
   "main": "mr.js",
   "scripts": {