[ECMAScript6BestPractices] prerequisite fix common-serve.js

Signed-off-by: Vincent Potucek <[email protected]>

Author: Vincent Potucek

lib/src/main/resources/com/diffplug/spotless/npm/common-serve.js

@@ -1,65 +1,57 @@
-// this file will be glued to the top of the specific xy-serve.js file
-const debug_serve = false; // set to true for debug log output in node process
-const shutdownServer = require("http-graceful-shutdown");
-const express = require("express");
 const app = express();
+const express = require("express");
+const fs = require("fs");
+const shutdownServer = require("http-graceful-shutdown");
 
 app.use(express.json({limit: "50mb"}));
 
-const fs = require("fs");
-
-function debugLog() {
-	if (debug_serve) {
-		console.log.apply(this, arguments)
-	}
-}
+// This file will be glued to the top of the specific xy-serve.js file
+
+app.post('/shutdown', (req, res) => {
+    res.status(200).send('Shutting down');
+    setTimeout(async () => {
+        try {
+            await shutdownServer(
+                app.listen(0, '127.0.0.1', () => {
+                    const instanceId = getInstanceId();
+                    debugLog('Server running on port ' + listener.address().port + ' for instance ' + instanceId);
+                    fs.writeFile('server.port.tmp', '' + listener.address().port, function (err) {
+                        if (err) {
+                            return console.log(err);
+                        } else {
+                            fs.rename('server.port.tmp', `server-${instanceId}.port`, function (err) {
+                                if (err) {
+                                    return console.log(err);
+                                }
+                            });
+                        }
+                    });
+                }),
+                {
+                    forceExit: false, // Let the event loop clear
+                    finally: () => debugLog('graceful shutdown finished.'),
+                }
+            )();
+        } catch (err) {
+            console.error('Error during shutdown:', err);
+        }
+    }, 200);
+});
 
 function getInstanceId() {
-	const args = process.argv.slice(2);
-
-	// Look for the --node-server-instance-id option
-	let instanceId;
-
-	args.forEach(arg => {
-		if (arg.startsWith('--node-server-instance-id=')) {
-			instanceId = arg.split('=')[1];
-		}
-	});
-
-	// throw if instanceId is not set
-	if (!instanceId) {
-		throw new Error("Missing --node-server-instance-id argument");
-	}
-	return instanceId;
+    return (
+        process.argv
+            .slice(2)
+            .find(arg => arg.startsWith('--node-server-instance-id='))
+            ?.split('=')[1]
+            || (() => {
+                throw new Error('Missing --node-server-instance-id argument');
+            })()
+    );
 }
 
-var listener = app.listen(0, "127.0.0.1", () => {
-	const instanceId = getInstanceId();
-	debugLog("Server running on port " + listener.address().port + " for instance " + instanceId);
-	fs.writeFile("server.port.tmp", "" + listener.address().port, function (err) {
-		if (err) {
-			return console.log(err);
-		} else {
-			fs.rename("server.port.tmp", `server-${instanceId}.port`, function (err) {
-				if (err) {
-					return console.log(err);
-				}
-			}); // try to be as atomic as possible
-		}
-	});
-});
-const shutdown = shutdownServer(listener, {
-	forceExit: false, // let the event loop clear
-	finally: () => debugLog("graceful shutdown finished."),
-});
-
-app.post("/shutdown", (req, res) => {
-	res.status(200).send("Shutting down");
-	setTimeout(async () => {
-		try {
-			await shutdown();
-		} catch (err) {
-			console.error("Error during shutdown:", err);
-		}
-	}, 200);
-});
+function debugLog() {
+    if (false) { // Set to true for debug log output in node process
+        console.log.apply(this, arguments);
+    }
+}

plugin-maven/src/test/java/com/diffplug/spotless/maven/npm/NpmTestsWithDynamicallyInstalledNpmInstallationTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 DiffPlug
+ * Copyright 2023-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +25,8 @@
 
 public class NpmTestsWithDynamicallyInstalledNpmInstallationTest extends MavenIntegrationHarness {
 
+	public static final String TS = "typescript";
+
 	@Test
 	void useDownloadedNpmInstallation() throws Exception {
 		writePomWithPrettierSteps(
@@ -34,15 +36,11 @@ void useDownloadedNpmInstallation() throws Exception {
 				"    <npmExecutable>" + installedNpmPath() + "</npmExecutable>",
 				"</prettier>");
 
-		String kind = "typescript";
-		String suffix = "ts";
-		String configPath = ".prettierrc.yml";
-		setFile(configPath).toResource("npm/prettier/filetypes/" + kind + "/" + ".prettierrc.yml");
-		String path = "src/main/" + kind + "/test." + suffix;
-		setFile(path).toResource("npm/prettier/filetypes/" + kind + "/" + kind + ".dirty");
-
+		String path = "src/main/" + TS + "/test.ts";
+		setFile(path).toResource("npm/prettier/filetypes/" + TS + "/" + TS + ".dirty");
+		setFile(".prettierrc.yml").toResource("npm/prettier/filetypes/" + TS + "/" + ".prettierrc.yml");
 		mavenRunner().withArguments(installNpmMavenGoal(), "spotless:apply").runNoError();
-		assertFile(path).sameAsResource("npm/prettier/filetypes/" + kind + "/" + kind + ".clean");
+		assertFile(path).sameAsResource("npm/prettier/filetypes/" + TS + "/" + TS + ".clean");
 	}
 
 }