From c4f83c7bf768332f1a5e61c399f354aa5ab56565 Mon Sep 17 00:00:00 2001 From: Kagami Sascha Rosylight Date: Fri, 3 Mar 2023 20:12:55 +0100 Subject: [PATCH] Do not emit toString() on class static declarations --- baselines/audioworklet.generated.d.ts | 1 - baselines/dom.generated.d.ts | 4 ---- baselines/serviceworker.generated.d.ts | 1 - baselines/sharedworker.generated.d.ts | 1 - baselines/webworker.generated.d.ts | 1 - src/build/emitter.ts | 12 ++---------- 6 files changed, 2 insertions(+), 18 deletions(-) diff --git a/baselines/audioworklet.generated.d.ts b/baselines/audioworklet.generated.d.ts index 1418f9e84..924886be5 100644 --- a/baselines/audioworklet.generated.d.ts +++ b/baselines/audioworklet.generated.d.ts @@ -713,7 +713,6 @@ interface URLSearchParams { declare var URLSearchParams: { prototype: URLSearchParams; new(init?: string[][] | Record | string | URLSearchParams): URLSearchParams; - toString(): string; }; /** Available only in secure contexts. */ diff --git a/baselines/dom.generated.d.ts b/baselines/dom.generated.d.ts index 1602e661c..207cfe8cc 100644 --- a/baselines/dom.generated.d.ts +++ b/baselines/dom.generated.d.ts @@ -4110,7 +4110,6 @@ declare var DOMMatrixReadOnly: { fromFloat32Array(array32: Float32Array): DOMMatrixReadOnly; fromFloat64Array(array64: Float64Array): DOMMatrixReadOnly; fromMatrix(other?: DOMMatrixInit): DOMMatrixReadOnly; - toString(): string; }; /** Provides the ability to parse XML or HTML source code from a string into a DOM Document. */ @@ -11751,7 +11750,6 @@ declare var Range: { readonly START_TO_END: 1; readonly END_TO_END: 2; readonly END_TO_START: 3; - toString(): string; }; interface ReadableByteStreamController { @@ -13783,7 +13781,6 @@ interface Selection { declare var Selection: { prototype: Selection; new(): Selection; - toString(): string; }; interface ServiceWorkerEventMap extends AbstractWorkerEventMap { @@ -14707,7 +14704,6 @@ interface URLSearchParams { declare var URLSearchParams: { prototype: URLSearchParams; new(init?: string[][] | Record | string | URLSearchParams): URLSearchParams; - toString(): string; }; interface VTTCue extends TextTrackCue { diff --git a/baselines/serviceworker.generated.d.ts b/baselines/serviceworker.generated.d.ts index 291da249d..9208c9f19 100644 --- a/baselines/serviceworker.generated.d.ts +++ b/baselines/serviceworker.generated.d.ts @@ -3285,7 +3285,6 @@ interface URLSearchParams { declare var URLSearchParams: { prototype: URLSearchParams; new(init?: string[][] | Record | string | URLSearchParams): URLSearchParams; - toString(): string; }; interface WEBGL_color_buffer_float { diff --git a/baselines/sharedworker.generated.d.ts b/baselines/sharedworker.generated.d.ts index bbe60166d..8eeadb200 100644 --- a/baselines/sharedworker.generated.d.ts +++ b/baselines/sharedworker.generated.d.ts @@ -3149,7 +3149,6 @@ interface URLSearchParams { declare var URLSearchParams: { prototype: URLSearchParams; new(init?: string[][] | Record | string | URLSearchParams): URLSearchParams; - toString(): string; }; interface WEBGL_color_buffer_float { diff --git a/baselines/webworker.generated.d.ts b/baselines/webworker.generated.d.ts index ef1942a75..c2b734465 100644 --- a/baselines/webworker.generated.d.ts +++ b/baselines/webworker.generated.d.ts @@ -3426,7 +3426,6 @@ interface URLSearchParams { declare var URLSearchParams: { prototype: URLSearchParams; new(init?: string[][] | Record | string | URLSearchParams): URLSearchParams; - toString(): string; }; interface VideoColorSpace { diff --git a/src/build/emitter.ts b/src/build/emitter.ts index f3f5f5609..1fe86b166 100644 --- a/src/build/emitter.ts +++ b/src/build/emitter.ts @@ -909,15 +909,7 @@ export function emitWebIdl( return emitQuerySelectorAllOverloads(m); } - // ignore toString() provided from browser.webidl.preprocessed.json - // to prevent duplication - if (m.name !== "toString") { - emitSignatures(m, prefix, m.name, printLine); - - if (m.stringifier) { - printLine("toString(): string;"); - } - } + emitSignatures(m, prefix, m.name, printLine); } function emitSignature( @@ -989,7 +981,7 @@ export function emitWebIdl( .sort(compareName) .forEach((m) => emitMethod(prefix, m, conflictedMembers)); } - if (i.anonymousMethods) { + if (i.anonymousMethods && emitScope === EmitScope.InstanceOnly) { const stringifier = i.anonymousMethods.method.find((m) => m.stringifier); if (stringifier) { printer.printLine("toString(): string;");