mushroom-cli 1.2.6 → 1.2.8

package/README.md

@@ -132,6 +132,17 @@ npx mushroom-cli parameters --no-check-update
 
 ## Version
 
+### 1.2.8
+
+Improvement
+
+- gen docs: fix bug: gen docs fail when entity action has codehint.delegator.params
+- gen docs: fix bug: gen wrong docs for entity view params
+
+### 1.2.6, 1.2.7
+
+Hot fixed
+
 ### 1.2.5
 
 Improvement

package/dist/docs/docs.v2.js

@@ -1025,7 +1025,7 @@ function renderGeneralAction(args) {
         type: (field.type === 'array' ? 'array of ' : '') + (field.items?.type ?? 'string'),
         description: field.description ?? '',
         required: field.required ? 'required' : 'optional',
-        validation: getValidationStringDocs(p, true),
+        validation: getValidationStringDocs(field, true),
       })
     }).join('');
   } else {
@@ -1150,7 +1150,7 @@ function renderEntityViewRolePage(entityName, viewName, grant) {
           type: (p.isArray ? 'array of ' : '') + (p.type ?? 'string'),
           description: p.description ?? '',
           defaultValue: p.defaultValue ? `, default (${p.defaultValue})` : '',
-          required: p.required ? 'required' : 'optional',
+          required: p.validation?.required ? 'required' : 'optional',
           validation: getValidationStringDocs(p.validation, true),
         }),
       )

package/dist/gen/gen-csharp.js

@@ -595,6 +595,7 @@ ${strEnumClasses}
     }
     content += `        [MongoDB.Bson.Serialization.Attributes.BsonExtraElements]
         [Newtonsoft.Json.JsonIgnore]
+        [System.Text.Json.Serialization.JsonIgnore]
         public System.Collections.Generic.Dictionary<string, object> Mushroom_ExtraProperties { get; set; }
 
     }

package/dist/gen/gen-list-api.js

@@ -0,0 +1,52 @@
+import * as common from '../common.js';
+export function listApi(source) {
+    const entities = common.getEntities(source, ["*"], true);
+    const endpoints = new Set();
+    for (const entityName in entities) {
+        const actions = entities[entityName].actions || {};
+        for (const actionName in actions) {
+            const action = actions[actionName];
+            if (!Array.isArray(action) || !action.length || action.every(a => !a.enabled))
+                continue;
+            let method;
+            let id = '';
+            if (actionName == 'findById') {
+                method = 'GET';
+                id = '/{{id}}';
+            }
+            if (actionName == 'findMany')
+                method = 'GET';
+            else if (actionName == 'createOne' || actionName == 'createMany')
+                method = 'POST';
+            else if (actionName?.startsWith('_raw_http_method_')) {
+                method = 'POST';
+                id = '/' + actionName.substring('_raw_http_method_'.length);
+            }
+            else if (actionName == 'updateOne') {
+                method = 'PUT';
+                id = '/{{id}}';
+            }
+            else if (actionName == 'updateMany')
+                method = 'PUT';
+            else if (actionName == 'updatePartially') {
+                method = 'PATCH';
+                id = '/{{id}}';
+            }
+            else if (actionName == 'deleteOne') {
+                method = 'DELETE';
+                id = '/{{id}}';
+            }
+            else if (actionName == 'deleteMany')
+                method = 'DELETE';
+            endpoints.add(`${method} ${source.rootUrl}${entityName}s${id}`);
+        }
+        const views = entities[entityName].views || {};
+        for (const viewName in views) {
+            const view = views[viewName];
+            if (!Array.isArray(view) || !view.length || view.every(v => !v.enabled))
+                continue;
+            endpoints.add(`GET ${source.rootUrl}${entityName}s/views/${viewName}`);
+        }
+    }
+    endpoints.forEach(e => console.log(e));
+}

package/dist/gen/gen-ts-driver.js

@@ -92,16 +92,16 @@ function generateTypescriptClass(objectDefination, className, options) {
                     childrenCode += generateTypescriptClass(field.values.items.fields ?? {}, fieldClassName, options);
                 }
                 else {
-                    code += `    ${fieldName}${optionalMark}: Record<string, Array<${getTypescriptTypeFromMushroomType(field.values.items?.type ?? 'string')}${itemNullType}>${valueNullType}>${nullType};\n`;
+                    code += `    ${fieldName}${optionalMark}: Record<string, Array<${getTypescriptTypeFromMushroomType(field.values.items?.type)}${itemNullType}>${valueNullType}>${nullType};\n`;
                 }
             }
             else {
-                code += `    ${fieldName}${optionalMark}: Record<string, ${getTypescriptTypeFromMushroomType(field.values?.type ?? 'string')}${valueNullType}>${nullType};\n`;
+                code += `    ${fieldName}${optionalMark}: Record<string, ${getTypescriptTypeFromMushroomType(field.values?.type)}${valueNullType}>${nullType};\n`;
             }
         }
         else if (field.type == 'array') {
             const itemNullType = options?.checkRequired &&
-                (field.items.required || field.items.validation?.required)
+                (field.items?.required || field.items?.validation?.required)
                 ? ''
                 : ' | null | undefined';
             if (field.items?.type == 'object') {
@@ -121,15 +121,15 @@ function generateTypescriptClass(objectDefination, className, options) {
                     childrenCode += generateTypescriptClass(field.items.values.fields ?? {}, fieldClassName, options);
                 }
                 else {
-                    code += `    ${fieldName}${optionalMark}: Array<Record<string, ${getTypescriptTypeFromMushroomType(field.items.type ?? 'string')}${valueNullType}>${itemNullType}>${nullType};\n`;
+                    code += `    ${fieldName}${optionalMark}: Array<Record<string, ${getTypescriptTypeFromMushroomType(field.items.type)}${valueNullType}>${itemNullType}>${nullType};\n`;
                 }
             }
             else {
-                code += `    ${fieldName}${optionalMark}: Array<${getTypescriptTypeFromMushroomType(field.items?.type ?? 'string')}${itemNullType}>${nullType};\n`;
+                code += `    ${fieldName}${optionalMark}: Array<${getTypescriptTypeFromMushroomType(field.items?.type)}${itemNullType}>${nullType};\n`;
             }
         }
         else {
-            code += `    ${fieldName}${optionalMark}: ${getTypescriptTypeFromMushroomType(field.type ?? 'string')}${nullType};\n`;
+            code += `    ${fieldName}${optionalMark}: ${getTypescriptTypeFromMushroomType(field.type)}${nullType};\n`;
         }
     }
     code += '}\n\n';
@@ -139,7 +139,7 @@ function generateTypescriptClassFromViewParameters(parameters) {
     if (Array.isArray(parameters)) {
         return ('{\n' +
             parameters
-                .map((p) => `${generateDescription(p.description)}    ${p.field}${p.validation?.required && p.defaultValue === undefined ? '' : '?'}: ${getTypescriptTypeFromMushroomType(p.type || 'string')}${p.isArray ? '[]' : ''}${p.validation?.required && p.defaultValue === undefined ? '' : ' | null'};`)
+                .map((p) => `${generateDescription(p.description)}    ${p.field}${p.validation?.required && p.defaultValue === undefined ? '' : '?'}: ${getTypescriptTypeFromMushroomType(p.type)}${p.isArray ? '[]' : ''}${p.validation?.required && p.defaultValue === undefined ? '' : ' | null'};`)
                 .join('\n') +
             '\n}');
     }
@@ -155,13 +155,13 @@ function generateTopCustomClass(config, entityName, methodName, grantRole, postf
         : isArray
             ? config.items?.fields
             : config.fields;
-    const type = (isKeyValue
+    const type = isKeyValue
         ? isArray
             ? config.values?.items?.type
             : config.values?.type
         : isArray
             ? config.items?.type
-            : config.type) ?? 'string';
+            : config.type;
     let inputClassName;
     if (type == 'object') {
         if (fields) {

package/dist/gen.js

@@ -10,6 +10,7 @@ import genDatabaseDocs from './gen/gen-db-docs.js';
 import * as javascriptDriverGenerator from './gen/gen-js-driver.js';
 import genJavascriptDriverTarball from './gen/gen-js-driver-tarball.js';
 import * as typescriptDriverGenerator from './gen/gen-ts-driver.js';
+import * as listApi from './gen/gen-list-api.js';
 import * as csharp from './gen/gen-csharp.js';
 export default async function gen(args) {
     let projectName = args[1];
@@ -96,7 +97,9 @@ export default async function gen(args) {
         case 'c#-driver':
             csharp.genCSharpDriver(args, projectName, project, alias, source);
             break;
-        case '':
+        case 'list-api':
+            listApi.listApi(source);
+            break;
         case undefined:
         case 'help':
         case 'man':

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mushroom-cli",
-  "version": "1.2.6",
+  "version": "1.2.8",
   "description": "Mushroom CLI",
   "main": "dist/mr.js",
   "type": "module",
@@ -33,9 +33,9 @@
   "author": "suco2007",
   "license": "ISC",
   "dependencies": {
-    "jsdom": "^29.0.2",
+    "jsdom": "^29.1.1",
     "json5": "^2.2.3",
-    "minify": "^15.2.1",
+    "minify": "^15.3.1",
     "node-fetch": "^3.3.2",
     "open": "^11.0.0",
     "readline-sync": "^1.4.10",