Skip to content

[TS] Change declaration of static readonly fields #3407

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

Merged
dclaux merged 1 commit into from
Aug 28, 2019
Merged

[TS] Change declaration of static readonly fields #3407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 15 additions & 16 deletions source/nodejs/adaptivecards/src/card-elements.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4076,7 +4076,9 @@ export abstract class Action extends CardObject {
}

export class SubmitAction extends Action {
static readonly JsonTypeName = "Action.Submit";
// Note the "weird" way this field is declared is to work around a breaking
// change introduced in TS 3.1 wrt d.ts generation. DO NOT CHANGE
static readonly JsonTypeName: "Action.Submit" = "Action.Submit";

private _isPrepared: boolean = false;
private _originalData: Object;
Expand Down Expand Up @@ -4151,7 +4153,9 @@ export class SubmitAction extends Action {
}

export class OpenUrlAction extends Action {
static readonly JsonTypeName = "Action.OpenUrl";
// Note the "weird" way this field is declared is to work around a breaking
// change introduced in TS 3.1 wrt d.ts generation. DO NOT CHANGE
static readonly JsonTypeName: "Action.OpenUrl" = "Action.OpenUrl";

url: string;

Expand Down Expand Up @@ -4192,7 +4196,9 @@ export class OpenUrlAction extends Action {
}

export class ToggleVisibilityAction extends Action {
static readonly JsonTypeName = "Action.ToggleVisibility";
// Note the "weird" way this field is declared is to work around a breaking
// change introduced in TS 3.1 wrt d.ts generation. DO NOT CHANGE
static readonly JsonTypeName: "Action.ToggleVisibility" = "Action.ToggleVisibility";

targetElements = {}

Expand Down Expand Up @@ -4317,7 +4323,9 @@ export class HttpHeader extends SerializableObject {
}

export class HttpAction extends Action {
static readonly JsonTypeName = "Action.Http";
// Note the "weird" way this field is declared is to work around a breaking
// change introduced in TS 3.1 wrt d.ts generation. DO NOT CHANGE
static readonly JsonTypeName: "Action.Http" = "Action.Http";

private _url = new Shared.StringWithSubstitutions();
private _body = new Shared.StringWithSubstitutions();
Expand Down Expand Up @@ -4367,17 +4375,6 @@ export class HttpAction extends Action {
Utils.setProperty(result, "url", this._url.getOriginal());
Utils.setProperty(result, "body", this._body.getOriginal());
Utils.setProperty(result, "ignoreInputValidation", this.ignoreInputValidation, false);

/*
let headers = [];

for (let header of this.headers) {
headers.push(header.toJSON());
}

Utils.setProperty(result, "headers", headers);
*/

Utils.setArrayProperty(result, "headers", this.headers);

return result;
Expand Down Expand Up @@ -4463,7 +4460,9 @@ export class HttpAction extends Action {
}

export class ShowCardAction extends Action {
static readonly JsonTypeName = "Action.ShowCard";
// Note the "weird" way this field is declared is to work around a breaking
// change introduced in TS 3.1 wrt d.ts generation. DO NOT CHANGE
static readonly JsonTypeName: "Action.ShowCard" = "Action.ShowCard";

protected addCssClasses(element: HTMLElement) {
super.addCssClasses(element);
Expand Down
26 changes: 17 additions & 9 deletions source/nodejs/adaptivecards/src/enums.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

// Note the "weird" way these readonly fields are declared is to work around
// a breaking change introduced in TS 3.1 wrt d.ts generation. DO NOT CHANGE
// and adopt this syntax for all other static readonly fields.
export class ActionStyle {
static readonly Default = "default";
static readonly Positive = "positive";
static readonly Destructive = "destructive";
static readonly Default: "default" = "default";
static readonly Positive: "positive" = "positive";
static readonly Destructive: "destructive" = "destructive";
}

export enum Size {
Expand Down Expand Up @@ -129,14 +133,18 @@ export enum InputValidationNecessity {
recent enough to understand string enums. This is
a compatible construct that does not require using
a more recent version of TypeScript.

Also note the "weird" way these readonly fields are declared is to work around
a breaking change introduced in TS 3.1 wrt d.ts generation. DO NOT CHANGE
and adopt this syntax for all other static readonly fields.
*/
export class ContainerStyle {
static readonly Default = "default";
static readonly Emphasis = "emphasis";
static readonly Accent = "accent";
static readonly Good = "good";
static readonly Attention = "attention";
static readonly Warning = "warning";
static readonly Default: "default" = "default";
static readonly Emphasis: "emphasis" = "emphasis";
static readonly Accent: "accent" = "accent";
static readonly Good: "good" = "good";
static readonly Attention: "attention" = "attention";
static readonly Warning: "warning" = "warning";
}

export enum ValidationError {
Expand Down