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

support encode for modular #2006

Merged
merged 19 commits into from
Sep 11, 2023
Merged

support encode for modular #2006

Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
4540897
add-encode-test-case-for-modular
qiaozha Sep 4, 2023
a47b338
try fix modular encoding
qiaozha Sep 4, 2023
a34c705
resolve issues in modular bytes encoding and datetime encoding
qiaozha Sep 5, 2023
0389af5
reserve work
qiaozha Sep 5, 2023
4a5e433
reserve work
qiaozha Sep 6, 2023
3b8c6d1
works for duration and bytes
qiaozha Sep 6, 2023
c200ad5
works for datetime
qiaozha Sep 6, 2023
135b9c0
try fix ci
qiaozha Sep 7, 2023
60fec35
undo unnecessary changes
qiaozha Sep 7, 2023
2c222a5
fix integration test
qiaozha Sep 7, 2023
6f84151
fix ci
qiaozha Sep 7, 2023
3d8a2da
fix integrationgit
qiaozha Sep 7, 2023
1235e0b
merge main
qiaozha Sep 7, 2023
ed91cff
merge main
qiaozha Sep 8, 2023
06ce70c
use auto imports
qiaozha Sep 8, 2023
18a0286
datetime ut
qiaozha Sep 8, 2023
32992d1
fix ci
qiaozha Sep 8, 2023
4448009
add more ut
qiaozha Sep 11, 2023
4508ec8
add header utcDateTime default encoding ut
qiaozha Sep 11, 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
3 changes: 2 additions & 1 deletion packages/rlc-common/src/buildIndexFile.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,8 @@ function generateRLCIndex(file: SourceFile, model: RLCModel) {
hasMultiCollection(model) ||
hasSsvCollection(model) ||
hasPipeCollection(model) ||
hasTsvCollection(model)
hasTsvCollection(model) ||
hasCsvCollection(model)
) {
file.addExportDeclarations([
{
Expand Down
7 changes: 6 additions & 1 deletion ...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 @@ -325,7 +325,12 @@ export function _addOrUpdateBlockItemsSend(
)
.post({
...operationOptionsToRequestParameters(options),
body: { blockItems: blockItems },
body: {
blockItems: (blockItems ?? []).map((p) => ({
description: p["description"],
text: p["text"],
})),
},
});
}

Expand Down
5 changes: 2 additions & 3 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 @@ -63,8 +63,7 @@ export function _publishCloudEventSend(
? uint8ArrayToString(event["dataBase64"], "base64")
: undefined,
type: event["type"],
time:
event["time"] !== undefined ? new Date(event["time"]) : undefined,
time: event["time"]?.toISOString(),
Copy link
Contributor

@MaryGao MaryGao Sep 8, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I notice the typespec type here is utcDateTime but we generate to toISOString

https://github.com/Azure/autorest.typescript/blob/1235e0ba4762ac1171f5777b50eafb1b7e43a8d0/packages/typespec-test/test/eventgrid_modular/spec/main.tsp#L64-L65C24

Not sure it is possible to add some UTs to cover typespec type to modular type:

/**
 * A date on a calendar without a time zone, e.g. "April 10th"
 */
scalar plainDate;

/**
 * A time on a clock without a time zone, e.g. "3:00 am"
 */
scalar plainTime;

/**
 * An instant in coordinated universal time (UTC)"
 */
scalar utcDateTime;

/**
 * A date and time in a particular time zone, e.g. "April 10th at 3:00am in PST"
 */
scalar offsetDateTime;

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suspect typespec compiler does not provide any format info to these types, but let me check.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

typescript date.toUTCString() is "Fri, 08 Sep 2023 08:50:03 GMT" and date.toISOString() is "2023-09-08T08:42:49.439Z"
therefore use toISOString for utcDateTime makes more sense. and toUTCString for offsetDateTime makes more sense to me.

Copy link
Contributor

@MaryGao MaryGao Sep 11, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, it makes sense to me also. Just checking with Tim here microsoft/typespec#1899 (comment)

Copy link
Contributor

@MaryGao MaryGao Sep 12, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems both of them share the same default value.

https://microsoft.github.io/typespec/next/standard-library/http/encoding#utcdatetime-and-offsetdatetime

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They are not the same
image

specversion: event["specversion"],
dataschema: event["dataschema"],
datacontenttype: event["datacontenttype"],
Expand Down Expand Up @@ -123,7 +122,7 @@ export function _publishCloudEventsSend(
? uint8ArrayToString(p["dataBase64"], "base64")
: undefined,
type: p["type"],
time: p["time"] !== undefined ? new Date(p["time"]) : undefined,
time: p["time"]?.toISOString(),
specversion: p["specversion"],
dataschema: p["dataschema"],
datacontenttype: p["datacontenttype"],
Expand Down
78 changes: 39 additions & 39 deletions ...-test/test/loadtesting_modular/generated/typespec-ts/review/load-testing.api.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ export interface CreateOrUpdateAppComponentsOptions extends OperationOptions {
// (undocumented)
contentType?: string;
createdBy?: string;
createdDateTime?: any;
createdDateTime?: Date;
lastModifiedBy?: string;
lastModifiedDateTime?: any;
lastModifiedDateTime?: Date;
testId?: string;
}

Expand All @@ -48,9 +48,9 @@ export interface CreateOrUpdateServerMetricsConfigOptions extends OperationOptio
// (undocumented)
contentType?: string;
createdBy?: string;
createdDateTime?: any;
createdDateTime?: Date;
lastModifiedBy?: string;
lastModifiedDateTime?: any;
lastModifiedDateTime?: Date;
metrics?: Record<string, ResourceMetric>;
testId?: string;
}
Expand All @@ -61,15 +61,15 @@ export interface CreateOrUpdateTestOptions extends OperationOptions {
// (undocumented)
contentType?: string;
createdBy?: string;
createdDateTime?: any;
createdDateTime?: Date;
description?: string;
displayName?: string;
environmentVariables?: Record<string, string>;
inputArtifacts?: TestInputArtifacts;
keyvaultReferenceIdentityId?: string;
keyvaultReferenceIdentityType?: string;
lastModifiedBy?: string;
lastModifiedDateTime?: any;
lastModifiedDateTime?: Date;
loadTestConfiguration?: LoadTestConfiguration;
passFailCriteria?: PassFailCriteria;
secrets?: Record<string, Secret>;
Expand Down Expand Up @@ -114,7 +114,7 @@ export interface ErrorDetails {

// @public
export interface FileInfo {
expireDateTime?: any;
expireDateTime?: Date;
fileName?: string;
fileType?: FileType;
url?: string;
Expand Down Expand Up @@ -187,8 +187,8 @@ export interface ListTestFilesOptions extends OperationOptions {

// @public (undocumented)
export interface ListTestRunsOptions extends OperationOptions {
executionFrom?: any;
executionTo?: any;
executionFrom?: Date;
executionTo?: Date;
maxpagesize?: number;
orderby?: string;
search?: string;
Expand All @@ -198,8 +198,8 @@ export interface ListTestRunsOptions extends OperationOptions {

// @public (undocumented)
export interface ListTestsOptions extends OperationOptions {
lastModifiedEndTime?: any;
lastModifiedStartTime?: any;
lastModifiedEndTime?: Date;
lastModifiedStartTime?: Date;
maxpagesize?: number;
orderby?: string;
search?: string;
Expand Down Expand Up @@ -289,9 +289,9 @@ export interface LoadTestRunClientCreateOrUpdateAppComponentsOptions extends Ope
// (undocumented)
contentType?: string;
createdBy?: string;
createdDateTime?: any;
createdDateTime?: Date;
lastModifiedBy?: string;
lastModifiedDateTime?: any;
lastModifiedDateTime?: Date;
testRunId?: string;
}

Expand All @@ -300,9 +300,9 @@ export interface LoadTestRunClientCreateOrUpdateServerMetricsConfigOptions exten
// (undocumented)
contentType?: string;
createdBy?: string;
createdDateTime?: any;
createdDateTime?: Date;
lastModifiedBy?: string;
lastModifiedDateTime?: any;
lastModifiedDateTime?: Date;
metrics?: Record<string, LoadTestRunClientResourceMetric>;
testRunId?: string;
}
Expand Down Expand Up @@ -332,7 +332,7 @@ export interface LoadTestRunClientErrorDetails {

// @public
export interface LoadTestRunClientFileInfo {
expireDateTime?: any;
expireDateTime?: Date;
fileName?: string;
fileType?: LoadTestRunClientFileType;
url?: string;
Expand Down Expand Up @@ -475,15 +475,15 @@ export type LoadTestRunClientStatus = string;
export interface LoadTestRunClientTest {
certificate?: LoadTestRunClientCertificateMetadata;
readonly createdBy?: string;
readonly createdDateTime?: any;
readonly createdDateTime?: Date;
description?: string;
displayName?: string;
environmentVariables?: Record<string, string>;
readonly inputArtifacts?: LoadTestRunClientTestInputArtifacts;
keyvaultReferenceIdentityId?: string;
keyvaultReferenceIdentityType?: string;
readonly lastModifiedBy?: string;
readonly lastModifiedDateTime?: any;
readonly lastModifiedDateTime?: Date;
loadTestConfiguration?: LoadTestRunClientLoadTestConfiguration;
passFailCriteria?: LoadTestRunClientPassFailCriteria;
secrets?: Record<string, LoadTestRunClientSecret>;
Expand All @@ -504,21 +504,21 @@ export interface LoadTestRunClientTestInputArtifacts {
export interface LoadTestRunClientTestRun {
certificate?: LoadTestRunClientCertificateMetadata;
readonly createdBy?: string;
readonly createdDateTime?: any;
readonly createdDateTime?: Date;
description?: string;
displayName?: string;
readonly duration?: number;
readonly endDateTime?: any;
readonly endDateTime?: Date;
environmentVariables?: Record<string, string>;
readonly errorDetails?: LoadTestRunClientErrorDetails[];
readonly executedDateTime?: any;
readonly executedDateTime?: Date;
readonly lastModifiedBy?: string;
readonly lastModifiedDateTime?: any;
readonly lastModifiedDateTime?: Date;
loadTestConfiguration?: LoadTestRunClientLoadTestConfiguration;
passFailCriteria?: LoadTestRunClientPassFailCriteria;
readonly portalUrl?: string;
secrets?: Record<string, LoadTestRunClientSecret>;
readonly startDateTime?: any;
readonly startDateTime?: Date;
readonly status?: LoadTestRunClientStatus;
readonly subnetId?: string;
readonly testArtifacts?: LoadTestRunClientTestRunArtifacts;
Expand Down Expand Up @@ -699,15 +699,15 @@ export interface StopTestRunOptions extends OperationOptions {
export interface Test {
certificate?: CertificateMetadata;
readonly createdBy?: string;
readonly createdDateTime?: any;
readonly createdDateTime?: Date;
description?: string;
displayName?: string;
environmentVariables?: Record<string, string>;
readonly inputArtifacts?: TestInputArtifacts;
keyvaultReferenceIdentityId?: string;
keyvaultReferenceIdentityType?: string;
readonly lastModifiedBy?: string;
readonly lastModifiedDateTime?: any;
readonly lastModifiedDateTime?: Date;
loadTestConfiguration?: LoadTestConfiguration;
passFailCriteria?: PassFailCriteria;
secrets?: Record<string, Secret>;
Expand All @@ -719,9 +719,9 @@ export interface Test {
export interface TestAppComponents {
components: Record<string, AppComponent>;
readonly createdBy?: string;
readonly createdDateTime?: any;
readonly createdDateTime?: Date;
readonly lastModifiedBy?: string;
readonly lastModifiedDateTime?: any;
readonly lastModifiedDateTime?: Date;
readonly testId?: string;
}

Expand All @@ -738,21 +738,21 @@ export interface TestInputArtifacts {
export interface TestRun {
certificate?: CertificateMetadata;
readonly createdBy?: string;
readonly createdDateTime?: any;
readonly createdDateTime?: Date;
description?: string;
displayName?: string;
readonly duration?: number;
readonly endDateTime?: any;
readonly endDateTime?: Date;
environmentVariables?: Record<string, string>;
readonly errorDetails?: ErrorDetails[];
readonly executedDateTime?: any;
readonly executedDateTime?: Date;
readonly lastModifiedBy?: string;
readonly lastModifiedDateTime?: any;
readonly lastModifiedDateTime?: Date;
loadTestConfiguration?: LoadTestConfiguration;
passFailCriteria?: PassFailCriteria;
readonly portalUrl?: string;
secrets?: Record<string, Secret>;
readonly startDateTime?: any;
readonly startDateTime?: Date;
readonly status?: Status;
readonly subnetId?: string;
readonly testArtifacts?: TestRunArtifacts;
Expand Down Expand Up @@ -783,22 +783,22 @@ export interface TestRunOptions extends OperationOptions {
certificate?: LoadTestRunClientCertificateMetadata;
contentType?: string;
createdBy?: string;
createdDateTime?: any;
createdDateTime?: Date;
description?: string;
displayName?: string;
duration?: number;
endDateTime?: any;
endDateTime?: Date;
environmentVariables?: Record<string, string>;
errorDetails?: LoadTestRunClientErrorDetails[];
executedDateTime?: any;
executedDateTime?: Date;
lastModifiedBy?: string;
lastModifiedDateTime?: any;
lastModifiedDateTime?: Date;
loadTestConfiguration?: LoadTestRunClientLoadTestConfiguration;
oldTestRunId?: string;
passFailCriteria?: LoadTestRunClientPassFailCriteria;
portalUrl?: string;
secrets?: Record<string, LoadTestRunClientSecret>;
startDateTime?: any;
startDateTime?: Date;
status?: LoadTestRunClientStatus;
subnetId?: string;
testArtifacts?: LoadTestRunClientTestRunArtifacts;
Expand Down Expand Up @@ -835,9 +835,9 @@ export interface TestRunStatistics {
// @public
export interface TestServerMetricConfig {
readonly createdBy?: string;
readonly createdDateTime?: any;
readonly createdDateTime?: Date;
readonly lastModifiedBy?: string;
readonly lastModifiedDateTime?: any;
readonly lastModifiedDateTime?: Date;
metrics?: Record<string, ResourceMetric>;
readonly testId?: string;
}
Expand Down
Loading
Loading