upgrade to typespec 0.63 and typespec azure 0.49 (#1481)

Azure · Dec 18, 2024 · 147df49 · 147df49
1 parent 09c7c34
commit 147df49
Show file tree

Hide file tree

Showing 15 changed files with 216 additions and 205 deletions.
diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
diff --git a/packages/typespec-go/package.json b/packages/typespec-go/package.json
@@ -46,33 +46,33 @@
   "homepage": "https://github.com/Azure/autorest.go#readme",
   "readme": "https://github.com/Azure/autorest.go/blob/main/readme.md",
   "devDependencies": {
-    "@azure-tools/cadl-ranch": "~0.16.1",
-    "@azure-tools/cadl-ranch-expect": "~0.15.6",
-    "@azure-tools/cadl-ranch-specs": "0.39.1",
-    "@azure-tools/typespec-autorest": ">=0.48.0 <1.0.0",
-    "@azure-tools/typespec-azure-core": ">=0.48.0 <1.0.0",
-    "@azure-tools/typespec-azure-resource-manager": ">=0.48.0 <1.0.0",
-    "@azure-tools/typespec-client-generator-core": ">=0.48.6 <1.0.0",
+    "@azure-tools/cadl-ranch": "~0.16.2",
+    "@azure-tools/cadl-ranch-expect": "~0.15.7",
+    "@azure-tools/cadl-ranch-specs": "0.39.6",
+    "@azure-tools/typespec-autorest": ">=0.49.0 <1.0.0",
+    "@azure-tools/typespec-azure-core": ">=0.49.0 <1.0.0",
+    "@azure-tools/typespec-azure-resource-manager": ">=0.49.0 <1.0.0",
+    "@azure-tools/typespec-client-generator-core": ">=0.49.0 <1.0.0",
     "@types/js-yaml": "~4.0.6",
     "@types/node": "^18.16.3",
     "@typescript-eslint/eslint-plugin": "~4.1.1",
     "@typescript-eslint/parser": "~4.1.1",
-    "@typespec/compiler": ">=0.62.0 <1.0.0",
-    "@typespec/http": ">=0.62.0 <1.0.0",
-    "@typespec/openapi": ">=0.62.0 <1.0.0",
-    "@typespec/rest": ">=0.62.0 <1.0.0",
-    "@typespec/versioning": ">=0.62.0 <1.0.0",
-    "@typespec/xml": ">=0.62.0 <1.0.0",
+    "@typespec/compiler": ">=0.63.0 <1.0.0",
+    "@typespec/http": ">=0.63.0 <1.0.0",
+    "@typespec/openapi": ">=0.63.0 <1.0.0",
+    "@typespec/rest": ">=0.63.0 <1.0.0",
+    "@typespec/versioning": ">=0.63.0 <1.0.0",
+    "@typespec/xml": ">=0.63.0 <1.0.0",
     "@types/jest": "~26.0.24",
     "eslint": "~6.6.0",
     "jest": "~27.0.6",
     "ts-jest": "~27.0.4",
     "typescript": "~5.1.3"
   },
   "peerDependencies": {
-    "@azure-tools/typespec-client-generator-core": ">=0.48.6 <1.0.0",
-    "@typespec/compiler": ">=0.62.0 <1.0.0",
-    "@typespec/http": ">=0.62.0 <1.0.0"
+    "@azure-tools/typespec-client-generator-core": ">=0.49.0 <1.0.0",
+    "@typespec/compiler": ">=0.63.0 <1.0.0",
+    "@typespec/http": ">=0.63.0 <1.0.0"
   },
   "dependencies": {
     "@azure-tools/codegen": "~2.9.2",

diff --git a/packages/typespec-go/src/tcgcadapter/clients.ts b/packages/typespec-go/src/tcgcadapter/clients.ts
@@ -295,7 +295,7 @@ export class clientAdapter {
     }
 
     // stuff all of the operation parameters into one array for easy traversal
-    type OperationParamType = tcgc.SdkBodyParameter | tcgc.SdkHeaderParameter | tcgc.SdkPathParameter | tcgc.SdkQueryParameter;
+    type OperationParamType = tcgc.SdkBodyParameter | tcgc.SdkHeaderParameter | tcgc.SdkPathParameter | tcgc.SdkQueryParameter | tcgc.SdkCookieParameter;
     const allOpParams = new Array<OperationParamType>();
     allOpParams.push(...sdkMethod.operation.parameters);
     if (sdkMethod.operation.bodyParam) {
@@ -434,7 +434,7 @@ export class clientAdapter {
     return contentType;
   }
 
-  private adaptMethodParameter(param: tcgc.SdkBodyParameter | tcgc.SdkHeaderParameter | tcgc.SdkPathParameter | tcgc.SdkQueryParameter, optionalGroup?: go.ParameterGroup): go.Parameter {
+  private adaptMethodParameter(param: tcgc.SdkBodyParameter | tcgc.SdkHeaderParameter | tcgc.SdkPathParameter | tcgc.SdkQueryParameter | tcgc.SdkCookieParameter, optionalGroup?: go.ParameterGroup): go.Parameter {
     if (param.isApiVersionParam && param.clientDefaultValue) {
       // we emit the api version param inline as a literal, never as a param.
       // the ClientOptions.APIVersion setting is used to change the version.
@@ -452,7 +452,7 @@ export class clientAdapter {
     }
 
     let location: go.ParameterLocation = 'method';
-    const getClientParamsKey = function (param: tcgc.SdkBodyParameter | tcgc.SdkHeaderParameter | tcgc.SdkPathParameter | tcgc.SdkQueryParameter): string {
+    const getClientParamsKey = function (param: tcgc.SdkBodyParameter | tcgc.SdkHeaderParameter | tcgc.SdkPathParameter | tcgc.SdkQueryParameter | tcgc.SdkCookieParameter): string {
       // include the param kind in the key name as a client param can be used
       // in different places across methods (path/query)
       return `${param.name}-${param.kind}`;
@@ -500,6 +500,9 @@ export class clientAdapter {
       }
     } else if (param.kind === 'path') {
       adaptedParam = new go.PathParameter(paramName, param.serializedName, !param.allowReserved, this.adaptPathParameterType(param.type), paramKind, byVal, location);
+    } else if (param.kind === 'cookie') {
+      // TODO: currently we don't have Azure service using cookie parameter. need to add support if needed in the future.
+      throw new Error('could not support cookie parameter');
     } else {
       if (param.collectionFormat) {
         const type = this.ta.getPossibleType(param.type, true, false);
@@ -693,7 +696,7 @@ export class clientAdapter {
     return type;
   }
 
-  private adaptParameterKind(param: tcgc.SdkBodyParameter | tcgc.SdkEndpointParameter | tcgc.SdkHeaderParameter | tcgc.SdkMethodParameter | tcgc.SdkPathParameter | tcgc.SdkQueryParameter): go.ParameterKind {
+  private adaptParameterKind(param: tcgc.SdkBodyParameter | tcgc.SdkEndpointParameter | tcgc.SdkHeaderParameter | tcgc.SdkMethodParameter | tcgc.SdkPathParameter | tcgc.SdkQueryParameter | tcgc.SdkCookieParameter): go.ParameterKind {
     // NOTE: must check for constant type first as it will also set clientDefaultValue
     if (param.type.kind === 'constant') {
       if (param.optional) {

diff --git a/packages/typespec-go/test/armapicenter/zz_models.go b/packages/typespec-go/test/armapicenter/zz_models.go
diff --git a/packages/typespec-go/test/armcodesigning/zz_models.go b/packages/typespec-go/test/armcodesigning/zz_models.go
diff --git a/packages/typespec-go/test/armcommunitymanagement/zz_models.go b/packages/typespec-go/test/armcommunitymanagement/zz_models.go
diff --git a/packages/typespec-go/test/armcontainerorchestratorruntime/zz_models.go b/packages/typespec-go/test/armcontainerorchestratorruntime/zz_models.go
diff --git a/packages/typespec-go/test/armdatabasewatcher/zz_models.go b/packages/typespec-go/test/armdatabasewatcher/zz_models.go
diff --git a/packages/typespec-go/test/armdevopsinfrastructure/zz_models.go b/packages/typespec-go/test/armdevopsinfrastructure/zz_models.go
diff --git a/packages/typespec-go/test/armlargeinstance/zz_models.go b/packages/typespec-go/test/armlargeinstance/zz_models.go
diff --git a/packages/typespec-go/test/armlargeinstance/zz_models_serde.go b/packages/typespec-go/test/armlargeinstance/zz_models_serde.go
diff --git a/packages/typespec-go/test/armloadtestservice/zz_models.go b/packages/typespec-go/test/armloadtestservice/zz_models.go
diff --git a/packages/typespec-go/test/armmongocluster/zz_models.go b/packages/typespec-go/test/armmongocluster/zz_models.go
diff --git a/packages/typespec-go/test/tsp/KeyVault.Keys/models.tsp b/packages/typespec-go/test/tsp/KeyVault.Keys/models.tsp
@@ -765,7 +765,7 @@ model KeyListResult {
   /**
    * The URL to get the next set of keys.
    */
-  @Azure.Core.nextLink
+  @nextLink
   @visibility("read")
   nextLink?: string;
 }
@@ -1007,7 +1007,7 @@ model DeletedKeyListResult {
   /**
    * The URL to get the next set of deleted keys.
    */
-  @Azure.Core.nextLink
+  @nextLink
   @visibility("read")
   nextLink?: string;
 }

diff --git a/packages/typespec-go/test/tsp/Random.Management/main.tsp b/packages/typespec-go/test/tsp/Random.Management/main.tsp
@@ -46,7 +46,7 @@ model ThingsListResult {
   value: FakeData[];
 
   @doc("The link to the next page of items")
-  @Azure.Core.nextLink
+  @nextLink
   nextLink?: string;
 
   @doc("More fake things")