mushroom-cli 2.0.0-alpha.3 → 2.0.0-alpha.5

package/README.md

@@ -130,6 +130,19 @@ npx mushroom-cli parameters --no-check-update
 
 ## Version
 
+### 2.0.0-alpha.4
+
+Bug fixes:
+
+- gen c#-mongo: fix missing the function handlers in extensions when generating RefactorHelper.cs file
+
+### 2.0.0-alpha.4
+
+Bug fixes:
+
+- gen ts-driver: fix the swapped extension exports. The `auth` feature now exports `Auth: AuthExtension` and the
+  `file` feature now exports `File: FileExtension` (previously the two were swapped)
+
 ### 2.0.0-alpha.3
 
 New features:

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

@@ -247,13 +247,13 @@ export function genTypescriptDriverString(aliasProject, source) {
     if (Array.isArray(aliasProject.features)) {
         if (aliasProject.features.includes('auth')) {
             extensionsImportLines.push('import * as AuthExtension from "mushroomjs-auth";');
-            extensionsExportLines.push('File: FileExtension');
+            extensionsExportLines.push('Auth: AuthExtension');
             extensionsTypes.push('AuthExtension.IMushroomAuth & ');
             extensionsCodeLines.push('AuthExtension.useAuth(AuthExtension.AuthLocalStorage, mushroom);');
         }
         if (aliasProject.features.includes('file')) {
             extensionsImportLines.push('import * as FileExtension from "mushroomjs-file";');
-            extensionsExportLines.push('Auth: AuthExtension');
+            extensionsExportLines.push('File: FileExtension');
             extensionsTypes.push('FileExtension.IMushroomFile & ');
             extensionsCodeLines.push('FileExtension.useFile(mushroom);');
         }

package/dist/master-file/master-file.js

@@ -29,6 +29,17 @@ function transformViewNode(view) {
         return;
     view.parameters.forEach((p) => transformValidationNode(p.validation));
 }
+function mergeObject(total, fragment, excludeFields = []) {
+    if (!fragment)
+        return;
+    Object.keys(fragment).forEach(key => {
+        if (excludeFields.includes(key))
+            return;
+        const newValue = fragment[key];
+        if (newValue !== undefined && newValue !== null)
+            total[key] = fragment[key];
+    });
+}
 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}'`);
@@ -108,11 +119,23 @@ function mergeApiProject(totalProject, fragmentProject, options) {
             fragmentProject.views[viewName].forEach(transformViewNode);
         }
     }
-    for (const name in fragmentProject) {
-        if (name === 'environmentVariables' || name === 'entities' || name === 'views' || name === '$schema')
-            continue;
-        totalProject[name] = fragmentProject[name];
+    if (fragmentProject.extensions) {
+        const fragmentExtensions = fragmentProject.extensions;
+        const totalExtensions = totalProject.extensions || {};
+        totalProject.extensions = totalExtensions;
+        Object.keys(fragmentExtensions).forEach(ext => {
+            const fragmentExtension = fragmentExtensions[ext];
+            const totalExtension = totalExtensions[ext] = totalExtensions[ext] || {};
+            if (fragmentExtension.description !== undefined && fragmentExtension.description !== null)
+                totalExtension.description = fragmentExtension.description;
+            if (fragmentExtension.startup !== undefined && fragmentExtension.startup !== null)
+                totalExtension.startup = fragmentExtension.startup;
+            mergeObject(totalExtension.config = totalExtension.config || {}, fragmentExtension.config);
+            mergeObject(totalExtension.ensureIndex = totalExtension.ensureIndex || {}, fragmentExtension.ensureIndex);
+            mergeObject(totalExtension.routes = totalExtension.routes || {}, fragmentExtension.routes);
+        });
     }
+    mergeObject(totalProject, fragmentProject, ['environmentVariables', 'extensions', 'entities', 'views', '$schema']);
     return totalProject;
 }
 export function processMasterFile(basePath, master) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mushroom-cli",
-  "version": "2.0.0-alpha.3",
+  "version": "2.0.0-alpha.5",
   "description": "Mushroom CLI",
   "type": "module",
   "scripts": {