Skip to content

Commit 7f8e0ec

Browse files
jakovljevic-mladenjakovljevic-mladen
committed
Revert "fix: Now compatible with TypeScript 4.6 type checks (ReactiveX#6895)"
This reverts commit fce9aa1.
1 parent d279670 commit 7f8e0ec

File tree

16 files changed

+41
-65
lines changed

16 files changed

+41
-65
lines changed

‎spec/ajax/index-spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ describe('index', () => {
77
});
88

99
it('should export Ajax data classes', () => {
10+
expect(index.AjaxResponse).to.exist;
1011
expect(index.AjaxError).to.exist;
1112
expect(index.AjaxTimeoutError).to.exist;
1213
// Interfaces can be checked by creating a variable of that type
1314
let ajaxRequest: index.AjaxRequest;
14-
let ajaxResponse: index.AjaxResponse<object>;
1515
});
1616
});

‎src/ajax/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
export { ajax } from '../internal/ajax/ajax';
22
export { AjaxError, AjaxTimeoutError } from '../internal/ajax/errors';
33
export { AjaxResponse } from '../internal/ajax/AjaxResponse';
4-
export type { AjaxRequest, AjaxConfig, AjaxDirection } from '../internal/ajax/types';
4+
export { AjaxRequest, AjaxConfig, AjaxDirection } from '../internal/ajax/types';

‎src/index.ts

+10-18
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
/* Observable */
1616
export { Observable } from './internal/Observable';
1717
export { ConnectableObservable } from './internal/observable/ConnectableObservable';
18-
export type { GroupedObservable } from './internal/operators/groupBy';
19-
export type { Operator } from './internal/Operator';
18+
export { GroupedObservable } from './internal/operators/groupBy';
19+
export { Operator } from './internal/Operator';
2020
export { observable } from './internal/symbol/observable';
2121
export { animationFrames } from './internal/observable/dom/animationFrames';
2222

@@ -97,8 +97,7 @@ export { NEVER } from './internal/observable/never';
9797
export * from './internal/types';
9898

9999
/* Config */
100-
export { config } from './internal/config';
101-
export type { GlobalConfig } from './internal/config';
100+
export { config, GlobalConfig } from './internal/config';
102101

103102
/* Operators */
104103
export { audit } from './internal/operators/audit';
@@ -116,8 +115,7 @@ export { concatAll } from './internal/operators/concatAll';
116115
export { concatMap } from './internal/operators/concatMap';
117116
export { concatMapTo } from './internal/operators/concatMapTo';
118117
export { concatWith } from './internal/operators/concatWith';
119-
export { connect } from './internal/operators/connect';
120-
export type { ConnectConfig } from './internal/operators/connect';
118+
export { connect, ConnectConfig } from './internal/operators/connect';
121119
export { count } from './internal/operators/count';
122120
export { debounce } from './internal/operators/debounce';
123121
export { debounceTime } from './internal/operators/debounceTime';
@@ -140,8 +138,7 @@ export { finalize } from './internal/operators/finalize';
140138
export { find } from './internal/operators/find';
141139
export { findIndex } from './internal/operators/findIndex';
142140
export { first } from './internal/operators/first';
143-
export { groupBy } from './internal/operators/groupBy';
144-
export type { BasicGroupByOptions, GroupByOptionsWithElement } from './internal/operators/groupBy';
141+
export { groupBy, BasicGroupByOptions, GroupByOptionsWithElement } from './internal/operators/groupBy';
145142
export { ignoreElements } from './internal/operators/ignoreElements';
146143
export { isEmpty } from './internal/operators/isEmpty';
147144
export { last } from './internal/operators/last';
@@ -168,18 +165,15 @@ export { raceWith } from './internal/operators/raceWith';
168165
export { reduce } from './internal/operators/reduce';
169166
export { repeat } from './internal/operators/repeat';
170167
export { repeatWhen } from './internal/operators/repeatWhen';
171-
export { retry } from './internal/operators/retry';
172-
export type { RetryConfig } from './internal/operators/retry';
168+
export { retry, RetryConfig } from './internal/operators/retry';
173169
export { retryWhen } from './internal/operators/retryWhen';
174170
export { refCount } from './internal/operators/refCount';
175171
export { sample } from './internal/operators/sample';
176172
export { sampleTime } from './internal/operators/sampleTime';
177173
export { scan } from './internal/operators/scan';
178174
export { sequenceEqual } from './internal/operators/sequenceEqual';
179-
export { share } from './internal/operators/share';
180-
export type { ShareConfig } from './internal/operators/share';
181-
export { shareReplay } from './internal/operators/shareReplay';
182-
export type { ShareReplayConfig } from './internal/operators/shareReplay';
175+
export { share, ShareConfig } from './internal/operators/share';
176+
export { shareReplay, ShareReplayConfig } from './internal/operators/shareReplay';
183177
export { single } from './internal/operators/single';
184178
export { skip } from './internal/operators/skip';
185179
export { skipLast } from './internal/operators/skipLast';
@@ -196,13 +190,11 @@ export { takeLast } from './internal/operators/takeLast';
196190
export { takeUntil } from './internal/operators/takeUntil';
197191
export { takeWhile } from './internal/operators/takeWhile';
198192
export { tap } from './internal/operators/tap';
199-
export { throttle } from './internal/operators/throttle';
200-
export type { ThrottleConfig } from './internal/operators/throttle';
193+
export { throttle, ThrottleConfig } from './internal/operators/throttle';
201194
export { throttleTime } from './internal/operators/throttleTime';
202195
export { throwIfEmpty } from './internal/operators/throwIfEmpty';
203196
export { timeInterval } from './internal/operators/timeInterval';
204-
export { timeout } from './internal/operators/timeout';
205-
export type { TimeoutConfig, TimeoutInfo } from './internal/operators/timeout';
197+
export { timeout, TimeoutConfig, TimeoutInfo } from './internal/operators/timeout';
206198
export { timeoutWith } from './internal/operators/timeoutWith';
207199
export { timestamp } from './internal/operators/timestamp';
208200
export { toArray } from './internal/operators/toArray';

‎src/internal/Subscriber.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ export class SafeSubscriber<T> extends Subscriber<T> {
203203
// The first argument is a function, not an observer. The next
204204
// two arguments *could* be observers, or they could be empty.
205205
partialObserver = {
206-
next: (observerOrNext ?? undefined) as (((value: T) => void) | undefined),
206+
next: observerOrNext ?? undefined,
207207
error: error ?? undefined,
208208
complete: complete ?? undefined,
209209
};

‎src/internal/operators/groupBy.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ export function groupBy<T, K, R>(
147147
return operate((source, subscriber) => {
148148
let element: ((value: any) => any) | void;
149149
if (!elementOrOptions || typeof elementOrOptions === 'function') {
150-
element = elementOrOptions as ((value: any) => any);
150+
element = elementOrOptions;
151151
} else {
152152
({ duration, element, connector } = elementOrOptions);
153153
}

‎src/internal/operators/retry.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ export function retry<T>(configOrCount: number | RetryConfig = Infinity): MonoTy
8686
config = configOrCount;
8787
} else {
8888
config = {
89-
count: configOrCount as number,
89+
count: configOrCount,
9090
};
9191
}
9292
const { count = Infinity, delay, resetOnSuccess: resetOnSuccess = false } = config;

‎src/internal/operators/shareReplay.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ export function shareReplay<T>(
161161
if (configOrBufferSize && typeof configOrBufferSize === 'object') {
162162
({ bufferSize = Infinity, windowTime = Infinity, refCount = false, scheduler } = configOrBufferSize);
163163
} else {
164-
bufferSize = (configOrBufferSize ?? Infinity) as number;
164+
bufferSize = configOrBufferSize ?? Infinity;
165165
}
166166
return share<T>({
167167
connector: () => new ReplaySubject(bufferSize, windowTime, scheduler),

‎src/internal/scheduler/immediateProvider.ts

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
import { Immediate } from '../util/Immediate';
2-
import type { TimerHandle } from './timerHandle';
32
const { setImmediate, clearImmediate } = Immediate;
43

5-
type SetImmediateFunction = (handler: () => void, ...args: any[]) => TimerHandle;
6-
type ClearImmediateFunction = (handle: TimerHandle) => void;
4+
type SetImmediateFunction = (handler: () => void, ...args: any[]) => number;
5+
type ClearImmediateFunction = (handle: number) => void;
76

87
interface ImmediateProvider {
98
setImmediate: SetImmediateFunction;
@@ -25,7 +24,7 @@ export const immediateProvider: ImmediateProvider = {
2524
},
2625
clearImmediate(handle) {
2726
const { delegate } = immediateProvider;
28-
return (delegate?.clearImmediate || clearImmediate)(handle as any);
27+
return (delegate?.clearImmediate || clearImmediate)(handle);
2928
},
3029
delegate: undefined,
3130
};

‎src/internal/scheduler/intervalProvider.ts

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
import type { TimerHandle } from './timerHandle';
2-
type SetIntervalFunction = (handler: () => void, timeout?: number, ...args: any[]) => TimerHandle;
3-
type ClearIntervalFunction = (handle: TimerHandle) => void;
1+
type SetIntervalFunction = (handler: () => void, timeout?: number, ...args: any[]) => number;
2+
type ClearIntervalFunction = (handle: number) => void;
43

54
interface IntervalProvider {
65
setInterval: SetIntervalFunction;
@@ -17,15 +16,15 @@ export const intervalProvider: IntervalProvider = {
1716
// When accessing the delegate, use the variable rather than `this` so that
1817
// the functions can be called without being bound to the provider.
1918
setInterval(handler: () => void, timeout?: number, ...args) {
20-
const { delegate } = intervalProvider;
19+
const {delegate} = intervalProvider;
2120
if (delegate?.setInterval) {
2221
return delegate.setInterval(handler, timeout, ...args);
2322
}
2423
return setInterval(handler, timeout, ...args);
2524
},
2625
clearInterval(handle) {
2726
const { delegate } = intervalProvider;
28-
return (delegate?.clearInterval || clearInterval)(handle as any);
27+
return (delegate?.clearInterval || clearInterval)(handle);
2928
},
3029
delegate: undefined,
3130
};

‎src/internal/scheduler/timeoutProvider.ts

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
import type { TimerHandle } from './timerHandle';
2-
type SetTimeoutFunction = (handler: () => void, timeout?: number, ...args: any[]) => TimerHandle;
3-
type ClearTimeoutFunction = (handle: TimerHandle) => void;
1+
type SetTimeoutFunction = (handler: () => void, timeout?: number, ...args: any[]) => number;
2+
type ClearTimeoutFunction = (handle: number) => void;
43

54
interface TimeoutProvider {
65
setTimeout: SetTimeoutFunction;
@@ -17,15 +16,15 @@ export const timeoutProvider: TimeoutProvider = {
1716
// When accessing the delegate, use the variable rather than `this` so that
1817
// the functions can be called without being bound to the provider.
1918
setTimeout(handler: () => void, timeout?: number, ...args) {
20-
const { delegate } = timeoutProvider;
19+
const {delegate} = timeoutProvider;
2120
if (delegate?.setTimeout) {
2221
return delegate.setTimeout(handler, timeout, ...args);
2322
}
2423
return setTimeout(handler, timeout, ...args);
2524
},
2625
clearTimeout(handle) {
2726
const { delegate } = timeoutProvider;
28-
return (delegate?.clearTimeout || clearTimeout)(handle as any);
27+
return (delegate?.clearTimeout || clearTimeout)(handle);
2928
},
3029
delegate: undefined,
3130
};

‎src/internal/scheduler/timerHandle.ts

-1
This file was deleted.

‎src/internal/testing/TestScheduler.ts

+5-6
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import { COMPLETE_NOTIFICATION, errorNotification, nextNotification } from '../N
1010
import { dateTimestampProvider } from '../scheduler/dateTimestampProvider';
1111
import { performanceTimestampProvider } from '../scheduler/performanceTimestampProvider';
1212
import { animationFrameProvider } from '../scheduler/animationFrameProvider';
13-
import type { TimerHandle } from '../scheduler/timerHandle';
1413
import { immediateProvider } from '../scheduler/immediateProvider';
1514
import { intervalProvider } from '../scheduler/intervalProvider';
1615
import { timeoutProvider } from '../scheduler/timeoutProvider';
@@ -511,11 +510,11 @@ export class TestScheduler extends VirtualTimeScheduler {
511510

512511
let lastHandle = 0;
513512
const scheduleLookup = new Map<
514-
TimerHandle,
513+
number,
515514
{
516515
due: number;
517516
duration: number;
518-
handle: TimerHandle;
517+
handle: number;
519518
handler: () => void;
520519
subscription: Subscription;
521520
type: 'immediate' | 'interval' | 'timeout';
@@ -583,7 +582,7 @@ export class TestScheduler extends VirtualTimeScheduler {
583582
});
584583
return handle;
585584
},
586-
clearImmediate: (handle: TimerHandle) => {
585+
clearImmediate: (handle: number) => {
587586
const value = scheduleLookup.get(handle);
588587
if (value) {
589588
value.subscription.unsubscribe();
@@ -605,7 +604,7 @@ export class TestScheduler extends VirtualTimeScheduler {
605604
});
606605
return handle;
607606
},
608-
clearInterval: (handle: TimerHandle) => {
607+
clearInterval: (handle: number) => {
609608
const value = scheduleLookup.get(handle);
610609
if (value) {
611610
value.subscription.unsubscribe();
@@ -627,7 +626,7 @@ export class TestScheduler extends VirtualTimeScheduler {
627626
});
628627
return handle;
629628
},
630-
clearTimeout: (handle: TimerHandle) => {
629+
clearTimeout: (handle: number) => {
631630
const value = scheduleLookup.get(handle);
632631
if (value) {
633632
value.subscription.unsubscribe();

‎src/internal/util/workarounds.ts

-2
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,3 @@
33
// Wherever possible, use a TypeScript issue number in the type - something
44
// like TS_18757 - or use a descriptive name and leave a detailed comment
55
// alongside the type alias.
6-
7-
export {}

‎src/operators/index.ts

+7-14
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ export { concatAll } from '../internal/operators/concatAll';
1616
export { concatMap } from '../internal/operators/concatMap';
1717
export { concatMapTo } from '../internal/operators/concatMapTo';
1818
export { concatWith } from '../internal/operators/concatWith';
19-
export { connect } from '../internal/operators/connect';
20-
export type { ConnectConfig } from '../internal/operators/connect';
19+
export { connect, ConnectConfig } from '../internal/operators/connect';
2120
export { count } from '../internal/operators/count';
2221
export { debounce } from '../internal/operators/debounce';
2322
export { debounceTime } from '../internal/operators/debounceTime';
@@ -40,8 +39,7 @@ export { finalize } from '../internal/operators/finalize';
4039
export { find } from '../internal/operators/find';
4140
export { findIndex } from '../internal/operators/findIndex';
4241
export { first } from '../internal/operators/first';
43-
export { groupBy } from '../internal/operators/groupBy';
44-
export type { BasicGroupByOptions, GroupByOptionsWithElement } from '../internal/operators/groupBy';
42+
export { groupBy, BasicGroupByOptions, GroupByOptionsWithElement } from '../internal/operators/groupBy';
4543
export { ignoreElements } from '../internal/operators/ignoreElements';
4644
export { isEmpty } from '../internal/operators/isEmpty';
4745
export { last } from '../internal/operators/last';
@@ -72,18 +70,15 @@ export { raceWith } from '../internal/operators/raceWith';
7270
export { reduce } from '../internal/operators/reduce';
7371
export { repeat } from '../internal/operators/repeat';
7472
export { repeatWhen } from '../internal/operators/repeatWhen';
75-
export { retry } from '../internal/operators/retry';
76-
export type { RetryConfig } from '../internal/operators/retry';
73+
export { retry, RetryConfig } from '../internal/operators/retry';
7774
export { retryWhen } from '../internal/operators/retryWhen';
7875
export { refCount } from '../internal/operators/refCount';
7976
export { sample } from '../internal/operators/sample';
8077
export { sampleTime } from '../internal/operators/sampleTime';
8178
export { scan } from '../internal/operators/scan';
8279
export { sequenceEqual } from '../internal/operators/sequenceEqual';
83-
export { share } from '../internal/operators/share';
84-
export type { ShareConfig } from '../internal/operators/share';
85-
export { shareReplay } from '../internal/operators/shareReplay';
86-
export type { ShareReplayConfig } from '../internal/operators/shareReplay';
80+
export { share, ShareConfig } from '../internal/operators/share';
81+
export { shareReplay, ShareReplayConfig } from '../internal/operators/shareReplay';
8782
export { single } from '../internal/operators/single';
8883
export { skip } from '../internal/operators/skip';
8984
export { skipLast } from '../internal/operators/skipLast';
@@ -100,13 +95,11 @@ export { takeLast } from '../internal/operators/takeLast';
10095
export { takeUntil } from '../internal/operators/takeUntil';
10196
export { takeWhile } from '../internal/operators/takeWhile';
10297
export { tap } from '../internal/operators/tap';
103-
export { throttle } from '../internal/operators/throttle';
104-
export type { ThrottleConfig } from '../internal/operators/throttle';
98+
export { throttle, ThrottleConfig } from '../internal/operators/throttle';
10599
export { throttleTime } from '../internal/operators/throttleTime';
106100
export { throwIfEmpty } from '../internal/operators/throwIfEmpty';
107101
export { timeInterval } from '../internal/operators/timeInterval';
108-
export { timeout } from '../internal/operators/timeout';
109-
export type { TimeoutConfig, TimeoutInfo } from '../internal/operators/timeout';
102+
export { timeout, TimeoutConfig, TimeoutInfo } from '../internal/operators/timeout';
110103
export { timeoutWith } from '../internal/operators/timeoutWith';
111104
export { timestamp } from '../internal/operators/timestamp';
112105
export { toArray } from '../internal/operators/toArray';

‎src/testing/index.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
export { TestScheduler } from '../internal/testing/TestScheduler';
2-
export type { RunHelpers } from '../internal/testing/TestScheduler';
1+
export { TestScheduler, RunHelpers } from '../internal/testing/TestScheduler';

‎src/webSocket/index.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
export { webSocket as webSocket } from '../internal/observable/dom/webSocket';
2-
export { WebSocketSubject } from '../internal/observable/dom/WebSocketSubject';
3-
export type { WebSocketSubjectConfig } from '../internal/observable/dom/WebSocketSubject';
2+
export { WebSocketSubject, WebSocketSubjectConfig } from '../internal/observable/dom/WebSocketSubject';

0 commit comments

Comments
 (0)