mushroom-cli 1.2.0-alpha.10 → 1.2.0-alpha.11

package/docs/docs.v2.js

@@ -1,7 +1,7 @@
 function toCSharpName(str) {
     if (typeof str != "string" || str === "") return "";
     const name = str.replace(/\W/g, "_");
-    return name.charAt(0).toUpperCase() + name.substr(1);
+    return name.charAt(0).toUpperCase() + name.substring(1);
 }
 function encodeHtml(data) {
     if (data === undefined || data === null)
@@ -34,7 +34,7 @@ function getApiDomain(url) {
 }
 function getApiPath(url) {
     const m = url.match(/^(\w+:)?\/\/([\w-]+\.)+\w+(:\d+)?/);
-    return m ? url.substr(m[0].length) : url;
+    return m ? url.substring(m[0].length) : url;
 }
 
 function getPanelClass(actionName) {
@@ -75,7 +75,7 @@ function getHttpMethod(actionName) {
             return "DELETE";
         default:
             if (actionName && actionName.indexOf("_raw_http_method_") !== -1)
-                return actionName.substr("_raw_http_method_".length);
+                return actionName.substring("_raw_http_method_".length);
             return "UNKNOWN(" + actionName + ")";
     }
 }
@@ -94,7 +94,7 @@ function getApiUrl(actionName, rootUrl, entityName) {
             return rootUrl + entityName + "s/{" + entityName + "Id}";
         default:
             if (actionName && actionName.indexOf("_raw_http_method_") !== -1)
-                return rootUrl + entityName + "s/" + actionName.substr("_raw_http_method_".length);
+                return rootUrl + entityName + "s/" + actionName.substring("_raw_http_method_".length);
             return "UNKNOWN(" + actionName + ")";
     }
 }
@@ -481,10 +481,9 @@ function formatHintModel(obj, strIndent, options) {
 
 function renderInfo() {
     document.title = document.querySelector("#project-title").innerText = window.docs.info.name + " API document";
-    document.querySelector("#project-rootUrl").innerText = window.docs.info.rootUrl;
     document.querySelector("#project-description").innerText = window.docs.info.description;
 
-    document.querySelector("#project-roles").innerHTML = window.docs.roles.map(role => renderTemplate("template-project-role", role)).join("");
+    document.querySelector("#project-roles").innerHTML = window.docs.roles.map(role => renderTemplate("template-project-role", role)).join("") ?? "";
 
     if (window.docs.info.security?.crossDomain === false) {
         document.querySelector("#project-security-crossDomain-false").style.display = "block";
@@ -493,6 +492,77 @@ function renderInfo() {
         document.querySelector("#project-security-allowOrigins").style.display = "block";
         document.querySelector("#project-security-allowOrigins ul").innerHTML = window.docs.info.security.allowOrigins.map(origin => renderTemplate("template-li-code", {value: origin})).join("");
     }
+
+    const domRootUrls = document.querySelector("#project-rootUrls");
+    const rootUrls = Object.keys(localStorage)
+        .filter(key => localStorage.hasOwnProperty(key) && key.startsWith("rootUrl."))
+        .map(key => key.substring(8));
+    if (!rootUrls.includes(window.docs.info.rootUrl)) rootUrls.unshift(window.docs.info.rootUrl);
+    
+    let selected = localStorage.selected_root_url;
+    if (!selected) selected = localStorage.selected_root_url = window.docs.info.rootUrl;
+    const onspanclick = function() {
+        this.parentNode.parentNode.querySelector(".selected").className = "";
+        selected = this.innerText;
+        this.className = "selected";
+        const old_root_url = localStorage.selected_root_url;
+        const new_root_url = this.innerText;
+        localStorage.selected_root_url = new_root_url;
+        document.querySelectorAll(".contain-root-url").forEach(dom => dom.innerHTML = dom.innerHTML.replace(old_root_url, new_root_url));
+        document.querySelectorAll(".root-url").forEach(dom => dom.innerText = new_root_url);
+        document.querySelectorAll(".domain").forEach(dom => dom.innerText = getApiDomain(new_root_url))
+    };
+    const onlabelclick = function() {
+        const span = this.parentNode.querySelector("span");
+        if (span.className == "selected") return;
+
+        const rootUrl = span.innerText;
+        const index = rootUrls.indexOf(rootUrl);
+        if (index !== -1) rootUrls.splice(index, 1);
+
+        localStorage.removeItem(`rootUrl.${rootUrl}`);
+
+        this.parentNode.remove();
+    };
+
+    const addRootUrlDom = (rootUrl, liAddNew) => {
+        const li = document.createElement("li");
+        if (rootUrl == window.docs.info.rootUrl) li.className = "origin";
+        const span = document.createElement("span");
+        span.innerText = rootUrl;
+        if (rootUrl == selected) span.className = "selected";
+        li.appendChild(span);
+        const label = document.createElement("label");
+        label.className = "delete";
+        label.title = "Xóa";
+        li.appendChild(label);
+        domRootUrls.insertBefore(li, liAddNew);
+        span.onclick = onspanclick;
+        label.onclick = onlabelclick;
+    };
+
+    const li = document.createElement("li");
+    const span = document.createElement("span");
+    span.innerText = "Thêm mới API root url";
+    span.className = "add-new";
+    li.appendChild(span);
+    domRootUrls.appendChild(li);
+
+    rootUrls.forEach(rootUrl => addRootUrlDom(rootUrl, li));
+    span.onclick = () => {
+        const newRootUrl = prompt("Nhập API root url mới:");
+        if (!newRootUrl) return;
+        if (rootUrls.includes(newRootUrl)) return;
+
+        if (!newRootUrl.match(/^(https?:)?\/\//i)) {
+            alert("API root url không hợp lệ!");
+            return;
+        }
+        
+        rootUrls.push(newRootUrl);
+        localStorage[`rootUrl.${newRootUrl}`] = "";
+        addRootUrlDom(newRootUrl, li);
+    };
 }
 
 function renderEnvironmentVariables() {
@@ -511,27 +581,27 @@ function renderEnvironmentVariables() {
 function renderExtensionAuth() {
     if (!window.docs.features?.includes("auth")) return;
     document.querySelector("#extension-auth").innerHTML = renderTemplate("template-extension-DefaultAuth-module", {
-        rootUrl: window.docs.info.rootUrl,
-        rootUrlPath: getApiPath(window.docs.info.rootUrl),
-        domain: getApiDomain(window.docs.info.rootUrl)
+        rootUrl: localStorage.selected_root_url,
+        rootUrlPath: getApiPath(localStorage.selected_root_url),
+        domain: getApiDomain(localStorage.selected_root_url)
     });
 }
 
 function renderExtensionFile() {
     if (!window.docs.features?.includes("file")) return;
     document.querySelector("#extension-file").innerHTML = renderTemplate("template-extension-File-module", {
-        rootUrl: window.docs.info.rootUrl,
-        rootUrlPath: getApiPath(window.docs.info.rootUrl),
-        domain: getApiDomain(window.docs.info.rootUrl)
+        rootUrl: localStorage.selected_root_url,
+        rootUrlPath: getApiPath(localStorage.selected_root_url),
+        domain: getApiDomain(localStorage.selected_root_url)
     });
 }
 
 function renderExtensionMail() {
     if (!window.docs.features?.includes("mail")) return;
     document.querySelector("#extension-mailing").innerHTML = renderTemplate("template-extension-Mailing-module", {
-        rootUrl: window.docs.info.rootUrl,
-        rootUrlPath: getApiPath(window.docs.info.rootUrl),
-        domain: getApiDomain(window.docs.info.rootUrl)
+        rootUrl: localStorage.selected_root_url,
+        rootUrlPath: getApiPath(localStorage.selected_root_url),
+        domain: getApiDomain(localStorage.selected_root_url)
     });
 }
 
@@ -557,7 +627,7 @@ function renderEntity(entityName) {
             actionName,
             className: getPanelClass(actionName),
             actionHttpMethod: getHttpMethod(actionName),
-            actionApiUrl: getApiUrl(actionName, window.docs.info.rootUrl, entity.name),
+            actionApiUrl: getApiUrl(actionName, localStorage.selected_root_url, entity.name),
             actionDescription: getDescriptionByActionName(actionName, entity.name)
         })).join("");
         initDom(dom);
@@ -568,7 +638,7 @@ function renderEntity(entityName) {
         dom.innerHTML = Object.keys(entity.views).map(viewName => renderTemplate("template-project-entity-views", {
             entityName: entity.name,
             viewName,
-            actionApiUrl: getApiViewUrl(window.docs.info.rootUrl, entity.name, viewName),
+            actionApiUrl: getApiViewUrl(localStorage.selected_root_url, entity.name, viewName),
             description: entity.views[viewName]?.[0]?.description ?? ""
         })).join("");
         initDom(dom);
@@ -661,8 +731,8 @@ function renderEntityActionRolePage(entityName, actionName, grant) {
         entity,
         entityName,
         EntityName: toCSharpName(entityName),
-        domain: getApiDomain(window.docs.info.rootUrl),
-        rootUrlPath: getApiPath(window.docs.info.rootUrl),
+        domain: getApiDomain(localStorage.selected_root_url),
+        rootUrlPath: getApiPath(localStorage.selected_root_url),
     };
     const snippet = window.codeSnippets[codeSnippetName] ?? {};
     const data = {
@@ -915,8 +985,8 @@ function renderEntityViewRolePage(entityName, viewName, grant) {
         entity,
         entityName,
         EntityName: toCSharpName(entityName),
-        domain: getApiDomain(window.docs.info.rootUrl),
-        rootUrlPath: getApiPath(window.docs.info.rootUrl),
+        domain: getApiDomain(localStorage.selected_root_url),
+        rootUrlPath: getApiPath(localStorage.selected_root_url),
     };
     const snippet = window.codeSnippets.view;
     const data = {
@@ -1000,7 +1070,7 @@ window.codeSnippets = {
             tokenDisplay: args.action.grant !== "*" ? 'inline' : 'none',
         }),
         cURL: (args) => renderTemplate("template-codeSnippets-findMany-cURL", {
-            rootUrl: window.docs.info.rootUrl,
+            rootUrl: localStorage.selected_root_url,
             entityName: args.entityName,
             tokenDisplay: args.action.grant !== "*" ? 'inline' : 'none',
             fields: args.action.returnableFields?.map(fieldName => renderTemplate("template-fields-inline", {fieldName})).join(""),
@@ -1047,7 +1117,7 @@ window.codeSnippets = {
             tokenDisplay: args.action.grant !== "*" ? 'inline' : 'none'
         }),
         cURL: (args) => renderTemplate("template-codeSnippets-findById-cURL", {
-            rootUrl: window.docs.info.rootUrl,
+            rootUrl: localStorage.selected_root_url,
             entityName: args.entityName,
             tokenDisplay: args.action.grant !== "*" ? 'inline' : 'none',
             fields: args.action.returnableFields?.map(fieldName => renderTemplate("template-fields-inline", {fieldName})).join("")
@@ -1083,7 +1153,7 @@ window.codeSnippets = {
             tokenDisplay: args.action.grant !== "*" ? 'inline' : 'none'
         }),
         cURL: (args) => renderTemplate("template-codeSnippets-createOne-cURL", {
-            rootUrl: window.docs.info.rootUrl,
+            rootUrl: localStorage.selected_root_url,
             entityName: args.entityName,
             tokenDisplay: args.action.grant !== "*" ? 'inline' : 'none'
         }),
@@ -1116,7 +1186,7 @@ window.codeSnippets = {
             tokenDisplay: args.action.grant !== "*" ? 'inline' : 'none'
         }),
         cURL: (args) => renderTemplate("template-codeSnippets-createMany-cURL", {
-            rootUrl: window.docs.info.rootUrl,
+            rootUrl: localStorage.selected_root_url,
             entityName: args.entityName,
             tokenDisplay: args.action.grant !== "*" ? 'inline' : 'none'
         }),
@@ -1149,7 +1219,7 @@ window.codeSnippets = {
             tokenDisplay: args.action.grant !== "*" ? 'inline' : 'none'
         }),
         cURL: (args) => renderTemplate("template-codeSnippets-updateOne-cURL", {
-            rootUrl: window.docs.info.rootUrl,
+            rootUrl: localStorage.selected_root_url,
             entityName: args.entityName,
             tokenDisplay: args.action.grant !== "*" ? 'inline' : 'none'
         }),
@@ -1182,7 +1252,7 @@ window.codeSnippets = {
             tokenDisplay: args.action.grant !== "*" ? 'inline' : 'none'
         }),
         cURL: (args) => renderTemplate("template-codeSnippets-updateMany-cURL", {
-            rootUrl: window.docs.info.rootUrl,
+            rootUrl: localStorage.selected_root_url,
             entityName: args.entityName,
             tokenDisplay: args.action.grant !== "*" ? 'inline' : 'none'
         }),
@@ -1215,7 +1285,7 @@ window.codeSnippets = {
             tokenDisplay: args.action.grant !== "*" ? 'inline' : 'none'
         }),
         cURL: (args) => renderTemplate("template-codeSnippets-updatePartially-cURL", {
-            rootUrl: window.docs.info.rootUrl,
+            rootUrl: localStorage.selected_root_url,
             entityName: args.entityName,
             tokenDisplay: args.action.grant !== "*" ? 'inline' : 'none'
         }),
@@ -1243,7 +1313,7 @@ window.codeSnippets = {
             tokenDisplay: args.action.grant !== "*" ? 'inline' : 'none'
         }),
         cURL: (args) => renderTemplate("template-codeSnippets-deleteOne-cURL", {
-            rootUrl: window.docs.info.rootUrl,
+            rootUrl: localStorage.selected_root_url,
             entityName: args.entityName,
             tokenDisplay: args.action.grant !== "*" ? 'inline' : 'none'
         }),
@@ -1271,7 +1341,7 @@ window.codeSnippets = {
             tokenDisplay: args.action.grant !== "*" ? 'inline' : 'none'
         }),
         cURL: (args) => renderTemplate("template-codeSnippets-deleteMany-cURL", {
-            rootUrl: window.docs.info.rootUrl,
+            rootUrl: localStorage.selected_root_url,
             entityName: args.entityName,
             tokenDisplay: args.action.grant !== "*" ? 'inline' : 'none'
         }),
@@ -1306,7 +1376,7 @@ window.codeSnippets = {
             tokenDisplay: args.action.grant !== "*" ? 'inline' : 'none'
         }),
         cURL: (args) => renderTemplate("template-codeSnippets-generalAction-cURL", {
-            rootUrl: window.docs.info.rootUrl,
+            rootUrl: localStorage.selected_root_url,
             entityName: args.entityName,
             tokenDisplay: args.action.grant !== "*" ? 'inline' : 'none'
         }),
@@ -1351,7 +1421,7 @@ window.codeSnippets = {
             parameters: args.view.parameters ? "?" + args.view.parameters.map(p => `${encodeHtml(p.field)}=<span class="place-holder">value_of_${encodeHtml(p.field)}</span>`).join("&") : ""
         }),
         cURL: (args) => renderTemplate("template-codeSnippets-view-cURL", {
-            rootUrl: window.docs.info.rootUrl,
+            rootUrl: localStorage.selected_root_url,
             entityName: args.entityName,
             tokenDisplay: args.view.grant !== "*" ? 'inline' : 'none',
             parameters: args.view.parameters ? "?" + args.view.parameters.map(p => `${encodeHtml(p.field)}=<span class="place-holder">value_of_${encodeHtml(p.field)}</span>`).join("&") : ""
@@ -1421,7 +1491,7 @@ function gotoHash() {
     const m = location.hash.match(/^#(\$[\w-]+|\w+)(\.((views\.)?\w+))?$/);
     if (!m) return;
 
-    const cardSelector = m[1].charAt(0) === "$" ? "#extension-" + m[1].substr(1) : "#entity-" + m[1];
+    const cardSelector = m[1].charAt(0) === "$" ? "#extension-" + m[1].substring(1) : "#entity-" + m[1];
     let dom = document.querySelector(cardSelector);
     if (!dom) return;
 
@@ -1441,7 +1511,7 @@ function gotoHash() {
     if (!m[3]) return;
     
     const panelSelector = m[1].charAt(0) === "$"
-        ? "#extension-" + m[1].substr(1) + "-" + m[3].replace(/[.]/g, "-")
+        ? "#extension-" + m[1].substring(1) + "-" + m[3].replace(/[.]/g, "-")
         : "#action-" + m[1] + "-" + m[3].replace(/[.]/g, "-");
     dom = document.querySelector(panelSelector);
     if (!dom) return;

package/gen/gen-api-docs.js

@@ -258,7 +258,7 @@ async function genDocs(args, projectName, project, alias, source) {
             }
         },
         features: aliasProject.features,
-        roles: source.roles,
+        roles: common.filterRoles(source.roles ?? [], aliasProject.allowRoles),
         environmentVariables: source.environmentVariables,
         entities: entities
     });

package/gen/gen-ts-driver.js

@@ -63,32 +63,33 @@ function getCSharpTypeFromMushroomType(type) {
     return "UNKNOWN_TYPE_" + type;
 }
 
-function generateTypescriptClass(objectDefination, indent, options) {
-    if (!indent) indent = "";
-    let code = "{\n";
+function generateTypescriptClass(objectDefination, className, options) {
+    let childrenCode = '';
+    let code = `export interface ${className} {\n`;
     for (let fieldName in objectDefination) {
         const optionalMark = options?.checkRequired && objectDefination[fieldName].required ? "" : "?";
         if (objectDefination[fieldName].type == "object") {
-            code += `${indent}    ${fieldName}${optionalMark}: ${generateTypescriptClass(objectDefination[fieldName].fields, indent + "    ")},
-`;
+            const fieldClassName = className + "_" + toTypeScriptClassName(fieldName);
+            code += `    ${fieldName}${optionalMark}: ${fieldClassName},\n`;
+            childrenCode += generateTypescriptClass(objectDefination[fieldName].fields, fieldClassName);
         }
         else if (objectDefination[fieldName].type == "array") {
             if (objectDefination[fieldName].items.type == "object") {
-                code += `${indent}    ${fieldName}${optionalMark}: ${generateTypescriptClass(objectDefination[fieldName].items.fields, indent + "    ")}[],
-`;
+                const fieldClassName = className + "_" + toTypeScriptClassName(fieldName);
+                code += `    ${fieldName}${optionalMark}: ${fieldClassName}[],\n`;
+                childrenCode += generateTypescriptClass(objectDefination[fieldName].items.fields, fieldClassName);
             }
             else {
-                code += `${indent}    ${fieldName}${optionalMark}: ${getCSharpTypeFromMushroomType(objectDefination[fieldName].items.type)}[],
-`;
+                code += `    ${fieldName}${optionalMark}: ${getCSharpTypeFromMushroomType(objectDefination[fieldName].items.type)}[],\n`;
             }
         }
         else {
-            code += `${indent}    ${fieldName}${optionalMark}: ${getCSharpTypeFromMushroomType(objectDefination[fieldName].type)},
-`;
+            code += `    ${fieldName}${optionalMark}: ${getCSharpTypeFromMushroomType(objectDefination[fieldName].type)},\n`;
         }
     }
-    code += indent + "}";
-    return code;
+    code += "}\n\n";
+
+    return code + childrenCode;
 }
 
 function generateTypescriptClassFromViewParameters(parameters) {
@@ -143,9 +144,7 @@ export type IdValue = ${source.idType == "AutoIncInt" || source.idType == "AutoI
 
         const entity = entities[entityName];
         const typescriptClassName = toTypeScriptClassName(entityName);
-        code += `export interface ${typescriptClassName} ${generateTypescriptClass(entity.fields)};
-`;
-
+        code += generateTypescriptClass(entity.fields, typescriptClassName);
 
         const actions = {};
         iApiClassBody += `    ${entityName}: MushroomResourceBase`;
@@ -238,8 +237,8 @@ ${customMethodCode}}
                 code += `export interface ${inputType} ${generateTypescriptClassFromViewParameters(view.parameters)};
 `;
                 if (view.codeHint?.output)
-                    code += `export interface ${outputType} ${generateTypescriptClass(view.codeHint.output.fields, undefined, {checkRequired: true})};
-`;
+                    code += generateTypescriptClass(view.codeHint.output.fields, outputType, {checkRequired: true});
+                
                 return `MushroomViewFunction<${outputType}, ${inputType}>`;
             });
             viewCode += `
@@ -322,9 +321,7 @@ export declare type IdValue = ${source.idType == "AutoIncInt" || source.idType =
 
         const entity = entities[entityName];
         const typescriptClassName = toTypeScriptClassName(entityName);
-        code += `export interface ${typescriptClassName} ${generateTypescriptClass(entity.fields)};
-`;
-
+        code += generateTypescriptClass(entity.fields, typescriptClassName);
 
         const actions = {};
         iApiClassBody += `    ${entityName}: MushroomResourceBase`;
@@ -414,11 +411,10 @@ ${customMethodCode}}
             const viewParameterTypes = viewRoles.map(view => {
                 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)};
-`;
+                code += `export interface ${inputType} ${generateTypescriptClassFromViewParameters(view.parameters)};\n`;
                 if (view.codeHint?.output)
-                    code += `export interface ${outputType} ${generateTypescriptClass(view.codeHint.output.fields, undefined, {checkRequired: true})};
-`;
+                    code += generateTypescriptClass(view.codeHint.output.fields, outputType, {checkRequired: true});
+
                 return `MushroomViewFunction<${outputType}, ${inputType}>`;
             });
             viewCode += `

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mushroom-cli",
-  "version": "1.2.0-alpha.10",
+  "version": "1.2.0-alpha.11",
   "description": "Mushroom CLI",
   "main": "mr.js",
   "scripts": {
@@ -21,7 +21,7 @@
     "jsdom": "^24.1.1",
     "json5": "^2.2.3",
     "minify": "7.2.2",
-    "node-fetch": "^2.6.11",
+    "node-fetch": "^2.7.0",
     "open": "^8.4.2",
     "readline-sync": "^1.4.10",
     "targz": "^1.0.1"