'use strict';
// https://github.com/tc39/proposal-observable
var $ = require('../internals/export');
+var global = require('../internals/global');
+var call = require('../internals/function-call');
var DESCRIPTORS = require('../internals/descriptors');
var setSpecies = require('../internals/set-species');
-var aFunction = require('../internals/a-function');
+var aCallable = require('../internals/a-callable');
+var isCallable = require('../internals/is-callable');
+var isConstructor = require('../internals/is-constructor');
var anObject = require('../internals/an-object');
var isObject = require('../internals/is-object');
var anInstance = require('../internals/an-instance');
var defineProperty = require('../internals/object-define-property').f;
-var createNonEnumerableProperty = require('../internals/create-non-enumerable-property');
+var redefine = require('../internals/redefine');
var redefineAll = require('../internals/redefine-all');
var getIterator = require('../internals/get-iterator');
+var getMethod = require('../internals/get-method');
var iterate = require('../internals/iterate');
var hostReportErrors = require('../internals/host-report-errors');
var wellKnownSymbol = require('../internals/well-known-symbol');
var OBSERVABLE = wellKnownSymbol('observable');
var getInternalState = InternalStateModule.get;
var setInternalState = InternalStateModule.set;
-
-var getMethod = function (fn) {
- return fn == null ? undefined : aFunction(fn);
-};
+var Array = global.Array;
var cleanupSubscription = function (subscriptionState) {
var cleanup = subscriptionState.cleanup;
return subscriptionState.observer === undefined;
};
-var close = function (subscription, subscriptionState) {
+var close = function (subscriptionState) {
+ var subscription = subscriptionState.facade;
if (!DESCRIPTORS) {
subscription.closed = true;
var subscriptionObserver = subscriptionState.subscriptionObserver;
var start;
if (!DESCRIPTORS) this.closed = false;
try {
- if (start = getMethod(observer.start)) start.call(observer, this);
+ if (start = getMethod(observer, 'start')) call(start, observer, this);
} catch (error) {
hostReportErrors(error);
}
try {
var cleanup = subscriber(subscriptionObserver);
var subscription = cleanup;
- if (cleanup != null) subscriptionState.cleanup = typeof cleanup.unsubscribe === 'function'
+ if (cleanup != null) subscriptionState.cleanup = isCallable(cleanup.unsubscribe)
? function () { subscription.unsubscribe(); }
- : aFunction(cleanup);
+ : aCallable(cleanup);
} catch (error) {
subscriptionObserver.error(error);
return;
unsubscribe: function unsubscribe() {
var subscriptionState = getInternalState(this);
if (!subscriptionClosed(subscriptionState)) {
- close(this, subscriptionState);
+ close(subscriptionState);
cleanupSubscription(subscriptionState);
}
}
if (!subscriptionClosed(subscriptionState)) {
var observer = subscriptionState.observer;
try {
- var nextMethod = getMethod(observer.next);
- if (nextMethod) nextMethod.call(observer, value);
+ var nextMethod = getMethod(observer, 'next');
+ if (nextMethod) call(nextMethod, observer, value);
} catch (error) {
hostReportErrors(error);
}
}
},
error: function error(value) {
- var subscription = getInternalState(this).subscription;
- var subscriptionState = getInternalState(subscription);
+ var subscriptionState = getInternalState(getInternalState(this).subscription);
if (!subscriptionClosed(subscriptionState)) {
var observer = subscriptionState.observer;
- close(subscription, subscriptionState);
+ close(subscriptionState);
try {
- var errorMethod = getMethod(observer.error);
- if (errorMethod) errorMethod.call(observer, value);
+ var errorMethod = getMethod(observer, 'error');
+ if (errorMethod) call(errorMethod, observer, value);
else hostReportErrors(value);
} catch (err) {
hostReportErrors(err);
}
},
complete: function complete() {
- var subscription = getInternalState(this).subscription;
- var subscriptionState = getInternalState(subscription);
+ var subscriptionState = getInternalState(getInternalState(this).subscription);
if (!subscriptionClosed(subscriptionState)) {
var observer = subscriptionState.observer;
- close(subscription, subscriptionState);
+ close(subscriptionState);
try {
- var completeMethod = getMethod(observer.complete);
- if (completeMethod) completeMethod.call(observer);
+ var completeMethod = getMethod(observer, 'complete');
+ if (completeMethod) call(completeMethod, observer);
} catch (error) {
hostReportErrors(error);
} cleanupSubscription(subscriptionState);
});
var $Observable = function Observable(subscriber) {
- anInstance(this, $Observable, 'Observable');
- setInternalState(this, { subscriber: aFunction(subscriber) });
+ anInstance(this, ObservablePrototype);
+ setInternalState(this, { subscriber: aCallable(subscriber) });
};
-redefineAll($Observable.prototype, {
+var ObservablePrototype = $Observable.prototype;
+
+redefineAll(ObservablePrototype, {
subscribe: function subscribe(observer) {
var length = arguments.length;
- return new Subscription(typeof observer === 'function' ? {
+ return new Subscription(isCallable(observer) ? {
next: observer,
error: length > 1 ? arguments[1] : undefined,
complete: length > 2 ? arguments[2] : undefined
redefineAll($Observable, {
from: function from(x) {
- var C = typeof this === 'function' ? this : $Observable;
- var observableMethod = getMethod(anObject(x)[OBSERVABLE]);
+ var C = isConstructor(this) ? this : $Observable;
+ var observableMethod = getMethod(anObject(x), OBSERVABLE);
if (observableMethod) {
- var observable = anObject(observableMethod.call(x));
+ var observable = anObject(call(observableMethod, x));
return observable.constructor === C ? observable : new C(function (observer) {
return observable.subscribe(observer);
});
});
},
of: function of() {
- var C = typeof this === 'function' ? this : $Observable;
+ var C = isConstructor(this) ? this : $Observable;
var length = arguments.length;
- var items = new Array(length);
+ var items = Array(length);
var index = 0;
while (index < length) items[index] = arguments[index++];
return new C(function (observer) {
}
});
-createNonEnumerableProperty($Observable.prototype, OBSERVABLE, function () { return this; });
+redefine(ObservablePrototype, OBSERVABLE, function () { return this; });
$({ global: true }, {
Observable: $Observable