Fix windows binary resolution (#26)

maelanleborgne · web-flow · commit c36c40e4b620 · 2023-12-13T17:57:54.000+01:00
diff --git a/src/Tools/TypescriptBinaryFactory.php b/src/Tools/TypescriptBinaryFactory.php
@@ -80,14 +80,14 @@ public static function getBinaryNameFromServerSpecs(
         }
 
         if (str_contains($os, 'win')) {
-            if ('x86_64' === $machine) {
-                return 'swc-win32-x64-msvc';
+            if ('x86_64' === $machine || 'amd64' === $machine) {
+                return 'swc-win32-x64-msvc.exe';
             }
-            if ('amd64' === $machine) {
-                return 'swc-win32-arm64-msvc';
+            if ('arm64' === $machine) {
+                return 'swc-win32-arm64-msvc.exe';
             }
             if ('i586' === $machine) {
-                return 'swc-win32-ia32-msvc';
+                return 'swc-win32-ia32-msvc.exe';
             }
 
             throw new \Exception(sprintf('No matching machine found for Windows platform (Machine: %s).', $machine));
diff --git a/tests/Tools/TypeScriptBinaryFactoryTest.php b/tests/Tools/TypeScriptBinaryFactoryTest.php
@@ -66,9 +66,10 @@ public function provideServerSpecs()
             ['Linux', 'x86_64', 'linux-musl', 'swc-linux-x64-musl'],
             ['Linux', 'arm64', 'linux-musl', 'swc-linux-arm64-musl'],
 
-            ['Windows', 'x86_64', 'windows', 'swc-win32-x64-msvc'],
-            ['Windows', 'amd64', 'windows', 'swc-win32-arm64-msvc'],
-            ['Windows', 'i586', 'windows', 'swc-win32-ia32-msvc'],
+            ['Windows', 'x86_64', 'windows', 'swc-win32-x64-msvc.exe'],
+            ['Windows', 'amd64', 'windows', 'swc-win32-x64-msvc.exe'],
+            ['Windows', 'arm64', 'windows', 'swc-win32-arm64-msvc.exe'],
+            ['Windows', 'i586', 'windows', 'swc-win32-ia32-msvc.exe'],
 
             ['Undefined', 'x86_64', 'darwin', null, \Exception::class],
             ['Darwin', 'undefined', 'darwin', null, \Exception::class],
diff --git a/tests/fixtures/bin/watchexec-1.20.5-x86_64-unknown-linux-gnu/watchexec b/tests/fixtures/bin/watchexec-1.20.5-x86_64-unknown-linux-gnu/watchexec

Original file line number	Diff line number	Diff line change
`@@ -80,14 +80,14 @@ public static function getBinaryNameFromServerSpecs(`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`if (str_contains($os, 'win')) {`
`83`		`- if ('x86_64' === $machine) {`
`84`		`- return 'swc-win32-x64-msvc';`
	`83`	`+ if ('x86_64' === $machine \|\| 'amd64' === $machine) {`
	`84`	`+ return 'swc-win32-x64-msvc.exe';`
`85`	`85`	`}`
`86`		`- if ('amd64' === $machine) {`
`87`		`- return 'swc-win32-arm64-msvc';`
	`86`	`+ if ('arm64' === $machine) {`
	`87`	`+ return 'swc-win32-arm64-msvc.exe';`
`88`	`88`	`}`
`89`	`89`	`if ('i586' === $machine) {`
`90`		`- return 'swc-win32-ia32-msvc';`
	`90`	`+ return 'swc-win32-ia32-msvc.exe';`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`throw new \Exception(sprintf('No matching machine found for Windows platform (Machine: %s).', $machine));`