mushroom-cli 1.1.0-alpha.4 → 1.1.0-alpha.8

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

@@ -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.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"' : ""}
+        ${dependencies.join(',\n        ')}
     }
 }`;
 

package/gen/gen-ts-driver.js

@@ -105,8 +105,9 @@ function genTypescriptDriverString(aliasProject, source) {
     const entities = common.getEntities(source, aliasProject.allowRoles);
 
     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";' : ""}
+export { 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";\nexport { IMushroomAuth, AuthLocalStorage, useAuth, AuthSessionStorage, AuthStorage, AuthStorageConstructor, IAuthExtension, LogoutMode, NoAuthStorage } from "mushroomjs-auth";' : ""}
+${Array.isArray(aliasProject.features) && aliasProject.features.includes("file") ? 'import { IMushroomFile, useFile } from "mushroomjs-file";\nexport { IMushroomFile, useFile, FileContentFormat, IFileExtension, ImageHorizontalAlign, ImageOutputFormat, ImageVerticalAlign } from "mushroomjs-file";' : ""}
 
 export type ISODateValue = string | Date;
 export type IdValue = ${source.idType == "AutoIncInt" || source.idType == "AutoIncLong" ? "number" : "string"};
@@ -119,7 +120,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)};
 `;
 
 
@@ -186,7 +187,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 +205,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 +214,7 @@ ${customMethodCode}}
         }
         
         if (viewCode) {
-            code += `interface ${typescriptClassName}$ViewsResource {
+            code += `export interface ${typescriptClassName}$ViewsResource {
     views: {${viewCode}
     }
 }
@@ -234,10 +235,10 @@ ${Array.isArray(aliasProject.features) && aliasProject.features.includes("auth")
 ${Array.isArray(aliasProject.features) && aliasProject.features.includes("auth") ? "useFile();" : ""}
 mushroom.$using(${JSON.stringify(common.getRootUrl(source))});
 
-interface IApi extends IMushroom {
+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 = ${Array.isArray(aliasProject.features) && aliasProject.features.includes("auth") ? "IMushroomAuth & " : ""}${Array.isArray(aliasProject.features) && aliasProject.features.includes("file") ? "IMushroomFile & " : ""}IApi;
 
 export default mushroom as Api;`;
 
@@ -266,7 +267,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)};
 `;
 
 
@@ -333,7 +334,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 +352,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 +361,7 @@ ${customMethodCode}}
         }
         
         if (viewCode) {
-            code += `interface ${typescriptClassName}$ViewsResource {
+            code += `export interface ${typescriptClassName}$ViewsResource {
     views: {${viewCode}
     }
 }
@@ -373,7 +374,7 @@ ${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;

package/mr.js

@@ -62,7 +62,7 @@ async function run(args) {
 
     if (checkUpdateTask !== null)
         try {
-            var data = await checkUpdateTask;            
+            var data = await checkUpdateTask;
             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]}`);
             }

package/package.json

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