mushroom-cli 1.2.0-alpha.15 → 1.2.0-alpha.17

package/README.md

@@ -132,6 +132,12 @@ npx mushroom-cli parameters --no-check-update
 
 ## Version
 
+### 1.2.0-alpha.17
+
+Improvement:
+
+- gen-ts: add null value for nullable field type
+
 ### 1.2.0-alpha.15
 
 Improvement:

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

@@ -241,7 +241,7 @@ async function writeDocs(filePath, strTemplate, strData) {
 }
 const copyStaticFiles = (folderPath, files) => {
     files.forEach((file) => {
-        fs.copyFileSync(path.join(folderPath, file), path.join(__dirname, '../docs/', file));
+        fs.copyFileSync(path.join(__dirname, '../docs/', file), path.join(folderPath, file));
     });
 };
 export default async function genDocs(args, projectName, project, alias, source) {

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

@@ -59,24 +59,26 @@ function generateTypescriptClass(objectDefination, className, options) {
     let childrenCode = '';
     let code = `export interface ${className} {\n`;
     for (const fieldName in objectDefination) {
-        const optionalMark = options?.checkRequired && objectDefination[fieldName].required ? '' : '?';
+        const optionalMark = options?.checkRequired && objectDefination[fieldName].required
+            ? ''
+            : ' | null | undefined';
         if (objectDefination[fieldName].type == 'object') {
             const fieldClassName = className + '_' + toTypeScriptClassName(fieldName);
-            code += `    ${fieldName}${optionalMark}: ${fieldClassName},\n`;
+            code += `    ${fieldName}: ${fieldClassName}${optionalMark};\n`;
             childrenCode += generateTypescriptClass(objectDefination[fieldName].fields ?? {}, fieldClassName);
         }
         else if (objectDefination[fieldName].type == 'array') {
             if (objectDefination[fieldName].items?.type == 'object') {
                 const fieldClassName = className + '_' + toTypeScriptClassName(fieldName);
-                code += `    ${fieldName}${optionalMark}: ${fieldClassName}[],\n`;
+                code += `    ${fieldName}: ${fieldClassName}[]${optionalMark};\n`;
                 childrenCode += generateTypescriptClass(objectDefination[fieldName].items?.fields ?? {}, fieldClassName);
             }
             else {
-                code += `    ${fieldName}${optionalMark}: ${getCSharpTypeFromMushroomType(objectDefination[fieldName].items?.type ?? '')}[],\n`;
+                code += `    ${fieldName}: ${getCSharpTypeFromMushroomType(objectDefination[fieldName].items?.type ?? '')}[]${optionalMark};\n`;
             }
         }
         else {
-            code += `    ${fieldName}${optionalMark}: ${getCSharpTypeFromMushroomType(objectDefination[fieldName].type)},\n`;
+            code += `    ${fieldName}: ${getCSharpTypeFromMushroomType(objectDefination[fieldName].type)}${optionalMark};\n`;
         }
     }
     code += '}\n\n';
@@ -86,8 +88,8 @@ function generateTypescriptClassFromViewParameters(parameters) {
     if (Array.isArray(parameters)) {
         return ('{\n' +
             parameters
-                .map((p) => `    ${p.field}${p.validation?.required && p.defaultValue === undefined ? '' : '?'}: ${getCSharpTypeFromMushroomType(p.type || 'string')}${p.isArray ? '[]' : ''}`)
-                .join(',\n') +
+                .map((p) => `    ${p.field}: ${getCSharpTypeFromMushroomType(p.type || 'string')}${p.isArray ? '[]' : ''}${p.validation?.required && p.defaultValue === undefined ? '' : ' | null | undefined'};`)
+                .join('\n') +
             '\n}');
     }
     return '{}';
@@ -193,8 +195,7 @@ export type IdValue = ${source.idType == 'AutoIncInt' || source.idType == 'AutoI
                 }
                 default: {
                     if (actionName.indexOf('_raw_http_method_') === 0) {
-                        customMethodCode += `    ${actionName.substring('_raw_http_method_'.length)}Async: (rawRequest: MushroomRequest) => Promise<MushroomResponse<any>>,
-`;
+                        customMethodCode += `    ${actionName.substring('_raw_http_method_'.length)}Async: (rawRequest: MushroomRequest) => Promise<MushroomResponse<any>>;\n`;
                         break;
                     }
                     else {
@@ -229,7 +230,7 @@ ${customMethodCode}}
                 return `MushroomViewFunction<${outputType}, ${inputType}>`;
             });
             viewCode += `
-        ${viewName}Async: ${viewParameterTypes.join(' | ')},`;
+        ${viewName}Async: ${viewParameterTypes.join(' | ')};`;
         }
         if (viewCode) {
             code += `export interface ${typescriptClassName}$ViewsResource {
@@ -358,8 +359,7 @@ export declare type IdValue = ${source.idType == 'AutoIncInt' || source.idType =
                 }
                 default: {
                     if (actionName.indexOf('_raw_http_method_') === 0) {
-                        customMethodCode += `    ${actionName.substring('_raw_http_method_'.length)}Async: (rawRequest: MushroomRequest) => Promise<MushroomResponse<any>>,
-`;
+                        customMethodCode += `    ${actionName.substring('_raw_http_method_'.length)}Async: (rawRequest: MushroomRequest) => Promise<MushroomResponse<any>>;\n`;
                         break;
                     }
                     else {

package/package.json

@@ -1,15 +1,23 @@
 {
   "name": "mushroom-cli",
-  "version": "1.2.0-alpha.15",
+  "version": "1.2.0-alpha.17",
   "description": "Mushroom CLI",
   "main": "dist/mr.js",
   "type": "module",
   "scripts": {
     "build": "tsc && copyfiles -u 2 ./src/docs/* ./dist/docs/",
-    "format": "prettier --write \"**/*.{ts,js,json,md}\"",
-    "lint": "eslint ./src",
+    "format": "prettier --write **/*",
+    "lint": "eslint ./src/**/*.ts",
     "release": "npm run build && npm publish --access public --tag alpha",
-    "prepare": "husky install"
+    "preinstall": "npx only-allow npm",
+    "prepare": "husky"
+  },
+  "lint-staged": {
+    "!(*.ts)": "prettier --write --ignore-unknown",
+    "src/**/*.ts": [
+      "eslint --quiet",
+      "prettier --write"
+    ]
   },
   "files": [
     "dist"
@@ -25,28 +33,30 @@
   "author": "suco2007",
   "license": "ISC",
   "dependencies": {
-    "jsdom": "^25.0.0",
+    "jsdom": "^25.0.1",
     "json5": "^2.2.3",
-    "minify": "^11.4.0",
+    "minify": "^11.4.1",
     "node-fetch": "^3.3.2",
     "open": "^10.1.0",
     "readline-sync": "^1.4.10",
     "targz": "^1.0.1"
   },
   "devDependencies": {
-    "@eslint/js": "^9.9.1",
+    "@eslint/js": "^9.11.1",
     "@types/jsdom": "^21.1.7",
     "@types/minify": "^9.1.4",
-    "@types/node": "^22.5.0",
+    "@types/node": "^22.7.4",
     "@types/node-fetch": "^2.6.11",
     "@types/readline-sync": "^1.4.8",
     "@types/targz": "^1.0.4",
     "copyfiles": "^2.4.1",
-    "eslint": "^9.9.1",
-    "husky": "^8.0.3",
+    "eslint": "^9.11.1",
+    "husky": "^9.1.6",
+    "lint-staged": "^15.2.10",
+    "only-allow": "^1.2.1",
     "prettier": "^3.3.3",
-    "typescript": "^5.5.4",
-    "typescript-eslint": "^8.3.0"
+    "typescript": "^5.6.2",
+    "typescript-eslint": "^8.8.0"
   },
   "engines": {
     "node": ">=14.0.0"