chore: bump spring-shell-e2e dependencies

- Bump node-pty from 0.11.0-beta19 to 1.0.0
- Bump xterm-headless from 4.18.0 to 5.5.0
- Rename xterm-headless to @xterm/headless as per https://www.npmjs.com/package/xterm-headless
- Unpin Python 3.11 in e2e test by reverting commit 8097f1e because it's no longer necessary as explained in #909 (comment)

- Fixes #909
- Fixes #921

Signed-off-by: Andrey Litvitski <[email protected]>

Author: codespearhead

.github/workflows/e2e.yml

@@ -95,10 +95,6 @@ jobs:
           distribution: adopt
           java-version: 22
           cache: gradle
-      - name: Use Python 3.11
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.11'
       - uses: actions/setup-node@v2
         with:
           node-version: '16'

e2e/spring-shell-e2e/package-lock.json

@@ -36,7 +36,7 @@
     "typescript": "^4.6.4"
   },
   "dependencies": {
-    "node-pty": "0.11.0-beta19",
-    "xterm-headless": "^4.18.0"
+    "node-pty": "^1.0.0",
+    "@xterm/headless": "^5.5.0"
   }
 }

e2e/spring-shell-e2e/package.json

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2023 the original author or authors.
+ * Copyright 2022-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,6 +41,7 @@
  * Interface defining a command registration endpoint.
  *
  * @author Janne Valkealahti
+ * @author Andrey Litvitski
  */
 public interface CommandRegistration {
 
@@ -764,6 +765,14 @@ public interface Builder {
 		 */
 		AliasSpec withAlias();
 
+		/**
+		 * Define an alias what this command should execute
+		 *
+		 * @param commands the commands
+		 * @return builder for chaining
+		 */
+		Builder withAlias(String... commands);
+
 		/**
 		 * Define an exit code what this command should execute
 		 *
@@ -1421,6 +1430,20 @@ public AliasSpec withAlias() {
 			return spec;
 		}
 
+		@Override
+		public Builder withAlias(String... commands) {
+			Assert.notNull(commands, "commands must be set");
+			DefaultAliasSpec spec = new DefaultAliasSpec(this);
+			spec.commands = Arrays.asList(commands).stream()
+					.flatMap(c -> Stream.of(c.split(" ")))
+					.filter(c -> StringUtils.hasText(c))
+					.map(c -> c.trim())
+					.collect(Collectors.toList())
+					.toArray(new String[0]);
+			this.aliasSpecs.add(spec);
+			return this;
+		}
+
 		@Override
 		public ExitCodeSpec withExitCode() {
 			DefaultExitCodeSpec spec = new DefaultExitCodeSpec(this);

spring-shell-core/src/main/java/org/springframework/shell/command/CommandRegistration.java

@@ -411,15 +411,16 @@ public void testAliases() {
 				.command("alias2")
 				.group("Alias Group")
 				.and()
+			.withAlias("alias3")
 			.withTarget()
 				.function(function1)
 				.and()
 			.build();
 		assertThat(registration.getCommand()).isEqualTo("command1");
 		assertThat(registration.getGroup()).isEqualTo("Test Group");
-		assertThat(registration.getAliases()).hasSize(2);
+		assertThat(registration.getAliases()).hasSize(3);
 		assertThat(registration.getAliases().stream().map(CommandAlias::getCommand)).containsExactlyInAnyOrder("alias1",
-				"alias2");
+				"alias2", "alias3");
 		assertThat(registration.getAliases().get(0).getGroup()).isEqualTo("Alias Group");
 		assertThat(registration.getAliases().get(1).getGroup()).isEqualTo("Alias Group");
 	}