From 381d281039333274c1a8658b901579073c5a84b6 Mon Sep 17 00:00:00 2001 From: Jochem Brouwer Date: Fri, 28 Mar 2025 13:21:34 +0100 Subject: [PATCH 1/3] client: fix new tsx behavior which overwrites (?) fields of subclasses --- packages/client/src/sync/fetcher/fetcher.ts | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/packages/client/src/sync/fetcher/fetcher.ts b/packages/client/src/sync/fetcher/fetcher.ts index 72b1b256579..853ebad456a 100644 --- a/packages/client/src/sync/fetcher/fetcher.ts +++ b/packages/client/src/sync/fetcher/fetcher.ts @@ -65,11 +65,6 @@ export abstract class Fetcher extends Readable protected destroyWhenDone: boolean // Destroy the fetcher once we are finished processing each task. syncErrored?: Error - private _readableState?: { - // This property is inherited from Readable. We only need `length`. - length: number - } - private writer: Writable | null = null /** @@ -352,10 +347,13 @@ export abstract class Fetcher extends Readable return false } const jobStr = this.jobStr(job) - if (this._readableState === undefined || this._readableState!.length > this.maxQueue) { + if ( + (this)._readableState === undefined || + (this)._readableState!.length > this.maxQueue + ) { this.DEBUG && this.debug( - `Readable state length=${this._readableState!.length} exceeds max queue size=${ + `Readable state length=${(this)._readableState!.length} exceeds max queue size=${ this.maxQueue }, skip job ${jobStr} execution.`, ) From 452eb07593490bdd6b66a83946856b7a4f52599a Mon Sep 17 00:00:00 2001 From: Jochem Brouwer Date: Fri, 28 Mar 2025 14:40:13 +0100 Subject: [PATCH 2/3] client: make tsc happy --- packages/client/test/sync/fetcher/fetcher.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/client/test/sync/fetcher/fetcher.spec.ts b/packages/client/test/sync/fetcher/fetcher.spec.ts index a336916c549..458dc53f145 100644 --- a/packages/client/test/sync/fetcher/fetcher.spec.ts +++ b/packages/client/test/sync/fetcher/fetcher.spec.ts @@ -76,7 +76,7 @@ describe('should handle expiration', async () => { }) fetcher['in'].insert(job as any) - fetcher['_readableState'] = [] + ;(fetcher)['_readableState'] = [] fetcher['running'] = true fetcher['total'] = 10 fetcher.next() From f758380fca92326372751407b609862d32f48a70 Mon Sep 17 00:00:00 2001 From: acolytec3 <17355484+acolytec3@users.noreply.github.com> Date: Fri, 28 Mar 2025 09:47:21 -0400 Subject: [PATCH 3/3] make any erasable --- packages/client/src/sync/fetcher/fetcher.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/client/src/sync/fetcher/fetcher.ts b/packages/client/src/sync/fetcher/fetcher.ts index 853ebad456a..1983a23dde9 100644 --- a/packages/client/src/sync/fetcher/fetcher.ts +++ b/packages/client/src/sync/fetcher/fetcher.ts @@ -348,12 +348,12 @@ export abstract class Fetcher extends Readable } const jobStr = this.jobStr(job) if ( - (this)._readableState === undefined || - (this)._readableState!.length > this.maxQueue + (this as any)._readableState === undefined || + (this as any)._readableState!.length > this.maxQueue ) { this.DEBUG && this.debug( - `Readable state length=${(this)._readableState!.length} exceeds max queue size=${ + `Readable state length=${(this as any)._readableState!.length} exceeds max queue size=${ this.maxQueue }, skip job ${jobStr} execution.`, )