Move generator over to microsoft/typespec (#3175)

Fixes #3173
microsoft · Apr 22, 2024 · d2292f0 · d2292f0
1 parent fa540a9
commit d2292f0
Show file tree

Hide file tree

Showing 381 changed files with 19,395 additions and 23 deletions.
diff --git a/.gitignore b/.gitignore
@@ -193,3 +193,4 @@ docs/**/js-api/
 
 # csharp emitter
 !packages/http-client-csharp/package-lock.json
+packages/http-client-csharp/generator/artifacts/
diff --git a/eng/common/scripts/Analyze-Changes.Tests.ps1 b/eng/common/scripts/Analyze-Changes.Tests.ps1
@@ -10,27 +10,51 @@ Describe 'Analyze-Changes' {
   }
 
   It 'Should return package variables if package specific changes are detected' {
-      $variables = Get-ActiveVariables @(
+      $actual = Get-ActiveVariables @(
         "packages/http-client-csharp/src/constants.ts"
       )
 
-      $variables | Should -Be 'RunCSharp'
+      $expected = @('RunCSharp')
+
+      $actual | ForEach-Object {
+        $_ | Should -BeIn $expected
+      }
   }
 
   It 'Should return RunCore if common files are changed' {
-      $variables = Get-ActiveVariables @(
+      $actual = Get-ActiveVariables @(
         "packages/compiler/package.json"
       )
 
-      $variables | Should -Be 'RunCore'
+      $expected = @('RunCore')
+
+      $actual | ForEach-Object {
+        $_ | Should -BeIn $expected
+      }
   }
 
   It 'Should return a combination of core and isolated packages' {
-      $variables = Get-ActiveVariables @(
+      $actual = Get-ActiveVariables @(
         "packages/http-client-csharp/src/constants.ts",
         "packages/compiler/package.json"
       )
 
-      $variables | Should -Be 'RunCore', 'RunCSharp'
+      $expected = @('RunCore', 'RunCSharp')
+
+      $actual | ForEach-Object {
+        $_ | Should -BeIn $expected
+      }
+  }
+
+  It 'Should return RunCSharp and RunCore if .editorconfig is changed' {
+      $actual = Get-ActiveVariables @(
+        ".editorconfig"
+      )
+
+      $expected = @('RunCore', 'RunCSharp')
+
+      $actual | ForEach-Object {
+        $_ | Should -BeIn $expected
+      }
   }
 }
diff --git a/eng/common/scripts/Analyze-Changes.ps1 b/eng/common/scripts/Analyze-Changes.ps1
@@ -6,23 +6,23 @@ param(
 
 # Represents an isolated package which has its own stages in typespec - ci pipeline
 class IsolatedPackage {
-    [string] $Path
+    [string[]] $Paths
     [string] $RunVariable
     [bool] $RunValue
 
-    IsolatedPackage([string]$path, [string]$runVariable, [bool]$runValue) {
-        $this.Path = $path
+    IsolatedPackage([string[]]$paths, [string]$runVariable, [bool]$runValue) {
+        $this.Paths = $paths
         $this.RunVariable = $runVariable
         $this.RunValue = $runValue
     }
 }
 
 # Emitter packages in the repo
 $isolatedPackages = @{
-    "http-client-csharp" = [IsolatedPackage]::new("packages/http-client-csharp", "RunCSharp", $false)
-    "http-client-java" = [IsolatedPackage]::new("packages/http-client-java", "RunJava", $false)
-    "http-client-typescript" = [IsolatedPackage]::new("packages/http-client-typescript", "RunTypeScript", $false)
-    "http-client-python" = [IsolatedPackage]::new("packages/http-client-python", "RunPython", $false)
+    "http-client-csharp" = [IsolatedPackage]::new(@("packages/http-client-csharp", ".editorconfig"), "RunCSharp", $false)
+    "http-client-java" = [IsolatedPackage]::new(@("packages/http-client-java"), "RunJava", $false)
+    "http-client-typescript" = [IsolatedPackage]::new(@("packages/http-client-typescript"), "RunTypeScript", $false)
+    "http-client-python" = [IsolatedPackage]::new(@("packages/http-client-python"), "RunPython", $false)
 }
 
 # A tree representation of a set of files
@@ -125,7 +125,12 @@ function Get-ActiveVariables($changes) {
         if (-not $runIsolated) {
             # set each isolated package flag
             foreach ($package in $isolatedPackages.Values) {
-                $package.RunValue = $root.PathExists($package.Path)
+                foreach ($path in $package.Paths) {
+                    $package.RunValue = $package.RunValue -or $root.PathExists($path)
+                    if ($package.RunValue) {
+                        break
+                    }
+                }
             }
         }
 

diff --git a/packages/http-client-csharp/readme.md → ...ages/http-client-csharp/emitter/readme.md b/packages/http-client-csharp/readme.md → ...ages/http-client-csharp/emitter/readme.md
diff --git a/packages/http-client-csharp/src/constants.ts → ...tp-client-csharp/emitter/src/constants.ts b/packages/http-client-csharp/src/constants.ts → ...tp-client-csharp/emitter/src/constants.ts
diff --git a/packages/http-client-csharp/src/emitter.ts → ...http-client-csharp/emitter/src/emitter.ts b/packages/http-client-csharp/src/emitter.ts → ...http-client-csharp/emitter/src/emitter.ts
diff --git a/packages/http-client-csharp/src/index.ts → ...s/http-client-csharp/emitter/src/index.ts b/packages/http-client-csharp/src/index.ts → ...s/http-client-csharp/emitter/src/index.ts
diff --git a/...nt-csharp/src/lib/client-model-builder.ts → ...p/emitter/src/lib/client-model-builder.ts b/...nt-csharp/src/lib/client-model-builder.ts → ...p/emitter/src/lib/client-model-builder.ts
diff --git a/.../http-client-csharp/src/lib/decorators.ts → ...ient-csharp/emitter/src/lib/decorators.ts b/.../http-client-csharp/src/lib/decorators.ts → ...ient-csharp/emitter/src/lib/decorators.ts
diff --git a/...ages/http-client-csharp/src/lib/logger.ts → ...p-client-csharp/emitter/src/lib/logger.ts b/...ages/http-client-csharp/src/lib/logger.ts → ...p-client-csharp/emitter/src/lib/logger.ts
diff --git a/packages/http-client-csharp/src/lib/model.ts → ...tp-client-csharp/emitter/src/lib/model.ts b/packages/http-client-csharp/src/lib/model.ts → ...tp-client-csharp/emitter/src/lib/model.ts
diff --git a/...s/http-client-csharp/src/lib/operation.ts → ...lient-csharp/emitter/src/lib/operation.ts b/...s/http-client-csharp/src/lib/operation.ts → ...lient-csharp/emitter/src/lib/operation.ts
diff --git a/...-csharp/src/lib/service-authentication.ts → ...emitter/src/lib/service-authentication.ts b/...-csharp/src/lib/service-authentication.ts → ...emitter/src/lib/service-authentication.ts
diff --git a/...-client-csharp/src/lib/typespec-server.ts → ...csharp/emitter/src/lib/typespec-server.ts b/...-client-csharp/src/lib/typespec-server.ts → ...csharp/emitter/src/lib/typespec-server.ts
diff --git a/packages/http-client-csharp/src/lib/utils.ts → ...tp-client-csharp/emitter/src/lib/utils.ts b/packages/http-client-csharp/src/lib/utils.ts → ...tp-client-csharp/emitter/src/lib/utils.ts
diff --git a/packages/http-client-csharp/src/options.ts → ...http-client-csharp/emitter/src/options.ts b/packages/http-client-csharp/src/options.ts → ...http-client-csharp/emitter/src/options.ts
diff --git a/...client-csharp/src/type/body-media-type.ts → ...sharp/emitter/src/type/body-media-type.ts b/...client-csharp/src/type/body-media-type.ts → ...sharp/emitter/src/type/body-media-type.ts
diff --git a/...ttp-client-csharp/src/type/client-kind.ts → ...nt-csharp/emitter/src/type/client-kind.ts b/...ttp-client-csharp/src/type/client-kind.ts → ...nt-csharp/emitter/src/type/client-kind.ts
diff --git a/...http-client-csharp/src/type/code-model.ts → ...ent-csharp/emitter/src/type/code-model.ts b/...http-client-csharp/src/type/code-model.ts → ...ent-csharp/emitter/src/type/code-model.ts
diff --git a/...ient-csharp/src/type/collection-format.ts → ...arp/emitter/src/type/collection-format.ts b/...ient-csharp/src/type/collection-format.ts → ...arp/emitter/src/type/collection-format.ts
diff --git a/...p-client-csharp/src/type/configuration.ts → ...-csharp/emitter/src/type/configuration.ts b/...p-client-csharp/src/type/configuration.ts → ...-csharp/emitter/src/type/configuration.ts
diff --git a/.../http-client-csharp/src/type/converter.ts → ...ient-csharp/emitter/src/type/converter.ts b/.../http-client-csharp/src/type/converter.ts → ...ient-csharp/emitter/src/type/converter.ts
diff --git a/...p-client-csharp/src/type/external-docs.ts → ...-csharp/emitter/src/type/external-docs.ts b/...p-client-csharp/src/type/external-docs.ts → ...-csharp/emitter/src/type/external-docs.ts
diff --git a/...-client-csharp/src/type/formatted-type.ts → ...csharp/emitter/src/type/formatted-type.ts b/...-client-csharp/src/type/formatted-type.ts → ...csharp/emitter/src/type/formatted-type.ts
diff --git a/...t-csharp/src/type/http-response-header.ts → .../emitter/src/type/http-response-header.ts b/...t-csharp/src/type/http-response-header.ts → .../emitter/src/type/http-response-header.ts
diff --git a/...ent-csharp/src/type/input-api-key-auth.ts → ...rp/emitter/src/type/input-api-key-auth.ts b/...ent-csharp/src/type/input-api-key-auth.ts → ...rp/emitter/src/type/input-api-key-auth.ts
diff --git a/...http-client-csharp/src/type/input-auth.ts → ...ent-csharp/emitter/src/type/input-auth.ts b/...http-client-csharp/src/type/input-auth.ts → ...ent-csharp/emitter/src/type/input-auth.ts
diff --git a/...tp-client-csharp/src/type/input-client.ts → ...t-csharp/emitter/src/type/input-client.ts b/...tp-client-csharp/src/type/input-client.ts → ...t-csharp/emitter/src/type/input-client.ts
diff --git a/...-client-csharp/src/type/input-constant.ts → ...csharp/emitter/src/type/input-constant.ts b/...-client-csharp/src/type/input-constant.ts → ...csharp/emitter/src/type/input-constant.ts
diff --git a/...-csharp/src/type/input-enum-type-value.ts → ...emitter/src/type/input-enum-type-value.ts b/...-csharp/src/type/input-enum-type-value.ts → ...emitter/src/type/input-enum-type-value.ts
diff --git a/...arp/src/type/input-intrinsic-type-kind.ts → ...ter/src/type/input-intrinsic-type-kind.ts b/...arp/src/type/input-intrinsic-type-kind.ts → ...ter/src/type/input-intrinsic-type-kind.ts
diff --git a/...t-csharp/src/type/input-model-property.ts → .../emitter/src/type/input-model-property.ts b/...t-csharp/src/type/input-model-property.ts → .../emitter/src/type/input-model-property.ts
diff --git a/...ient-csharp/src/type/input-oauth2-auth.ts → ...arp/emitter/src/type/input-oauth2-auth.ts b/...ient-csharp/src/type/input-oauth2-auth.ts → ...arp/emitter/src/type/input-oauth2-auth.ts
diff --git a/...rc/type/input-operation-parameter-kind.ts → ...rc/type/input-operation-parameter-kind.ts b/...rc/type/input-operation-parameter-kind.ts → ...rc/type/input-operation-parameter-kind.ts
diff --git a/...client-csharp/src/type/input-operation.ts → ...sharp/emitter/src/type/input-operation.ts b/...client-csharp/src/type/input-operation.ts → ...sharp/emitter/src/type/input-operation.ts
diff --git a/...client-csharp/src/type/input-parameter.ts → ...sharp/emitter/src/type/input-parameter.ts b/...client-csharp/src/type/input-parameter.ts → ...sharp/emitter/src/type/input-parameter.ts
diff --git a/...arp/src/type/input-primitive-type-kind.ts → ...ter/src/type/input-primitive-type-kind.ts b/...arp/src/type/input-primitive-type-kind.ts → ...ter/src/type/input-primitive-type-kind.ts
diff --git a/...client-csharp/src/type/input-type-kind.ts → ...sharp/emitter/src/type/input-type-kind.ts b/...client-csharp/src/type/input-type-kind.ts → ...sharp/emitter/src/type/input-type-kind.ts
diff --git a/...c/type/input-type-serialization-format.ts → ...c/type/input-type-serialization-format.ts b/...c/type/input-type-serialization-format.ts → ...c/type/input-type-serialization-format.ts
diff --git a/...lient-csharp/src/type/input-type-value.ts → ...harp/emitter/src/type/input-type-value.ts b/...lient-csharp/src/type/input-type-value.ts → ...harp/emitter/src/type/input-type-value.ts
diff --git a/...http-client-csharp/src/type/input-type.ts → ...ent-csharp/emitter/src/type/input-type.ts b/...http-client-csharp/src/type/input-type.ts → ...ent-csharp/emitter/src/type/input-type.ts
diff --git a/...t-csharp/src/type/literal-type-context.ts → .../emitter/src/type/literal-type-context.ts b/...t-csharp/src/type/literal-type-context.ts → .../emitter/src/type/literal-type-context.ts
diff --git a/...arp/src/type/operation-final-state-via.ts → ...ter/src/type/operation-final-state-via.ts b/...arp/src/type/operation-final-state-via.ts → ...ter/src/type/operation-final-state-via.ts
diff --git a/...csharp/src/type/operation-long-running.ts → ...mitter/src/type/operation-long-running.ts b/...csharp/src/type/operation-long-running.ts → ...mitter/src/type/operation-long-running.ts
diff --git a/...lient-csharp/src/type/operation-paging.ts → ...harp/emitter/src/type/operation-paging.ts b/...lient-csharp/src/type/operation-paging.ts → ...harp/emitter/src/type/operation-paging.ts
diff --git a/...ent-csharp/src/type/operation-response.ts → ...rp/emitter/src/type/operation-response.ts b/...ent-csharp/src/type/operation-response.ts → ...rp/emitter/src/type/operation-response.ts
diff --git a/.../http-client-csharp/src/type/protocols.ts → ...ient-csharp/emitter/src/type/protocols.ts b/.../http-client-csharp/src/type/protocols.ts → ...ient-csharp/emitter/src/type/protocols.ts
diff --git a/...lient-csharp/src/type/request-location.ts → ...harp/emitter/src/type/request-location.ts b/...lient-csharp/src/type/request-location.ts → ...harp/emitter/src/type/request-location.ts
diff --git a/...-client-csharp/src/type/request-method.ts → ...csharp/emitter/src/type/request-method.ts b/...-client-csharp/src/type/request-method.ts → ...csharp/emitter/src/type/request-method.ts
diff --git a/...ages/http-client-csharp/src/type/usage.ts → ...p-client-csharp/emitter/src/type/usage.ts b/...ages/http-client-csharp/src/type/usage.ts → ...p-client-csharp/emitter/src/type/usage.ts
diff --git a/...client-csharp/src/type/validation-type.ts → ...sharp/emitter/src/type/validation-type.ts b/...client-csharp/src/type/validation-type.ts → ...sharp/emitter/src/type/validation-type.ts
diff --git a/...tp-client-csharp/test/Unit/encode.test.ts → ...t-csharp/emitter/test/Unit/encode.test.ts b/...tp-client-csharp/test/Unit/encode.test.ts → ...t-csharp/emitter/test/Unit/encode.test.ts
diff --git a/...lient-csharp/test/Unit/model-type.test.ts → ...harp/emitter/test/Unit/model-type.test.ts b/...lient-csharp/test/Unit/model-type.test.ts → ...harp/emitter/test/Unit/model-type.test.ts
diff --git a/...st/Unit/operation-final-state-via.test.ts → ...st/Unit/operation-final-state-via.test.ts b/...st/Unit/operation-final-state-via.test.ts → ...st/Unit/operation-final-state-via.test.ts
diff --git a/...nt-csharp/test/Unit/property-type.test.ts → ...p/emitter/test/Unit/property-type.test.ts b/...nt-csharp/test/Unit/property-type.test.ts → ...p/emitter/test/Unit/property-type.test.ts
diff --git a/...tp-client-csharp/test/Unit/scalar.test.ts → ...t-csharp/emitter/test/Unit/scalar.test.ts b/...tp-client-csharp/test/Unit/scalar.test.ts → ...t-csharp/emitter/test/Unit/scalar.test.ts
diff --git a/...nt-csharp/test/Unit/string-format.test.ts → ...p/emitter/test/Unit/string-format.test.ts b/...nt-csharp/test/Unit/string-format.test.ts → ...p/emitter/test/Unit/string-format.test.ts
diff --git a/...ttp-client-csharp/test/Unit/usage.test.ts → ...nt-csharp/emitter/test/Unit/usage.test.ts b/...ttp-client-csharp/test/Unit/usage.test.ts → ...nt-csharp/emitter/test/Unit/usage.test.ts
diff --git a/...lient-csharp/test/Unit/utils/test-util.ts → ...harp/emitter/test/Unit/utils/test-util.ts b/...lient-csharp/test/Unit/utils/test-util.ts → ...harp/emitter/test/Unit/utils/test-util.ts
diff --git a/...es/http-client-csharp/tsconfig.build.json → ...client-csharp/emitter/tsconfig.build.json b/...es/http-client-csharp/tsconfig.build.json → ...client-csharp/emitter/tsconfig.build.json
diff --git a/packages/http-client-csharp/tsconfig.json → .../http-client-csharp/emitter/tsconfig.json b/packages/http-client-csharp/tsconfig.json → .../http-client-csharp/emitter/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.base.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "noEmit": true
   }

diff --git a/packages/http-client-csharp/vitest.config.ts → ...tp-client-csharp/emitter/vitest.config.ts b/packages/http-client-csharp/vitest.config.ts → ...tp-client-csharp/emitter/vitest.config.ts
@@ -1,4 +1,4 @@
 import { defineConfig, mergeConfig } from "vitest/config";
-import { defaultTypeSpecVitestConfig } from "../../vitest.workspace.js";
+import { defaultTypeSpecVitestConfig } from "../../../vitest.workspace.js";
 
 export default mergeConfig(defaultTypeSpecVitestConfig, defineConfig({}));
diff --git a/packages/http-client-csharp/eng/CodeAnalysis.ruleset b/packages/http-client-csharp/eng/CodeAnalysis.ruleset
diff --git a/packages/http-client-csharp/eng/images/packageIcon.png b/packages/http-client-csharp/eng/images/packageIcon.png
diff --git a/packages/http-client-csharp/eng/scripts/Build-Packages.ps1 b/packages/http-client-csharp/eng/scripts/Build-Packages.ps1
@@ -34,6 +34,10 @@ if ($BuildNumber) {
 Push-Location "$packageRoot"
 try {
     Write-Host "Working in $PWD"
+
+    # TODO this is happening 4 times until ..... gets fixed
+    Invoke-LoggedCommand "dotnet build ./generator" -GroupOutput
+
     Invoke-LoggedCommand "npm run build" -GroupOutput
 
     if ($BuildNumber) {

diff --git a/packages/http-client-csharp/eng/scripts/Generate.ps1 b/packages/http-client-csharp/eng/scripts/Generate.ps1
@@ -0,0 +1,13 @@
+#Requires -Version 7.0
+
+Import-Module "$PSScriptRoot\Generation.psm1" -DisableNameChecking -Force;
+
+$repoRoot = Resolve-Path (Join-Path $PSScriptRoot '..' '..' 'generator')
+$mgcArtifactRoot = Join-Path $repoRoot 'artifacts' 'bin' 'Microsoft.Generator.CSharp' 'Debug' 'net8.0'
+$clientModelTestProjectsDirectory = Join-Path $repoRoot 'Microsoft.Generator.CSharp.ClientModel.TestProjects'
+
+Invoke "dotnet build $repoRoot"
+
+$mgcPath = Join-Path $mgcArtifactRoot "Microsoft.Generator.CSharp"
+$unbrandedTypespecTestProject = Join-Path $clientModelTestProjectsDirectory "Unbranded-TypeSpec"
+Invoke "$mgcPath $unbrandedTypespecTestProject"
diff --git a/packages/http-client-csharp/eng/scripts/Generation.psm1 b/packages/http-client-csharp/eng/scripts/Generation.psm1
@@ -0,0 +1,22 @@
+$repoRoot = Resolve-Path (Join-Path $PSScriptRoot '..')
+
+function Invoke($command, $executePath=$repoRoot)
+{
+    Write-Host "> $command"
+    Push-Location $executePath
+    if ($IsLinux -or $IsMacOs)
+    {
+        sh -c "$command 2>&1"
+    }
+    else
+    {
+        cmd /c "$command 2>&1"
+    }
+    Pop-Location
+
+    if($LastExitCode -ne 0)
+    {
+        Write-Error "Command failed to execute: $command"
+    }
+}
+Export-ModuleMember -Function "Invoke"
diff --git a/packages/http-client-csharp/eng/scripts/Initialize-Repository.ps1 b/packages/http-client-csharp/eng/scripts/Initialize-Repository.ps1
@@ -17,6 +17,17 @@ try {
         Remove-Item -Recurse -Force "./node_modules"
     }
 
+    # install dotnet
+    if ($IsWindows) {
+        # download and run https://dot.net/v1/dotnet-install.ps1
+        Invoke-WebRequest 'https://dot.net/v1/dotnet-install.ps1' -OutFile 'dotnet-install.ps1'
+        ./dotnet-install.ps1 -Version '8.0.204'
+    }
+    else {
+        Invoke-WebRequest 'https://dot.net/v1/dotnet-install.sh' -OutFile 'dotnet-install.sh'
+        bash ./dotnet-install.sh --version 8.0.204
+    }
+
     # install and list npm packages
 
     if ($BuildArtifactsPath) {

diff --git a/packages/http-client-csharp/eng/scripts/Test-Packages.ps1 b/packages/http-client-csharp/eng/scripts/Test-Packages.ps1
@@ -15,11 +15,14 @@ Set-ConsoleEncoding
 Push-Location $packageRoot
 try {
     if ($UnitTests) {
-        # test the emitter
         Push-Location "$packageRoot"
         try {
+            # test the emitter
             Invoke-LoggedCommand "npm run build" -GroupOutput
             Invoke-LoggedCommand "npm run test" -GroupOutput
+
+            # test the generator
+            Invoke-LoggedCommand "dotnet test ./generator" -GroupOutput
         }
         finally {
             Pop-Location

diff --git a/packages/http-client-csharp/eng/stylecop.json b/packages/http-client-csharp/eng/stylecop.json
@@ -0,0 +1,13 @@
+{
+  "$schema": "https://raw.githubusercontent.com/DotNetAnalyzers/StyleCopAnalyzers/master/StyleCop.Analyzers/StyleCop.Analyzers/Settings/stylecop.schema.json",
+  "settings": {
+    "documentationRules": {
+      "copyrightText": "Copyright (c) {companyName}. All rights reserved.\nLicensed under the {licenseName} License.",
+      "companyName": "Microsoft Corporation",
+      "xmlHeader": false,
+      "variables": {
+        "licenseName": "MIT"
+      }
+    }
+  }
+}