Adds Windows support

.github/actions/build/action.yml

@@ -26,7 +26,7 @@ runs:
   using: composite
   steps:
     - name: Install cross
-      if: ${{ !endsWith(inputs.target, '-apple-darwin') && inputs.target != 'wasm32-browserpod-linux-musl' }}
+      if: ${{ !endsWith(inputs.target, '-apple-darwin') && !contains(inputs.target, '-windows-') && inputs.target != 'wasm32-browserpod-linux-musl' }}
       uses: taiki-e/install-action@a27ef18d36cfa66b0af3a360104621793b41c036 # v2.54.3
       with:
         tool: cross
@@ -90,7 +90,7 @@ runs:
           cargo "+browserpod-${{inputs.browserpod-version}}" build --verbose --bin yarn-bin --profile=${{inputs.profile}} --target=${{inputs.target}}
 
           cp target/${{inputs.target}}/${{inputs.profile}}/yarn-bin target/${{inputs.target}}/${{inputs.profile}}/yarn-bin.wasm
-        elif [[ "${{inputs.target}}" == *-apple-darwin ]]; then
+        elif [[ "${{inputs.target}}" == *-apple-darwin || "${{inputs.target}}" == *-windows-* ]]; then
           cargo build --verbose --profile=${{inputs.profile}} --target=${{inputs.target}}
         else
           cross build --verbose --profile=${{inputs.profile}} --target=${{inputs.target}}

.github/actions/prepare-node/action.yml

@@ -23,7 +23,11 @@ runs:
         chmod +x "${{inputs.switch}}"
         install_dir="${RUNNER_TEMP}/yarn-switch-bin"
         mkdir -p "${install_dir}"
-        cp -f "${{inputs.switch}}" "${install_dir}/yarn"
+        if [[ "${RUNNER_OS}" == "Windows" ]]; then
+          cp -f "${{inputs.switch}}" "${install_dir}/yarn.exe"
+        else
+          cp -f "${{inputs.switch}}" "${install_dir}/yarn"
+        fi
         echo "${install_dir}" >> "${GITHUB_PATH}"
 
     - name: Add link to the local path
@@ -41,4 +45,7 @@ runs:
     - name: Install dependencies
       shell: bash
       run: |
+        if [[ -n "${{inputs.switch}}" ]]; then
+          export YARN_ENABLE_IMMUTABLE_INSTALLS=0
+        fi
         yarn install

.github/workflows/build.yml

@@ -22,14 +22,22 @@ jobs:
         include:
           - target: x86_64-unknown-linux-musl
             os: ubuntu-latest
+            ext: ''
           - target: aarch64-unknown-linux-musl
             os: ubuntu-latest
+            ext: ''
           - target: i686-unknown-linux-musl
             os: ubuntu-latest
+            ext: ''
           - target: aarch64-apple-darwin
             os: macos-latest
+            ext: ''
+          - target: x86_64-pc-windows-msvc
+            os: windows-latest
+            ext: '.exe'
           - target: wasm32-browserpod-linux-musl
             os: ubuntu-latest
+            ext: ''
 
     name: "Building ${{matrix.target}}"
     runs-on: ${{matrix.os}}
@@ -66,8 +74,8 @@ jobs:
         with:
           name: yarn-${{matrix.target}}
           path: |
-            target/${{matrix.target}}/release-lto-nodebug/yarn-bin
-            target/${{matrix.target}}/release-lto-nodebug/yarn
+            target/${{matrix.target}}/release-lto-nodebug/yarn-bin${{matrix.ext}}
+            target/${{matrix.target}}/release-lto-nodebug/yarn${{matrix.ext}}
             target/${{matrix.target}}/release-lto-nodebug/LICENSE.md
 
       - name: Upload Browserpod artifacts
@@ -92,6 +100,10 @@ jobs:
         include:
           - target: x86_64-unknown-linux-musl
             os: ubuntu-latest
+            ext: ''
+          - target: x86_64-pc-windows-msvc
+            os: windows-latest
+            ext: '.exe'
 
     name: "Testing ${{matrix.target}}"
     needs: [build]
@@ -112,17 +124,20 @@ jobs:
       - name: Prepare Node
         uses: ./.github/actions/prepare-node
         with:
-          link: artifacts/yarn-bin
-          switch: artifacts/yarn
+          link: artifacts/yarn-bin${{matrix.ext}}
+          switch: artifacts/yarn${{matrix.ext}}
 
       - name: Generate the test report
+        shell: bash
+        env:
+          TEST_BINARY: ${{github.workspace}}/artifacts/yarn-bin${{matrix.ext}}
+          TEST_SWITCH_BINARY: ${{github.workspace}}/artifacts/yarn${{matrix.ext}}
         run: |
-          chmod +x artifacts/{yarn,yarn-bin}
+          if [[ "${RUNNER_OS}" != "Windows" ]]; then
+            chmod +x artifacts/{yarn,yarn-bin}
+          fi
 
-          export TEST_BINARY=$(pwd)/artifacts/yarn-bin
-          export TEST_SWITCH_BINARY=$(pwd)/artifacts/yarn
-
-          yarn ./tests/acceptance-tests jest --json --outputFile=$(pwd)/report.json || true
+          yarn ./tests/acceptance-tests jest --json --outputFile="${GITHUB_WORKSPACE}/report.json" || true
 
       - name: Upload test report
         uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7

.github/workflows/releases.yml

@@ -48,12 +48,19 @@ jobs:
         include:
           - target: x86_64-unknown-linux-musl
             os: ubuntu-latest
+            ext: ''
           - target: aarch64-unknown-linux-musl
             os: ubuntu-latest
+            ext: ''
           - target: i686-unknown-linux-musl
             os: ubuntu-latest
+            ext: ''
           - target: aarch64-apple-darwin
             os: macos-latest
+            ext: ''
+          - target: x86_64-pc-windows-msvc
+            os: windows-latest
+            ext: '.exe'
 
     name: 'Building ${{matrix.target}}'
     runs-on: ${{matrix.os}}
@@ -70,8 +77,24 @@ jobs:
           version: ${{needs.check.outputs.version}}
 
       - name: Generate the archive files
+        if: runner.os != 'Windows'
+        shell: bash
         run: |
-          zip -jX yarn-${{matrix.target}}.zip target/${{matrix.target}}/release-lto-nodebug/{yarn-bin,yarn,LICENSE.md}
+          zip -jX yarn-${{matrix.target}}.zip \
+            target/${{matrix.target}}/release-lto-nodebug/yarn-bin${{matrix.ext}} \
+            target/${{matrix.target}}/release-lto-nodebug/yarn${{matrix.ext}} \
+            target/${{matrix.target}}/release-lto-nodebug/LICENSE.md
+
+      - name: Generate the archive files
+        if: runner.os == 'Windows'
+        shell: pwsh
+        run: |
+          $archiveRoot = New-Item -ItemType Directory -Path "archive-${{matrix.target}}"
+          Copy-Item "target/${{matrix.target}}/release-lto-nodebug/yarn-bin${{matrix.ext}}" $archiveRoot
+          Copy-Item "target/${{matrix.target}}/release-lto-nodebug/yarn${{matrix.ext}}" $archiveRoot
+          Copy-Item "target/${{matrix.target}}/release-lto-nodebug/LICENSE.md" $archiveRoot
+          Compress-Archive -Path "$archiveRoot/*" -DestinationPath "yarn-${{matrix.target}}.zip"
+          Remove-Item -Recurse -Force $archiveRoot
 
       - name: Upload artifacts
         uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
@@ -173,7 +196,7 @@ jobs:
               const ext = includes(targetName, `windows`) ? `.exe` : ``;
 
               // We don't need to distribute Yarn Switch itself
-              fs.unlinkSync(path.join(destinationPath, `yarn`));
+              fs.unlinkSync(path.join(destinationPath, `yarn${ext}`));
 
               // Rename the binary to `yarn`
               fs.renameSync(path.join(destinationPath, `yarn-bin${ext}`), path.join(destinationPath, `yarn${ext}`));
@@ -190,6 +213,7 @@ jobs:
               const os = findFirst(targetName, {
                 linux: `linux`,
                 darwin: `darwin`,
+                win32: `windows`,
               });
 
               fs.writeFileSync(path.join(destinationPath, `package.json`), `${JSON.stringify({

Cargo.toml

@@ -64,6 +64,7 @@ http-body-util = "0.1"
 hyper = { version = "1", features = ["server", "http1"] }
 hyper-util = { version = "0.1", features = ["tokio"] }
 itertools = "0.14.0"
+junction = "1.2.0"
 indexmap = {version = "2.11.0", features = ["serde"]}
 interprocess = { version = "2.2.2", features = ["tokio"] }
 mimalloc = "0.1.43"
@@ -116,6 +117,7 @@ ts-rs = "12.0.1"
 serde_json = { version = "1.0.145", features = ["preserve_order"] }
 serde = { version = "1.0.207", features = ["derive"] }
 wax = { git = "https://github.com/arcanis/wax.git" }
+windows-sys = { version = "0.61", features = ["Win32_Foundation", "Win32_Security", "Win32_Security_Authorization", "Win32_System_Threading"] }
 winnow = "0.7"
 url = "2.5.7"
 urlencoding = "2.1.3"

install-script.sh

@@ -74,6 +74,12 @@ case $platform in
 'Darwin arm64')
   target=aarch64-apple-darwin
   ;;
+'MINGW64_NT'*' x86_64' | 'MSYS_NT'*' x86_64' | 'CYGWIN_NT'*' x86_64')
+  target=x86_64-pc-windows-msvc
+  ;;
+'MINGW64_NT'*' ARM64' | 'MINGW64_NT'*' aarch64' | 'MSYS_NT'*' ARM64' | 'MSYS_NT'*' aarch64' | 'CYGWIN_NT'*' ARM64' | 'CYGWIN_NT'*' aarch64')
+  target=x86_64-pc-windows-msvc
+  ;;
 'Linux aarch64' | 'Linux arm64')
   target=aarch64-unknown-linux-musl
   ;;
@@ -82,6 +88,15 @@ case $platform in
   ;;
 esac
 
+case $target in
+*-windows-*)
+  ext=.exe
+  ;;
+*)
+  ext=
+  ;;
+esac
+
 install_dir=$HOME/.yarn/switch/bin
 tmp_dir=$install_dir.tmp
 archive=$tmp_dir/yarn.zip
@@ -100,16 +115,16 @@ curl --fail --location --progress-bar --output "$archive" $yarn_uri ||
     error "Failed to download Yarn from $(colorize "$color_url" "$yarn_uri")"
 
 unzip -q "$archive" -d "$tmp_dir"
-rm "$tmp_dir"/yarn-bin
+rm "$tmp_dir"/yarn-bin$ext
 rm "$archive"
 
 if [[ -n "$bin_dir" ]]; then
-  mv -f "$tmp_dir"/yarn "$bin_dir"/
+  mv -f "$tmp_dir"/yarn$ext "$bin_dir"/
 else
   rm -rf "$install_dir"
   mv "$tmp_dir" "$install_dir"
 
   echo
 
-  "$install_dir"/yarn switch postinstall -H "$HOME"
+  "$install_dir"/yarn$ext switch postinstall -H "$HOME"
 fi

packages/zpm-formats/src/lib.rs

@@ -1,4 +1,4 @@
-use std::{borrow::Cow, os::unix::fs::PermissionsExt};
+use std::borrow::Cow;
 
 use libdeflater::{CompressionLvl, Compressor};
 use zpm_utils::{FromFileString, impl_file_string_from_str, Path, ToFileString, ToHumanString};
@@ -190,9 +190,7 @@ pub fn entries_from_folder<'a>(path: &Path) -> Result<Vec<Entry<'a>>, Error> {
 
             let rel_path = entry_path.relative_to(&base);
             let data = entry_path.fs_read()?;
-            let metadata = entry_path.fs_metadata()?;
-
-            let is_exec = metadata.permissions().mode() & 0o111 != 0;
+            let is_exec = entry_path.fs_is_executable()?;
             let mode = if is_exec { 0o755 } else { 0o644 };
 
             entries.push(Entry {
@@ -216,9 +214,7 @@ pub fn entries_from_files<'a>(base: &Path, files: &[Path]) -> Result<Vec<Entry<'
             .with_join(rel_path);
 
         let data = abs_path.fs_read()?;
-        let metadata = abs_path.fs_metadata()?;
-
-        let is_exec = metadata.permissions().mode() & 0o111 != 0;
+        let is_exec = abs_path.fs_is_executable()?;
         let mode = if is_exec { 0o755 } else { 0o644 };
 
         entries.push(Entry {

packages/zpm-parsers/src/json_doc.rs

@@ -619,13 +619,13 @@ impl<'a> Scanner<'a> {
     }
 
     fn skip_whitespace(&mut self) {
-        while self.offset < self.input.len() && (self.input[self.offset] == b' ' || self.input[self.offset] == b'\t' || self.input[self.offset] == b'\n') {
+        while self.offset < self.input.len() && matches!(self.input[self.offset], b' ' | b'\t' | b'\n' | b'\r') {
             self.offset += 1;
         }
     }
 
     fn rskip_whitespace(&mut self) {
-        while self.offset > 0 && (self.input[self.offset - 1] == b' ' || self.input[self.offset - 1] == b'\t' || self.input[self.offset - 1] == b'\n') {
+        while self.offset > 0 && matches!(self.input[self.offset - 1], b' ' | b'\t' | b'\n' | b'\r') {
             self.offset -= 1;
         }
     }
@@ -935,6 +935,8 @@ mod tests {
     // Edge cases with whitespace
     #[case(b"{ \"spaced\": \"value\" }", vec!["spaced"], Value::String("updated".to_string()), b"{ \"spaced\": \"updated\" }")]
     #[case(b"{\n\n  \"key\": \"value\"\n\n}", vec!["key"], Value::String("new_value".to_string()), b"{\n\n  \"key\": \"new_value\"\n\n}")]
+    #[case(b"{\r\n  \"key\": \"value\"\r\n}", vec!["key"], Value::String("new_value".to_string()), b"{\r\n  \"key\": \"new_value\"\r\n}")]
+    #[case(b"{\r\n  \"key\": \"value\"\r\n}", vec!["another"], Value::String("new_value".to_string()), b"{\r\n  \"another\": \"new_value\",\r\n  \"key\": \"value\"\r\n}")]
     #[case(b"{\"key\":\"no_spaces\"}", vec!["key"], Value::String("with_spaces".to_string()), b"{\"key\":\"with_spaces\"}")]
 
     // Escaped characters

packages/zpm-switch/src/commands/proxy.rs

@@ -84,7 +84,7 @@ async fn proxy_completer_async(ctx: &CompletionContext<'_>) -> Vec<Completion> {
             cmd
         },
         PackageManagerReference::Local(params) => {
-            std::process::Command::new(params.path.to_file_string())
+            std::process::Command::new(params.path.to_path_buf())
         },
     };
 
@@ -101,7 +101,7 @@ async fn proxy_completer_async(ctx: &CompletionContext<'_>) -> Vec<Completion> {
     args.extend(user_args.into_iter().map(String::from));
 
     if let Some(cwd) = get_fake_cwd() {
-        binary.args(&[cwd.to_file_string()]);
+        binary.args(&[cwd.to_native_string()]);
     }
 
     binary.args(&args);
@@ -161,7 +161,7 @@ impl ProxyCommand {
             = self.args.clone();
 
         if let Some(cwd) = get_fake_cwd() {
-            args.insert(0, cwd.to_file_string());
+            args.insert(0, cwd.to_native_string());
         }
 
         ExplicitCommand::run(&reference, &args).await

packages/zpm-switch/src/commands/switch/daemon_open.rs

@@ -123,7 +123,7 @@ impl DaemonOpenCommand {
             .arg("daemon")
             .arg("--auth-token")
             .arg(&auth_token)
-            .current_dir(detected_root.to_file_string())
+            .current_dir(detected_root.to_path_buf())
             .stdin(Stdio::null())
             .stdout(Stdio::piped())
             .stderr(Stdio::null());
@@ -135,8 +135,11 @@ impl DaemonOpenCommand {
             binary.env("USERPROFILE", userprofile);
         }
 
-        use std::os::unix::process::CommandExt;
-        binary.process_group(0);
+        #[cfg(unix)]
+        {
+            use std::os::unix::process::CommandExt;
+            binary.process_group(0);
+        }
 
         let mut child
             = binary

packages/zpm-switch/src/commands/switch/explicit.rs

@@ -32,7 +32,7 @@ impl ExplicitCommand {
                 => install_package_manager(params).await?,
 
             PackageManagerReference::Local(params)
-                => Command::new(params.path.to_file_string()),
+                => Command::new(params.path.to_path_buf()),
         };
 
         binary.stdout(Stdio::inherit());