mushroom-cli 1.2.5 → 1.2.7

package/README.md

@@ -132,6 +132,10 @@ npx mushroom-cli parameters --no-check-update
 
 ## Version
 
+### 1.2.6, 1.2.7
+
+Hot fixed
+
 ### 1.2.5
 
 Improvement

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-js-driver.js

@@ -24,7 +24,7 @@ export function genJavascriptDriverString(aliasProject, source) {
     }
     const entities = common.getEntities(source, aliasProject.allowRoles);
     const extensionsImportLines = ['/* import all mushroom extensions */'];
-    const extensionsExportLines = ['/* export all mushroom extensions */'];
+    const extensionsExportLines = [];
     const extensionsCodeLines = ['/* using all mushroom extensions */'];
     if (Array.isArray(aliasProject.features)) {
         if (aliasProject.features.includes('auth')) {
@@ -52,6 +52,7 @@ for (var m in mushroom_1) exports[m] = mushroom_1[m];
 ${extensionsImportLines.join('\n')}
 //export const extensions = {
 var extensions = {
+    /* export all mushroom extensions */
     ${extensionsExportLines.join(',\n    ')}
 };
 exports.extensions = extensions;

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) {
@@ -232,7 +232,7 @@ export function genTypescriptDriverString(aliasProject, source) {
     }
     const entities = common.getEntities(source, aliasProject.allowRoles);
     const extensionsImportLines = ['/* import all mushroom extensions */'];
-    const extensionsExportLines = ['/* export all mushroom extensions */'];
+    const extensionsExportLines = [];
     const extensionsTypes = ['/* all mushroom extensions types */'];
     const extensionsCodeLines = ['/* using all mushroom extensions */'];
     if (Array.isArray(aliasProject.features)) {
@@ -254,6 +254,7 @@ import type { IdType, IMushroom, MushroomRequest, MushroomRequestSetting, Mushro
 ${extensionsImportLines.join('\n')}
 export * from "mushroomjs";
 export const extensions = {
+    /* export all mushroom extensions */
     ${extensionsExportLines.join(',\n    ')}
 };
 
@@ -437,6 +438,7 @@ export function genDtsString(aliasProject, source) {
 ${extensionsImportLines.join('\n')}
 export * from "mushroomjs";
 export declare const extensions = {
+    /* export all mushroom extensions */
     ${extensionsExportLines.join(',\n    ')}
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mushroom-cli",
-  "version": "1.2.5",
+  "version": "1.2.7",
   "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",