Support NPM installed Autorest (#271)

Author: deathly809

PSSwagger/PSSwagger.Resources.psd1

@@ -24,7 +24,7 @@ ConvertFrom-StringData @'
     SwaggerSpecPathNotExist=Swagger file $SwaggerSpecPath does not exist. Check the path
     SamePropertyName=Same property name '{0}' is defined in a definition '{1}' with AllOf inheritance.
     DataTypeNotImplemented=Please get an implementation of '{0}' for '{1}'
-    AutoRestNotInPath=Unable to find AutoRest.exe in PATH environment. Ensure the PATH is updated.
+    AutoRestNotInPath=Unable to find AutoRest in PATH environment. Ensure the PATH is updated.
     AutoRestError=AutoRest resulted in an error
     SwaggerParamsMissing=No parameters in the Swagger
     SwaggerDefinitionsMissing=No definitions in the Swagger
@@ -62,11 +62,11 @@ ConvertFrom-StringData @'
     InvalidPathParameterType=Extracted an invalid parameter type '{0}' for parameter '{1}' in path operation.
     InvalidDefinitionParameterType=Extracted an invalid parameter type '{0}' for parameter '{1}' in definition '{2}'.
     AutoRestParameterIgnored=The parameter '{0}' with value '{1}' specified in the Swagger specification will be overwritten by PSSwagger during code generation.
-    InvokingAutoRestWithParams=Invoking AutoRest.exe with the following parameters:
+    InvokingAutoRestWithParams=Invoking AutoRest with the following parameters:
     AutoRestParam=  {0} = {1}
     OutputDirectoryMustBeEmpty=Code output directory '{0}' must not contain any .cs files in order for PSSwagger to correctly determine the files from which the SDK should be built.
     CustomNamespaceNotRecommended=Custom namespaces are not recommended when using PSSwagger, as the generated modules may not support side-by-side.
-    CodeDirectoryWillBeCreated=Code output directory '{0}' will be created by AutoRest.exe and contain unused generated code. You may delete this directory after the module has finished generating if you wish.
+    CodeDirectoryWillBeCreated=Code output directory '{0}' will be created by AutoRest and contain unused generated code. You may delete this directory after the module has finished generating if you wish.
     MultiplePageReturnTypes=Multiple page return types found, unable to generate -Page parameter with a strong type for cmdlet '{0}'.
     FailedToFindPagingOperation=Failed to find specified next page operation with operationId '{0}' for cmdlet '{1}'.
     InvalidPagingOperationSchema=PSSwagger requires that the NextLink operation contains exactly one parameter different than the original operation, where the different parameter is used to pass the nextLink value to the NextLink operation. Current cmdlet: '{0}'. NextLink operation: '{1}'

PSSwagger/PSSwagger.psm1

@@ -528,10 +528,9 @@ function ConvertTo-CsharpCode
     Write-Verbose -Message $LocalizedData.GenerateCodeUsingAutoRest
     $info = $SwaggerDict['Info']
 
-    $autoRestExePath = "autorest.exe"
-    if (-not (get-command -name autorest.exe))
-    {
-        throw $LocalizedData.AutoRestNotInPath
+    $autoRestExePath = "AutoRest"
+    if (-not (get-command -name $autoRestExePath)) {
+            throw $LocalizedData.AutoRestNotInPath
     }
 
     $outputDirectory = $SwaggerMetaDict['outputDirectory']

PSSwagger/SwaggerUtils.psm1

@@ -1559,6 +1559,41 @@ function Get-Response
     return $responseBody, $outputType
 }
 
+<#
+
+    Get-ToolsPath
+
+#>
+function Get-ToolsPath {
+        [string]$AutoRestToolsPath = $null
+
+        # Note: DLLs are automatically downloaded and extracted into the folder 
+        # "$env:USERPROFILE/.autorest/plugins/autorest/$VERSION" if they do not 
+        # exist for newer versions of autorest.
+        [string]$basePath = Join-Path -Path $env:USERPROFILE -ChildPath ".autorest" | Join-Path -ChildPath "plugins" | Join-Path -ChildPath "autorest"
+
+        
+        if(Test-Path $basePath) { # Try to load newer version of autorest
+            $versions = @(Get-ChildItem -Directory $basePath | ForEach-Object {[System.Version]$_.Name} | Sort-Object -Descending)
+            
+            if($versions.Length -ne 0) {
+                [string]$version = $versions[0] # Get newest
+                $AutoRestToolsPath = Join-Path -Path $basePath -ChildPath $version
+            }
+        } else { # Fallback to old version of autorest
+            $AutoRestToolsPath = Get-Command -Name 'AutoRest.exe' | 
+                Select-Object -First 1 -ErrorAction Ignore | 
+                    ForEach-Object {Split-Path -LiteralPath $_.Source}
+        }
+
+        if (-not ($AutoRestToolsPath))
+        {
+            throw $LocalizedData.AutoRestNotInPath
+        }
+
+        return $AutoRestToolsPath
+}
+
 function Get-CSharpModelName
 {
     param(
@@ -1574,15 +1609,8 @@ function Get-CSharpModelName
                 [string]
                 $AssemblyName
             )
-
-            $AutoRestToolsPath = Get-Command -Name 'AutoRest.exe' |
-                                Select-Object -First 1 -ErrorAction Ignore | 
-                                    ForEach-Object {Split-Path -LiteralPath $_.Source}
-
-            if (-not ($AutoRestToolsPath))
-            {
-                throw $LocalizedData.AutoRestNotInPath
-            }
+   
+            [string]$AutoRestToolsPath = Get-ToolsPath
 
             $AssemblyFilePath = Join-Path -Path $AutoRestToolsPath -ChildPath $AssemblyName
             if(-not $AssemblyFilePath -or -not (Test-Path -LiteralPath $AssemblyFilePath -PathType Leaf))

Tests/PSSwaggerScenario.Tests.ps1

@@ -226,8 +226,14 @@ Describe "Optional parameter tests" -Tag ScenarioTest {
             $results.Length | should be 2
         }
 
+        It "Generates cmdlet using optional query parameters (flavor and maker)" {
+            $results = Get-Cupcake -Flavor "chocolate" -Maker "bob"
+            $results.Length | should be 1
+        }
+
         It "Generates cmdlet using optional path parameters" {
-            Get-CupcakeByMaker -Flavor "chocolate" -Maker "bob"
+            $results = Get-CupcakeByMaker -Flavor "chocolate" -Maker "bob"
+            $results.Length | should be 1
         }
 
         It "Sets default value when specified in spec" {