diff --git a/.babelrc b/.babelrc deleted file mode 100644 index 3e1c3fc..0000000 --- a/.babelrc +++ /dev/null @@ -1,13 +0,0 @@ -{ - "presets": [ - [ - "env", - { - "targets": { - "chrome": 59 - }, - "loose": true - } - ] - ] -} diff --git a/.gitignore b/.gitignore index 12d9d2a..d62f727 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ build/ .DS_Store test_build/ .tern-port +lib/ diff --git a/README.md b/README.md index c9ba23e..ec4852f 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Experiment to reproduce Erlang style processes in browser. The api follows the o ```javascript const Processes = require('erlang-processes') - let system = new Processes.default.ProcessSystem() + let system = new Processes.ProcessSystem() ``` - Now you can spawn processes using the system. diff --git a/examples/index.html b/examples/index.html new file mode 100644 index 0000000..a40a2d6 --- /dev/null +++ b/examples/index.html @@ -0,0 +1,15 @@ + + + + + + + + + Open Console + + + + + diff --git a/examples/send_receive.html b/examples/send_receive.html deleted file mode 100644 index db7f8f8..0000000 --- a/examples/send_receive.html +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - -Open Console - - - - - - \ No newline at end of file diff --git a/lib/processes.js b/lib/processes.js deleted file mode 100644 index 678fe3b..0000000 --- a/lib/processes.js +++ /dev/null @@ -1,637 +0,0 @@ -'use strict'; - -function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; } - -var ErlangTypes = _interopDefault(require('erlang-types')); - -/* @flow */ - -class Mailbox { - constructor() { - this.messages = []; - } - - deliver(message) { - this.messages.push(message); - return message; - } - - get() { - return this.messages; - } - - isEmpty() { - return this.messages.length === 0; - } - - removeAt(index) { - this.messages.splice(index, 1); - } -} - -var States = { - NORMAL: Symbol.for("normal"), - KILL: Symbol.for("kill"), - SUSPEND: Symbol.for("suspend"), - CONTINUE: Symbol.for("continue"), - RECEIVE: Symbol.for("receive"), - SEND: Symbol.for("send"), - SLEEPING: Symbol.for("sleeping"), - RUNNING: Symbol.for("running"), - SUSPENDED: Symbol.for("suspended"), - STOPPED: Symbol.for("stopped"), - SLEEP: Symbol.for("sleep"), - EXIT: Symbol.for("exit"), - NOMATCH: Symbol.for("no_match") -}; - -/* @flow */ - -function is_sleep(value) { - return Array.isArray(value) && value[0] === States.SLEEP; -} - -function is_receive(value) { - return Array.isArray(value) && value[0] === States.RECEIVE; -} - -function receive_timed_out(value) { - return value[2] != null && value[2] < Date.now(); -} - -class Process { - constructor(pid, func, args, mailbox, system) { - this.pid = pid; - this.func = func; - this.args = args; - this.mailbox = mailbox; - this.system = system; - this.status = States.STOPPED; - this.dict = {}; - this.flags = {}; - this.monitors = []; - } - - start() { - const function_scope = this; - let machine = this.main(); - - this.system.schedule(function () { - function_scope.system.set_current(function_scope.pid); - function_scope.run(machine, machine.next()); - }, this.pid); - } - - *main() { - let retval = States.NORMAL; - - try { - yield* this.func.apply(null, this.args); - } catch (e) { - console.error(e); - retval = e; - } - - this.system.exit(retval); - } - - process_flag(flag, value) { - const old_value = this.flags[flag]; - this.flags[flag] = value; - return old_value; - } - - is_trapping_exits() { - return this.flags[Symbol.for("trap_exit")] && this.flags[Symbol.for("trap_exit")] == true; - } - - signal(reason) { - if (reason !== States.NORMAL) { - console.error(reason); - } - - this.system.remove_proc(this.pid, reason); - } - - receive(fun) { - let value = States.NOMATCH; - let messages = this.mailbox.get(); - - for (let i = 0; i < messages.length; i++) { - try { - value = fun(messages[i]); - if (value !== States.NOMATCH) { - this.mailbox.removeAt(i); - break; - } - } catch (e) { - if (e.constructor.name != "MatchError") { - this.exit(e); - } - } - } - - return value; - } - - run(machine, step) { - const function_scope = this; - - if (!step.done) { - let value = step.value; - - if (is_sleep(value)) { - - this.system.delay(function () { - function_scope.system.set_current(function_scope.pid); - function_scope.run(machine, machine.next()); - }, value[1]); - } else if (is_receive(value) && receive_timed_out(value)) { - - let result = value[3](); - - this.system.schedule(function () { - function_scope.system.set_current(function_scope.pid); - function_scope.run(machine, machine.next(result)); - }); - } else if (is_receive(value)) { - - let result = function_scope.receive(value[1]); - - if (result === States.NOMATCH) { - this.system.suspend(function () { - function_scope.system.set_current(function_scope.pid); - function_scope.run(machine, step); - }); - } else { - this.system.schedule(function () { - function_scope.system.set_current(function_scope.pid); - function_scope.run(machine, machine.next(result)); - }); - } - } else { - this.system.schedule(function () { - function_scope.system.set_current(function_scope.pid); - function_scope.run(machine, machine.next(value)); - }); - } - } - } -} - -class ProcessQueue { - constructor(pid) { - this.pid = pid; - this.tasks = []; - } - - empty() { - return this.tasks.length === 0; - } - - add(task) { - this.tasks.push(task); - } - - next() { - return this.tasks.shift(); - } -} - -class Scheduler { - constructor(throttle = 0, reductions_per_process = 8) { - this.isRunning = false; - this.invokeLater = function (callback) { - setTimeout(callback, throttle); - }; - - // In our case a reduction is equal to a task call - // Controls how many tasks are called at a time per process - this.reductions_per_process = reductions_per_process; - this.queues = new Map(); - this.run(); - } - - addToQueue(pid, task) { - if (!this.queues.has(pid)) { - this.queues.set(pid, new ProcessQueue(pid)); - } - - this.queues.get(pid).add(task); - } - - removePid(pid) { - this.isRunning = true; - - this.queues.delete(pid); - - this.isRunning = false; - } - - run() { - if (this.isRunning) { - this.invokeLater(() => { - this.run(); - }); - } else { - for (let [pid, queue] of this.queues) { - let reductions = 0; - while (queue && !queue.empty() && reductions < this.reductions_per_process) { - let task = queue.next(); - this.isRunning = true; - - let result; - - try { - result = task(); - } catch (e) { - console.error(e); - result = e; - } - - this.isRunning = false; - - if (result instanceof Error) { - throw result; - } - - reductions++; - } - } - - this.invokeLater(() => { - this.run(); - }); - } - } - - addToScheduler(pid, task, dueTime = 0) { - if (dueTime === 0) { - this.invokeLater(() => { - this.addToQueue(pid, task); - }); - } else { - setTimeout(() => { - this.addToQueue(pid, task); - }, dueTime); - } - } - - schedule(pid, task) { - this.addToScheduler(pid, () => { - task(); - }); - } - - scheduleFuture(pid, dueTime, task) { - this.addToScheduler(pid, () => { - task(); - }, dueTime); - } -} - -/* @flow */ -class ProcessSystem { - - constructor() { - this.pids = new Map(); - this.mailboxes = new Map(); - this.names = new Map(); - this.links = new Map(); - this.monitors = new Map(); - - const throttle = 5; //ms between scheduled tasks - this.current_process = null; - this.scheduler = new Scheduler(throttle); - this.suspended = new Map(); - - let process_system_scope = this; - this.main_process_pid = this.spawn(function* () { - yield process_system_scope.sleep(Symbol.for("Infinity")); - }); - this.set_current(this.main_process_pid); - } - - static *run(fun, args, context = null) { - if (fun.constructor.name === "GeneratorFunction") { - return yield* fun.apply(context, args); - } else { - return yield fun.apply(context, args); - } - } - - spawn(...args) { - if (args.length === 1) { - let fun = args[0]; - return this.add_proc(fun, [], false).pid; - } else { - let mod = args[0]; - let fun = args[1]; - let the_args = args[2]; - - return this.add_proc(mod[fun], the_args, false, false).pid; - } - } - - spawn_link(...args) { - if (args.length === 1) { - let fun = args[0]; - return this.add_proc(fun, [], true, false).pid; - } else { - let mod = args[0]; - let fun = args[1]; - let the_args = args[2]; - - return this.add_proc(mod[fun], the_args, true, false).pid; - } - } - - link(pid) { - this.links.get(this.pid()).add(pid); - this.links.get(pid).add(this.pid()); - } - - unlink(pid) { - this.links.get(this.pid()).delete(pid); - this.links.get(pid).delete(this.pid()); - } - - spawn_monitor(...args) { - if (args.length === 1) { - let fun = args[0]; - let process = this.add_proc(fun, [], false, true); - return [process.pid, process.monitors[0]]; - } else { - let mod = args[0]; - let fun = args[1]; - let the_args = args[2]; - let process = this.add_proc(mod[fun], the_args, false, true); - - return [process.pid, process.monitors[0]]; - } - } - - monitor(pid) { - const real_pid = this.pidof(pid); - const ref = this.make_ref(); - - if (real_pid) { - - this.monitors.set(ref, { 'monitor': this.current_process.pid, 'monitee': real_pid }); - this.pids.get(real_pid).monitors.push(ref); - return ref; - } else { - this.send(this.current_process.pid, new ErlangTypes.Tuple('DOWN', ref, pid, real_pid, Symbol.for('noproc'))); - return ref; - } - } - - demonitor(ref) { - if (this.monitor.has(ref)) { - this.monitor.delete(ref); - return true; - } - - return false; - } - - set_current(id) { - let pid = this.pidof(id); - if (pid !== null) { - this.current_process = this.pids.get(pid); - this.current_process.status = States.RUNNING; - } - } - - add_proc(fun, args, linked, monitored) { - let newpid = new ErlangTypes.PID(); - let mailbox = new Mailbox(); - let newproc = new Process(newpid, fun, args, mailbox, this); - - this.pids.set(newpid, newproc); - this.mailboxes.set(newpid, mailbox); - this.links.set(newpid, new Set()); - - if (linked) { - this.link(newpid); - } - - if (monitored) { - this.monitor(newpid); - } - - newproc.start(); - return newproc; - } - - remove_proc(pid, exitreason) { - this.pids.delete(pid); - this.unregister(pid); - this.scheduler.removePid(pid); - - if (this.links.has(pid)) { - for (let linkpid of this.links.get(pid)) { - this.exit(linkpid, exitreason); - this.links.get(linkpid).delete(pid); - } - - this.links.delete(pid); - } - } - - register(name, pid) { - if (!this.names.has(name)) { - this.names.set(name, pid); - } else { - throw new Error("Name is already registered to another process"); - } - } - - whereis(name) { - return this.names.has(name) ? this.names.get(name) : null; - } - - registered() { - return this.names.keys(); - } - - unregister(pid) { - for (let name of this.names.keys()) { - if (this.names.has(name) && this.names.get(name) === pid) { - this.names.delete(name); - } - } - } - - pid() { - return this.current_process.pid; - } - - pidof(id) { - if (id instanceof ErlangTypes.PID) { - return this.pids.has(id) ? id : null; - } else if (id instanceof Process) { - return id.pid; - } else { - let pid = this.whereis(id); - if (pid === null) throw "Process name not registered: " + id + " (" + typeof id + ")"; - return pid; - } - } - - send(id, msg) { - const pid = this.pidof(id); - - if (pid) { - this.mailboxes.get(pid).deliver(msg); - - if (this.suspended.has(pid)) { - let fun = this.suspended.get(pid); - this.suspended.delete(pid); - this.schedule(fun); - } - } - - return msg; - } - - receive(fun, timeout = 0, timeoutFn = () => true) { - let DateTimeout = null; - - if (timeout === 0 || timeout === Infinity) { - DateTimeout = null; - } else { - DateTimeout = Date.now() + timeout; - } - - return [States.RECEIVE, fun, DateTimeout, timeoutFn]; - } - - sleep(duration) { - return [States.SLEEP, duration]; - } - - suspend(fun) { - this.current_process.status = States.SUSPENDED; - this.suspended.set(this.current_process.pid, fun); - } - - delay(fun, time) { - this.current_process.status = States.SLEEPING; - - if (Number.isInteger(time)) { - this.scheduler.scheduleFuture(this.current_process.pid, time, fun); - } - } - - schedule(fun, pid) { - const the_pid = pid != null ? pid : this.current_process.pid; - this.scheduler.schedule(the_pid, fun); - } - - exit(one, two) { - let pid = null; - let reason = null; - let process = null; - - if (two) { - pid = one; - reason = two; - process = this.pids.get(this.pidof(pid)); - - if (process && process.is_trapping_exits() || reason === States.KILL || reason === States.NORMAL) { - this.mailboxes.get(process.pid).deliver(new ErlangTypes.Tuple(States.EXIT, this.pid(), reason)); - } else { - process.signal(reason); - } - } else { - pid = this.current_process.pid; - reason = one; - process = this.current_process; - - process.signal(reason); - } - - for (let ref in process.monitors) { - let mons = this.monitors.get(ref); - this.send(mons['monitor'], new ErlangTypes.Tuple('DOWN', ref, mons['monitee'], mons['monitee'], reason)); - } - } - - error(reason) { - this.current_process.signal(reason); - } - - process_flag(...args) { - if (args.length == 2) { - const flag = args[0]; - const value = args[1]; - return this.current_process.process_flag(flag, value); - } else { - const pid = this.pidof(args[0]); - const flag = args[1]; - const value = args[2]; - return this.pids.get(pid).process_flag(flag, value); - } - } - - put(key, value) { - this.current_process.dict[key] = value; - } - - get_process_dict() { - return this.current_process.dict; - } - - get(key, default_value = null) { - if (key in this.current_process.dict) { - return this.current_process.dict[key]; - } else { - return default_value; - } - } - - get_keys(value) { - if (value) { - let keys = []; - - for (let key of Object.keys(this.current_process.dict)) { - if (this.current_process.dict[key] === value) { - keys.push(key); - } - } - - return keys; - } - - return Object.keys(this.current_process.dict); - } - - erase(key) { - if (key != null) { - delete this.current_process.dict[key]; - } else { - this.current_process.dict = {}; - } - } - - is_alive(pid) { - const real_pid = this.pidof(pid); - return real_pid != null; - } - - list() { - return Array.from(this.pids.keys()); - } - - make_ref() { - return new ErlangTypes.Reference(); - } -} - -var index = { - ProcessSystem -}; - -module.exports = index; -//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"file":"processes.js","sources":["../src/processes/mailbox.js","../src/processes/states.js","../src/processes/process.js","../src/processes/scheduler.js","../src/processes/process_system.js","../src/index.js"],"sourcesContent":["\"use strict\";\n\n/* @flow */\n\nclass Mailbox{\n  constructor(){\n    this.messages = [];\n  }\n\n  deliver(message){\n    this.messages.push(message);\n    return message;\n  }\n\n  get(){\n    return this.messages;\n  }\n\n  isEmpty(){\n    return this.messages.length === 0;\n  }\n\n  removeAt(index){\n    this.messages.splice(index, 1);\n  }\n}\n\nexport default Mailbox;\n","export default {\n  NORMAL: Symbol.for(\"normal\"),\n  KILL: Symbol.for(\"kill\"),\n  SUSPEND: Symbol.for(\"suspend\"),\n  CONTINUE: Symbol.for(\"continue\"),\n  RECEIVE: Symbol.for(\"receive\"),\n  SEND: Symbol.for(\"send\"),\n  SLEEPING: Symbol.for(\"sleeping\"),\n  RUNNING: Symbol.for(\"running\"),\n  SUSPENDED: Symbol.for(\"suspended\"),\n  STOPPED: Symbol.for(\"stopped\"),\n  SLEEP: Symbol.for(\"sleep\"),\n  EXIT: Symbol.for(\"exit\"),\n  NOMATCH: Symbol.for(\"no_match\")\n}","\"use strict\";\n\n/* @flow */\nimport Mailbox from \"./mailbox\";\nimport ProcessSystem from \"./process_system\";\nimport States from \"./states\";\n\nfunction is_sleep(value){\n  return Array.isArray(value) && value[0] === States.SLEEP;\n}\n\nfunction is_receive(value){\n  return Array.isArray(value) && value[0] === States.RECEIVE;\n}\n\nfunction receive_timed_out(value){\n  return value[2] != null && value[2] < Date.now();\n}\n\nclass Process {\n  constructor(pid, func, args, mailbox, system){\n    this.pid = pid;\n    this.func = func;\n    this.args = args;\n    this.mailbox = mailbox;\n    this.system = system;\n    this.status = States.STOPPED;\n    this.dict = {};\n    this.flags = {};\n    this.monitors = [];\n  }\n\n  start(){\n    const function_scope = this;\n    let machine = this.main();\n\n    this.system.schedule(function() {\n      function_scope.system.set_current(function_scope.pid);\n      function_scope.run(machine, machine.next());\n    }, this.pid);\n  }\n\n  *main() {\n    let retval = States.NORMAL;\n\n    try {\n      yield* this.func.apply(null, this.args);\n    } catch(e) {\n      console.error(e);\n      retval = e;\n    }\n\n    this.system.exit(retval);\n  }\n\n  process_flag(flag, value){\n    const old_value = this.flags[flag];\n    this.flags[flag] = value;\n    return old_value;\n  }\n\n  is_trapping_exits(){\n    return this.flags[Symbol.for(\"trap_exit\")] && this.flags[Symbol.for(\"trap_exit\")] == true;\n  }\n\n  signal(reason){\n    if(reason !== States.NORMAL){\n      console.error(reason);\n    }\n\n    this.system.remove_proc(this.pid, reason);\n  }\n\n  receive(fun){\n    let value = States.NOMATCH;\n    let messages = this.mailbox.get();\n\n    for(let i = 0; i < messages.length; i++){\n      try{\n        value = fun(messages[i]);\n        if(value !== States.NOMATCH){\n          this.mailbox.removeAt(i);\n          break;\n        }\n      }catch(e){\n        if(e.constructor.name != \"MatchError\"){\n          this.exit(e);\n        }\n      }\n    }\n\n    return value;\n  }\n\n  run(machine, step){\n    const function_scope = this;\n\n    if(!step.done){\n      let value = step.value;\n\n      if(is_sleep(value)){\n\n        this.system.delay(function() {\n          function_scope.system.set_current(function_scope.pid);\n          function_scope.run(machine, machine.next());\n        }, value[1]);\n\n      }else if(is_receive(value) && receive_timed_out(value)){\n\n        let result = value[3]();\n\n        this.system.schedule(function() {\n          function_scope.system.set_current(function_scope.pid);\n          function_scope.run(machine, machine.next(result));\n        });\n\n      }else if(is_receive(value)){\n\n        let result = function_scope.receive(value[1]);\n\n        if(result === States.NOMATCH){\n          this.system.suspend(function() {\n            function_scope.system.set_current(function_scope.pid);\n            function_scope.run(machine, step);\n          });\n        }else{\n          this.system.schedule(function() {\n            function_scope.system.set_current(function_scope.pid);\n            function_scope.run(machine, machine.next(result));\n          });\n        }\n\n      }else{\n        this.system.schedule(function() {\n          function_scope.system.set_current(function_scope.pid);\n          function_scope.run(machine, machine.next(value));\n        });\n      }\n    }\n  }\n}\n\nexport default Process;\n","\"use strict\";\n\nclass ProcessQueue {\n  constructor(pid){\n    this.pid = pid;\n    this.tasks = [];\n  }\n\n  empty(){\n    return this.tasks.length === 0;\n  }\n\n  add(task){\n    this.tasks.push(task);\n  }\n\n  next(){\n    return this.tasks.shift();\n  }\n}\n\nclass Scheduler {\n    constructor(throttle = 0, reductions_per_process = 8){\n        this.isRunning = false;\n        this.invokeLater = function (callback) { setTimeout(callback, throttle); };\n\n        // In our case a reduction is equal to a task call\n        // Controls how many tasks are called at a time per process\n        this.reductions_per_process = reductions_per_process;\n        this.queues = new Map();\n        this.run();\n  }\n\n  addToQueue(pid, task){\n    if(!this.queues.has(pid)){\n      this.queues.set(pid, new ProcessQueue(pid));\n    }\n\n    this.queues.get(pid).add(task);\n  }\n\n  removePid(pid){\n    this.isRunning = true;\n\n    this.queues.delete(pid);\n\n    this.isRunning = false;\n  }\n\n  run(){\n    if (this.isRunning) {\n      this.invokeLater(() => { this.run(); });\n    } else {\n      for(let [pid, queue] of this.queues){\n        let reductions = 0;\n        while(queue && !queue.empty() && reductions < this.reductions_per_process){\n          let task = queue.next();\n          this.isRunning = true;\n\n          let result;\n\n          try{\n            result = task();\n          }catch(e){\n            console.error(e);\n            result = e;\n          }\n\n          this.isRunning = false;\n\n          if (result instanceof Error) {\n            throw result;\n          }\n\n          reductions++;\n        }\n      }\n\n      this.invokeLater(() => { this.run(); });\n    }\n  }\n\n  addToScheduler(pid, task, dueTime = 0) {\n    if(dueTime === 0){\n      this.invokeLater(() => {\n        this.addToQueue(pid, task);\n      });\n    }else{\n      setTimeout(() => {\n        this.addToQueue(pid, task);\n      }, dueTime);\n    }\n  };\n\n  schedule(pid, task){\n    this.addToScheduler(pid, () => { task(); });\n  }\n\n  scheduleFuture(pid, dueTime, task){\n    this.addToScheduler(pid, () => { task(); }, dueTime);\n  }\n}\n\nexport default Scheduler;\n","/* @flow */\n\"use strict\";\n\nimport Mailbox from \"./mailbox\";\nimport Process from \"./process\";\nimport States from \"./states\";\nimport Scheduler from \"./scheduler\";\nimport ErlangTypes from \"erlang-types\";\n\n\nclass ProcessSystem {\n\n  constructor(){\n    this.pids = new Map();\n    this.mailboxes = new Map();\n    this.names = new Map();\n    this.links = new Map();\n    this.monitors = new Map();\n\n    const throttle = 5; //ms between scheduled tasks\n    this.current_process = null;\n    this.scheduler = new Scheduler(throttle);\n    this.suspended = new Map();\n\n    let process_system_scope = this;\n    this.main_process_pid = this.spawn(function*(){\n      yield process_system_scope.sleep(Symbol.for(\"Infinity\"));\n    });\n    this.set_current(this.main_process_pid);\n  }\n\n  static * run(fun, args, context = null){\n    if(fun.constructor.name === \"GeneratorFunction\"){\n      return yield* fun.apply(context, args);\n    }else{\n      return yield fun.apply(context, args);\n    }\n  }\n\n  spawn(...args){\n    if(args.length === 1){\n      let fun = args[0];\n      return this.add_proc(fun, [], false).pid;\n\n    }else{\n      let mod = args[0];\n      let fun = args[1];\n      let the_args = args[2];\n\n      return this.add_proc(mod[fun], the_args, false, false).pid;\n    }\n  }\n\n  spawn_link(...args){\n    if(args.length === 1){\n      let fun = args[0];\n      return this.add_proc(fun, [], true, false).pid;\n\n    }else{\n      let mod = args[0];\n      let fun = args[1];\n      let the_args = args[2];\n\n      return this.add_proc(mod[fun], the_args, true, false).pid;\n    }\n  }\n\n  link(pid){\n    this.links.get(this.pid()).add(pid);\n    this.links.get(pid).add(this.pid());\n  }\n\n  unlink(pid){\n    this.links.get(this.pid()).delete(pid);\n    this.links.get(pid).delete(this.pid());\n  }\n\n  spawn_monitor(...args){\n    if(args.length === 1){\n      let fun = args[0];\n      let process = this.add_proc(fun, [], false, true);\n      return [process.pid, process.monitors[0]];\n\n    }else{\n      let mod = args[0];\n      let fun = args[1];\n      let the_args = args[2];\n      let process = this.add_proc(mod[fun], the_args, false, true);\n\n      return [process.pid, process.monitors[0]];\n    }\n  }\n\n  monitor(pid){\n    const real_pid = this.pidof(pid);\n    const ref = this.make_ref();\n\n    if(real_pid){\n\n      this.monitors.set(ref, {'monitor': this.current_process.pid, 'monitee': real_pid});\n      this.pids.get(real_pid).monitors.push(ref);\n      return ref;\n    }else{\n      this.send(this.current_process.pid, new ErlangTypes.Tuple('DOWN', ref, pid, real_pid, Symbol.for('noproc')));\n      return ref;\n    }\n  }\n\n  demonitor(ref){\n    if(this.monitor.has(ref)){\n      this.monitor.delete(ref);\n      return true;\n    }\n\n    return false;\n  }\n\n  set_current(id){\n    let pid = this.pidof(id);\n    if(pid !== null){\n      this.current_process = this.pids.get(pid);\n      this.current_process.status = States.RUNNING;\n    }\n  }\n\n  add_proc(fun, args, linked, monitored){\n    let newpid = new ErlangTypes.PID();\n    let mailbox = new Mailbox();\n    let newproc = new Process(newpid, fun, args, mailbox, this);\n\n    this.pids.set(newpid, newproc);\n    this.mailboxes.set(newpid, mailbox);\n    this.links.set(newpid, new Set());\n\n    if(linked){\n      this.link(newpid);\n    }\n\n    if(monitored){\n      this.monitor(newpid);\n    }\n\n    newproc.start();\n    return newproc;\n  }\n\n  remove_proc(pid, exitreason){\n    this.pids.delete(pid);\n    this.unregister(pid);\n    this.scheduler.removePid(pid);\n\n    if(this.links.has(pid)){\n      for (let linkpid of this.links.get(pid)) {\n        this.exit(linkpid, exitreason);\n        this.links.get(linkpid).delete(pid);\n      }\n\n      this.links.delete(pid);\n    }\n  }\n\n  register(name, pid){\n    if(!this.names.has(name)){\n      this.names.set(name, pid);\n    }else{\n      throw new Error(\"Name is already registered to another process\");\n    }\n  }\n\n  whereis(name){\n    return this.names.has(name) ? this.names.get(name) : null;\n  }\n\n  registered(){\n    return this.names.keys();\n  }\n\n  unregister(pid){\n    for(let name of this.names.keys()){\n      if(this.names.has(name) && this.names.get(name) === pid){\n        this.names.delete(name);\n      }\n    }\n  }\n\n  pid(){\n    return this.current_process.pid;\n  }\n\n  pidof(id){\n    if (id instanceof ErlangTypes.PID) {\n       return this.pids.has(id) ? id : null;\n    } else if (id instanceof Process) {\n       return id.pid;\n    } else {\n       let pid = this.whereis(id);\n       if (pid === null)\n          throw(\"Process name not registered: \" + id + \" (\" + typeof(id) + \")\");\n       return pid;\n    }\n  }\n\n  send(id, msg) {\n    const pid = this.pidof(id);\n\n    if(pid){\n      this.mailboxes.get(pid).deliver(msg);\n\n      if(this.suspended.has(pid)){\n        let fun = this.suspended.get(pid);\n        this.suspended.delete(pid);\n        this.schedule(fun);\n      }\n    }\n\n    return msg;\n  }\n\n  receive(fun, timeout = 0, timeoutFn = () => true ) {\n    let DateTimeout = null;\n\n    if(timeout === 0 || timeout === Infinity){\n      DateTimeout = null;\n    }else{\n      DateTimeout = Date.now() + timeout;\n    }\n\n    return [\n      States.RECEIVE,\n      fun,\n      DateTimeout,\n      timeoutFn\n    ];\n  }\n\n  sleep(duration){\n    return [States.SLEEP, duration];\n  }\n\n  suspend(fun){\n    this.current_process.status = States.SUSPENDED;\n    this.suspended.set(this.current_process.pid, fun);\n  }\n\n  delay(fun, time){\n    this.current_process.status = States.SLEEPING;\n\n    if(Number.isInteger(time)){\n      this.scheduler.scheduleFuture(this.current_process.pid, time, fun);\n    }\n  }\n\n  schedule(fun, pid){\n    const the_pid = pid != null ? pid : this.current_process.pid;\n    this.scheduler.schedule(the_pid, fun);\n  }\n\n  exit(one, two){\n    let pid = null;\n    let reason = null;\n    let process = null;\n\n    if(two){\n      pid = one;\n      reason = two;\n      process = this.pids.get(this.pidof(pid));\n\n      if((process && process.is_trapping_exits()) || reason === States.KILL || reason === States.NORMAL){\n        this.mailboxes.get(process.pid).deliver(new ErlangTypes.Tuple(States.EXIT, this.pid(), reason ));\n      } else{\n        process.signal(reason);\n      }\n\n    }else{\n      pid = this.current_process.pid;\n      reason = one;\n      process = this.current_process;\n\n      process.signal(reason);\n    }\n\n    for(let ref in process.monitors){\n      let mons = this.monitors.get(ref);\n      this.send(mons['monitor'], new ErlangTypes.Tuple('DOWN', ref, mons['monitee'], mons['monitee'], reason));\n    }\n  }\n\n  error(reason){\n    this.current_process.signal(reason);\n  }\n\n  process_flag(...args){\n    if(args.length == 2){\n      const flag = args[0];\n      const value = args[1];\n      return this.current_process.process_flag(flag, value);\n    }else{\n      const pid = this.pidof(args[0]);\n      const flag = args[1];\n      const value = args[2];\n      return this.pids.get(pid).process_flag(flag, value);\n    }\n  }\n\n  put(key, value){\n    this.current_process.dict[key] = value;\n  }\n\n  get_process_dict(){\n    return this.current_process.dict;\n  }\n\n  get(key, default_value = null){\n    if(key in this.current_process.dict){\n      return this.current_process.dict[key];\n    }else{\n      return default_value;\n    }\n  }\n\n  get_keys(value){\n    if(value){\n      let keys = [];\n\n      for(let key of Object.keys(this.current_process.dict)){\n        if(this.current_process.dict[key] === value){\n          keys.push(key);\n        }\n      }\n\n      return keys;\n    }\n\n    return Object.keys(this.current_process.dict);\n  }\n\n  erase(key){\n    if(key != null){\n      delete this.current_process.dict[key];\n    }else{\n      this.current_process.dict = {};\n    }\n  }\n\n  is_alive(pid){\n    const real_pid = this.pidof(pid);\n    return real_pid != null;\n  }\n\n  list(){\n    return Array.from(this.pids.keys());\n  }\n\n  make_ref(){\n    return new ErlangTypes.Reference();\n  }\n}\n\nexport default ProcessSystem;\n","import ProcessSystem from \"./processes/process_system\";\n\nexport default {\n  ProcessSystem\n};\n"],"names":["Mailbox","messages","message","push","length","index","splice","Symbol","for","is_sleep","value","Array","isArray","States","SLEEP","is_receive","RECEIVE","receive_timed_out","Date","now","Process","pid","func","args","mailbox","system","status","STOPPED","dict","flags","monitors","function_scope","machine","main","schedule","set_current","run","next","retval","NORMAL","apply","e","error","exit","flag","old_value","reason","remove_proc","fun","NOMATCH","get","i","removeAt","constructor","name","step","done","delay","result","receive","suspend","ProcessQueue","tasks","task","shift","Scheduler","throttle","reductions_per_process","isRunning","invokeLater","callback","queues","Map","has","set","add","delete","queue","reductions","empty","Error","dueTime","addToQueue","addToScheduler","ProcessSystem","pids","mailboxes","names","links","current_process","scheduler","suspended","process_system_scope","main_process_pid","spawn","sleep","context","add_proc","mod","the_args","process","real_pid","pidof","ref","make_ref","send","ErlangTypes","Tuple","monitor","id","RUNNING","linked","monitored","newpid","PID","newproc","Set","link","start","exitreason","unregister","removePid","linkpid","keys","whereis","msg","deliver","timeout","timeoutFn","DateTimeout","Infinity","duration","SUSPENDED","time","SLEEPING","Number","isInteger","scheduleFuture","the_pid","one","two","is_trapping_exits","KILL","EXIT","signal","mons","process_flag","key","default_value","Object","from","Reference"],"mappings":"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"} diff --git a/package-lock.json b/package-lock.json index 93204aa..95017d4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -80,6 +80,52 @@ "arrify": "^1.0.1" } }, + "@ladjs/time-require": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/@ladjs/time-require/-/time-require-0.1.4.tgz", + "integrity": "sha512-weIbJqTMfQ4r1YX85u54DKfjLZs2jwn1XZ6tIOP/pFgMwhIN5BAtaCp/1wn9DzyLsDR9tW0R2NIePcVJ45ivQQ==", + "dev": true, + "requires": { + "chalk": "^0.4.0", + "date-time": "^0.1.1", + "pretty-ms": "^0.2.1", + "text-table": "^0.2.0" + }, + "dependencies": { + "ansi-styles": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.0.0.tgz", + "integrity": "sha1-yxAt8cVvUSPquLZ817mAJ6AnkXg=", + "dev": true + }, + "chalk": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz", + "integrity": "sha1-UZmj3c0MHv4jvAjBsCewYXbgxk8=", + "dev": true, + "requires": { + "ansi-styles": "~1.0.0", + "has-color": "~0.1.0", + "strip-ansi": "~0.1.0" + } + }, + "pretty-ms": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-0.2.2.tgz", + "integrity": "sha1-2oeaaC/zOjcBEEbxPWJ/Z8c7hPY=", + "dev": true, + "requires": { + "parse-ms": "^0.1.0" + } + }, + "strip-ansi": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz", + "integrity": "sha1-OeipjQRNFQZgq+SmgIrPcLt7yZE=", + "dev": true + } + } + }, "ansi-align": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-2.0.0.tgz", @@ -90,9 +136,9 @@ } }, "ansi-escapes": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-2.0.0.tgz", - "integrity": "sha1-W65SvkJIeN2Xg+iRDj/Cki6DyBs=", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz", + "integrity": "sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==", "dev": true }, "ansi-regex": { @@ -102,28 +148,28 @@ "dev": true }, "ansi-styles": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.1.0.tgz", - "integrity": "sha1-CcIC1ckX7CMYjKpcnLkXnNlUd1A=", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, "requires": { - "color-convert": "^1.0.0" + "color-convert": "^1.9.0" } }, "anymatch": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.0.tgz", - "integrity": "sha1-o+Uvo5FoyCX/V7AkgSbOWo/5VQc=", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz", + "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==", "dev": true, "requires": { - "arrify": "^1.0.0", - "micromatch": "^2.1.5" + "micromatch": "^2.1.5", + "normalize-path": "^2.0.0" } }, "argparse": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz", - "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=", + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", "dev": true, "requires": { "sprintf-js": "~1.0.2" @@ -196,22 +242,23 @@ "dev": true }, "auto-bind": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/auto-bind/-/auto-bind-1.1.0.tgz", - "integrity": "sha1-k7hk3H7gGjJigXddXHXKCnUeWWE=", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/auto-bind/-/auto-bind-1.2.1.tgz", + "integrity": "sha512-/W9yj1yKmBLwpexwAujeD9YHwYmRuWFGV8HWE7smQab797VeHa4/cnE2NFeDhA+E+5e/OGBI8763EhLjfZ/MXA==", "dev": true }, "ava": { - "version": "0.21.0", - "resolved": "https://registry.npmjs.org/ava/-/ava-0.21.0.tgz", - "integrity": "sha512-+ZjahyjqyzkPLlFZe2OoLmiE3aaQ2jK5h74wrkuX5I+J6LpNAPoQ8X/EhqEtKEjuWwmniLAjnVjZ7OY8rWdJwA==", + "version": "0.25.0", + "resolved": "https://registry.npmjs.org/ava/-/ava-0.25.0.tgz", + "integrity": "sha512-4lGNJCf6xL8SvsKVEKxEE46se7JAUIAZoKHw9itTQuwcsydhpAMkBs5gOOiWiwt0JKNIuXWc2/r4r8ZdcNrBEw==", "dev": true, "requires": { "@ava/babel-preset-stage-4": "^1.1.0", "@ava/babel-preset-transform-test-files": "^3.0.0", "@ava/write-file-atomic": "^2.2.0", "@concordance/react": "^1.0.0", - "ansi-escapes": "^2.0.0", + "@ladjs/time-require": "^0.1.4", + "ansi-escapes": "^3.0.0", "ansi-styles": "^3.1.0", "arr-flatten": "^1.0.1", "array-union": "^1.0.1", @@ -220,6 +267,8 @@ "auto-bind": "^1.1.0", "ava-init": "^0.2.0", "babel-core": "^6.17.0", + "babel-generator": "^6.26.0", + "babel-plugin-syntax-object-rest-spread": "^6.13.0", "bluebird": "^3.0.0", "caching-transform": "^1.0.0", "chalk": "^2.0.1", @@ -230,13 +279,13 @@ "cli-spinners": "^1.0.0", "cli-truncate": "^1.0.0", "co-with-promise": "^4.6.0", - "code-excerpt": "^2.1.0", + "code-excerpt": "^2.1.1", "common-path-prefix": "^1.0.0", "concordance": "^3.0.0", - "convert-source-map": "^1.2.0", + "convert-source-map": "^1.5.1", "core-assert": "^0.2.0", "currently-unhandled": "^0.4.1", - "debug": "^2.2.0", + "debug": "^3.0.1", "dot-prop": "^4.1.0", "empower-core": "^0.6.1", "equal-length": "^1.0.0", @@ -253,9 +302,8 @@ "is-ci": "^1.0.7", "is-generator-fn": "^1.0.0", "is-obj": "^1.0.0", - "is-observable": "^0.2.0", + "is-observable": "^1.0.0", "is-promise": "^2.1.0", - "js-yaml": "^3.8.2", "last-line-stream": "^1.0.0", "lodash.clonedeepwith": "^4.5.0", "lodash.debounce": "^4.0.3", @@ -273,20 +321,21 @@ "package-hash": "^2.0.0", "pkg-conf": "^2.0.0", "plur": "^2.0.0", - "pretty-ms": "^2.0.0", + "pretty-ms": "^3.0.0", "require-precompiled": "^0.1.0", "resolve-cwd": "^2.0.0", "safe-buffer": "^5.1.1", + "semver": "^5.4.1", "slash": "^1.0.0", - "source-map-support": "^0.4.0", - "stack-utils": "^1.0.0", + "source-map-support": "^0.5.0", + "stack-utils": "^1.0.1", "strip-ansi": "^4.0.0", "strip-bom-buf": "^1.0.0", - "supports-color": "^4.0.0", - "time-require": "^0.1.2", + "supertap": "^1.0.0", + "supports-color": "^5.0.0", "trim-off-newlines": "^1.0.1", "unique-temp-dir": "^1.0.0", - "update-notifier": "^2.1.0" + "update-notifier": "^2.3.0" } }, "ava-init": { @@ -303,14 +352,14 @@ } }, "babel-code-frame": { - "version": "6.22.0", - "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.22.0.tgz", - "integrity": "sha1-AnYgvuVnqIwyVhV05/0IAdMxGOQ=", + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz", + "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", "dev": true, "requires": { - "chalk": "^1.1.0", + "chalk": "^1.1.3", "esutils": "^2.0.2", - "js-tokens": "^3.0.0" + "js-tokens": "^3.0.2" }, "dependencies": { "ansi-styles": { @@ -350,45 +399,62 @@ } }, "babel-core": { - "version": "6.25.0", - "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.25.0.tgz", - "integrity": "sha1-fdQrBGPHQunVKW3rPsZ6kyLa1yk=", + "version": "6.26.3", + "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.26.3.tgz", + "integrity": "sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==", "dev": true, "requires": { - "babel-code-frame": "^6.22.0", - "babel-generator": "^6.25.0", + "babel-code-frame": "^6.26.0", + "babel-generator": "^6.26.0", "babel-helpers": "^6.24.1", "babel-messages": "^6.23.0", - "babel-register": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-template": "^6.25.0", - "babel-traverse": "^6.25.0", - "babel-types": "^6.25.0", - "babylon": "^6.17.2", - "convert-source-map": "^1.1.0", - "debug": "^2.1.1", - "json5": "^0.5.0", - "lodash": "^4.2.0", - "minimatch": "^3.0.2", - "path-is-absolute": "^1.0.0", - "private": "^0.1.6", + "babel-register": "^6.26.0", + "babel-runtime": "^6.26.0", + "babel-template": "^6.26.0", + "babel-traverse": "^6.26.0", + "babel-types": "^6.26.0", + "babylon": "^6.18.0", + "convert-source-map": "^1.5.1", + "debug": "^2.6.9", + "json5": "^0.5.1", + "lodash": "^4.17.4", + "minimatch": "^3.0.4", + "path-is-absolute": "^1.0.1", + "private": "^0.1.8", "slash": "^1.0.0", - "source-map": "^0.5.0" + "source-map": "^0.5.7" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + } } }, "babel-generator": { - "version": "6.25.0", - "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.25.0.tgz", - "integrity": "sha1-M6GvcNXyiQrrRlpKd5PB32qeqfw=", + "version": "6.26.1", + "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz", + "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==", "dev": true, "requires": { "babel-messages": "^6.23.0", - "babel-runtime": "^6.22.0", - "babel-types": "^6.25.0", + "babel-runtime": "^6.26.0", + "babel-types": "^6.26.0", "detect-indent": "^4.0.0", "jsesc": "^1.3.0", - "lodash": "^4.2.0", - "source-map": "^0.5.0", + "lodash": "^4.17.4", + "source-map": "^0.5.7", "trim-right": "^1.0.1" }, "dependencies": { @@ -423,18 +489,6 @@ "babel-types": "^6.24.1" } }, - "babel-helper-define-map": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.24.1.tgz", - "integrity": "sha1-epdH8ljYlH0y1RX2qhx70CIEoIA=", - "dev": true, - "requires": { - "babel-helper-function-name": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1", - "lodash": "^4.2.0" - } - }, "babel-helper-explode-assignable-expression": { "version": "6.24.1", "resolved": "https://registry.npmjs.org/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz", @@ -479,25 +533,15 @@ "babel-types": "^6.24.1" } }, - "babel-helper-optimise-call-expression": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz", - "integrity": "sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" - } - }, "babel-helper-regex": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.24.1.tgz", - "integrity": "sha1-024i+rEAjXnYhkjjIRaGgShFbOg=", + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz", + "integrity": "sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=", "dev": true, "requires": { - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1", - "lodash": "^4.2.0" + "babel-runtime": "^6.26.0", + "babel-types": "^6.26.0", + "lodash": "^4.17.4" } }, "babel-helper-remap-async-to-generator": { @@ -513,20 +557,6 @@ "babel-types": "^6.24.1" } }, - "babel-helper-replace-supers": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz", - "integrity": "sha1-v22/5Dk40XNpohPKiov3S2qQqxo=", - "dev": true, - "requires": { - "babel-helper-optimise-call-expression": "^6.24.1", - "babel-messages": "^6.23.0", - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1", - "babel-traverse": "^6.24.1", - "babel-types": "^6.24.1" - } - }, "babel-helpers": { "version": "6.24.1", "resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz", @@ -556,9 +586,9 @@ } }, "babel-plugin-espower": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/babel-plugin-espower/-/babel-plugin-espower-2.3.2.tgz", - "integrity": "sha1-VRa4/NsmyfDh2BYHSfbkxl5xJx4=", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/babel-plugin-espower/-/babel-plugin-espower-2.4.0.tgz", + "integrity": "sha512-/+SRpy7pKgTI28oEHfn1wkuM5QFAdRq8WNsOOih1dVrdV6A/WbNbRZyl0eX5eyDgtb0lOE27PeDFuCX2j8OxVg==", "dev": true, "requires": { "babel-generator": "^6.1.0", @@ -582,6 +612,12 @@ "integrity": "sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4=", "dev": true }, + "babel-plugin-syntax-object-rest-spread": { + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz", + "integrity": "sha1-/WU28rzhODb/o6VFjEkDpZe7O/U=", + "dev": true + }, "babel-plugin-syntax-trailing-function-commas": { "version": "6.22.0", "resolved": "https://registry.npmjs.org/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz", @@ -599,64 +635,6 @@ "babel-runtime": "^6.22.0" } }, - "babel-plugin-transform-es2015-arrow-functions": { - "version": "6.22.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz", - "integrity": "sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-transform-es2015-block-scoped-functions": { - "version": "6.22.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz", - "integrity": "sha1-u8UbSflk1wy42OC5ToICRs46YUE=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-transform-es2015-block-scoping": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.24.1.tgz", - "integrity": "sha1-dsKV3DpHQbFmWt/TFnIV3P8ypXY=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1", - "babel-traverse": "^6.24.1", - "babel-types": "^6.24.1", - "lodash": "^4.2.0" - } - }, - "babel-plugin-transform-es2015-classes": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz", - "integrity": "sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=", - "dev": true, - "requires": { - "babel-helper-define-map": "^6.24.1", - "babel-helper-function-name": "^6.24.1", - "babel-helper-optimise-call-expression": "^6.24.1", - "babel-helper-replace-supers": "^6.24.1", - "babel-messages": "^6.23.0", - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1", - "babel-traverse": "^6.24.1", - "babel-types": "^6.24.1" - } - }, - "babel-plugin-transform-es2015-computed-properties": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz", - "integrity": "sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1" - } - }, "babel-plugin-transform-es2015-destructuring": { "version": "6.23.0", "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz", @@ -666,25 +644,6 @@ "babel-runtime": "^6.22.0" } }, - "babel-plugin-transform-es2015-duplicate-keys": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz", - "integrity": "sha1-c+s9MQypaePvnskcU3QabxV2Qj4=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" - } - }, - "babel-plugin-transform-es2015-for-of": { - "version": "6.23.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz", - "integrity": "sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0" - } - }, "babel-plugin-transform-es2015-function-name": { "version": "6.24.1", "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz", @@ -696,68 +655,16 @@ "babel-types": "^6.24.1" } }, - "babel-plugin-transform-es2015-literals": { - "version": "6.22.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz", - "integrity": "sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-transform-es2015-modules-amd": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz", - "integrity": "sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ=", - "dev": true, - "requires": { - "babel-plugin-transform-es2015-modules-commonjs": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1" - } - }, "babel-plugin-transform-es2015-modules-commonjs": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.24.1.tgz", - "integrity": "sha1-0+MQtA72ZKNmIiAAl8bUQCmPK/4=", + "version": "6.26.2", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.2.tgz", + "integrity": "sha512-CV9ROOHEdrjcwhIaJNBGMBCodN+1cfkwtM1SbUHmvyy35KGT7fohbpOxkE2uLz1o6odKK2Ck/tz47z+VqQfi9Q==", "dev": true, "requires": { "babel-plugin-transform-strict-mode": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1", - "babel-types": "^6.24.1" - } - }, - "babel-plugin-transform-es2015-modules-systemjs": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz", - "integrity": "sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM=", - "dev": true, - "requires": { - "babel-helper-hoist-variables": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1" - } - }, - "babel-plugin-transform-es2015-modules-umd": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz", - "integrity": "sha1-rJl+YoXNGO1hdq22B9YCNErThGg=", - "dev": true, - "requires": { - "babel-plugin-transform-es2015-modules-amd": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1" - } - }, - "babel-plugin-transform-es2015-object-super": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz", - "integrity": "sha1-JM72muIcuDp/hgPa0CH1cusnj40=", - "dev": true, - "requires": { - "babel-helper-replace-supers": "^6.24.1", - "babel-runtime": "^6.22.0" + "babel-runtime": "^6.26.0", + "babel-template": "^6.26.0", + "babel-types": "^6.26.0" } }, "babel-plugin-transform-es2015-parameters": { @@ -774,16 +681,6 @@ "babel-types": "^6.24.1" } }, - "babel-plugin-transform-es2015-shorthand-properties": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz", - "integrity": "sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" - } - }, "babel-plugin-transform-es2015-spread": { "version": "6.22.0", "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz", @@ -804,24 +701,6 @@ "babel-types": "^6.24.1" } }, - "babel-plugin-transform-es2015-template-literals": { - "version": "6.22.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz", - "integrity": "sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-transform-es2015-typeof-symbol": { - "version": "6.23.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz", - "integrity": "sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0" - } - }, "babel-plugin-transform-es2015-unicode-regex": { "version": "6.24.1", "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz", @@ -844,15 +723,6 @@ "babel-runtime": "^6.22.0" } }, - "babel-plugin-transform-regenerator": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.24.1.tgz", - "integrity": "sha1-uNowWtQ8PJm0hI5P5AN7dw0jxBg=", - "dev": true, - "requires": { - "regenerator-transform": "0.9.11" - } - }, "babel-plugin-transform-strict-mode": { "version": "6.24.1", "resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz", @@ -863,115 +733,105 @@ "babel-types": "^6.24.1" } }, - "babel-preset-env": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/babel-preset-env/-/babel-preset-env-1.6.0.tgz", - "integrity": "sha512-OVgtQRuOZKckrILgMA5rvctvFZPv72Gua9Rt006AiPoB0DJKGN07UmaQA+qRrYgK71MVct8fFhT0EyNWYorVew==", - "dev": true, - "requires": { - "babel-plugin-check-es2015-constants": "^6.22.0", - "babel-plugin-syntax-trailing-function-commas": "^6.22.0", - "babel-plugin-transform-async-to-generator": "^6.22.0", - "babel-plugin-transform-es2015-arrow-functions": "^6.22.0", - "babel-plugin-transform-es2015-block-scoped-functions": "^6.22.0", - "babel-plugin-transform-es2015-block-scoping": "^6.23.0", - "babel-plugin-transform-es2015-classes": "^6.23.0", - "babel-plugin-transform-es2015-computed-properties": "^6.22.0", - "babel-plugin-transform-es2015-destructuring": "^6.23.0", - "babel-plugin-transform-es2015-duplicate-keys": "^6.22.0", - "babel-plugin-transform-es2015-for-of": "^6.23.0", - "babel-plugin-transform-es2015-function-name": "^6.22.0", - "babel-plugin-transform-es2015-literals": "^6.22.0", - "babel-plugin-transform-es2015-modules-amd": "^6.22.0", - "babel-plugin-transform-es2015-modules-commonjs": "^6.23.0", - "babel-plugin-transform-es2015-modules-systemjs": "^6.23.0", - "babel-plugin-transform-es2015-modules-umd": "^6.23.0", - "babel-plugin-transform-es2015-object-super": "^6.22.0", - "babel-plugin-transform-es2015-parameters": "^6.23.0", - "babel-plugin-transform-es2015-shorthand-properties": "^6.22.0", - "babel-plugin-transform-es2015-spread": "^6.22.0", - "babel-plugin-transform-es2015-sticky-regex": "^6.22.0", - "babel-plugin-transform-es2015-template-literals": "^6.22.0", - "babel-plugin-transform-es2015-typeof-symbol": "^6.23.0", - "babel-plugin-transform-es2015-unicode-regex": "^6.22.0", - "babel-plugin-transform-exponentiation-operator": "^6.22.0", - "babel-plugin-transform-regenerator": "^6.22.0", - "browserslist": "^2.1.2", - "invariant": "^2.2.2", - "semver": "^5.3.0" - } - }, "babel-register": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.24.1.tgz", - "integrity": "sha1-fhDhOi9xBlvfrVoXh7pFvKbe118=", + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz", + "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=", "dev": true, "requires": { - "babel-core": "^6.24.1", - "babel-runtime": "^6.22.0", - "core-js": "^2.4.0", + "babel-core": "^6.26.0", + "babel-runtime": "^6.26.0", + "core-js": "^2.5.0", "home-or-tmp": "^2.0.0", - "lodash": "^4.2.0", + "lodash": "^4.17.4", "mkdirp": "^0.5.1", - "source-map-support": "^0.4.2" + "source-map-support": "^0.4.15" + }, + "dependencies": { + "source-map-support": { + "version": "0.4.18", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz", + "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==", + "dev": true, + "requires": { + "source-map": "^0.5.6" + } + } } }, "babel-runtime": { - "version": "6.23.0", - "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz", - "integrity": "sha1-CpSJ8UTecO+zzkMArM2zKeL8VDs=", + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", + "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", "dev": true, "requires": { "core-js": "^2.4.0", - "regenerator-runtime": "^0.10.0" + "regenerator-runtime": "^0.11.0" } }, "babel-template": { - "version": "6.25.0", - "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.25.0.tgz", - "integrity": "sha1-ZlJBFmt8KqTGGdceGSlpVSsQwHE=", + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz", + "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=", "dev": true, "requires": { - "babel-runtime": "^6.22.0", - "babel-traverse": "^6.25.0", - "babel-types": "^6.25.0", - "babylon": "^6.17.2", - "lodash": "^4.2.0" + "babel-runtime": "^6.26.0", + "babel-traverse": "^6.26.0", + "babel-types": "^6.26.0", + "babylon": "^6.18.0", + "lodash": "^4.17.4" } }, "babel-traverse": { - "version": "6.25.0", - "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.25.0.tgz", - "integrity": "sha1-IldJfi/NGbie3BPEyROB+VEklvE=", + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz", + "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=", "dev": true, "requires": { - "babel-code-frame": "^6.22.0", + "babel-code-frame": "^6.26.0", "babel-messages": "^6.23.0", - "babel-runtime": "^6.22.0", - "babel-types": "^6.25.0", - "babylon": "^6.17.2", - "debug": "^2.2.0", - "globals": "^9.0.0", - "invariant": "^2.2.0", - "lodash": "^4.2.0" + "babel-runtime": "^6.26.0", + "babel-types": "^6.26.0", + "babylon": "^6.18.0", + "debug": "^2.6.8", + "globals": "^9.18.0", + "invariant": "^2.2.2", + "lodash": "^4.17.4" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + } } }, "babel-types": { - "version": "6.25.0", - "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.25.0.tgz", - "integrity": "sha1-cK+ySNVmDl0Y+BHZHIMDtUE0oY4=", + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz", + "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=", "dev": true, "requires": { - "babel-runtime": "^6.22.0", + "babel-runtime": "^6.26.0", "esutils": "^2.0.2", - "lodash": "^4.2.0", - "to-fast-properties": "^1.0.1" + "lodash": "^4.17.4", + "to-fast-properties": "^1.0.3" } }, "babylon": { - "version": "6.17.4", - "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.17.4.tgz", - "integrity": "sha512-kChlV+0SXkjE0vUn9OZ7pBMWRFd8uq3mZe8x1K6jhuNcAFAtEnjchFAqB+dYEXKyd+JpT6eppRR78QAr5gTsUw==", + "version": "6.18.0", + "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz", + "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==", "dev": true }, "balanced-match": { @@ -981,21 +841,21 @@ "dev": true }, "binary-extensions": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.8.0.tgz", - "integrity": "sha1-SOyNFt9Dd+rl+liEaCSAr02Vx3Q=", + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.11.0.tgz", + "integrity": "sha1-RqoXUftqL5PuXmibsQh9SxTGwgU=", "dev": true }, "bluebird": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz", - "integrity": "sha1-eRQg1/VR7qKJdFOop3ZT+WYG1nw=", + "version": "3.5.1", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz", + "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==", "dev": true }, "boxen": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/boxen/-/boxen-1.2.0.tgz", - "integrity": "sha512-tfKK3nq0qXXOxvXEYW1k1XNRrDuQzO2oFPvLD3Fs1I58n0leuTNlftBmu3seUCyZvDfiqgRaxlqZs9WJAbSA7g==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz", + "integrity": "sha512-TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw==", "dev": true, "requires": { "ansi-align": "^2.0.0", @@ -1004,7 +864,7 @@ "cli-boxes": "^1.0.0", "string-width": "^2.0.0", "term-size": "^1.2.0", - "widest-line": "^1.0.0" + "widest-line": "^2.0.0" }, "dependencies": { "camelcase": { @@ -1016,9 +876,9 @@ } }, "brace-expansion": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", - "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=", + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, "requires": { "balanced-match": "^1.0.0", @@ -1036,39 +896,18 @@ "repeat-element": "^1.1.2" } }, - "browser-resolve": { - "version": "1.11.2", - "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.2.tgz", - "integrity": "sha1-j/CbCixCFxihBRwmCzLkj0QpOM4=", - "dev": true, - "requires": { - "resolve": "1.1.7" - }, - "dependencies": { - "resolve": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz", - "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=", - "dev": true - } - } - }, - "browserslist": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.2.2.tgz", - "integrity": "sha512-MejxGMNIeIqzgaMKVYfFTWHinrwZOnWMXteN9VlHinTd13/0aDmXY9uyRqNsCTnVxqRmrjQFcXI7cy0q9K1IYg==", - "dev": true, - "requires": { - "caniuse-lite": "^1.0.30000704", - "electron-to-chromium": "^1.3.16" - } - }, "buf-compare": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/buf-compare/-/buf-compare-1.0.1.tgz", "integrity": "sha1-/vKNqLgROgoNtEMLC2Rntpcws0o=", "dev": true }, + "buffer-from": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.0.tgz", + "integrity": "sha512-c5mRlguI/Pe2dSZmpER62rSCu0ryKmWddzRYsuXc50U2/g8jMOulc31VZMa4mYx31U5xsmSOpDCgH88Vl9cDGQ==", + "dev": true + }, "builtin-modules": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", @@ -1142,12 +981,6 @@ "map-obj": "^1.0.0" } }, - "caniuse-lite": { - "version": "1.0.30000704", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000704.tgz", - "integrity": "sha1-rbbqARNFFWY2gtuTq6spHUwClGs=", - "dev": true - }, "capture-stack-trace": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz", @@ -1155,14 +988,14 @@ "dev": true }, "chalk": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.0.1.tgz", - "integrity": "sha512-Mp+FXEI+FrwY/XYV45b2YD3E8i3HwnEAoFcM0qlZzq/RZ9RwWitt2Y/c7cqRAz70U7hfekqx6qNYthuKFO6K0g==", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", + "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", "dev": true, "requires": { - "ansi-styles": "^3.1.0", + "ansi-styles": "^3.2.1", "escape-string-regexp": "^1.0.5", - "supports-color": "^4.0.0" + "supports-color": "^5.3.0" } }, "chokidar": { @@ -1183,9 +1016,9 @@ } }, "ci-info": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.0.0.tgz", - "integrity": "sha1-3FKF8rTiUYIWg2gcOBwziPRuxTQ=", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.1.3.tgz", + "integrity": "sha512-SK/846h/Rcy8q9Z9CAwGBLfCJ6EkjJWdpelWDufQpqVDYq2Wnnv8zlSO6AMQap02jvhVruKKpEtQOufo3pFhLg==", "dev": true }, "clean-stack": { @@ -1216,18 +1049,18 @@ } }, "cli-spinners": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-1.0.0.tgz", - "integrity": "sha1-75h+09SDkaw9q5GAtAanQhgNbmo=", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-1.3.1.tgz", + "integrity": "sha512-1QL4544moEsDVH9T/l6Cemov/37iv1RtoKf7NJ04A60+4MREXNfx/QvavbH6QoGdsD4N4Mwy49cmaINR/o2mdg==", "dev": true }, "cli-truncate": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-1.0.0.tgz", - "integrity": "sha1-IeuR9Hs/ZWDwBNt3p2m0Zo2cVRg=", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-1.1.0.tgz", + "integrity": "sha512-bAtZo0u82gCfaAGfSNxUdTI9mNyza7D8w4CVCcaOsy7sgwDzvx6ekr6cuWJqY3UGzgnQ1+4wgENup5eIhgxEYA==", "dev": true, "requires": { - "slice-ansi": "0.0.4", + "slice-ansi": "^1.0.0", "string-width": "^2.0.0" } }, @@ -1241,33 +1074,27 @@ } }, "code-excerpt": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/code-excerpt/-/code-excerpt-2.1.0.tgz", - "integrity": "sha1-XcwIHoj0p+O1VOnjXX7yMtR/gUc=", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/code-excerpt/-/code-excerpt-2.1.1.tgz", + "integrity": "sha512-tJLhH3EpFm/1x7heIW0hemXJTUU5EWl2V0EIX558jp05Mt1U6DVryCgkp3l37cxqs+DNbNgxG43SkwJXpQ14Jw==", "dev": true, "requires": { "convert-to-spaces": "^1.0.1" } }, - "code-point-at": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", - "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", - "dev": true - }, "color-convert": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz", - "integrity": "sha1-Gsz5fdc5uYO/mU1W/sj5WFNkG3o=", + "version": "1.9.2", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.2.tgz", + "integrity": "sha512-3NUJZdhMhcdPn8vJ9v2UQJoH0qqoGUkYTgFEPZaPjEtwmmKUfNV46zZmgB2M5M4DCEQHMaCfWHCxiBflLm04Tg==", "dev": true, "requires": { - "color-name": "^1.1.1" + "color-name": "1.1.1" } }, "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.1.tgz", + "integrity": "sha1-SxQVMEz1ACjqgWQ2Q72C6gWANok=", "dev": true }, "common-path-prefix": { @@ -1305,12 +1132,23 @@ "md5-hex": "^2.0.0", "semver": "^5.3.0", "well-known-symbols": "^1.0.0" + }, + "dependencies": { + "date-time": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/date-time/-/date-time-2.1.0.tgz", + "integrity": "sha512-/9+C44X7lot0IeiyfgJmETtRMhBidBYM2QFFIkGa0U1k+hSyY87Nw7PY3eDqpvCBm7I3WCSfPeZskW/YYq6m4g==", + "dev": true, + "requires": { + "time-zone": "^1.0.0" + } + } } }, "configstore": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.1.tgz", - "integrity": "sha512-5oNkD/L++l0O6xGXxb1EWS7SivtjfGQlRyxJsYgE0Z495/L81e2h4/d3r969hoPXuFItzNOKMtsXgYG4c7dYvw==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.2.tgz", + "integrity": "sha512-vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw==", "dev": true, "requires": { "dot-prop": "^4.1.0", @@ -1322,9 +1160,9 @@ } }, "convert-source-map": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.0.tgz", - "integrity": "sha1-ms1whRxtXf3ZPZKC5e35SgP/RrU=", + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.1.tgz", + "integrity": "sha1-uCeAl7m8IpNl3lxiz1/K7YtVmeU=", "dev": true }, "convert-to-spaces": { @@ -1344,9 +1182,9 @@ } }, "core-js": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz", - "integrity": "sha1-TekR5mew6ukSTjQlS1OupvxhjT4=", + "version": "2.5.7", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.7.tgz", + "integrity": "sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw==", "dev": true }, "core-util-is": { @@ -1391,21 +1229,26 @@ } }, "date-time": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/date-time/-/date-time-2.1.0.tgz", - "integrity": "sha512-/9+C44X7lot0IeiyfgJmETtRMhBidBYM2QFFIkGa0U1k+hSyY87Nw7PY3eDqpvCBm7I3WCSfPeZskW/YYq6m4g==", - "dev": true, - "requires": { - "time-zone": "^1.0.0" - } + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/date-time/-/date-time-0.1.1.tgz", + "integrity": "sha1-7S9tk9l5DOL9ZtW1/z7dW7y/Owc=", + "dev": true }, "debug": { - "version": "2.6.8", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz", - "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", "dev": true, "requires": { "ms": "2.0.0" + }, + "dependencies": { + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + } } }, "decamelize": { @@ -1421,9 +1264,9 @@ "dev": true }, "deep-extend": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz", - "integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8=", + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", + "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", "dev": true }, "detect-indent": { @@ -1435,10 +1278,16 @@ "repeating": "^2.0.0" } }, + "diff": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz", + "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==", + "dev": true + }, "dot-prop": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.1.1.tgz", - "integrity": "sha1-qEk/C3te7sglJbXHWH+n3nyoWcE=", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz", + "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==", "dev": true, "requires": { "is-obj": "^1.0.0" @@ -1450,12 +1299,6 @@ "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=", "dev": true }, - "electron-to-chromium": { - "version": "1.3.16", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.16.tgz", - "integrity": "sha1-0OAmc1dUdwkBrjAaIWZMukXZL30=", - "dev": true - }, "empower-core": { "version": "0.6.2", "resolved": "https://registry.npmjs.org/empower-core/-/empower-core-0.6.2.tgz", @@ -1473,23 +1316,23 @@ "dev": true }, "erlang-types": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/erlang-types/-/erlang-types-1.0.1.tgz", - "integrity": "sha512-xTKz50wkI7scTf/0ZqsZe50PhVNQEyyJk18gapz2zSrDvQKmShk1NDKfOvqLETEfW2rOiRb4X1/AIXAJaz3fhQ==" + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/erlang-types/-/erlang-types-1.1.3.tgz", + "integrity": "sha512-HZWcirSqKIdasr04DT9NnYgVyqvUaefDPp2LhNgtBnM2ovOkUhJ4DEKVQZ71POKsu4wiR64EWhahA8AE9r796g==" }, "error-ex": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz", - "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", + "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", "dev": true, "requires": { "is-arrayish": "^0.2.1" } }, "es6-error": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.0.2.tgz", - "integrity": "sha1-7sXHJurO9Rt/a3PCDbbhsTsGnJg=", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz", + "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==", "dev": true }, "escape-string-regexp": { @@ -1511,15 +1354,15 @@ } }, "esprima": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz", - "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", "dev": true }, "espurify": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/espurify/-/espurify-1.7.0.tgz", - "integrity": "sha1-HFz2y8zDLm9jk4C9T5kfq5up0iY=", + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/espurify/-/espurify-1.8.1.tgz", + "integrity": "sha512-ZDko6eY/o+D/gHCWyHTU85mKDgYcS4FJj7S+YD6WIInm7GQ6AnOjmcL4+buFV/JOztVLELi/7MmuGU5NHta0Mg==", "dev": true, "requires": { "core-js": "^2.0.0" @@ -1531,12 +1374,6 @@ "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=", "dev": true }, - "estree-walker": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.2.1.tgz", - "integrity": "sha1-va/oCVOD2EFNXcLs9MkXO225QS4=", - "dev": true - }, "esutils": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", @@ -1586,9 +1423,9 @@ } }, "fast-diff": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.1.1.tgz", - "integrity": "sha1-CuoOTmBbaiGJ8Ok21Lf7rxt8/Zs=", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.1.2.tgz", + "integrity": "sha512-KaJUt+M9t1qaIteSvjc6P3RbMdXsNhK61GRftR6SNxqmhthcd9MGIi4T+o0jD8LUSpSnSKXE20nLtJ3fOHxQig==", "dev": true }, "figures": { @@ -1607,14 +1444,14 @@ "dev": true }, "fill-range": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz", - "integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=", + "version": "2.2.4", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz", + "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==", "dev": true, "requires": { "is-number": "^2.1.0", "isobject": "^2.0.0", - "randomatic": "^1.1.3", + "randomatic": "^3.0.0", "repeat-element": "^1.1.2", "repeat-string": "^1.5.2" } @@ -1667,39 +1504,29 @@ "dev": true }, "fsevents": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.1.2.tgz", - "integrity": "sha512-Sn44E5wQW4bTHXvQmvSHwqbuiXtduD6Rrjm2ZtUEGbyrig+nUH3t/QD4M4/ZXViY556TBpRgZkHLDx3JxPwxiw==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.4.tgz", + "integrity": "sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==", "dev": true, "optional": true, "requires": { - "nan": "^2.3.0", - "node-pre-gyp": "^0.6.36" + "nan": "^2.9.2", + "node-pre-gyp": "^0.10.0" }, "dependencies": { "abbrev": { - "version": "1.1.0", + "version": "1.1.1", "bundled": true, "dev": true, "optional": true }, - "ajv": { - "version": "4.11.8", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "co": "^4.6.0", - "json-stable-stringify": "^1.0.1" - } - }, "ansi-regex": { "version": "2.1.1", "bundled": true, "dev": true }, "aproba": { - "version": "1.1.1", + "version": "1.2.0", "bundled": true, "dev": true, "optional": true @@ -1714,88 +1541,22 @@ "readable-stream": "^2.0.6" } }, - "asn1": { - "version": "0.2.3", - "bundled": true, - "dev": true, - "optional": true - }, - "assert-plus": { - "version": "0.2.0", - "bundled": true, - "dev": true, - "optional": true - }, - "asynckit": { - "version": "0.4.0", - "bundled": true, - "dev": true, - "optional": true - }, - "aws-sign2": { - "version": "0.6.0", - "bundled": true, - "dev": true, - "optional": true - }, - "aws4": { - "version": "1.6.0", - "bundled": true, - "dev": true, - "optional": true - }, "balanced-match": { - "version": "0.4.2", + "version": "1.0.0", "bundled": true, "dev": true }, - "bcrypt-pbkdf": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "tweetnacl": "^0.14.3" - } - }, - "block-stream": { - "version": "0.0.9", - "bundled": true, - "dev": true, - "requires": { - "inherits": "~2.0.0" - } - }, - "boom": { - "version": "2.10.1", - "bundled": true, - "dev": true, - "requires": { - "hoek": "2.x.x" - } - }, "brace-expansion": { - "version": "1.1.7", + "version": "1.1.11", "bundled": true, "dev": true, "requires": { - "balanced-match": "^0.4.1", + "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, - "buffer-shims": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "caseless": { - "version": "0.12.0", - "bundled": true, - "dev": true, - "optional": true - }, - "co": { - "version": "4.6.0", + "chownr": { + "version": "1.0.1", "bundled": true, "dev": true, "optional": true @@ -1805,14 +1566,6 @@ "bundled": true, "dev": true }, - "combined-stream": { - "version": "1.0.5", - "bundled": true, - "dev": true, - "requires": { - "delayed-stream": "~1.0.0" - } - }, "concat-map": { "version": "0.0.1", "bundled": true, @@ -1826,36 +1579,11 @@ "core-util-is": { "version": "1.0.2", "bundled": true, - "dev": true - }, - "cryptiles": { - "version": "2.0.5", - "bundled": true, "dev": true, - "optional": true, - "requires": { - "boom": "2.x.x" - } - }, - "dashdash": { - "version": "1.14.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "assert-plus": "^1.0.0" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - } - } + "optional": true }, "debug": { - "version": "2.6.8", + "version": "2.6.9", "bundled": true, "dev": true, "optional": true, @@ -1864,85 +1592,37 @@ } }, "deep-extend": { - "version": "0.4.2", + "version": "0.5.1", "bundled": true, "dev": true, "optional": true }, - "delayed-stream": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, "delegates": { "version": "1.0.0", "bundled": true, "dev": true, "optional": true }, - "ecc-jsbn": { - "version": "0.1.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "jsbn": "~0.1.0" - } - }, - "extend": { - "version": "3.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "extsprintf": { - "version": "1.0.2", - "bundled": true, - "dev": true - }, - "forever-agent": { - "version": "0.6.1", + "detect-libc": { + "version": "1.0.3", "bundled": true, "dev": true, "optional": true }, - "form-data": { - "version": "2.1.4", + "fs-minipass": { + "version": "1.2.5", "bundled": true, "dev": true, "optional": true, "requires": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.5", - "mime-types": "^2.1.12" + "minipass": "^2.2.1" } }, "fs.realpath": { "version": "1.0.0", "bundled": true, - "dev": true - }, - "fstream": { - "version": "1.0.11", - "bundled": true, "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "inherits": "~2.0.0", - "mkdirp": ">=0.5 0", - "rimraf": "2" - } - }, - "fstream-ignore": { - "version": "1.0.5", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "fstream": "^1.0.0", - "inherits": "2", - "minimatch": "^3.0.0" - } + "optional": true }, "gauge": { "version": "2.7.4", @@ -1960,27 +1640,11 @@ "wide-align": "^1.1.0" } }, - "getpass": { - "version": "0.1.7", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "assert-plus": "^1.0.0" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - } - } - }, "glob": { "version": "7.1.2", "bundled": true, "dev": true, + "optional": true, "requires": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -1990,180 +1654,64 @@ "path-is-absolute": "^1.0.0" } }, - "graceful-fs": { - "version": "4.1.11", - "bundled": true, - "dev": true - }, - "har-schema": { - "version": "1.0.5", - "bundled": true, - "dev": true, - "optional": true - }, - "har-validator": { - "version": "4.2.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "ajv": "^4.9.1", - "har-schema": "^1.0.5" - } - }, "has-unicode": { "version": "2.0.1", "bundled": true, "dev": true, "optional": true }, - "hawk": { - "version": "3.1.3", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "boom": "2.x.x", - "cryptiles": "2.x.x", - "hoek": "2.x.x", - "sntp": "1.x.x" - } - }, - "hoek": { - "version": "2.16.3", - "bundled": true, - "dev": true - }, - "http-signature": { - "version": "1.1.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "assert-plus": "^0.2.0", - "jsprim": "^1.2.2", - "sshpk": "^1.7.0" - } - }, - "inflight": { - "version": "1.0.6", - "bundled": true, - "dev": true, - "requires": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "inherits": { - "version": "2.0.3", - "bundled": true, - "dev": true - }, - "ini": { - "version": "1.3.4", - "bundled": true, - "dev": true, - "optional": true - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "number-is-nan": "^1.0.0" - } - }, - "is-typedarray": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "isarray": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "isstream": { - "version": "0.1.2", - "bundled": true, - "dev": true, - "optional": true - }, - "jodid25519": { - "version": "1.0.2", + "iconv-lite": { + "version": "0.4.21", "bundled": true, "dev": true, "optional": true, "requires": { - "jsbn": "~0.1.0" + "safer-buffer": "^2.1.0" } }, - "jsbn": { - "version": "0.1.1", - "bundled": true, - "dev": true, - "optional": true - }, - "json-schema": { - "version": "0.2.3", + "ignore-walk": { + "version": "3.0.1", "bundled": true, "dev": true, - "optional": true + "optional": true, + "requires": { + "minimatch": "^3.0.4" + } }, - "json-stable-stringify": { - "version": "1.0.1", + "inflight": { + "version": "1.0.6", "bundled": true, "dev": true, "optional": true, "requires": { - "jsonify": "~0.0.0" + "once": "^1.3.0", + "wrappy": "1" } }, - "json-stringify-safe": { - "version": "5.0.1", + "inherits": { + "version": "2.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true }, - "jsonify": { - "version": "0.0.0", + "ini": { + "version": "1.3.5", "bundled": true, "dev": true, "optional": true }, - "jsprim": { - "version": "1.4.0", + "is-fullwidth-code-point": { + "version": "1.0.0", "bundled": true, "dev": true, - "optional": true, "requires": { - "assert-plus": "1.0.0", - "extsprintf": "1.0.2", - "json-schema": "0.2.3", - "verror": "1.3.6" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - } + "number-is-nan": "^1.0.0" } }, - "mime-db": { - "version": "1.27.0", - "bundled": true, - "dev": true - }, - "mime-types": { - "version": "2.1.15", + "isarray": { + "version": "1.0.0", "bundled": true, "dev": true, - "requires": { - "mime-db": "~1.27.0" - } + "optional": true }, "minimatch": { "version": "3.0.4", @@ -2178,6 +1726,24 @@ "bundled": true, "dev": true }, + "minipass": { + "version": "2.2.4", + "bundled": true, + "dev": true, + "requires": { + "safe-buffer": "^5.1.1", + "yallist": "^3.0.0" + } + }, + "minizlib": { + "version": "1.1.0", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "minipass": "^2.2.1" + } + }, "mkdirp": { "version": "0.5.1", "bundled": true, @@ -2192,21 +1758,33 @@ "dev": true, "optional": true }, + "needle": { + "version": "2.2.0", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "debug": "^2.1.2", + "iconv-lite": "^0.4.4", + "sax": "^1.2.4" + } + }, "node-pre-gyp": { - "version": "0.6.36", + "version": "0.10.0", "bundled": true, "dev": true, "optional": true, "requires": { + "detect-libc": "^1.0.2", "mkdirp": "^0.5.1", + "needle": "^2.2.0", "nopt": "^4.0.1", + "npm-packlist": "^1.1.6", "npmlog": "^4.0.2", "rc": "^1.1.7", - "request": "^2.81.0", "rimraf": "^2.6.1", "semver": "^5.3.0", - "tar": "^2.2.1", - "tar-pack": "^3.4.0" + "tar": "^4" } }, "nopt": { @@ -2219,8 +1797,24 @@ "osenv": "^0.1.4" } }, + "npm-bundled": { + "version": "1.0.3", + "bundled": true, + "dev": true, + "optional": true + }, + "npm-packlist": { + "version": "1.1.10", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "ignore-walk": "^3.0.1", + "npm-bundled": "^1.0.1" + } + }, "npmlog": { - "version": "4.1.0", + "version": "4.1.2", "bundled": true, "dev": true, "optional": true, @@ -2236,12 +1830,6 @@ "bundled": true, "dev": true }, - "oauth-sign": { - "version": "0.8.2", - "bundled": true, - "dev": true, - "optional": true - }, "object-assign": { "version": "4.1.1", "bundled": true, @@ -2269,7 +1857,7 @@ "optional": true }, "osenv": { - "version": "0.1.4", + "version": "0.1.5", "bundled": true, "dev": true, "optional": true, @@ -2281,38 +1869,22 @@ "path-is-absolute": { "version": "1.0.1", "bundled": true, - "dev": true - }, - "performance-now": { - "version": "0.2.0", - "bundled": true, "dev": true, "optional": true }, "process-nextick-args": { - "version": "1.0.7", - "bundled": true, - "dev": true - }, - "punycode": { - "version": "1.4.1", - "bundled": true, - "dev": true, - "optional": true - }, - "qs": { - "version": "6.4.0", + "version": "2.0.0", "bundled": true, "dev": true, "optional": true }, "rc": { - "version": "1.2.1", + "version": "1.2.7", "bundled": true, "dev": true, "optional": true, "requires": { - "deep-extend": "~0.4.0", + "deep-extend": "^0.5.1", "ini": "~1.3.0", "minimist": "^1.2.0", "strip-json-comments": "~2.0.1" @@ -2327,113 +1899,63 @@ } }, "readable-stream": { - "version": "2.2.9", + "version": "2.3.6", "bundled": true, "dev": true, + "optional": true, "requires": { - "buffer-shims": "~1.0.0", "core-util-is": "~1.0.0", - "inherits": "~2.0.1", + "inherits": "~2.0.3", "isarray": "~1.0.0", - "process-nextick-args": "~1.0.6", - "string_decoder": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", "util-deprecate": "~1.0.1" } }, - "request": { - "version": "2.81.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "aws-sign2": "~0.6.0", - "aws4": "^1.2.1", - "caseless": "~0.12.0", - "combined-stream": "~1.0.5", - "extend": "~3.0.0", - "forever-agent": "~0.6.1", - "form-data": "~2.1.1", - "har-validator": "~4.2.1", - "hawk": "~3.1.3", - "http-signature": "~1.1.0", - "is-typedarray": "~1.0.0", - "isstream": "~0.1.2", - "json-stringify-safe": "~5.0.1", - "mime-types": "~2.1.7", - "oauth-sign": "~0.8.1", - "performance-now": "^0.2.0", - "qs": "~6.4.0", - "safe-buffer": "^5.0.1", - "stringstream": "~0.0.4", - "tough-cookie": "~2.3.0", - "tunnel-agent": "^0.6.0", - "uuid": "^3.0.0" - } - }, "rimraf": { - "version": "2.6.1", + "version": "2.6.2", "bundled": true, "dev": true, + "optional": true, "requires": { "glob": "^7.0.5" } }, "safe-buffer": { - "version": "5.0.1", + "version": "5.1.1", "bundled": true, "dev": true }, - "semver": { - "version": "5.3.0", + "safer-buffer": { + "version": "2.1.2", "bundled": true, "dev": true, "optional": true }, - "set-blocking": { - "version": "2.0.0", + "sax": { + "version": "1.2.4", "bundled": true, "dev": true, "optional": true }, - "signal-exit": { - "version": "3.0.2", + "semver": { + "version": "5.5.0", "bundled": true, "dev": true, "optional": true }, - "sntp": { - "version": "1.0.9", + "set-blocking": { + "version": "2.0.0", "bundled": true, "dev": true, - "optional": true, - "requires": { - "hoek": "2.x.x" - } + "optional": true }, - "sshpk": { - "version": "1.13.0", + "signal-exit": { + "version": "3.0.2", "bundled": true, "dev": true, - "optional": true, - "requires": { - "asn1": "~0.2.3", - "assert-plus": "^1.0.0", - "bcrypt-pbkdf": "^1.0.0", - "dashdash": "^1.12.0", - "ecc-jsbn": "~0.1.1", - "getpass": "^0.1.1", - "jodid25519": "^1.0.0", - "jsbn": "~0.1.0", - "tweetnacl": "~0.14.0" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - } - } + "optional": true }, "string-width": { "version": "1.0.2", @@ -2446,19 +1968,14 @@ } }, "string_decoder": { - "version": "1.0.1", + "version": "1.1.1", "bundled": true, "dev": true, + "optional": true, "requires": { - "safe-buffer": "^5.0.1" + "safe-buffer": "~5.1.0" } }, - "stringstream": { - "version": "0.0.5", - "bundled": true, - "dev": true, - "optional": true - }, "strip-ansi": { "version": "3.0.1", "bundled": true, @@ -2474,81 +1991,26 @@ "optional": true }, "tar": { - "version": "2.2.1", - "bundled": true, - "dev": true, - "requires": { - "block-stream": "*", - "fstream": "^1.0.2", - "inherits": "2" - } - }, - "tar-pack": { - "version": "3.4.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "debug": "^2.2.0", - "fstream": "^1.0.10", - "fstream-ignore": "^1.0.5", - "once": "^1.3.3", - "readable-stream": "^2.1.4", - "rimraf": "^2.5.1", - "tar": "^2.2.1", - "uid-number": "^0.0.6" - } - }, - "tough-cookie": { - "version": "2.3.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "punycode": "^1.4.1" - } - }, - "tunnel-agent": { - "version": "0.6.0", + "version": "4.4.1", "bundled": true, "dev": true, "optional": true, "requires": { - "safe-buffer": "^5.0.1" + "chownr": "^1.0.1", + "fs-minipass": "^1.2.5", + "minipass": "^2.2.4", + "minizlib": "^1.1.0", + "mkdirp": "^0.5.0", + "safe-buffer": "^5.1.1", + "yallist": "^3.0.2" } }, - "tweetnacl": { - "version": "0.14.5", - "bundled": true, - "dev": true, - "optional": true - }, - "uid-number": { - "version": "0.0.6", - "bundled": true, - "dev": true, - "optional": true - }, "util-deprecate": { "version": "1.0.2", "bundled": true, - "dev": true - }, - "uuid": { - "version": "3.0.1", - "bundled": true, "dev": true, "optional": true }, - "verror": { - "version": "1.3.6", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "extsprintf": "1.0.2" - } - }, "wide-align": { "version": "1.1.2", "bundled": true, @@ -2562,6 +2024,11 @@ "version": "1.0.2", "bundled": true, "dev": true + }, + "yallist": { + "version": "3.0.2", + "bundled": true, + "dev": true } } }, @@ -2572,9 +2039,9 @@ "dev": true }, "get-port": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/get-port/-/get-port-3.1.0.tgz", - "integrity": "sha1-7wGxioTKZIaXD/meVERhQac//T4=", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/get-port/-/get-port-3.2.0.tgz", + "integrity": "sha1-3Xzn3hh8Bsi/NTeWrHHgmfCYDrw=", "dev": true }, "get-stdin": { @@ -2622,6 +2089,15 @@ "is-glob": "^2.0.0" } }, + "global-dirs": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.1.tgz", + "integrity": "sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=", + "dev": true, + "requires": { + "ini": "^1.3.4" + } + }, "globals": { "version": "9.18.0", "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz", @@ -2721,9 +2197,9 @@ } }, "hosted-git-info": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz", - "integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg==", + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz", + "integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==", "dev": true }, "hullabaloo-config-manager": { @@ -2777,9 +2253,9 @@ "dev": true }, "indent-string": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.1.0.tgz", - "integrity": "sha1-CP9DNGAziDmbMp5rlTjcejz13n0=", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz", + "integrity": "sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=", "dev": true }, "inflight": { @@ -2799,24 +2275,24 @@ "dev": true }, "ini": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz", - "integrity": "sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4=", + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", + "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", "dev": true }, "invariant": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz", - "integrity": "sha1-nh9WrArNtr8wMwbzOL47IErmA2A=", + "version": "2.2.4", + "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz", + "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==", "dev": true, "requires": { "loose-envify": "^1.0.0" } }, "irregular-plurals": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-1.3.0.tgz", - "integrity": "sha512-njf5A+Mxb3kojuHd1DzISjjIl+XhyzovXEOyPPSzdQozq/Lf2tN27mOrAAsxEPZxpn6I4MGzs1oo9TxXxPFpaA==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-1.4.0.tgz", + "integrity": "sha1-LKmwM2UREYVUEvFr5dd8YqRYp2Y=", "dev": true }, "is-arrayish": { @@ -2835,9 +2311,9 @@ } }, "is-buffer": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz", - "integrity": "sha1-Hzsm72E7IUuIy8ojzGwB2Hlh7sw=", + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", + "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", "dev": true }, "is-builtin-module": { @@ -2850,9 +2326,9 @@ } }, "is-ci": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.0.10.tgz", - "integrity": "sha1-9zkzayYyNlBhqdSCcM1WrjNpMY4=", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.1.0.tgz", + "integrity": "sha512-c7TnwxLePuqIlxHgr7xtxzycJPegNHFuIrBkwbf8hc58//+Op1CqFkyS+xnIMkwn9UsJIwc174BIjkyBmSpjKg==", "dev": true, "requires": { "ci-info": "^1.0.0" @@ -2921,6 +2397,16 @@ "is-extglob": "^1.0.0" } }, + "is-installed-globally": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.1.0.tgz", + "integrity": "sha1-Df2Y9akRFxbdU13aZJL2e/PSWoA=", + "dev": true, + "requires": { + "global-dirs": "^0.1.0", + "is-path-inside": "^1.0.0" + } + }, "is-npm": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz", @@ -2943,12 +2429,21 @@ "dev": true }, "is-observable": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/is-observable/-/is-observable-0.2.0.tgz", - "integrity": "sha1-s2ExHYPG5dcmyr9eJQsCNxBvWuI=", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-observable/-/is-observable-1.1.0.tgz", + "integrity": "sha512-NqCa4Sa2d+u7BWc6CukaObG3Fh+CU9bvixbpcXYhy2VvYS7vVGIdAgnIS5Ks3A/cqk4rebLJ9s8zBstT2aKnIA==", + "dev": true, + "requires": { + "symbol-observable": "^1.1.0" + } + }, + "is-path-inside": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz", + "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=", "dev": true, "requires": { - "symbol-observable": "^0.2.2" + "path-is-inside": "^1.0.1" } }, "is-plain-obj": { @@ -2994,9 +2489,9 @@ "dev": true }, "is-url": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/is-url/-/is-url-1.2.2.tgz", - "integrity": "sha1-SYkFpZO/R8wtnn9zg3K792lsfyY=", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz", + "integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==", "dev": true }, "is-utf8": { @@ -3039,9 +2534,9 @@ "dev": true }, "js-yaml": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.9.0.tgz", - "integrity": "sha512-0LoUNELX4S+iofCT8f4uEHIiRBR+c2AINyC8qRWfC6QNruLtxVZRJaPcu/xwMgFIgDxF25tGHaDjvxzJCNE9yw==", + "version": "3.12.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz", + "integrity": "sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==", "dev": true, "requires": { "argparse": "^1.0.7", @@ -3054,6 +2549,12 @@ "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=", "dev": true }, + "json-parse-better-errors": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", + "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==", + "dev": true + }, "json5": { "version": "0.5.1", "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz", @@ -3110,9 +2611,9 @@ } }, "lodash": { - "version": "4.17.4", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", - "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=", + "version": "4.17.10", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz", + "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==", "dev": true }, "lodash.clonedeep": { @@ -3158,18 +2659,18 @@ "dev": true }, "lodash.merge": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.0.tgz", - "integrity": "sha1-aYhLoUSsM/5plzemCG3v+t0PicU=", + "version": "4.6.1", + "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.1.tgz", + "integrity": "sha512-AOYza4+Hf5z1/0Hztxpm2/xiPZgi/cjMqdnKTUWTBSKchJlxXXuUSxCCl8rJlf4g6yww/j6mA8nC8Hw/EZWxKQ==", "dev": true }, "loose-envify": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz", - "integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", + "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", "dev": true, "requires": { - "js-tokens": "^3.0.0" + "js-tokens": "^3.0.0 || ^4.0.0" } }, "loud-rejection": { @@ -3183,15 +2684,15 @@ } }, "lowercase-keys": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz", - "integrity": "sha1-TjNms55/VFfjXxMkvfb4jQv8cwY=", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz", + "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==", "dev": true }, "lru-cache": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz", - "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.3.tgz", + "integrity": "sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==", "dev": true, "requires": { "pseudomap": "^1.0.2", @@ -3199,14 +2700,28 @@ } }, "make-dir": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.0.0.tgz", - "integrity": "sha1-l6ARdR6R3YfPre9Ygy67BJNt6Xg=", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz", + "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==", "dev": true, "requires": { - "pify": "^2.3.0" + "pify": "^3.0.0" + }, + "dependencies": { + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", + "dev": true + } } }, + "make-error": { + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.4.tgz", + "integrity": "sha512-0Dab5btKVPhibSalc9QGXb559ED7G7iLjFXBaj9Wq8O3vorueR5K5jaE3hkG6ZQINyhA/JgG6Qk4qdFQjsYV6g==", + "dev": true + }, "map-obj": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", @@ -3214,14 +2729,20 @@ "dev": true }, "matcher": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/matcher/-/matcher-1.0.0.tgz", - "integrity": "sha1-qvDEgW62m5IJRnQXViXzRmsOPhk=", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/matcher/-/matcher-1.1.1.tgz", + "integrity": "sha512-+BmqxWIubKTRKNWx/ahnCkk3mG8m7OturVlqq6HiojGJTd5hVYbgZm6WzcYPCoB+KBT4Vd6R7WSRG2OADNaCjg==", "dev": true, "requires": { "escape-string-regexp": "^1.0.4" } }, + "math-random": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.1.tgz", + "integrity": "sha1-izqsWIuKZuSXXjzepn97sylgH6w=", + "dev": true + }, "md5-hex": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/md5-hex/-/md5-hex-2.0.0.tgz", @@ -3373,9 +2894,9 @@ } }, "mimic-fn": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.1.0.tgz", - "integrity": "sha1-5md4PZLonb00KBi1IwudYqZyrRg=", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz", + "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==", "dev": true }, "minimatch": { @@ -3403,9 +2924,9 @@ } }, "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", + "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", "dev": true }, "multimatch": { @@ -3421,9 +2942,9 @@ } }, "nan": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.6.2.tgz", - "integrity": "sha1-5P805slf37WuzAjeZZb0NgWn20U=", + "version": "2.10.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz", + "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==", "dev": true, "optional": true }, @@ -3489,11 +3010,22 @@ "symbol-observable": "^1.0.4" }, "dependencies": { - "symbol-observable": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.4.tgz", - "integrity": "sha1-Kb9hXUqnEhvdiYsi1LP5vE4qoD0=", - "dev": true + "is-observable": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/is-observable/-/is-observable-0.2.0.tgz", + "integrity": "sha1-s2ExHYPG5dcmyr9eJQsCNxBvWuI=", + "dev": true, + "requires": { + "symbol-observable": "^0.2.2" + }, + "dependencies": { + "symbol-observable": { + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-0.2.4.tgz", + "integrity": "sha1-lag9smGG1q9+ehjb2XYKL4bQj0A=", + "dev": true + } + } } } }, @@ -3540,10 +3072,13 @@ "dev": true }, "p-limit": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.1.0.tgz", - "integrity": "sha1-sH/y2aXYi+yAYDWJWiurZqJ5iLw=", - "dev": true + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", + "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", + "dev": true, + "requires": { + "p-try": "^1.0.0" + } }, "p-locate": { "version": "2.0.0", @@ -3554,6 +3089,12 @@ "p-limit": "^1.1.0" } }, + "p-try": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", + "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", + "dev": true + }, "package-hash": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/package-hash/-/package-hash-2.0.0.tgz", @@ -3600,9 +3141,9 @@ } }, "parse-ms": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-1.0.1.tgz", - "integrity": "sha1-VjRtR0nXjyNDDKDHE4UK75GqNh0=", + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-0.1.2.tgz", + "integrity": "sha1-3T+iXtbC78e93hKtm0bBY6opIk4=", "dev": true }, "path-exists": { @@ -3617,18 +3158,18 @@ "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", "dev": true }, + "path-is-inside": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz", + "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=", + "dev": true + }, "path-key": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", "dev": true }, - "path-parse": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz", - "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=", - "dev": true - }, "path-type": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz", @@ -3660,13 +3201,43 @@ } }, "pkg-conf": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/pkg-conf/-/pkg-conf-2.0.0.tgz", - "integrity": "sha1-BxyHZQQDvM+5xif1h1G/5HwGcnk=", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/pkg-conf/-/pkg-conf-2.1.0.tgz", + "integrity": "sha1-ISZRTKbyq/69FoWW3xi6V4Z/AFg=", "dev": true, "requires": { "find-up": "^2.0.0", - "load-json-file": "^2.0.0" + "load-json-file": "^4.0.0" + }, + "dependencies": { + "load-json-file": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz", + "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=", + "dev": true, + "requires": { + "graceful-fs": "^4.1.2", + "parse-json": "^4.0.0", + "pify": "^3.0.0", + "strip-bom": "^3.0.0" + } + }, + "parse-json": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", + "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", + "dev": true, + "requires": { + "error-ex": "^1.3.1", + "json-parse-better-errors": "^1.0.1" + } + }, + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", + "dev": true + } } }, "pkg-dir": { @@ -3700,34 +3271,32 @@ "dev": true }, "pretty-ms": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-2.1.0.tgz", - "integrity": "sha1-QlfCVt8/sLRR1q/6qwIYhBJpgdw=", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-3.2.0.tgz", + "integrity": "sha512-ZypexbfVUGTFxb0v+m1bUyy92DHe5SyYlnyY0msyms5zd3RwyvNgyxZZsXXgoyzlxjx5MiqtXUdhUfvQbe0A2Q==", "dev": true, "requires": { - "is-finite": "^1.0.1", - "parse-ms": "^1.0.0", - "plur": "^1.0.0" + "parse-ms": "^1.0.0" }, "dependencies": { - "plur": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/plur/-/plur-1.0.0.tgz", - "integrity": "sha1-24XGgU9eXlo7Se/CjWBP7GKXUVY=", + "parse-ms": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-1.0.1.tgz", + "integrity": "sha1-VjRtR0nXjyNDDKDHE4UK75GqNh0=", "dev": true } } }, "private": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/private/-/private-0.1.7.tgz", - "integrity": "sha1-aM5eih7woju1cMwoU3tTMqumPvE=", + "version": "0.1.8", + "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz", + "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==", "dev": true }, "process-nextick-args": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", - "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz", + "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==", "dev": true }, "pseudomap": { @@ -3737,53 +3306,37 @@ "dev": true }, "randomatic": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz", - "integrity": "sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.0.0.tgz", + "integrity": "sha512-VdxFOIEY3mNO5PtSRkkle/hPJDHvQhK21oa73K4yAc9qmp6N429gAyF1gZMOTMeS0/AYzaV/2Trcef+NaIonSA==", "dev": true, "requires": { - "is-number": "^3.0.0", - "kind-of": "^4.0.0" + "is-number": "^4.0.0", + "kind-of": "^6.0.0", + "math-random": "^1.0.1" }, "dependencies": { "is-number": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", - "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "dev": true, - "requires": { - "kind-of": "^3.0.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } - } - } + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz", + "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==", + "dev": true }, "kind-of": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", - "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", + "dev": true } } }, "rc": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.1.tgz", - "integrity": "sha1-LgPo5C7kULjLPc5lvhv4l04d/ZU=", + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", + "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", "dev": true, "requires": { - "deep-extend": "~0.4.0", + "deep-extend": "^0.6.0", "ini": "~1.3.0", "minimist": "^1.2.0", "strip-json-comments": "~2.0.1" @@ -3819,17 +3372,17 @@ } }, "readable-stream": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", - "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "dev": true, "requires": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", "isarray": "~1.0.0", - "process-nextick-args": "~1.0.6", + "process-nextick-args": "~2.0.0", "safe-buffer": "~5.1.1", - "string_decoder": "~1.0.3", + "string_decoder": "~1.1.1", "util-deprecate": "~1.0.1" } }, @@ -3867,36 +3420,24 @@ } }, "regenerate": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.3.2.tgz", - "integrity": "sha1-0ZQcZ7rUN+G+dkM63Vs4X5WxkmA=", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz", + "integrity": "sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==", "dev": true }, "regenerator-runtime": { - "version": "0.10.5", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz", - "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg=", + "version": "0.11.1", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", + "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==", "dev": true }, - "regenerator-transform": { - "version": "0.9.11", - "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.9.11.tgz", - "integrity": "sha1-On0GdSDLe3F2dp61/4aGkb7+EoM=", - "dev": true, - "requires": { - "babel-runtime": "^6.18.0", - "babel-types": "^6.19.0", - "private": "^0.1.6" - } - }, "regex-cache": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.3.tgz", - "integrity": "sha1-mxpsNdTQ3871cRrmUejp09cRQUU=", + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz", + "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==", "dev": true, "requires": { - "is-equal-shallow": "^0.1.3", - "is-primitive": "^2.0.0" + "is-equal-shallow": "^0.1.3" } }, "regexpu-core": { @@ -3911,9 +3452,9 @@ } }, "registry-auth-token": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.1.tgz", - "integrity": "sha1-+w0yie4Nmtosu1KvXf5mywcNMAY=", + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.2.tgz", + "integrity": "sha512-JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ==", "dev": true, "requires": { "rc": "^1.1.6", @@ -3954,9 +3495,9 @@ } }, "remove-trailing-separator": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.0.2.tgz", - "integrity": "sha1-abBi2XhyetFNxrVrpKt3L9jXBRE=", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", + "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=", "dev": true }, "repeat-element": { @@ -3986,15 +3527,6 @@ "integrity": "sha1-WhtS63Dr7UPrmC6XTIWrWVceVvo=", "dev": true }, - "resolve": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.3.3.tgz", - "integrity": "sha1-ZVkHw0aahoDcLeOidaj91paR8OU=", - "dev": true, - "requires": { - "path-parse": "^1.0.5" - } - }, "resolve-cwd": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz", @@ -4020,58 +3552,16 @@ "signal-exit": "^3.0.2" } }, - "rollup": { - "version": "0.45.2", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-0.45.2.tgz", - "integrity": "sha512-2+bq5GQSrocdhr+M92mOQRmF1evtLRzv9NdmEC2wo7BILvTG8irHCtD0q+zg8ikNu63iJicdN5IzyxAXRTFKOQ==", - "dev": true, - "requires": { - "source-map-support": "^0.4.0" - } - }, - "rollup-plugin-babel": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/rollup-plugin-babel/-/rollup-plugin-babel-2.7.1.tgz", - "integrity": "sha1-FlKBl7D5OKFTb0RoPHqT1XMYL1c=", - "dev": true, - "requires": { - "babel-core": "6", - "babel-plugin-transform-es2015-classes": "^6.9.0", - "object-assign": "^4.1.0", - "rollup-pluginutils": "^1.5.0" - } - }, - "rollup-plugin-node-resolve": { - "version": "1.7.3", - "resolved": "https://registry.npmjs.org/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-1.7.3.tgz", - "integrity": "sha1-chLyw3G4SZ/PsKF3JDGTGyQPEuQ=", - "dev": true, - "requires": { - "browser-resolve": "^1.11.0", - "builtin-modules": "^1.1.0", - "resolve": "^1.1.6" - } - }, - "rollup-pluginutils": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-1.5.2.tgz", - "integrity": "sha1-HhVud4+UtyVb+hs9AXi+j1xVJAg=", - "dev": true, - "requires": { - "estree-walker": "^0.2.1", - "minimatch": "^3.0.2" - } - }, "safe-buffer": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", - "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==", + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", "dev": true }, "semver": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", - "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=", + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz", + "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, "semver-diff": { @@ -4083,6 +3573,12 @@ "semver": "^5.0.3" } }, + "serialize-error": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-2.1.0.tgz", + "integrity": "sha1-ULZ51WNc34Rme9yOWa9OW4HV9go=", + "dev": true + }, "set-immediate-shim": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz", @@ -4117,10 +3613,13 @@ "dev": true }, "slice-ansi": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz", - "integrity": "sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU=", - "dev": true + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz", + "integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==", + "dev": true, + "requires": { + "is-fullwidth-code-point": "^2.0.0" + } }, "slide": { "version": "1.1.6", @@ -4138,39 +3637,59 @@ } }, "source-map": { - "version": "0.5.6", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz", - "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI=", + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", "dev": true }, "source-map-support": { - "version": "0.4.15", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.15.tgz", - "integrity": "sha1-AyAt9lwG0r2MfsI2KhkwVv7407E=", + "version": "0.5.6", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.6.tgz", + "integrity": "sha512-N4KXEz7jcKqPf2b2vZF11lQIz9W5ZMuUcIOGj243lduidkf2fjkVKJS9vNxVWn3u/uxX38AcE8U9nnH9FPcq+g==", "dev": true, "requires": { - "source-map": "^0.5.6" + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } } }, "spdx-correct": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz", - "integrity": "sha1-SzBz2TP/UfORLwOsVRlJikFQ20A=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.0.tgz", + "integrity": "sha512-N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g==", "dev": true, "requires": { - "spdx-license-ids": "^1.0.2" + "spdx-expression-parse": "^3.0.0", + "spdx-license-ids": "^3.0.0" } }, - "spdx-expression-parse": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz", - "integrity": "sha1-m98vIOH0DtRH++JzJmGR/O1RYmw=", + "spdx-exceptions": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz", + "integrity": "sha512-4K1NsmrlCU1JJgUrtgEeTVyfx8VaYea9J9LvARxhbHtVtohPs/gFGG5yy49beySjlIMhhXZ4QqujIZEfS4l6Cg==", "dev": true }, + "spdx-expression-parse": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz", + "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==", + "dev": true, + "requires": { + "spdx-exceptions": "^2.1.0", + "spdx-license-ids": "^3.0.0" + } + }, "spdx-license-ids": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz", - "integrity": "sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz", + "integrity": "sha512-2+EPwgbnmOIl8HjGBXXMd9NAu02vLjOO1nWw4kmeRDFyHn+M/ETfHxQUK0oXg8ctgVnl9t3rosNVsZ1jG61nDA==", "dev": true }, "sprintf-js": { @@ -4196,9 +3715,9 @@ } }, "string_decoder": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", - "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "requires": { "safe-buffer": "~5.1.0" @@ -4257,19 +3776,40 @@ "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", "dev": true }, + "supertap": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/supertap/-/supertap-1.0.0.tgz", + "integrity": "sha512-HZJ3geIMPgVwKk2VsmO5YHqnnJYl6bV5A9JW2uzqV43WmpgliNEYbuvukfor7URpaqpxuw3CfZ3ONdVbZjCgIA==", + "dev": true, + "requires": { + "arrify": "^1.0.1", + "indent-string": "^3.2.0", + "js-yaml": "^3.10.0", + "serialize-error": "^2.1.0", + "strip-ansi": "^4.0.0" + } + }, "supports-color": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.2.1.tgz", - "integrity": "sha512-qxzYsob3yv6U+xMzPrv170y8AwGP7i74g+pbixCfD6rgso8BscLT2qXIuz6TpOaiJZ3mFgT5O9lyT9nMU4LfaA==", + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", + "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", "dev": true, "requires": { - "has-flag": "^2.0.0" + "has-flag": "^3.0.0" + }, + "dependencies": { + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "dev": true + } } }, "symbol-observable": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-0.2.4.tgz", - "integrity": "sha1-lag9smGG1q9+ehjb2XYKL4bQj0A=", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz", + "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==", "dev": true }, "term-size": { @@ -4297,64 +3837,6 @@ "xtend": "~4.0.1" } }, - "time-require": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/time-require/-/time-require-0.1.2.tgz", - "integrity": "sha1-+eEss3D8JgXhFARYK6VO9corLZg=", - "dev": true, - "requires": { - "chalk": "^0.4.0", - "date-time": "^0.1.1", - "pretty-ms": "^0.2.1", - "text-table": "^0.2.0" - }, - "dependencies": { - "ansi-styles": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.0.0.tgz", - "integrity": "sha1-yxAt8cVvUSPquLZ817mAJ6AnkXg=", - "dev": true - }, - "chalk": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz", - "integrity": "sha1-UZmj3c0MHv4jvAjBsCewYXbgxk8=", - "dev": true, - "requires": { - "ansi-styles": "~1.0.0", - "has-color": "~0.1.0", - "strip-ansi": "~0.1.0" - } - }, - "date-time": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/date-time/-/date-time-0.1.1.tgz", - "integrity": "sha1-7S9tk9l5DOL9ZtW1/z7dW7y/Owc=", - "dev": true - }, - "parse-ms": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-0.1.2.tgz", - "integrity": "sha1-3T+iXtbC78e93hKtm0bBY6opIk4=", - "dev": true - }, - "pretty-ms": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-0.2.2.tgz", - "integrity": "sha1-2oeaaC/zOjcBEEbxPWJ/Z8c7hPY=", - "dev": true, - "requires": { - "parse-ms": "^0.1.0" - } - }, - "strip-ansi": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz", - "integrity": "sha1-OeipjQRNFQZgq+SmgIrPcLt7yZE=", - "dev": true - } - } - }, "time-zone": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/time-zone/-/time-zone-1.0.0.tgz", @@ -4391,6 +3873,36 @@ "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=", "dev": true }, + "ts-node": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-7.0.0.tgz", + "integrity": "sha512-klJsfswHP0FuOLsvBZ/zzCfUvakOSSxds78mVeK7I+qP76YWtxf16hEZsp3U+b0kIo82R5UatGFeblYMqabb2Q==", + "dev": true, + "requires": { + "arrify": "^1.0.0", + "buffer-from": "^1.1.0", + "diff": "^3.1.0", + "make-error": "^1.1.1", + "minimist": "^1.2.0", + "mkdirp": "^0.5.1", + "source-map-support": "^0.5.6", + "yn": "^2.0.0" + }, + "dependencies": { + "minimist": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "dev": true + } + } + }, + "typescript": { + "version": "2.9.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz", + "integrity": "sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w==", + "dev": true + }, "uid2": { "version": "0.0.3", "resolved": "https://registry.npmjs.org/uid2/-/uid2-0.0.3.tgz", @@ -4424,55 +3936,21 @@ "dev": true }, "update-notifier": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-2.2.0.tgz", - "integrity": "sha1-G1g3z5DAc22IYncytmHBOPht5y8=", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-2.5.0.tgz", + "integrity": "sha512-gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw==", "dev": true, "requires": { - "boxen": "^1.0.0", - "chalk": "^1.0.0", + "boxen": "^1.2.1", + "chalk": "^2.0.1", "configstore": "^3.0.0", "import-lazy": "^2.1.0", + "is-ci": "^1.0.10", + "is-installed-globally": "^0.1.0", "is-npm": "^1.0.0", "latest-version": "^3.0.0", "semver-diff": "^2.0.0", "xdg-basedir": "^3.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "^2.2.1", - "escape-string-regexp": "^1.0.2", - "has-ansi": "^2.0.0", - "strip-ansi": "^3.0.0", - "supports-color": "^2.0.0" - } - }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "dev": true, - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - } } }, "url-parse-lax": { @@ -4491,13 +3969,13 @@ "dev": true }, "validate-npm-package-license": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz", - "integrity": "sha1-KAS6vnEq0zeUWaz74kdGqywwP7w=", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz", + "integrity": "sha512-63ZOUnL4SIXj4L0NixR3L1lcjO38crAbgrTpl28t8jjrfuiOBL5Iygm+60qPs/KsZGzPNg6Smnc/oY16QTjF0g==", "dev": true, "requires": { - "spdx-correct": "~1.0.0", - "spdx-expression-parse": "~1.0.0" + "spdx-correct": "^3.0.0", + "spdx-expression-parse": "^3.0.0" } }, "well-known-symbols": { @@ -4507,52 +3985,21 @@ "dev": true }, "which": { - "version": "1.2.14", - "resolved": "https://registry.npmjs.org/which/-/which-1.2.14.tgz", - "integrity": "sha1-mofEN48D6CfOyvGs31bHNsAcFOU=", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", + "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", "dev": true, "requires": { "isexe": "^2.0.0" } }, "widest-line": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-1.0.0.tgz", - "integrity": "sha1-DAnIXCqUaD0Nfq+O4JfVZL8OEFw=", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-2.0.0.tgz", + "integrity": "sha1-AUKk6KJD+IgsAjOqDgKBqnYVInM=", "dev": true, "requires": { - "string-width": "^1.0.1" - }, - "dependencies": { - "is-fullwidth-code-point": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", - "dev": true, - "requires": { - "number-is-nan": "^1.0.0" - } - }, - "string-width": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", - "dev": true, - "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" - } - }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "dev": true, - "requires": { - "ansi-regex": "^2.0.0" - } - } + "string-width": "^2.1.1" } }, "wrappy": { @@ -4562,27 +4009,27 @@ "dev": true }, "write-file-atomic": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.1.0.tgz", - "integrity": "sha512-0TZ20a+xcIl4u0+Mj5xDH2yOWdmQiXlKf9Hm+TgDXjTMsEYb+gDrmb8e8UNAzMCitX8NBqG4Z/FUQIyzv/R1JQ==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.3.0.tgz", + "integrity": "sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA==", "dev": true, "requires": { "graceful-fs": "^4.1.11", "imurmurhash": "^0.1.4", - "slide": "^1.1.5" + "signal-exit": "^3.0.2" } }, "write-json-file": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/write-json-file/-/write-json-file-2.2.0.tgz", - "integrity": "sha1-UYYlBruzthnu+reFnx/WxtBTCHY=", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/write-json-file/-/write-json-file-2.3.0.tgz", + "integrity": "sha1-K2TIozAE1UuGmMdtWFp3zrYdoy8=", "dev": true, "requires": { "detect-indent": "^5.0.0", "graceful-fs": "^4.1.2", "make-dir": "^1.0.0", - "pify": "^2.0.0", - "sort-keys": "^1.1.1", + "pify": "^3.0.0", + "sort-keys": "^2.0.0", "write-file-atomic": "^2.0.0" }, "dependencies": { @@ -4592,21 +4039,18 @@ "integrity": "sha1-OHHMCmoALow+Wzz38zYmRnXwa50=", "dev": true }, - "sort-keys": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz", - "integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=", - "dev": true, - "requires": { - "is-plain-obj": "^1.0.0" - } + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", + "dev": true } } }, "write-pkg": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/write-pkg/-/write-pkg-3.1.0.tgz", - "integrity": "sha1-AwqZlMyZk9JbTnWp8aGSNgcpHOk=", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/write-pkg/-/write-pkg-3.2.0.tgz", + "integrity": "sha512-tX2ifZ0YqEFOF1wjRW2Pk93NLsj02+n1UP5RvO6rCs0K6R2g1padvf006cY74PQJKMGS2r42NK7FD0dG6Y6paw==", "dev": true, "requires": { "sort-keys": "^2.0.0", @@ -4630,6 +4074,12 @@ "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=", "dev": true + }, + "yn": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/yn/-/yn-2.0.0.tgz", + "integrity": "sha1-5a2ryKz0CPY4X8dklWhMiOavaJo=", + "dev": true } } } diff --git a/package.json b/package.json index 1372183..8c5f328 100644 --- a/package.json +++ b/package.json @@ -2,10 +2,10 @@ "name": "erlang-processes", "version": "2.0.0", "description": "Erlang style processes in JavaScript", - "main": "lib/processes.js", - "jsnext:main": "src/index.js", + "main": "lib/index.js", + "types": "lib/index.d.ts", "scripts": { - "build": "rollup -c rollup.config.js", + "build": "tsc", "test": "ava test" }, "keywords": [ @@ -19,23 +19,20 @@ "author": "Bryan Joseph ", "license": "MIT", "devDependencies": { - "ava": "^0.21.0", - "babel-core": "^6.25.0", - "babel-preset-env": "^1.6.0", - "babel-register": "^6.24.0", - "rollup": "^0.45.2", - "rollup-plugin-babel": "^2.7.1", - "rollup-plugin-node-resolve": "^1.7.0" + "ava": "^0.25.0", + "ts-node": "^7.0.0", + "typescript": "^2.9.2" }, "dependencies": { - "erlang-types": "^1.0.0" + "erlang-types": "^1.1.3" }, "ava": { - "require": [ - "babel-register" + "compileEnhancements": false, + "extensions": [ + "ts" ], - "babel": { - "babelrc": true - } + "require": [ + "ts-node/register" + ] } } diff --git a/rollup.config.js b/rollup.config.js deleted file mode 100644 index aad183e..0000000 --- a/rollup.config.js +++ /dev/null @@ -1,13 +0,0 @@ -import babel from 'rollup-plugin-babel'; - -export default { - entry: 'src/index.js', - dest: 'lib/processes.js', - sourceMap: 'inline', - format: 'cjs', - plugins: [ - babel({ - babelrc: false - }) - ] -}; diff --git a/src/index.js b/src/index.js deleted file mode 100644 index 61cb727..0000000 --- a/src/index.js +++ /dev/null @@ -1,5 +0,0 @@ -import ProcessSystem from "./processes/process_system"; - -export default { - ProcessSystem -}; diff --git a/src/index.ts b/src/index.ts new file mode 100644 index 0000000..b349e8e --- /dev/null +++ b/src/index.ts @@ -0,0 +1,3 @@ +import ProcessSystem from './processes/process_system' + +export {ProcessSystem} diff --git a/src/processes/mailbox.js b/src/processes/mailbox.js deleted file mode 100644 index a5dc7e3..0000000 --- a/src/processes/mailbox.js +++ /dev/null @@ -1,28 +0,0 @@ -"use strict"; - -/* @flow */ - -class Mailbox{ - constructor(){ - this.messages = []; - } - - deliver(message){ - this.messages.push(message); - return message; - } - - get(){ - return this.messages; - } - - isEmpty(){ - return this.messages.length === 0; - } - - removeAt(index){ - this.messages.splice(index, 1); - } -} - -export default Mailbox; diff --git a/src/processes/mailbox.ts b/src/processes/mailbox.ts new file mode 100644 index 0000000..5538104 --- /dev/null +++ b/src/processes/mailbox.ts @@ -0,0 +1,25 @@ +class Mailbox { + messages: any[] + constructor() { + this.messages = [] + } + + deliver(message: any): any { + this.messages.push(message) + return message + } + + get(): any[] { + return this.messages + } + + isEmpty(): boolean { + return this.messages.length === 0 + } + + removeAt(index: number): any { + this.messages.splice(index, 1) + } +} + +export default Mailbox diff --git a/src/processes/process.js b/src/processes/process.js deleted file mode 100644 index 2c5e655..0000000 --- a/src/processes/process.js +++ /dev/null @@ -1,143 +0,0 @@ -"use strict"; - -/* @flow */ -import Mailbox from "./mailbox"; -import ProcessSystem from "./process_system"; -import States from "./states"; - -function is_sleep(value){ - return Array.isArray(value) && value[0] === States.SLEEP; -} - -function is_receive(value){ - return Array.isArray(value) && value[0] === States.RECEIVE; -} - -function receive_timed_out(value){ - return value[2] != null && value[2] < Date.now(); -} - -class Process { - constructor(pid, func, args, mailbox, system){ - this.pid = pid; - this.func = func; - this.args = args; - this.mailbox = mailbox; - this.system = system; - this.status = States.STOPPED; - this.dict = {}; - this.flags = {}; - this.monitors = []; - } - - start(){ - const function_scope = this; - let machine = this.main(); - - this.system.schedule(function() { - function_scope.system.set_current(function_scope.pid); - function_scope.run(machine, machine.next()); - }, this.pid); - } - - *main() { - let retval = States.NORMAL; - - try { - yield* this.func.apply(null, this.args); - } catch(e) { - console.error(e); - retval = e; - } - - this.system.exit(retval); - } - - process_flag(flag, value){ - const old_value = this.flags[flag]; - this.flags[flag] = value; - return old_value; - } - - is_trapping_exits(){ - return this.flags[Symbol.for("trap_exit")] && this.flags[Symbol.for("trap_exit")] == true; - } - - signal(reason){ - if(reason !== States.NORMAL){ - console.error(reason); - } - - this.system.remove_proc(this.pid, reason); - } - - receive(fun){ - let value = States.NOMATCH; - let messages = this.mailbox.get(); - - for(let i = 0; i < messages.length; i++){ - try{ - value = fun(messages[i]); - if(value !== States.NOMATCH){ - this.mailbox.removeAt(i); - break; - } - }catch(e){ - if(e.constructor.name != "MatchError"){ - this.exit(e); - } - } - } - - return value; - } - - run(machine, step){ - const function_scope = this; - - if(!step.done){ - let value = step.value; - - if(is_sleep(value)){ - - this.system.delay(function() { - function_scope.system.set_current(function_scope.pid); - function_scope.run(machine, machine.next()); - }, value[1]); - - }else if(is_receive(value) && receive_timed_out(value)){ - - let result = value[3](); - - this.system.schedule(function() { - function_scope.system.set_current(function_scope.pid); - function_scope.run(machine, machine.next(result)); - }); - - }else if(is_receive(value)){ - - let result = function_scope.receive(value[1]); - - if(result === States.NOMATCH){ - this.system.suspend(function() { - function_scope.system.set_current(function_scope.pid); - function_scope.run(machine, step); - }); - }else{ - this.system.schedule(function() { - function_scope.system.set_current(function_scope.pid); - function_scope.run(machine, machine.next(result)); - }); - } - - }else{ - this.system.schedule(function() { - function_scope.system.set_current(function_scope.pid); - function_scope.run(machine, machine.next(value)); - }); - } - } - } -} - -export default Process; diff --git a/src/processes/process.ts b/src/processes/process.ts new file mode 100644 index 0000000..313241b --- /dev/null +++ b/src/processes/process.ts @@ -0,0 +1,148 @@ +import {PID} from 'erlang-types' +import States from './states' +import Mailbox from './mailbox' +import System from './process_system' + +function is_sleep(value: any) { + return Array.isArray(value) && value[0] === States.SLEEP +} + +function is_receive(value: any) { + return Array.isArray(value) && value[0] === States.RECEIVE +} + +function receive_timed_out(value: any) { + return value[2] != null && value[2] < Date.now() +} + +class Process { + pid: PID + func: Function + args: any[] + mailbox: Mailbox + system: System + status: symbol + dict: Map + flags: Map + monitors: any[] + + constructor(system: System, func: Function, args: any[]) { + this.system = system + this.func = func + this.args = args + this.status = States.STOPPED + this.pid = new PID() + this.mailbox = new Mailbox() + this.dict = new Map() + this.flags = new Map() + this.monitors = [] + } + + start() { + const function_scope = this + let machine = this.main() + + this.system.schedule(function() { + function_scope.system.set_current(function_scope.pid) + function_scope.run(machine, machine.next()) + }, this.pid) + } + + *main() { + let retval = States.NORMAL + + try { + yield* this.func.apply(null, this.args) + } catch (e) { + console.error(e) + retval = e + } + + this.system.exit(retval) + } + + process_flag(flag: symbol, value: any): any { + const old_value = this.flags.get(flag) + this.flags.set(flag, value) + return old_value + } + + is_trapping_exits(): boolean { + return ( + this.flags.has(Symbol.for('trap_exit')) && + this.flags.get(Symbol.for('trap_exit')) == true + ) + } + + signal(reason: any): void { + if (reason !== States.NORMAL) { + console.error(reason) + } + + this.system.remove_proc(this.pid, reason) + } + + receive(fun: Function) { + let value = States.NOMATCH + let messages = this.mailbox.get() + + for (let i = 0; i < messages.length; i++) { + try { + value = fun(messages[i]) + if (value !== States.NOMATCH) { + this.mailbox.removeAt(i) + break + } + } catch (e) { + if (e.constructor.name != 'MatchError') { + this.system.exit(e) + } + } + } + + return value + } + + run(machine: Generator, step: any): void { + const function_scope = this + + if (!step.done) { + let value = step.value + + if (is_sleep(value)) { + this.system.delay(function() { + function_scope.system.set_current(function_scope.pid) + function_scope.run(machine, machine.next()) + }, value[1]) + } else if (is_receive(value) && receive_timed_out(value)) { + let result = value[3]() + + this.system.schedule(function() { + function_scope.system.set_current(function_scope.pid) + function_scope.run(machine, machine.next(result)) + }) + } else if (is_receive(value)) { + let result = function_scope.receive(value[1]) + + if (result === States.NOMATCH) { + this.system.suspend(function() { + function_scope.system.set_current(function_scope.pid) + function_scope.run(machine, step) + }) + } else { + this.system.schedule(function() { + function_scope.system.set_current(function_scope.pid) + function_scope.run(machine, machine.next(result)) + }) + } + } else { + this.system.schedule(function() { + function_scope.system.set_current(function_scope.pid) + function_scope.run(machine, machine.next(value)) + }) + } + } + } +} + +export default Process diff --git a/src/processes/process_queue.ts b/src/processes/process_queue.ts new file mode 100644 index 0000000..f6398c5 --- /dev/null +++ b/src/processes/process_queue.ts @@ -0,0 +1,25 @@ +import {PID} from 'erlang-types' + +class ProcessQueue { + pid: PID + tasks: Function[] + + constructor(pid: PID) { + this.pid = pid + this.tasks = [] + } + + empty() { + return this.tasks.length === 0 + } + + add(task: any) { + this.tasks.push(task) + } + + next() { + return this.tasks.shift() + } +} + +export default ProcessQueue diff --git a/src/processes/process_system.js b/src/processes/process_system.js deleted file mode 100644 index 871a80a..0000000 --- a/src/processes/process_system.js +++ /dev/null @@ -1,359 +0,0 @@ -/* @flow */ -"use strict"; - -import Mailbox from "./mailbox"; -import Process from "./process"; -import States from "./states"; -import Scheduler from "./scheduler"; -import ErlangTypes from "erlang-types"; - - -class ProcessSystem { - - constructor(){ - this.pids = new Map(); - this.mailboxes = new Map(); - this.names = new Map(); - this.links = new Map(); - this.monitors = new Map(); - - const throttle = 5; //ms between scheduled tasks - this.current_process = null; - this.scheduler = new Scheduler(throttle); - this.suspended = new Map(); - - let process_system_scope = this; - this.main_process_pid = this.spawn(function*(){ - yield process_system_scope.sleep(Symbol.for("Infinity")); - }); - this.set_current(this.main_process_pid); - } - - static * run(fun, args, context = null){ - if(fun.constructor.name === "GeneratorFunction"){ - return yield* fun.apply(context, args); - }else{ - return yield fun.apply(context, args); - } - } - - spawn(...args){ - if(args.length === 1){ - let fun = args[0]; - return this.add_proc(fun, [], false).pid; - - }else{ - let mod = args[0]; - let fun = args[1]; - let the_args = args[2]; - - return this.add_proc(mod[fun], the_args, false, false).pid; - } - } - - spawn_link(...args){ - if(args.length === 1){ - let fun = args[0]; - return this.add_proc(fun, [], true, false).pid; - - }else{ - let mod = args[0]; - let fun = args[1]; - let the_args = args[2]; - - return this.add_proc(mod[fun], the_args, true, false).pid; - } - } - - link(pid){ - this.links.get(this.pid()).add(pid); - this.links.get(pid).add(this.pid()); - } - - unlink(pid){ - this.links.get(this.pid()).delete(pid); - this.links.get(pid).delete(this.pid()); - } - - spawn_monitor(...args){ - if(args.length === 1){ - let fun = args[0]; - let process = this.add_proc(fun, [], false, true); - return [process.pid, process.monitors[0]]; - - }else{ - let mod = args[0]; - let fun = args[1]; - let the_args = args[2]; - let process = this.add_proc(mod[fun], the_args, false, true); - - return [process.pid, process.monitors[0]]; - } - } - - monitor(pid){ - const real_pid = this.pidof(pid); - const ref = this.make_ref(); - - if(real_pid){ - - this.monitors.set(ref, {'monitor': this.current_process.pid, 'monitee': real_pid}); - this.pids.get(real_pid).monitors.push(ref); - return ref; - }else{ - this.send(this.current_process.pid, new ErlangTypes.Tuple('DOWN', ref, pid, real_pid, Symbol.for('noproc'))); - return ref; - } - } - - demonitor(ref){ - if(this.monitor.has(ref)){ - this.monitor.delete(ref); - return true; - } - - return false; - } - - set_current(id){ - let pid = this.pidof(id); - if(pid !== null){ - this.current_process = this.pids.get(pid); - this.current_process.status = States.RUNNING; - } - } - - add_proc(fun, args, linked, monitored){ - let newpid = new ErlangTypes.PID(); - let mailbox = new Mailbox(); - let newproc = new Process(newpid, fun, args, mailbox, this); - - this.pids.set(newpid, newproc); - this.mailboxes.set(newpid, mailbox); - this.links.set(newpid, new Set()); - - if(linked){ - this.link(newpid); - } - - if(monitored){ - this.monitor(newpid); - } - - newproc.start(); - return newproc; - } - - remove_proc(pid, exitreason){ - this.pids.delete(pid); - this.unregister(pid); - this.scheduler.removePid(pid); - - if(this.links.has(pid)){ - for (let linkpid of this.links.get(pid)) { - this.exit(linkpid, exitreason); - this.links.get(linkpid).delete(pid); - } - - this.links.delete(pid); - } - } - - register(name, pid){ - if(!this.names.has(name)){ - this.names.set(name, pid); - }else{ - throw new Error("Name is already registered to another process"); - } - } - - whereis(name){ - return this.names.has(name) ? this.names.get(name) : null; - } - - registered(){ - return this.names.keys(); - } - - unregister(pid){ - for(let name of this.names.keys()){ - if(this.names.has(name) && this.names.get(name) === pid){ - this.names.delete(name); - } - } - } - - pid(){ - return this.current_process.pid; - } - - pidof(id){ - if (id instanceof ErlangTypes.PID) { - return this.pids.has(id) ? id : null; - } else if (id instanceof Process) { - return id.pid; - } else { - let pid = this.whereis(id); - if (pid === null) - throw("Process name not registered: " + id + " (" + typeof(id) + ")"); - return pid; - } - } - - send(id, msg) { - const pid = this.pidof(id); - - if(pid){ - this.mailboxes.get(pid).deliver(msg); - - if(this.suspended.has(pid)){ - let fun = this.suspended.get(pid); - this.suspended.delete(pid); - this.schedule(fun); - } - } - - return msg; - } - - receive(fun, timeout = 0, timeoutFn = () => true ) { - let DateTimeout = null; - - if(timeout === 0 || timeout === Infinity){ - DateTimeout = null; - }else{ - DateTimeout = Date.now() + timeout; - } - - return [ - States.RECEIVE, - fun, - DateTimeout, - timeoutFn - ]; - } - - sleep(duration){ - return [States.SLEEP, duration]; - } - - suspend(fun){ - this.current_process.status = States.SUSPENDED; - this.suspended.set(this.current_process.pid, fun); - } - - delay(fun, time){ - this.current_process.status = States.SLEEPING; - - if(Number.isInteger(time)){ - this.scheduler.scheduleFuture(this.current_process.pid, time, fun); - } - } - - schedule(fun, pid){ - const the_pid = pid != null ? pid : this.current_process.pid; - this.scheduler.schedule(the_pid, fun); - } - - exit(one, two){ - let pid = null; - let reason = null; - let process = null; - - if(two){ - pid = one; - reason = two; - process = this.pids.get(this.pidof(pid)); - - if((process && process.is_trapping_exits()) || reason === States.KILL || reason === States.NORMAL){ - this.mailboxes.get(process.pid).deliver(new ErlangTypes.Tuple(States.EXIT, this.pid(), reason )); - } else{ - process.signal(reason); - } - - }else{ - pid = this.current_process.pid; - reason = one; - process = this.current_process; - - process.signal(reason); - } - - for(let ref in process.monitors){ - let mons = this.monitors.get(ref); - this.send(mons['monitor'], new ErlangTypes.Tuple('DOWN', ref, mons['monitee'], mons['monitee'], reason)); - } - } - - error(reason){ - this.current_process.signal(reason); - } - - process_flag(...args){ - if(args.length == 2){ - const flag = args[0]; - const value = args[1]; - return this.current_process.process_flag(flag, value); - }else{ - const pid = this.pidof(args[0]); - const flag = args[1]; - const value = args[2]; - return this.pids.get(pid).process_flag(flag, value); - } - } - - put(key, value){ - this.current_process.dict[key] = value; - } - - get_process_dict(){ - return this.current_process.dict; - } - - get(key, default_value = null){ - if(key in this.current_process.dict){ - return this.current_process.dict[key]; - }else{ - return default_value; - } - } - - get_keys(value){ - if(value){ - let keys = []; - - for(let key of Object.keys(this.current_process.dict)){ - if(this.current_process.dict[key] === value){ - keys.push(key); - } - } - - return keys; - } - - return Object.keys(this.current_process.dict); - } - - erase(key){ - if(key != null){ - delete this.current_process.dict[key]; - }else{ - this.current_process.dict = {}; - } - } - - is_alive(pid){ - const real_pid = this.pidof(pid); - return real_pid != null; - } - - list(){ - return Array.from(this.pids.keys()); - } - - make_ref(){ - return new ErlangTypes.Reference(); - } -} - -export default ProcessSystem; diff --git a/src/processes/process_system.ts b/src/processes/process_system.ts new file mode 100644 index 0000000..7dcd409 --- /dev/null +++ b/src/processes/process_system.ts @@ -0,0 +1,471 @@ +/* @flow */ +'use strict' + +import Mailbox from './mailbox' +import Process from './process' +import States from './states' +import Scheduler from './scheduler' +import {PID, Reference, Tuple} from 'erlang-types' + +class ProcessSystem { + pids: Map + mailboxes: Map + names: Map + links: Map> + monitors: Map + current_process: Process | null + scheduler: Scheduler + suspended: Map any> + main_process_pid: PID + + constructor() { + this.pids = new Map() + this.mailboxes = new Map() + this.names = new Map() + this.links = new Map() + this.monitors = new Map() + + const throttle = 5 //ms between scheduled tasks + this.current_process = null + this.scheduler = new Scheduler(throttle) + this.suspended = new Map() + + let process_system_scope = this + this.main_process_pid = this.spawn(function*() { + yield process_system_scope.sleep(Symbol.for('Infinity')) + }) + this.set_current(this.main_process_pid) + } + + static *run( + fun: Function | GeneratorFunction, + args: any[], + context: any = null + ) { + if (fun.constructor.name === 'GeneratorFunction') { + return yield* fun.apply(context, args) + } else { + return yield fun.apply(context, args) + } + } + + spawn(...args: any[]) { + if (args.length === 1) { + let fun = args[0] + return this.add_proc(fun, [], false, false).pid + } else { + let mod = args[0] + let fun = args[1] + let the_args = args[2] + + return this.add_proc(mod[fun], the_args, false, false).pid + } + } + + spawn_link(...args: any[]) { + if (args.length === 1) { + let fun = args[0] + return this.add_proc(fun, [], true, false).pid + } else { + let mod = args[0] + let fun = args[1] + let the_args = args[2] + + return this.add_proc(mod[fun], the_args, true, false).pid + } + } + + link(pid: PID): void { + const currentProcessPid = this.pid() + if (currentProcessPid != null) { + const currentProcessLink = this.links.get(currentProcessPid) + const IncomingProcessLink = this.links.get(pid) + + if (currentProcessLink && IncomingProcessLink) { + currentProcessLink.add(pid) + IncomingProcessLink.add(currentProcessPid) + } + } + } + + unlink(pid: PID): void { + const currentProcessPid = this.pid() + if (currentProcessPid != null) { + const currentProcessLink = this.links.get(currentProcessPid) + const IncomingProcessLink = this.links.get(pid) + + if (currentProcessLink && IncomingProcessLink) { + currentProcessLink.delete(pid) + IncomingProcessLink.delete(currentProcessPid) + } + } + } + + spawn_monitor(...args: any[]) { + if (args.length === 1) { + let fun = args[0] + let process = this.add_proc(fun, [], false, true) + return [process.pid, process.monitors[0]] + } else { + let mod = args[0] + let fun = args[1] + let the_args = args[2] + let process = this.add_proc(mod[fun], the_args, false, true) + + return [process.pid, process.monitors[0]] + } + } + + monitor(pid: PID) { + const real_pid = this.pidof(pid) + const ref = this.make_ref() + + if (this.currentProcess != null) { + if (real_pid) { + this.monitors.set(ref, { + monitor: this.currentProcess.pid, + monitee: real_pid, + }) + + const process = this.pids.get(real_pid) + if (process) { + process.monitors.push(ref) + } + + return ref + } else { + this.send( + this.currentProcess.pid, + new Tuple('DOWN', ref, pid, real_pid, Symbol.for('noproc')) + ) + return ref + } + } + } + + demonitor(ref: Reference) { + if (this.monitors.has(ref)) { + this.monitors.delete(ref) + return true + } + + return false + } + + set_current(id: any) { + let pid = this.pidof(id) + if (pid) { + const next = this.pids.get(pid) + if (next) { + this.current_process = next + if (this.currentProcess) { + this.currentProcess.status = States.RUNNING + } + } + } + } + + add_proc( + fun: GeneratorFunction, + args: any[], + linked: boolean, + monitored: boolean + ) { + let newproc = new Process(this, fun, args) + + this.pids.set(newproc.pid, newproc) + this.mailboxes.set(newproc.pid, newproc.mailbox) + this.links.set(newproc.pid, new Set()) + + if (linked) { + this.link(newproc.pid) + } + + if (monitored) { + this.monitor(newproc.pid) + } + + newproc.start() + return newproc + } + + remove_proc(pid: PID, exitreason: any) { + this.pids.delete(pid) + this.unregister(pid) + this.scheduler.removePid(pid) + + const linkedPids = this.links.get(pid) + if (linkedPids) { + for (let linkpid of linkedPids) { + this.exit(linkpid, exitreason) + const linkedPid = this.links.get(linkpid) + if (linkedPid) { + linkedPid.delete(pid) + } + } + + this.links.delete(pid) + } + } + + register(name: any, pid: PID) { + if (!this.names.has(name)) { + this.names.set(name, pid) + } else { + throw new Error('Name is already registered to another process') + } + } + + whereis(name: any) { + return this.names.has(name) ? this.names.get(name) : null + } + + registered() { + return this.names.keys() + } + + unregister(pid: PID) { + for (let name of this.names.keys()) { + if (this.names.has(name) && this.names.get(name) === pid) { + this.names.delete(name) + } + } + } + + pid(): PID | null { + if (this.currentProcess) { + return this.currentProcess.pid + } + + return null + } + + pidof(id: any) { + if (id instanceof PID) { + return this.pids.has(id) ? id : null + } else if (id instanceof Process) { + return id.pid + } else { + let pid = this.whereis(id) + if (pid === null) + throw 'Process name not registered: ' + id + ' (' + typeof id + ')' + return pid + } + } + + send(id: any, msg: any) { + const pid = this.pidof(id) + + if (pid) { + const mailbox = this.mailboxes.get(pid) + if (mailbox) { + mailbox.deliver(msg) + } + + if (this.suspended.has(pid)) { + let fun = this.suspended.get(pid) + this.suspended.delete(pid) + if (fun) { + this.schedule(fun) + } + } + } + + return msg + } + + receive(fun: Function, timeout = 0, timeoutFn: () => boolean = () => true) { + let DateTimeout = null + + if (timeout === 0 || timeout === Infinity) { + DateTimeout = null + } else { + DateTimeout = Date.now() + timeout + } + + return [States.RECEIVE, fun, DateTimeout, timeoutFn] + } + + sleep(duration: number | symbol): [symbol, number | symbol] { + return [States.SLEEP, duration] + } + + suspend(fun: () => any): void { + if (this.currentProcess) { + this.currentProcess.status = States.SUSPENDED + this.suspended.set(this.currentProcess.pid, fun) + } + } + + delay(fun: () => any, time: number): void { + if (this.currentProcess) { + this.currentProcess.status = States.SLEEPING + + if (Number.isInteger(time)) { + this.scheduler.scheduleFuture(this.currentProcess.pid, time, fun) + } + } + } + + schedule(fun: () => any, pid?: PID): void { + if (this.currentProcess) { + const the_pid = pid != null ? pid : this.currentProcess.pid + this.scheduler.schedule(the_pid, fun) + } + } + + exit(one: PID | any, two?: any): void { + let pid = null + let reason = null + let process = null + + if (two) { + pid = one + reason = two + const thePid = this.pidof(pid) + if (thePid) { + process = this.pids.get(thePid) + } + + if (process) { + if ( + process.is_trapping_exits() || + reason === States.KILL || + reason === States.NORMAL + ) { + const mailbox = this.mailboxes.get(process.pid) + + if (mailbox) { + mailbox.deliver(new Tuple(States.EXIT, this.pid(), reason)) + } + } else { + process.signal(reason) + } + } + } else { + if (this.currentProcess) { + pid = this.currentProcess.pid + reason = one + process = this.currentProcess + + process.signal(reason) + } + } + + if (process) { + for (let ref of process.monitors) { + let mons = this.monitors.get(ref) + if (mons) { + this.send( + mons['monitor'], + new Tuple('DOWN', ref, mons['monitee'], mons['monitee'], reason) + ) + } + } + } + } + + error(reason: any): void { + if (this.currentProcess) { + this.currentProcess.signal(reason) + } + } + + process_flag(...args: any[]): any { + if (args.length == 2) { + const flag = args[0] + const value = args[1] + if (this.currentProcess) { + return this.currentProcess.process_flag(flag, value) + } + } else { + const pid = this.pidof(args[0]) + if (pid) { + const flag = args[1] + const value = args[2] + const process = this.pids.get(pid) + + if (process) { + return process.process_flag(flag, value) + } + } + } + } + + put(key: string, value: any): void { + if (this.currentProcess) { + this.currentProcess.dict.set(key, value) + } + } + + get_process_dict(): object { + if (this.currentProcess) { + return this.currentProcess.dict + } + + throw new Error('No Current Process') + } + + get(key: string, default_value: any = null) { + if (this.currentProcess && key in this.currentProcess.dict) { + return this.currentProcess.dict.get(key) + } else { + return default_value + } + } + + get_keys(value: any): string[] { + if (value) { + let keys = [] + + if (this.currentProcess) { + for (let key of Object.keys(this.currentProcess.dict)) { + if (this.currentProcess.dict.get(key) === value) { + keys.push(key) + } + } + } + + return keys + } + + if (this.currentProcess) { + return Object.keys(this.currentProcess.dict) + } + + throw new Error('No Current Process') + } + + erase(key: string): void { + if (this.currentProcess) { + if (key != null && this.currentProcess.dict.has(key)) { + this.currentProcess.dict.delete(key) + } else { + this.currentProcess.dict = new Map() + } + } + } + + is_alive(pid: any) { + const real_pid = this.pidof(pid) + return real_pid != null + } + + list(): PID[] { + return Array.from(this.pids.keys()) + } + + make_ref(): Reference { + return new Reference() + } + + get currentProcess(): Process | null { + if (this.current_process) { + return this.current_process + } + + return null + } +} + +export default ProcessSystem diff --git a/src/processes/scheduler.js b/src/processes/scheduler.js deleted file mode 100644 index 4a76200..0000000 --- a/src/processes/scheduler.js +++ /dev/null @@ -1,104 +0,0 @@ -"use strict"; - -class ProcessQueue { - constructor(pid){ - this.pid = pid; - this.tasks = []; - } - - empty(){ - return this.tasks.length === 0; - } - - add(task){ - this.tasks.push(task); - } - - next(){ - return this.tasks.shift(); - } -} - -class Scheduler { - constructor(throttle = 0, reductions_per_process = 8){ - this.isRunning = false; - this.invokeLater = function (callback) { setTimeout(callback, throttle); }; - - // In our case a reduction is equal to a task call - // Controls how many tasks are called at a time per process - this.reductions_per_process = reductions_per_process; - this.queues = new Map(); - this.run(); - } - - addToQueue(pid, task){ - if(!this.queues.has(pid)){ - this.queues.set(pid, new ProcessQueue(pid)); - } - - this.queues.get(pid).add(task); - } - - removePid(pid){ - this.isRunning = true; - - this.queues.delete(pid); - - this.isRunning = false; - } - - run(){ - if (this.isRunning) { - this.invokeLater(() => { this.run(); }); - } else { - for(let [pid, queue] of this.queues){ - let reductions = 0; - while(queue && !queue.empty() && reductions < this.reductions_per_process){ - let task = queue.next(); - this.isRunning = true; - - let result; - - try{ - result = task(); - }catch(e){ - console.error(e); - result = e; - } - - this.isRunning = false; - - if (result instanceof Error) { - throw result; - } - - reductions++; - } - } - - this.invokeLater(() => { this.run(); }); - } - } - - addToScheduler(pid, task, dueTime = 0) { - if(dueTime === 0){ - this.invokeLater(() => { - this.addToQueue(pid, task); - }); - }else{ - setTimeout(() => { - this.addToQueue(pid, task); - }, dueTime); - } - }; - - schedule(pid, task){ - this.addToScheduler(pid, () => { task(); }); - } - - scheduleFuture(pid, dueTime, task){ - this.addToScheduler(pid, () => { task(); }, dueTime); - } -} - -export default Scheduler; diff --git a/src/processes/scheduler.ts b/src/processes/scheduler.ts new file mode 100644 index 0000000..311f6be --- /dev/null +++ b/src/processes/scheduler.ts @@ -0,0 +1,113 @@ +import {PID} from 'erlang-types' +import ProcessQueue from './process_queue' + +class Scheduler { + isRunning: boolean + invokeLater: (callback: () => void) => void + reductions_per_process: number + queues: Map + constructor(throttle: number = 0, reductions_per_process: number = 8) { + this.isRunning = false + this.invokeLater = function(callback) { + setTimeout(callback, throttle) + } + + // In our case a reduction is equal to a task call + // Controls how many tasks are called at a time per process + this.reductions_per_process = reductions_per_process + this.queues = new Map() + this.run() + } + + addToQueue(pid: PID, task: () => any) { + if (!this.queues.has(pid)) { + this.queues.set(pid, new ProcessQueue(pid)) + } + + const queue = this.queues.get(pid) + if (queue) { + queue.add(task) + } + } + + removePid(pid: PID) { + this.isRunning = true + + this.queues.delete(pid) + + this.isRunning = false + } + + run() { + if (this.isRunning) { + this.invokeLater(() => { + this.run() + }) + } else { + for (let [pid, queue] of this.queues) { + let reductions = 0 + while ( + queue && + !queue.empty() && + reductions < this.reductions_per_process + ) { + let task = queue.next() + this.isRunning = true + + let result + + try { + if (task) { + result = task() + } + } catch (e) { + console.error(e) + result = e + } + + this.isRunning = false + + if (result instanceof Error) { + throw result + } + + reductions++ + } + } + + this.invokeLater(() => { + this.run() + }) + } + } + + addToScheduler(pid: PID, task: () => any, dueTime: number = 0) { + if (dueTime === 0) { + this.invokeLater(() => { + this.addToQueue(pid, task) + }) + } else { + setTimeout(() => { + this.addToQueue(pid, task) + }, dueTime) + } + } + + schedule(pid: PID, task: () => any) { + this.addToScheduler(pid, () => { + task() + }) + } + + scheduleFuture(pid: PID, dueTime: number, task: () => any) { + this.addToScheduler( + pid, + () => { + task() + }, + dueTime + ) + } +} + +export default Scheduler diff --git a/src/processes/states.js b/src/processes/states.ts similarity index 100% rename from src/processes/states.js rename to src/processes/states.ts diff --git a/test/mailbox_test.js b/test/mailbox_test.js new file mode 100644 index 0000000..d0949a4 --- /dev/null +++ b/test/mailbox_test.js @@ -0,0 +1,39 @@ +import test from 'ava' +import Mailbox from '../src/processes/mailbox' + +test('constructor', function(t) { + const mailbox = new Mailbox() + + t.is(mailbox.messages.length, 0) +}) + +test('get', function(t) { + const mailbox = new Mailbox() + + t.is(mailbox.get().length, 0) + + mailbox.deliver('Hi') + + t.is(mailbox.get().length, 1) +}) + +test('isEmpty', function(t) { + const mailbox = new Mailbox() + + t.true(mailbox.isEmpty()) + + mailbox.deliver('Hi') + + t.false(mailbox.isEmpty()) +}) + +test('removeAt', function(t) { + const mailbox = new Mailbox() + + mailbox.deliver('Hi') + mailbox.deliver('Goodbye') + + mailbox.removeAt(0) + + t.is(mailbox.get()[0], 'Goodbye') +}) diff --git a/test/process_queue_test.js b/test/process_queue_test.js new file mode 100644 index 0000000..1e28e64 --- /dev/null +++ b/test/process_queue_test.js @@ -0,0 +1,30 @@ +import test from 'ava' +import ProcessQueue from '../src/processes/process_queue' +import {PID} from 'erlang-types' + +test('constructor', function(t) { + const pid = new PID() + const queue = new ProcessQueue(pid) + + t.is(queue.pid.id, pid.id) + t.is(queue.tasks.length, 0) + t.true(queue.empty()) +}) + +test('add', function(t) { + const pid = new PID() + const queue = new ProcessQueue(pid) + + queue.add(() => 'Hi') + t.false(queue.empty()) +}) + +test('next', function(t) { + const pid = new PID() + const queue = new ProcessQueue(pid) + const func = () => 'Hi' + + queue.add(func) + + t.is(queue.next(), func) +}) diff --git a/test/process_test.js b/test/process_test.js new file mode 100644 index 0000000..c4602aa --- /dev/null +++ b/test/process_test.js @@ -0,0 +1,12 @@ +import test from 'ava' +import Process from '../src/processes/process' +import Mailbox from '../src/processes/mailbox' +import {PID} from 'erlang-types' + +test('constructor', function(t) { + const pid = new PID() + const mailbox = new Mailbox() + const process = new Process() + + t.is(mailbox.messages.length, 0) +}) diff --git a/test/processes_test.js b/test/processes_test.js index f43eac4..961efd4 100644 --- a/test/processes_test.js +++ b/test/processes_test.js @@ -1,27 +1,27 @@ -import test from 'ava'; -import Processes from '../src/index.js'; +import test from 'ava' +import {ProcessSystem} from '../src/index' -let system = null; +let system = null test.beforeEach(t => { - system = new Processes.ProcessSystem(); -}); + system = new ProcessSystem() +}) test(function* testSpawn(t) { const pid = system.spawn(function*() { - yield 1; - }); + yield 1 + }) - t.is(system.list().length, 2); - t.is(system.list()[1], pid); -}); + t.is(system.list().length, 2) + t.is(system.list()[1], pid) +}) test(function* testSpawnLink(t) { const pid = system.spawn_link(function*() { - yield 1; - }); + yield 1 + }) - t.is(system.list().length, 2); - t.true(system.links.get(pid).has(system.list()[0])); - t.true(system.links.get(system.list()[0]).has(pid)); -}); + t.is(system.list().length, 2) + t.true(system.links.get(pid).has(system.list()[0])) + t.true(system.links.get(system.list()[0]).has(pid)) +}) diff --git a/tsconfig.json b/tsconfig.json new file mode 100644 index 0000000..93521cb --- /dev/null +++ b/tsconfig.json @@ -0,0 +1,63 @@ +{ + "compilerOptions": { + /* Basic Options */ + "target": + "ES2017" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017','ES2018' or 'ESNEXT'. */, + "module": + "commonjs" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */, + // "lib": [], /* Specify library files to be included in the compilation. */ + //"allowJs": true /* Allow javascript files to be compiled. */, + //"checkJs": true /* Report errors in .js files. */, + // "jsx": "preserve", /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */ + "declaration": true /* Generates corresponding '.d.ts' file. */, + // "declarationMap": true, /* Generates a sourcemap for each corresponding '.d.ts' file. */ + // "sourceMap": true, /* Generates corresponding '.map' file. */ + //"outFile": "./lib/processes.js" /* Concatenate and emit output to single file. */, + "outDir": "./lib/" /* Redirect output structure to the directory. */, + //"rootDir": "./src/" /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */, + // "composite": true, /* Enable project compilation */ + // "removeComments": true, /* Do not emit comments to output. */ + // "noEmit": true, /* Do not emit outputs. */ + // "importHelpers": true, /* Import emit helpers from 'tslib'. */ + // "downlevelIteration": true, /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */ + // "isolatedModules": true, /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */ + + /* Strict Type-Checking Options */ + "strict": true /* Enable all strict type-checking options. */, + // "noImplicitAny": true, /* Raise error on expressions and declarations with an implied 'any' type. */ + // "strictNullChecks": true, /* Enable strict null checks. */ + // "strictFunctionTypes": true, /* Enable strict checking of function types. */ + // "strictPropertyInitialization": true, /* Enable strict checking of property initialization in classes. */ + // "noImplicitThis": true, /* Raise error on 'this' expressions with an implied 'any' type. */ + // "alwaysStrict": true, /* Parse in strict mode and emit "use strict" for each source file. */ + + /* Additional Checks */ + // "noUnusedLocals": true, /* Report errors on unused locals. */ + // "noUnusedParameters": true, /* Report errors on unused parameters. */ + // "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */ + // "noFallthroughCasesInSwitch": true, /* Report errors for fallthrough cases in switch statement. */ + + /* Module Resolution Options */ + // "moduleResolution": "node", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */ + // "baseUrl": "./", /* Base directory to resolve non-absolute module names. */ + // "paths": {}, /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */ + // "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */ + // "typeRoots": [], /* List of folders to include type definitions from. */ + // "types": [], /* Type declaration files to be included in compilation. */ + // "allowSyntheticDefaultImports": true, /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */ + "esModuleInterop": true /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */ + // "preserveSymlinks": true, /* Do not resolve the real path of symlinks. */ + + /* Source Map Options */ + // "sourceRoot": "./", /* Specify the location where debugger should locate TypeScript files instead of source locations. */ + // "mapRoot": "./", /* Specify the location where debugger should locate map files instead of generated locations. */ + // "inlineSourceMap": true, /* Emit a single file with source maps instead of having a separate file. */ + // "inlineSources": true, /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */ + + /* Experimental Options */ + // "experimentalDecorators": true, /* Enables experimental support for ES7 decorators. */ + // "emitDecoratorMetadata": true, /* Enables experimental support for emitting type metadata for decorators. */ + }, + "include": ["src/**/*"], + "exclude": ["node_modules", "test/**/*.*", "examples/**/*.*"] +}