mushroom-cli 1.1.0 → 1.2.0-alpha.1

package/README.md

@@ -84,6 +84,10 @@ Disable checking for update:
 
 ## Version
 
+### 1.2.0-alpha.1
+
+Support type for View result
+
 ### 1.1.0
 
 Support MushroomServer 0.2.25.4 or later

package/gen/gen-ts-driver.js

@@ -63,26 +63,27 @@ function getCSharpTypeFromMushroomType(type) {
     return "UNKNOWN_TYPE_" + type;
 }
 
-function generateTypescriptClass(objectDefination, indent) {
+function generateTypescriptClass(objectDefination, indent, options) {
     if (!indent) indent = "";
     let code = "{\n";
     for (let fieldName in objectDefination) {
+        const optionalMark = options?.checkRequired && objectDefination[fieldName].required ? "" : "?";
         if (objectDefination[fieldName].type == "object") {
-            code += `${indent}    ${fieldName}?: ${generateTypescriptClass(objectDefination[fieldName].fields, indent + "    ")},
+            code += `${indent}    ${fieldName}${optionalMark}: ${generateTypescriptClass(objectDefination[fieldName].fields, indent + "    ")},
 `;
         }
         else if (objectDefination[fieldName].type == "array") {
             if (objectDefination[fieldName].items.type == "object") {
-                code += `${indent}    ${fieldName}?: ${generateTypescriptClass(objectDefination[fieldName].items.fields, indent + "    ")}[],
+                code += `${indent}    ${fieldName}${optionalMark}: ${generateTypescriptClass(objectDefination[fieldName].items.fields, indent + "    ")}[],
 `;
             }
             else {
-                code += `${indent}    ${fieldName}?: ${getCSharpTypeFromMushroomType(objectDefination[fieldName].items.type)}[],
+                code += `${indent}    ${fieldName}${optionalMark}: ${getCSharpTypeFromMushroomType(objectDefination[fieldName].items.type)}[],
 `;
             }
         }
         else {
-            code += `${indent}    ${fieldName}?: ${getCSharpTypeFromMushroomType(objectDefination[fieldName].type)},
+            code += `${indent}    ${fieldName}${optionalMark}: ${getCSharpTypeFromMushroomType(objectDefination[fieldName].type)},
 `;
         }
     }
@@ -92,7 +93,7 @@ function generateTypescriptClass(objectDefination, indent) {
 
 function generateTypescriptClassFromViewParameters(parameters) {
     if (Array.isArray(parameters)){
-        return '{\n' + parameters.map(p => `    ${p.field}?: ${getCSharpTypeFromMushroomType(p.type || "string")}${p.isArray ? "[]" : ""}`).join(',\n') + '\n}';
+        return '{\n' + parameters.map(p => `    ${p.field}${p.validation?.required ? "" : "?"}: ${getCSharpTypeFromMushroomType(p.type || "string")}${p.isArray ? "[]" : ""}`).join(',\n') + '\n}';
     }
     return '{}';
 }
@@ -227,13 +228,17 @@ ${customMethodCode}}
             views[viewName] = { clientCache: true };
 
             const viewParameterTypes = viewRoles.map(view => {
-                const type = `${typescriptClassName}$ViewsResource_${viewName}View_${view.grant === "*" ? "" : toTypeScriptClassName(view.grant)}Parameters`;
-                code += `export interface ${type} ${generateTypescriptClassFromViewParameters(view.parameters)};
+                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)};
 `;
-                return `MushroomViewFunction<any, ${type}>`;
+                if (view.codeHint?.output)
+                    code += `export interface ${outputType} ${generateTypescriptClass(view.codeHint.output.fields, undefined, {checkRequired: true})};
+`;
+                return `MushroomViewFunction<${outputType}, ${inputType}>`;
             });
             viewCode += `
-        ${viewName}Async: ${viewParameterTypes.join(' & ')},`;
+        ${viewName}Async: ${viewParameterTypes.join(' | ')},`;
         }
         
         if (viewCode) {
@@ -396,13 +401,17 @@ ${customMethodCode}}
             views[viewName] = { clientCache: true };
 
             const viewParameterTypes = viewRoles.map(view => {
-                const type = `${typescriptClassName}$ViewsResource_${viewName}View_${view.grant === "*" ? "" : toTypeScriptClassName(view.grant)}Parameters`;
-                code += `export interface ${type} ${generateTypescriptClassFromViewParameters(view.parameters)};
+                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)};
+`;
+                if (view.codeHint?.output)
+                    code += `export interface ${outputType} ${generateTypescriptClass(view.codeHint.output.fields, undefined, {checkRequired: true})};
 `;
-                return `MushroomViewFunction<any, ${type}>`;
+                return `MushroomViewFunction<${outputType}, ${inputType}>`;
             });
             viewCode += `
-        ${viewName}Async: ${viewParameterTypes.join(' & ')},`;
+        ${viewName}Async: ${viewParameterTypes.join(' | ')},`;
         }
         
         if (viewCode) {

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "mushroom-cli",
-  "version": "1.1.0",
+  "version": "1.2.0-alpha.1",
   "description": "Mushroom CLI",
   "main": "mr.js",
   "scripts": {
-    "release": "npm publish --access public"
+    "release": "npm publish --access public --tag alpha"
   },
   "keywords": [
     "Mushroom",