Skip to content

Commit 1ce6d70

Browse files
tsp, separate EmitterOptions for Azure emitter and unbranded emitter (#3042)
* 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
1 parent 2a94759 commit 1ce6d70

18 files changed

+187
-51
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ typespec-tests/package-lock.json
106106
/typespec-tests/src/main/resources/META-INF/*apiview_properties.json
107107

108108
# typespec-extension
109-
/typespec-extension/src
109+
/typespec-extension/src/*
110+
!/typespec-extension/src/options.ts
110111
/typespec-extension/test
111112
/typespec-extension/generator

Build-TypeSpec.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Write-Host "Copy JAR and TypeSpec code to './typespec-extension' directory"
2222
New-Item -ItemType File -Path ./typespec-extension/generator/http-client-generator/target/emitter.jar -Force
2323
Copy-Item ./core/packages/http-client-java/generator/http-client-generator/target/emitter.jar ./typespec-extension/generator/http-client-generator/target/emitter.jar -Force
2424
# Copy TypeScript code
25-
Copy-Item -Path ./core/packages/http-client-java/emitter/src -Destination ./typespec-extension/ -Recurse -Force
25+
Copy-Item -Path ./core/packages/http-client-java/emitter/src -Destination ./typespec-extension/ -Exclude "options.ts" -Recurse -Force
2626
Copy-Item -Path ./core/packages/http-client-java/emitter/test -Destination ./typespec-extension/ -Recurse -Force
2727

2828
Write-Host "Build and Pack typespec-java"

Generate-TypeSpec.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ function invokeExpressionAndCaptureOutput([string]$expression) {
2626
Write-Host $output
2727
}
2828

29-
pwsh ./Build-TypeSpec.ps1
29+
& ./Build-TypeSpec.ps1
3030

3131
Write-Host "Installing TypeSpec ('npm install -g @typespec/compiler')"
3232
invokeExpressionAndCaptureOutput("npm install -g @typespec/compiler")
@@ -36,7 +36,7 @@ Push-Location ./typespec-tests
3636

3737
try {
3838
Write-Host "Generating code ('Generate.ps1' in './typespec-tests')"
39-
pwsh ./Generate.ps1 -Parallelization $Parallelization
39+
& ./Generate.ps1 -Parallelization $Parallelization
4040

4141
# Write-Host "Checking format of generated code ('npm run check-format')"
4242
# invokeExpressionAndCaptureOutput("npm run check-format")

core

Submodule core updated 653 files

core.diff

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,5 @@
1-
diff --git a/packages/http-client-java/emitter/src/lib.ts b/packages/http-client-java/emitter/src/lib.ts
2-
index 2d9134c3d..c9ef91f87 100644
3-
--- a/packages/http-client-java/emitter/src/lib.ts
4-
+++ b/packages/http-client-java/emitter/src/lib.ts
5-
@@ -1,6 +1,6 @@
6-
import { createTypeSpecLibrary, JSONSchemaType, paramMessage } from "@typespec/compiler";
7-
8-
-export const LIB_NAME = "@typespec/http-client-java";
9-
+export const LIB_NAME = "@azure-tools/typespec-java";
10-
11-
export interface DevOptions {
12-
"generate-code-model"?: boolean;
131
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
14-
index ce40ac91d..c3ee24c92 100644
2+
index b4139191e..d1b75d5ae 100644
153
--- a/packages/http-client-java/generator/http-client-generator-core/pom.xml
164
+++ b/packages/http-client-java/generator/http-client-generator-core/pom.xml
175
@@ -21,6 +21,11 @@
@@ -27,7 +15,7 @@ index ce40ac91d..c3ee24c92 100644
2715
<groupId>com.azure</groupId>
2816
<artifactId>azure-core</artifactId>
2917
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
30-
index d44ce8ec4..7953870bc 100644
18+
index 4aad12e27..67e5f7ef1 100644
3119
--- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/postprocessor/Postprocessor.java
3220
+++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/postprocessor/Postprocessor.java
3321
@@ -3,9 +3,9 @@

eng/pipelines/ci-typespec-java-dev-nightly.yaml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ pr: none
1212
jobs:
1313
- job: Build
1414

15-
timeoutInMinutes: 30
15+
timeoutInMinutes: 60
1616

1717
variables:
1818
- template: /eng/pipelines/variables/globals.yml
@@ -25,14 +25,6 @@ jobs:
2525
- checkout: self
2626
submodules: true
2727

28-
- task: PowerShell@2
29-
displayName: 'Disable Warning on Deprecation'
30-
inputs:
31-
targetType: inline
32-
script: >
33-
(Get-Content '.eslintrc.cjs') -replace '(?<="deprecation/deprecation": ")[^"]*', 'off' | Set-Content '.eslintrc.cjs'
34-
workingDirectory: ./typespec-extension
35-
3628
- task: NodeTool@0
3729
displayName: 'Install Node.js $(NodeVersion)'
3830
inputs:
@@ -91,7 +83,7 @@ jobs:
9183
displayName: 'Start Spector Test Server'
9284
workingDirectory: ./typespec-tests
9385
94-
- task: Maven@3
86+
- task: Maven@4
9587
displayName: 'Run TypeSpec Tests'
9688
inputs:
9789
mavenPomFile: pom.xml

eng/pipelines/ci-typespec-java.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ pr:
2626
jobs:
2727
- job: Build
2828

29-
timeoutInMinutes: 30
29+
timeoutInMinutes: 60
3030

3131
variables:
3232
- template: /eng/pipelines/variables/globals.yml
@@ -70,7 +70,7 @@ jobs:
7070
# [ -z "`git status --porcelain -- :!package-lock.json`" ]
7171
# displayName: 'Check no Diff'
7272

73-
- task: Maven@3
73+
- task: Maven@4
7474
displayName: 'Verify Test Code'
7575
inputs:
7676
mavenPomFile: 'typespec-tests/pom.xml'
@@ -87,7 +87,7 @@ jobs:
8787
displayName: 'Start Spector Test Server'
8888
workingDirectory: ./typespec-tests
8989
90-
- task: Maven@3
90+
- task: Maven@4
9191
displayName: 'Run TypeSpec Tests'
9292
inputs:
9393
mavenPomFile: pom.xml

eng/pipelines/ci.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
parameters:
5151
JobType: 'Autorest'
5252

53-
- task: Maven@3
53+
- task: Maven@4
5454
displayName: 'Build and Package'
5555
inputs:
5656
mavenPomFile: pom.xml
@@ -86,7 +86,7 @@ jobs:
8686
npm run testserver-run &
8787
displayName: 'Start Testserver'
8888
89-
- task: Maven@3
89+
- task: Maven@4
9090
displayName: 'Run Vanilla Tests'
9191
inputs:
9292
mavenPomFile: pom.xml
@@ -105,7 +105,7 @@ jobs:
105105
searchFolder: '$(System.DefaultWorkingDirectory)/vanilla-tests/'
106106
condition: always()
107107

108-
- task: Maven@3
108+
- task: Maven@4
109109
displayName: 'Run Azure Tests'
110110
inputs:
111111
mavenPomFile: pom.xml
@@ -124,7 +124,7 @@ jobs:
124124
searchFolder: '$(System.DefaultWorkingDirectory)/azure-tests/'
125125
condition: always()
126126

127-
- task: Maven@3
127+
- task: Maven@4
128128
displayName: 'Run Protocol Tests'
129129
inputs:
130130
mavenPomFile: pom.xml
@@ -153,7 +153,7 @@ jobs:
153153
cat coverage/report-dpg.json || true
154154
displayName: 'Display Coverage Data'
155155
156-
- task: Maven@3
156+
- task: Maven@4
157157
displayName: 'Verify Javadoc of Protocol Tests'
158158
inputs:
159159
mavenPomFile: protocol-tests/pom.xml
@@ -165,7 +165,7 @@ jobs:
165165
jdkArchitectureOption: 'x64'
166166
publishJUnitResults: false
167167

168-
- task: Maven@3
168+
- task: Maven@4
169169
displayName: 'Run Protocol Resilience Tests'
170170
inputs:
171171
mavenPomFile: protocol-resilience-test/pom.xml

eng/pipelines/fluent_integration.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
parameters:
4949
JobType: 'Fluent Integration'
5050

51-
- task: Maven@3
51+
- task: Maven@4
5252
displayName: 'Build and Package'
5353
inputs:
5454
mavenPomFile: pom.xml
@@ -67,7 +67,7 @@ jobs:
6767
filePath: fluent-tests/Initialize-Tests.ps1
6868
workingDirectory: ./fluent-tests
6969

70-
- task: Maven@3
70+
- task: Maven@4
7171
displayName: 'Run Tests'
7272
inputs:
7373
mavenPomFile: 'pom.xml'

eng/pipelines/publish-autorest-java.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ extends:
4040
parameters:
4141
JobType: 'Publish Autorest'
4242

43-
- task: Maven@3
43+
- task: Maven@4
4444
displayName: 'Build JAR'
4545
inputs:
4646
mavenPomFile: pom.xml

0 commit comments

Comments
 (0)