mushroom-cli 1.1.0-alpha.9 → 1.2.0-alpha.1

package/gen/gen-db-docs.js

@@ -175,7 +175,7 @@ function genDatabaseDocs(args, projectName, project, alias, source) {
     const aliasProject = ((project.dbDocs || {}).alias || {})[alias];
 
     if (!aliasProject) {
-        throw new Error(`Not found gen db-docs configuration. Please run 'npx mr config ${projectName} gen db-docs OUTPUT_FILE.html${alias === "default" ? "" : " alias " + alias}' first`);
+        throw new Error(`Not found gen db-docs configuration. Please run 'npx mushroom-cli config ${projectName} gen db-docs OUTPUT_FILE.html${alias === "default" ? "" : " alias " + alias}' first`);
     }
 
     const entities = common.getEntities(source, aliasProject.allowRoles, true);

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

@@ -63,7 +63,8 @@ async function genJavascriptDriverTarball(args, projectName, project, alias, sou
 
     if (fs.existsSync(dirPath)) {
         console.log("Clean up tarball folder");
-        fs.rmdirSync(dirPath, { recursive: true });
+        // fs.rmdirSync(dirPath, { recursive: true });
+        fs.rmSync(dirPath, { recursive: true });
     }
 
     const tarballFileName = path.join(path.dirname(aliasProject.output), tarballName + ".tar.gz");
@@ -92,7 +93,8 @@ async function genJavascriptDriverTarball(args, projectName, project, alias, sou
     await compressAsync(dirPath, tarballFileName, tarballName);
 
     console.log("Generated tarball file");
-    fs.rmdirSync(dirPath, { recursive: true });
+    // fs.rmdirSync(dirPath, { recursive: true });
+    fs.rmSync(dirPath, { recursive: true });
     console.log("Cleaned up tarball folder");
 }
 

package/gen/gen-js-driver.js

@@ -36,23 +36,34 @@ function genJavascriptDriverString(aliasProject, source) {
 
     if (Array.isArray(aliasProject.features)) {
         if (aliasProject.features.includes("auth")) {
-            extensionsImportLines.push('import * as AuthExtension from "mushroomjs-auth";');
+            extensionsImportLines.push('//import * as AuthExtension from "mushroomjs-auth";');
+            extensionsImportLines.push('var AuthExtension = require("mushroomjs-auth");');
             extensionsExportLines.push('Auth: AuthExtension');
-            extensionsCodeLines.push("AuthExtension.useAuth(AuthExtension.AuthLocalStorage);");
+            extensionsCodeLines.push("AuthExtension.useAuth(AuthExtension.AuthLocalStorage, mushroom_1.default);");
         }
         if (aliasProject.features.includes("file")) {
-            extensionsImportLines.push('import * as FileExtension from "mushroomjs-file";');
+            extensionsImportLines.push('//import * as FileExtension from "mushroomjs-file";');
+            extensionsImportLines.push('var FileExtension = require("mushroomjs-file");');
             extensionsExportLines.push('File: FileExtension');
-            extensionsCodeLines.push("FileExtension.useFile();");
+            extensionsCodeLines.push("FileExtension.useFile(mushroom_1.default);");
         }
     }
 
-    let code = `import mushroom, {defineAsyncResource} from "mushroomjs";
-export * from "mushroomjs";
+    let code = `//import mushroom, {defineAsyncResource} from "mushroomjs";
+Object.defineProperty(exports, "__esModule", { value: true });
+var mushroom_1 = require("mushroomjs");
+var mushroom = mushroom_1.default;
+var defineAsyncResource = mushroom_1.defineAsyncResource;
+
+//export * from "mushroomjs";
+for (var m in mushroom_1) exports[m] = mushroom_1[m];
+
 ${extensionsImportLines.join("\n")}
-export const extensions = {
+//export const extensions = {
+var extensions = {
     ${extensionsExportLines.join(",\n    ")}
 };
+exports.extensions = extensions;
 
 "use strict";
 
@@ -69,7 +80,8 @@ export const extensions = {
                 continue;
 
             actions[actionName] = {
-                clientCache: (actionName === "findById" || actionName === "findMany") && isAllowCache(entity.actions[actionName], true) ? true : undefined
+                clientCache: (actionName === "findById" || actionName === "findMany") && isAllowCache(entity.actions[actionName], true) ? true : undefined,
+                includeTotal: actionName === "findMany" && entity.actions[actionName].some(a => a.includeTotal) ? true: undefined
             };
         }
 
@@ -88,7 +100,8 @@ mushroom.$using(${JSON.stringify(common.getRootUrl(source))});
 
 ${extensionsCodeLines.join('\n')}
 
-export default mushroom;`;
+//export default mushroom;
+exports.default = mushroom;`;
 
     return code;
 }
@@ -97,7 +110,7 @@ function genJavascriptDriver(args, projectName, project, alias, source) {
     const aliasProject = ((project.jsDriver || {}).alias || {})[alias];
 
     if (!aliasProject) {
-        throw new Error(`Not found gen js-driver configuration. Please run 'npx mr config gen ${projectName} js-driver OUTPUT_FILE.js${alias === "default" ? "" : " alias " + alias}' first`);
+        throw new Error(`Not found gen js-driver configuration. Please run 'npx mushroom-cli config gen ${projectName} js-driver OUTPUT_FILE.js${alias === "default" ? "" : " alias " + alias}' first`);
     }
 
     let code = genJavascriptDriverString(aliasProject, source);

package/gen/gen-ts-driver.js

@@ -38,7 +38,7 @@ function toTypeScriptClassName(str) {
         return "_";
     const name = toVietnameseNonTongue(str).replace(/\W/g, "_");
     const c = name.charAt(0);
-    return ('0' <= c && c <= '9' ? '_' : "") + c.toUpperCase() + name.substr(1);
+    return ('0' <= c && c <= '9' ? '_' : "") + c.toUpperCase() + name.substring(1);
 }
 
 function getCSharpTypeFromMushroomType(type) {
@@ -63,26 +63,27 @@ function getCSharpTypeFromMushroomType(type) {
     return "UNKNOWN_TYPE_" + type;
 }
 
-function generateTypescriptClass(objectDefination, indent) {
+function generateTypescriptClass(objectDefination, indent, options) {
     if (!indent) indent = "";
     let code = "{\n";
     for (let fieldName in objectDefination) {
+        const optionalMark = options?.checkRequired && objectDefination[fieldName].required ? "" : "?";
         if (objectDefination[fieldName].type == "object") {
-            code += `${indent}    ${fieldName}?: ${generateTypescriptClass(objectDefination[fieldName].fields, indent + "    ")},
+            code += `${indent}    ${fieldName}${optionalMark}: ${generateTypescriptClass(objectDefination[fieldName].fields, indent + "    ")},
 `;
         }
         else if (objectDefination[fieldName].type == "array") {
             if (objectDefination[fieldName].items.type == "object") {
-                code += `${indent}    ${fieldName}?: ${generateTypescriptClass(objectDefination[fieldName].items.fields, indent + "    ")}[],
+                code += `${indent}    ${fieldName}${optionalMark}: ${generateTypescriptClass(objectDefination[fieldName].items.fields, indent + "    ")}[],
 `;
             }
             else {
-                code += `${indent}    ${fieldName}?: ${getCSharpTypeFromMushroomType(objectDefination[fieldName].items.type)}[],
+                code += `${indent}    ${fieldName}${optionalMark}: ${getCSharpTypeFromMushroomType(objectDefination[fieldName].items.type)}[],
 `;
             }
         }
         else {
-            code += `${indent}    ${fieldName}?: ${getCSharpTypeFromMushroomType(objectDefination[fieldName].type)},
+            code += `${indent}    ${fieldName}${optionalMark}: ${getCSharpTypeFromMushroomType(objectDefination[fieldName].type)},
 `;
         }
     }
@@ -92,7 +93,7 @@ function generateTypescriptClass(objectDefination, indent) {
 
 function generateTypescriptClassFromViewParameters(parameters) {
     if (Array.isArray(parameters)){
-        return '{\n' + parameters.map(p => `    ${p.field}?: ${getCSharpTypeFromMushroomType(p.type || "string")}${p.isArray ? "[]" : ""}`).join(',\n') + '\n}';
+        return '{\n' + parameters.map(p => `    ${p.field}${p.validation?.required ? "" : "?"}: ${getCSharpTypeFromMushroomType(p.type || "string")}${p.isArray ? "[]" : ""}`).join(',\n') + '\n}';
     }
     return '{}';
 }
@@ -114,19 +115,19 @@ function genTypescriptDriverString(aliasProject, source) {
             extensionsImportLines.push('import * as AuthExtension from "mushroomjs-auth";');
             extensionsExportLines.push('File: FileExtension');
             extensionsTypes.push("AuthExtension.IMushroomAuth & ");
-            extensionsCodeLines.push("AuthExtension.useAuth(AuthExtension.AuthLocalStorage);");
+            extensionsCodeLines.push("AuthExtension.useAuth(AuthExtension.AuthLocalStorage, mushroom);");
         }
         if (aliasProject.features.includes("file")) {
             extensionsImportLines.push('import * as FileExtension from "mushroomjs-file";');
             extensionsExportLines.push('Auth: AuthExtension');
             extensionsTypes.push("FileExtension.IMushroomFile & ");
-            extensionsCodeLines.push("FileExtension.useFile();");
+            extensionsCodeLines.push("FileExtension.useFile(mushroom);");
         }
     }
 
     let code = `import mushroom, { defineAsyncResource, defineAsyncView, fireEvent, createRestfulAsyncFunction, IdType, IMushroom, Mushroom, MushroomRequest, MushroomRequestSetting, MushroomRestfulRequest, MushroomResponse, MushroomResourceBase, MushroomListResource, MushroomFindByIdResource, MushroomCreateResource, MushroomBatchCreateResource, MushroomUpdateResource, MushroomBatchUpdateResource, MushroomPartialUpdateResource, MushroomDeleteResource, MushroomBatchDeleteResource, MushroomExtensibleResource, MushroomViewFunction, MushroomError } from "mushroomjs";
-export * from "mushroomjs";
 ${extensionsImportLines.join("\n")}
+export * from "mushroomjs";
 export const extensions = {
     ${extensionsExportLines.join(",\n    ")}
 };
@@ -154,7 +155,8 @@ export type IdValue = ${source.idType == "AutoIncInt" || source.idType == "AutoI
                 continue;
 
             actions[actionName] = {
-                clientCache: (actionName === "findById" || actionName === "findMany") && isAllowCache(entity.actions[actionName], true) ? true : undefined
+                clientCache: (actionName === "findById" || actionName === "findMany") && isAllowCache(entity.actions[actionName], true) ? true : undefined,
+                includeTotal: actionName === "findMany" && entity.actions[actionName].some(a => a.includeTotal) ? true: undefined
             };
 
             switch (actionName) {
@@ -196,7 +198,7 @@ export type IdValue = ${source.idType == "AutoIncInt" || source.idType == "AutoI
                 }
                 default: {
                     if (actionName.indexOf("_raw_http_method_") === 0) {
-                        customMethodCode += `    ${actionName.substr("_raw_http_method_".length)}Async: (rawRequest: MushroomRequest) => Promise<MushroomResponse<any>>,
+                        customMethodCode += `    ${actionName.substring("_raw_http_method_".length)}Async: (rawRequest: MushroomRequest) => Promise<MushroomResponse<any>>,
 `;
                         break;
                     }
@@ -226,13 +228,17 @@ ${customMethodCode}}
             views[viewName] = { clientCache: true };
 
             const viewParameterTypes = viewRoles.map(view => {
-                const type = `${typescriptClassName}$ViewsResource_${viewName}View_${view.grant === "*" ? "" : toTypeScriptClassName(view.grant)}Parameters`;
-                code += `export interface ${type} ${generateTypescriptClassFromViewParameters(view.parameters)};
+                const inputType = `${typescriptClassName}$ViewsResource_${viewName}View_${view.grant === "*" ? "" : toTypeScriptClassName(view.grant)}Parameters`;
+                const outputType = view.codeHint?.output ? `${typescriptClassName}$ViewsResource_${viewName}View_${view.grant === "*" ? "" : toTypeScriptClassName(view.grant)}Result` : 'any';
+                code += `export interface ${inputType} ${generateTypescriptClassFromViewParameters(view.parameters)};
 `;
-                return `MushroomViewFunction<any, ${type}>`;
+                if (view.codeHint?.output)
+                    code += `export interface ${outputType} ${generateTypescriptClass(view.codeHint.output.fields, undefined, {checkRequired: true})};
+`;
+                return `MushroomViewFunction<${outputType}, ${inputType}>`;
             });
             viewCode += `
-        ${viewName}Async: ${viewParameterTypes.join(' & ')},`;
+        ${viewName}Async: ${viewParameterTypes.join(' | ')},`;
         }
         
         if (viewCode) {
@@ -255,7 +261,9 @@ ${customMethodCode}}
     code += `
 mushroom.$using(${JSON.stringify(common.getRootUrl(source))});
 
+(function(){
 ${extensionsCodeLines.join('\n')}
+})();
 
 export interface IApi extends IMushroom {
 ${iApiClassBody}};
@@ -281,19 +289,19 @@ function genDtsString(aliasProject, source) {
     if (Array.isArray(aliasProject.features)) {
         if (aliasProject.features.includes("auth")) {
             extensionsImportLines.push('import * as AuthExtension from "mushroomjs-auth";');
-            extensionsExportLines.push('Auth: typeof AuthExtension');
+            extensionsExportLines.push('Auth: AuthExtension');
             extensionsTypes.push("AuthExtension.IMushroomAuth & ");
         }
         if (aliasProject.features.includes("file")) {
             extensionsImportLines.push('import * as FileExtension from "mushroomjs-file";');
-            extensionsExportLines.push('File: typeof FileExtension');
+            extensionsExportLines.push('File: FileExtension');
             extensionsTypes.push("FileExtension.IMushroomFile & ");
         }
     }
 
     let code = `import { IdType, IMushroom, Mushroom, MushroomRequest, MushroomRequestSetting, MushroomRestfulRequest, MushroomResponse, MushroomResourceBase, MushroomListResource, MushroomFindByIdResource, MushroomCreateResource, MushroomBatchCreateResource, MushroomUpdateResource, MushroomBatchUpdateResource, MushroomPartialUpdateResource, MushroomDeleteResource, MushroomBatchDeleteResource, MushroomExtensibleResource, MushroomViewFunction, MushroomError } from "mushroomjs";
-export * from "mushroomjs";
 ${extensionsImportLines.join("\n")}
+export * from "mushroomjs";
 export declare const extensions = {
     ${extensionsExportLines.join(",\n    ")}
 };
@@ -363,7 +371,7 @@ export declare type IdValue = ${source.idType == "AutoIncInt" || source.idType =
                 }
                 default: {
                     if (actionName.indexOf("_raw_http_method_") === 0) {
-                        customMethodCode += `    ${actionName.substr("_raw_http_method_".length)}Async: (rawRequest: MushroomRequest) => Promise<MushroomResponse<any>>,
+                        customMethodCode += `    ${actionName.substring("_raw_http_method_".length)}Async: (rawRequest: MushroomRequest) => Promise<MushroomResponse<any>>,
 `;
                         break;
                     }
@@ -393,13 +401,17 @@ ${customMethodCode}}
             views[viewName] = { clientCache: true };
 
             const viewParameterTypes = viewRoles.map(view => {
-                const type = `${typescriptClassName}$ViewsResource_${viewName}View_${view.grant === "*" ? "" : toTypeScriptClassName(view.grant)}Parameters`;
-                code += `export interface ${type} ${generateTypescriptClassFromViewParameters(view.parameters)};
+                const inputType = `${typescriptClassName}$ViewsResource_${viewName}View_${view.grant === "*" ? "" : toTypeScriptClassName(view.grant)}Parameters`;
+                const outputType = view.codeHint?.output ? `${typescriptClassName}$ViewsResource_${viewName}View_${view.grant === "*" ? "" : toTypeScriptClassName(view.grant)}Result` : 'any';
+                code += `export interface ${inputType} ${generateTypescriptClassFromViewParameters(view.parameters)};
+`;
+                if (view.codeHint?.output)
+                    code += `export interface ${outputType} ${generateTypescriptClass(view.codeHint.output.fields, undefined, {checkRequired: true})};
 `;
-                return `MushroomViewFunction<any, ${type}>`;
+                return `MushroomViewFunction<${outputType}, ${inputType}>`;
             });
             viewCode += `
-        ${viewName}Async: ${viewParameterTypes.join(' & ')},`;
+        ${viewName}Async: ${viewParameterTypes.join(' | ')},`;
         }
         
         if (viewCode) {
@@ -430,7 +442,7 @@ function genTypescriptDriver(args, projectName, project, alias, source) {
     const aliasProject = ((project.tsDriver || {}).alias || {})[alias];
 
     if (!aliasProject) {
-        throw new Error(`Not found gen ts-driver configuration. Please run 'npx mr config gen ${projectName} ts-driver OUTPUT_FILE.ts${alias === "default" ? "" : " alias " + alias}' first`);
+        throw new Error(`Not found gen ts-driver configuration. Please run 'npx mushroom-cli config gen ${projectName} ts-driver OUTPUT_FILE.ts${alias === "default" ? "" : " alias " + alias}' first`);
     }
 
     const code = genTypescriptDriverString(aliasProject, source);

package/gen.js

@@ -24,8 +24,8 @@ async function gen(args) {
 
     const atIndex = projectName.indexOf("@");
     if (atIndex !== -1) {
-        alias = projectName.substr(atIndex + 1);
-        projectName = projectName.substr(0, atIndex);
+        alias = projectName.substring(atIndex + 1);
+        projectName = projectName.substring(0, atIndex);
         if (!projectName) {
             help(args);
             return;

package/help.js

@@ -10,46 +10,46 @@ function help(key, wrong) {
     }
     else
         console.log(`Init a mushroom json file
-    npx mr init json ./api/SampleProject.json [silent]
+    npx mushroom-cli 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 mushroom-cli init netcore
 
 Add the mushroom json file into mushroom-config.json
-    npx mr config add ./api/yourProjectName.json
+    npx mushroom-cli config add ./api/yourProjectName.json
 
 Config gen docs api
-    npx mr config gen projectName docs ./wwwroot/docs.html [alias aliasName] [features file,auth,mail,driver] [roles Admin,User-Contributor]
+    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 mr gen projectName[@aliasName] docs [tmp]
+    npx mushroom-cli gen projectName[@aliasName] docs [tmp]
 
 Config gen database docs
-    npx mr config gen projectName db-docs ./wwwroot/db-docs.html [alias aliasName] [features file,auth,mail]
+    npx mushroom-cli config gen projectName db-docs ./wwwroot/db-docs.html [alias aliasName] [features file,auth,mail]
 
 Generate database docs (html format)
-    npx mr gen projectName[@aliasName] db-docs [tmp]
+    npx mushroom-cli gen projectName[@aliasName] db-docs [tmp]
 
 Config gen javascript driver
-    npx mr config gen projectName js-driver ./src/api/mushroom.api.js [alias aliasName] [roles Admin,User-Contributor] [tarball tarballName]
+    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 mr gen projectName[@aliasName] js-driver
+    npx mushroom-cli gen projectName[@aliasName] js-driver
 
 Config gen entities for Mushroom project in CSharp and using MongoDb
-    npx mr config gen projectName c#-mongo ./API/Generated.cs [alias aliasName]
+    npx mushroom-cli config gen projectName c#-mongo ./API/Generated.cs [alias aliasName]
 
 Generate entities for Mushroom project in CSharp and using MongoDb
-    npx mr gen projectName[@aliasName] c#-mongo
+    npx mushroom-cli gen projectName[@aliasName] c#-mongo
 
 Config gen entities for CSharp project which calls Mushroom API
-    npx mr config gen projectName c#-driver ./API/Generated.cs [roles Admin,User-Contributor] [alias aliasName]
+    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 mr gen projectName[@aliasName] c#-driver
+    npx mushroom-cli gen projectName[@aliasName] c#-driver
 
 Disable checking for update:
-    npx mr parameters --no-check-update`);
+    npx mushroom-cli parameters --no-check-update`);
 }
 
 module.exports = help;

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/master-file/master-file.js

@@ -41,9 +41,9 @@ function transformViewNode(view) {
 
 function mergeApiProject(totalProject, fragmentProject, options) {
     if (totalProject.name != null && fragmentProject.name != null && fragmentProject.name != totalProject.name)
-        throw new Error(`Unable merge project '${fragmentProject.name}' into '${totalProject.name}`);
+        throw new Error(`Unable merge project '${fragmentProject.name}' into '${totalProject.name}'`);
     if (totalProject.version != null && fragmentProject.version != null && fragmentProject.version != totalProject.version)
-        throw new Error(`Unable merge project '${fragmentProject.version}' into '${totalProject.version}`);
+        throw new Error(`Unable merge project '${fragmentProject.version}' into '${totalProject.version}'`);
 
     if (fragmentProject.environmentVariables != null) {
         totalProject.environmentVariables = totalProject.environmentVariables || {};
@@ -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"
                         }
                     });