Merge pull request #382 from cujojs/combine-timer-async-env

Combine async and timer modules into single env module

Author: briancavalier

lib/Promise.js

@@ -7,7 +7,7 @@ define(function (require) {
 
 	var makePromise = require('./makePromise');
 	var Scheduler = require('./Scheduler');
-	var async = require('./async');
+	var async = require('./env').asap;
 
 	return makePromise({
 		scheduler: new Scheduler(async)

lib/async.js

@@ -5,11 +5,11 @@
 (function(define) { 'use strict';
 define(function(require) {
 
-	var timer = require('../timer');
+	var env = require('../env');
 	var TimeoutError = require('../TimeoutError');
 
 	function setTimeout(f, ms, x, y) {
-		return timer.set(function() {
+		return env.setTimer(function() {
 			f(x, y, ms);
 		}, ms);
 	}
@@ -52,11 +52,11 @@ define(function(require) {
 
 			this._handler.visit(h,
 				function onFulfill(x) {
-					timer.clear(t);
+					env.clearTimer(t);
 					this.resolve(x); // this = h
 				},
 				function onReject(x) {
-					timer.clear(t);
+					env.clearTimer(t);
 					this.reject(x); // this = h
 				},
 				h.notify);

lib/decorators/timed.js

@@ -5,7 +5,7 @@
 (function(define) { 'use strict';
 define(function(require) {
 
-	var timer = require('../timer');
+	var setTimer = require('../env').setTimer;
 
 	return function unhandledRejection(Promise) {
 		var logError = noop;
@@ -56,7 +56,7 @@ define(function(require) {
 			tasks.push(f, x);
 			if(!running) {
 				running = true;
-				running = timer.set(flush, 0);
+				running = setTimer(flush, 0);
 			}
 		}
 

lib/decorators/unhandledRejection.js

@@ -0,0 +1,73 @@
+/** @license MIT License (c) copyright 2010-2014 original author or authors */
+/** @author Brian Cavalier */
+/** @author John Hann */
+
+/*global process,document,setTimeout,clearTimeout,MutationObserver,WebKitMutationObserver*/
+(function(define) { 'use strict';
+define(function(require) {
+	/*jshint maxcomplexity:6*/
+
+	// Sniff "best" async scheduling option
+	// Prefer process.nextTick or MutationObserver, then check for
+	// setTimeout, and finally vertx, since its the only env that doesn't
+	// have setTimeout
+
+	var MutationObs;
+	var capturedSetTimeout = typeof setTimeout !== 'undefined' && setTimeout;
+
+	// Default env
+	var setTimer = function(f, ms) { return setTimeout(f, ms); };
+	var clearTimer = function(t) { return clearTimeout(t); };
+	var asap = function (f) { return capturedSetTimeout(f, 0); };
+
+	// Detect specific env
+	if (isNode()) { // Node
+		asap = function (f) { return process.nextTick(f); };
+
+	} else if (MutationObs = hasMutationObserver()) { // Modern browser
+		asap = initMutationObserver(MutationObs);
+
+	} else if (!capturedSetTimeout) { // vert.x
+		var vertxRequire = require;
+		var vertx = vertxRequire('vertx');
+		setTimer = function (f, ms) { return vertx.setTimer(ms, f); };
+		clearTimer = vertx.cancelTimer;
+		asap = vertx.runOnLoop || vertx.runOnContext;
+	}
+
+	return {
+		setTimer: setTimer,
+		clearTimer: clearTimer,
+		asap: asap
+	};
+
+	function isNode () {
+		return typeof process !== 'undefined' && process !== null &&
+			typeof process.nextTick === 'function';
+	}
+
+	function hasMutationObserver () {
+		return (typeof MutationObserver === 'function' && MutationObserver) ||
+			(typeof WebKitMutationObserver === 'function' && WebKitMutationObserver);
+	}
+
+	function initMutationObserver(MutationObserver) {
+		var scheduled;
+		var node = document.createTextNode('');
+		var o = new MutationObserver(run);
+		o.observe(node, { characterData: true });
+
+		function run() {
+			var f = scheduled;
+			scheduled = void 0;
+			f();
+		}
+
+		var i = 0;
+		return function (f) {
+			scheduled = f;
+			node.data = (i ^= 1);
+		};
+	}
+});
+}(typeof define === 'function' && define.amd ? define : function(factory) { module.exports = factory(require); }));

lib/env.js

@@ -8,7 +8,7 @@ define(function(require) {
 	var defaultStackJumpSeparator = 'from execution context:';
 	var defaultStackFilter = /[\s\(\/\\](node|module|timers)\.js:|when([\/\\]{1,2}(lib|monitor|es6-shim)[\/\\]{1,2}|\.js)|(new\sPromise)\b|(\b(PromiseMonitor|ConsoleReporter|Scheduler|RunHandlerTask|ProgressTask|Promise|.*Handler)\.[\w_]\w\w+\b)|\b(tryCatch\w+|getHandler\w*)\b/i;
 
-	var setTimer = require('../lib/timer').set;
+	var setTimer = require('../lib/env').setTimer;
 	var error = require('./error');
 
 	var executionContext = [];

lib/timer.js

@@ -14,7 +14,7 @@ define(function(require) {
 	var when = require('./when');
 	var Promise = when.Promise;
 	var _liftAll = require('./lib/liftAll');
-	var setTimer = require('./lib/timer').set;
+	var setTimer = require('./lib/env').setTimer;
 	var slice = Array.prototype.slice;
 
 	return {

monitor/PromiseMonitor.js

@@ -2,7 +2,7 @@
 define(function(require) {
 
 	var when = require('../../when');
-	var async = require('../../lib/async');
+	var async = require('../../lib/env').asap;
 
 	var p = when.reject(new Error('TEST FAILED, should not see this'));