mushroom-cli 1.1.0-alpha.20 → 1.1.0-alpha.22

package/common.js

@@ -203,7 +203,8 @@ function processDeleteCommand(command, basePath, variables) {
 
     const deletedPath = path.join(basePath, input);
     if (fs.lstatSync(deletedPath).isDirectory()) {
-        fs.rmdirSync(deletedPath, {recursive: true, force: true});
+        // fs.rmdirSync(deletedPath, {recursive: true, force: true});
+        fs.rmSync(deletedPath, {recursive: true, force: true});
     }
     else {
         fs.rmSync(deletedPath, {force: true});

package/docs/docs.html

@@ -333,6 +333,9 @@
             </div>
             <div data-mt-cond='{"entity.features.vn_text.fields.length": {"$gt": 0}}'>
                 Cho phép tìm kiếm tiếng Việt không dấu, không phân biệt hoa thường trên <span data-mt-cond='{"entity.features.vn_text.fields.length": {"$gt": 1}}'>các</span> trường: <code class="separated-items" data-mt-iterate='{"data": "$entity.features.vn_text.fields"}'><span data-mt-attr='{"text": "$this"}'></span><span class="separator">, </span></code>
+                <ul data-mt-cond='{"entity.features.vn_text.channels.length": {"$gt": 0}}' data-mt-iterate='{"data": "$entity.features.vn_text.channels"}'>
+                    <li>Cho phép tìm kiếm theo kênh <code data-mt-attr='{"text": "$name"}'></code> trên <span data-mt-cond='{"fields.length": {"$gt": 1}}'>các</span> trường: <code class="separated-items" data-mt-iterate='{"data": "$fields"}'><span data-mt-attr='{"text": "$this"}'></span><span class="separator">, </span></code></li>
+                </ul>
             </div>
             <div data-mt-cond='{"action.requiredFilteringFields": {"$exists": true}}'>
                 Bắt buộc phải lọc theo các trường:
@@ -437,7 +440,7 @@
                     Đơn giản
                     <pre data-language="javascript">try {
     const response = await mushroom.<span data-mt-attr='{"text": "$entityName"}'></span>.listAsync();
-    console.log("Các <span data-mt-attr='{"text": "$entityName"}'></span> thỏa mãn: %o, info: %o", response);
+    console.log("Các <span data-mt-attr='{"text": "$entityName"}'></span> thỏa mãn: %o", response);
 }
 catch (e) {
     console.error("Có lỗi: %o", e);
@@ -454,7 +457,7 @@ catch (e) {
 </span><span data-mt-cond='{"action.pagingType": "Page"}'>        page: 1,
 </span><span data-mt-cond='{"entity.features.vn_text.fields.length": {"$gt": 0}}'>        vn_text: "Chuỗi tìm kiếm", <span class="code-comment">// tìm kiếm tiếng Việt không dấu, không phân biệt hoa thường trên <span data-mt-cond='{"entity.features.vn_text.fields.length": {"$gt": 1}}'>các</span> trường: <span class="separated-items" data-mt-iterate='{"data": "$entity.features.vn_text.fields"}'><span data-mt-attr='{"text": "$this"}'></span><span class="separator">,</span></span></span>
 </span>    });
-    console.log("Các <span data-mt-attr='{"text": "$entityName"}'></span> thỏa mãn: %o, info: %o", response);
+    console.log("Các <span data-mt-attr='{"text": "$entityName"}'></span> thỏa mãn: %o", response);
 }
 catch (e) {
     console.error("Có lỗi: %o", e);
@@ -3052,7 +3055,45 @@ password: string, required</pre>
     token: string
 }</pre><br />
                     Thất bại:<br />
-                    Http Status Code: <code>403</code>
+                    Http Status Code: <code>403</code><br />
+                    Mushroom code:
+                    <ul>
+                        <li>
+                            -1: Có lỗi nói chung (Mushroom Auth từ 1.5.0 trở về trước)
+                        </li>
+                        <li>
+                            37000: đăng nhập thất bại (do sai account hoặc password) (Mushroom Auth từ 1.6.0 trở lên)
+                            <ul>
+                                <li>
+                                    Nếu vẫn còn login quota
+                                    <ul>
+                                        <li>meta.remainingCount: number là số lượng quota còn lại</li>
+                                    </ul>
+                                </li>
+                                <li>
+                                    Nếu hết login quota
+                                    <ul>
+                                        <li>subCode:1</li>
+                                        <li>meta.locked: true</li>
+                                        <li>meta.lockedTime: datetime</li>
+                                        <li>meta.lockedReason: string</li>
+                                        <li>meta.releaseTime: datetime</li>
+                                        <li>meta.serverTime: datatime</li>
+                                    </ul>
+                                </li>
+                            </ul>
+                        </li>
+                        <li>
+                            37001: khi tài khoản bị tạm khóa (đã hết login quota) (Mushroom Auth từ 1.6.0 trở lên)
+                            <ul>
+                                <li>meta.locked: true</li>
+                                <li>meta.lockedTime: datetime</li>
+                                <li>meta.lockedReason: string</li>
+                                <li>meta.releaseTime: datetime</li>
+                                <li>meta.serverTime: datatime</li>
+                            </ul>
+                        </li>
+                    </ul>
                 </div>
                 
                 <div class="driver-snippet">

package/gen/gen-api-docs.js

@@ -102,7 +102,7 @@ async function genDocs(args, projectName, project, alias, source) {
     const aliasProject = ((project.docs || {}).alias || {})[alias];
 
     if (!aliasProject) {
-        throw new Error(`Not found gen docs configuration. Please run 'npx mr config ${projectName} gen docs OUTPUT_FILE.html${alias === "default" ? "" : " alias " + alias}' first`);
+        throw new Error(`Not found gen docs configuration. Please run 'npx mushroom-cli config ${projectName} gen docs OUTPUT_FILE.html${alias === "default" ? "" : " alias " + alias}' first`);
     }
 
     const entities = common.getEntities(source, aliasProject.allowRoles);

package/gen/gen-csharp.js

@@ -269,7 +269,7 @@ function genCSharpMongoDbClasses(args, projectName, project, alias, source) {
     const aliasProject = ((project.csharpMongo || {}).alias || {})[alias];
 
     if (!aliasProject) {
-        throw new Error(`Not found gen c#-mongo configuration. Please run 'npx mr config ${projectName} gen c#-mongo OUTPUT_FILE.cs${alias === "default" ? "" : " alias " + alias}' first`);
+        throw new Error(`Not found gen c#-mongo configuration. Please run 'npx mushroom-cli config ${projectName} gen c#-mongo OUTPUT_FILE.cs${alias === "default" ? "" : " alias " + alias}' first`);
     }
 
     if (aliasProject.outputToFolder) {
@@ -382,6 +382,25 @@ function genCSharpMongoDbClasses(args, projectName, project, alias, source) {
                 }
             });
         }
+
+        const channels = entities[entityName].features?.vn_text?.channels;
+        if (channels != null) {
+            channels.forEach(channel => {
+                if (!channel.nativeBuilder || typeof channel.nativeBuilder !== "string" || channel.nativeBuilder.indexOf("lib:") !== 0) return;
+
+                out.vnTextChannels = out.vnTextChannels || [];
+                const method = channel.nativeBuilder.substr(4, channel.nativeBuilder.length - 4);
+                let type = channel.codeHint && channel.codeHint.nativeBuilder && channel.codeHint.nativeBuilder.csharp
+                    ? channel.codeHint.nativeBuilder.csharp.methodType
+                    : null;
+                if (type !== "non-static") type = "static";
+                out.vnTextChannels.push({
+                    method: method,
+                    source: `entity: ${entityName}, feature: vn_text, channel: ${channel.name}`,
+                    type: type
+                });
+            });
+        }
     }
 
     if (out.strEnumClasses)
@@ -413,6 +432,19 @@ function genCSharpMongoDbClasses(args, projectName, project, alias, source) {
     }, {});
     const strViewHandlerReferences = Object.keys(viewHandlers).map(method => viewHandlers[method].map(ev => `            // ${ev.source}`).join(newLine) + newLine + `            RegisterCustomViewMethod(${getCSharpFunc(method, viewHandlers[method][0].type)});`).join(newLine);
 
+    const vnTextChannels = (out.vnTextChannels || []).reduce((prev, cur) => {
+        if (cur.method in prev) {
+            if (prev[cur.method].indexOf(cur.source) === -1) {
+                prev[cur.method].push(cur);
+            }
+        }
+        else {
+            prev[cur.method] = [cur];
+        }
+        return prev;
+    }, {});
+    const strVnTextChannels = Object.keys(vnTextChannels).map(method => vnTextChannels[method].map(channel => `            // ${channel.source}`).join(newLine) + newLine + `            RegisterCustomVnTextBuilderMethod(${getCSharpFunc(method, vnTextChannels[method][0].type)});`).join(newLine);
+
     const eventHandlers = (out.eventHandlers || []).reduce((prev, cur) => {
         if (cur.method in prev) {
             if (prev[cur.method].indexOf(cur.source) === -1) {
@@ -507,6 +539,7 @@ namespace ${namespace}.CodeHelper
         private void RegisterCustomMethod(System.Action<Mushroom.ActionArguments> fn) { }
         private void RegisterCustomViewMethod(System.Func<Mushroom.ViewArguments, System.Threading.Tasks.Task<System.Collections.Generic.IEnumerable<object>>> fn) { }
         private void RegisterCustomViewMethod(System.Action<Mushroom.ViewArguments> fn) { }
+        private void RegisterCustomVnTextBuilderMethod(System.Func<System.Collections.Generic.IEnumerable<string>, System.Collections.Generic.IEnumerable<string>> fn) { }
         private void RegisterEvent(System.Func<object, Mushroom.ActionArguments, System.Threading.Tasks.Task> fn) { }
         private void RegisterEvent(System.Action<object, Mushroom.ActionArguments> fn) { }
         private void RegisterJob<T>() where T : Mushroom.Job.JobBase { }
@@ -514,6 +547,7 @@ namespace ${namespace}.CodeHelper
         {
 ${strDelegatorReferences}
 ${strViewHandlerReferences}
+${strVnTextChannels}
 ${strEventHandlerReferences}
 ${strJobReferences}
         }
@@ -674,7 +708,8 @@ function genCSharpMongoDbClassesToFolder(projectName, alias, source, aliasProjec
             fs.unlinkSync(aliasProject.output); // xóa file nếu có
         } catch(e) {}
         try {
-            fs.rmdirSync(aliasProject.output, { recursive: true, force: true }); // xóa thư mục nếu có
+            // fs.rmdirSync(aliasProject.output, { recursive: true, force: true }); // xóa thư mục nếu có
+            fs.rmSync(aliasProject.output, { recursive: true, force: true }); // xóa thư mục nếu có
         } catch(e) {}
     }
     fs.mkdirSync(aliasProject.output, { recursive: true, mode: 0755 });
@@ -785,6 +820,25 @@ function genCSharpMongoDbClassesToFolder(projectName, alias, source, aliasProjec
                 }
             });
         }
+
+        const channels = entities[entityName].features?.vn_text?.channels;
+        if (channels != null) {
+            channels.forEach(channel => {
+                if (!channel.nativeBuilder || typeof channel.nativeBuilder !== "string" || channel.nativeBuilder.indexOf("lib:") !== 0) return;
+
+                out.vnTextChannels = out.vnTextChannels || [];
+                const method = channel.nativeBuilder.substr(4, channel.nativeBuilder.length - 4);
+                let type = channel.codeHint && channel.codeHint.nativeBuilder && channel.codeHint.nativeBuilder.csharp
+                    ? channel.codeHint.nativeBuilder.csharp.methodType
+                    : null;
+                if (type !== "non-static") type = "static";
+                out.vnTextChannels.push({
+                    method: method,
+                    source: `entity: ${entityName}, feature: vn_text, channel: ${channel.name}`,
+                    type: type
+                });
+            });
+        }
     }
 
 
@@ -814,6 +868,19 @@ function genCSharpMongoDbClassesToFolder(projectName, alias, source, aliasProjec
     }, {});
     const strViewHandlerReferences = Object.keys(viewHandlers).map(method => viewHandlers[method].map(ev => `            // ${ev.source}`).join(newLine) + newLine + `            RegisterCustomViewMethod(${getCSharpFunc(method, viewHandlers[method][0].type)});`).join(newLine);
 
+    const vnTextChannels = (out.vnTextChannels || []).reduce((prev, cur) => {
+        if (cur.method in prev) {
+            if (prev[cur.method].indexOf(cur.source) === -1) {
+                prev[cur.method].push(cur);
+            }
+        }
+        else {
+            prev[cur.method] = [cur];
+        }
+        return prev;
+    }, {});
+    const strVnTextChannels = Object.keys(vnTextChannels).map(method => vnTextChannels[method].map(channel => `            // ${channel.source}`).join(newLine) + newLine + `            RegisterCustomVnTextBuilderMethod(${getCSharpFunc(method, vnTextChannels[method][0].type)});`).join(newLine);
+
     const eventHandlers = (out.eventHandlers || []).reduce((prev, cur) => {
         if (cur.method in prev) {
             if (prev[cur.method].indexOf(cur.source) === -1) {
@@ -901,6 +968,7 @@ namespace ${namespace}
         private void RegisterCustomMethod(System.Action<Mushroom.ActionArguments> fn) { }
         private void RegisterCustomViewMethod(System.Func<Mushroom.ViewArguments, System.Threading.Tasks.Task<System.Collections.Generic.IEnumerable<object>>> fn) { }
         private void RegisterCustomViewMethod(System.Action<Mushroom.ViewArguments> fn) { }
+        private void RegisterCustomVnTextBuilderMethod(System.Func<System.Collections.Generic.IEnumerable<string>, System.Collections.Generic.IEnumerable<string>> fn) { }
         private void RegisterEvent(System.Func<object, Mushroom.ActionArguments, System.Threading.Tasks.Task> fn) { }
         private void RegisterEvent(System.Action<object, Mushroom.ActionArguments> fn) { }
         private void RegisterJob<T>() where T : Mushroom.Job.JobBase { }
@@ -908,6 +976,7 @@ namespace ${namespace}
         {
 ${strDelegatorReferences}
 ${strViewHandlerReferences}
+${strVnTextChannels}
 ${strEventHandlerReferences}
 ${strJobReferences}
         }
@@ -991,7 +1060,7 @@ function genCSharpDriver(args, projectName, project, alias, source) {
     const aliasProject = ((project.csharpDriver || {}).alias || {})[alias];
 
     if (!aliasProject) {
-        throw new Error(`Not found gen c#-driver configuration. Please run 'npx mr config ${projectName} gen c#-driver OUTPUT_FILE.cs${alias === "default" ? "" : " alias " + alias}' first`);
+        throw new Error(`Not found gen c#-driver configuration. Please run 'npx mushroom-cli config ${projectName} gen c#-driver OUTPUT_FILE.cs${alias === "default" ? "" : " alias " + alias}' first`);
     }
 
     const entities = common.getEntities(source, aliasProject.allowRoles);

package/gen/gen-db-docs.js

@@ -175,7 +175,7 @@ function genDatabaseDocs(args, projectName, project, alias, source) {
     const aliasProject = ((project.dbDocs || {}).alias || {})[alias];
 
     if (!aliasProject) {
-        throw new Error(`Not found gen db-docs configuration. Please run 'npx mr config ${projectName} gen db-docs OUTPUT_FILE.html${alias === "default" ? "" : " alias " + alias}' first`);
+        throw new Error(`Not found gen db-docs configuration. Please run 'npx mushroom-cli config ${projectName} gen db-docs OUTPUT_FILE.html${alias === "default" ? "" : " alias " + alias}' first`);
     }
 
     const entities = common.getEntities(source, aliasProject.allowRoles, true);

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

@@ -63,7 +63,8 @@ async function genJavascriptDriverTarball(args, projectName, project, alias, sou
 
     if (fs.existsSync(dirPath)) {
         console.log("Clean up tarball folder");
-        fs.rmdirSync(dirPath, { recursive: true });
+        // fs.rmdirSync(dirPath, { recursive: true });
+        fs.rmSync(dirPath, { recursive: true });
     }
 
     const tarballFileName = path.join(path.dirname(aliasProject.output), tarballName + ".tar.gz");
@@ -92,7 +93,8 @@ async function genJavascriptDriverTarball(args, projectName, project, alias, sou
     await compressAsync(dirPath, tarballFileName, tarballName);
 
     console.log("Generated tarball file");
-    fs.rmdirSync(dirPath, { recursive: true });
+    // fs.rmdirSync(dirPath, { recursive: true });
+    fs.rmSync(dirPath, { recursive: true });
     console.log("Cleaned up tarball folder");
 }
 

package/gen/gen-js-driver.js

@@ -39,13 +39,13 @@ function genJavascriptDriverString(aliasProject, source) {
             extensionsImportLines.push('//import * as AuthExtension from "mushroomjs-auth";');
             extensionsImportLines.push('var AuthExtension = require("mushroomjs-auth");');
             extensionsExportLines.push('Auth: AuthExtension');
-            extensionsCodeLines.push("AuthExtension.useAuth(AuthExtension.AuthLocalStorage);");
+            extensionsCodeLines.push("AuthExtension.useAuth(AuthExtension.AuthLocalStorage, mushroom_1.default);");
         }
         if (aliasProject.features.includes("file")) {
             extensionsImportLines.push('//import * as FileExtension from "mushroomjs-file";');
             extensionsImportLines.push('var FileExtension = require("mushroomjs-file");');
             extensionsExportLines.push('File: FileExtension');
-            extensionsCodeLines.push("FileExtension.useFile();");
+            extensionsCodeLines.push("FileExtension.useFile(mushroom_1.default);");
         }
     }
 
@@ -109,7 +109,7 @@ function genJavascriptDriver(args, projectName, project, alias, source) {
     const aliasProject = ((project.jsDriver || {}).alias || {})[alias];
 
     if (!aliasProject) {
-        throw new Error(`Not found gen js-driver configuration. Please run 'npx mr config gen ${projectName} js-driver OUTPUT_FILE.js${alias === "default" ? "" : " alias " + alias}' first`);
+        throw new Error(`Not found gen js-driver configuration. Please run 'npx mushroom-cli config gen ${projectName} js-driver OUTPUT_FILE.js${alias === "default" ? "" : " alias " + alias}' first`);
     }
 
     let code = genJavascriptDriverString(aliasProject, source);

package/gen/gen-ts-driver.js

@@ -114,13 +114,13 @@ function genTypescriptDriverString(aliasProject, source) {
             extensionsImportLines.push('import * as AuthExtension from "mushroomjs-auth";');
             extensionsExportLines.push('File: FileExtension');
             extensionsTypes.push("AuthExtension.IMushroomAuth & ");
-            extensionsCodeLines.push("AuthExtension.useAuth(AuthExtension.AuthLocalStorage);");
+            extensionsCodeLines.push("AuthExtension.useAuth(AuthExtension.AuthLocalStorage, mushroom);");
         }
         if (aliasProject.features.includes("file")) {
             extensionsImportLines.push('import * as FileExtension from "mushroomjs-file";');
             extensionsExportLines.push('Auth: AuthExtension');
             extensionsTypes.push("FileExtension.IMushroomFile & ");
-            extensionsCodeLines.push("FileExtension.useFile();");
+            extensionsCodeLines.push("FileExtension.useFile(mushroom);");
         }
     }
 
@@ -432,7 +432,7 @@ function genTypescriptDriver(args, projectName, project, alias, source) {
     const aliasProject = ((project.tsDriver || {}).alias || {})[alias];
 
     if (!aliasProject) {
-        throw new Error(`Not found gen ts-driver configuration. Please run 'npx mr config gen ${projectName} ts-driver OUTPUT_FILE.ts${alias === "default" ? "" : " alias " + alias}' first`);
+        throw new Error(`Not found gen ts-driver configuration. Please run 'npx mushroom-cli config gen ${projectName} ts-driver OUTPUT_FILE.ts${alias === "default" ? "" : " alias " + alias}' first`);
     }
 
     const code = genTypescriptDriverString(aliasProject, source);

package/help.js

@@ -10,46 +10,46 @@ function help(key, wrong) {
     }
     else
         console.log(`Init a mushroom json file
-    npx mr init json ./api/SampleProject.json [silent]
+    npx mushroom-cli init json ./api/SampleProject.json [silent]
 
 Init a dotnet core project which pre-install Mushroom Server
-    npx mr init netcore
+    npx mushroom-cli init netcore
 
 Add the mushroom json file into mushroom-config.json
-    npx mr config add ./api/yourProjectName.json
+    npx mushroom-cli config add ./api/yourProjectName.json
 
 Config gen docs api
-    npx mr config gen projectName docs ./wwwroot/docs.html [alias aliasName] [features file,auth,mail,driver] [roles Admin,User-Contributor]
+    npx mushroom-cli config gen projectName docs ./wwwroot/docs.html [alias aliasName] [features file,auth,mail,driver] [roles Admin,User-Contributor]
 
 Generate docs api (html format)
-    npx mr gen projectName[@aliasName] docs [tmp]
+    npx mushroom-cli gen projectName[@aliasName] docs [tmp]
 
 Config gen database docs
-    npx mr config gen projectName db-docs ./wwwroot/db-docs.html [alias aliasName] [features file,auth,mail]
+    npx mushroom-cli config gen projectName db-docs ./wwwroot/db-docs.html [alias aliasName] [features file,auth,mail]
 
 Generate database docs (html format)
-    npx mr gen projectName[@aliasName] db-docs [tmp]
+    npx mushroom-cli gen projectName[@aliasName] db-docs [tmp]
 
 Config gen javascript driver
-    npx mr config gen projectName js-driver ./src/api/mushroom.api.js [alias aliasName] [roles Admin,User-Contributor] [tarball tarballName]
+    npx mushroom-cli config gen projectName js-driver ./src/api/mushroom.api.js [alias aliasName] [roles Admin,User-Contributor] [tarball tarballName]
 
 Generate javascript driver
-    npx mr gen projectName[@aliasName] js-driver
+    npx mushroom-cli gen projectName[@aliasName] js-driver
 
 Config gen entities for Mushroom project in CSharp and using MongoDb
-    npx mr config gen projectName c#-mongo ./API/Generated.cs [alias aliasName]
+    npx mushroom-cli config gen projectName c#-mongo ./API/Generated.cs [alias aliasName]
 
 Generate entities for Mushroom project in CSharp and using MongoDb
-    npx mr gen projectName[@aliasName] c#-mongo
+    npx mushroom-cli gen projectName[@aliasName] c#-mongo
 
 Config gen entities for CSharp project which calls Mushroom API
-    npx mr config gen projectName c#-driver ./API/Generated.cs [roles Admin,User-Contributor] [alias aliasName]
+    npx mushroom-cli config gen projectName c#-driver ./API/Generated.cs [roles Admin,User-Contributor] [alias aliasName]
 
 Generate entities for CSharp project which calls Mushroom API
-    npx mr gen projectName[@aliasName] c#-driver
+    npx mushroom-cli gen projectName[@aliasName] c#-driver
 
 Disable checking for update:
-    npx mr parameters --no-check-update`);
+    npx mushroom-cli parameters --no-check-update`);
 }
 
 module.exports = help;

package/master-file/master-file.js

@@ -41,9 +41,9 @@ function transformViewNode(view) {
 
 function mergeApiProject(totalProject, fragmentProject, options) {
     if (totalProject.name != null && fragmentProject.name != null && fragmentProject.name != totalProject.name)
-        throw new Error(`Unable merge project '${fragmentProject.name}' into '${totalProject.name}`);
+        throw new Error(`Unable merge project '${fragmentProject.name}' into '${totalProject.name}'`);
     if (totalProject.version != null && fragmentProject.version != null && fragmentProject.version != totalProject.version)
-        throw new Error(`Unable merge project '${fragmentProject.version}' into '${totalProject.version}`);
+        throw new Error(`Unable merge project '${fragmentProject.version}' into '${totalProject.version}'`);
 
     if (fragmentProject.environmentVariables != null) {
         totalProject.environmentVariables = totalProject.environmentVariables || {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mushroom-cli",
-  "version": "1.1.0-alpha.20",
+  "version": "1.1.0-alpha.22",
   "description": "Mushroom CLI",
   "main": "mr.js",
   "scripts": {