enable ES6 syntax for profiling

bergus · bergus · commit 5c22a6ea587c · 2016-06-25T20:33:50.000+02:00
just switch "main" of package.json to "dist/creed.es6.js"
benchmarks will automatically use it
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@ experiments/
 node_modules/
 build/
 coverage/
+perf/logs/
diff --git a/package.json b/package.json
@@ -5,7 +5,8 @@
   "main": "dist/creed.js",
   "jsnext:main": "src/main.js",
   "files": [
-    "dist/creed.js"
+    "dist/creed.js",
+    "dist/creed.es6.js"
   ],
   "repository": {
     "type": "git",
@@ -25,7 +26,7 @@
     "async"
   ],
   "scripts": {
-    "build-dist": "mkdirp dist && rollup src/main.js | babel -m umd --module-id creed -o dist/creed.js --loose es6.classes",
+    "build-dist": "mkdirp dist && rollup src/main.js -o dist/creed.js --format cjs && babel dist/creed.es6.js -o dist/creed.js -m umd --module-id creed --loose es6.classes",
     "build": "npm run build-dist && uglifyjs -c \"warnings=false\" -m -o dist/creed.min.js -- dist/creed.js",
     "preversion": "npm run build",
     "test-aplus": "promises-aplus-tests test/aplus.js --reporter dot",
diff --git a/perf/doxbee-sequential-errors/promises-creed-algebraic.js b/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');
 
diff --git a/perf/doxbee-sequential-errors/promises-creed-generator.js b/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');
 
diff --git a/perf/doxbee-sequential-errors/promises-creed.js b/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');
 
diff --git a/perf/doxbee-sequential/promises-creed-algebraic.js b/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');
 
diff --git a/perf/doxbee-sequential/promises-creed-generator.js b/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) {
diff --git a/perf/doxbee-sequential/promises-creed.js b/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');
 
diff --git a/perf/lib/fakesP.js b/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;
diff --git a/perf/madeup-parallel/promises-creed-generator.js b/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) {
diff --git a/perf/madeup-parallel/promises-creed.js b/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');
 
diff --git a/perf/performance.js b/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,
diff --git a/src/main.js b/src/main.js
@@ -32,7 +32,7 @@ export {
 // coroutine :: Generator e a -> (...* -> Promise e a)
 // Make a coroutine from a promise-yielding generator
 export function coroutine (generator) {
-	return function (...args) {
+	return function coroutinified (...args) {
 		return runGenerator(generator, this, args)
 	}
 }
@@ -52,7 +52,7 @@ function runGenerator (generator, thisArg, args) {
 // fromNode :: NodeApi e a -> (...args -> Promise e a)
 // Turn a Node API into a promise API
 export function fromNode (f) {
-	return function (...args) {
+	return function promisified (...args) {
 		return runResolver(_runNode, f, this, args, new Future())
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ else if (global.useNative) {`
`83`	`83`	`};`
`84`	`84`	`}`
`85`	`85`	`else if (global.useCreed) {`
`86`		`- var lifter = require('../../dist/creed').fromNode;`
	`86`	`+ var lifter = require('../..').fromNode;`
`87`	`87`	`}`
`88`	`88`	`else {`
`89`	`89`	`var lifter = require('when/node').lift;`