WIP: Handles

.gitignore

@@ -3,3 +3,4 @@ experiments/
 node_modules/
 build/
 coverage/
+perf/logs/

package.json

@@ -6,7 +6,8 @@
   "jsnext:main": "dist/creed.es.js",
   "files": [
     "dist/creed.js",
-    "dist/creed.es.js"
+    "dist/creed.es.js",
+    "dist/creed.node.js"
   ],
   "repository": {
     "type": "git",
@@ -28,13 +29,13 @@
   "scripts": {
     "compile": "npm run compile-src",
     "compile-src": "mkdirp build/src && buble -m -i src -o build/src --no modules",
-    "build-dist": "npm run compile && mkdirp dist && rollup -c",
-    "build": "npm run build-dist && uglifyjs -c 'warnings=false' -m -o dist/creed.min.js -- dist/creed.js",
+    "build-dist": "npm run compile && mkdirp dist && rollup -c && rollup -f cjs -o dist/creed.node.js src/main.js",
+    "build": "npm run build-dist && uglifyjs -c \"warnings=false\" -m -o dist/creed.min.js -- dist/creed.js",
     "preversion": "npm run build",
     "check-coverage": "istanbul check-coverage --statements 100 --branches 100 --lines 100 --functions 100 coverage/coverage*.json",
     "lint": "jsinspect src && eslint src",
     "pretest": "npm run lint",
-    "test": "istanbul cover _mocha",
+    "test": "istanbul cover node_modules/mocha/bin/_mocha",
     "posttest": "npm run test-aplus",
     "test-aplus": "promises-aplus-tests test/aplus.js --reporter dot"
   },

perf/doxbee-sequential-errors/promises-creed-algebraic.js

@@ -2,7 +2,7 @@ global.useCreed = true;
 global.useQ = false;
 global.useBluebird = false;
 
-var creed = require('../../dist/creed');
+var creed = require('../..');
 
 require('../lib/fakesP');
 

perf/doxbee-sequential-errors/promises-creed-generator.js

@@ -2,7 +2,7 @@ global.useCreed = true;
 global.useQ = false;
 global.useBluebird = false;
 
-var creed = require('../../dist/creed');
+var creed = require('../..');
 
 require('../lib/fakesP');
 

perf/doxbee-sequential-errors/promises-creed.js

@@ -2,7 +2,7 @@ global.useCreed = true;
 global.useQ = false;
 global.useBluebird = false;
 
-var creed = require('../../dist/creed');
+var creed = require('../..');
 
 require('../lib/fakesP');
 

perf/doxbee-sequential/promises-creed-algebraic.js

@@ -2,7 +2,7 @@ global.useCreed = true;
 global.useQ = false;
 global.useBluebird = false;
 
-var creed = require('../../dist/creed');
+var creed = require('../..');
 
 require('../lib/fakesP');
 
@@ -52,7 +52,7 @@ module.exports = function upload(stream, idOrPath, tag, done) {
     }).chain(function() {
         return File.whereUpdate({id: fileId}, {version: version.id})
             .execWithin(tx);
-    }).map(function() {
+    }).then(function() {
         tx.commit();
         return done();
     }, function(err) {

perf/doxbee-sequential/promises-creed-generator.js

@@ -1,7 +1,7 @@
 global.useBluebird = false;
 global.useQ = false;
 global.useCreed = true;
-var creed = require('../../dist/creed');
+var creed = require('../..');
 require('../lib/fakesP');
 
 module.exports = creed.coroutine(function* upload(stream, idOrPath, tag, done) {

perf/doxbee-sequential/promises-creed.js

@@ -2,7 +2,7 @@ global.useCreed = true;
 global.useQ = false;
 global.useBluebird = false;
 
-var creed = require('../../dist/creed');
+var creed = require('../..');
 
 require('../lib/fakesP');
 

perf/lib/fakesP.js

@@ -83,7 +83,7 @@ else if (global.useNative) {
     };
 }
 else if (global.useCreed) {
-    var lifter = require('../../dist/creed').fromNode;
+    var lifter = require('../..').fromNode;
 }
 else {
     var lifter = require('when/node').lift;

perf/madeup-parallel/promises-creed-generator.js

@@ -3,7 +3,7 @@ global.useQ = false;
 global.useWhen = false;
 
 global.useCreed = true;
-var creed = require('../../dist/creed');
+var creed = require('../..');
 require('../lib/fakesP');
 
 module.exports = creed.coroutine(function* upload(stream, idOrPath, tag, done) {

perf/madeup-parallel/promises-creed.js

@@ -4,7 +4,7 @@ global.useWhen = false;
 
 global.useCreed = true;
 
-var creed = require('../../dist/creed');
+var creed = require('../..');
 
 require('../lib/fakesP');
 

perf/performance.js

@@ -1,6 +1,5 @@
 
 var args = require('optimist').argv;
-
 var path = require('path');
 
 global.LIKELIHOOD_OF_REJECTION = args.e || 0.1;
@@ -138,7 +137,7 @@ function measure(files, requests, time, parg, callback) {
     async.mapSeries(files, function(f, done) {
         console.log("benchmarking", f);
         var logFile = path.basename(f) + ".log";
-        var profileFlags = ["--prof", "--logfile=C:/etc/v8/" + logFile];
+        var profileFlags = ["--prof", "--logfile=logs/" + logFile];
 
         var argsFork = [__filename,
             '--n', requests,

src/Action.js

@@ -0,0 +1,57 @@
+import { Handle, ShareHandle } from './Handle'
+
+export default class Action extends Handle {
+	constructor (promise) {
+		super(null) // ref will be set when used as handle
+		this.promise = promise
+	}
+
+	_concat (action) {
+		if (!action._isReused() && (this._isReused() || action instanceof ShareHandle)) {
+			return action._concat(this)
+		} else {
+			return new ShareHandle(this.ref)._concat(this)._concat(action)
+		}
+	}
+	run () {
+		const settled = this.ref
+		if (this._isReused()) {
+			this.ref = null // make action reusable elsewhere
+		}
+		settled._runAction(this)
+	}
+
+	// default onFulfilled action
+	/* istanbul ignore next */
+	fulfilled (p) {
+		this.promise._become(p)
+	}
+
+	// default onRejected action
+	rejected (p) {
+		this.promise._become(p)
+		return false
+	}
+
+	tryCall (f, x) {
+		let result
+		try {
+			result = f(x)
+		} catch (e) {
+			this.promise._reject(e)
+			return
+		} // else
+		this.handle(result)
+	}
+
+	tryCallContext (f, c, x) {
+		let result
+		try {
+			result = f.call(c, x)
+		} catch (e) {
+			this.promise._reject(e)
+			return
+		} // else
+		this.handle(result)
+	}
+}

src/Any.js

@@ -1,4 +1,4 @@
-import { silenceError } from './inspect.js'
+import { silenceError } from './Promise' // deferred
 
 export default class Any {
 	constructor () {

src/ErrorHandler.js

@@ -1,20 +1,22 @@
-import { silenceError, isHandled } from './inspect'
+import { silenceError } from './Promise' // deferred
+import { isHandled } from './inspect'
 
-const UNHANDLED_REJECTION = 'unhandledRejection'
-const HANDLED_REJECTION = 'rejectionHandled'
+export const UNHANDLED_REJECTION = 'unhandledRejection'
+export const HANDLED_REJECTION = 'rejectionHandled'
 
 export default class ErrorHandler {
 	constructor (emitEvent, reportError) {
 		this.errors = []
 		this.emit = emitEvent
 		this.reportError = reportError
+		this.report = () => this._reportErrors()
 	}
 
 	track (e) {
 		if (!this.emit(UNHANDLED_REJECTION, e, e.value)) {
 			/* istanbul ignore else */
 			if (this.errors.length === 0) {
-				setTimeout(reportErrors, 1, this.reportError, this.errors)
+				setTimeout(this.report, 1)
 			}
 			this.errors.push(e)
 		}
@@ -24,22 +26,22 @@ export default class ErrorHandler {
 		silenceError(e)
 		this.emit(HANDLED_REJECTION, e)
 	}
-}
 
-function reportErrors (report, errors) {
-	try {
-		reportAll(errors, report)
-	} finally {
-		errors.length = 0
+	_reportErrors () {
+		try {
+			this._reportAll(this.errors)
+		} finally {
+			this.errors.length = 0
+		}
 	}
-}
 
-function reportAll (errors, report) {
-	for (let i = 0; i < errors.length; ++i) {
-		const e = errors[i]
-		/* istanbul ignore else */
-		if (!isHandled(e)) {
-			report(e)
+	_reportAll (errors) {
+		for (let i = 0; i < errors.length; ++i) {
+			const e = errors[i]
+			/* istanbul ignore else */
+			if (!isHandled(e)) {
+				this.reportError(e)
+			}
 		}
 	}
 }

src/Handle.js

@@ -0,0 +1,33 @@
+export class Handle {
+	constructor (ref) {
+		this.ref = ref // a ShareHandle, known Promise or unresolved Future
+	}
+	_getRef () {
+		return this.ref
+	}
+	// the ref will be lost, e.g. when an action is used multiple times
+	_isReused () {
+		return false // ref is stable by default
+	}
+}
+
+export class ShareHandle extends Handle {
+	constructor (ref) {
+		// assert: ref != null
+		super(ref)
+		this.length = 0
+	}
+	_concat (action) {
+		action.ref = this
+		this[this.length++] = action
+		// potential for flattening the tree here
+		return this
+	}
+	run () {
+		for (let i = 0; i < this.length; ++i) {
+			this.ref._runAction(this[i])
+			this[i] = void 0
+		}
+		this.length = 0
+	}
+}