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

package/README.md

@@ -1,75 +1,83 @@
-# Init
+# Mushroom CLI
+
+## Init
 
 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
+Init a DotNet Core project which pre-install Mushroom Server
 
-    npx mr init netcore projectName [features file,auth,mail]
+    npx mushroom-cli init netcore [projectName]
 
-# Configure
+## Configure
 
 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]
 
 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]
 
 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]
 
 Config gen typescript driver
 
-    npx mr config gen projectName ts-driver ./src/api/mushroom.api.ts [alias aliasName] [roles Admin,User-Contributor]
+    npx mushroom-cli config gen projectName ts-driver ./src/api/mushroom.api.ts [alias aliasName] [roles Admin,User-Contributor]
 
 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]
 
 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] [access-modifier public] [features file,auth,mail]
+    npx mushroom-cli config gen projectName c#-driver ./API/Generated.cs [roles Admin,User-Contributor] [alias aliasName] [access-modifier public] [features file,auth,mail]
 
-# Genarate
+## Genarate
 
 Generate docs api (html format)
 
-    npx mr gen projectName[@aliasName] docs [tmp]
+    npx mushroom-cli gen projectName[@aliasName] docs [tmp]
 
 Generate database docs (html format)
 
-    npx mr gen projectName[@aliasName] db-docs [tmp]
+    npx mushroom-cli gen projectName[@aliasName] db-docs [tmp]
 
 Generate npm package (tarball file)
 
-    npx mr gen projectName[@aliasName] js-driver-tarball
+    npx mushroom-cli gen projectName[@aliasName] js-driver-tarball
 
 Generate javascript driver
 
-    npx mr gen projectName[@aliasName] js-driver
+    npx mushroom-cli gen projectName[@aliasName] js-driver
 
 Generate typescript driver
 
-    npx mr gen projectName[@aliasName] ts-driver
+    npx mushroom-cli gen projectName[@aliasName] ts-driver
 
 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
 
 Generate entities for CSharp project which calls Mushroom API
 
-    npx mr gen projectName[@aliasName] c#-driver
+    npx mushroom-cli gen projectName[@aliasName] c#-driver
+
+## Update
+
+Update ts code
+
+    npx mushroom-cli update ts-code [file-path.ts] [remote-ts-code-url]
 
-# Other
+## Other
 
 Disable checking for update:
 
-    npx mr parameters --no-check-update
+    npx mushroom-cli parameters --no-check-update

package/gen/gen-ts-driver.js

@@ -125,8 +125,8 @@ function genTypescriptDriverString(aliasProject, source) {
     }
 
     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    ")}
 };
@@ -255,7 +255,9 @@ ${customMethodCode}}
     code += `
 mushroom.$using(${JSON.stringify(common.getRootUrl(source))});
 
+(function(){
 ${extensionsCodeLines.join('\n')}
+})();
 
 export interface IApi extends IMushroom {
 ${iApiClassBody}};
@@ -292,8 +294,8 @@ function genDtsString(aliasProject, source) {
     }
 
     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    ")}
 };

package/mr.js

@@ -3,6 +3,7 @@
 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 pkg = require("./package.json");
@@ -19,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;
     }
@@ -42,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`);

package/package.json

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

package/update/tsCode.js

@@ -0,0 +1,20 @@
+const fs = require("fs");
+const fetch = require('node-fetch');
+
+async function updateTsCode(options) {
+    if (!options.output) {
+        console.error("Missing output file path");
+        return;
+    }
+    if (!options.input) {
+        console.error("Missing remote url");
+        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`);
+}
+
+module.exports = updateTsCode;

package/update.js

@@ -0,0 +1,24 @@
+const help = require("./help.js");
+const updateTsCode = require("./update/tsCode");
+
+async function update(args) {
+    let command = args[1];
+    
+    switch (command) {
+        case "ts-code":
+            await updateTsCode({
+                input: args[3],
+                output: args[2]
+            });
+            break;
+        case "help":
+        case "man":
+            help(args);
+            break;
+        default:
+            help(args, true);
+            break;
+    }
+}
+
+module.exports = update;