mushroom-cli 1.2.0-alpha.13 → 1.2.0-alpha.14

package/README.md

@@ -226,6 +226,12 @@ New features:
 
 - Support type for View result
 
+### 1.1.1
+
+Improvement:
+
+- `mushroom-cli update tsCode` can read the configuration in mushroom-config.json file
+
 ### 1.1.0
 
 Support MushroomServer 0.2.25.4 or later

package/dist/check-update.js

@@ -1,5 +1,6 @@
 import fetch from 'node-fetch';
 export default async function checkUpdate() {
     const res = await fetch('https://registry.npmjs.org/mushroom-cli/');
-    return await res.json();
+    const data = await res.json();
+    return data;
 }

package/dist/gen/gen-csharp.js

@@ -1,6 +1,20 @@
 import fs from 'fs';
+import path from 'path';
+import { fileURLToPath } from 'url';
 import * as common from '../common.js';
-import packageJson from '../../package.json' assert { type: 'json' };
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+function getPackageVersion() {
+    try {
+        const content = fs.readFileSync(path.join(__dirname, '../package.json')).toString();
+        const pkg = JSON.parse(content);
+        return pkg.version;
+    }
+    catch {
+        return '<!unable to get package version>';
+    }
+}
+const packageVersion = getPackageVersion();
 const newLine = '\n';
 const header = `// NOTE: Please do not modify this file
 // NOTE: Version and compatibility information: please see in Info.cs file
@@ -208,42 +222,36 @@ function generateCSharpClassMongoDb(source, className, fields, isRoot, descripti
         /// </summary>
 `;
         if (isRoot && fieldName === 'id') {
-            content += `        [MongoDB.Bson.Serialization.Attributes.BsonId${field.type === 'AutoId' && source.idType === 'GUID' ? '(IdGenerator = typeof(MongoDB.Bson.Serialization.IdGenerators.GuidGenerator))' : ''}]${newLine}`;
+            content += `        [MongoDB.Bson.Serialization.Attributes.BsonId${field.type === 'AutoId' && source.idType === 'GUID' ? '(IdGenerator = typeof(MongoDB.Bson.Serialization.IdGenerators.GuidGenerator))' : ''}]\n`;
         }
         content += `        [MongoDB.Bson.Serialization.Attributes.BsonElement("${isRoot && fieldName === 'id' ? '_id' : fieldName}")]
         [MongoDB.Bson.Serialization.Attributes.BsonIgnoreIfNull]
         [Newtonsoft.Json.JsonProperty(PropertyName = "${fieldName}", NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore${type === 'System.DateTime' ? ', DefaultValueHandling = Newtonsoft.Json.DefaultValueHandling.Ignore' : ''})]
 `;
         if ((field.type === 'AutoId' || field.type === 'IdRef') && source.idType === 'ObjectId') {
-            content +=
-                '        [MongoDB.Bson.Serialization.Attributes.BsonRepresentation(MongoDB.Bson.BsonType.ObjectId)]' + newLine;
+            content += '        [MongoDB.Bson.Serialization.Attributes.BsonRepresentation(MongoDB.Bson.BsonType.ObjectId)]\n';
         }
         if (field.type === 'AutoId' && source.idType === 'GUID') {
-            content +=
-                '        [MongoDB.Bson.Serialization.Attributes.BsonRepresentation(MongoDB.Bson.BsonType.String)]' + newLine;
+            content += '        [MongoDB.Bson.Serialization.Attributes.BsonRepresentation(MongoDB.Bson.BsonType.String)]\n';
         }
         if (field.type === 'datetime') {
             content +=
-                '        [MongoDB.Bson.Serialization.Attributes.BsonDateTimeOptions(Kind = System.DateTimeKind.Local)]' +
-                    newLine;
+                '        [MongoDB.Bson.Serialization.Attributes.BsonDateTimeOptions(Kind = System.DateTimeKind.Local)]\n';
         }
         if (field.type === 'array' && field.items) {
             if ((field.items.type === 'AutoId' || field.items.type === 'IdRef') && source.idType === 'ObjectId') {
                 content +=
-                    '        [MongoDB.Bson.Serialization.Attributes.BsonRepresentation(MongoDB.Bson.BsonType.ObjectId)]' +
-                        newLine;
+                    '        [MongoDB.Bson.Serialization.Attributes.BsonRepresentation(MongoDB.Bson.BsonType.ObjectId)]\n';
             }
             if (field.items.type === 'AutoId' && source.idType === 'GUID') {
-                content +=
-                    '        [MongoDB.Bson.Serialization.Attributes.BsonRepresentation(MongoDB.Bson.BsonType.String)]' + newLine;
+                content += '        [MongoDB.Bson.Serialization.Attributes.BsonRepresentation(MongoDB.Bson.BsonType.String)]\n';
             }
             if (field.items.type === 'datetime') {
                 content +=
-                    '        [MongoDB.Bson.Serialization.Attributes.BsonDateTimeOptions(Kind = System.DateTimeKind.Local)]' +
-                        newLine;
+                    '        [MongoDB.Bson.Serialization.Attributes.BsonDateTimeOptions(Kind = System.DateTimeKind.Local)]\n';
             }
         }
-        content += `        public ${type} ${propertyName} { get; set; }${newLine}${newLine}`;
+        content += `        public ${type} ${propertyName} { get; set; }\n\n`;
         strEnumClasses += generateEnumClass(source, out, field, `${className.toUpperCase()}_${propertyName.toUpperCase()}_ENUM`);
     }
     content += `        [MongoDB.Bson.Serialization.Attributes.BsonExtraElements]
@@ -299,7 +307,7 @@ export function genCSharpMongoDbClasses(args, projectName, project, alias, sourc
         collectionNames += `        public static string ${className}CollectionName => "${entities[entityName].storageName}";
         public static IMongoCollection<Resources.${className}> ${className}Collection => GetDatabase().GetCollection<Resources.${className}>(${className}CollectionName);
 `;
-        resourceNames += `        public static string ${className} => "${entityName}";${newLine}`;
+        resourceNames += `        public static string ${className} => "${entityName}";\n`;
         strClasses += generateCSharpClassMongoDb(source, className, entities[entityName].fields, true, entities[entityName].description, out);
         const actions = entities[entityName].actions || {};
         for (const actionName in actions) {
@@ -400,26 +408,22 @@ export function genCSharpMongoDbClasses(args, projectName, project, alias, sourc
     const delegators = groupCSharpMethodHandlerByMethod(out.delegators);
     const strDelegatorReferences = Object.keys(delegators)
         .map((method) => delegators[method].map((ev) => `            // ${ev.source}`).join(newLine) +
-        newLine +
-        `            RegisterCustomMethod(${getCSharpFunc(method, delegators[method][0].type)});`)
+        `\n            RegisterCustomMethod(${getCSharpFunc(method, delegators[method][0].type)});`)
         .join(newLine);
     const viewHandlers = groupCSharpMethodHandlerByMethod(out.viewHandlers);
     const strViewHandlerReferences = Object.keys(viewHandlers)
         .map((method) => viewHandlers[method].map((ev) => `            // ${ev.source}`).join(newLine) +
-        newLine +
-        `            RegisterCustomViewMethod(${getCSharpFunc(method, viewHandlers[method][0].type)});`)
+        `\n            RegisterCustomViewMethod(${getCSharpFunc(method, viewHandlers[method][0].type)});`)
         .join(newLine);
     const vnTextChannels = groupCSharpMethodHandlerByMethod(out.vnTextChannels);
     const strVnTextChannels = Object.keys(vnTextChannels)
         .map((method) => vnTextChannels[method].map((channel) => `            // ${channel.source}`).join(newLine) +
-        newLine +
-        `            RegisterCustomVnTextBuilderMethod(${getCSharpFunc(method, vnTextChannels[method][0].type)});`)
+        `\n            RegisterCustomVnTextBuilderMethod(${getCSharpFunc(method, vnTextChannels[method][0].type)});`)
         .join(newLine);
     const eventHandlers = groupCSharpMethodHandlerByMethod(out.eventHandlers);
     const strEventHandlerReferences = Object.keys(eventHandlers)
         .map((method) => eventHandlers[method].map((ev) => `            // ${ev.source}`).join(newLine) +
-        newLine +
-        `            RegisterEvent(${getCSharpFunc(method, eventHandlers[method][0].type)});`)
+        `\n            RegisterEvent(${getCSharpFunc(method, eventHandlers[method][0].type)});`)
         .join(newLine);
     const strJobReferences = Array.isArray(source.jobs)
         ? source.jobs
@@ -431,7 +435,7 @@ export function genCSharpMongoDbClasses(args, projectName, project, alias, sourc
             .map((job) => `            RegisterJob<${job.action.substring(4).split(',')[0]}>();`)
             .join(newLine)
         : '';
-    const code = `// This file was generated by Mushroom CLI ${packageJson.version} (https://www.npmjs.com/package/mushroom-cli), please do not modify
+    const code = `// This file was generated by Mushroom CLI ${packageVersion} (https://www.npmjs.com/package/mushroom-cli), please do not modify
 
 // NOTE: Compatible with Mushroom Server version 0.2.18 or higher (https://www.nuget.org/packages/Mushroom/)
 
@@ -563,39 +567,33 @@ function generateCSharpClassMongoDbToFolder(source, className, fields, isRoot, d
         /// </summary>
 `;
         if (isRoot && fieldName === 'id') {
-            content += `        [MongoDB.Bson.Serialization.Attributes.BsonId${field.type === 'AutoId' && source.idType === 'GUID' ? '(IdGenerator = typeof(MongoDB.Bson.Serialization.IdGenerators.GuidGenerator))' : ''}]${newLine}`;
+            content += `        [MongoDB.Bson.Serialization.Attributes.BsonId${field.type === 'AutoId' && source.idType === 'GUID' ? '(IdGenerator = typeof(MongoDB.Bson.Serialization.IdGenerators.GuidGenerator))' : ''}]\n`;
         }
         content += `        [MongoDB.Bson.Serialization.Attributes.BsonElement("${isRoot && fieldName === 'id' ? '_id' : fieldName}")]
         [MongoDB.Bson.Serialization.Attributes.BsonIgnoreIfNull]
         [Newtonsoft.Json.JsonProperty(PropertyName = "${fieldName}", NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore${type === 'System.DateTime' ? ', DefaultValueHandling = Newtonsoft.Json.DefaultValueHandling.Ignore' : ''})]
 `;
         if ((field.type === 'AutoId' || field.type === 'IdRef') && source.idType === 'ObjectId') {
-            content +=
-                '        [MongoDB.Bson.Serialization.Attributes.BsonRepresentation(MongoDB.Bson.BsonType.ObjectId)]' + newLine;
+            content += '        [MongoDB.Bson.Serialization.Attributes.BsonRepresentation(MongoDB.Bson.BsonType.ObjectId)]\n';
         }
         if (field.type === 'AutoId' && source.idType === 'GUID') {
-            content +=
-                '        [MongoDB.Bson.Serialization.Attributes.BsonRepresentation(MongoDB.Bson.BsonType.String)]' + newLine;
+            content += '        [MongoDB.Bson.Serialization.Attributes.BsonRepresentation(MongoDB.Bson.BsonType.String)]\n';
         }
         if (field.type === 'datetime') {
             content +=
-                '        [MongoDB.Bson.Serialization.Attributes.BsonDateTimeOptions(Kind = System.DateTimeKind.Local)]' +
-                    newLine;
+                '        [MongoDB.Bson.Serialization.Attributes.BsonDateTimeOptions(Kind = System.DateTimeKind.Local)]\n';
         }
         if (field.type === 'array') {
             if ((field.items?.type === 'AutoId' || field.items?.type === 'IdRef') && source.idType === 'ObjectId') {
                 content +=
-                    '        [MongoDB.Bson.Serialization.Attributes.BsonRepresentation(MongoDB.Bson.BsonType.ObjectId)]' +
-                        newLine;
+                    '        [MongoDB.Bson.Serialization.Attributes.BsonRepresentation(MongoDB.Bson.BsonType.ObjectId)]\n';
             }
             if (field.items?.type === 'AutoId' && source.idType === 'GUID') {
-                content +=
-                    '        [MongoDB.Bson.Serialization.Attributes.BsonRepresentation(MongoDB.Bson.BsonType.String)]' + newLine;
+                content += '        [MongoDB.Bson.Serialization.Attributes.BsonRepresentation(MongoDB.Bson.BsonType.String)]\n';
             }
             if (field.items?.type === 'datetime') {
                 content +=
-                    '        [MongoDB.Bson.Serialization.Attributes.BsonDateTimeOptions(Kind = System.DateTimeKind.Local)]' +
-                        newLine;
+                    '        [MongoDB.Bson.Serialization.Attributes.BsonDateTimeOptions(Kind = System.DateTimeKind.Local)]\n';
             }
         }
         content += `        public ${type} ${propertyName} { get; set; }
@@ -776,26 +774,22 @@ function genCSharpMongoDbClassesToFolder(projectName, alias, source, aliasProjec
     const delegators = groupCSharpMethodHandlerByMethod(out.delegators);
     const strDelegatorReferences = Object.keys(delegators)
         .map((method) => delegators[method].map((ev) => `            // ${ev.source}`).join(newLine) +
-        newLine +
-        `            RegisterCustomMethod(${getCSharpFunc(method, delegators[method][0].type)});`)
+        `\n            RegisterCustomMethod(${getCSharpFunc(method, delegators[method][0].type)});`)
         .join(newLine);
     const viewHandlers = groupCSharpMethodHandlerByMethod(out.viewHandlers);
     const strViewHandlerReferences = Object.keys(viewHandlers)
         .map((method) => viewHandlers[method].map((ev) => `            // ${ev.source}`).join(newLine) +
-        newLine +
-        `            RegisterCustomViewMethod(${getCSharpFunc(method, viewHandlers[method][0].type)});`)
+        `\n            RegisterCustomViewMethod(${getCSharpFunc(method, viewHandlers[method][0].type)});`)
         .join(newLine);
     const vnTextChannels = groupCSharpMethodHandlerByMethod(out.vnTextChannels);
     const strVnTextChannels = Object.keys(vnTextChannels)
         .map((method) => vnTextChannels[method].map((channel) => `            // ${channel.source}`).join(newLine) +
-        newLine +
-        `            RegisterCustomVnTextBuilderMethod(${getCSharpFunc(method, vnTextChannels[method][0].type)});`)
+        `\n            RegisterCustomVnTextBuilderMethod(${getCSharpFunc(method, vnTextChannels[method][0].type)});`)
         .join(newLine);
     const eventHandlers = groupCSharpMethodHandlerByMethod(out.eventHandlers);
     const strEventHandlerReferences = Object.keys(eventHandlers)
         .map((method) => eventHandlers[method].map((ev) => `            // ${ev.source}`).join(newLine) +
-        newLine +
-        `            RegisterEvent(${getCSharpFunc(method, eventHandlers[method][0].type)});`)
+        `\n            RegisterEvent(${getCSharpFunc(method, eventHandlers[method][0].type)});`)
         .join(newLine);
     const strJobReferences = Array.isArray(source.jobs)
         ? source.jobs
@@ -871,7 +865,8 @@ ${strJobReferences}
 }
 #endif
 `;
-    const infoFileContent = `// Mushroom CLI version: ${packageJson.version}${newLine}// Compatible with Mushroom Server version: 0.2.25.4 or higher (https://www.nuget.org/packages/Mushroom/)
+    const infoFileContent = `// Mushroom CLI version: ${packageVersion}
+// Compatible with Mushroom Server version: 0.2.25.4 or higher (https://www.nuget.org/packages/Mushroom/)
 // For Mushroom Server 0.2.18 to 0.2.25.4: Please remove all FindById methods in DbConnector.cs`;
     fs.writeFileSync(aliasProject.output + '/DbConnector.cs', dbConnectorFileContent);
     fs.writeFileSync(aliasProject.output + '/ResourceNames.cs', resourceNamesFileContent);
@@ -928,7 +923,7 @@ function generateCSharpClassDriver(source, className, fields, description, out)
         out.strEnumClasses ?? (out.strEnumClasses = '');
         out.strEnumClasses += strEnumClasses;
     }
-    content += '    }' + newLine;
+    content += '    }\n';
     return strClasses + newLine + content;
 }
 export function genCSharpDriver(args, projectName, project, alias, source) {
@@ -949,8 +944,8 @@ export function genCSharpDriver(args, projectName, project, alias, source) {
     for (const entityName in entities) {
         const className = toCSharpName(entityName);
         strClasses += generateCSharpClassDriver(source, className, entities[entityName].fields, entities[entityName].description, out);
-        codeStaticCtor += `            ${className} = new ${className}Connector(client);${newLine}`;
-        codeStaticProperties += `        public static ${className}Connector ${className} { get; }${newLine}${newLine}`;
+        codeStaticCtor += `            ${className} = new ${className}Connector(client);\n`;
+        codeStaticProperties += `        public static ${className}Connector ${className} { get; }\n\n`;
         const entity = entities[entityName];
         codeConnectors += `    ${accessModifier} partial class ${className}Connector : MushroomDriver.MushroomResourceConnector<${className}>
     {
@@ -1187,11 +1182,11 @@ export function genCSharpDriver(args, projectName, project, alias, source) {
 
 ${viewExtraClass}`;
         }
-        codeConnectors += '    }' + newLine + newLine;
+        codeConnectors += '    }\n\n';
     }
     if (out.strEnumClasses)
         strEnumClasses += out.strEnumClasses;
-    const code = `// This file was generated by Mushroom CLI ${packageJson.version} (https://www.npmjs.com/package/mushroom-cli), please do not modify
+    const code = `// This file was generated by Mushroom CLI ${packageVersion} (https://www.npmjs.com/package/mushroom-cli), please do not modify
 
 // Require package: Mushroom.Driver version 1.4.0 or later (https://www.nuget.org/packages/Mushroom.Driver/)
 

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

@@ -1,10 +1,23 @@
 import fs from 'fs';
 import path from 'path';
+import { fileURLToPath } from 'url';
 import targz from 'targz';
 import * as common from '../common.js';
 import * as javascriptDriverGenerator from './gen-js-driver.js';
 import * as typescriptDriverGenerator from './gen-ts-driver.js';
-import packageJson from '../../package.json' assert { type: 'json' };
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+function getPackageVersion() {
+    try {
+        const content = fs.readFileSync(path.join(__dirname, '../package.json')).toString();
+        const pkg = JSON.parse(content);
+        return pkg.version;
+    }
+    catch {
+        return '<!unable to get package version>';
+    }
+}
+const packageVersion = getPackageVersion();
 function compressAsync(src, dest, folderName) {
     return new Promise((resolve, reject) => {
         const options = {
@@ -35,7 +48,7 @@ export default async function genJavascriptDriverTarball(args, projectName, proj
     let tarballName = aliasProject.tarballName ? aliasProject.tarballName : projectName;
     tarballName = tarballName.toLowerCase().replace(/[^a-z-]/g, '-');
     const dirPath = path.join(path.dirname(aliasProject.output), tarballName);
-    const versionGroup = packageJson.version.match(/([^-]+)(-(\w+).*)?/);
+    const versionGroup = packageVersion.match(/([^-]+)(-(\w+).*)?/);
     const currentDistTag = versionGroup?.[3] ? versionGroup[3] : 'latest';
     const dependencies = [`"mushroomjs": "${currentDistTag}"`];
     if (Array.isArray(aliasProject.features) && aliasProject.features.includes('auth')) {

package/dist/init/init-json.js

@@ -30,7 +30,8 @@ export default function initJson(args) {
     common.logInfo('Fetch https://api.siten.vn/gen/template/template-def.json');
     fetch('https://api.siten.vn/gen/template/template-def.json')
         .then((res) => res.json())
-        .then((templateConfig) => {
+        .then((templateDefination) => {
+        const templateConfig = templateDefination;
         const info = {};
         templateConfig.fields.forEach((field) => {
             while (true) {

package/dist/init/init-netcore.js

@@ -10,10 +10,10 @@ function fetchFromGit() {
             '--single-branch',
         ]);
         git.stdout.on('data', (data) => {
-            common.logInfo('GIT:', data);
+            common.logInfo('GIT:', data?.toString());
         });
         git.stderr.on('data', (data) => {
-            common.logError('GIT:', data);
+            common.logError('GIT:', data?.toString());
         });
         git.on('close', (code) => {
             if (code) {

package/dist/mr.js

@@ -1,4 +1,7 @@
 #!/usr/bin/env node
+import fs from 'fs';
+import path from 'path';
+import { fileURLToPath } from 'url';
 import * as common from './common.js';
 import init from './init.js';
 import config from './config.js';
@@ -6,11 +9,23 @@ import gen from './gen.js';
 import merge from './merge.js';
 import update from './update.js';
 import help from './help.js';
-import pkg from '../package.json' assert { type: 'json' };
 import checkUpdate from './check-update.js';
-const versionGroup = pkg.version.match(/([^-]+)(-(\w+).*)?/);
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+function getPackageVersion() {
+    try {
+        const content = fs.readFileSync(path.join(__dirname, '../package.json')).toString();
+        const pkg = JSON.parse(content);
+        return pkg.version;
+    }
+    catch {
+        return '<!unable to get package version>';
+    }
+}
+const packageVersion = getPackageVersion();
+const versionGroup = packageVersion.match(/([^-]+)(-(\w+).*)?/);
 const currentDistTag = versionGroup?.[3] ? versionGroup[3] : 'latest';
-common.logInfo('Mushroom CLI version', pkg.version);
+common.logInfo('Mushroom CLI version', packageVersion);
 async function run(args) {
     let debugMode = false;
     if (args.indexOf('--debug') !== -1) {
@@ -62,7 +77,9 @@ async function run(args) {
     if (checkUpdateTask !== null)
         try {
             const data = await checkUpdateTask;
-            if (data['dist-tags'] && data['dist-tags'][currentDistTag] && data['dist-tags'][currentDistTag] !== pkg.version) {
+            if (data['dist-tags'] &&
+                data['dist-tags'][currentDistTag] &&
+                data['dist-tags'][currentDistTag] !== packageVersion) {
                 common.logWarning(`YOUR mushroom-cli VERSION IS NOT LATEST (dist-tags: ${currentDistTag}). PLEASE RUN: npm i mushroom-cli@${data['dist-tags'][currentDistTag]} OR yarn add mushroom-cli@^${data['dist-tags'][currentDistTag]}`);
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mushroom-cli",
-  "version": "1.2.0-alpha.13",
+  "version": "1.2.0-alpha.14",
   "description": "Mushroom CLI",
   "main": "dist/mr.js",
   "type": "module",
@@ -8,7 +8,7 @@
     "build": "tsc && copyfiles -u 2 ./src/docs/* ./dist/docs/",
     "format": "prettier --write \"**/*.{ts,js,json,md}\"",
     "lint": "eslint ./src",
-    "release": "npm publish --access public --tag alpha",
+    "release": "npm run build && npm publish --access public --tag alpha",
     "prepare": "husky install"
   },
   "files": [
@@ -24,13 +24,12 @@
   },
   "author": "suco2007",
   "license": "ISC",
-  "dependencies-comments": "node-fetch: 2.x; open: 8.x",
   "dependencies": {
-    "jsdom": "^24.1.1",
+    "jsdom": "^25.0.0",
     "json5": "^2.2.3",
     "minify": "^11.4.0",
-    "node-fetch": "^2.7.0",
-    "open": "^8.4.2",
+    "node-fetch": "^3.3.2",
+    "open": "^10.1.0",
     "readline-sync": "^1.4.10",
     "targz": "^1.0.1"
   },