feat(compat): add Observable extension classes with static create()

jasonaden · jasonaden · commit ecd7f68f0642 · 2018-04-06T16:36:59.000-07:00
diff --git a/compat/observable/ArrayLikeObservable.ts b/compat/observable/ArrayLikeObservable.ts
@@ -0,0 +1,7 @@
+import { Observable, SchedulerLike, from } from 'rxjs';
+
+export class ArrayLikeObservable<T> extends Observable<T> {
+  static create<T>(arrayLike: ArrayLike<T>, scheduler?: SchedulerLike): Observable<T> {
+    return from(arrayLike, scheduler);
+  }
+}
diff --git a/compat/observable/ArrayObservable.ts b/compat/observable/ArrayObservable.ts
@@ -0,0 +1,7 @@
+import { Observable, SchedulerLike, from } from 'rxjs';
+
+export class ArrayObservable<T> extends Observable<T> {
+  static create<T>(array: T[], scheduler?: SchedulerLike) {
+    return from(array, scheduler);
+  }
+}
diff --git a/compat/observable/BoundCallbackObservable.ts b/compat/observable/BoundCallbackObservable.ts
@@ -0,0 +1,28 @@
+import { Observable, SchedulerLike, bindCallback } from 'rxjs';
+
+export class BoundCallbackObservable<T> extends Observable<T> {
+  /* tslint:disable:max-line-length */
+  static create(callbackFunc: (callback: () => any) => any, selector?: void, scheduler?: SchedulerLike): () => Observable<void>;
+  static create<R>(callbackFunc: (callback: (result: R) => any) => any, selector?: void, scheduler?: SchedulerLike): () => Observable<R>;
+  static create<T, R>(callbackFunc: (v1: T, callback: (result: R) => any) => any, selector?: void, scheduler?: SchedulerLike): (v1: T) => Observable<R>;
+  static create<T, T2, R>(callbackFunc: (v1: T, v2: T2, callback: (result: R) => any) => any, selector?: void, scheduler?: SchedulerLike): (v1: T, v2: T2) => Observable<R>;
+  static create<T, T2, T3, R>(callbackFunc: (v1: T, v2: T2, v3: T3, callback: (result: R) => any) => any, selector?: void, scheduler?: SchedulerLike): (v1: T, v2: T2, v3: T3) => Observable<R>;
+  static create<T, T2, T3, T4, R>(callbackFunc: (v1: T, v2: T2, v3: T3, v4: T4, callback: (result: R) => any) => any, selector?: void, scheduler?: SchedulerLike): (v1: T, v2: T2, v3: T3, v4: T4) => Observable<R>;
+  static create<T, T2, T3, T4, T5, R>(callbackFunc: (v1: T, v2: T2, v3: T3, v4: T4, v5: T5, callback: (result: R) => any) => any, selector?: void, scheduler?: SchedulerLike): (v1: T, v2: T2, v3: T3, v4: T4, v5: T5) => Observable<R>;
+  static create<T, T2, T3, T4, T5, T6, R>(callbackFunc: (v1: T, v2: T2, v3: T3, v4: T4, v5: T5, v6: T6, callback: (result: R) => any) => any, selector?: void, scheduler?: SchedulerLike): (v1: T, v2: T2, v3: T3, v4: T4, v5: T5, v6: T6) => Observable<R>;
+  static create<R>(callbackFunc: (callback: (...args: any[]) => any) => any, selector: (...args: any[]) => R, scheduler?: SchedulerLike): () => Observable<R>;
+  static create<T, R>(callbackFunc: (v1: T, callback: (...args: any[]) => any) => any, selector: (...args: any[]) => R, scheduler?: SchedulerLike): (v1: T) => Observable<R>;
+  static create<T, T2, R>(callbackFunc: (v1: T, v2: T2, callback: (...args: any[]) => any) => any, selector: (...args: any[]) => R, scheduler?: SchedulerLike): (v1: T, v2: T2) => Observable<R>;
+  static create<T, T2, T3, R>(callbackFunc: (v1: T, v2: T2, v3: T3, callback: (...args: any[]) => any) => any, selector: (...args: any[]) => R, scheduler?: SchedulerLike): (v1: T, v2: T2, v3: T3) => Observable<R>;
+  static create<T, T2, T3, T4, R>(callbackFunc: (v1: T, v2: T2, v3: T3, v4: T4, callback: (...args: any[]) => any) => any, selector: (...args: any[]) => R, scheduler?: SchedulerLike): (v1: T, v2: T2, v3: T3, v4: T4) => Observable<R>;
+  static create<T, T2, T3, T4, T5, R>(callbackFunc: (v1: T, v2: T2, v3: T3, v4: T4, v5: T5, callback: (...args: any[]) => any) => any, selector: (...args: any[]) => R, scheduler?: SchedulerLike): (v1: T, v2: T2, v3: T3, v4: T4, v5: T5) => Observable<R>;
+  static create<T, T2, T3, T4, T5, T6, R>(callbackFunc: (v1: T, v2: T2, v3: T3, v4: T4, v5: T5, v6: T6, callback: (...args: any[]) => any) => any, selector: (...args: any[]) => R, scheduler?: SchedulerLike): (v1: T, v2: T2, v3: T3, v4: T4, v5: T5, v6: T6) => Observable<R>;
+  static create<T>(callbackFunc: Function, selector?: void, scheduler?: SchedulerLike): (...args: any[]) => Observable<T>;
+  static create<T>(callbackFunc: Function, selector?: (...args: any[]) => T, scheduler?: SchedulerLike): (...args: any[]) => Observable<T>;
+  /* tslint:enable:max-line-length */
+  static create<T>(func: Function,
+                   selector: Function | void = undefined,
+                   scheduler?: SchedulerLike): (...args: any[]) => Observable<T> {
+    return  bindCallback(func, <any>selector, scheduler);
+  }
+}
diff --git a/compat/observable/BoundNodeCallbackObservable.ts b/compat/observable/BoundNodeCallbackObservable.ts
@@ -0,0 +1,20 @@
+import { Observable, SchedulerLike, bindNodeCallback } from 'rxjs';
+
+export class BoundNodeCallbackObservable<T> extends Observable<T> {
+  /* tslint:disable:max-line-length */
+  static create<R>(callbackFunc: (callback: (err: any, result: R) => any) => any, selector?: void, scheduler?: SchedulerLike): () => Observable<R>;
+  static create<T, R>(callbackFunc: (v1: T, callback: (err: any, result: R) => any) => any, selector?: void, scheduler?: SchedulerLike): (v1: T) => Observable<R>;
+  static create<T, T2, R>(callbackFunc: (v1: T, v2: T2, callback: (err: any, result: R) => any) => any, selector?: void, scheduler?: SchedulerLike): (v1: T, v2: T2) => Observable<R>;
+  static create<T, T2, T3, R>(callbackFunc: (v1: T, v2: T2, v3: T3, callback: (err: any, result: R) => any) => any, selector?: void, scheduler?: SchedulerLike): (v1: T, v2: T2, v3: T3) => Observable<R>;
+  static create<T, T2, T3, T4, R>(callbackFunc: (v1: T, v2: T2, v3: T3, v4: T4, callback: (err: any, result: R) => any) => any, selector?: void, scheduler?: SchedulerLike): (v1: T, v2: T2, v3: T3, v4: T4) => Observable<R>;
+  static create<T, T2, T3, T4, T5, R>(callbackFunc: (v1: T, v2: T2, v3: T3, v4: T4, v5: T5, callback: (err: any, result: R) => any) => any, selector?: void, scheduler?: SchedulerLike): (v1: T, v2: T2, v3: T3, v4: T4, v5: T5) => Observable<R>;
+  static create<T, T2, T3, T4, T5, T6, R>(callbackFunc: (v1: T, v2: T2, v3: T3, v4: T4, v5: T5, v6: T6, callback: (err: any, result: R) => any) => any, selector?: void, scheduler?: SchedulerLike): (v1: T, v2: T2, v3: T3, v4: T4, v5: T5, v6: T6) => Observable<R>;
+  static create<T>(callbackFunc: Function, selector?: void, scheduler?: SchedulerLike): (...args: any[]) => Observable<T>;
+  static create<T>(callbackFunc: Function, selector?: (...args: any[]) => T, scheduler?: SchedulerLike): (...args: any[]) => Observable<T>;
+  /* tslint:enable:max-line-length */
+  static create<T>(func: Function,
+                   selector: Function | void = undefined,
+                   scheduler?: SchedulerLike): (...args: any[]) => Observable<T> {
+    return bindNodeCallback(func, <any>selector, scheduler);
+  }
+}
diff --git a/compat/observable/DeferObservable.ts b/compat/observable/DeferObservable.ts
@@ -0,0 +1,7 @@
+import { Observable, SubscribableOrPromise, defer } from 'rxjs';
+
+export class DeferObservable<T> extends Observable<T> {
+  static create<T>(observableFactory: () => SubscribableOrPromise<T> | void): Observable<T> {
+    return defer(observableFactory);
+  }
+}
diff --git a/compat/observable/EmptyObservable.ts b/compat/observable/EmptyObservable.ts
@@ -0,0 +1,7 @@
+import { Observable, SchedulerLike, empty } from 'rxjs';
+
+export class EmptyObservable<T> extends Observable<T> {
+  static create<T>(scheduler?: SchedulerLike): Observable<T> {
+    return empty(scheduler);
+  }
+}
diff --git a/compat/observable/ErrorObservable.ts b/compat/observable/ErrorObservable.ts
@@ -0,0 +1,7 @@
+import { Observable, SchedulerLike, throwError } from 'rxjs';
+
+export class ErrorObservable<T> extends Observable<T> {
+  static create<T>(error: any, scheduler?: SchedulerLike) {
+    return throwError(error, scheduler);
+  }
+}
diff --git a/compat/observable/ForkJoinObservable.ts b/compat/observable/ForkJoinObservable.ts
@@ -0,0 +1,29 @@
+import { Observable, SubscribableOrPromise, forkJoin } from 'rxjs';
+
+export class ForkJoinObservable<T> extends Observable<T> {
+  /* tslint:disable:max-line-length */
+  static create<T, T2>(v1: SubscribableOrPromise<T>, v2: SubscribableOrPromise<T2>): Observable<[T, T2]>;
+  static create<T, T2, T3>(v1: SubscribableOrPromise<T>, v2: SubscribableOrPromise<T2>, v3: SubscribableOrPromise<T3>): Observable<[T, T2, T3]>;
+  static create<T, T2, T3, T4>(v1: SubscribableOrPromise<T>, v2: SubscribableOrPromise<T2>, v3: SubscribableOrPromise<T3>, v4: SubscribableOrPromise<T4>): Observable<[T, T2, T3, T4]>;
+  static create<T, T2, T3, T4, T5>(v1: SubscribableOrPromise<T>, v2: SubscribableOrPromise<T2>, v3: SubscribableOrPromise<T3>, v4: SubscribableOrPromise<T4>, v5: SubscribableOrPromise<T5>): Observable<[T, T2, T3, T4, T5]>;
+  static create<T, T2, T3, T4, T5, T6>(v1: SubscribableOrPromise<T>, v2: SubscribableOrPromise<T2>, v3: SubscribableOrPromise<T3>, v4: SubscribableOrPromise<T4>, v5: SubscribableOrPromise<T5>, v6: SubscribableOrPromise<T6>): Observable<[T, T2, T3, T4, T5, T6]>;
+  static create<T, R>(v1: SubscribableOrPromise<T>, project: (v1: T) => R): Observable<R>;
+  static create<T, T2, R>(v1: SubscribableOrPromise<T>, v2: SubscribableOrPromise<T2>, project: (v1: T, v2: T2) => R): Observable<R>;
+  static create<T, T2, T3, R>(v1: SubscribableOrPromise<T>, v2: SubscribableOrPromise<T2>, v3: SubscribableOrPromise<T3>, project: (v1: T, v2: T2, v3: T3) => R): Observable<R>;
+  static create<T, T2, T3, T4, R>(v1: SubscribableOrPromise<T>, v2: SubscribableOrPromise<T2>, v3: SubscribableOrPromise<T3>, v4: SubscribableOrPromise<T4>, project: (v1: T, v2: T2, v3: T3, v4: T4) => R): Observable<R>;
+  static create<T, T2, T3, T4, T5, R>(v1: SubscribableOrPromise<T>, v2: SubscribableOrPromise<T2>, v3: SubscribableOrPromise<T3>, v4: SubscribableOrPromise<T4>, v5: SubscribableOrPromise<T5>, project: (v1: T, v2: T2, v3: T3, v4: T4, v5: T5) => R): Observable<R>;
+  static create<T, T2, T3, T4, T5, T6, R>(v1: SubscribableOrPromise<T>, v2: SubscribableOrPromise<T2>, v3: SubscribableOrPromise<T3>, v4: SubscribableOrPromise<T4>, v5: SubscribableOrPromise<T5>, v6: SubscribableOrPromise<T6>, project: (v1: T, v2: T2, v3: T3, v4: T4, v5: T5, v6: T6) => R): Observable<R>;
+  static create<T>(sources: SubscribableOrPromise<T>[]): Observable<T[]>;
+  static create<R>(sources: SubscribableOrPromise<any>[]): Observable<R>;
+  static create<T, R>(sources: SubscribableOrPromise<T>[], project: (...values: Array<T>) => R): Observable<R>;
+  static create<R>(sources: SubscribableOrPromise<any>[], project: (...values: Array<any>) => R): Observable<R>;
+  static create<T>(...sources: SubscribableOrPromise<T>[]): Observable<T[]>;
+  static create<R>(...sources: SubscribableOrPromise<any>[]): Observable<R>;
+  /* tslint:enable:max-line-length */
+
+  static create<T>(...sources: Array<SubscribableOrPromise<any> |
+    Array<SubscribableOrPromise<any>> |
+    ((...values: Array<any>) => any)>): Observable<T> {
+    return forkJoin(...sources);
+  }
+}
diff --git a/compat/observable/FromEventObservable.ts b/compat/observable/FromEventObservable.ts
@@ -0,0 +1,18 @@
+import { Observable, fromEvent } from 'rxjs';
+import { EventTargetLike } from 'rxjs/internal-compatibility';
+
+export class FromEventObservable<T> extends Observable<T> {
+  /* tslint:disable:max-line-length */
+  static create<T>(target: EventTargetLike, eventName: string): Observable<T>;
+  static create<T>(target: EventTargetLike, eventName: string, selector: ((...args: any[]) => T)): Observable<T>;
+  static create<T>(target: EventTargetLike, eventName: string, options: EventListenerOptions): Observable<T>;
+  static create<T>(target: EventTargetLike, eventName: string, options: EventListenerOptions, selector: ((...args: any[]) => T)): Observable<T>;
+  /* tslint:enable:max-line-length */
+
+  static create<T>(target: EventTargetLike,
+                   eventName: string,
+                   options?: EventListenerOptions | ((...args: any[]) => T),
+                   selector?: ((...args: any[]) => T)): Observable<T> {
+    return fromEvent(target, eventName, options as EventListenerOptions, selector);
+  }
+}
diff --git a/compat/observable/FromEventPatternObservable.ts b/compat/observable/FromEventPatternObservable.ts
@@ -0,0 +1,9 @@
+import { Observable, fromEventPattern } from 'rxjs';
+
+export class FromEventPatternObservable<T> extends Observable<T> {
+  static create<T>(addHandler: (handler: Function) => any,
+                   removeHandler?: (handler: Function, signal?: any) => void,
+                   selector?: (...args: Array<any>) => T) {
+    return fromEventPattern(addHandler, removeHandler, selector);
+  }
+}
diff --git a/compat/observable/FromObservable.ts b/compat/observable/FromObservable.ts
@@ -0,0 +1,9 @@
+import { Observable, ObservableInput, SchedulerLike, from } from 'rxjs';
+
+export class FromObservable<T> extends Observable<T> {
+  static create<T>(ish: ObservableInput<T>, scheduler?: SchedulerLike): Observable<T>;
+  static create<T, R>(ish: ArrayLike<T>, scheduler?: SchedulerLike): Observable<R>;
+  static create<T>(ish: ObservableInput<T>, scheduler?: SchedulerLike): Observable<T> {
+    return from(ish, scheduler);
+  }
+}
diff --git a/compat/observable/GenerateObservable.ts b/compat/observable/GenerateObservable.ts
@@ -0,0 +1,19 @@
+import { Observable, SchedulerLike, generate } from 'rxjs';
+import { ConditionFunc, IterateFunc, ResultFunc, GenerateBaseOptions, GenerateOptions } from 'rxjs/internal-compatibility';
+
+export class GenerateObservable<T> extends Observable<T> {
+  /* tslint:disable:max-line-length */
+  static create<T, S>(initialState: S, condition: ConditionFunc<S>, iterate: IterateFunc<S>, resultSelector: ResultFunc<S, T>, scheduler?: SchedulerLike): Observable<T>;
+  static create<S>(initialState: S, condition: ConditionFunc<S>, iterate: IterateFunc<S>, scheduler?: SchedulerLike): Observable<S>;
+  static create<S>(options: GenerateBaseOptions<S>): Observable<S>;
+  static create<T, S>(options: GenerateOptions<T, S>): Observable<T>;
+  /* tslint:enable:max-line-length */
+
+  static create<T, S>(initialStateOrOptions: S | GenerateOptions<T, S>,
+                      condition?: ConditionFunc<S>,
+                      iterate?: IterateFunc<S>,
+                      resultSelectorOrObservable?: (ResultFunc<S, T>) | SchedulerLike,
+                      scheduler?: SchedulerLike): Observable<T> {
+    return generate(<S>initialStateOrOptions, condition, iterate, <ResultFunc<S, T>>resultSelectorOrObservable, scheduler);
+  }
+}
diff --git a/compat/observable/IfObservable.ts b/compat/observable/IfObservable.ts
@@ -0,0 +1,9 @@
+import { Observable, SubscribableOrPromise, iif } from 'rxjs';
+
+export class IfObservable<T> extends Observable<T> {
+  static create<T, R>(condition: () => boolean | void,
+                      thenSource?: SubscribableOrPromise<T> | void,
+                      elseSource?: SubscribableOrPromise<R> | void): Observable<T|R> {
+    return iif(<() => boolean>condition, <SubscribableOrPromise<T>>thenSource, <SubscribableOrPromise<R>>elseSource);
+  }
+}
diff --git a/compat/observable/IntervalObservable.ts b/compat/observable/IntervalObservable.ts
@@ -0,0 +1,8 @@
+import { Observable, SchedulerLike, asyncScheduler, interval } from 'rxjs';
+
+export class IntervalObservable<T> extends Observable<T> {
+  static create(period: number = 0,
+                scheduler: SchedulerLike = asyncScheduler): Observable<number> {
+    return interval(period, scheduler);
+  }
+}
diff --git a/compat/observable/IteratorObservable.ts b/compat/observable/IteratorObservable.ts
@@ -0,0 +1,7 @@
+import { Observable, SchedulerLike, from } from 'rxjs';
+
+export class IteratorObservable<T> extends Observable<T> {
+  static create<T>(iterator: any, scheduler?: SchedulerLike) {
+    return from<T>(iterator, scheduler);
+  }
+}
diff --git a/compat/observable/NeverObservable.ts b/compat/observable/NeverObservable.ts
@@ -0,0 +1,7 @@
+import { Observable, SchedulerLike, NEVER } from 'rxjs';
+
+export class NeverObservable<T> extends Observable<T> {
+  static create<T>() {
+    return NEVER;
+  }
+}
diff --git a/compat/observable/PairsObservable.ts b/compat/observable/PairsObservable.ts
@@ -0,0 +1,7 @@
+import { Observable, SchedulerLike, pairs } from 'rxjs';
+
+export class PairsObservable<T> extends Observable<T> {
+  static create<T>(obj: Object, scheduler?: SchedulerLike): Observable<(string | T)[]> {
+    return pairs(obj, scheduler);
+  }
+}
diff --git a/compat/observable/PromiseObservable.ts b/compat/observable/PromiseObservable.ts
@@ -0,0 +1,7 @@
+import { Observable, SchedulerLike, from } from 'rxjs';
+
+export class PromiseObservable<T> extends Observable<T> {
+  static create<T>(promise: PromiseLike<T>, scheduler?: SchedulerLike): Observable<T> {
+    return from(promise, scheduler);
+  }
+}
diff --git a/compat/observable/RangeObservable.ts b/compat/observable/RangeObservable.ts
@@ -0,0 +1,9 @@
+import { Observable, SchedulerLike, range } from 'rxjs';
+
+export class RangeObservable<T> extends Observable<T> {
+  static create(start: number = 0,
+                count: number = 0,
+                scheduler?: SchedulerLike): Observable<number> {
+    return range(start, count, scheduler);
+  }
+}
diff --git a/compat/observable/ScalarObservable.ts b/compat/observable/ScalarObservable.ts
@@ -0,0 +1,7 @@
+import { Observable, SchedulerLike, of } from 'rxjs';
+
+export class ScalarObservable<T> extends Observable<T> {
+  static create<T>(value: T, scheduler?: SchedulerLike) {
+    return arguments.length > 1 ? of(value, scheduler) : of(value);
+  }
+}
diff --git a/compat/observable/TimerObservable.ts b/compat/observable/TimerObservable.ts
@@ -0,0 +1,9 @@
+import { Observable, SchedulerLike, timer } from 'rxjs';
+
+export class TimerObservable<T> extends Observable<T> {
+  static create(initialDelay: number | Date = 0,
+                period?: number | SchedulerLike,
+                scheduler?: SchedulerLike): Observable<number> {
+    return timer(initialDelay, period, scheduler);
+  }
+}
diff --git a/compat/observable/UsingObservable.ts b/compat/observable/UsingObservable.ts
@@ -0,0 +1,8 @@
+import { Observable, Unsubscribable, SubscribableOrPromise, using } from 'rxjs';
+
+export class UsingObservable<T> extends Observable<T> {
+  static create<T>(resourceFactory: () => Unsubscribable | void,
+                   observableFactory: (resource: Unsubscribable | void) => SubscribableOrPromise<T> | void): Observable<T> {
+    return using(resourceFactory, observableFactory);
+  }
+}
diff --git a/compat/observable/fromObservable.ts b/compat/observable/fromObservable.ts
diff --git a/legacy-reexport/observable/ArrayLikeObservable.ts b/legacy-reexport/observable/ArrayLikeObservable.ts
@@ -0,0 +1 @@
+export * from 'rxjs-compat/observable/ArrayLikeObservable';
diff --git a/legacy-reexport/observable/ArrayObservable.ts b/legacy-reexport/observable/ArrayObservable.ts
@@ -0,0 +1 @@
+export * from 'rxjs-compat/observable/ArrayObservable';
diff --git a/legacy-reexport/observable/BoundCallbackObservable.ts b/legacy-reexport/observable/BoundCallbackObservable.ts
@@ -0,0 +1 @@
+export * from 'rxjs-compat/observable/BoundCallbackObservable';
diff --git a/legacy-reexport/observable/BoundNodeCallbackObservable.ts b/legacy-reexport/observable/BoundNodeCallbackObservable.ts
@@ -0,0 +1 @@
+export * from 'rxjs-compat/observable/BoundNodeCallbackObservable';
diff --git a/legacy-reexport/observable/DeferObservable.ts b/legacy-reexport/observable/DeferObservable.ts
@@ -0,0 +1 @@
+export * from 'rxjs-compat/observable/DeferObservable';
diff --git a/legacy-reexport/observable/EmptyObservable.ts b/legacy-reexport/observable/EmptyObservable.ts
@@ -0,0 +1 @@
+export * from 'rxjs-compat/observable/EmptyObservable';
diff --git a/legacy-reexport/observable/ErrorObservable.ts b/legacy-reexport/observable/ErrorObservable.ts
@@ -0,0 +1 @@
+export * from 'rxjs-compat/observable/ErrorObservable';
diff --git a/legacy-reexport/observable/ForkJoinObservable.ts b/legacy-reexport/observable/ForkJoinObservable.ts
@@ -0,0 +1 @@
+export * from 'rxjs-compat/observable/ForkJoinObservable';
diff --git a/legacy-reexport/observable/FromEventObservable.ts b/legacy-reexport/observable/FromEventObservable.ts
@@ -0,0 +1 @@
+export * from 'rxjs-compat/observable/FromEventObservable';
diff --git a/legacy-reexport/observable/FromEventPatternObservable.ts b/legacy-reexport/observable/FromEventPatternObservable.ts
@@ -0,0 +1 @@
+export * from 'rxjs-compat/observable/FromEventPatternObservable';
diff --git a/legacy-reexport/observable/FromObservable.ts b/legacy-reexport/observable/FromObservable.ts
@@ -0,0 +1 @@
+export * from 'rxjs-compat/observable/FromObservable';
diff --git a/legacy-reexport/observable/GenerateObservable.ts b/legacy-reexport/observable/GenerateObservable.ts
@@ -0,0 +1 @@
+export * from 'rxjs-compat/observable/GenerateObservable';
diff --git a/legacy-reexport/observable/IfObservable.ts b/legacy-reexport/observable/IfObservable.ts
@@ -0,0 +1 @@
+export * from 'rxjs-compat/observable/IfObservable';
diff --git a/legacy-reexport/observable/IntervalObservable.ts b/legacy-reexport/observable/IntervalObservable.ts
@@ -0,0 +1 @@
+export * from 'rxjs-compat/observable/IntervalObservable';
diff --git a/legacy-reexport/observable/IteratorObservable.ts b/legacy-reexport/observable/IteratorObservable.ts
@@ -0,0 +1 @@
+export * from 'rxjs-compat/observable/IteratorObservable';
diff --git a/legacy-reexport/observable/NeverObservable.ts b/legacy-reexport/observable/NeverObservable.ts
@@ -0,0 +1 @@
+export * from 'rxjs-compat/observable/NeverObservable';
diff --git a/legacy-reexport/observable/PairsObservable.ts b/legacy-reexport/observable/PairsObservable.ts
@@ -0,0 +1 @@
+export * from 'rxjs-compat/observable/PairsObservable';
diff --git a/legacy-reexport/observable/PromiseObservable.ts b/legacy-reexport/observable/PromiseObservable.ts
@@ -0,0 +1 @@
+export * from 'rxjs-compat/observable/PromiseObservable';
diff --git a/legacy-reexport/observable/RangeObservable.ts b/legacy-reexport/observable/RangeObservable.ts
@@ -0,0 +1 @@
+export * from 'rxjs-compat/observable/RangeObservable';
diff --git a/legacy-reexport/observable/ScalarObservable.ts b/legacy-reexport/observable/ScalarObservable.ts
@@ -0,0 +1 @@
+export * from 'rxjs-compat/observable/ScalarObservable';
diff --git a/legacy-reexport/observable/TimerObservable.ts b/legacy-reexport/observable/TimerObservable.ts
@@ -0,0 +1 @@
+export * from 'rxjs-compat/observable/TimerObservable';
diff --git a/legacy-reexport/observable/UsingObservable.ts b/legacy-reexport/observable/UsingObservable.ts
@@ -0,0 +1 @@
+export * from 'rxjs-compat/observable/UsingObservable';
diff --git a/legacy-reexport/observable/fromObservable.ts b/legacy-reexport/observable/fromObservable.ts
diff --git a/spec/observables/ScalarObservable-spec.ts b/spec/observables/ScalarObservable-spec.ts
@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import * as Rx from 'rxjs/Rx';
-import { scalar } from 'rxjs/observable/scalar';
+import { of as scalar } from 'rxjs';
 
 declare const rxTestScheduler: Rx.TestScheduler;
 
diff --git a/src/internal-compatibility/index.ts b/src/internal-compatibility/index.ts
@@ -15,6 +15,8 @@ export { AjaxRequest, AjaxCreationMethod, ajaxGet, ajaxPost, ajaxDelete, ajaxPut
   AjaxObservable, AjaxSubscriber, AjaxResponse, AjaxError, AjaxTimeoutError } from '../internal/observable/dom/AjaxObservable';
 export { WebSocketSubjectConfig, WebSocketSubject } from '../internal/observable/dom/WebSocketSubject';
 export { CombineLatestOperator } from '../internal/observable/combineLatest';
+export { EventTargetLike } from '../internal/observable/fromEvent';
+export { ConditionFunc, IterateFunc, ResultFunc, GenerateBaseOptions, GenerateOptions } from '../internal/observable/generate';
 export { dispatch } from '../internal/observable/range';
 export { SubscribeOnObservable } from '../internal/observable/SubscribeOnObservable';
 
