Fix serialisation of static class members in JS #37780
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| //// [source.js] | ||
| class Handler { | ||
| static get OPTIONS() { | ||
| return 1; | ||
| } | ||
|
|
||
| process() { | ||
| } | ||
| } | ||
| Handler.statische = function() { } | ||
| const Strings = { | ||
| a: "A", | ||
| b: "B" | ||
| } | ||
|
|
||
| module.exports = Handler; | ||
| module.exports.Strings = Strings | ||
|
|
||
| /** | ||
| * @typedef {Object} HandlerOptions | ||
| * @property {String} name | ||
| * Should be able to export a type alias at the same time. | ||
| */ | ||
|
|
||
|
|
||
| //// [source.js] | ||
| var Handler = /** @class */ (function () { | ||
| function Handler() { | ||
| } | ||
| Object.defineProperty(Handler, "OPTIONS", { | ||
| get: function () { | ||
| return 1; | ||
| }, | ||
| enumerable: false, | ||
| configurable: true | ||
| }); | ||
| Handler.prototype.process = function () { | ||
| }; | ||
| return Handler; | ||
| }()); | ||
| Handler.statische = function () { }; | ||
| var Strings = { | ||
| a: "A", | ||
| b: "B" | ||
| }; | ||
| module.exports = Handler; | ||
| module.exports.Strings = Strings; | ||
| /** | ||
| * @typedef {Object} HandlerOptions | ||
| * @property {String} name | ||
| * Should be able to export a type alias at the same time. | ||
| */ | ||
|
|
||
|
|
||
| //// [source.d.ts] | ||
| export = Handler; | ||
| declare class Handler { | ||
| static get OPTIONS(): number; | ||
| process(): void; | ||
| } | ||
| declare namespace Handler { | ||
| export { statische, Strings, HandlerOptions }; | ||
| } | ||
| declare function statische(): void; | ||
| declare namespace Strings { | ||
| export const a: string; | ||
| export const b: string; | ||
| } | ||
| type HandlerOptions = { | ||
| /** | ||
| * Should be able to export a type alias at the same time. | ||
| */ | ||
| name: String; | ||
| }; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| === tests/cases/conformance/jsdoc/declarations/source.js === | ||
| class Handler { | ||
| >Handler : Symbol(Handler, Decl(source.js, 0, 0), Decl(source.js, 7, 1)) | ||
|
|
||
| static get OPTIONS() { | ||
| >OPTIONS : Symbol(Handler.OPTIONS, Decl(source.js, 0, 15)) | ||
|
|
||
| return 1; | ||
| } | ||
|
|
||
| process() { | ||
| >process : Symbol(Handler.process, Decl(source.js, 3, 2)) | ||
| } | ||
| } | ||
| Handler.statische = function() { } | ||
| >Handler.statische : Symbol(Handler.statische, Decl(source.js, 7, 1)) | ||
| >Handler : Symbol(Handler, Decl(source.js, 0, 0), Decl(source.js, 7, 1)) | ||
| >statische : Symbol(Handler.statische, Decl(source.js, 7, 1)) | ||
|
|
||
| const Strings = { | ||
| >Strings : Symbol(Strings, Decl(source.js, 9, 5)) | ||
|
|
||
| a: "A", | ||
| >a : Symbol(a, Decl(source.js, 9, 17)) | ||
|
|
||
| b: "B" | ||
| >b : Symbol(b, Decl(source.js, 10, 11)) | ||
| } | ||
|
|
||
| module.exports = Handler; | ||
| >module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/source", Decl(source.js, 0, 0)) | ||
| >module : Symbol(export=, Decl(source.js, 12, 1)) | ||
| >exports : Symbol(export=, Decl(source.js, 12, 1)) | ||
| >Handler : Symbol(Handler, Decl(source.js, 0, 0), Decl(source.js, 7, 1)) | ||
|
|
||
| module.exports.Strings = Strings | ||
| >module.exports.Strings : Symbol(Strings) | ||
| >module.exports : Symbol(Strings, Decl(source.js, 14, 25)) | ||
| >module : Symbol(module, Decl(source.js, 12, 1)) | ||
| >exports : Symbol("tests/cases/conformance/jsdoc/declarations/source", Decl(source.js, 0, 0)) | ||
| >Strings : Symbol(Strings, Decl(source.js, 14, 25)) | ||
| >Strings : Symbol(Strings, Decl(source.js, 9, 5)) | ||
|
|
||
| /** | ||
| * @typedef {Object} HandlerOptions | ||
| * @property {String} name | ||
| * Should be able to export a type alias at the same time. | ||
| */ | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| === tests/cases/conformance/jsdoc/declarations/source.js === | ||
| class Handler { | ||
| >Handler : Handler | ||
|
|
||
| static get OPTIONS() { | ||
| >OPTIONS : number | ||
|
|
||
| return 1; | ||
| >1 : 1 | ||
| } | ||
|
|
||
| process() { | ||
| >process : () => void | ||
| } | ||
| } | ||
| Handler.statische = function() { } | ||
| >Handler.statische = function() { } : () => void | ||
| >Handler.statische : () => void | ||
| >Handler : typeof Handler | ||
| >statische : () => void | ||
| >function() { } : () => void | ||
|
|
||
| const Strings = { | ||
| >Strings : { a: string; b: string; } | ||
| >{ a: "A", b: "B"} : { a: string; b: string; } | ||
|
|
||
| a: "A", | ||
| >a : string | ||
| >"A" : "A" | ||
|
|
||
| b: "B" | ||
| >b : string | ||
| >"B" : "B" | ||
| } | ||
|
|
||
| module.exports = Handler; | ||
| >module.exports = Handler : typeof Handler | ||
| >module.exports : typeof Handler | ||
| >module : { "\"tests/cases/conformance/jsdoc/declarations/source\"": typeof Handler; } | ||
| >exports : typeof Handler | ||
| >Handler : typeof Handler | ||
|
|
||
| module.exports.Strings = Strings | ||
| >module.exports.Strings = Strings : { a: string; b: string; } | ||
| >module.exports.Strings : { a: string; b: string; } | ||
| >module.exports : typeof Handler | ||
| >module : { "\"tests/cases/conformance/jsdoc/declarations/source\"": typeof Handler; } | ||
| >exports : typeof Handler | ||
| >Strings : { a: string; b: string; } | ||
| >Strings : { a: string; b: string; } | ||
|
|
||
| /** | ||
| * @typedef {Object} HandlerOptions | ||
| * @property {String} name | ||
| * Should be able to export a type alias at the same time. | ||
| */ | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| // @allowJs: true | ||
| // @checkJs: true | ||
| // @target: es5 | ||
| // @outDir: ./out | ||
| // @declaration: true | ||
| // @filename: source.js | ||
| class Handler { | ||
| static get OPTIONS() { | ||
| return 1; | ||
| } | ||
|
|
||
| process() { | ||
| } | ||
| } | ||
| Handler.statische = function() { } | ||
| const Strings = { | ||
| a: "A", | ||
| b: "B" | ||
| } | ||
|
|
||
| module.exports = Handler; | ||
| module.exports.Strings = Strings | ||
|
|
||
| /** | ||
| * @typedef {Object} HandlerOptions | ||
| * @property {String} name | ||
| * Should be able to export a type alias at the same time. | ||
| */ |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should we extract this predicate to a function, so it's obvious each place is using the same predicate (albeit inverted)?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes, although it reveals that this usage is not quite the same as the others, because it needs to (1) accept
staticmembers (the opposite of the others) but (2) excludeprototype(same as the others)