From 9a330bf232082d0d995f70f877523a82fcc7e619 Mon Sep 17 00:00:00 2001 From: Bashamega Date: Fri, 30 May 2025 13:01:15 +0300 Subject: [PATCH 1/2] fix: update overrideType for ServiceWorkerGlobalScope in overridingTypes.jsonc --- baselines/serviceworker.generated.d.ts | 4 ++-- baselines/sharedworker.generated.d.ts | 4 ++-- baselines/ts5.5/serviceworker.generated.d.ts | 4 ++-- baselines/ts5.5/sharedworker.generated.d.ts | 4 ++-- baselines/ts5.5/webworker.generated.d.ts | 4 ++-- baselines/ts5.6/serviceworker.generated.d.ts | 4 ++-- baselines/ts5.6/sharedworker.generated.d.ts | 4 ++-- baselines/ts5.6/webworker.generated.d.ts | 4 ++-- baselines/webworker.generated.d.ts | 4 ++-- inputfiles/overridingTypes.jsonc | 3 +-- 10 files changed, 19 insertions(+), 20 deletions(-) diff --git a/baselines/serviceworker.generated.d.ts b/baselines/serviceworker.generated.d.ts index e248aceaa..fc8896775 100644 --- a/baselines/serviceworker.generated.d.ts +++ b/baselines/serviceworker.generated.d.ts @@ -8599,7 +8599,7 @@ interface WorkerGlobalScope extends EventTarget, FontFaceSource, WindowOrWorkerG * * [MDN Reference](https://developer.mozilla.org/docs/Web/API/WorkerGlobalScope/self) */ - readonly self: WorkerGlobalScope & typeof globalThis; + readonly self: WorkerGlobalScope; /** * Fetches each URL in urls, executes them one-by-one in the order they are passed, and then returns (or throws if something went amiss). * @@ -9073,7 +9073,7 @@ declare var onunhandledrejection: ((this: ServiceWorkerGlobalScope, ev: PromiseR * * [MDN Reference](https://developer.mozilla.org/docs/Web/API/WorkerGlobalScope/self) */ -declare var self: WorkerGlobalScope & typeof globalThis; +declare var self: WorkerGlobalScope; /** * Fetches each URL in urls, executes them one-by-one in the order they are passed, and then returns (or throws if something went amiss). * diff --git a/baselines/sharedworker.generated.d.ts b/baselines/sharedworker.generated.d.ts index 9d750580d..51bc798d1 100644 --- a/baselines/sharedworker.generated.d.ts +++ b/baselines/sharedworker.generated.d.ts @@ -8334,7 +8334,7 @@ interface WorkerGlobalScope extends EventTarget, FontFaceSource, WindowOrWorkerG * * [MDN Reference](https://developer.mozilla.org/docs/Web/API/WorkerGlobalScope/self) */ - readonly self: WorkerGlobalScope & typeof globalThis; + readonly self: WorkerGlobalScope; /** * Fetches each URL in urls, executes them one-by-one in the order they are passed, and then returns (or throws if something went amiss). * @@ -8989,7 +8989,7 @@ declare var onunhandledrejection: ((this: SharedWorkerGlobalScope, ev: PromiseRe * * [MDN Reference](https://developer.mozilla.org/docs/Web/API/WorkerGlobalScope/self) */ -declare var self: WorkerGlobalScope & typeof globalThis; +declare var self: WorkerGlobalScope; /** * Fetches each URL in urls, executes them one-by-one in the order they are passed, and then returns (or throws if something went amiss). * diff --git a/baselines/ts5.5/serviceworker.generated.d.ts b/baselines/ts5.5/serviceworker.generated.d.ts index 8eae809df..2f1787de6 100644 --- a/baselines/ts5.5/serviceworker.generated.d.ts +++ b/baselines/ts5.5/serviceworker.generated.d.ts @@ -8599,7 +8599,7 @@ interface WorkerGlobalScope extends EventTarget, FontFaceSource, WindowOrWorkerG * * [MDN Reference](https://developer.mozilla.org/docs/Web/API/WorkerGlobalScope/self) */ - readonly self: WorkerGlobalScope & typeof globalThis; + readonly self: WorkerGlobalScope; /** * Fetches each URL in urls, executes them one-by-one in the order they are passed, and then returns (or throws if something went amiss). * @@ -9073,7 +9073,7 @@ declare var onunhandledrejection: ((this: ServiceWorkerGlobalScope, ev: PromiseR * * [MDN Reference](https://developer.mozilla.org/docs/Web/API/WorkerGlobalScope/self) */ -declare var self: WorkerGlobalScope & typeof globalThis; +declare var self: WorkerGlobalScope; /** * Fetches each URL in urls, executes them one-by-one in the order they are passed, and then returns (or throws if something went amiss). * diff --git a/baselines/ts5.5/sharedworker.generated.d.ts b/baselines/ts5.5/sharedworker.generated.d.ts index e0df20411..bc3e46675 100644 --- a/baselines/ts5.5/sharedworker.generated.d.ts +++ b/baselines/ts5.5/sharedworker.generated.d.ts @@ -8334,7 +8334,7 @@ interface WorkerGlobalScope extends EventTarget, FontFaceSource, WindowOrWorkerG * * [MDN Reference](https://developer.mozilla.org/docs/Web/API/WorkerGlobalScope/self) */ - readonly self: WorkerGlobalScope & typeof globalThis; + readonly self: WorkerGlobalScope; /** * Fetches each URL in urls, executes them one-by-one in the order they are passed, and then returns (or throws if something went amiss). * @@ -8989,7 +8989,7 @@ declare var onunhandledrejection: ((this: SharedWorkerGlobalScope, ev: PromiseRe * * [MDN Reference](https://developer.mozilla.org/docs/Web/API/WorkerGlobalScope/self) */ -declare var self: WorkerGlobalScope & typeof globalThis; +declare var self: WorkerGlobalScope; /** * Fetches each URL in urls, executes them one-by-one in the order they are passed, and then returns (or throws if something went amiss). * diff --git a/baselines/ts5.5/webworker.generated.d.ts b/baselines/ts5.5/webworker.generated.d.ts index 2eb67b611..67486af46 100644 --- a/baselines/ts5.5/webworker.generated.d.ts +++ b/baselines/ts5.5/webworker.generated.d.ts @@ -9567,7 +9567,7 @@ interface WorkerGlobalScope extends EventTarget, FontFaceSource, WindowOrWorkerG * * [MDN Reference](https://developer.mozilla.org/docs/Web/API/WorkerGlobalScope/self) */ - readonly self: WorkerGlobalScope & typeof globalThis; + readonly self: WorkerGlobalScope; /** * Fetches each URL in urls, executes them one-by-one in the order they are passed, and then returns (or throws if something went amiss). * @@ -10253,7 +10253,7 @@ declare var onunhandledrejection: ((this: DedicatedWorkerGlobalScope, ev: Promis * * [MDN Reference](https://developer.mozilla.org/docs/Web/API/WorkerGlobalScope/self) */ -declare var self: WorkerGlobalScope & typeof globalThis; +declare var self: WorkerGlobalScope; /** * Fetches each URL in urls, executes them one-by-one in the order they are passed, and then returns (or throws if something went amiss). * diff --git a/baselines/ts5.6/serviceworker.generated.d.ts b/baselines/ts5.6/serviceworker.generated.d.ts index 8eae809df..2f1787de6 100644 --- a/baselines/ts5.6/serviceworker.generated.d.ts +++ b/baselines/ts5.6/serviceworker.generated.d.ts @@ -8599,7 +8599,7 @@ interface WorkerGlobalScope extends EventTarget, FontFaceSource, WindowOrWorkerG * * [MDN Reference](https://developer.mozilla.org/docs/Web/API/WorkerGlobalScope/self) */ - readonly self: WorkerGlobalScope & typeof globalThis; + readonly self: WorkerGlobalScope; /** * Fetches each URL in urls, executes them one-by-one in the order they are passed, and then returns (or throws if something went amiss). * @@ -9073,7 +9073,7 @@ declare var onunhandledrejection: ((this: ServiceWorkerGlobalScope, ev: PromiseR * * [MDN Reference](https://developer.mozilla.org/docs/Web/API/WorkerGlobalScope/self) */ -declare var self: WorkerGlobalScope & typeof globalThis; +declare var self: WorkerGlobalScope; /** * Fetches each URL in urls, executes them one-by-one in the order they are passed, and then returns (or throws if something went amiss). * diff --git a/baselines/ts5.6/sharedworker.generated.d.ts b/baselines/ts5.6/sharedworker.generated.d.ts index e0df20411..bc3e46675 100644 --- a/baselines/ts5.6/sharedworker.generated.d.ts +++ b/baselines/ts5.6/sharedworker.generated.d.ts @@ -8334,7 +8334,7 @@ interface WorkerGlobalScope extends EventTarget, FontFaceSource, WindowOrWorkerG * * [MDN Reference](https://developer.mozilla.org/docs/Web/API/WorkerGlobalScope/self) */ - readonly self: WorkerGlobalScope & typeof globalThis; + readonly self: WorkerGlobalScope; /** * Fetches each URL in urls, executes them one-by-one in the order they are passed, and then returns (or throws if something went amiss). * @@ -8989,7 +8989,7 @@ declare var onunhandledrejection: ((this: SharedWorkerGlobalScope, ev: PromiseRe * * [MDN Reference](https://developer.mozilla.org/docs/Web/API/WorkerGlobalScope/self) */ -declare var self: WorkerGlobalScope & typeof globalThis; +declare var self: WorkerGlobalScope; /** * Fetches each URL in urls, executes them one-by-one in the order they are passed, and then returns (or throws if something went amiss). * diff --git a/baselines/ts5.6/webworker.generated.d.ts b/baselines/ts5.6/webworker.generated.d.ts index 2eb67b611..67486af46 100644 --- a/baselines/ts5.6/webworker.generated.d.ts +++ b/baselines/ts5.6/webworker.generated.d.ts @@ -9567,7 +9567,7 @@ interface WorkerGlobalScope extends EventTarget, FontFaceSource, WindowOrWorkerG * * [MDN Reference](https://developer.mozilla.org/docs/Web/API/WorkerGlobalScope/self) */ - readonly self: WorkerGlobalScope & typeof globalThis; + readonly self: WorkerGlobalScope; /** * Fetches each URL in urls, executes them one-by-one in the order they are passed, and then returns (or throws if something went amiss). * @@ -10253,7 +10253,7 @@ declare var onunhandledrejection: ((this: DedicatedWorkerGlobalScope, ev: Promis * * [MDN Reference](https://developer.mozilla.org/docs/Web/API/WorkerGlobalScope/self) */ -declare var self: WorkerGlobalScope & typeof globalThis; +declare var self: WorkerGlobalScope; /** * Fetches each URL in urls, executes them one-by-one in the order they are passed, and then returns (or throws if something went amiss). * diff --git a/baselines/webworker.generated.d.ts b/baselines/webworker.generated.d.ts index 14209458d..28ca75f82 100644 --- a/baselines/webworker.generated.d.ts +++ b/baselines/webworker.generated.d.ts @@ -9567,7 +9567,7 @@ interface WorkerGlobalScope extends EventTarget, FontFaceSource, WindowOrWorkerG * * [MDN Reference](https://developer.mozilla.org/docs/Web/API/WorkerGlobalScope/self) */ - readonly self: WorkerGlobalScope & typeof globalThis; + readonly self: WorkerGlobalScope; /** * Fetches each URL in urls, executes them one-by-one in the order they are passed, and then returns (or throws if something went amiss). * @@ -10253,7 +10253,7 @@ declare var onunhandledrejection: ((this: DedicatedWorkerGlobalScope, ev: Promis * * [MDN Reference](https://developer.mozilla.org/docs/Web/API/WorkerGlobalScope/self) */ -declare var self: WorkerGlobalScope & typeof globalThis; +declare var self: WorkerGlobalScope; /** * Fetches each URL in urls, executes them one-by-one in the order they are passed, and then returns (or throws if something went amiss). * diff --git a/inputfiles/overridingTypes.jsonc b/inputfiles/overridingTypes.jsonc index 4ad85c4a2..5b457653a 100644 --- a/inputfiles/overridingTypes.jsonc +++ b/inputfiles/overridingTypes.jsonc @@ -3337,10 +3337,9 @@ } }, "WorkerGlobalScope": { - "properties": { "property": { "self": { - "overrideType": "WorkerGlobalScope & typeof globalThis" + "overrideType": "ServiceWorkerGlobalScope & typeof globalThis" } } }, From 122830be59124ba7d7b4c316ad84ba1f4e1330a7 Mon Sep 17 00:00:00 2001 From: Bashamega Date: Fri, 30 May 2025 13:03:57 +0300 Subject: [PATCH 2/2] - --- baselines/serviceworker.generated.d.ts | 4 ++-- baselines/sharedworker.generated.d.ts | 4 ++-- baselines/ts5.5/serviceworker.generated.d.ts | 4 ++-- baselines/ts5.5/sharedworker.generated.d.ts | 4 ++-- baselines/ts5.5/webworker.generated.d.ts | 4 ++-- baselines/ts5.6/serviceworker.generated.d.ts | 4 ++-- baselines/ts5.6/sharedworker.generated.d.ts | 4 ++-- baselines/ts5.6/webworker.generated.d.ts | 4 ++-- baselines/webworker.generated.d.ts | 4 ++-- inputfiles/overridingTypes.jsonc | 1 + 10 files changed, 19 insertions(+), 18 deletions(-) diff --git a/baselines/serviceworker.generated.d.ts b/baselines/serviceworker.generated.d.ts index fc8896775..f93638160 100644 --- a/baselines/serviceworker.generated.d.ts +++ b/baselines/serviceworker.generated.d.ts @@ -8599,7 +8599,7 @@ interface WorkerGlobalScope extends EventTarget, FontFaceSource, WindowOrWorkerG * * [MDN Reference](https://developer.mozilla.org/docs/Web/API/WorkerGlobalScope/self) */ - readonly self: WorkerGlobalScope; + readonly self: ServiceWorkerGlobalScope & typeof globalThis; /** * Fetches each URL in urls, executes them one-by-one in the order they are passed, and then returns (or throws if something went amiss). * @@ -9073,7 +9073,7 @@ declare var onunhandledrejection: ((this: ServiceWorkerGlobalScope, ev: PromiseR * * [MDN Reference](https://developer.mozilla.org/docs/Web/API/WorkerGlobalScope/self) */ -declare var self: WorkerGlobalScope; +declare var self: ServiceWorkerGlobalScope & typeof globalThis; /** * Fetches each URL in urls, executes them one-by-one in the order they are passed, and then returns (or throws if something went amiss). * diff --git a/baselines/sharedworker.generated.d.ts b/baselines/sharedworker.generated.d.ts index 51bc798d1..a3eeee8a7 100644 --- a/baselines/sharedworker.generated.d.ts +++ b/baselines/sharedworker.generated.d.ts @@ -8334,7 +8334,7 @@ interface WorkerGlobalScope extends EventTarget, FontFaceSource, WindowOrWorkerG * * [MDN Reference](https://developer.mozilla.org/docs/Web/API/WorkerGlobalScope/self) */ - readonly self: WorkerGlobalScope; + readonly self: ServiceWorkerGlobalScope & typeof globalThis; /** * Fetches each URL in urls, executes them one-by-one in the order they are passed, and then returns (or throws if something went amiss). * @@ -8989,7 +8989,7 @@ declare var onunhandledrejection: ((this: SharedWorkerGlobalScope, ev: PromiseRe * * [MDN Reference](https://developer.mozilla.org/docs/Web/API/WorkerGlobalScope/self) */ -declare var self: WorkerGlobalScope; +declare var self: ServiceWorkerGlobalScope & typeof globalThis; /** * Fetches each URL in urls, executes them one-by-one in the order they are passed, and then returns (or throws if something went amiss). * diff --git a/baselines/ts5.5/serviceworker.generated.d.ts b/baselines/ts5.5/serviceworker.generated.d.ts index 2f1787de6..ca4a6af3c 100644 --- a/baselines/ts5.5/serviceworker.generated.d.ts +++ b/baselines/ts5.5/serviceworker.generated.d.ts @@ -8599,7 +8599,7 @@ interface WorkerGlobalScope extends EventTarget, FontFaceSource, WindowOrWorkerG * * [MDN Reference](https://developer.mozilla.org/docs/Web/API/WorkerGlobalScope/self) */ - readonly self: WorkerGlobalScope; + readonly self: ServiceWorkerGlobalScope & typeof globalThis; /** * Fetches each URL in urls, executes them one-by-one in the order they are passed, and then returns (or throws if something went amiss). * @@ -9073,7 +9073,7 @@ declare var onunhandledrejection: ((this: ServiceWorkerGlobalScope, ev: PromiseR * * [MDN Reference](https://developer.mozilla.org/docs/Web/API/WorkerGlobalScope/self) */ -declare var self: WorkerGlobalScope; +declare var self: ServiceWorkerGlobalScope & typeof globalThis; /** * Fetches each URL in urls, executes them one-by-one in the order they are passed, and then returns (or throws if something went amiss). * diff --git a/baselines/ts5.5/sharedworker.generated.d.ts b/baselines/ts5.5/sharedworker.generated.d.ts index bc3e46675..a0fe07f1c 100644 --- a/baselines/ts5.5/sharedworker.generated.d.ts +++ b/baselines/ts5.5/sharedworker.generated.d.ts @@ -8334,7 +8334,7 @@ interface WorkerGlobalScope extends EventTarget, FontFaceSource, WindowOrWorkerG * * [MDN Reference](https://developer.mozilla.org/docs/Web/API/WorkerGlobalScope/self) */ - readonly self: WorkerGlobalScope; + readonly self: ServiceWorkerGlobalScope & typeof globalThis; /** * Fetches each URL in urls, executes them one-by-one in the order they are passed, and then returns (or throws if something went amiss). * @@ -8989,7 +8989,7 @@ declare var onunhandledrejection: ((this: SharedWorkerGlobalScope, ev: PromiseRe * * [MDN Reference](https://developer.mozilla.org/docs/Web/API/WorkerGlobalScope/self) */ -declare var self: WorkerGlobalScope; +declare var self: ServiceWorkerGlobalScope & typeof globalThis; /** * Fetches each URL in urls, executes them one-by-one in the order they are passed, and then returns (or throws if something went amiss). * diff --git a/baselines/ts5.5/webworker.generated.d.ts b/baselines/ts5.5/webworker.generated.d.ts index 67486af46..1ac9006df 100644 --- a/baselines/ts5.5/webworker.generated.d.ts +++ b/baselines/ts5.5/webworker.generated.d.ts @@ -9567,7 +9567,7 @@ interface WorkerGlobalScope extends EventTarget, FontFaceSource, WindowOrWorkerG * * [MDN Reference](https://developer.mozilla.org/docs/Web/API/WorkerGlobalScope/self) */ - readonly self: WorkerGlobalScope; + readonly self: ServiceWorkerGlobalScope & typeof globalThis; /** * Fetches each URL in urls, executes them one-by-one in the order they are passed, and then returns (or throws if something went amiss). * @@ -10253,7 +10253,7 @@ declare var onunhandledrejection: ((this: DedicatedWorkerGlobalScope, ev: Promis * * [MDN Reference](https://developer.mozilla.org/docs/Web/API/WorkerGlobalScope/self) */ -declare var self: WorkerGlobalScope; +declare var self: ServiceWorkerGlobalScope & typeof globalThis; /** * Fetches each URL in urls, executes them one-by-one in the order they are passed, and then returns (or throws if something went amiss). * diff --git a/baselines/ts5.6/serviceworker.generated.d.ts b/baselines/ts5.6/serviceworker.generated.d.ts index 2f1787de6..ca4a6af3c 100644 --- a/baselines/ts5.6/serviceworker.generated.d.ts +++ b/baselines/ts5.6/serviceworker.generated.d.ts @@ -8599,7 +8599,7 @@ interface WorkerGlobalScope extends EventTarget, FontFaceSource, WindowOrWorkerG * * [MDN Reference](https://developer.mozilla.org/docs/Web/API/WorkerGlobalScope/self) */ - readonly self: WorkerGlobalScope; + readonly self: ServiceWorkerGlobalScope & typeof globalThis; /** * Fetches each URL in urls, executes them one-by-one in the order they are passed, and then returns (or throws if something went amiss). * @@ -9073,7 +9073,7 @@ declare var onunhandledrejection: ((this: ServiceWorkerGlobalScope, ev: PromiseR * * [MDN Reference](https://developer.mozilla.org/docs/Web/API/WorkerGlobalScope/self) */ -declare var self: WorkerGlobalScope; +declare var self: ServiceWorkerGlobalScope & typeof globalThis; /** * Fetches each URL in urls, executes them one-by-one in the order they are passed, and then returns (or throws if something went amiss). * diff --git a/baselines/ts5.6/sharedworker.generated.d.ts b/baselines/ts5.6/sharedworker.generated.d.ts index bc3e46675..a0fe07f1c 100644 --- a/baselines/ts5.6/sharedworker.generated.d.ts +++ b/baselines/ts5.6/sharedworker.generated.d.ts @@ -8334,7 +8334,7 @@ interface WorkerGlobalScope extends EventTarget, FontFaceSource, WindowOrWorkerG * * [MDN Reference](https://developer.mozilla.org/docs/Web/API/WorkerGlobalScope/self) */ - readonly self: WorkerGlobalScope; + readonly self: ServiceWorkerGlobalScope & typeof globalThis; /** * Fetches each URL in urls, executes them one-by-one in the order they are passed, and then returns (or throws if something went amiss). * @@ -8989,7 +8989,7 @@ declare var onunhandledrejection: ((this: SharedWorkerGlobalScope, ev: PromiseRe * * [MDN Reference](https://developer.mozilla.org/docs/Web/API/WorkerGlobalScope/self) */ -declare var self: WorkerGlobalScope; +declare var self: ServiceWorkerGlobalScope & typeof globalThis; /** * Fetches each URL in urls, executes them one-by-one in the order they are passed, and then returns (or throws if something went amiss). * diff --git a/baselines/ts5.6/webworker.generated.d.ts b/baselines/ts5.6/webworker.generated.d.ts index 67486af46..1ac9006df 100644 --- a/baselines/ts5.6/webworker.generated.d.ts +++ b/baselines/ts5.6/webworker.generated.d.ts @@ -9567,7 +9567,7 @@ interface WorkerGlobalScope extends EventTarget, FontFaceSource, WindowOrWorkerG * * [MDN Reference](https://developer.mozilla.org/docs/Web/API/WorkerGlobalScope/self) */ - readonly self: WorkerGlobalScope; + readonly self: ServiceWorkerGlobalScope & typeof globalThis; /** * Fetches each URL in urls, executes them one-by-one in the order they are passed, and then returns (or throws if something went amiss). * @@ -10253,7 +10253,7 @@ declare var onunhandledrejection: ((this: DedicatedWorkerGlobalScope, ev: Promis * * [MDN Reference](https://developer.mozilla.org/docs/Web/API/WorkerGlobalScope/self) */ -declare var self: WorkerGlobalScope; +declare var self: ServiceWorkerGlobalScope & typeof globalThis; /** * Fetches each URL in urls, executes them one-by-one in the order they are passed, and then returns (or throws if something went amiss). * diff --git a/baselines/webworker.generated.d.ts b/baselines/webworker.generated.d.ts index 28ca75f82..e81522df1 100644 --- a/baselines/webworker.generated.d.ts +++ b/baselines/webworker.generated.d.ts @@ -9567,7 +9567,7 @@ interface WorkerGlobalScope extends EventTarget, FontFaceSource, WindowOrWorkerG * * [MDN Reference](https://developer.mozilla.org/docs/Web/API/WorkerGlobalScope/self) */ - readonly self: WorkerGlobalScope; + readonly self: ServiceWorkerGlobalScope & typeof globalThis; /** * Fetches each URL in urls, executes them one-by-one in the order they are passed, and then returns (or throws if something went amiss). * @@ -10253,7 +10253,7 @@ declare var onunhandledrejection: ((this: DedicatedWorkerGlobalScope, ev: Promis * * [MDN Reference](https://developer.mozilla.org/docs/Web/API/WorkerGlobalScope/self) */ -declare var self: WorkerGlobalScope; +declare var self: ServiceWorkerGlobalScope & typeof globalThis; /** * Fetches each URL in urls, executes them one-by-one in the order they are passed, and then returns (or throws if something went amiss). * diff --git a/inputfiles/overridingTypes.jsonc b/inputfiles/overridingTypes.jsonc index 5b457653a..10e142727 100644 --- a/inputfiles/overridingTypes.jsonc +++ b/inputfiles/overridingTypes.jsonc @@ -3337,6 +3337,7 @@ } }, "WorkerGlobalScope": { + "properties": { "property": { "self": { "overrideType": "ServiceWorkerGlobalScope & typeof globalThis"