Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 9 commits into from
Nov 16, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4987582
Update the array items fix
MaryGao Nov 13, 2023
066f735
Update the test cases
MaryGao Nov 13, 2023
37b796f
update the cases
MaryGao Nov 13, 2023
c213da9
Merge branch 'main' into fix-array-issue
MaryGao Nov 16, 2023
a147ade
Revert changes
MaryGao Nov 16, 2023
360231e
Update the test cases and fix empty array default issue
MaryGao Nov 16, 2023
3270e15
Re-generate the smoke and integrations
MaryGao Nov 16, 2023
3b80278
Fix linter issues
MaryGao Nov 16, 2023
5ba6b9b
Fix the UT cases
MaryGao Nov 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15,967 changes: 8,727 additions & 7,240 deletions packages/typespec-test/test/batch_modular/generated/typespec-ts/src/api/operations.ts
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions packages/typespec-test/test/chatApi_modular/generated/typespec-ts/src/api/operations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
Expand Down Expand Up @@ -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"],
Expand Down
36 changes: 19 additions & 17 deletions ...ages/typespec-test/test/contentsafety_modular/generated/typespec-ts/src/api/operations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
})),
Expand Down Expand Up @@ -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"],
})),
Expand Down Expand Up @@ -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"],
})),
Expand Down Expand Up @@ -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"],
})),
Expand All @@ -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"],
})),
};
}

Expand Down Expand Up @@ -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"],
Expand Down
8 changes: 4 additions & 4 deletions packages/typespec-test/test/eventgrid_modular/generated/typespec-ts/src/api/operations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
Expand Down Expand Up @@ -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"],
Expand Down Expand Up @@ -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"],
Expand Down Expand Up @@ -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"],
Expand Down
68 changes: 36 additions & 32 deletions ...st/loadtesting_modular/generated/typespec-ts/src/loadTestAdministration/api/operations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
Expand Down Expand Up @@ -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"],
Expand Down Expand Up @@ -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"],
Expand Down Expand Up @@ -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"] },
Expand Down Expand Up @@ -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"],
Expand Down
Loading
Loading