tsp, separate EmitterOptions for Azure emitter and unbranded emitter (#3042)

weidongxu-microsoft · web-flow · commit 1ce6d705c6c4 · 2025-03-18T12:41:57.000+08:00
* update core.diff

* options.ts

* ignore options.ts on copy

* avoid use pwsh

* use Maven 4

* doc, we no longer need to modify any ts file

* add stream lib

* eng, remove step of modifying lint rule in nightly
diff --git a/.gitignore b/.gitignore
@@ -106,6 +106,7 @@ typespec-tests/package-lock.json
 /typespec-tests/src/main/resources/META-INF/*apiview_properties.json
 
 # typespec-extension
-/typespec-extension/src
+/typespec-extension/src/*
+!/typespec-extension/src/options.ts
 /typespec-extension/test
 /typespec-extension/generator
diff --git a/Build-TypeSpec.ps1 b/Build-TypeSpec.ps1
@@ -22,7 +22,7 @@ Write-Host "Copy JAR and TypeSpec code to './typespec-extension' directory"
 New-Item -ItemType File -Path ./typespec-extension/generator/http-client-generator/target/emitter.jar -Force
 Copy-Item ./core/packages/http-client-java/generator/http-client-generator/target/emitter.jar ./typespec-extension/generator/http-client-generator/target/emitter.jar -Force
 # Copy TypeScript code
-Copy-Item -Path ./core/packages/http-client-java/emitter/src -Destination ./typespec-extension/ -Recurse -Force
+Copy-Item -Path ./core/packages/http-client-java/emitter/src -Destination ./typespec-extension/ -Exclude "options.ts" -Recurse -Force
 Copy-Item -Path ./core/packages/http-client-java/emitter/test -Destination ./typespec-extension/ -Recurse -Force
 
 Write-Host "Build and Pack typespec-java"
diff --git a/Generate-TypeSpec.ps1 b/Generate-TypeSpec.ps1
@@ -26,7 +26,7 @@ function invokeExpressionAndCaptureOutput([string]$expression) {
   Write-Host $output
 }
 
-pwsh ./Build-TypeSpec.ps1
+& ./Build-TypeSpec.ps1
 
 Write-Host "Installing TypeSpec ('npm install -g @typespec/compiler')"
 invokeExpressionAndCaptureOutput("npm install -g @typespec/compiler")
@@ -36,7 +36,7 @@ Push-Location ./typespec-tests
 
 try {
   Write-Host "Generating code ('Generate.ps1' in './typespec-tests')"
-  pwsh ./Generate.ps1 -Parallelization $Parallelization
+  & ./Generate.ps1 -Parallelization $Parallelization
 
 #   Write-Host "Checking format of generated code ('npm run check-format')"
 #   invokeExpressionAndCaptureOutput("npm run check-format")
diff --git a/core b/core
@@ -1 +1 @@
-Subproject commit 0a21f10e2501b74c4c929c0a1e5a796df98f25ad
+Subproject commit e6f340fd77c3d6704496f462a319928e32d7b87f
diff --git a/core.diff b/core.diff
@@ -1,17 +1,5 @@
-diff --git a/packages/http-client-java/emitter/src/lib.ts b/packages/http-client-java/emitter/src/lib.ts
-index 2d9134c3d..c9ef91f87 100644
---- a/packages/http-client-java/emitter/src/lib.ts
-+++ b/packages/http-client-java/emitter/src/lib.ts
-@@ -1,6 +1,6 @@
- import { createTypeSpecLibrary, JSONSchemaType, paramMessage } from "@typespec/compiler";
- 
--export const LIB_NAME = "@typespec/http-client-java";
-+export const LIB_NAME = "@azure-tools/typespec-java";
- 
- export interface DevOptions {
-   "generate-code-model"?: boolean;
 diff --git a/packages/http-client-java/generator/http-client-generator-core/pom.xml b/packages/http-client-java/generator/http-client-generator-core/pom.xml
-index ce40ac91d..c3ee24c92 100644
+index b4139191e..d1b75d5ae 100644
 --- a/packages/http-client-java/generator/http-client-generator-core/pom.xml
 +++ b/packages/http-client-java/generator/http-client-generator-core/pom.xml
 @@ -21,6 +21,11 @@
@@ -27,7 +15,7 @@ index ce40ac91d..c3ee24c92 100644
        <groupId>com.azure</groupId>
        <artifactId>azure-core</artifactId>
 diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/postprocessor/Postprocessor.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/postprocessor/Postprocessor.java
-index d44ce8ec4..7953870bc 100644
+index 4aad12e27..67e5f7ef1 100644
 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/postprocessor/Postprocessor.java
 +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/postprocessor/Postprocessor.java
 @@ -3,9 +3,9 @@
diff --git a/eng/pipelines/ci-typespec-java-dev-nightly.yaml b/eng/pipelines/ci-typespec-java-dev-nightly.yaml
@@ -12,7 +12,7 @@ pr: none
 jobs:
   - job: Build
 
-    timeoutInMinutes: 30
+    timeoutInMinutes: 60
 
     variables:
       - template: /eng/pipelines/variables/globals.yml
@@ -25,14 +25,6 @@ jobs:
       - checkout: self
         submodules: true
 
-      - task: PowerShell@2
-        displayName: 'Disable Warning on Deprecation'
-        inputs:
-          targetType: inline
-          script: >
-            (Get-Content '.eslintrc.cjs') -replace '(?<="deprecation/deprecation": ")[^"]*', 'off' | Set-Content '.eslintrc.cjs'
-          workingDirectory: ./typespec-extension
-
       - task: NodeTool@0
         displayName: 'Install Node.js $(NodeVersion)'
         inputs:
@@ -91,7 +83,7 @@ jobs:
         displayName: 'Start Spector Test Server'
         workingDirectory: ./typespec-tests
 
-      - task: Maven@3
+      - task: Maven@4
         displayName: 'Run TypeSpec Tests'
         inputs:
           mavenPomFile: pom.xml
diff --git a/eng/pipelines/ci-typespec-java.yaml b/eng/pipelines/ci-typespec-java.yaml
@@ -26,7 +26,7 @@ pr:
 jobs:
   - job: Build
 
-    timeoutInMinutes: 30
+    timeoutInMinutes: 60
 
     variables:
       - template: /eng/pipelines/variables/globals.yml
@@ -70,7 +70,7 @@ jobs:
       #     [ -z "`git status --porcelain -- :!package-lock.json`" ]
       #   displayName: 'Check no Diff'
 
-      - task: Maven@3
+      - task: Maven@4
         displayName: 'Verify Test Code'
         inputs:
           mavenPomFile: 'typespec-tests/pom.xml'
@@ -87,7 +87,7 @@ jobs:
         displayName: 'Start Spector Test Server'
         workingDirectory: ./typespec-tests
 
-      - task: Maven@3
+      - task: Maven@4
         displayName: 'Run TypeSpec Tests'
         inputs:
           mavenPomFile: pom.xml
diff --git a/eng/pipelines/ci.yaml b/eng/pipelines/ci.yaml
@@ -50,7 +50,7 @@ jobs:
         parameters:
           JobType: 'Autorest'
 
-      - task: Maven@3
+      - task: Maven@4
         displayName: 'Build and Package'
         inputs:
           mavenPomFile: pom.xml
@@ -86,7 +86,7 @@ jobs:
           npm run testserver-run &
         displayName: 'Start Testserver'
 
-      - task: Maven@3
+      - task: Maven@4
         displayName: 'Run Vanilla Tests'
         inputs:
           mavenPomFile: pom.xml
@@ -105,7 +105,7 @@ jobs:
           searchFolder: '$(System.DefaultWorkingDirectory)/vanilla-tests/'
         condition: always()
 
-      - task: Maven@3
+      - task: Maven@4
         displayName: 'Run Azure Tests'
         inputs:
           mavenPomFile: pom.xml
@@ -124,7 +124,7 @@ jobs:
           searchFolder: '$(System.DefaultWorkingDirectory)/azure-tests/'
         condition: always()
 
-      - task: Maven@3
+      - task: Maven@4
         displayName: 'Run Protocol Tests'
         inputs:
           mavenPomFile: pom.xml
@@ -153,7 +153,7 @@ jobs:
           cat coverage/report-dpg.json || true
         displayName: 'Display Coverage Data'
 
-      - task: Maven@3
+      - task: Maven@4
         displayName: 'Verify Javadoc of Protocol Tests'
         inputs:
           mavenPomFile: protocol-tests/pom.xml
@@ -165,7 +165,7 @@ jobs:
           jdkArchitectureOption: 'x64'
           publishJUnitResults: false
 
-      - task: Maven@3
+      - task: Maven@4
         displayName: 'Run Protocol Resilience Tests'
         inputs:
           mavenPomFile: protocol-resilience-test/pom.xml
diff --git a/eng/pipelines/fluent_integration.yaml b/eng/pipelines/fluent_integration.yaml
@@ -48,7 +48,7 @@ jobs:
     parameters:
       JobType: 'Fluent Integration'
 
-  - task: Maven@3
+  - task: Maven@4
     displayName: 'Build and Package'
     inputs:
       mavenPomFile: pom.xml
@@ -67,7 +67,7 @@ jobs:
       filePath: fluent-tests/Initialize-Tests.ps1
       workingDirectory: ./fluent-tests
 
-  - task: Maven@3
+  - task: Maven@4
     displayName: 'Run Tests'
     inputs:
       mavenPomFile: 'pom.xml'
diff --git a/eng/pipelines/publish-autorest-java.yaml b/eng/pipelines/publish-autorest-java.yaml
@@ -40,7 +40,7 @@ extends:
                 parameters:
                   JobType: 'Publish Autorest'
 
-              - task: Maven@3
+              - task: Maven@4
                 displayName: 'Build JAR'
                 inputs:
                   mavenPomFile: pom.xml
diff --git a/eng/scripts/Build-Packages.ps1 b/eng/scripts/Build-Packages.ps1
@@ -26,7 +26,7 @@ $packagesPath = New-Item -ItemType Directory -Force -Path $packagesPath | Select
 
 Push-Location $RepoRoot
 try {
-  invoke "pwsh Build-TypeSpec.ps1"
+  & ./Build-TypeSpec.ps1
 
   Push-Location "./typespec-extension"
   try {
diff --git a/readme.md b/readme.md
@@ -383,7 +383,7 @@ Before building Maven project and packaging NPM package, the script does 3 thing
 
 If you do not plan to modify these patched files in your PR, you can use "assume-unchanged" to ignore the changes on these files:
 ```
-git update-index --assume-unchanged packages/http-client-java/emitter/src/code-model-builder.ts packages/http-client-java/emitter/src/lib.ts packages/http-client-java/generator/http-client-generator-core/pom.xml packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/postprocessor/Postprocessor.java packages/http-client-java/generator/http-client-generator/src/main/resources/readme/pom.xml
+git update-index --assume-unchanged packages/http-client-java/generator/http-client-generator-core/pom.xml packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/postprocessor/Postprocessor.java packages/http-client-java/generator/http-client-generator/src/main/resources/readme/pom.xml
 ```
 "no-assume-unchanged" would unset the files marked by "assume-unchanged".
 
diff --git a/typespec-extension/package-lock.json b/typespec-extension/package-lock.json
diff --git a/typespec-extension/package.json b/typespec-extension/package.json
@@ -81,6 +81,9 @@
     "@typespec/rest": "0.66.0",
     "@typespec/versioning": "0.66.0",
     "@typespec/xml": "0.66.0",
+    "@typespec/events": "0.66.0",
+    "@typespec/sse": "0.66.0",
+    "@typespec/streams": "0.66.0",
     "@vitest/coverage-v8": "^3.0.8",
     "@vitest/ui": "^3.0.8",
     "c8": "~10.1.3",
diff --git a/typespec-extension/src/options.ts b/typespec-extension/src/options.ts
diff --git a/typespec-tests/Generate.ps1 b/typespec-tests/Generate.ps1
diff --git a/typespec-tests/package.json b/typespec-tests/package.json
diff --git a/typespec-tests/tsp/enum.tsp b/typespec-tests/tsp/enum.tsp
