mushroom-cli 1.1.0-alpha.21 → 1.1.0-alpha.23

package/docs/docs.html

@@ -440,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);
@@ -457,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);

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);");
         }
     }
 
@@ -80,7 +80,8 @@ exports.extensions = extensions;
                 continue;
 
             actions[actionName] = {
-                clientCache: (actionName === "findById" || actionName === "findMany") && isAllowCache(entity.actions[actionName], true) ? true : undefined
+                clientCache: (actionName === "findById" || actionName === "findMany") && isAllowCache(entity.actions[actionName], true) ? true : undefined,
+                includeTotal: actionName === "findMany" && entity.actions[actionName].some(a => a.includeTotal) ? true: undefined
             };
         }
 

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);");
         }
     }
 
@@ -154,7 +154,8 @@ export type IdValue = ${source.idType == "AutoIncInt" || source.idType == "AutoI
                 continue;
 
             actions[actionName] = {
-                clientCache: (actionName === "findById" || actionName === "findMany") && isAllowCache(entity.actions[actionName], true) ? true : undefined
+                clientCache: (actionName === "findById" || actionName === "findMany") && isAllowCache(entity.actions[actionName], true) ? true : undefined,
+                includeTotal: actionName === "findMany" && entity.actions[actionName].some(a => a.includeTotal) ? true: undefined
             };
 
             switch (actionName) {

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/mr.js

@@ -66,7 +66,7 @@ async function run(args) {
         try {
             var data = await checkUpdateTask;
             if (data["dist-tags"] && data["dist-tags"][currentDistTag] && data["dist-tags"][currentDistTag] !== pkg.version) {
-                console.warn(`YOUR mushroom-cli VERSION IS NOT LATEST (dist-tags: ${currentDistTag}). PLEASE RUN: npm i mushroom-cli@${data["dist-tags"][currentDistTag]}`);
+                console.warn(`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]}`);
             }
         }
         catch(e) {

package/package.json

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