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

package/gen/gen-csharp.js

@@ -910,21 +910,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();
-        }
     }
 }
 `;
@@ -933,7 +918,7 @@ ${collectionNames}
 
 namespace ${namespace}
 {
-    public class ResourceNames
+    public class ResourceNamess
     {
         private ResourceNames() { }
 
@@ -985,7 +970,8 @@ ${strJobReferences}
 #endif
 `;
 
-    const infoFileContent = `// Mushroom CLI version: ${package.version}${newLine}// Compatible with Mushroom Server version: 0.2.18 or higher (https://www.nuget.org/packages/Mushroom/)`
+    const infoFileContent = `// Mushroom CLI version: ${package.version}${newLine}// 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);

package/gen/gen-js-driver.js

@@ -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

@@ -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/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.22",
+  "version": "1.1.0-alpha.24",
   "description": "Mushroom CLI",
   "main": "mr.js",
   "scripts": {
@@ -17,8 +17,8 @@
   "author": "suco2007",
   "license": "ISC",
   "dependencies": {
-    "jsdom": "^20.0.0",
-    "json5": "^2.2.1",
+    "jsdom": "^21.0.0",
+    "json5": "^2.2.3",
     "node-fetch": "^2.6.7",
     "open": "^8.4.0",
     "readline-sync": "^1.4.10",