mushroom-cli 1.2.0-alpha.5 → 1.2.0-alpha.6.1

package/README.md

@@ -88,6 +88,17 @@ Disable checking for update:
 
 ## Version
 
+### 1.2.0-alpha.6
+
+New features:
+
+* gen-ts-driver: Support offline mode
+
+Changes:
+
+* gen-api-docs: Improve generating api-docs
+* gen-csharp: Generate resource classes with `partial`
+
 ### 1.2.0-alpha.5
 
 New features:

package/docs/docs.html

@@ -2614,7 +2614,7 @@ Token: your token</span>
 
 <span class="place-holder">BODY DATA</span></pre>
                     Nếu webserver chỉ hỗ trợ các http method thông dụng, không hỗ trợ http method <span data-mt-attr='{"text": {"fn": "getHttpMethod", "data": "$actionName"}}'></span> thì sử dụng Header theo cách sau:
-                    <pre data-language="http">TRƯỜNG HỢP CÓ BODY DATA
+                    <pre data-language="http"><span data-mt-cond='{"action.codeHint.delegator.requestBody": {"$exists": false}}'>TRƯỜNG HỢP CÓ BODY DATA</span>
 POST <span data-mt-attr='{"text": {"fn": "getApiPath"}}'></span><span data-mt-attr='{"text": "$entityName"}'></span>s/<span data-mt-attr='{"text": {"fn": "getHttpMethod", "data": "$actionName"}}'></span><span class="place-holder">?param1=value1&amp;param2=value2</span> HTTP/1.1
 Host: <span data-mt-attr='{"text": {"fn": "getApiDomain"}}'></span>
 Content-Type: application/json
@@ -2622,13 +2622,13 @@ X-HTTP-Method-Override: <span data-mt-attr='{"text": {"fn": "getHttpMethod", "da
 Token: your token</span>
 
 <span class="place-holder">BODY DATA</span>
-
+<span data-mt-cond='{"action.codeHint.delegator.requestBody": {"$exists": false}}'>
 TRƯỜNG HỢP KHÔNG CÓ BODY DATA
 GET <span data-mt-attr='{"text": {"fn": "getApiPath"}}'></span><span data-mt-attr='{"text": "$entityName"}'></span>s/<span data-mt-attr='{"text": {"fn": "getHttpMethod", "data": "$actionName"}}'></span><span class="place-holder">?param1=value1&amp;param2=value2</span> HTTP/1.1
 Host: <span data-mt-attr='{"text": {"fn": "getApiDomain"}}'></span>
 Content-Type: application/json
 X-HTTP-Method-Override: <span data-mt-attr='{"text": {"fn": "getHttpMethod", "data": "$actionName"}}'></span><span data-mt-cond='{"action.grant": {"$ne": "*"}}'>
-Token: your token</span>
+Token: your token</span></span>
 </pre>
                 </div>
             </div>

package/gen/gen-csharp.js

@@ -134,7 +134,7 @@ function generateEnumClass(source, out, field, defaultClassName) {
                 strEnumClasses += `    /// <summary>
     /// ${singleLine(validation.codeHint.validValues.description || field.description)}
     /// </summary>
-    public class ${enumClassName}
+    public partial class ${enumClassName}
     {
         private ${enumClassName}() { }
 
@@ -179,7 +179,7 @@ function generateCSharpClassMongoDb(source, className, fields, isRoot, descripti
 
         supperClass = " : Mushroom.Models.IResource<" + getCSharpTypeFromMushroomType(source, fields.id.type, true) + ">";
     }
-    content += `    public class ${className}${supperClass}
+    content += `    public partial class ${className}${supperClass}
     {
 `;
     for (var fieldName in fields) {
@@ -488,21 +488,6 @@ namespace ${namespace}
     {
 ${collectionNames}
         public static IMongoDatabase GetDatabase() => Mushroom.MushroomDaoFactory.GetDbAdapter() as IMongoDatabase;
-        
-        public static async System.Threading.Tasks.Task<T> FindByIdAsync<T, TId>(this IMongoCollection<T> collection, TId id) where T : Mushroom.Models.IResource<TId>
-        {
-            return await (await collection.FindAsync(Builders<T>.Filter.Eq(doc => doc.Id, id))).FirstOrDefaultAsync();
-        }
-        
-        public static async System.Threading.Tasks.Task<T> FindByIdAsync<T, TId>(this IMongoCollection<T> collection, TId id, FindOptions<T> findOptions) where T : Mushroom.Models.IResource<TId>
-        {
-            return await (await collection.FindAsync(Builders<T>.Filter.Eq(doc => doc.Id, id), findOptions)).FirstOrDefaultAsync();
-        }
-        
-        public static async System.Threading.Tasks.Task<T> FindByIdAsync<T, TId>(this IMongoCollection<T> collection, TId id, ProjectionDefinition<T> projection) where T : Mushroom.Models.IResource<TId>
-        {
-            return await (await collection.FindAsync(Builders<T>.Filter.Eq(doc => doc.Id, id), new FindOptions<T> { Projection = projection })).FirstOrDefaultAsync();
-        }
     }
 
     public class ResourceNames
@@ -587,7 +572,7 @@ function generateCSharpClassMongoDbToFolder(source, className, fields, isRoot, d
 
         supperClass = " : Mushroom.Models.IResource<" + getCSharpTypeFromMushroomType(source, fields.id.type, true) + ">";
     }
-    content += `    public class ${className}${supperClass}
+    content += `    public partial class ${className}${supperClass}
     {
 `;
     for (var fieldName in fields) {
@@ -653,7 +638,7 @@ function generateCSharpClassMongoDbToFolder(source, className, fields, isRoot, d
 
         let strEnumClasses = generateEnumClass(source, {}, field, `${className.toUpperCase()}_${propertyName.toUpperCase()}_ENUM`);
 
-        const match = strEnumClasses.match(/public class\s+(\w+)/);
+        const match = strEnumClasses.match(/public partial class\s+(\w+)/);
         if (!match) continue;
         common.ensureFolder(aliasProject.output + "/Enums", true);
         strEnumClasses = `${header}

package/gen/gen-ts-driver.js

@@ -125,7 +125,7 @@ function genTypescriptDriverString(aliasProject, source) {
         }
     }
 
-    let code = `import mushroom, { defineAsyncResource, defineAsyncView, fireEvent, createRestfulAsyncFunction, IdType, IMushroom, Mushroom, MushroomRequest, MushroomRequestSetting, MushroomRestfulRequest, MushroomResponse, MushroomResourceBase, MushroomListResource, MushroomFindByIdResource, MushroomCreateResource, MushroomBatchCreateResource, MushroomUpdateResource, MushroomBatchUpdateResource, MushroomPartialUpdateResource, MushroomDeleteResource, MushroomBatchDeleteResource, MushroomExtensibleResource, MushroomViewFunction, MushroomError } from "mushroomjs";
+    let code = `import mushroom, { defineAsyncResource, defineAsyncView, fireEvent, createRestfulAsyncFunction, IdType, IMushroom, Mushroom, MushroomRequest, MushroomRequestSetting, MushroomRestfulRequest, MushroomResponse, MushroomResponseDataType, MushroomResourceBase, MushroomListResource, MushroomFindByIdResource, MushroomCreateResource, MushroomBatchCreateResource, MushroomUpdateResource, MushroomBatchUpdateResource, MushroomPartialUpdateResource, MushroomDeleteResource, MushroomBatchDeleteResource, MushroomExtensibleResource, MushroomViewFunction, MushroomError, IMushroomOfflineResponse, MushroomOfflineResponse, MushroomOfflineResponseState } from "mushroomjs";
 ${extensionsImportLines.join("\n")}
 export * from "mushroomjs";
 export const extensions = {
@@ -156,7 +156,12 @@ export type IdValue = ${source.idType == "AutoIncInt" || source.idType == "AutoI
 
             actions[actionName] = {
                 clientCache: (actionName === "findById" || actionName === "findMany") && isAllowCache(entity.actions[actionName], true) ? true : undefined,
-                includeTotal: actionName === "findMany" && entity.actions[actionName].some(a => a.includeTotal) ? true: undefined
+                includeTotal: actionName === "findMany" && entity.actions[actionName].some(a => a.includeTotal) ? true: undefined,
+                offlineMode: entity.actions[actionName].some(a => a.offlineMode === "disallow") 
+                    ? "disallow"
+                    : !entity.actions[actionName].length || entity.actions[actionName].some(a => a.offlineMode === "allow")
+                        ? "allow"
+                        : undefined
             };
 
             switch (actionName) {
@@ -299,7 +304,7 @@ function genDtsString(aliasProject, source) {
         }
     }
 
-    let code = `import { IdType, IMushroom, Mushroom, MushroomRequest, MushroomRequestSetting, MushroomRestfulRequest, MushroomResponse, MushroomResourceBase, MushroomListResource, MushroomFindByIdResource, MushroomCreateResource, MushroomBatchCreateResource, MushroomUpdateResource, MushroomBatchUpdateResource, MushroomPartialUpdateResource, MushroomDeleteResource, MushroomBatchDeleteResource, MushroomExtensibleResource, MushroomViewFunction, MushroomError } from "mushroomjs";
+    let code = `import { IdType, IMushroom, Mushroom, MushroomRequest, MushroomRequestSetting, MushroomRestfulRequest, MushroomResponse, MushroomResponseDataType, MushroomResourceBase, MushroomListResource, MushroomFindByIdResource, MushroomCreateResource, MushroomBatchCreateResource, MushroomUpdateResource, MushroomBatchUpdateResource, MushroomPartialUpdateResource, MushroomDeleteResource, MushroomBatchDeleteResource, MushroomExtensibleResource, MushroomViewFunction, MushroomError, IMushroomOfflineResponse, MushroomOfflineResponse, MushroomOfflineResponseState } from "mushroomjs";
 ${extensionsImportLines.join("\n")}
 export * from "mushroomjs";
 export declare const extensions = {
@@ -329,7 +334,13 @@ export declare type IdValue = ${source.idType == "AutoIncInt" || source.idType =
                 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,
+                offlineMode: entity.actions[actionName].some(a => a.offlineMode === "disallow") 
+                    ? "disallow"
+                    : !entity.actions[actionName].length || entity.actions[actionName].some(a => a.offlineMode === "allow")
+                        ? "allow"
+                        : undefined
             };
 
             switch (actionName) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mushroom-cli",
-  "version": "1.2.0-alpha.5",
+  "version": "1.2.0-alpha.6.1",
   "description": "Mushroom CLI",
   "main": "mr.js",
   "scripts": {