Fix the empty default value issue for array in body model (#2111)

* Update the array items fix * Update the test cases * update the cases * Revert changes * Update the test cases and fix empty array default issue * Re-generate the smoke and integrations * Fix linter issues * Fix the UT cases
Azure · Nov 16, 2023 · b0561b6 · b0561b6
1 parent 7d39ff5
commit b0561b6
Show file tree

Hide file tree

Showing 40 changed files with 9,799 additions and 7,837 deletions.
diff --git a/packages/typespec-test/test/batch_modular/generated/typespec-ts/src/api/operations.ts b/packages/typespec-test/test/batch_modular/generated/typespec-ts/src/api/operations.ts
diff --git a/packages/typespec-test/test/chatApi_modular/generated/typespec-ts/src/api/operations.ts b/packages/typespec-test/test/chatApi_modular/generated/typespec-ts/src/api/operations.ts
@@ -44,7 +44,7 @@ export async function _createStreamingDeserialize(
   }
 
   return {
-    choices: (result.body["choices"] ?? []).map((p) => ({
+    choices: result.body["choices"].map((p) => ({
       index: p["index"],
       delta: {
         content: p.delta["content"],
@@ -94,7 +94,7 @@ export async function _createDeserialize(
   }
 
   return {
-    choices: (result.body["choices"] ?? []).map((p) => ({
+    choices: result.body["choices"].map((p) => ({
       index: p["index"],
       message: p.message as any,
       sessionState: p["session_state"],

diff --git a/...ages/typespec-test/test/contentsafety_modular/generated/typespec-ts/src/api/operations.ts b/...ages/typespec-test/test/contentsafety_modular/generated/typespec-ts/src/api/operations.ts
@@ -84,14 +84,14 @@ export async function _analyzeTextDeserialize(
   }
 
   return {
-    blocklistsMatchResults: (result.body["blocklistsMatchResults"] ?? []).map(
-      (p) => ({
-        blocklistName: p["blocklistName"],
-        blockItemId: p["blockItemId"],
-        blockItemText: p["blockItemText"],
-      })
-    ),
-    analyzeResults: (result.body["analyzeResults"] ?? []).map((p) => ({
+    blocklistsMatchResults: !result.body["blocklistsMatchResults"]
+      ? result.body["blocklistsMatchResults"]
+      : result.body["blocklistsMatchResults"].map((p) => ({
+          blocklistName: p["blocklistName"],
+          blockItemId: p["blockItemId"],
+          blockItemText: p["blockItemText"],
+        })),
+    analyzeResults: result.body["analyzeResults"].map((p) => ({
       category: p["category"],
       severity: p["severity"],
     })),
@@ -139,7 +139,7 @@ export async function _analyzeImageDeserialize(
   }
 
   return {
-    analyzeResults: (result.body["analyzeResults"] ?? []).map((p) => ({
+    analyzeResults: result.body["analyzeResults"].map((p) => ({
       category: p["category"],
       severity: p["severity"],
     })),
@@ -298,7 +298,7 @@ export async function _listTextBlocklistsDeserialize(
   }
 
   return {
-    value: (result.body["value"] ?? []).map((p) => ({
+    value: result.body["value"].map((p) => ({
       blocklistName: p["blocklistName"],
       description: p["description"],
     })),
@@ -331,7 +331,7 @@ export function _addOrUpdateBlockItemsSend(
     .post({
       ...operationOptionsToRequestParameters(options),
       body: {
-        blockItems: (body["blockItems"] ?? []).map((p) => ({
+        blockItems: body["blockItems"].map((p) => ({
           description: p["description"],
           text: p["text"],
         })),
@@ -349,11 +349,13 @@ export async function _addOrUpdateBlockItemsDeserialize(
   }
 
   return {
-    value: (result.body["value"] ?? []).map((p) => ({
-      blockItemId: p["blockItemId"],
-      description: p["description"],
-      text: p["text"],
-    })),
+    value: !result.body["value"]
+      ? result.body["value"]
+      : result.body["value"].map((p) => ({
+          blockItemId: p["blockItemId"],
+          description: p["description"],
+          text: p["text"],
+        })),
   };
 }
 
@@ -491,7 +493,7 @@ export async function _listTextBlocklistItemsDeserialize(
   }
 
   return {
-    value: (result.body["value"] ?? []).map((p) => ({
+    value: result.body["value"].map((p) => ({
       blockItemId: p["blockItemId"],
       description: p["description"],
       text: p["text"],

diff --git a/packages/typespec-test/test/eventgrid_modular/generated/typespec-ts/src/api/operations.ts b/packages/typespec-test/test/eventgrid_modular/generated/typespec-ts/src/api/operations.ts
@@ -196,7 +196,7 @@ export async function _receiveCloudEventsDeserialize(
   }
 
   return {
-    value: (result.body["value"] ?? []).map((p) => ({
+    value: result.body["value"].map((p) => ({
       brokerProperties: {
         lockToken: p.brokerProperties["lockToken"],
         deliveryCount: p.brokerProperties["deliveryCount"],
@@ -270,7 +270,7 @@ export async function _acknowledgeCloudEventsDeserialize(
   }
 
   return {
-    failedLockTokens: (result.body["failedLockTokens"] ?? []).map((p) => ({
+    failedLockTokens: result.body["failedLockTokens"].map((p) => ({
       lockToken: p["lockToken"],
       errorCode: p["errorCode"],
       errorDescription: p["errorDescription"],
@@ -328,7 +328,7 @@ export async function _releaseCloudEventsDeserialize(
   }
 
   return {
-    failedLockTokens: (result.body["failedLockTokens"] ?? []).map((p) => ({
+    failedLockTokens: result.body["failedLockTokens"].map((p) => ({
       lockToken: p["lockToken"],
       errorCode: p["errorCode"],
       errorDescription: p["errorDescription"],
@@ -386,7 +386,7 @@ export async function _rejectCloudEventsDeserialize(
   }
 
   return {
-    failedLockTokens: (result.body["failedLockTokens"] ?? []).map((p) => ({
+    failedLockTokens: result.body["failedLockTokens"].map((p) => ({
       lockToken: p["lockToken"],
       errorCode: p["errorCode"],
       errorDescription: p["errorDescription"],

diff --git a/...st/loadtesting_modular/generated/typespec-ts/src/loadTestAdministration/api/operations.ts b/...st/loadtesting_modular/generated/typespec-ts/src/loadTestAdministration/api/operations.ts
@@ -271,16 +271,18 @@ export async function _createOrUpdateTestDeserialize(
                     "validationFailureDetails"
                   ],
               },
-          additionalFileInfo: (
-            result.body.inputArtifacts?.["additionalFileInfo"] ?? []
-          ).map((p) => ({
-            url: p["url"],
-            fileName: p["fileName"],
-            fileType: p["fileType"],
-            expireDateTime: p["expireDateTime"],
-            validationStatus: p["validationStatus"],
-            validationFailureDetails: p["validationFailureDetails"],
-          })),
+          additionalFileInfo: !result.body.inputArtifacts?.[
+            "additionalFileInfo"
+          ]
+            ? result.body.inputArtifacts?.["additionalFileInfo"]
+            : result.body.inputArtifacts?.["additionalFileInfo"].map((p) => ({
+                url: p["url"],
+                fileName: p["fileName"],
+                fileType: p["fileType"],
+                expireDateTime: p["expireDateTime"],
+                validationStatus: p["validationStatus"],
+                validationFailureDetails: p["validationFailureDetails"],
+              })),
         },
     testId: result.body["testId"],
     description: result.body["description"],
@@ -660,16 +662,18 @@ export async function _getTestDeserialize(
                     "validationFailureDetails"
                   ],
               },
-          additionalFileInfo: (
-            result.body.inputArtifacts?.["additionalFileInfo"] ?? []
-          ).map((p) => ({
-            url: p["url"],
-            fileName: p["fileName"],
-            fileType: p["fileType"],
-            expireDateTime: p["expireDateTime"],
-            validationStatus: p["validationStatus"],
-            validationFailureDetails: p["validationFailureDetails"],
-          })),
+          additionalFileInfo: !result.body.inputArtifacts?.[
+            "additionalFileInfo"
+          ]
+            ? result.body.inputArtifacts?.["additionalFileInfo"]
+            : result.body.inputArtifacts?.["additionalFileInfo"].map((p) => ({
+                url: p["url"],
+                fileName: p["fileName"],
+                fileType: p["fileType"],
+                expireDateTime: p["expireDateTime"],
+                validationStatus: p["validationStatus"],
+                validationFailureDetails: p["validationFailureDetails"],
+              })),
         },
     testId: result.body["testId"],
     description: result.body["description"],
@@ -761,7 +765,7 @@ export async function _listTestFilesDeserialize(
   }
 
   return {
-    value: (result.body["value"] ?? []).map((p) => ({
+    value: result.body["value"].map((p) => ({
       url: p["url"],
       fileName: p["fileName"],
       fileType: p["fileType"],
@@ -814,7 +818,7 @@ export async function _listTestsDeserialize(
   }
 
   return {
-    value: (result.body["value"] ?? []).map((p) => ({
+    value: result.body["value"].map((p) => ({
       passFailCriteria: !p.passFailCriteria
         ? undefined
         : { passFailMetrics: p.passFailCriteria?.["passFailMetrics"] },
@@ -925,16 +929,16 @@ export async function _listTestsDeserialize(
                       "validationFailureDetails"
                     ],
                 },
-            additionalFileInfo: (
-              p.inputArtifacts?.["additionalFileInfo"] ?? []
-            ).map((p) => ({
-              url: p["url"],
-              fileName: p["fileName"],
-              fileType: p["fileType"],
-              expireDateTime: p["expireDateTime"],
-              validationStatus: p["validationStatus"],
-              validationFailureDetails: p["validationFailureDetails"],
-            })),
+            additionalFileInfo: !p.inputArtifacts?.["additionalFileInfo"]
+              ? p.inputArtifacts?.["additionalFileInfo"]
+              : p.inputArtifacts?.["additionalFileInfo"].map((p) => ({
+                  url: p["url"],
+                  fileName: p["fileName"],
+                  fileType: p["fileType"],
+                  expireDateTime: p["expireDateTime"],
+                  validationStatus: p["validationStatus"],
+                  validationFailureDetails: p["validationFailureDetails"],
+                })),
           },
       testId: p["testId"],
       description: p["description"],