Fix processing of args for secundary PowerShell scripts

This is needed to preserve the contents of arguments that contain spaces
when we call the main "bin/elixir.ps1" script using "Invoke-Expression".

Author: Philip Sampaio

bin/elixir.ps1

@@ -198,7 +198,8 @@ for ($i = 0; $i -lt $args.Count; $i++) {
     }
 
     "--erl" {
-      $beforeExtras.Add($args[++$i])
+      $private:erlFlags = $args[++$i] -split " "
+      $beforeExtras.AddRange($erlFlags)
       break
     }
 
@@ -297,11 +298,13 @@ $beforeExtras.InsertRange(0, [string[]]@("-noshell", "-elixir_root", "$(Join-Pat
 # $ERTS_BIN=
 $ERTS_BIN = "$env:ERTS_BIN"
 
-$ELIXIR_ERL_OPTIONS = "$env:ELIXIR_ERL_OPTIONS"
-
 $allParams = New-Object Collections.Generic.List[String]
 
-$allParams.Add($ELIXIR_ERL_OPTIONS)
+if ($null -ne $env:ELIXIR_ERL_OPTIONS) {
+  $private:erlFlags = $env:ELIXIR_ERL_OPTIONS -split " "
+  $allParams.AddRange($erlFlags)
+}
+
 $allParams.AddRange($erlangParams)
 $allParams.AddRange($beforeExtras)
 $allParams.Add("-extra")
@@ -335,10 +338,10 @@ else {
   }
 
   # We scape special chars using the Unix style of scaping, with "\".
-  # But first we escape the double-quotes.
+  # But first we escape the double-quotes, because for some reason they are not escaped in the same regex.
   $private:escaped = $allParams | ForEach-Object -Process { ($_ -replace "`"", "\`"") -replace "[^a-zA-Z0-9_/-]", "\$&" }
 
-  # The args are surrounded here for the same reasons
+  # The args are surrounded here because we want to have only one argument for the entire command.
   $paramsPart = @("-daemon","`"$runErlPipe/`"", "`"$runErlLog/`"", "`"$($escaped -join " ")`"")
 }
 

bin/elixirc.ps1

@@ -27,4 +27,25 @@ Usage: $scriptName [elixir switches] [compiler switches] [.ex files]
 $scriptPath = Split-Path -Parent $PSCommandPath
 $command = Join-Path -Path $scriptPath -ChildPath "elixir.ps1"
 
-Invoke-Expression "$command +elixirc $($args -join " ")"
+function QuoteString {
+  param(
+    [Parameter(ValueFromPipeline = $true)]
+    [string] $Item
+  )
+
+  # We surround the string with double quotes, in order to preserve its contents as
+  # only one command arg.
+  # This is needed because PowerShell consider spaces as separator of arguments.
+  # The double quotes around will be removed when PowerShell process the argument.
+  # See: https://learn.microsoft.com/en-us/powershell/module/microsoft.powershell.core/about/about_quoting_rules?view=powershell-7.4#passing-quoted-strings-to-external-commands
+  if ($Item.Contains(" ")) {
+    '"' + $Item + '"'
+  }
+  else {
+    $Item
+  }
+}
+
+$quotedArgs = $args | forEach-Object -Process { QuoteString($_) }
+
+Invoke-Expression "$command +elixirc $($quotedArgs -join " ")"

bin/iex.ps1

@@ -19,7 +19,27 @@ It accepts all other options listed by "elixir --help".
   exit
 }
 
+function QuoteString {
+  param(
+    [Parameter(ValueFromPipeline = $true)]
+    [string] $Item
+  )
+
+  # We surround the string with double quotes, in order to preserve its contents as
+  # only one command arg.
+  # This is needed because PowerShell consider spaces as separator of arguments.
+  # The double quotes around will be removed when PowerShell process the argument.
+  # See: https://learn.microsoft.com/en-us/powershell/module/microsoft.powershell.core/about/about_quoting_rules?view=powershell-7.4#passing-quoted-strings-to-external-commands
+  if ($Item.Contains(" ")) {
+    '"' + $Item + '"'
+  }
+  else {
+    $Item
+  }
+}
+
 $scriptPath = Split-Path -Parent $PSCommandPath
 $command = Join-Path -Path $scriptPath -ChildPath "elixir.ps1"
+$quotedArgs = $args | forEach-Object -Process { QuoteString($_) }
 
-Invoke-Expression "$command --no-halt --erl `"-user elixir`" +iex $($args -join " ")"
+Invoke-Expression "$command --no-halt --erl `"-user elixir`" +iex $($quotedArgs -join " ")"

bin/mix.ps1

@@ -4,4 +4,25 @@ $scriptPath = Split-Path -Parent $PSCommandPath
 $command = Join-Path -Path $scriptPath -ChildPath "elixir.ps1"
 $mixFile = Join-Path -Path $scriptPath -ChildPath "mix"
 
-Invoke-Expression "$command $mixFile $($args -join " ")"
+function QuoteString {
+  param(
+    [Parameter(ValueFromPipeline = $true)]
+    [string] $Item
+  )
+
+  # We surround the string with double quotes, in order to preserve its contents as
+  # only one command arg.
+  # This is needed because PowerShell consider spaces as separator of arguments.
+  # The double quotes around will be removed when PowerShell process the argument.
+  # See: https://learn.microsoft.com/en-us/powershell/module/microsoft.powershell.core/about/about_quoting_rules?view=powershell-7.4#passing-quoted-strings-to-external-commands
+  if ($Item.Contains(" ")) {
+    '"' + $Item + '"'
+  }
+  else {
+    $Item
+  }
+}
+
+$quotedArgs = $args | forEach-Object -Process { QuoteString($_) }
+
+Invoke-Expression "$command $mixFile $($quotedArgs -join " ")"