Hyperlink tweaks

Author: freost

src/mako/application/cli/commands/server/Server.php

@@ -10,6 +10,8 @@
 use mako\application\Application;
 use mako\cli\input\arguments\Argument;
 use mako\cli\input\arguments\NamedArgument;
+use mako\cli\output\components\Hyperlink;
+use mako\cli\output\components\hyperlink\Theme;
 use mako\reactor\attributes\CommandArguments;
 use mako\reactor\attributes\CommandDescription;
 use mako\reactor\Command;
@@ -95,8 +97,8 @@ public function execute(
 		// Tell the user where the server will be running
 
 		$message  = 'Starting <green>Mako</green> development server at ';
-		$message .= "<underlined>http://{$host}:{$availablePort}</underlined> ";
-		$message .= '<yellow>(ctrl+c to stop)</yellow> ...';
+		$message .= (new Hyperlink($this->output, new Theme('<underlined>%s</underlined>')))->render("http://{$host}:{$availablePort}");
+		$message .= ' <yellow>(ctrl+c to stop)</yellow> ...';
 
 		$this->nl();
 		$this->write($message);

src/mako/cli/output/components/Hyperlink.php

@@ -7,6 +7,7 @@
 
 namespace mako\cli\output\components;
 
+use mako\cli\output\components\hyperlink\Theme;
 use mako\cli\output\Output;
 
 use function hash;
@@ -30,7 +31,8 @@ class Hyperlink
 	 * Constructor.
 	 */
 	public function __construct(
-		protected Output $output
+		protected Output $output,
+		protected Theme $theme = new Theme
 	) {
 	}
 
@@ -48,7 +50,12 @@ protected function hasHyperlinkSupport(): bool
 	public function render(string $url, ?string $text = null): string
 	{
 		if ($this->hasHyperlinkSupport()) {
-			return sprintf("\x1b]8;id=%s;%s\x1b\\%s\x1b]8;;\x1b\\", hash('xxh128', $url), $url, $text ?? $url);
+			return sprintf(
+				"\x1b]8;id=%s;%s\x1b\\%s\x1b]8;;\x1b\\",
+				hash('xxh128', $url),
+				$url,
+				sprintf($this->theme->getFormat(), $text ?? $url)
+			);
 		}
 
 		return $text ? "{$text} ({$url})" : $url;

src/mako/cli/output/components/hyperlink/AsciiTheme.php

@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * @copyright Frederic G. Østby
+ * @license   http://www.makoframework.com/license
+ */
+
+namespace mako\cli\output\components\hyperlink;
+
+/**
+ * Ascii theme.
+ */
+class AsciiTheme extends Theme
+{
+	/**
+	 * Arrow.
+	 */
+	protected const string ARROW = '^';
+}

src/mako/cli/output/components/hyperlink/Theme.php

@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * @copyright Frederic G. Østby
+ * @license   http://www.makoframework.com/license
+ */
+
+namespace mako\cli\output\components\hyperlink;
+
+use function sprintf;
+
+/**
+ * Base theme.
+ */
+class Theme
+{
+	/**
+	 * Arrow.
+	 */
+	protected const string ARROW = '↗';
+
+	/**
+	 * Constructor.
+	 */
+	public function __construct(
+		protected string $template = '%s'
+	) {
+	}
+
+	/**
+	 * Returns the format.
+	 */
+	public function getFormat(): string
+	{
+		return sprintf($this->template, '%s [' . static::ARROW . ']');
+	}
+}

tests/unit/cli/output/components/HyperlinkTest.php

@@ -8,6 +8,7 @@
 namespace mako\tests\unit\cli\output\components;
 
 use mako\cli\output\components\Hyperlink;
+use mako\cli\output\components\hyperlink\Theme;
 use mako\cli\output\Output;
 use mako\tests\TestCase;
 use Mockery;
@@ -35,7 +36,7 @@ public function testRenderWithHyperlinkSupport(): void
 
 		$output = Mockery::mock(Output::class);
 
-		$hyperlink = Mockery::mock(Hyperlink::class, [$output]);
+		$hyperlink = Mockery::mock(Hyperlink::class, [$output, new Theme]);
 
 		$hyperlink->makePartial();
 
@@ -47,9 +48,9 @@ public function testRenderWithHyperlinkSupport(): void
 
 		$link2 = $hyperlink->render($url, 'Example');
 
-		$this->assertSame("\x1b]8;id={$hash};{$url}\x1b\\{$url}\x1b]8;;\x1b\\", $link1);
+		$this->assertSame("\x1b]8;id={$hash};{$url}\x1b\\{$url} [↗]\x1b]8;;\x1b\\", $link1);
 
-		$this->assertSame("\x1b]8;id={$hash};{$url}\x1b\\Example\x1b]8;;\x1b\\", $link2);
+		$this->assertSame("\x1b]8;id={$hash};{$url}\x1b\\Example [↗]\x1b]8;;\x1b\\", $link2);
 	}
 
 	/**
@@ -87,9 +88,9 @@ public function testDrawWithHyperlinkSupport(): void
 
 		$output = Mockery::mock(Output::class);
 
-		$output->shouldReceive('write')->once()->with("\x1b]8;id={$hash};{$url}\x1b\\{$url}\x1b]8;;\x1b\\", 1);
+		$output->shouldReceive('write')->once()->with("\x1b]8;id={$hash};{$url}\x1b\\{$url} [↗]\x1b]8;;\x1b\\", Output::STANDARD);
 
-		$output->shouldReceive('write')->once()->with("\x1b]8;id={$hash};{$url}\x1b\\Example\x1b]8;;\x1b\\", 1);
+		$output->shouldReceive('write')->once()->with("\x1b]8;id={$hash};{$url}\x1b\\Example [↗]\x1b]8;;\x1b\\", Output::STANDARD);
 
 		$hyperlink = Mockery::mock(Hyperlink::class, [$output]);
 
@@ -113,9 +114,9 @@ public function testDrawWithoutHyperlinkSupport(): void
 
 		$output = Mockery::mock(Output::class);
 
-		$output->shouldReceive('write')->once()->with($url, 1);
+		$output->shouldReceive('write')->once()->with($url, Output::STANDARD);
 
-		$output->shouldReceive('write')->once()->with("Example ({$url})", 1);
+		$output->shouldReceive('write')->once()->with("Example ({$url})", Output::STANDARD);
 
 		$hyperlink = Mockery::mock(Hyperlink::class, [$output]);
 

tests/unit/cli/output/components/hyperlink/ThemeTest.php

@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * @copyright Frederic G. Østby
+ * @license   http://www.makoframework.com/license
+ */
+
+namespace mako\tests\unit\cli\output\components\hyperlink;
+
+use mako\cli\output\components\hyperlink\Theme;
+use mako\tests\TestCase;
+use PHPUnit\Framework\Attributes\Group;
+
+#[Group('unit')]
+class ThemeTest extends TestCase
+{
+	/**
+	 *
+	 */
+	public function testWithDefaultTemplate(): void
+	{
+		$theme = new Theme;
+
+		$this->assertSame('%s [↗]', $theme->getFormat());
+	}
+
+	/**
+	 *
+	 */
+	public function testWithCustomTemplate(): void
+	{
+		$theme = new Theme('<underlined>%s</underlined>');
+
+		$this->assertSame('<underlined>%s [↗]</underlined>', $theme->getFormat());
+	}
+}