Update the cadl-ranch version to latest part 1 (#1907)

* Update the cadl-ranch version to latest * refresh the int test code * Update encode datetime test cases * update helper func * revert format change * update the codegen * Enable body paramter test cases * Add repeatable headers
Azure · Jun 30, 2023 · 2ba36ef · 2ba36ef
1 parent efb25ef
commit 2ba36ef
Show file tree

Hide file tree

Showing 72 changed files with 1,696 additions and 392 deletions.
diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
diff --git a/packages/autorest.typescript/src/restLevelClient/transforms/transformParameterTypes.ts b/packages/autorest.typescript/src/restLevelClient/transforms/transformParameterTypes.ts
@@ -242,7 +242,7 @@ function getParameterSchema(
       typeName: schema.name
     };
   }
-  if (type === "Array<string>") {
+  if (type === "Array<string>" || type === "Array<number>") {
     const serializeInfo = getSpecialSerializeInfo(parameter);
     if (serializeInfo.hasMultiCollection || serializeInfo.hasPipeCollection || serializeInfo.hasSsvCollection || serializeInfo.hasTsvCollection) {
       type = "string";

diff --git a/packages/autorest.typescript/test/rlcIntegration/generated/urlRest/src/serializeHelper.ts b/packages/autorest.typescript/test/rlcIntegration/generated/urlRest/src/serializeHelper.ts
@@ -1,14 +1,14 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-export function buildPipeCollection(items: string[]): string {
+export function buildPipeCollection(items: string[] | number[]): string {
   return items.join("|");
 }
 
-export function buildSsvCollection(items: string[]): string {
+export function buildSsvCollection(items: string[] | number[]): string {
   return items.join(" ");
 }
 
-export function buildTsvCollection(items: string[]) {
+export function buildTsvCollection(items: string[] | number[]) {
   return items.join("\t");
 }
diff --git a/...ript/test/smoke/generated/agrifood-data-plane/review/agrifood-data-plane.api.md b/...ript/test/smoke/generated/agrifood-data-plane/review/agrifood-data-plane.api.md
@@ -3713,7 +3713,7 @@ export interface ScenesListQueryParamProperties {
     farmerId: string;
     imageFormats?: string;
     imageNames?: string;
-    imageResolutions?: Array<number>;
+    imageResolutions?: string;
     maxCloudCoveragePercentage?: number;
     maxDarkPixelCoveragePercentage?: number;
     provider: string;
@@ -4206,7 +4206,7 @@ export interface SeasonsListQueryParamProperties {
     names?: string;
     propertyFilters?: string;
     statuses?: string;
-    years?: Array<number>;
+    years?: string;
 }
 
 // @public

diff --git a/packages/autorest.typescript/test/smoke/generated/agrifood-data-plane/src/parameters.ts b/packages/autorest.typescript/test/smoke/generated/agrifood-data-plane/src/parameters.ts
@@ -1374,8 +1374,8 @@ export interface ScenesListQueryParamProperties {
   maxDarkPixelCoveragePercentage?: number;
   /** List of image names to be filtered. This parameter needs to be formatted as multi collection, we provide buildMultiCollection from serializeHelper.ts to help, you will probably need to set skipUrlEncoding as true when sending the request */
   imageNames?: string;
-  /** List of image resolutions in meters to be filtered. */
-  imageResolutions?: Array<number>;
+  /** List of image resolutions in meters to be filtered. This parameter needs to be formatted as multi collection, we provide buildMultiCollection from serializeHelper.ts to help, you will probably need to set skipUrlEncoding as true when sending the request */
+  imageResolutions?: string;
   /** List of image formats to be filtered. This parameter needs to be formatted as multi collection, we provide buildMultiCollection from serializeHelper.ts to help, you will probably need to set skipUrlEncoding as true when sending the request */
   imageFormats?: string;
   /**
@@ -1586,8 +1586,8 @@ export interface SeasonsListQueryParamProperties {
   minEndDateTime?: Date | string;
   /** Maximum season end datetime, sample format: yyyy-MM-ddTHH:mm:ssZ. */
   maxEndDateTime?: Date | string;
-  /** Years of the resource. */
-  years?: Array<number>;
+  /** Years of the resource. This parameter needs to be formatted as multi collection, we provide buildMultiCollection from serializeHelper.ts to help, you will probably need to set skipUrlEncoding as true when sending the request */
+  years?: string;
   /** Ids of the resource. This parameter needs to be formatted as multi collection, we provide buildMultiCollection from serializeHelper.ts to help, you will probably need to set skipUrlEncoding as true when sending the request */
   ids?: string;
   /** Names of the resource. This parameter needs to be formatted as multi collection, we provide buildMultiCollection from serializeHelper.ts to help, you will probably need to set skipUrlEncoding as true when sending the request */

diff --git a/packages/rlc-common/src/static/serializeHelper.ts b/packages/rlc-common/src/static/serializeHelper.ts
@@ -14,21 +14,21 @@ export function buildMultiCollection(
 }`;
 
 export const buildPipeCollectionContent = `
-export function buildPipeCollection(items: string[]): string {
+export function buildPipeCollection(items: string[] | number[]): string {
   return items.join("|");
 }`;
 
 export const buildSsvCollectionContent = `
-export function buildSsvCollection(items: string[]): string {
+export function buildSsvCollection(items: string[] | number[]): string {
   return items.join(" ");
 }`;
 
 export const buildTsvCollectionContent = `
-export function buildTsvCollection(items: string[]) {
+export function buildTsvCollection(items: string[] | number[]) {
   return items.join("\\t");
 }`;
 
 export const buildCsvCollectionContent = `
-export function buildCsvCollection(items: string[]) {
+export function buildCsvCollection(items: string[] | number[]) {
   return items.join(",");
 }`;
diff --git a/packages/typespec-ts/package.json b/packages/typespec-ts/package.json
@@ -41,9 +41,9 @@
     "ts-node": "^10.9.1",
     "typescript": "~5.0.0",
     "prettier": "~2.7.1",
-    "@azure-tools/cadl-ranch-specs": "^0.15.4",
-    "@azure-tools/cadl-ranch-expect": "^0.3.2",
-    "@azure-tools/cadl-ranch": "^0.4.17",
+    "@azure-tools/cadl-ranch-specs": "^0.16.2",
+    "@azure-tools/cadl-ranch-expect": "^0.4.0",
+    "@azure-tools/cadl-ranch": "^0.5.1",
     "chalk": "^4.0.0",
     "@azure-rest/core-client": "^1.1.3",
     "@azure/core-auth": "^1.3.2",

diff --git a/packages/typespec-ts/src/transform/transformParameters.ts b/packages/typespec-ts/src/transform/transformParameters.ts
@@ -146,7 +146,12 @@ function getParameterMetadata(
   const name = getParameterName(parameter.name);
   let description =
     getFormattedPropertyDoc(program, parameter.param, schema) ?? "";
-  if (type === "string[]" || type === "Array<string>") {
+  if (
+    type === "string[]" ||
+    type === "Array<string>" ||
+    type === "number[]" ||
+    type === "Array<number>"
+  ) {
     const serializeInfo = getSpecialSerializeInfo(parameter);
     if (
       serializeInfo.hasMultiCollection ||

diff --git a/packages/typespec-ts/test/commands/cadl-ranch-list.ts b/packages/typespec-ts/test/commands/cadl-ranch-list.ts
@@ -6,9 +6,21 @@ export interface CadlRanchConfig {
 
 export const cadls: CadlRanchConfig[] = [
   {
-    outputPath: "encode",
+    outputPath: "headers/repeatability",
+    inputPath: "special-headers/repeatability"
+  },
+  {
+    outputPath: "parameters/body-optionality",
+    inputPath: "parameters/body-optionality"
+  },
+  {
+    outputPath: "encode/duration",
     inputPath: "encode/duration"
   },
+  {
+    outputPath: "encode/datetime",
+    inputPath: "encode/datetime"
+  },
   {
     outputPath: "sharedRoute",
     inputPath: "shared-route"
@@ -55,7 +67,7 @@ export const cadls: CadlRanchConfig[] = [
   },
   {
     outputPath: "lro/lroRPC",
-    inputPath: "azure/core/lro/rpc"
+    inputPath: "azure/core/lro/rpc/legacy"
   },
   {
     outputPath: "models/inheritance",