update run-callback

Author: zoubin

.eslintrc

@@ -13,60 +13,59 @@ rules:
   no-dupe-keys: 2
   no-duplicate-case: 2
   no-empty-character-class: 2
-  no-ex-assign: 1
-  no-extra-boolean-cast: 1
-  no-extra-parens: 1
-  no-extra-semi: 1
-  no-func-assign: 1
-  no-inner-declarations: 1
-  no-invalid-regexp: 1
-  no-irregular-whitespace: 1
-  no-negated-in-lhs: 1
-  no-obj-calls: 1
-  no-regex-spaces: 1
-  no-sparse-arrays: 1
-  no-unreachable: 1
-  use-isnan: 1
+  no-ex-assign: 2
+  no-extra-boolean-cast: 2
+  no-extra-parens: 2
+  no-extra-semi: 2
+  no-func-assign: 2
+  no-inner-declarations: 2
+  no-invalid-regexp: 2
+  no-irregular-whitespace: 2
+  no-negated-in-lhs: 2
+  no-obj-calls: 2
+  no-regex-spaces: 2
+  no-sparse-arrays: 2
+  no-unreachable: 2
+  use-isnan: 2
   valid-typeof: 2
-  no-unexpected-multiline: 1
-  no-cond-assign: 1
-  no-constant-condition: 1
-  no-control-regex: 1
-  no-debugger: 1
+  no-unexpected-multiline: 2
+  no-cond-assign: 2
+  no-constant-condition: 2
+  no-control-regex: 2
+  no-debugger: 2
   # code style
-  consistent-return: 1
-  curly: 1
-  default-case: 1
-  dot-notation: 1
-  dot-location: [1, "property"]
-  eqeqeq: 1
-  no-else-return: 1
-  no-lone-blocks: 1
-  no-loop-func: 1
-  no-multi-spaces: 1
-  no-multi-str: 1
-  no-proto: 1
-  no-redeclare: 1
-  no-return-assign: 1
-  no-sequences: 1
-  no-throw-literal: 1
-  no-unused-expressions: 1
-  no-void: 1
-  no-warning-comments: [1, { "terms": ["todo", "fixme", "xxx"], "location": "start"  }]
-  no-with: 1
-  radix: 1
-  no-delete-var: 1
-  no-shadow-restricted-names: 1
-  no-shadow: 1
+  consistent-return: 0
+  curly: 2
+  default-case: 2
+  dot-notation: 2
+  dot-location: [2, "property"]
+  eqeqeq: [2, "allow-null"]
+  no-else-return: 2
+  no-lone-blocks: 2
+  no-loop-func: 2
+  no-multi-spaces: 2
+  no-multi-str: 2
+  no-proto: 2
+  no-redeclare: 2
+  no-return-assign: 2
+  no-sequences: 2
+  no-throw-literal: 2
+  no-unused-expressions: 2
+  no-void: 2
+  no-warning-comments: [2, { "terms": ["todo", "fixme", "xxx"], "location": "start"  }]
+  no-with: 2
+  radix: 2
+  no-delete-var: 2
+  no-shadow-restricted-names: 2
+  no-shadow: 2
   no-undef: 2
-  no-unused-vars: 1
-  brace-style: [1, "1tbs", { "allowSingleLine": true }]
-  comma-spacing: 1
-  comma-style: 1
-  consistent-this: [2, "self"]
+  no-unused-vars: 2
+  brace-style: [2, "1tbs", { "allowSingleLine": true }]
+  comma-spacing: 2
+  comma-style: 2
   indent: [2, 2]
-  key-spacing: 1
-  max-nested-callbacks: [2, 7]
+  key-spacing: 2
+  max-nested-callbacks: [2, 5]
   no-lonely-if: 2
   no-mixed-spaces-and-tabs: 2
   no-nested-ternary: 2
@@ -76,7 +75,7 @@ rules:
   operator-linebreak: 2
   quote-props: [2, "as-needed"]
   quotes: [2, "single", "avoid-escape"]
-  semi: [2, "always"]
+  semi: [2, "never"]
   space-after-keywords: 2
   space-before-blocks: 2
   space-infix-ops: 2

.gitignore

@@ -1,3 +1,5 @@
 /node_modules/
 .DS_Store
 npm-debug.log
+/build/
+/coverage/

.travis.yml

@@ -0,0 +1,7 @@
+language: node_js
+node_js:
+  - "4.1"
+  - "4.0"
+  - "0.12"
+  - "0.11"
+  - "iojs"

gulpfile.babel.js

@@ -0,0 +1,50 @@
+import gulp from 'gulp'
+
+gulp.task('clean', () => {
+  let del = require('del')
+  return del('build')
+})
+
+gulp.task('scripts', ['clean'], () => {
+  let babel = require('gulp-babel')
+  return gulp.src(['lib/*.js', 'bin/*.js'], { base: process.cwd() })
+    .pipe(babel())
+    .pipe(gulp.dest('build'))
+})
+
+gulp.task('docs', ['clean'], () => {
+  return gulp.src(['README.md', 'LICENSE'])
+    .pipe(gulp.dest('build'))
+})
+
+gulp.task('package', ['clean'], () => {
+  let editor = require('gulp-json-editor')
+  return gulp.src('./package.json')
+    .pipe(editor( (p) => {
+      p.main = 'lib/main'
+      return p
+    }))
+    .pipe(gulp.dest('build'))
+})
+
+gulp.task('build', ['scripts', 'package', 'docs'])
+
+gulp.task('lint', () => {
+  let eslint = require('gulp-eslint')
+  return gulp.src(['*.js', 'bin/*.js', 'lib/*.js', 'test/*.js'])
+    .pipe(eslint())
+    .pipe(eslint.format())
+    .pipe(eslint.failAfterError())
+})
+
+gulp.task('test', ['lint'], function test() {
+  require('task-tape')
+  let tape = require('gulp-tape')
+  let reporter = require('tap-spec')
+  return gulp.src('test/*.js')
+    .pipe(tape({
+      reporter: reporter(),
+    }))
+})
+gulp.task('default', ['test'])
+

index.js

@@ -1,47 +1,3 @@
-var bindAsync = require('run-callback').bindAsync;
-
-var noop = function () {};
-var undef;
-
-module.exports = sequence;
-module.exports.run = run;
-module.exports.last = {};
-
-function sequence() {
-  return run.bind(null, arguments);
-}
-
-function run(things, initial, done) {
-  var res = [];
-  if (arguments.length < 3) {
-    if (typeof initial === 'function') {
-      done = initial;
-      initial = undef;
-    }
-  }
-  done = done || noop;
-
-  (function NEXT(i) {
-    if (i >= things.length) {
-      return done(null, res);
-    }
-    bind(things[i], res, initial)(function (err, r) {
-      if (err) {
-        return done(err, res);
-      }
-      res.push(r);
-      NEXT(++i);
-    });
-  }(0));
-}
-
-function bind(fn, res, initial) {
-  var args = [].concat(fn).map(function (j) {
-    if (j === sequence.last) {
-      return res.length === 0 ? initial : res[res.length - 1];
-    }
-    return j;
-  });
-  return bindAsync.apply(null, args);
-}
+require('babel-core/register')()
+module.exports = require('./lib/main')
 

lib/main.js

@@ -0,0 +1,45 @@
+import { bindAsync } from 'run-callback'
+
+export var last = {}
+export var first = {}
+
+export default function () {
+  return run.bind(null, arguments)
+}
+
+export function run(things, initial, done) {
+  if (arguments.length < 3) {
+    if (typeof initial === 'function') {
+      done = initial
+      initial = null
+    }
+  }
+
+  next(things, initial, done || function () {}, [], 0)
+}
+
+function next(things, initial, done, res, i) {
+  if (i >= things.length) {
+    return done(null, res)
+  }
+  bind(things[i], res, initial)((err, r) => {
+    if (err) {
+      return done(err, res)
+    }
+    res.push(r)
+    next(things, initial, done, res, ++i)
+  })
+}
+
+function bind(fn, res, initial) {
+  return bindAsync.apply(null, [].concat(fn).map((j) => {
+    if (j === last) {
+      return res.length === 0 ? initial : res[res.length - 1]
+    }
+    if (j === first) {
+      return initial == null ? res[0] : initial
+    }
+    return j
+  }))
+}
+

package.json

@@ -4,7 +4,7 @@
   "description": "Make a new callback to run input callbacks in sequence",
   "main": "index.js",
   "scripts": {
-    "test": "eslint . && tap test/*.js"
+    "test": "gulp"
   },
   "repository": {
     "type": "git",
@@ -24,10 +24,18 @@
   },
   "homepage": "https://github.com/zoubin/callback-sequence#readme",
   "dependencies": {
-    "run-callback": "^1.0.0"
+    "run-callback": "^2.0.0"
   },
   "devDependencies": {
-    "eslint": "^1.1.0",
-    "tap": "^1.3.1"
+    "babel-core": "^5.8.25",
+    "del": "^2.0.2",
+    "gulp": "^3.9.0",
+    "gulp-babel": "^5.2.1",
+    "gulp-eslint": "^1.0.0",
+    "gulp-json-editor": "^2.2.1",
+    "gulp-tape": "0.0.4",
+    "tap-spec": "^4.1.0",
+    "tape": "^4.2.0",
+    "task-tape": "^0.1.0"
   }
 }

test/args.js

@@ -1,24 +1,43 @@
-var test = require('tap').test;
-var sequence = require('..');
-var run = sequence.run;
+import test from 'tape'
+import { first, last, run } from '..'
 
-test('arguments', function(t) {
-  t.plan(1);
+test('last', function(t) {
+  t.plan(1)
   function sum(a, b, next) {
     process.nextTick(function () {
-      next(null, a + b);
-    });
+      next(null, a + b)
+    })
   }
   run(
     [
-      [sum, sequence.last, 1],
-      [sum, sequence.last, 1],
-      [sum, sequence.last, 1],
+      [sum, last, 1],
+      [sum, last, 1],
+      [sum, last, 1],
     ],
     1,
-    function (err, res) {
-      t.same(res, [2, 3, 4]);
+    (err, res) => {
+      t.same(res, [2, 3, 4])
     }
-  );
-});
+  )
+})
+
+test('first', function(t) {
+  t.plan(1)
+  function order(a, b, next) {
+    process.nextTick(() => {
+      next(null, a + b)
+    })
+  }
+  run(
+    [
+      [order, first, 1],
+      [order, first, 2],
+      [order, first, 3],
+    ],
+    10,
+    (err, res) => {
+      t.same(res, [11, 12, 13])
+    }
+  )
+})