mushroom-cli 1.1.0 → 1.1.1

package/common.js

@@ -12,7 +12,7 @@ function ensureFolder(path, isFolder) {
         return;
 
     if (!fs.existsSync(path)) {
-        fs.mkdirSync(path, { recursive: true, mode: 0755 });
+        fs.mkdirSync(path, { recursive: true, mode: 493 }); // 493 = 755 in octa
     }
 }
 
@@ -41,7 +41,7 @@ function getEntities(projectApiConfiguration, roles, getAll) {
             return;
         }
 
-        for (var actionName in entity.actions) {
+        for (const actionName in entity.actions) {
             if (!entity.actions.hasOwnProperty(actionName))
                 continue;
 
@@ -49,7 +49,7 @@ function getEntities(projectApiConfiguration, roles, getAll) {
                 if (!action.grant || !action.enabled || action.codeHint && action.codeHint.disabled)
                     return;
 
-                var allow = roles.indexOf("*") !== -1 || action.grant === "*";
+                let allow = roles.indexOf("*") !== -1 || action.grant === "*";
 
                 if (!allow)
                     action.grant.split("|").forEach(function (roleGroup) {
@@ -81,7 +81,7 @@ function getEntities(projectApiConfiguration, roles, getAll) {
 
         }
 
-        for (var viewName in entity.views) {
+        for (const viewName in entity.views) {
             if (!entity.views.hasOwnProperty(viewName))
                 continue;
 
@@ -89,7 +89,7 @@ function getEntities(projectApiConfiguration, roles, getAll) {
                 if (!view.grant || !view.enabled)
                     return;
 
-                var allow = roles.indexOf("*") !== -1 || view.grant === "*";
+                let allow = roles.indexOf("*") !== -1 || view.grant === "*";
 
                 view.grant.split("|").forEach(function (roleGroup) {
                     if (!roleGroup)
@@ -186,7 +186,8 @@ function processSetCommand(command, variables) {
 
 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);
+        const r = Math.random() * 16 | 0;
+        const v = c == 'x' ? r : (r & 0x3 | 0x8);
         return v.toString(16);
     }).toUpperCase();
 }
@@ -203,7 +204,6 @@ function processDeleteCommand(command, basePath, variables) {
 
     const deletedPath = path.join(basePath, input);
     if (fs.lstatSync(deletedPath).isDirectory()) {
-        // fs.rmdirSync(deletedPath, {recursive: true, force: true});
         fs.rmSync(deletedPath, {recursive: true, force: true});
     }
     else {

package/config.js

@@ -4,7 +4,7 @@ const JSON5 = require("json5");
 
 //#region common function
 function saveConfig(mushroomConfig, success) {
-    mushroomConfig["$schema"] = "http://schema.siten.vn/mushroom/mushroom-cli.json";
+    mushroomConfig["$schema"] = "https://schema.siten.vn/mushroom/mushroom-cli.json";
     fs.writeFile("./mushroom-config.json", JSON.stringify(mushroomConfig, null, "  "), err => {
         if (err)
             throw err;
@@ -25,7 +25,7 @@ function configAdd(args) {
     }
 
     const fileContent = fs.readFileSync(filePath).toString();
-    var project = JSON5.parse(fileContent);
+    const project = JSON5.parse(fileContent);
     if (!project.name) {
         throw new TypeError(`Missing name in ${filePath}`);
     }

package/docs/docs.html

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html lang="vi">
 <head>
     <meta charset="utf-8" />
     <title>Restful API Document</title>
@@ -258,19 +258,19 @@
                     <li>
                         Web
                         <ul>
-                            <li><a href="https://www.npmjs.com/package/mushroomjs" target="_blank">Mushroom js driver</a></li>
-                            <li><a href="https://www.npmjs.com/package/mushroomjs-auth" target="_blank">Extension Authentication</a></li>
-                            <li><a href="https://www.npmjs.com/package/mushroomjs-file" target="_blank">Extension File</a></li>
-                            <li><a href="http://api.siten.vn/js/mushroom.mailing.es6.js" target="_blank">Extension Mailing</a></li>
+                            <li><a rel="noopener" href="https://www.npmjs.com/package/mushroomjs" target="_blank">Mushroom js driver</a></li>
+                            <li><a rel="noopener" href="https://www.npmjs.com/package/mushroomjs-auth" target="_blank">Extension Authentication</a></li>
+                            <li><a rel="noopener" href="https://www.npmjs.com/package/mushroomjs-file" target="_blank">Extension File</a></li>
+                            <li><a rel="noopener" href="https://api.siten.vn/js/mushroom.mailing.es6.js" target="_blank">Extension Mailing</a></li>
                         </ul>
                     </li>
                     <li>
                         React Native
                         <ul>
-                            <li><a href="https://www.npmjs.com/package/mushroomjs" target="_blank">Mushroom js driver</a></li>
-                            <li><a href="https://www.npmjs.com/package/mushroomjs-auth-rn" target="_blank">Extension Authentication</a></li>
-                            <li><a href="http://api.siten.vn/js/mushroom.file.react.js" target="_blank">Extension File</a></li>
-                            <li><a href="http://api.siten.vn/js/mushroom.mailing.es6.js" target="_blank">Extension Mailing</a></li>
+                            <li><a rel="noopener" href="https://www.npmjs.com/package/mushroomjs" target="_blank">Mushroom js driver</a></li>
+                            <li><a rel="noopener" href="https://www.npmjs.com/package/mushroomjs-auth-rn" target="_blank">Extension Authentication</a></li>
+                            <li><a rel="noopener" href="https://api.siten.vn/js/mushroom.file.react.js" target="_blank">Extension File</a></li>
+                            <li><a rel="noopener" href="https://api.siten.vn/js/mushroom.mailing.es6.js" target="_blank">Extension Mailing</a></li>
                         </ul>
                     </li>
                 </ul>
@@ -282,7 +282,7 @@
                 CSharp
             </div>
             <div class="panel-body">
-                Sử dụng NUGET tại <a href="https://www.nuget.org/packages/Mushroom.Driver/" target="_blank">đây</a>
+                Sử dụng NUGET tại <a rel="noopener" href="https://www.nuget.org/packages/Mushroom.Driver/" target="_blank">đây</a>
             </div>
         </div>
         <div class="panel panel-primary" id="extension-$driver-java">
@@ -290,8 +290,8 @@
                 Java
             </div>
             <div class="panel-body">
-                Sử dụng Maven tại <a href="javascript:void(0)" target="_blank">đây (coming soon)</a><br />
-                Sử dụng Gradle tại <a href="javascript:void(0)" target="_blank">đây (coming soon)</a>
+                Sử dụng Maven tại <a rel="noopener" href="javascript:void(0)" target="_blank">đây (coming soon)</a><br />
+                Sử dụng Gradle tại <a rel="noopener" href="javascript:void(0)" target="_blank">đây (coming soon)</a>
             </div>
         </div>
     </div>
@@ -4578,7 +4578,7 @@ BINARY|BASE64|FORMDATA</pre>
                     <h4>Byte serving</h4>
                     Hỗ trợ download một phần nội dung của file (hỗ trợ pause, resume download) bằng cách truyền lên thông số range qua request header:
                     <pre>Range: string, optional, là định nghĩa khoảng dữ liệu mong muốn nhận được</pre>
-                    Xem thêm tại <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Range" target="_blank">Range header document</a><br />
+                    Xem thêm tại <a rel="noopener" href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Range" target="_blank">Range header document</a><br />
                     <br />
                     Khi có thông số Range, response có định dạng sau:<br />
                     Trường hợp có lỗi:<br />

package/docs/mt-dom-1.0.js

@@ -235,6 +235,7 @@
                         case "html-element":
                             return x1 instanceof HTMLElement;
                     }
+                    return false;
                 }
             case "in":
                 {

package/gen/gen-api-docs.js

@@ -1,6 +1,5 @@
 const fs = require("fs");
 const open = require("open");
-const fetch = require('node-fetch');
 const jsdom = require("jsdom");
 const { JSDOM } = jsdom;
 const common = require("../common.js");
@@ -117,7 +116,6 @@ async function genDocs(args, projectName, project, alias, source) {
         }
     }
 
-    //const html = await fetch('https://api.siten.vn/gen/docs.html').then(res => res.text());
     const html = fs.readFileSync(__dirname + "/../docs/docs.html").toString();
     await processGenDocs(aliasProject, entities, source, html, args, projectName, alias);
 }

package/gen/gen-csharp.js

@@ -1,6 +1,6 @@
 const fs = require("fs");
 const common = require("../common.js");
-const package = require("./../package.json");
+const package_json = require("./../package.json");
 
 //#region shared function
 const newLine = `
@@ -31,7 +31,7 @@ function singleLine(str) {
 function toVietnameseNonTongue(str) {
     const signText = "ăâđêôơưàảãạáằẳẵặắầẩẫậấèẻẽẹéềểễệếìỉĩịíòỏõọóồổỗộốờởỡợớùủũụúừửữựứỳỷỹỵýĂÂĐÐÊÔƠƯÀẢÃẠÁẰẲẴẶẮẦẨẪẬẤÈẺẼẸÉỀỂỄỆẾÌỈĨỊÍÒỎÕỌÓỒỔỖỘỐỜỞỠỢỚÙỦŨỤÚỪỬỮỰỨỲỶỸỴÝ";
     const unsignedText = "aadeoouaaaaaaaaaaaaaaaeeeeeeeeeeiiiiiooooooooooooooouuuuuuuuuuyyyyyAADDEOOUAAAAAAAAAAAAAAAEEEEEEEEEEIIIIIOOOOOOOOOOOOOOOUUUUUUUUUUYYYYY";
-    var returnValue = "";
+    let returnValue = "";
     for (let i = 0; i < str.length; i++) {
         const index = signText.indexOf(str.charAt(i));
         returnValue += index !== -1 ? unsignedText.charAt(index) : str.charAt(i);
@@ -118,7 +118,7 @@ function generateEnumClass(source, out, field, defaultClassName) {
         return "";
     }
 
-    var type = getCSharpTypeFromMushroomType(source, mrType, true);
+    const type = getCSharpTypeFromMushroomType(source, mrType, true);
     
     validation.codeHint = validation.codeHint || {};
     if (validation.validValues) {
@@ -157,9 +157,9 @@ function generateEnumClass(source, out, field, defaultClassName) {
 
 //#region CSharp MongoDb Classes
 function generateCSharpClassMongoDb(source, className, fields, isRoot, description, out) {
-    var strClasses = "";
+    let strClasses = "";
     let strEnumClasses = "";
-    var content = "";
+    let content = "";
     if (description) {
         content += 
             `    /// <summary>
@@ -167,7 +167,7 @@ function generateCSharpClassMongoDb(source, className, fields, isRoot, descripti
     /// </summary>
 `;
     }
-    var supperClass = "";
+    let supperClass = "";
     if (isRoot) {
         // thêm cho trường hợp không khai báo id hoặc id.type
         if (!fields.id) {
@@ -182,13 +182,13 @@ function generateCSharpClassMongoDb(source, className, fields, isRoot, descripti
     content += `    public class ${className}${supperClass}
     {
 `;
-    for (var fieldName in fields) {
+    for (const fieldName in fields) {
         if (!fields.hasOwnProperty(fieldName))
             continue;
 
-        var field = fields[fieldName];
-        var type;
-        var propertyName = toCSharpName(fieldName);
+        const field = fields[fieldName];
+        let type;
+        const propertyName = toCSharpName(fieldName);
         if (field.codeHint && field.codeHint.type && field.codeHint.type.csharp) {
             type = field.codeHint.type.csharp;
         }
@@ -252,7 +252,6 @@ function generateCSharpClassMongoDb(source, className, fields, isRoot, descripti
         out.strEnumClasses = out.strEnumClasses || "";
 
         out.strEnumClasses += strEnumClasses;
-        //console.log("strEnumClasses("+typeof(strEnumClasses)+"):" + strEnumClasses);
     }
 
     return strClasses + newLine + content;
@@ -320,7 +319,7 @@ function genCSharpMongoDbClasses(args, projectName, project, alias, source) {
                     return;
                 if (typeof a.delegator === "string" && a.delegator.indexOf("lib:") === 0) {
                     out.delegators = out.delegators || [];
-                    const method = a.delegator.substr(4, a.delegator.length - 4);
+                    const method = a.delegator.substring(4);
                     let type = a.codeHint && a.codeHint.delegator && a.codeHint.delegator.csharp
                         ? a.codeHint.delegator.csharp.methodType
                         : null;
@@ -332,7 +331,7 @@ function genCSharpMongoDbClasses(args, projectName, project, alias, source) {
                     });
                 }
 
-                if (!a.events && !(typeof a.events === "object")) return;
+                if (!a.events && typeof a.events !== "object") return;
 
                 for (let eventName in a.events) {
                     if (!Array.isArray(a.events[eventName])) return;
@@ -340,7 +339,7 @@ function genCSharpMongoDbClasses(args, projectName, project, alias, source) {
                     out.eventHandlers = out.eventHandlers || [];
                     a.events[eventName].forEach((ev, i) => {
                         if (typeof ev !== "string" || ev.indexOf("lib:") !== 0) return;
-                        const method = ev.substr(4, ev.length - 4);
+                        const method = ev.substring(4);
                         let type = a.codeHint && a.codeHint.events 
                                     && Array.isArray(a.codeHint.events[eventName]) 
                                     && a.codeHint.events[eventName][i] 
@@ -369,7 +368,7 @@ function genCSharpMongoDbClasses(args, projectName, project, alias, source) {
 
                 if (typeof v.query === "string" && v.query.indexOf("lib:") === 0) {
                     out.viewHandlers = out.viewHandlers || [];
-                    const method = v.query.substr(4, v.query.length - 4);
+                    const method = v.query.substring(4);
                     let type = v.codeHint && v.codeHint.query && v.codeHint.query.csharp
                         ? v.codeHint.query.csharp.methodType
                         : null;
@@ -389,7 +388,7 @@ function genCSharpMongoDbClasses(args, projectName, project, alias, source) {
                 if (!channel.nativeBuilder || typeof channel.nativeBuilder !== "string" || channel.nativeBuilder.indexOf("lib:") !== 0) return;
 
                 out.vnTextChannels = out.vnTextChannels || [];
-                const method = channel.nativeBuilder.substr(4, channel.nativeBuilder.length - 4);
+                const method = channel.nativeBuilder.substring(4);
                 let type = channel.codeHint && channel.codeHint.nativeBuilder && channel.codeHint.nativeBuilder.csharp
                     ? channel.codeHint.nativeBuilder.csharp.methodType
                     : null;
@@ -465,7 +464,7 @@ function genCSharpMongoDbClasses(args, projectName, project, alias, source) {
             .join(newLine)
         : "";
 
-    const code = `// This file was generated by Mushroom CLI ${package.version} (https://www.npmjs.com/package/mushroom-cli), please do not modify
+    const code = `// This file was generated by Mushroom CLI ${package_json.version} (https://www.npmjs.com/package/mushroom-cli), please do not modify
 
 // NOTE: Compatible with Mushroom Server version 0.2.18 or higher (https://www.nuget.org/packages/Mushroom/)
 
@@ -566,7 +565,7 @@ ${strJobReferences}
 }
 
 function generateCSharpClassMongoDbToFolder(source, className, fields, isRoot, description, out, aliasProject) {
-    var content = "";
+    let content = "";
     const namespace = toCSharpName(source.name);
     if (description) {
         content += 
@@ -575,7 +574,7 @@ function generateCSharpClassMongoDbToFolder(source, className, fields, isRoot, d
     /// </summary>
 `;
     }
-    var supperClass = "";
+    let supperClass = "";
     if (isRoot) {
         // thêm cho trường hợp không khai báo id hoặc id.type
         if (!fields.id) {
@@ -590,23 +589,23 @@ function generateCSharpClassMongoDbToFolder(source, className, fields, isRoot, d
     content += `    public class ${className}${supperClass}
     {
 `;
-    for (var fieldName in fields) {
+    for (const fieldName in fields) {
         if (!fields.hasOwnProperty(fieldName))
             continue;
 
-        var field = fields[fieldName];
-        var type;
-        var propertyName = toCSharpName(fieldName);
+        const field = fields[fieldName];
+        let type;
+        const propertyName = toCSharpName(fieldName);
         if (field.codeHint && field.codeHint.type && field.codeHint.type.csharp) {
             type = field.codeHint.type.csharp;
         }
         else if (field.type === "object") {
-            generateCSharpClassMongoDbToFolder(source, className + "_" + propertyName, field.fields, false, null, out, aliasProject) + newLine;
+            generateCSharpClassMongoDbToFolder(source, className + "_" + propertyName, field.fields, false, null, out, aliasProject);
             type = className + "_" + propertyName;
         }
         else if (field.type === "array") {
             if (field.items.type === "object") {
-                generateCSharpClassMongoDbToFolder(source, className + "_" + propertyName, field.items.fields, false, null, out, aliasProject) + newLine;
+                generateCSharpClassMongoDbToFolder(source, className + "_" + propertyName, field.items.fields, false, null, out, aliasProject);
                 type = `System.Collections.Generic.List<${className}_${propertyName}>`;
             } else {
                 type = `System.Collections.Generic.List<${getCSharpTypeFromMushroomType(source, field.items.type, field.items.validation && field.items.validation.required)}>`;
@@ -674,7 +673,6 @@ ${strEnumClasses}
     }
 `;
 
-    //return strClasses + newLine + content;
     common.ensureFolder(aliasProject.output + "/Resources", true);
 
     content = `${header}
@@ -708,11 +706,10 @@ function genCSharpMongoDbClassesToFolder(projectName, alias, source, aliasProjec
             fs.unlinkSync(aliasProject.output); // xóa file nếu có
         } catch(e) {}
         try {
-            // fs.rmdirSync(aliasProject.output, { recursive: true, force: true }); // xóa thư mục nếu có
             fs.rmSync(aliasProject.output, { recursive: true, force: true }); // xóa thư mục nếu có
         } catch(e) {}
     }
-    fs.mkdirSync(aliasProject.output, { recursive: true, mode: 0755 });
+    fs.mkdirSync(aliasProject.output, { recursive: true, mode: 493 }); // 493 = 755 in octa
     
     const entities = common.getEntities(source, aliasProject.allowRoles, true);
     
@@ -743,7 +740,6 @@ function genCSharpMongoDbClassesToFolder(projectName, alias, source, aliasProjec
 `;
         resourceNames += `        public static string ${className} => "${entityName}";
 `;
-        //strClasses += generateCSharpClassMongoDbToFolder(source, className, entities[entityName].fields, true, entities[entityName].description, out);
 
         generateCSharpClassMongoDbToFolder(source, className, entities[entityName].fields, true, entities[entityName].description, out, aliasProject);
 
@@ -758,7 +754,7 @@ function genCSharpMongoDbClassesToFolder(projectName, alias, source, aliasProjec
                     return;
                 if (typeof a.delegator === "string" && a.delegator.indexOf("lib:") === 0) {
                     out.delegators = out.delegators || [];
-                    const method = a.delegator.substr(4, a.delegator.length - 4);
+                    const method = a.delegator.substring(4);
                     let type = a.codeHint && a.codeHint.delegator && a.codeHint.delegator.csharp
                         ? a.codeHint.delegator.csharp.methodType
                         : null;
@@ -770,7 +766,7 @@ function genCSharpMongoDbClassesToFolder(projectName, alias, source, aliasProjec
                     });
                 }
 
-                if (!a.events && !(typeof a.events === "object")) return;
+                if (!a.events && typeof a.events !== "object") return;
 
                 for (let eventName in a.events) {
                     if (!Array.isArray(a.events[eventName])) return;
@@ -778,7 +774,7 @@ function genCSharpMongoDbClassesToFolder(projectName, alias, source, aliasProjec
                     out.eventHandlers = out.eventHandlers || [];
                     a.events[eventName].forEach((ev, i) => {
                         if (typeof ev !== "string" || ev.indexOf("lib:") !== 0) return;
-                        const method = ev.substr(4, ev.length - 4);
+                        const method = ev.substring(4);
                         let type = a.codeHint && a.codeHint.events 
                                     && Array.isArray(a.codeHint.events[eventName]) 
                                     && a.codeHint.events[eventName][i] 
@@ -807,7 +803,7 @@ function genCSharpMongoDbClassesToFolder(projectName, alias, source, aliasProjec
 
                 if (typeof v.query === "string" && v.query.indexOf("lib:") === 0) {
                     out.viewHandlers = out.viewHandlers || [];
-                    const method = v.query.substr(4, v.query.length - 4);
+                    const method = v.query.substring(4);
                     let type = v.codeHint && v.codeHint.query && v.codeHint.query.csharp
                         ? v.codeHint.query.csharp.methodType
                         : null;
@@ -827,7 +823,7 @@ function genCSharpMongoDbClassesToFolder(projectName, alias, source, aliasProjec
                 if (!channel.nativeBuilder || typeof channel.nativeBuilder !== "string" || channel.nativeBuilder.indexOf("lib:") !== 0) return;
 
                 out.vnTextChannels = out.vnTextChannels || [];
-                const method = channel.nativeBuilder.substr(4, channel.nativeBuilder.length - 4);
+                const method = channel.nativeBuilder.substring(4);
                 let type = channel.codeHint && channel.codeHint.nativeBuilder && channel.codeHint.nativeBuilder.csharp
                     ? channel.codeHint.nativeBuilder.csharp.methodType
                     : null;
@@ -970,7 +966,7 @@ ${strJobReferences}
 #endif
 `;
 
-    const infoFileContent = `// Mushroom CLI version: ${package.version}${newLine}// Compatible with Mushroom Server version: 0.2.25.4 or higher (https://www.nuget.org/packages/Mushroom/)
+    const infoFileContent = `// Mushroom CLI version: ${package_json.version}${newLine}// Compatible with Mushroom Server version: 0.2.25.4 or higher (https://www.nuget.org/packages/Mushroom/)
 // For Mushroom Server 0.2.18 to 0.2.25.4: Please remove all FindById methods in DbConnector.cs`
 
     fs.writeFileSync(aliasProject.output + "/DbConnector.cs", dbConnectorFileContent);
@@ -985,9 +981,9 @@ ${strJobReferences}
 
 //#region CSharp Driver
 function generateCSharpClassDriver(source, className, fields, description, out) {
-    var strClasses = "";
-    var strEnumClasses = "";
-    var content = "";
+    let strClasses = "";
+    let strEnumClasses = "";
+    let content = "";
     if (description) {
         content +=
 `    /// <summary>
@@ -1051,30 +1047,30 @@ function genCSharpDriver(args, projectName, project, alias, source) {
 
     const entities = common.getEntities(source, aliasProject.allowRoles);
 
-    var namespace = toCSharpName(source.name);
+    const namespace = toCSharpName(source.name);
 
-    var strClasses = "";
-    var strEnumClasses = "";
-    var codeStaticCtor = "";
-    var codeStaticProperties = "";
-    var codeConnectors = "";
-    var codeExtraClasses = "";
+    let strClasses = "";
+    let strEnumClasses = "";
+    let codeStaticCtor = "";
+    let codeStaticProperties = "";
+    let codeConnectors = "";
+    let codeExtraClasses = "";
 
-    var out = {};
+    const out = {};
 
     let accessModifier = aliasProject.accessModifier || "internal";
 
-    for (var entityName in entities) {
+    for (const entityName in entities) {
         if (!entities.hasOwnProperty(entityName))
             continue;
 
-        var className = toCSharpName(entityName);
+        const className = toCSharpName(entityName);
         
         strClasses += generateCSharpClassDriver(source, className, entities[entityName].fields, entities[entityName].description, out);
         codeStaticCtor += `            ${className} = new ${className}Connector(client);${newLine}`;
         codeStaticProperties += `        public static ${className}Connector ${className} { get; }${newLine}${newLine}`;
 
-        var entity = entities[entityName];
+        const entity = entities[entityName];
 
         codeConnectors += `    ${accessModifier} partial class ${className}Connector : MushroomDriver.MushroomResourceConnector<${className}>
     {
@@ -1095,7 +1091,7 @@ function genCSharpDriver(args, projectName, project, alias, source) {
 `;
         }
 
-        for (var actionName in entity.actions) {
+        for (const actionName in entity.actions) {
             if (!entity.actions.hasOwnProperty(actionName))
                 continue;
 
@@ -1182,7 +1178,7 @@ function genCSharpDriver(args, projectName, project, alias, source) {
                     if (actionName.indexOf("_raw_http_method_"))
                         break;
 
-                    var customMethod = toCSharpName(actionName.substring("_raw_http_method_".length));
+                    const customMethod = toCSharpName(actionName.substring("_raw_http_method_".length));
                     
                     codeConnectors += `        public async System.Threading.Tasks.Task<${className}${customMethod}Result> ${customMethod}(${className}${customMethod}Arg arg)
         {
@@ -1287,7 +1283,7 @@ function genCSharpDriver(args, projectName, project, alias, source) {
     {
 `;
                         view.parameters.forEach(p => {
-                            var type = getCSharpTypeFromMushroomType(source, p.type, p.validation && p.validation.required);
+                            let type = getCSharpTypeFromMushroomType(source, p.type, p.validation && p.validation.required);
                             if (p.isArray)
                                 type = `System.Collections.Generic.List<${type}>`;
                             viewExtraClass += `        [Newtonsoft.Json.JsonProperty(PropertyName = "${p.field}")]
@@ -1332,7 +1328,7 @@ ${viewExtraClass}`;
     if (out.strEnumClasses)
         strEnumClasses += out.strEnumClasses;
     
-    const code = `// This file was generated by Mushroom CLI ${package.version} (https://www.npmjs.com/package/mushroom-cli), please do not modify
+    const code = `// This file was generated by Mushroom CLI ${package_json.version} (https://www.npmjs.com/package/mushroom-cli), please do not modify
 
 // Require package: Mushroom.Driver version 1.4.0 or later (https://www.nuget.org/packages/Mushroom.Driver/)
 

package/gen/gen-db-docs.js

@@ -7,7 +7,7 @@ function encodeHtml(str) {
         return "";
     if (typeof str !== "string")
         str = str.toString();
-    var html = str.replace(/&/g, "&");
+    let html = str.replace(/&/g, "&");
     html = html.replace(/</g, "&lt;");
     html = html.replace(/>/g, "&gt;");
     html = html.replace(/"/g, "&quot;");

package/gen/gen-js-driver-tarball.js

@@ -1,9 +1,9 @@
 const fs = require("fs");
 const path = require('path');
-var targz = require('targz');
+const targz = require('targz');
 const javascriptDriverGenerator = require("./gen-js-driver");
 const typescriptDriverGenerator = require("./gen-ts-driver");
-const package = require("./../package.json");
+const package_json = require("./../package.json");
 
 function compressAsync(src, dest, folderName) {
     return new Promise((resolve, reject) => {
@@ -39,7 +39,7 @@ async function genJavascriptDriverTarball(args, projectName, project, alias, sou
 
     const dirPath = path.join(path.dirname(aliasProject.output), tarballName);
 
-    const versionGroup = package.version.match(/([^-]+)(-(\w+).*)?/);
+    const versionGroup = package_json.version.match(/([^-]+)(-(\w+).*)?/);
     const currentDistTag = versionGroup[3] ? versionGroup[3] : "latest";
 
     const dependencies = [`"mushroomjs": "${currentDistTag}"`];
@@ -63,7 +63,6 @@ async function genJavascriptDriverTarball(args, projectName, project, alias, sou
 
     if (fs.existsSync(dirPath)) {
         console.log("Clean up tarball folder");
-        // fs.rmdirSync(dirPath, { recursive: true });
         fs.rmSync(dirPath, { recursive: true });
     }
 
@@ -76,7 +75,7 @@ async function genJavascriptDriverTarball(args, projectName, project, alias, sou
 
     console.log("Creating tarball folder");
 
-    fs.mkdirSync(dirPath, { recursive: true, mode: 0755 });
+    fs.mkdirSync(dirPath, { recursive: true, mode: 493 }); // 493 = 755 in octa
 
     console.log("Generating main file: " + tarballName + ".js");
     let code = javascriptDriverGenerator.genJavascriptDriverString(aliasProject, source);
@@ -93,7 +92,6 @@ async function genJavascriptDriverTarball(args, projectName, project, alias, sou
     await compressAsync(dirPath, tarballFileName, tarballName);
 
     console.log("Generated tarball file");
-    // fs.rmdirSync(dirPath, { recursive: true });
     fs.rmSync(dirPath, { recursive: true });
     console.log("Cleaned up tarball folder");
 }

package/gen/gen-ts-driver.js

@@ -25,7 +25,7 @@ function isAllowCache(actions, defaultValue) {
 function toVietnameseNonTongue(str) {
     const signText = "ăâđêôơưàảãạáằẳẵặắầẩẫậấèẻẽẹéềểễệếìỉĩịíòỏõọóồổỗộốờởỡợớùủũụúừửữựứỳỷỹỵýĂÂĐÐÊÔƠƯÀẢÃẠÁẰẲẴẶẮẦẨẪẬẤÈẺẼẸÉỀỂỄỆẾÌỈĨỊÍÒỎÕỌÓỒỔỖỘỐỜỞỠỢỚÙỦŨỤÚỪỬỮỰỨỲỶỸỴÝ";
     const unsignedText = "aadeoouaaaaaaaaaaaaaaaeeeeeeeeeeiiiiiooooooooooooooouuuuuuuuuuyyyyyAADDEOOUAAAAAAAAAAAAAAAEEEEEEEEEEIIIIIOOOOOOOOOOOOOOOUUUUUUUUUUYYYYY";
-    var returnValue = "";
+    let returnValue = "";
     for (let i = 0; i < str.length; i++) {
         const index = signText.indexOf(str.charAt(i));
         returnValue += index !== -1 ? unsignedText.charAt(index) : str.charAt(i);

package/gen.js

@@ -55,7 +55,7 @@ async function gen(args) {
     if (!project.src)
         throw new Error("Project source (src) not found");
     
-    var source;
+    let source;
     try {
         const sourceContent = fs.readFileSync(project.src).toString();
         source = JSON5.parse(sourceContent);
@@ -71,7 +71,6 @@ async function gen(args) {
     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") {

package/init/init-json.js

@@ -17,8 +17,8 @@ function initJson(args) {
     }
 
     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 => {
+        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 => {
@@ -30,8 +30,8 @@ function initJson(args) {
         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 => {
+    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)
@@ -84,15 +84,13 @@ function initJson(args) {
                 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, ""));
+            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)

package/master-file/master-file.js

@@ -27,7 +27,7 @@ function transformEntityFieldNode(field) {
     if (!field.fields || typeof field.fields !== "object") 
         return;
     
-    for (var fieldName in field.fields) {
+    for (const fieldName in field.fields) {
         transformEntityFieldNode(field.fields[fieldName]);
     }
 }
@@ -48,7 +48,7 @@ function mergeApiProject(totalProject, fragmentProject, options) {
     if (fragmentProject.environmentVariables != null) {
         totalProject.environmentVariables = totalProject.environmentVariables || {};
         
-        for (var name in fragmentProject.environmentVariables) {
+        for (const name in fragmentProject.environmentVariables) {
             if (name in totalProject.environmentVariables) {
                 switch (options.environmentVariable.duplicateNameHandling) {
                     case "override":
@@ -70,7 +70,7 @@ function mergeApiProject(totalProject, fragmentProject, options) {
 
         fragmentProject.entities.forEach(entity => {
 
-            var found = totalProject.entities.some((entityInTotal, i) => {
+            const found = totalProject.entities.some((entityInTotal, i) => {
                 if (entityInTotal.name !== entity.name){
                     return false;
                 }
@@ -89,12 +89,11 @@ function mergeApiProject(totalProject, fragmentProject, options) {
                 return;
 
             totalProject.entities.push(entity);
-            // console.log("add new entity: " + entity.name + "; totalProject.entities.length=" + totalProject.entities.length);
 
             if (!entity.fields || typeof entity.fields !== "object")
                 return;
 
-            for (var fieldName in entity.fields) {
+            for (const fieldName in entity.fields) {
                 transformEntityFieldNode(entity.fields[fieldName]);
             }
         });
@@ -103,7 +102,7 @@ function mergeApiProject(totalProject, fragmentProject, options) {
     if (fragmentProject.views != null) {
         totalProject.views = totalProject.views || {};
 
-        for (var viewName in fragmentProject.views)
+        for (const viewName in fragmentProject.views)
         {
             if (viewName in totalProject.views)
             {
@@ -131,7 +130,7 @@ function mergeApiProject(totalProject, fragmentProject, options) {
     }
 
 
-    for (var name in fragmentProject) {
+    for (const name in fragmentProject) {
         if (name === "environmentVariables" || name === "entities" || name === "views" || name === "$schema")
             continue;
 
@@ -176,7 +175,7 @@ function processMasterFile(basePath, master) {
     if (apiProject == null)
         return null;
 
-    apiProject["$schema"] = "http://schema.siten.vn/mushroom/project.json";
+    apiProject["$schema"] = "https://schema.siten.vn/mushroom/project.json";
 
     if (apiProject.entities == null)
         apiProject.entities = [];

package/mr.js

@@ -36,7 +36,7 @@ async function run(args) {
                 await init(args);
                 break;
             case "config":
-                await config(args);
+                config(args);
                 break;
             case "gen":
                 await gen(args);
@@ -64,7 +64,7 @@ async function run(args) {
 
     if (checkUpdateTask !== null)
         try {
-            var data = await checkUpdateTask;
+            const data = await checkUpdateTask;
             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]} OR yarn add mushroom-cli@^${data["dist-tags"][currentDistTag]}`);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mushroom-cli",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Mushroom CLI",
   "main": "mr.js",
   "scripts": {
@@ -17,7 +17,7 @@
   "author": "suco2007",
   "license": "ISC",
   "dependencies": {
-    "jsdom": "^21.0.0",
+    "jsdom": "^24.1.1",
     "json5": "^2.2.3",
     "node-fetch": "^2.6.7",
     "open": "^8.4.0",

package/sonarqube.yml

@@ -0,0 +1,18 @@
+pool:
+  name: SitenWindows
+
+steps:
+- task: SonarQubePrepare@6
+  inputs:
+    SonarQube: 'SonarQube-MushroomCLI'
+    scannerMode: 'CLI'
+    configMode: 'manual'
+    cliProjectKey: 'MushroomServer_mushroom-cli_AZBIWpTNDwLpW4gwuNzH'
+    cliProjectName: 'mushroom-cli'
+    cliSources: '.'
+
+- task: SonarQubeAnalyze@6
+
+- task: SonarQubePublish@6
+  inputs:
+    pollingTimeoutSec: '300'

package/update/tsCode.js

@@ -2,19 +2,84 @@ const fs = require("fs");
 const fetch = require('node-fetch');
 
 async function updateTsCode(options) {
-    if (!options.output) {
-        console.error("Missing output file path");
+    if (options.input || options.output) {
+        // legacy way
+        if (!options.output) {
+            console.error("Missing output file path");
+            return;
+        }
+        if (!options.input) {
+            console.error("Missing remote url");
+            return;
+        }
+        pullAsync(options.input, output);
+        console.log("Finish update ts-code");
         return;
     }
-    if (!options.input) {
-        console.error("Missing remote url");
+    
+    // new way, using mushroom-config.json file
+    if (!fs.existsSync("mushroom-config.json")) {
+        console.error("Missing mushroom-config.json file");
         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`);
+    const configJson = fs.readFileSync("mushroom-config.json");
+    const config = JSON.parse(configJson);
+    if (!config.update) {
+        console.error("Missing 'update' in mushroom-config.json file");
+        return;
+    }
+    if (!config.update["ts-code"]) {
+        console.error("Missing 'update.ts-code' in mushroom-config.json file");
+        return;
+    }
+
+    const steps = config.update["ts-code"].steps;
+    if (!steps) {
+        console.error("Missing 'update.ts-code.steps' in mushroom-config.json file");
+        return;
+    }
+
+    for (let i = 0; i < steps.length; i++) {
+        const step = steps[i];
+        switch (step.action) {
+            case "pull":
+                await pullAsync(step.source, step.destination);
+                break;
+            case "replace-content":
+                replaceContent(step.source, step.search, step.replacement);
+                break;
+            case "replace-regex":
+                replaceContent(step.source, step.pattern, step.replacement);
+                break;
+            default:
+                console.warn(`Unsupported step action: ${step.action}`);
+                break;
+        }
+    }
+    console.log("Finish update ts-code");
+}
+
+async function pullAsync(input, output) {
+    console.log(`Fetch ${input}`);
+    const res = await fetch(input);
+    console.log(`Write to ${output}`);
+    fs.writeFileSync(output, await res.text());
+}
+
+function replaceContent(input, search, replacement) {
+    console.log(`Replace ${search} by ${replacement} in ${input} file`);
+    const content = fs.readFileSync(input).toString();
+    if (!content) return;
+    const output = content.replace(new RegExp(search.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'), "g"), replacement);
+    fs.writeFileSync(input, output);
+}
+
+function replaceRegex(input, pattern, replacement) {
+    console.log(`Replace pattern ${pattern} by ${replacement} in ${input} file`);
+    const content = fs.readFileSync(input).toString();
+    if (!content) return;
+    const output = content.replace(new RegExp(pattern, "g"), replacement);
+    fs.writeFileSync(input, output);
 }
 
 module.exports = updateTsCode;