setitch-multimeter 0.2.1 → 0.3.0

package/README.markdown

@@ -3,20 +3,20 @@ multimeter
 
 Control multiple ANSI progress bars on the terminal.
 
-![multibar example output](http://substack.net/images/screenshots/multibar.png)
+![multibar example output](./example/images/multibar.png)
 
-![multimeter](http://substack.net/images/multimeter.png)
+![multimeter](./example/images/sum.png)
 
 example
 =======
 
 ````javascript
-var multimeter = require('multimeter');
-var multi = multimeter(process);
+import multimeter from 'setitch-multimeter';
+const multi = multimeter(process);
 
-multi.drop(function (bar) {
-    var iv = setInterval(function () {
-        var p = bar.percent();
+multi.drop((bar) => {
+    const iv = setInterval(() => {
+        const p = bar.percent();
         bar.percent(p + 1);
         
         if (p >= 100) clearInterval(iv);
@@ -27,18 +27,18 @@ multi.drop(function (bar) {
 methods
 =======
 
-var multimeter = require('setitch-multimeter');
+import multimeter from 'setitch-multimeter';
 
-var multi = multimeter(stream, ...)
------------------------------------
+const multi = multimeter(stream, ...)
+-------------------------------------
 
 Create a new multimeter handle on the supplied stream/process objects, which
 will be passed directly to [charm](https://github.com/substack/node-charm).
 
 If you pass in a charm object that will be used instead of creating a new one.
 
-var bar = multi(x, y, params)
------------------------------
+const bar = multi(x, y, params)
+-------------------------------
 
 Create a new progress bar at `(x,y)` with `params` which default to:
 
@@ -50,8 +50,8 @@ Create a new progress bar at `(x,y)` with `params` which default to:
 
 If `y` is negative or `'-0'` it will be treated as a relative coordinate.
 
-var bar = multi.rel(x, y, params)
----------------------------------
+const bar = multi.rel(x, y, params)
+-----------------------------------
 
 Create a new progress bar at an absolute `x` and relative `y` coordinate with
 respect to the present `multi.offset`.

package/example/drop.js

@@ -1,21 +1,22 @@
-var multimeter = require('multimeter');
-var multi = multimeter(process);
+import multimeter from 'setitch-multimeter';
 
-multi.on('^C', function () {
+const multi = multimeter(process);
+
+multi.on('^C', () => {
     multi.charm.cursor(true);
     multi.write('\n').destroy();
-    
+
     process.exit();
 });
 multi.charm.cursor(false);
 
-multi.drop(function (bar) {
-    var iv = setInterval(function () {
-        var p = bar.percent();
-        bar.percent(p + 1/100);
+multi.drop((bar) => {
+    const iv = setInterval(() => {
+        const p = bar.percent();
+        bar.percent(p + 1 / 100);
         if (p >= 1) {
             clearInterval(iv);
-            
+
             multi.charm.cursor(true);
             multi.write('\n').destroy();
         }

package/example/multibar.js

@@ -1,47 +1,47 @@
-var multimeter = require('multimeter');
+import multimeter from 'setitch-multimeter';
 
-var multi = multimeter(process);
+const multi = multimeter(process);
 multi.on('^C', process.exit);
 multi.charm.reset();
-    
-var bars = [];
-var progress = [];
-var deltas = [];
+
+const bars = [];
+const progress = [];
+const deltas = [];
 
 multi.write('Progress:\n\n');
 
-for (var i = 0; i < 5; i++) {
-    var s = 'ABCDE'[i] + ': \n';
+for (let i = 0; i < 5; i++) {
+    const s = 'ABCDE'[i] + ': \n';
     multi.write(s);
-    
-    var bar = multi(s.length, i + 3, {
-        width : 20,
-        solid : {
-            text : '|',
-            foreground : 'white',
-            background : 'blue'
+
+    const bar = multi(s.length, i + 3, {
+        width: 20,
+        solid: {
+            text: '|',
+            foreground: 'white',
+            background: 'blue'
         },
-        empty : { text : ' ' },
+        empty: { text: ' ' },
     });
     bars.push(bar);
-    
+
     deltas[i] = 1 + Math.random() * 9;
     progress.push(0);
 }
 
 multi.write('\nbeep boop\n');
 
-var pending = progress.length;
-var iv = setInterval(function () {
-    progress.forEach(function (p, i) {
+let pending = progress.length;
+const iv = setInterval(() => {
+    progress.forEach((p, i) => {
         progress[i] += Math.random() * deltas[i];
-        bars[i].percent(progress[i]/100);
-        if (p < 100 && progress[i] >= 100) pending --;
+        bars[i].percent(progress[i] / 100);
+        if (p < 100 && progress[i] >= 100) pending--;
         if (pending === 0) {
             multi.write('\nAll done.\n');
             multi.destroy();
             clearInterval(iv);
-            pending --;
+            pending--;
         }
     });
 }, 100);

package/example/multirel.js

@@ -1,29 +1,29 @@
-var multimeter = require('multimeter');
+import multimeter from 'setitch-multimeter';
 
-var multi = multimeter(process);
+const multi = multimeter(process);
 multi.on('^C', process.exit);
 
-var bars = [];
-var progress = [];
-var deltas = [];
+const bars = [];
+const progress = [];
+const deltas = [];
 
 multi.write('Progress:\n\n');
 
-for (var i = 0; i < 5; i++) {
-    var s = 'ABCDE'[i] + ': \n';
+for (let i = 0; i < 5; i++) {
+    const s = 'ABCDE'[i] + ': \n';
     multi.write(s);
-    
-    var bar = multi.rel(4, i, {
-        width : 20,
-        solid : {
-            text : '|',
-            foreground : 'white',
-            background : 'blue'
+
+    const bar = multi.rel(4, i, {
+        width: 20,
+        solid: {
+            text: '|',
+            foreground: 'white',
+            background: 'blue'
         },
-        empty : { text : ' ' },
+        empty: { text: ' ' },
     });
     bars.push(bar);
-    
+
     deltas[i] = 1 + Math.random() * 9;
     progress.push(0);
 }
@@ -31,22 +31,22 @@ for (var i = 0; i < 5; i++) {
 multi.offset += 2;
 multi.write('\nbeep');
 
-setTimeout(function () {
-    multi.offset ++;
+setTimeout(() => {
+    multi.offset++;
     multi.write('\n    boop');
 }, 2000);
 
-var pending = progress.length;
-var iv = setInterval(function () {
-    progress.forEach(function (p, i) {
+let pending = progress.length;
+const iv = setInterval(() => {
+    progress.forEach((p, i) => {
         progress[i] += Math.random() * deltas[i];
-        bars[i].percent(progress[i]/100);
-        if (p < 100 && progress[i] >= 100) pending --;
+        bars[i].percent(progress[i] / 100);
+        if (p < 100 && progress[i] >= 100) pending--;
         if (pending === 0) {
             multi.write('\nAll done.\n');
             multi.destroy();
             clearInterval(iv);
-            pending --;
+            pending--;
         }
     });
 }, 100);

package/example/simple_model.js

@@ -1,89 +1,25 @@
-    /**
-     * @param barNames Array of bar names
-     * @param makeEven boolean (false) should bar start evenly (from longest bar label/name
-     * @returns API: {writeText, updateProgress, close}
-     * @constructor
-     */
-    function ProgressBar(barNames = [], makeEven = true) {
-        let multimeter = require('multimeter');
-        let multi = multimeter(process);
+import ProgressBar from '../src/simple_model.js';
 
-        let bars = [];
-        let progress = [];
+const bars = ['bar1', 'another bar'];
 
+const manager = new ProgressBar(bars, true);
+const delay = async (time = 1000) => new Promise((r) => setTimeout(() => r(null), time));
 
-        for (let i = 0; i < barNames.length; i++) {
-            let s = barNames[i] + ': \n';
-            multi.write(s);
 
-            let offset = makeEven ? barNames.reduce( (a, b) => { return a.length > b.length ? a : b; }, '').length + 3 : barNames[barNames.length-1-i].length+3;
+(async () => {
+    manager.updateProgress(bars[0], 0.1);
+    await delay();
+    
+    manager.updateProgress(bars[0], 0.3);
+    manager.updateProgress(bars[1], 0.5);
+    manager.writeText('aaaaaaaaaaaaa');
+    await delay();
+    
+    manager.updateProgress(bars[1], 1);
+    manager.writeText('bbbb');
+    await delay();
+    
+    manager.close();
+})();
 
-            let bar = multi.rel(offset, i, {
-                width : 80,
-                solid : {
-                    text : '#',
-                    foreground : 'white',
-                    // background : 'blue'
-                },
-                empty : { text : '|' },
-            });
-            bars.push(bar);
-            progress.push(0);
-        }
 
-        multi.offset = 1;
-        let lastString = '';
-        let lastUsedString = '';
-
-        function update() {
-            if (working === false) { return ; }
-            let k = new Array(lastUsedString.length).join(' ');
-            multi.write(k);
-            multi.write(lastString);
-            lastUsedString = lastString;
-
-            bars.forEach((bar, i) => {
-                bar.percent(progress[i]);
-            });
-
-            timeout = setTimeout(update, 100);
-        }
-
-        let timeout = setTimeout(update, 100);
-
-        let working = true;
-
-        return {
-            writeText(text) {
-                if (working === false) return null;
-
-                lastString = text;
-
-                return this;
-            },
-            updateProgress(name, percentage) {
-                if (working === false) return null;
-
-                let index = barNames.indexOf(name);
-                if (index === -1) return -1;
-
-                percentage = Math.round(percentage * 10000)/10000;
-
-                progress[progress.length -1 -index] = percentage;
-                if (percentage === 1) setTimeout(update);
-                return this;
-            },
-            close() {
-                if (working === false) return null;
-
-                clearTimeout(timeout);
-                multi.destroy();
-                working = false;
-                progress.forEach((p, i) => {
-                    delete progress[i];
-                    delete barNames[i];
-                });
-                delete this;
-            }
-        };
-    }

package/example/single.js

@@ -1,11 +1,12 @@
-var multimeter = require('multimeter');
-var multi = multimeter(process);
+import multimeter from 'setitch-multimeter';
+
+const multi = multimeter(process);
+
+multi.drop((bar) => {
+    const iv = setInterval(() => {
+        const p = bar.percent();
+        bar.percent(p + 1 / 100);
 
-multi.drop(function (bar) {
-    var iv = setInterval(function () {
-        var p = bar.percent();
-        bar.percent(p + 1/100);
-        
         if (p >= 1) clearInterval(iv);
     }, 25);
 });

package/example/sum.js

@@ -1,33 +1,33 @@
-var multimeter = require('multimeter');
+import multimeter from 'setitch-multimeter';
 
-var multi = multimeter(process);
-var charm = multi.charm;
+const multi = multimeter(process);
+const charm = multi.charm;
 charm.on('^C', process.exit);
 charm.reset();
 
-var xs = [];
-for (var i = 0; i < 100; i++) xs.push(i);
+const xs = [];
+for (let i = 0; i < 100; i++) xs.push(i);
 
 console.log('Calculating the sum of [0..100]:\n');
 charm.write('    ');
 
-multi.drop(function (bar) {
+multi.drop((bar) => {
     bar.percent(0);
-    
+
     charm.write('\n\nResult: ');
-    charm.position(function (x, y) {
-        var sum = 0;
-        var iv = setInterval(function () {
+    charm.position((x, y) => {
+        let sum = 0;
+        const iv = setInterval(() => {
             sum += xs.shift();
-            
-            bar.percent(1 - xs.length/100);
-            
+
+            bar.percent(1 - xs.length / 100);
+
             charm
                 .position(x, y)
                 .erase('end')
                 .write(sum.toString())
             ;
-            
+
             if (xs.length === 0) {
                 clearInterval(iv);
                 multi.destroy();

package/example/web_multibar.js

@@ -1,52 +1,52 @@
-var http = require('http');
-var multimeter = require('multimeter');
+import http from 'http';
+import multimeter from 'setitch-multimeter';
 
-http.createServer(function (req, res) {
+http.createServer((req, res) => {
     res.setHeader('content-type', 'application/octet-stream');
-    
-    var multi = multimeter(res);
+
+    const multi = multimeter(res);
     multi.charm.on('^C', process.exit);
     multi.charm.reset();
-    
-    var bars = [];
-    var progress = [];
-    var deltas = [];
-    
-    for (var i = 0; i < 5; i++) {
-        var s = 'ABCDE'[i] + ': \n';
+
+    const bars = [];
+    const progress = [];
+    const deltas = [];
+
+    for (let i = 0; i < 5; i++) {
+        const s = 'ABCDE'[i] + ': \n';
         multi.write(s);
-        
-        var bar = multi(s.length, i + 1, {
-            width : 20,
-            solid : {
-                text : '|',
-                foreground : 'white',
-                background : 'blue'
+
+        const bar = multi(s.length, i + 1, {
+            width: 20,
+            solid: {
+                text: '|',
+                foreground: 'white',
+                background: 'blue'
             },
-            empty : { text : ' ' },
+            empty: { text: ' ' },
         });
         bars.push(bar);
-        
+
         deltas[i] = 1 + Math.random() * 9;
         progress.push(0);
     }
-    
+
     multi.write('\nbeep boop\n');
-    
-    var pending = progress.length;
-    var iv = setInterval(function () {
-        progress.forEach(function (p, i) {
+
+    let pending = progress.length;
+    const iv = setInterval(() => {
+        progress.forEach((p, i) => {
             progress[i] += Math.random() * deltas[i];
-            bars[i].percent(progress[i]/100);
-            if (p < 100 && progress[i] >= 100) pending --;
+            bars[i].percent(progress[i] / 100);
+            if (p < 100 && progress[i] >= 100) pending--;
             if (pending === 0) {
                 multi.write('\nAll done.\n');
                 res.end();
             }
         });
     }, 100);
-    
-    res.connection.on('end', function () {
+
+    res.connection.on('end', () => {
         multi.destroy();
         clearInterval(iv);
     });

package/example/web_multirel.js

@@ -1,57 +1,57 @@
-var http = require('http');
-var multimeter = require('multimeter');
+import http from 'http';
+import multimeter from 'setitch-multimeter';
 
-http.createServer(function (req, res) {
+http.createServer((req, res) => {
     res.setHeader('content-type', 'application/octet-stream');
-    
-    var multi = multimeter(res);
+
+    const multi = multimeter(res);
     multi.charm.on('^C', process.exit);
-    
-    var bars = [];
-    var progress = [];
-    var deltas = [];
-    
-    for (var i = 0; i < 5; i++) {
-        var s = 'ABCDE'[i] + ': \n';
+
+    const bars = [];
+    const progress = [];
+    const deltas = [];
+
+    for (let i = 0; i < 5; i++) {
+        const s = 'ABCDE'[i] + ': \n';
         multi.write(s);
-        
-        var bar = multi.rel(4, i, {
-            width : 20,
-            solid : {
-                text : '|',
-                foreground : 'white',
-                background : 'blue'
+
+        const bar = multi.rel(4, i, {
+            width: 20,
+            solid: {
+                text: '|',
+                foreground: 'white',
+                background: 'blue'
             },
-            empty : { text : ' ' },
+            empty: { text: ' ' },
         });
         bars.push(bar);
-        
+
         deltas[i] = 5 + Math.random() * 10;
         progress.push(0);
     }
-    
+
     multi.offset += 2;
     multi.write('\nbeep');
-    
-    setTimeout(function () {
-        multi.offset ++;
+
+    setTimeout(() => {
+        multi.offset++;
         multi.write('\n    boop');
     }, 1000);
-    
-    var pending = progress.length;
-    var iv = setInterval(function () {
-        progress.forEach(function (p, i) {
+
+    let pending = progress.length;
+    const iv = setInterval(() => {
+        progress.forEach((p, i) => {
             progress[i] += Math.random() * deltas[i];
-            bars[i].percent(progress[i]/100);
-            if (p < 100 && progress[i] >= 100) pending --;
+            bars[i].percent(progress[i] / 100);
+            if (p < 100 && progress[i] >= 100) pending--;
             if (pending === 0) {
                 multi.write('\nAll done.\n');
                 res.end();
             }
         });
     }, 100);
-    
-    res.connection.on('end', function () {
+
+    res.connection.on('end', () => {
         multi.destroy();
         clearInterval(iv);
     });

package/example/web_sum.js

@@ -1,42 +1,42 @@
-var http = require('http');
-var multimeter = require('multimeter');
-
-http.createServer(function (req, res) {
-    var multi = multimeter(res);
-    var charm = multi.charm;
-    
-    var xs = [];
-    for (var i = 0; i < 100; i++) xs.push(i);
-    
+import http from 'http';
+import multimeter from 'setitch-multimeter';
+
+http.createServer((req, res) => {
+    const multi = multimeter(res);
+    const charm = multi.charm;
+
+    const xs = [];
+    for (let i = 0; i < 100; i++) xs.push(i);
+
     charm.reset()
         .write('Calculating the sum of [0..100]:\n\n')
     ;
-    
-    var bar = multi(4, 3, { width : 20 });
+
+    const bar = multi(4, 3, { width: 20 });
     bar.percent(0);
-    
-    var sum = 0;
+
+    let sum = 0;
     charm.write('\n\nResult: ' + sum);
-    
-    var iv = setInterval(function () {
-        var x = xs.shift();
-        bar.percent(1 - xs.length/100);
-        
+
+    const iv = setInterval(() => {
+        const x = xs.shift();
+        bar.percent(1 - xs.length / 100);
+
         charm
             .left(sum.toString().length)
             .erase('end')
         ;
         sum += x;
-        
+
         charm.write(sum.toString());
-        
+
         if (xs.length === 0) {
             charm.write('\n');
             res.end();
         }
     }, 50);
-    
-    res.connection.on('end', function () {
+
+    res.connection.on('end', () => {
         multi.destroy();
         clearInterval(iv);
     });

package/package.json

@@ -1,15 +1,17 @@
 {
     "name": "setitch-multimeter",
-    "version": "0.2.1",
+    "version": "0.3.0",
     "description": "render multiple progress bars at once on the terminal",
-    "main": "index.js",
+    "type": "module",
+    "main": "./src/index.js",
+    "exports": "./src/index.js",
     "directories": {
         "lib": ".",
         "example": "example",
         "test": "test"
     },
     "dependencies": {
-        "charm": "~0.1.1"
+        "charm": "1.0.2"
     },
     "repository": {
         "type": "git",
@@ -37,7 +39,8 @@
         }
     ],
     "license": "MIT/X11",
-    "engine": {
-        "node": ">=0.4"
-    }
+    "engines": {
+        "node": ">=20"
+    },
+    "packageManager": "npm@11.13.0"
 }

package/src/index.js

@@ -0,0 +1,84 @@
+import charmer from 'charm';
+import Bar from './lib/bar.js';
+
+/**
+ * @return {number|(function(*, *, {}=): Bar)}
+ */
+
+export default function multimeter(...args) {
+    const c = args[0];
+    let charm;
+
+    if (c instanceof charmer.Charm) {
+        charm = c;
+    }
+    else {
+        charm = charmer(...args);
+        charm.on('^C', () => {
+            charm.destroy();
+        });
+    }
+
+    const multi = (x, y, params = {}) => {
+        if (typeof x === 'object') {
+            params = x;
+            x = params.x;
+            y = params.y;
+        }
+
+        if (x === undefined) x = '+0';
+        if (y === undefined) y = '+0';
+
+        const bar = new Bar(charm, x, y, params);
+        
+        multi.bars.push(bar);
+        bar.offset = multi.offset;
+        multi.on('offset', (o) => {
+            bar.offset = o;
+        });
+        
+        return bar;
+    };
+    multi.bars = [];
+
+    multi.rel = (x, y, params) => {
+        return multi(x, '-' + y, params);
+    };
+
+    multi.drop = (params, cb) => {
+        if (!cb) {
+            cb = params;
+            params = {};
+        }
+
+        charm.position((x, y) => {
+            const bar = new Bar(charm, x, y, params);
+            multi.bars.push(bar);
+            multi.on('offset', (o) => {
+                bar.offset = o;
+            });
+            cb(bar);
+        });
+    };
+
+    multi.charm = charm;
+    multi.destroy = charm.destroy.bind(charm);
+
+    multi.on = charm.on.bind(charm);
+    multi.emit = charm.emit.bind(charm);
+    multi.removeListener = charm.removeListener.bind(charm);
+    multi.write = charm.write.bind(charm);
+
+    let offset = 0;
+    Object.defineProperty(multi, 'offset', {
+        set(o) {
+            offset = o;
+            multi.emit('offset', o);
+        },
+        get() {
+            return offset;
+        }
+    });
+
+    return multi;
+}

package/src/lib/bar.js

@@ -0,0 +1,129 @@
+export default class Bar {
+    constructor(charm, x, y, params) {
+        this.charm = charm;
+        this.x = x;
+        this.y = y;
+        this.width = params.width || 10;
+        this.offset = params.offset || 0;
+
+        this.before = params.before || '[';
+        this.after = params.after || '] ';
+
+        this.solid = params.solid || {
+            background: 'blue',
+            foreground: 'white',
+            text: '|'
+        };
+
+        this.empty = params.empty || {
+            background: null,
+            foreground: null,
+            text: ' '
+        };
+
+        this.text = params.text || {
+            background: null,
+            foreground: null,
+            text: ''
+        };
+
+        this.progress = {
+            percent: 0,
+            ratio: 0
+        };
+    }
+
+    draw(bars, msg) {
+        bars = Math.floor(bars);
+        this.charm.push(true);
+
+        if (this.y.toString().match(/^[+-]/)) {
+            if (this.y.toString().match(/^-/)) {
+                this.charm.up(-this.y + this.offset);
+            }
+            else if (this.y.toString().match(/^\+/)) {
+                this.charm.down(+this.y - this.offset);
+            }
+            this.charm.column(+this.x);
+        }
+        else {
+            this.charm.position(this.x, this.y);
+        }
+
+        this.charm.write(this.before);
+
+        if (this.solid.background) {
+            this.charm.background(this.solid.background);
+        }
+        if (this.solid.foreground) {
+            this.charm.foreground(this.solid.foreground);
+        }
+
+        this.charm
+            .write(Array(bars + 1).join(this.solid.text))
+            .display('reset')
+        ;
+
+        if (this.empty.background) {
+            this.charm.background(this.empty.background);
+        }
+        if (this.empty.foreground) {
+            this.charm.foreground(this.empty.foreground);
+        }
+
+        this.charm
+            .write(Array(this.width - bars + 1).join(this.empty.text))
+        ;
+
+        if (this.text.background) {
+            this.charm.background(this.text.background);
+        }
+        if (this.text.foreground) {
+            this.charm.foreground(this.text.foreground);
+        }
+
+        this.charm.write(this.after + msg);
+
+        this.charm.pop(true);
+
+        return this;
+    }
+
+    percent(p, msg) {
+        if (p === undefined) {
+            return this.progress.percent;
+        }
+
+        p = Math.max(Math.min(1, p), 0);
+        this.progress.percent = p;
+        this.progress.ratio = [p, 100];
+
+        let pp = Math.round(p * 10000, 2) / 100;
+        if (p >= 1) pp = ' 100.00';
+        if (p < 1) pp = '  ' + pp;
+
+        this.draw(
+            this.width * p,
+            msg || (pp + ' %   ')
+        );
+
+        return this;
+    }
+
+    ratio(n, d, msg) {
+        if (n === undefined && d === undefined) {
+            return this.progress.ratio;
+        }
+
+        const f = n / d;
+        this.progress.ratio = [n, d];
+        this.progress.percent = f * 100;
+
+        this.draw(
+            this.width * f,
+            msg || (n + ' / ' + d)
+        );
+
+        return this;
+    }
+}

package/src/simple_model.js

@@ -0,0 +1,92 @@
+import multimeter from 'setitch-multimeter';
+
+/**
+ * @param barNames Array of bar names
+ * @param makeEven boolean (false) should bar start evenly (from longest bar label/name
+ * @returns API: {writeText, updateProgress, close}
+ * @constructor
+ */
+export default function ProgressBar(barNames = [], makeEven = true) {
+    const multi = multimeter(process);
+
+    const bars = [];
+    const progress = [];
+
+    for (let i = 0; i < barNames.length; i++) {
+        const s = barNames[i] + ': \n';
+        multi.write(s);
+
+        const offset = makeEven
+            ? barNames.reduce((a, b) => (a.length > b.length ? a : b), '').length + 3
+            : barNames[barNames.length - 1 - i].length + 3;
+
+        const bar = multi.rel(offset, i, {
+            width: 80,
+            solid: {
+                text: '#',
+                foreground: 'white',
+                // background : 'blue'
+            },
+            empty: { text: '|' },
+        });
+        bars.push(bar);
+        progress.push(0);
+    }
+
+    multi.offset = 1;
+    let lastString = '';
+    let lastUsedString = '';
+    let working = true;
+    let timeout;
+
+    function update() {
+        if (working === false) return;
+        const k = new Array(lastUsedString.length).join(' ');
+        multi.write(k);
+        multi.write(lastString);
+        lastUsedString = lastString;
+        lastString = '';
+
+        bars.forEach((bar, i) => {
+            bar.percent(progress[i]);
+        });
+
+        timeout = setTimeout(update, 100);
+    }
+
+    timeout = setTimeout(update, 100);
+
+    return {
+        writeText(text) {
+            if (working === false) return null;
+
+            lastString = text;
+
+            return this;
+        },
+        updateProgress(name, percentage) {
+            if (working === false) return null;
+
+            const index = barNames.indexOf(name);
+            if (index === -1) return -1;
+
+            percentage = Math.round(percentage * 10000) / 10000;
+
+            progress[progress.length - 1 - index] = percentage;
+            if (percentage === 1) setTimeout(update);
+            return this;
+        },
+        close() {
+            if (working === false) return null;
+
+            clearTimeout(timeout);
+            multi.destroy();
+            working = false;
+            progress.forEach((p, i) => {
+                delete progress[i];
+                delete barNames[i];
+            });
+            delete this;
+        }
+    };
+}

package/index.js

@@ -1,75 +0,0 @@
-var charmer = require('charm');
-var Bar = require('./lib/bar');
-
-var exports = module.exports = function (c) {
-    if (c instanceof charmer.Charm) {
-        var charm = c;
-    }
-    else {
-        var charm = charmer.apply(null, arguments);
-        charm.on('^C', function () {
-            charm.destroy();
-        });
-    }
-    
-    var multi = function (x, y, params) {
-        if (typeof x === 'object') {
-            params = x;
-            x = params.x;
-            y = params.y;
-        }
-        if (!params) params = {};
-        
-        if (x === undefined) x = '+0';
-        if (y === undefined) y = '+0';
-        
-        var bar = new Bar(charm, x, y, params);
-        multi.bars.push(bar);
-        bar.offset = multi.offset;
-        multi.on('offset', function (o) {
-            bar.offset = o;
-        });
-        return bar;
-    };
-    multi.bars = [];
-    
-    multi.rel = function (x, y, params) {
-        return multi(x, '-' + y, params);
-    };
-    
-    multi.drop = function (params, cb) {
-        if (!cb) { cb = params; params = {} }
-        
-        charm.position(function (x, y) {
-            var bar = new Bar(charm, x, y, params);
-            multi.bars.push(bar);
-            multi.on('offset', function (o) {
-                bar.offset = o;
-            });
-            cb(bar);
-        });
-    };
-    
-    multi.charm = charm;
-    multi.destroy = charm.destroy.bind(charm);
-    
-    multi.on = charm.on.bind(charm);
-    multi.emit = charm.emit.bind(charm);
-    multi.removeListener = charm.removeListener.bind(charm);
-    multi.write = charm.write.bind(charm);
-    
-    (function () {
-        var offset = 0;
-        Object.defineProperty(multi, 'offset', {
-            set : function (o) {
-                offset = o;
-                multi.emit('offset', o);
-            },
-            get : function () {
-                return offset;
-            }
-        });
-    })();
-    
-    return multi;
-};

package/lib/bar.js

@@ -1,113 +0,0 @@
-var Bar = module.exports = function (charm, x, y, params) {
-    this.charm = charm;
-    this.x = x;
-    this.y = y;
-    this.width = params.width || 10;
-    this.offset = params.offset || 0;
-    
-    this.before = params.before || '[';
-    this.after = params.after || '] ';
-    
-    this.solid = params.solid || {
-        background : 'blue',
-        foreground : 'white',
-        text : '|'
-    };
-    
-    this.empty = params.empty || {
-        background : null,
-        foreground : null,
-        text : ' '
-    };
-    
-    this.progress = {
-        percent : 0,
-        ratio : 0
-    };
-}
-
-Bar.prototype.draw = function (bars, msg) {
-    bars = Math.floor(bars);
-    this.charm.push(true);
-    
-    if (this.y.toString().match(/^[+-]/)) {
-        if (this.y.toString().match(/^-/)) {
-            this.charm.up(-this.y + this.offset);
-        }
-        else if (this.y.toString().match(/^\+/)) {
-            this.charm.down(+this.y - this.offset);
-        }
-        this.charm.column(+this.x);
-    }
-    else {
-        this.charm.position(this.x, this.y);
-    }
-    
-    this.charm.write(this.before);
-    
-    if (this.solid.background) {
-        this.charm.background(this.solid.background);
-    }
-    if (this.solid.foreground) {
-        this.charm.foreground(this.solid.foreground);
-    }
-    
-    this.charm
-        .write(Array(bars + 1).join(this.solid.text))
-        .display('reset')
-    ;
-    
-    if (this.empty.background) {
-        this.charm.background(this.empty.background);
-    }
-    if (this.empty.foreground) {
-        this.charm.foreground(this.empty.foreground);
-    }
-    
-    this.charm
-        .write(Array(this.width - bars + 1).join(this.empty.text))
-        .write(this.after + msg)
-    ;
-    
-    this.charm.pop(true);
-    
-    return this;
-};
-
-Bar.prototype.percent = function (p, msg) {
-    if (p === undefined) {
-        return this.progress.percent;
-    }
-
-    p = Math.max(Math.min(1, p), 0);
-    this.progress.percent = p;
-    this.progress.ratio = [ p, 100 ];
-
-    let pp = Math.round(p*10000, 2)/100;
-    if (p >= 1) pp = ' 100.00';
-    if (p < 1) pp = '  ' + pp;
-
-    this.draw(
-        this.width * p,
-        msg || (pp + ' %   ')
-    );
-    
-    return this;
-};
-
-Bar.prototype.ratio = function (n, d, msg) {
-    if (n === undefined && d === undefined) {
-        return this.progress.ratio;
-    }
-    
-    var f = n / d;
-    this.progress.ratio = [n, d];
-    this.progress.percent = f * 100;
-
-    this.draw(
-        this.width * f,
-        msg || (n + ' / ' + d)
-    );
-
-    return this;
-};