mushroom-cli 1.2.4 → 1.2.6

package/README.md

@@ -132,6 +132,12 @@ npx mushroom-cli parameters --no-check-update
 
 ## Version
 
+### 1.2.5
+
+Improvement
+
+- gen ts-driver, js-driver: add anchors in generated code to make easier to modify code by update-ts
+
 ### 1.2.4
 
 Improvement

package/dist/common.js

@@ -282,3 +282,13 @@ export function logWarning(message, ...parameters) {
 export function logError(message, ...parameters) {
     console.error(message, ...parameters);
 }
+export function toVietnameseNonTongue(str) {
+    const signText = 'ăâđêôơưàảãạáằẳẵặắầẩẫậấèẻẽẹéềểễệếìỉĩịíòỏõọóồổỗộốờởỡợớùủũụúừửữựứỳỷỹỵýĂÂĐÐÊÔƠƯÀẢÃẠÁẰẲẴẶẮẦẨẪẬẤÈẺẼẸÉỀỂỄỆẾÌỈĨỊÍÒỎÕỌÓỒỔỖỘỐỜỞỠỢỚÙỦŨỤÚỪỬỮỰỨỲỶỸỴÝ';
+    const unsignedText = 'aadeoouaaaaaaaaaaaaaaaeeeeeeeeeeiiiiiooooooooooooooouuuuuuuuuuyyyyyAADDEOOUAAAAAAAAAAAAAAAEEEEEEEEEEIIIIIOOOOOOOOOOOOOOOUUUUUUUUUUYYYYY';
+    let returnValue = '';
+    for (let i = 0; i < str.length; i++) {
+        const index = signText.indexOf(str.charAt(i));
+        returnValue += index !== -1 ? unsignedText.charAt(index) : str.charAt(i);
+    }
+    return returnValue;
+}

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

@@ -287,7 +287,7 @@ export default async function genDocs(args, projectName, project, alias, source)
         info: {
             name: source.name,
             rootUrl: source.codeHint?.rootUrl ?? source.rootUrl,
-            description: source.description,
+            description: source.description ?? '',
             security: source.security === undefined
                 ? undefined
                 : {

package/dist/gen/gen-csharp.js

@@ -23,20 +23,10 @@ function singleLine(str) {
         return '';
     return str.replace(/\r/g, '').replace(/\n/g, '<br/>');
 }
-function toVietnameseNonTongue(str) {
-    const signText = 'ăâđêôơưàảãạáằẳẵặắầẩẫậấèẻẽẹéềểễệếìỉĩịíòỏõọóồổỗộốờởỡợớùủũụúừửữựứỳỷỹỵýĂÂĐÐÊÔƠƯÀẢÃẠÁẰẲẴẶẮẦẨẪẬẤÈẺẼẸÉỀỂỄỆẾÌỈĨỊÍÒỎÕỌÓỒỔỖỘỐỜỞỠỢỚÙỦŨỤÚỪỬỮỰỨỲỶỸỴÝ';
-    const unsignedText = 'aadeoouaaaaaaaaaaaaaaaeeeeeeeeeeiiiiiooooooooooooooouuuuuuuuuuyyyyyAADDEOOUAAAAAAAAAAAAAAAEEEEEEEEEEIIIIIOOOOOOOOOOOOOOOUUUUUUUUUUYYYYY';
-    let returnValue = '';
-    for (let i = 0; i < str.length; i++) {
-        const index = signText.indexOf(str.charAt(i));
-        returnValue += index !== -1 ? unsignedText.charAt(index) : str.charAt(i);
-    }
-    return returnValue;
-}
 function toCSharpName(str) {
     if (!str)
         return '_';
-    const name = toVietnameseNonTongue(str).replace(/\W/g, '_');
+    const name = common.toVietnameseNonTongue(str).replace(/\W/g, '_');
     const c = name.charAt(0);
     return ('0' <= c && c <= '9' ? '_' : '') + c.toUpperCase() + name.substring(1);
 }

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

@@ -23,9 +23,9 @@ export function genJavascriptDriverString(aliasProject, source) {
         return '';
     }
     const entities = common.getEntities(source, aliasProject.allowRoles);
-    const extensionsImportLines = [];
+    const extensionsImportLines = ['/* import all mushroom extensions */'];
     const extensionsExportLines = [];
-    const extensionsCodeLines = [];
+    const extensionsCodeLines = ['/* using all mushroom extensions */'];
     if (Array.isArray(aliasProject.features)) {
         if (aliasProject.features.includes('auth')) {
             extensionsImportLines.push('//import * as AuthExtension from "mushroomjs-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;
@@ -94,7 +95,7 @@ exports.extensions = extensions;
         for (const viewName in entity.views) {
             views[viewName] = {};
         }
-        code += `defineAsyncResource({name:${JSON.stringify(entityName)},actions:${JSON.stringify(actions)},views:${JSON.stringify(views)}});
+        code += `defineAsyncResource({name:${JSON.stringify(entityName)},actions:${JSON.stringify(actions)},views:${JSON.stringify(views)}}, mushroom);
 `;
     }
     code += `

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

@@ -17,24 +17,14 @@ function isAllowCache(actions, defaultValue) {
     }
     return result;
 }
-function toVietnameseNonTongue(str) {
-    const signText = 'ăâđêôơưàảãạáằẳẵặắầẩẫậấèẻẽẹéềểễệếìỉĩịíòỏõọóồổỗộốờởỡợớùủũụúừửữựứỳỷỹỵýĂÂĐÐÊÔƠƯÀẢÃẠÁẰẲẴẶẮẦẨẪẬẤÈẺẼẸÉỀỂỄỆẾÌỈĨỊÍÒỎÕỌÓỒỔỖỘỐỜỞỠỢỚÙỦŨỤÚỪỬỮỰỨỲỶỸỴÝ';
-    const unsignedText = 'aadeoouaaaaaaaaaaaaaaaeeeeeeeeeeiiiiiooooooooooooooouuuuuuuuuuyyyyyAADDEOOUAAAAAAAAAAAAAAAEEEEEEEEEEIIIIIOOOOOOOOOOOOOOOUUUUUUUUUUYYYYY';
-    let returnValue = '';
-    for (let i = 0; i < str.length; i++) {
-        const index = signText.indexOf(str.charAt(i));
-        returnValue += index !== -1 ? unsignedText.charAt(index) : str.charAt(i);
-    }
-    return returnValue;
-}
 function toTypeScriptClassName(str) {
     if (!str)
         return '_';
-    const name = toVietnameseNonTongue(str).replace(/\W/g, '_');
+    const name = common.toVietnameseNonTongue(str).replace(/\W/g, '_');
     const c = name.charAt(0);
     return ('0' <= c && c <= '9' ? '_' : '') + c.toUpperCase() + name.substring(1);
 }
-function getCSharpTypeFromMushroomType(type) {
+function getTypescriptTypeFromMushroomType(type) {
     switch (type) {
         case 'string':
             return 'string';
@@ -102,11 +92,11 @@ function generateTypescriptClass(objectDefination, className, options) {
                     childrenCode += generateTypescriptClass(field.values.items.fields ?? {}, fieldClassName, options);
                 }
                 else {
-                    code += `    ${fieldName}${optionalMark}: Record<string, Array<${getCSharpTypeFromMushroomType(field.values.items?.type ?? 'string')}${itemNullType}>${valueNullType}>${nullType};\n`;
+                    code += `    ${fieldName}${optionalMark}: Record<string, Array<${getTypescriptTypeFromMushroomType(field.values.items?.type ?? 'string')}${itemNullType}>${valueNullType}>${nullType};\n`;
                 }
             }
             else {
-                code += `    ${fieldName}${optionalMark}: Record<string, ${getCSharpTypeFromMushroomType(field.values?.type ?? 'string')}${valueNullType}>${nullType};\n`;
+                code += `    ${fieldName}${optionalMark}: Record<string, ${getTypescriptTypeFromMushroomType(field.values?.type ?? 'string')}${valueNullType}>${nullType};\n`;
             }
         }
         else if (field.type == 'array') {
@@ -131,15 +121,15 @@ function generateTypescriptClass(objectDefination, className, options) {
                     childrenCode += generateTypescriptClass(field.items.values.fields ?? {}, fieldClassName, options);
                 }
                 else {
-                    code += `    ${fieldName}${optionalMark}: Array<Record<string, ${getCSharpTypeFromMushroomType(field.items.type ?? 'string')}${valueNullType}>${itemNullType}>${nullType};\n`;
+                    code += `    ${fieldName}${optionalMark}: Array<Record<string, ${getTypescriptTypeFromMushroomType(field.items.type ?? 'string')}${valueNullType}>${itemNullType}>${nullType};\n`;
                 }
             }
             else {
-                code += `    ${fieldName}${optionalMark}: Array<${getCSharpTypeFromMushroomType(field.items?.type ?? 'string')}${itemNullType}>${nullType};\n`;
+                code += `    ${fieldName}${optionalMark}: Array<${getTypescriptTypeFromMushroomType(field.items?.type ?? 'string')}${itemNullType}>${nullType};\n`;
             }
         }
         else {
-            code += `    ${fieldName}${optionalMark}: ${getCSharpTypeFromMushroomType(field.type ?? 'string')}${nullType};\n`;
+            code += `    ${fieldName}${optionalMark}: ${getTypescriptTypeFromMushroomType(field.type ?? 'string')}${nullType};\n`;
         }
     }
     code += '}\n\n';
@@ -149,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 ? '' : '?'}: ${getCSharpTypeFromMushroomType(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 || 'string')}${p.isArray ? '[]' : ''}${p.validation?.required && p.defaultValue === undefined ? '' : ' | null'};`)
                 .join('\n') +
             '\n}');
     }
@@ -186,7 +176,7 @@ function generateTopCustomClass(config, entityName, methodName, grantRole, postf
         }
     }
     else
-        inputClassName = getCSharpTypeFromMushroomType(type);
+        inputClassName = getTypescriptTypeFromMushroomType(type);
     return isKeyValue
         ? isArray
             ? 'Record<string, ' + inputClassName + '[]>'
@@ -241,10 +231,10 @@ export function genTypescriptDriverString(aliasProject, source) {
         return '';
     }
     const entities = common.getEntities(source, aliasProject.allowRoles);
-    const extensionsImportLines = [];
+    const extensionsImportLines = ['/* import all mushroom extensions */'];
     const extensionsExportLines = [];
-    const extensionsTypes = [];
-    const extensionsCodeLines = [];
+    const extensionsTypes = ['/* all mushroom extensions types */'];
+    const extensionsCodeLines = ['/* using all mushroom extensions */'];
     if (Array.isArray(aliasProject.features)) {
         if (aliasProject.features.includes('auth')) {
             extensionsImportLines.push('import * as AuthExtension from "mushroomjs-auth";');
@@ -264,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    ')}
 };
 
@@ -404,7 +395,7 @@ export interface CustomMethodBodyRequest<TBody> extends MushroomRequest {
         }
         iApiClassBody += `,
 `;
-        code += `defineAsyncResource<${typescriptClassName}>(${JSON.stringify({ name: entityName, actions: actions, views: views })});
+        code += `defineAsyncResource<${typescriptClassName}>(${JSON.stringify({ name: entityName, actions: actions, views: views })}, mushroom);
 
 `;
     }
@@ -447,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.4",
+  "version": "1.2.6",
   "description": "Mushroom CLI",
   "main": "dist/mr.js",
   "type": "module",
@@ -33,9 +33,9 @@
   "author": "suco2007",
   "license": "ISC",
   "dependencies": {
-    "jsdom": "^28.1.0",
+    "jsdom": "^29.0.2",
     "json5": "^2.2.3",
-    "minify": "^15.0.1",
+    "minify": "^15.2.1",
     "node-fetch": "^3.3.2",
     "open": "^11.0.0",
     "readline-sync": "^1.4.10",