@ui5/server 3.0.0-beta.2 → 3.0.0-beta.4

package/CHANGELOG.md

@@ -2,7 +2,16 @@
 All notable changes to this project will be documented in this file.  
 This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-A list of unreleased changes can be found [here](https://github.com/SAP/ui5-server/compare/v3.0.0-beta.2...HEAD).
+A list of unreleased changes can be found [here](https://github.com/SAP/ui5-server/compare/v3.0.0-beta.4...HEAD).
+
+<a name="v3.0.0-beta.4"></a>
+## [v3.0.0-beta.4] - 2022-12-01
+### Dependency Updates
+- Bump connect-openui5 from 0.10.2 to 0.10.3 [`90871f8`](https://github.com/SAP/ui5-server/commit/90871f89815501860616ffbdf8927824412ec909)
+
+
+<a name="v3.0.0-beta.3"></a>
+## [v3.0.0-beta.3] - 2022-11-30
 
 <a name="v3.0.0-beta.2"></a>
 ## [v3.0.0-beta.2] - 2022-11-29
@@ -299,6 +308,8 @@ Only Node.js v10 or higher is supported.
 <a name="v0.0.1"></a>
 ## v0.0.1 - 2018-06-06
 
+[v3.0.0-beta.4]: https://github.com/SAP/ui5-server/compare/v3.0.0-beta.3...v3.0.0-beta.4
+[v3.0.0-beta.3]: https://github.com/SAP/ui5-server/compare/v3.0.0-beta.2...v3.0.0-beta.3
 [v3.0.0-beta.2]: https://github.com/SAP/ui5-server/compare/v3.0.0-beta.1...v3.0.0-beta.2
 [v3.0.0-beta.1]: https://github.com/SAP/ui5-server/compare/v3.0.0-alpha.4...v3.0.0-beta.1
 [v3.0.0-alpha.4]: https://github.com/SAP/ui5-server/compare/v3.0.0-alpha.3...v3.0.0-alpha.4

package/lib/middleware/MiddlewareManager.js

@@ -61,7 +61,7 @@ class MiddlewareManager {
 	 * Adds the given middleware configuration
 	 *
 	 * @private
-	 * @param {string} configuredMiddlewareName The name of the middleware
+	 * @param {string} middlewareName The name of the middleware
 	 * @param {object} [options] The Options of the middleware
 	 * @param {object} [options.customMiddleware] The custom middleware
 	 * @param {Function} [options.wrapperCallback] Callback called when middleware is called
@@ -69,15 +69,19 @@ class MiddlewareManager {
 	 * @param {string} [options.beforeMiddleware] The name of the middleware called before the added middleware
 	 * @param {string} [options.afterMiddleware] The name of the middleware called after the added middleware
 	 */
-	async addMiddleware(configuredMiddlewareName, {
+	async addMiddleware(middlewareName, {
 		customMiddleware, wrapperCallback, mountPath = "/",
 		beforeMiddleware, afterMiddleware
 	} = {}) {
+		if (this.middleware[middlewareName]) {
+			throw new Error(`A middleware with the name ${middlewareName} has already been added`);
+		}
+
 		let middlewareCallback;
 		if (customMiddleware) {
 			middlewareCallback = customMiddleware;
 		} else {
-			const middlewareInfo = await middlewareRepository.getMiddleware(configuredMiddlewareName);
+			const middlewareInfo = await middlewareRepository.getMiddleware(middlewareName);
 			if (wrapperCallback) {
 				middlewareCallback = wrapperCallback(middlewareInfo);
 			} else {
@@ -85,16 +89,6 @@ class MiddlewareManager {
 			}
 		}
 
-		let middlewareName = configuredMiddlewareName;
-		if (this.middleware[middlewareName]) {
-			// Middleware is already known
-			// => add a suffix to allow for multiple configurations of the same middleware
-			let suffixCounter = 0;
-			while (this.middleware[middlewareName]) {
-				suffixCounter++; // Start at 1
-				middlewareName = `${configuredMiddlewareName}--${suffixCounter}`;
-			}
-		}
 		if (this.middlewareExecutionOrder.includes(middlewareName)) {
 			throw new Error(`Middleware ${middlewareName} already added to execution order. This should not happen.`);
 		}
@@ -275,7 +269,19 @@ class MiddlewareManager {
 					`Custom middleware definition ${middlewareDef.name} of project ${project.getName()} ` +
 					`defines neither a "beforeMiddleware" nor an "afterMiddleware" parameter. One must be defined.`);
 			}
-			await this.addMiddleware(middlewareDef.name, {
+
+			let middlewareName = middlewareDef.name;
+			if (this.middleware[middlewareName]) {
+				// Middleware is already known
+				// => add a suffix to allow for multiple configurations of the same middleware
+				let suffixCounter = 0;
+				while (this.middleware[middlewareName]) {
+					suffixCounter++; // Start at 1
+					middlewareName = `${middlewareDef.name}--${suffixCounter}`;
+				}
+			}
+
+			await this.addMiddleware(middlewareName, {
 				customMiddleware: async ({resources, middlewareUtil}) => {
 					const customMiddleware = this.graph.getExtension(middlewareDef.name);
 
@@ -288,7 +294,7 @@ class MiddlewareManager {
 
 					const specVersion = customMiddleware.getSpecVersion();
 					if (specVersion.gte("3.0")) {
-						params.options.middlewareName = middlewareDef.name;
+						params.options.middlewareName = middlewareName;
 						params.log = logger.getGroupLogger(`server:custom-middleware:${middlewareDef.name}`);
 					}
 					const middlewareUtilInterface = middlewareUtil.getInterface(specVersion);

package/lib/middleware/MiddlewareUtil.js

@@ -1,6 +1,7 @@
 import parseurl from "parseurl";
 import mime from "mime-types";
 import {
+	createReaderCollection,
 	createReaderCollectionPrioritized,
 	createResource,
 	createFilterReader,
@@ -156,6 +157,8 @@ class MiddlewareUtil {
 	 * @typedef {object} @ui5/project/build/helpers/MiddlewareUtill~resourceFactory
 	 * @property {Function} createResource Creates a [Resource]{@link @ui5/fs/Resource}.
 	 * 	Accepts the same parameters as the [Resource]{@link @ui5/fs/Resource} constructor.
+	 * @property {Function} createReaderCollection Creates a reader collection:
+	 *	[ReaderCollection]{@link @ui5/fs/ReaderCollection}
 	 * @property {Function} createReaderCollectionPrioritized Creates a prioritized reader collection:
 	 *	[ReaderCollectionPrioritized]{@link @ui5/fs/ReaderCollectionPrioritized}
 	 * @property {Function} createFilterReader
@@ -178,6 +181,7 @@ class MiddlewareUtil {
 	 */
 	resourceFactory = {
 		createResource,
+		createReaderCollection,
 		createReaderCollectionPrioritized,
 		createFilterReader,
 		createLinkReader,
@@ -223,7 +227,7 @@ class MiddlewareUtil {
 			[
 				// Once new functions get added, extract this array into a variable
 				// and enhance based on spec version once new functions get added
-				"createResource", "createReaderCollectionPrioritized",
+				"createResource", "createReaderCollection", "createReaderCollectionPrioritized",
 				"createFilterReader", "createLinkReader", "createFlatReader",
 			].forEach((factoryFunction) => {
 				baseInterface.resourceFactory[factoryFunction] = this.resourceFactory[factoryFunction];

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@ui5/server",
-	"version": "3.0.0-beta.2",
+	"version": "3.0.0-beta.4",
 	"description": "UI5 Tooling - Server",
 	"author": {
 		"name": "SAP SE",
@@ -115,12 +115,12 @@
 		"url": "git@github.com:SAP/ui5-server.git"
 	},
 	"dependencies": {
-		"@ui5/builder": "^3.0.0-beta.2",
-		"@ui5/fs": "^3.0.0-beta.3",
+		"@ui5/builder": "^3.0.0-beta.4",
+		"@ui5/fs": "^3.0.0-beta.4",
 		"@ui5/logger": "^3.0.1-beta.1",
 		"body-parser": "^1.20.1",
 		"compression": "^1.7.4",
-		"connect-openui5": "^0.10.2",
+		"connect-openui5": "^0.10.3",
 		"cors": "^2.8.5",
 		"devcert-sanscache": "^0.4.8",
 		"escape-html": "^1.0.3",
@@ -139,7 +139,7 @@
 	},
 	"devDependencies": {
 		"@istanbuljs/esm-loader-hook": "^0.2.0",
-		"@ui5/project": "^3.0.0-beta.3",
+		"@ui5/project": "^3.0.0-beta.4",
 		"ava": "^5.1.0",
 		"chokidar-cli": "^3.0.0",
 		"cross-env": "^7.0.3",