refactor(core): replace with rxjs isObservable

vthinkxie · vthinkxie · commit a6ea5f6c80c0 · 2019-10-22T10:24:14.000+08:00
diff --git a/integration/side-effects/snapshots/common/esm2015.js b/integration/side-effects/snapshots/common/esm2015.js
@@ -1 +1,3 @@
 import "@angular/core";
+
+import "rxjs";
diff --git a/integration/side-effects/snapshots/common/esm5.js b/integration/side-effects/snapshots/common/esm5.js
@@ -1,3 +1,5 @@
 import "tslib";
 
 import "@angular/core";
+
+import "rxjs";
diff --git a/packages/common/src/pipes/async_pipe.ts b/packages/common/src/pipes/async_pipe.ts
@@ -6,8 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ChangeDetectorRef, EventEmitter, OnDestroy, Pipe, PipeTransform, WrappedValue, &#629;isObservable, &#629;isPromise, &#629;looseIdentical} from '@angular/core';
-import {Observable, SubscriptionLike} from 'rxjs';
+import {ChangeDetectorRef, EventEmitter, OnDestroy, Pipe, PipeTransform, WrappedValue, &#629;isPromise, &#629;looseIdentical} from '@angular/core';
+import {Observable, SubscriptionLike, isObservable} from 'rxjs';
 import {invalidPipeArgumentError} from './invalid_pipe_argument_error';
 
 interface SubscriptionStrategy {
@@ -122,7 +122,7 @@ export class AsyncPipe implements OnDestroy, PipeTransform {
       return _promiseStrategy;
     }
 
-    if (&#629;isObservable(obj)) {
+    if (isObservable(obj)) {
       return _observableStrategy;
     }
 
diff --git a/packages/core/src/core_private_export.ts b/packages/core/src/core_private_export.ts
@@ -30,7 +30,7 @@ export {global as &#629;global} from './util/global';
 export {looseIdentical as &#629;looseIdentical,} from './util/comparison';
 export {stringify as &#629;stringify} from './util/stringify';
 export {makeDecorator as &#629;makeDecorator} from './util/decorators';
-export {isObservable as &#629;isObservable, isPromise as &#629;isPromise} from './util/lang';
+export {isPromise as &#629;isPromise} from './util/lang';
 export {clearOverrides as &#629;clearOverrides, initServicesIfNeeded as &#629;initServicesIfNeeded, overrideComponentView as &#629;overrideComponentView, overrideProvider as &#629;overrideProvider} from './view/index';
 export {NOT_FOUND_CHECK_ONLY_ELEMENT_INJECTOR as &#629;NOT_FOUND_CHECK_ONLY_ELEMENT_INJECTOR} from './view/provider';
 export {getLocalePluralCase as &#629;getLocalePluralCase, findLocaleData as &#629;findLocaleData} from './i18n/locale_data_api';
diff --git a/packages/core/src/render3/instructions/listener.ts b/packages/core/src/render3/instructions/listener.ts
@@ -6,9 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-
+import {isObservable} from 'rxjs';
 import {assertDataInRange} from '../../util/assert';
-import {isObservable} from '../../util/lang';
 import {EMPTY_OBJ} from '../empty';
 import {PropertyAliasValue, TNode, TNodeFlags, TNodeType} from '../interfaces/node';
 import {GlobalTargetResolver, RElement, Renderer3, isProceduralRenderer} from '../interfaces/renderer';
diff --git a/packages/core/src/util/lang.ts b/packages/core/src/util/lang.ts
@@ -6,8 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Observable} from 'rxjs';
-
 /**
  * Determine if the argument is shaped like a Promise
  */
@@ -16,12 +14,3 @@ export function isPromise(obj: any): obj is Promise<any> {
   // It's up to the caller to ensure that obj.then conforms to the spec
   return !!obj && typeof obj.then === 'function';
 }
-
-/**
- * Determine if the argument is an Observable
- */
-export function isObservable(obj: any | Observable<any>): obj is Observable<any> {
-  // TODO: use isObservable once we update pass rxjs 6.1
-  // https://github.com/ReactiveX/rxjs/blob/master/CHANGELOG.md#610-2018-05-03
-  return !!obj && typeof obj.subscribe === 'function';
-}
diff --git a/packages/core/src/view/provider.ts b/packages/core/src/view/provider.ts
@@ -5,14 +5,13 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-
+import {isObservable} from 'rxjs';
 import {ChangeDetectorRef, SimpleChange, SimpleChanges, WrappedValue} from '../change_detection/change_detection';
 import {INJECTOR, Injector, resolveForwardRef} from '../di';
 import {ElementRef} from '../linker/element_ref';
 import {TemplateRef} from '../linker/template_ref';
 import {ViewContainerRef} from '../linker/view_container_ref';
 import {Renderer2} from '../render/api';
-import {isObservable} from '../util/lang';
 import {stringify} from '../util/stringify';
 
 import {createChangeDetectorRef, createInjector} from './refs';
diff --git a/packages/core/test/util/lang_spec.ts b/packages/core/test/util/lang_spec.ts
@@ -5,8 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import {isObservable, isPromise} from '@angular/core/src/util/lang';
-import {of } from 'rxjs';
+import {isPromise} from '@angular/core/src/util/lang';
 
 {
   describe('isPromise', () => {
@@ -26,22 +25,4 @@ import {of } from 'rxjs';
       expect(isPromise(null)).toEqual(false);
     });
   });
-
-  describe('isObservable', () => {
-    it('should be true for an Observable', () => expect(isObservable(of (true))).toEqual(true));
-
-    it('should be true if the argument is the object with subscribe function',
-       () => expect(isObservable({subscribe: () => {}})).toEqual(true));
-
-    it('should be false if the argument is undefined',
-       () => expect(isObservable(undefined)).toEqual(false));
-
-    it('should be false if the argument is null', () => expect(isObservable(null)).toEqual(false));
-
-    it('should be false if the argument is an object',
-       () => expect(isObservable({})).toEqual(false));
-
-    it('should be false if the argument is a function',
-       () => expect(isObservable(() => {})).toEqual(false));
-  });
 }
diff --git a/packages/core/test/view/BUILD.bazel b/packages/core/test/view/BUILD.bazel
@@ -17,6 +17,7 @@ ts_library(
         "//packages/core/testing",
         "//packages/platform-browser",
         "//packages/private/testing",
+        "@npm//rxjs",
     ],
 )
 
diff --git a/packages/core/test/view/provider_spec.ts b/packages/core/test/view/provider_spec.ts
@@ -12,6 +12,7 @@ import {ArgumentType, DepFlags, NodeFlags, Services, anchorDef, asElementData, d
 import {TestBed, withModule} from '@angular/core/testing';
 import {&#629;getDOM as getDOM} from '@angular/common';
 import {ivyEnabled} from '@angular/private/testing';
+import {Observable} from 'rxjs';
 
 import {ARG_TYPE_VALUES, checkNodeInlineOrDynamic, createRootView, createAndGetRootNodes, compViewDef, compViewDefFactory} from './helper';
 
@@ -339,15 +340,12 @@ import {ARG_TYPE_VALUES, checkNodeInlineOrDynamic, createRootView, createAndGetR
       it('should listen to provider events', () => {
         let emitter = new EventEmitter<any>();
         let unsubscribeSpy: any;
-
         class SomeService {
-          emitter = {
-            subscribe: (callback: any) => {
-              const subscription = emitter.subscribe(callback);
-              unsubscribeSpy = spyOn(subscription, 'unsubscribe').and.callThrough();
-              return subscription;
-            }
-          };
+          emitter = new Observable((callback: any) => {
+            const subscription = emitter.subscribe(callback);
+            unsubscribeSpy = spyOn(subscription, 'unsubscribe').and.callThrough();
+            return subscription;
+          });
         }
 
         const handleEvent = jasmine.createSpy('handleEvent');
diff --git a/packages/forms/src/validators.ts b/packages/forms/src/validators.ts
@@ -6,8 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {InjectionToken, &#629;isObservable as isObservable, &#629;isPromise as isPromise} from '@angular/core';
-import {Observable, forkJoin, from} from 'rxjs';
+import {InjectionToken, &#629;isPromise as isPromise} from '@angular/core';
+import {Observable, forkJoin, from, isObservable} from 'rxjs';
 import {map} from 'rxjs/operators';
 import {AsyncValidatorFn, ValidationErrors, Validator, ValidatorFn} from './directives/validators';
 import {AbstractControl, FormControl} from './model';
diff --git a/packages/router/src/utils/collection.ts b/packages/router/src/utils/collection.ts
@@ -6,8 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgModuleFactory, &#629;isObservable as isObservable, &#629;isPromise as isPromise} from '@angular/core';
-import {Observable, from, of } from 'rxjs';
+import {NgModuleFactory, &#629;isPromise as isPromise} from '@angular/core';
+import {Observable, from, isObservable, of } from 'rxjs';
 import {concatAll, last as lastValue, map} from 'rxjs/operators';
 
 import {PRIMARY_OUTLET} from '../shared';
diff --git a/tools/testing/init_browser_spec.ts b/tools/testing/init_browser_spec.ts
@@ -16,4 +16,4 @@ TestBed.initTestEnvironment(
 
 (window as any).isNode = false;
 (window as any).isBrowser = true;
-(window as any).global = window;
+(window as any).global = window;

Original file line number	Diff line number	Diff line change
`@@ -1 +1,3 @@`
`1`	`1`	`import "@angular/core";`
	`2`	`+`
	`3`	`+import "rxjs";`
-Original file line number
+Diff line change
 export {looseIdentical as ɵlooseIdentical,} from './util/comparison';
 export {stringify as ɵstringify} from './util/stringify';
 export {makeDecorator as ɵmakeDecorator} from './util/decorators';
 -export {isObservable as ɵisObservable, isPromise as ɵisPromise} from './util/lang';
 +export {isPromise as ɵisPromise} from './util/lang';
 export {clearOverrides as ɵclearOverrides, initServicesIfNeeded as ɵinitServicesIfNeeded, overrideComponentView as ɵoverrideComponentView, overrideProvider as ɵoverrideProvider} from './view/index';
 export {NOT_FOUND_CHECK_ONLY_ELEMENT_INJECTOR as ɵNOT_FOUND_CHECK_ONLY_ELEMENT_INJECTOR} from './view/provider';
 export {getLocalePluralCase as ɵgetLocalePluralCase, findLocaleData as ɵfindLocaleData} from './i18n/locale_data_api';
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ ts_library(`
`17`	`17`	`"//packages/core/testing",`
`18`	`18`	`"//packages/platform-browser",`
`19`	`19`	`"//packages/private/testing",`
	`20`	`+ "@npm//rxjs",`
`20`	`21`	`],`
`21`	`22`	`)`
`22`	`23`