fix(Node): multiple copies now compatible with each other in Node and…

… TS (#3546)

This deprecates protected properties that users should not be using when extending types they probably should not be extending. This also makes them public, mostly so in situations where there are multiple copies of rxjs in in a node project, TypeScript is still happy with the resulting dts files

related to #3544

src/AsyncSubject.ts

@@ -10,7 +10,7 @@ export class AsyncSubject<T> extends Subject<T> {
   private hasNext: boolean = false;
   private hasCompleted: boolean = false;
 
-  protected _subscribe(subscriber: Subscriber<any>): Subscription {
+  /** @deprecated internal use only */ _subscribe(subscriber: Subscriber<any>): Subscription {
     if (this.hasError) {
       subscriber.error(this.thrownError);
       return Subscription.EMPTY;

src/BehaviorSubject.ts

@@ -16,7 +16,7 @@ export class BehaviorSubject<T> extends Subject<T> {
     return this.getValue();
   }
 
-  protected _subscribe(subscriber: Subscriber<T>): Subscription {
+  /** @deprecated internal use only */ _subscribe(subscriber: Subscriber<T>): Subscription {
     const subscription = super._subscribe(subscriber);
     if (subscription && !(<ISubscription>subscription).closed) {
       subscriber.next(this._value);

src/Observable.ts

@@ -29,7 +29,7 @@ export class Observable<T> implements Subscribable<T> {
 
   public _isScalar: boolean = false;
 
-  protected source: Observable<any>;
+  /** @deprecated internal use only */ public source: Observable<any>;
   protected operator: Operator<any, T>;
 
   /**
@@ -271,7 +271,7 @@ export class Observable<T> implements Subscribable<T> {
     });
   }
 
-  protected _subscribe(subscriber: Subscriber<any>): TeardownLogic {
+  /** @deprecated internal use only */ _subscribe(subscriber: Subscriber<any>): TeardownLogic {
     return this.source.subscribe(subscriber);
   }
 

src/ReplaySubject.ts

@@ -29,7 +29,7 @@ export class ReplaySubject<T> extends Subject<T> {
     super.next(value);
   }
 
-  protected _subscribe(subscriber: Subscriber<T>): Subscription {
+  /** @deprecated internal use only */ _subscribe(subscriber: Subscriber<T>): Subscription {
     const _events = this._trimBufferThenGetEvents();
     const scheduler = this.scheduler;
     let subscription: Subscription;

src/Subject.ts

@@ -107,7 +107,7 @@ export class Subject<T> extends Observable<T> implements ISubscription {
     }
   }
 
-  protected _subscribe(subscriber: Subscriber<T>): Subscription {
+  /** @deprecated internal use only */ _subscribe(subscriber: Subscriber<T>): Subscription {
     if (this.closed) {
       throw new ObjectUnsubscribedError();
     } else if (this.hasError) {
@@ -159,7 +159,7 @@ export class AnonymousSubject<T> extends Subject<T> {
     }
   }
 
-  protected _subscribe(subscriber: Subscriber<T>): Subscription {
+  /** @deprecated internal use only */ _subscribe(subscriber: Subscriber<T>): Subscription {
     const { source } = this;
     if (source) {
       return this.source.subscribe(subscriber);

src/Subscriber.ts

@@ -149,7 +149,7 @@ export class Subscriber<T> extends Subscription implements Observer<T> {
     this.unsubscribe();
   }
 
-  protected _unsubscribeAndRecycle(): Subscriber<T> {
+  /** @deprecated internal use only */ _unsubscribeAndRecycle(): Subscriber<T> {
     const { _parent, _parents } = this;
     this._parent = null;
     this._parents = null;
@@ -273,7 +273,7 @@ class SafeSubscriber<T> extends Subscriber<T> {
     return false;
   }
 
-  protected _unsubscribe(): void {
+  /** @deprecated internal use only */ _unsubscribe(): void {
     const { _parentSubscriber } = this;
     this._context = null;
     this._parentSubscriber = null;

src/observable/ArrayLikeObservable.ts

@@ -53,7 +53,7 @@ export class ArrayLikeObservable<T> extends Observable<T> {
     }
   }
 
-  protected _subscribe(subscriber: Subscriber<T>): TeardownLogic {
+  /** @deprecated internal use only */ _subscribe(subscriber: Subscriber<T>): TeardownLogic {
     let index = 0;
     const { arrayLike, scheduler } = this;
     const length = arrayLike.length;

src/observable/ArrayObservable.ts

@@ -109,7 +109,7 @@ export class ArrayObservable<T> extends Observable<T> {
     }
   }
 
-  protected _subscribe(subscriber: Subscriber<T>): TeardownLogic {
+  /** @deprecated internal use only */ _subscribe(subscriber: Subscriber<T>): TeardownLogic {
     let index = 0;
     const array = this.array;
     const count = array.length;

src/observable/BoundCallbackObservable.ts

@@ -185,7 +185,7 @@ export class BoundCallbackObservable<T> extends Observable<T> {
     super();
   }
 
-  protected _subscribe(subscriber: Subscriber<T | T[]>): Subscription {
+  /** @deprecated internal use only */ _subscribe(subscriber: Subscriber<T | T[]>): Subscription {
     const callbackFunc = this.callbackFunc;
     const args = this.args;
     const scheduler = this.scheduler;

src/observable/BoundNodeCallbackObservable.ts

@@ -168,7 +168,7 @@ export class BoundNodeCallbackObservable<T> extends Observable<T> {
     super();
   }
 
-  protected _subscribe(subscriber: Subscriber<T | T[]>): Subscription {
+  /** @deprecated internal use only */ _subscribe(subscriber: Subscriber<T | T[]>): Subscription {
     const callbackFunc = this.callbackFunc;
     const args = this.args;
     const scheduler = this.scheduler;

src/observable/ConnectableObservable.ts

@@ -10,21 +10,21 @@ import { refCount as higherOrderRefCount } from '../operators/refCount';
  */
 export class ConnectableObservable<T> extends Observable<T> {
 
-  protected _subject: Subject<T>;
-  protected _refCount: number = 0;
-  protected _connection: Subscription;
+  /** @deprecated internal use only */ public _subject: Subject<T>;
+  /** @deprecated internal use only */ public _refCount: number = 0;
+  /** @deprecated internal use only */ public _connection: Subscription;
   _isComplete = false;
 
-  constructor(protected source: Observable<T>,
-              protected subjectFactory: () => Subject<T>) {
+  constructor(/** @deprecated internal use only */ public source: Observable<T>,
+              /** @deprecated internal use only */ public subjectFactory: () => Subject<T>) {
     super();
   }
 
-  protected _subscribe(subscriber: Subscriber<T>) {
+  /** @deprecated internal use only */ _subscribe(subscriber: Subscriber<T>) {
     return this.getSubject().subscribe(subscriber);
   }
 
-  protected getSubject(): Subject<T> {
+  /** @deprecated internal use only */ public getSubject(): Subject<T> {
     const subject = this._subject;
     if (!subject || subject.isStopped) {
       this._subject = this.subjectFactory();
@@ -82,7 +82,7 @@ class ConnectableSubscriber<T> extends SubjectSubscriber<T> {
     this._unsubscribe();
     super._complete();
   }
-  protected _unsubscribe() {
+  /** @deprecated internal use only */ _unsubscribe() {
     const connectable = <any>this.connectable;
     if (connectable) {
       this.connectable = null;
@@ -125,7 +125,7 @@ class RefCountSubscriber<T> extends Subscriber<T> {
     super(destination);
   }
 
-  protected _unsubscribe() {
+  /** @deprecated internal use only */ _unsubscribe() {
 
     const { connectable } = this;
     if (!connectable) {

src/observable/DeferObservable.ts

@@ -65,7 +65,7 @@ export class DeferObservable<T> extends Observable<T> {
     super();
   }
 
-  protected _subscribe(subscriber: Subscriber<T>): Subscription {
+  /** @deprecated internal use only */ _subscribe(subscriber: Subscriber<T>): Subscription {
     return new DeferSubscriber(subscriber, this.observableFactory);
   }
 }

src/observable/EmptyObservable.ts

@@ -70,7 +70,7 @@ export class EmptyObservable<T> extends Observable<T> {
     super();
   }
 
-  protected _subscribe(subscriber: Subscriber<T>): TeardownLogic {
+  /** @deprecated internal use only */ _subscribe(subscriber: Subscriber<T>): TeardownLogic {
 
     const scheduler = this.scheduler;
 

src/observable/ErrorObservable.ts

@@ -68,7 +68,7 @@ export class ErrorObservable extends Observable<any> {
     super();
   }
 
-  protected _subscribe(subscriber: Subscriber<any>): TeardownLogic {
+  /** @deprecated internal use only */ _subscribe(subscriber: Subscriber<any>): TeardownLogic {
     const error = this.error;
     const scheduler = this.scheduler;
 

src/observable/ForkJoinObservable.ts

@@ -161,7 +161,7 @@ export class ForkJoinObservable<T> extends Observable<T> {
     return new ForkJoinObservable(<Array<SubscribableOrPromise<any>>>sources, resultSelector);
   }
 
-  protected _subscribe(subscriber: Subscriber<any>): Subscription {
+  /** @deprecated internal use only */ _subscribe(subscriber: Subscriber<any>): Subscription {
     return new ForkJoinSubscriber(subscriber, this.sources, this.resultSelector);
   }
 }
@@ -230,4 +230,4 @@ class ForkJoinSubscriber<T> extends OuterSubscriber<T, T> {
 
     destination.complete();
   }
-}
+}

src/observable/FromEventObservable.ts

@@ -222,7 +222,7 @@ export class FromEventObservable<T> extends Observable<T> {
     subscriber.add(new Subscription(unsubscribe));
   }
 
-  protected _subscribe(subscriber: Subscriber<T>) {
+  /** @deprecated internal use only */ _subscribe(subscriber: Subscriber<T>) {
     const sourceObj = this.sourceObj;
     const eventName = this.eventName;
     const options = this.options;

src/observable/FromEventPatternObservable.ts

@@ -70,7 +70,7 @@ export class FromEventPatternObservable<T> extends Observable<T> {
     super();
   }
 
-  protected _subscribe(subscriber: Subscriber<T>) {
+  /** @deprecated internal use only */ _subscribe(subscriber: Subscriber<T>) {
     const removeHandler = this.removeHandler;
 
     const handler = !!this.selector ? (...args: Array<any>) => {
@@ -107,4 +107,4 @@ export class FromEventPatternObservable<T> extends Observable<T> {
       errorSubscriber.error(e);
     }
   }
-}
+}

src/observable/FromObservable.ts

@@ -103,7 +103,7 @@ export class FromObservable<T> extends Observable<T> {
     throw new TypeError((ish !== null && typeof ish || ish) + ' is not observable');
   }
 
-  protected _subscribe(subscriber: Subscriber<T>) {
+  /** @deprecated internal use only */ _subscribe(subscriber: Subscriber<T>) {
     const ish = this.ish;
     const scheduler = this.scheduler;
     if (scheduler == null) {

src/observable/GenerateObservable.ts

@@ -200,7 +200,7 @@ export class GenerateObservable<T, S> extends Observable<T> {
       <IScheduler>scheduler);
   }
 
-  protected _subscribe(subscriber: Subscriber<any>): Subscription | Function | void {
+  /** @deprecated internal use only */ _subscribe(subscriber: Subscriber<any>): Subscription | Function | void {
     let state = this.initialState;
     if (this.scheduler) {
       return this.scheduler.schedule<SchedulerState<T, S>>(GenerateObservable.dispatch, 0, {

src/observable/IfObservable.ts

@@ -23,7 +23,7 @@ export class IfObservable<T, R> extends Observable<T> {
     super();
   }
 
-  protected _subscribe(subscriber: Subscriber<T|R>): TeardownLogic {
+  /** @deprecated internal use only */ _subscribe(subscriber: Subscriber<T|R>): TeardownLogic {
     const { condition, thenSource, elseSource } = this;
 
     return new IfSubscriber(subscriber, condition, thenSource, elseSource);

src/observable/IntervalObservable.ts

@@ -73,7 +73,7 @@ export class IntervalObservable extends Observable<number> {
     }
   }
 
-  protected _subscribe(subscriber: Subscriber<number>) {
+  /** @deprecated internal use only */ _subscribe(subscriber: Subscriber<number>) {
     const index = 0;
     const period = this.period;
     const scheduler = this.scheduler;

src/observable/IteratorObservable.ts

@@ -55,7 +55,7 @@ export class IteratorObservable<T> extends Observable<T> {
     this.iterator = getIterator(iterator);
   }
 
-  protected _subscribe(subscriber: Subscriber<T>): TeardownLogic {
+  /** @deprecated internal use only */ _subscribe(subscriber: Subscriber<T>): TeardownLogic {
 
     let index = 0;
     const { iterator, scheduler } = this;

src/observable/NeverObservable.ts

@@ -47,7 +47,7 @@ export class NeverObservable<T> extends Observable<T> {
     super();
   }
 
-  protected _subscribe(subscriber: Subscriber<T>): void {
+  /** @deprecated internal use only */ _subscribe(subscriber: Subscriber<T>): void {
     noop();
   }
 }

src/observable/PairsObservable.ts

@@ -76,7 +76,7 @@ export class PairsObservable<T> extends Observable<Array<string | T>> {
     this.keys = Object.keys(obj);
   }
 
-  protected _subscribe(subscriber: Subscriber<Array<string | T>>): TeardownLogic {
+  /** @deprecated internal use only */ _subscribe(subscriber: Subscriber<Array<string | T>>): TeardownLogic {
     const {keys, scheduler} = this;
     const length = keys.length;
 
@@ -92,4 +92,4 @@ export class PairsObservable<T> extends Observable<Array<string | T>> {
       subscriber.complete();
     }
   }
-}
+}

src/observable/PromiseObservable.ts

@@ -47,7 +47,7 @@ export class PromiseObservable<T> extends Observable<T> {
     super();
   }
 
-  protected _subscribe(subscriber: Subscriber<T>): TeardownLogic {
+  /** @deprecated internal use only */ _subscribe(subscriber: Subscriber<T>): TeardownLogic {
     const promise = this.promise;
     const scheduler = this.scheduler;
 

src/observable/RangeObservable.ts

@@ -80,7 +80,7 @@ export class RangeObservable extends Observable<number> {
     this.scheduler = scheduler;
   }
 
-  protected _subscribe(subscriber: Subscriber<number>): TeardownLogic {
+  /** @deprecated internal use only */ _subscribe(subscriber: Subscriber<number>): TeardownLogic {
     let index = 0;
     let start = this.start;
     const count = this._count;

src/observable/ScalarObservable.ts

@@ -39,7 +39,7 @@ export class ScalarObservable<T> extends Observable<T> {
     }
   }
 
-  protected _subscribe(subscriber: Subscriber<T>): TeardownLogic {
+  /** @deprecated internal use only */ _subscribe(subscriber: Subscriber<T>): TeardownLogic {
     const value = this.value;
     const scheduler = this.scheduler;
 

src/observable/SubscribeOnObservable.ts

@@ -38,7 +38,7 @@ export class SubscribeOnObservable<T> extends Observable<T> {
     }
   }
 
-  protected _subscribe(subscriber: Subscriber<T>) {
+  /** @deprecated internal use only */ _subscribe(subscriber: Subscriber<T>) {
     const delay = this.delayTime;
     const source = this.source;
     const scheduler = this.scheduler;

src/observable/TimerObservable.ts

@@ -104,7 +104,7 @@ export class TimerObservable extends Observable<number> {
       (<number> dueTime);
   }
 
-  protected _subscribe(subscriber: Subscriber<number>): TeardownLogic {
+  /** @deprecated internal use only */ _subscribe(subscriber: Subscriber<number>): TeardownLogic {
     const index = 0;
     const { period, dueTime, scheduler } = this;
 

src/observable/UsingObservable.ts

@@ -21,7 +21,7 @@ export class UsingObservable<T> extends Observable<T> {
     super();
   }
 
-  protected _subscribe(subscriber: Subscriber<T>): TeardownLogic {
+  /** @deprecated internal use only */ _subscribe(subscriber: Subscriber<T>): TeardownLogic {
     const { resourceFactory, observableFactory } = this;
 
     let resource: AnonymousSubscription;
@@ -54,4 +54,4 @@ class UsingSubscriber<T> extends OuterSubscriber<T, T> {
       this._error(err);
     }
   }
-}
+}

src/observable/dom/AjaxObservable.ts

@@ -178,7 +178,7 @@ export class AjaxObservable<T> extends Observable<T> {
     this.request = request;
   }
 
-  protected _subscribe(subscriber: Subscriber<T>): TeardownLogic {
+  /** @deprecated internal use only */ _subscribe(subscriber: Subscriber<T>): TeardownLogic {
     return new AjaxSubscriber(subscriber, this.request);
   }
 }

src/observable/dom/WebSocketSubject.ts

@@ -244,7 +244,7 @@ export class WebSocketSubject<T> extends AnonymousSubject<T> {
     };
   }
 
-  protected _subscribe(subscriber: Subscriber<T>): Subscription {
+  /** @deprecated internal use only */ _subscribe(subscriber: Subscriber<T>): Subscription {
     const { source } = this;
     if (source) {
       return source.subscribe(subscriber);

src/operators/bufferTime.ts

@@ -167,7 +167,7 @@ class BufferTimeSubscriber<T> extends Subscriber<T> {
     super._complete();
   }
 
-  protected _unsubscribe() {
+  /** @deprecated internal use only */ _unsubscribe() {
     this.contexts = null;
   }
 

src/operators/bufferWhen.ts

@@ -85,7 +85,7 @@ class BufferWhenSubscriber<T> extends OuterSubscriber<T, any> {
     super._complete();
   }
 
-  protected _unsubscribe() {
+  /** @deprecated internal use only */ _unsubscribe() {
     this.buffer = null;
     this.subscribing = false;
   }