mushroom-cli 1.1.0-alpha.1 → 1.1.0-alpha.5

package/README.md

@@ -26,6 +26,10 @@ Config gen javascript driver
 
     npx mr 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]
+
 Config gen entities for Mushroom project in CSharp and using MongoDb
 
     npx mr config gen projectName c#-mongo ./API/Generated.cs [alias aliasName]
@@ -44,10 +48,18 @@ Generate database docs (html format)
 
     npx mr gen projectName[@aliasName] db-docs [tmp]
 
+Generate npm package (tarball file)
+
+    npx mr gen projectName[@aliasName] js-driver-tarball
+
 Generate javascript driver
 
     npx mr gen projectName[@aliasName] js-driver
 
+Generate typescript driver
+
+    npx mr gen projectName[@aliasName] ts-driver
+
 Generate entities for Mushroom project in CSharp and using MongoDb
 
     npx mr gen projectName[@aliasName] c#-mongo

package/check-update.js

@@ -2,7 +2,7 @@ const fetch = require('node-fetch');
 
 
 function checkUpdate() {
-    return fetch('https://registry.npmjs.org/mushroom-cli/latest')
+    return fetch('https://registry.npmjs.org/mushroom-cli/')
         .then(res => res.json());
 }
 

package/gen/gen-api-docs.js

@@ -9,6 +9,8 @@ function processGenDocs(aliasProject, entities, source, html, args, projectName,
     console.log('Received html');
     console.log("Parsing html");
 
+    const roles = aliasProject.allowRoles.includes("*") ? source.roles : source.roles?.filter(r => aliasProject.allowRoles.includes(r.name));
+    
     html = html.replace(/^\uFEFF/, '');
     html = html.replace(/<script src=(["'])\/\//g, "<script src=$1http://");
     html = html.replace("</body>", `<script data-mt-cond='{"x": 1}'>
@@ -16,9 +18,11 @@ function processGenDocs(aliasProject, entities, source, html, args, projectName,
     window.data.description = ${JSON.stringify(source.description)};
     window.data.rootUrl = ${JSON.stringify(common.getRootUrl(source))};
     window.data.environmentVariables = ${JSON.stringify(source.environmentVariables)};
+    window.data.roles = ${JSON.stringify(roles)};
     window.data.entities = ${JSON.stringify(entities)};
     window.data.features = ${JSON.stringify(aliasProject.features)};
-    try{
+    try {
+        console.info("MUSHROOM-CLI: START");
         window.generateDocument();
         console.info("MUSHROOM-CLI: FINISH");
     }
@@ -31,6 +35,12 @@ function processGenDocs(aliasProject, entities, source, html, args, projectName,
     return new Promise((resolve, reject) => {
         const virtualConsole = new jsdom.VirtualConsole();
         virtualConsole.on("info", function(msg, err) {
+            if (typeof msg != "string") return;
+
+            if (msg.indexOf("MUSHROOM-CLI:") === 0) {
+                console.log("GenDocEngine:" + msg.substr("MUSHROOM-CLI:".length));
+            }
+
             if (msg === "MUSHROOM-CLI: FAIL"){
                 dom = null;
                 reject(err);

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

@@ -47,7 +47,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"' : ""}
+        "mushroomjs": "^1.1.0-alpha.7"${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"' : ""}
     }
 }`;
 

package/gen/gen-js-driver.js

@@ -30,13 +30,12 @@ function genJavascriptDriverString(aliasProject, source) {
 
     const entities = common.getEntities(source, aliasProject.allowRoles);
 
-    let code = `import mushroom from "mushroomjs";
+    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";' : ""}
 
 "use strict";
 
-
-const rootApiUrl = ${JSON.stringify(common.getRootUrl(source))};
-
 `;
     for (let entityName in entities) {
         if (!entities.hasOwnProperty(entityName))
@@ -61,11 +60,14 @@ const rootApiUrl = ${JSON.stringify(common.getRootUrl(source))};
 
             views[viewName] = {};
         }
-        code += `mushroom._defineAsyncResource({name:${JSON.stringify(entityName)},actions:${JSON.stringify(actions)},views:${JSON.stringify(views)}});
+        code += `defineAsyncResource({name:${JSON.stringify(entityName)},actions:${JSON.stringify(actions)},views:${JSON.stringify(views)}});
 `;
     }
     code += `
-mushroom.$using(rootApiUrl);
+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();" : ""}
 
 export default mushroom;`;
 

package/mr.js

@@ -8,6 +8,10 @@ const help = require("./help.js");
 const package = require("./package.json");
 const checkUpdate = require("./check-update");
 
+const versionGroup = package.version.match(/([^-]+)(-(\w+).*)?/);
+const currentDistTag = versionGroup[3] ? versionGroup[3] : "latest";
+console.log("Mushroom CLI version " +  package.version);
+
 async function run(args) {
     let debugMode = false;
     if (args.indexOf("--debug") !== -1) {
@@ -59,8 +63,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] !== package.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) {

package/package.json

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