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

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

@@ -3,6 +3,7 @@ const path = require('path');
 var targz = require('targz');
 const javascriptDriverGenerator = require("./gen-js-driver");
 const typescriptDriverGenerator = require("./gen-ts-driver");
+const package = require("./../package.json");
 
 function compressAsync(src, dest, folderName) {
     return new Promise((resolve, reject) => {
@@ -37,9 +38,18 @@ async function genJavascriptDriverTarball(args, projectName, project, alias, sou
     tarballName = tarballName.toLowerCase().replace(/[^a-z-]/g, "-");
 
     const dirPath = path.join(path.dirname(aliasProject.output), tarballName);
-    //const mainFileName = path.basename(aliasProject.output);
-    //const dtsFileName = mainFileName.replace(/\.js$/i, ".d.ts");
 
+    const versionGroup = package.version.match(/([^-]+)(-(\w+).*)?/);
+    const currentDistTag = versionGroup[3] ? versionGroup[3] : "latest";
+
+    const dependencies = [`"mushroomjs": "${currentDistTag}"`];
+    if (Array.isArray(aliasProject.features) && aliasProject.features.includes("auth")) {
+        dependencies.push(`"mushroomjs-auth": "${currentDistTag}"`);
+    }
+    if (Array.isArray(aliasProject.features) && aliasProject.features.includes("file")) {
+        dependencies.push(`"mushroomjs-file": "${currentDistTag}"`);
+    }
+    
     const packageContent = `{
     "version": "1.0.${new Date().getTime()}",
     "name": "${tarballName}",
@@ -47,7 +57,7 @@ async function genJavascriptDriverTarball(args, projectName, project, alias, sou
     "main": "${tarballName}.js",
     "types": "${tarballName}.d.ts",
     "dependencies": {
-        "mushroomjs": "^1.1.0-alpha.5"${Array.isArray(aliasProject.features) && aliasProject.features.includes("auth") ? ',\n        "mushroomjs-auth": "^1.1.0-alpha.4"' : ""}${Array.isArray(aliasProject.features) && aliasProject.features.includes("file") ? ',\n        "mushroomjs-file": "^1.1.0-alpha.1"' : ""}
+        ${dependencies.join(',\n        ')}
     }
 }`;
 

package/gen/gen-js-driver.js

@@ -30,9 +30,40 @@ function genJavascriptDriverString(aliasProject, source) {
 
     const entities = common.getEntities(source, aliasProject.allowRoles);
 
-    let code = `import mushroom, {defineAsyncResource} from "mushroomjs";
-${Array.isArray(aliasProject.features) && aliasProject.features.includes("auth") ? 'import { useAuth, AuthLocalStorage } from "mushroomjs-auth";' : ""}
-${Array.isArray(aliasProject.features) && aliasProject.features.includes("file") ? 'import { useFile } from "mushroomjs-file";' : ""}
+    let extensionsImportLines = [];
+    let extensionsExportLines = [];
+    let extensionsCodeLines = [];
+
+    if (Array.isArray(aliasProject.features)) {
+        if (aliasProject.features.includes("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);");
+        }
+        if (aliasProject.features.includes("file")) {
+            extensionsImportLines.push('//import * as FileExtension from "mushroomjs-file";');
+            extensionsImportLines.push('var FileExtension = require("mushroomjs-file");');
+            extensionsExportLines.push('File: FileExtension');
+            extensionsCodeLines.push("FileExtension.useFile();");
+        }
+    }
+
+    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 = {
+var extensions = {
+    ${extensionsExportLines.join(",\n    ")}
+};
+exports.extensions = extensions;
 
 "use strict";
 
@@ -66,10 +97,10 @@ ${Array.isArray(aliasProject.features) && aliasProject.features.includes("file")
     code += `
 mushroom.$using(${JSON.stringify(common.getRootUrl(source))});
 
-${Array.isArray(aliasProject.features) && aliasProject.features.includes("auth") ? "useAuth(AuthLocalStorage);" : ""}
-${Array.isArray(aliasProject.features) && aliasProject.features.includes("auth") ? "useFile();" : ""}
+${extensionsCodeLines.join('\n')}
 
-export default mushroom;`;
+//export default mushroom;
+exports.default = mushroom;`;
 
     return code;
 }

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) {
@@ -104,9 +104,32 @@ function genTypescriptDriverString(aliasProject, source) {
 
     const entities = common.getEntities(source, aliasProject.allowRoles);
 
+    let extensionsImportLines = [];
+    let extensionsExportLines = [];
+    let extensionsTypes = [];
+    let extensionsCodeLines = [];
+
+    if (Array.isArray(aliasProject.features)) {
+        if (aliasProject.features.includes("auth")) {
+            extensionsImportLines.push('import * as AuthExtension from "mushroomjs-auth";');
+            extensionsExportLines.push('File: FileExtension');
+            extensionsTypes.push("AuthExtension.IMushroomAuth & ");
+            extensionsCodeLines.push("AuthExtension.useAuth(AuthExtension.AuthLocalStorage);");
+        }
+        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();");
+        }
+    }
+
     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";
-${Array.isArray(aliasProject.features) && aliasProject.features.includes("auth") ? 'import { IMushroomAuth, useAuth, AuthLocalStorage } from "mushroomjs-auth";' : ""}
-${Array.isArray(aliasProject.features) && aliasProject.features.includes("file") ? 'import { IMushroomFile, useFile } from "mushroomjs-file";' : ""}
+${extensionsImportLines.join("\n")}
+export * from "mushroomjs";
+export const extensions = {
+    ${extensionsExportLines.join(",\n    ")}
+};
 
 export type ISODateValue = string | Date;
 export type IdValue = ${source.idType == "AutoIncInt" || source.idType == "AutoIncLong" ? "number" : "string"};
@@ -119,7 +142,7 @@ export type IdValue = ${source.idType == "AutoIncInt" || source.idType == "AutoI
 
         const entity = entities[entityName];
         const typescriptClassName = toTypeScriptClassName(entityName);
-        code += `interface ${typescriptClassName} ${generateTypescriptClass(entity.fields)};
+        code += `export interface ${typescriptClassName} ${generateTypescriptClass(entity.fields)};
 `;
 
 
@@ -173,7 +196,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;
                     }
@@ -186,7 +209,7 @@ export type IdValue = ${source.idType == "AutoIncInt" || source.idType == "AutoI
         }
 
         if (customMethodCode) {
-            code += `interface ${typescriptClassName}$CustomMethodResource {
+            code += `export interface ${typescriptClassName}$CustomMethodResource {
 ${customMethodCode}}
 `;
             iApiClassBody += ` & ${typescriptClassName}$CustomMethodResource`;
@@ -204,7 +227,7 @@ ${customMethodCode}}
 
             const viewParameterTypes = viewRoles.map(view => {
                 const type = `${typescriptClassName}$ViewsResource_${viewName}View_${view.grant === "*" ? "" : toTypeScriptClassName(view.grant)}Parameters`;
-                code += `interface ${type} ${generateTypescriptClassFromViewParameters(view.parameters)};
+                code += `export interface ${type} ${generateTypescriptClassFromViewParameters(view.parameters)};
 `;
                 return `MushroomViewFunction<any, ${type}>`;
             });
@@ -213,7 +236,7 @@ ${customMethodCode}}
         }
         
         if (viewCode) {
-            code += `interface ${typescriptClassName}$ViewsResource {
+            code += `export interface ${typescriptClassName}$ViewsResource {
     views: {${viewCode}
     }
 }
@@ -230,14 +253,16 @@ ${customMethodCode}}
     }
 
     code += `
-${Array.isArray(aliasProject.features) && aliasProject.features.includes("auth") ? "useAuth(AuthLocalStorage);" : ""}
-${Array.isArray(aliasProject.features) && aliasProject.features.includes("auth") ? "useFile();" : ""}
 mushroom.$using(${JSON.stringify(common.getRootUrl(source))});
 
-interface IApi extends IMushroom {
+(function(){
+${extensionsCodeLines.join('\n')}
+})();
+
+export interface IApi extends IMushroom {
 ${iApiClassBody}};
 
-type Api = ${Array.isArray(aliasProject.features) && aliasProject.features.includes("auth") ? "IMushroomAuth & " : ""}${Array.isArray(aliasProject.features) && aliasProject.features.includes("file") ? "IMushroomFile & " : ""}IApi;
+export type Api = ${extensionsTypes.join('')}IApi;
 
 export default mushroom as Api;`;
 
@@ -251,9 +276,29 @@ function genDtsString(aliasProject, source) {
 
     const entities = common.getEntities(source, aliasProject.allowRoles);
 
+    let extensionsImportLines = [];
+    let extensionsExportLines = [];
+    let extensionsTypes = [];
+
+    if (Array.isArray(aliasProject.features)) {
+        if (aliasProject.features.includes("auth")) {
+            extensionsImportLines.push('import * as AuthExtension from "mushroomjs-auth";');
+            extensionsExportLines.push('Auth: AuthExtension');
+            extensionsTypes.push("AuthExtension.IMushroomAuth & ");
+        }
+        if (aliasProject.features.includes("file")) {
+            extensionsImportLines.push('import * as FileExtension from "mushroomjs-file";');
+            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";
-${Array.isArray(aliasProject.features) && aliasProject.features.includes("auth") ? 'import { IMushroomAuth } from "mushroomjs-auth";' : ""}
-${Array.isArray(aliasProject.features) && aliasProject.features.includes("file") ? 'import { IMushroomFile } from "mushroomjs-file";' : ""}
+${extensionsImportLines.join("\n")}
+export * from "mushroomjs";
+export declare const extensions = {
+    ${extensionsExportLines.join(",\n    ")}
+};
 
 export declare type ISODateValue = string | Date;
 export declare type IdValue = ${source.idType == "AutoIncInt" || source.idType == "AutoIncLong" ? "number" : "string"};
@@ -266,7 +311,7 @@ export declare type IdValue = ${source.idType == "AutoIncInt" || source.idType =
 
         const entity = entities[entityName];
         const typescriptClassName = toTypeScriptClassName(entityName);
-        code += `interface ${typescriptClassName} ${generateTypescriptClass(entity.fields)};
+        code += `export interface ${typescriptClassName} ${generateTypescriptClass(entity.fields)};
 `;
 
 
@@ -320,7 +365,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;
                     }
@@ -333,7 +378,7 @@ export declare type IdValue = ${source.idType == "AutoIncInt" || source.idType =
         }
 
         if (customMethodCode) {
-            code += `interface ${typescriptClassName}$CustomMethodResource {
+            code += `export interface ${typescriptClassName}$CustomMethodResource {
 ${customMethodCode}}
 `;
             iApiClassBody += ` & ${typescriptClassName}$CustomMethodResource`;
@@ -351,7 +396,7 @@ ${customMethodCode}}
 
             const viewParameterTypes = viewRoles.map(view => {
                 const type = `${typescriptClassName}$ViewsResource_${viewName}View_${view.grant === "*" ? "" : toTypeScriptClassName(view.grant)}Parameters`;
-                code += `interface ${type} ${generateTypescriptClassFromViewParameters(view.parameters)};
+                code += `export interface ${type} ${generateTypescriptClassFromViewParameters(view.parameters)};
 `;
                 return `MushroomViewFunction<any, ${type}>`;
             });
@@ -360,7 +405,7 @@ ${customMethodCode}}
         }
         
         if (viewCode) {
-            code += `interface ${typescriptClassName}$ViewsResource {
+            code += `export interface ${typescriptClassName}$ViewsResource {
     views: {${viewCode}
     }
 }
@@ -373,10 +418,10 @@ ${customMethodCode}}
     }
 
     code += `
-interface IApi extends IMushroom {
+export interface IApi extends IMushroom {
 ${iApiClassBody}};
 
-declare type Api = ${Array.isArray(aliasProject.features) && aliasProject.features.includes("auth") ? "IMushroomAuth & " : ""}${Array.isArray(aliasProject.features) && aliasProject.features.includes("file") ? "IMushroomFile & " : ""}IApi;
+declare type Api = ${extensionsTypes.join('')}IApi;
 declare const _default: Api;
 export default _default;`;
 

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

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

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

package/mr.js

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