cborg 1.4.2 → 1.5.3

package/cjs/node-test/node-test-bin.js

@@ -13,11 +13,14 @@ var chai__default = /*#__PURE__*/_interopDefaultLegacy(chai);
 var process__default = /*#__PURE__*/_interopDefaultLegacy(process);
 var path__default = /*#__PURE__*/_interopDefaultLegacy(path);
 
-const {assert} = chai__default['default'];
-const binPath = path__default['default'].join(path__default['default'].dirname(url.fileURLToPath((typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : (document.currentScript && document.currentScript.src || new URL('node-test/node-test-bin.js', document.baseURI).href)))), '../lib/bin.js');
-async function execBin(cmd) {
+const {assert} = chai__default["default"];
+const binPath = path__default["default"].join(path__default["default"].dirname(url.fileURLToPath((typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : (document.currentScript && document.currentScript.src || new URL('node-test/node-test-bin.js', document.baseURI).href)))), '../lib/bin.js');
+function fromHex(hex) {
+  return new Uint8Array(hex.split('').map((c, i, d) => i % 2 === 0 ? `0x${ c }${ d[i + 1] }` : '').filter(Boolean).map(e => parseInt(e, 16)));
+}
+async function execBin(cmd, stdin) {
   return new Promise((resolve, reject) => {
-    child_process.exec(`"${ process__default['default'].execPath }" "${ binPath }" ${ cmd }`, (err, stdout, stderr) => {
+    const cp = child_process.exec(`"${ process__default["default"].execPath }" "${ binPath }" ${ cmd }`, (err, stdout, stderr) => {
       if (err) {
         err.stdout = stdout;
         err.stderr = stderr;
@@ -28,6 +31,12 @@ async function execBin(cmd) {
         stderr
       });
     });
+    if (stdin != null) {
+      cp.on('spawn', () => {
+        cp.stdin.write(stdin);
+        cp.stdin.end();
+      });
+    }
   });
 }
 describe('Bin', () => {
@@ -39,9 +48,16 @@ describe('Bin', () => {
       assert.strictEqual(e.stdout, '');
       assert.strictEqual(e.stderr, `Usage: cborg <command> <args>
 Valid commands:
-\thex2diag <hex input>
-\thex2json [--pretty] <hex input>
-\tjson2hex '<json input>'
+\thex2diag [hex input]
+\thex2bin [hex input]
+\thex2json [--pretty] [hex input]
+\tbin2hex [binary input]
+\tbin2diag [binary input]
+\tbin2json [--pretty] [binary input]
+\tjson2hex '[json input]'
+\tjson2diag '[json input]'
+\tjson2bin '[json input]'
+Input may either be supplied as an argument or piped via stdin
 `);
     }
   });
@@ -54,9 +70,16 @@ Valid commands:
       assert.strictEqual(e.stderr, `Unknown command: 'blip'
 Usage: cborg <command> <args>
 Valid commands:
-\thex2diag <hex input>
-\thex2json [--pretty] <hex input>
-\tjson2hex '<json input>'
+\thex2diag [hex input]
+\thex2bin [hex input]
+\thex2json [--pretty] [hex input]
+\tbin2hex [binary input]
+\tbin2diag [binary input]
+\tbin2json [--pretty] [binary input]
+\tjson2hex '[json input]'
+\tjson2diag '[json input]'
+\tjson2bin '[json input]'
+Input may either be supplied as an argument or piped via stdin
 `);
     }
   });
@@ -65,27 +88,31 @@ Valid commands:
     assert.strictEqual(stdout, '');
     assert.strictEqual(stderr, `Usage: cborg <command> <args>
 Valid commands:
-\thex2diag <hex input>
-\thex2json [--pretty] <hex input>
-\tjson2hex '<json input>'
+\thex2diag [hex input]
+\thex2bin [hex input]
+\thex2json [--pretty] [hex input]
+\tbin2hex [binary input]
+\tbin2diag [binary input]
+\tbin2json [--pretty] [binary input]
+\tjson2hex '[json input]'
+\tjson2diag '[json input]'
+\tjson2bin '[json input]'
+Input may either be supplied as an argument or piped via stdin
 `);
   });
-  it('hex2json', async () => {
-    const {stdout, stderr} = await execBin('hex2json a3616101616282020365736d696c6564f09f9880');
-    assert.strictEqual(stderr, '');
-    assert.strictEqual(stdout, '{"a":1,"b":[2,3],"smile":"\uD83D\uDE00"}\n');
-    try {
-      await execBin('hex2json');
-      assert.fail('should have errored');
-    } catch (e) {
-      assert.strictEqual(e.stdout, '');
-      assert.isTrue(e.stderr.startsWith('hex2json requires a hexadecimal input string\nUsage: '));
-    }
-  });
-  it('hex2json pretty', async () => {
-    const {stdout, stderr} = await execBin('hex2json --pretty a3616101616282020365736d696c6564f09f9880');
-    assert.strictEqual(stderr, '');
-    assert.strictEqual(stdout, `{
+  for (const stdin of [
+      true,
+      false
+    ]) {
+    it(`hex2json${ stdin ? ' (stdin)' : '' }`, async () => {
+      const {stdout, stderr} = stdin ? await execBin('hex2json a3616101616282020365736d696c6564f09f9880') : await execBin('hex2json', 'a3616101616282020365736d696c6564f09f9880');
+      assert.strictEqual(stderr, '');
+      assert.strictEqual(stdout, '{"a":1,"b":[2,3],"smile":"\uD83D\uDE00"}\n');
+    });
+    it(`hex2json pretty${ stdin ? ' (stdin)' : '' }`, async () => {
+      const {stdout, stderr} = stdin ? await execBin('hex2json --pretty a3616101616282020365736d696c6564f09f9880') : await execBin('hex2json --pretty', 'a3616101616282020365736d696c6564f09f9880');
+      assert.strictEqual(stderr, '');
+      assert.strictEqual(stdout, `{
   "a": 1,
   "b": [
     2,
@@ -94,11 +121,11 @@ Valid commands:
   "smile": "😀"
 }
 `);
-  });
-  it('hex2diag', async () => {
-    const {stdout, stderr} = await execBin('hex2diag a4616101616282020363627566440102036165736d696c6564f09f9880');
-    assert.strictEqual(stderr, '');
-    assert.strictEqual(stdout, `a4                                                # map(4)
+    });
+    it(`hex2diag${ stdin ? ' (stdin)' : '' }`, async () => {
+      const {stdout, stderr} = stdin ? await execBin('hex2diag a4616101616282020363627566440102036165736d696c6564f09f9880') : await execBin('hex2diag', 'a4616101616282020363627566440102036165736d696c6564f09f9880');
+      assert.strictEqual(stderr, '');
+      assert.strictEqual(stdout, `a4                                                # map(4)
   61                                              #   string(1)
     61                                            #     "a"
   01                                              #   uint(1)
@@ -116,24 +143,80 @@ Valid commands:
   64 f09f                                         #   string(2)
     f09f9880                                      #     "😀"
 `);
-    try {
-      await execBin('hex2diag');
-      assert.fail('should have errored');
-    } catch (e) {
-      assert.strictEqual(e.stdout, '');
-      assert.isTrue(e.stderr.startsWith('hex2diag requires a hexadecimal input string\nUsage: '));
-    }
+    });
+    it(`hex2bin${ stdin ? ' (stdin)' : '' }`, async () => {
+      const {stdout, stderr} = stdin ? await execBin('hex2bin a3616101616282020365736d696c6564f09f9880') : await execBin('hex2bin', 'a3616101616282020365736d696c6564f09f9880');
+      assert.strictEqual(stderr, '');
+      assert.strictEqual(stdout, new TextDecoder().decode(fromHex('a3616101616282020365736d696c6564f09f9880')));
+    });
+    it(`json2hex${ stdin ? ' (stdin)' : '' }`, async () => {
+      const {stdout, stderr} = stdin ? await execBin('json2hex "{\\"a\\":1,\\"b\\":[2,3],\\"smile\\":\\"\uD83D\uDE00\\"}"') : await execBin('json2hex', '{"a":1,"b":[2,3],"smile":"\uD83D\uDE00"}');
+      assert.strictEqual(stderr, '');
+      assert.strictEqual(stdout, 'a3616101616282020365736d696c6564f09f9880\n');
+    });
+    it(`json2bin${ stdin ? ' (stdin)' : '' }`, async () => {
+      const {stdout, stderr} = stdin ? await execBin('json2bin "{\\"a\\":1,\\"b\\":[2,3],\\"smile\\":\\"\uD83D\uDE00\\"}"') : await execBin('json2bin', '{"a":1,"b":[2,3],"smile":"\uD83D\uDE00"}');
+      assert.strictEqual(stderr, '');
+      assert.strictEqual(stdout, new TextDecoder().decode(fromHex('a3616101616282020365736d696c6564f09f9880')));
+    });
+    it(`json2diag${ stdin ? ' (stdin)' : '' }`, async () => {
+      const {stdout, stderr} = stdin ? await execBin('json2diag "{\\"a\\":1,\\"b\\":[2,3],\\"smile\\":\\"\uD83D\uDE00\\"}"') : await execBin('json2diag', '{"a":1,"b":[2,3],"smile":"\uD83D\uDE00"}');
+      assert.strictEqual(stderr, '');
+      assert.strictEqual(stdout, `a3                                                # map(3)
+  61                                              #   string(1)
+    61                                            #     "a"
+  01                                              #   uint(1)
+  61                                              #   string(1)
+    62                                            #     "b"
+  82                                              #   array(2)
+    02                                            #     uint(2)
+    03                                            #     uint(3)
+  65                                              #   string(5)
+    736d696c65                                    #     "smile"
+  64 f09f                                         #   string(2)
+    f09f9880                                      #     "😀"
+`);
+    });
+  }
+  it('bin2diag (stdin)', async () => {
+    const {stdout, stderr} = await execBin('bin2diag', fromHex('a3616101616282020365736d696c6564f09f9880'));
+    assert.strictEqual(stderr, '');
+    assert.strictEqual(stdout, `a3                                                # map(3)
+  61                                              #   string(1)
+    61                                            #     "a"
+  01                                              #   uint(1)
+  61                                              #   string(1)
+    62                                            #     "b"
+  82                                              #   array(2)
+    02                                            #     uint(2)
+    03                                            #     uint(3)
+  65                                              #   string(5)
+    736d696c65                                    #     "smile"
+  64 f09f                                         #   string(2)
+    f09f9880                                      #     "😀"
+`);
+  });
+  it('bin2json (stdin)', async () => {
+    const {stdout, stderr} = await execBin('bin2json', fromHex('a3616101616282020365736d696c6564f09f9880'));
+    assert.strictEqual(stderr, '');
+    assert.strictEqual(stdout, '{"a":1,"b":[2,3],"smile":"\uD83D\uDE00"}\n');
+  });
+  it('bin2json pretty (stdin)', async () => {
+    const {stdout, stderr} = await execBin('bin2json --pretty', fromHex('a3616101616282020365736d696c6564f09f9880'));
+    assert.strictEqual(stderr, '');
+    assert.strictEqual(stdout, `{
+  "a": 1,
+  "b": [
+    2,
+    3
+  ],
+  "smile": "😀"
+}
+`);
   });
-  it('json2hex', async () => {
-    const {stdout, stderr} = await execBin('json2hex "{\\"a\\":1,\\"b\\":[2,3],\\"smile\\":\\"\uD83D\uDE00\\"}"');
+  it('bin2hex (stdin)', async () => {
+    const {stdout, stderr} = await execBin('bin2hex', fromHex('a3616101616282020365736d696c6564f09f9880'));
     assert.strictEqual(stderr, '');
     assert.strictEqual(stdout, 'a3616101616282020365736d696c6564f09f9880\n');
-    try {
-      await execBin('json2hex');
-      assert.fail('should have errored');
-    } catch (e) {
-      assert.strictEqual(e.stdout, '');
-      assert.isTrue(e.stderr.startsWith('json2hex requires a JSON input string\nUsage: '));
-    }
   });
 });

package/cjs/node-test/test-0uint.js

@@ -10,7 +10,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var chai__default = /*#__PURE__*/_interopDefaultLegacy(chai);
 
-const {assert} = chai__default['default'];
+const {assert} = chai__default["default"];
 const fixtures = [
   {
     data: '00',

package/cjs/node-test/test-1negint.js

@@ -10,7 +10,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var chai__default = /*#__PURE__*/_interopDefaultLegacy(chai);
 
-const {assert} = chai__default['default'];
+const {assert} = chai__default["default"];
 const fixtures = [
   {
     data: '20',

package/cjs/node-test/test-2bytes.js

@@ -10,7 +10,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var chai__default = /*#__PURE__*/_interopDefaultLegacy(chai);
 
-const {assert} = chai__default['default'];
+const {assert} = chai__default["default"];
 const fixtures = [
   {
     data: '40',

package/cjs/node-test/test-3string.js

@@ -10,7 +10,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var chai__default = /*#__PURE__*/_interopDefaultLegacy(chai);
 
-const {assert} = chai__default['default'];
+const {assert} = chai__default["default"];
 const fixtures = [
   {
     data: '60',

package/cjs/node-test/test-4array.js

@@ -10,7 +10,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var chai__default = /*#__PURE__*/_interopDefaultLegacy(chai);
 
-const {assert} = chai__default['default'];
+const {assert} = chai__default["default"];
 const fixtures = [
   {
     data: '80',

package/cjs/node-test/test-5map.js

@@ -10,7 +10,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var chai__default = /*#__PURE__*/_interopDefaultLegacy(chai);
 
-const {assert} = chai__default['default'];
+const {assert} = chai__default["default"];
 const fixtures = [
   {
     data: 'a0',

package/cjs/node-test/test-6tag.js

@@ -11,7 +11,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var chai__default = /*#__PURE__*/_interopDefaultLegacy(chai);
 
-const {assert} = chai__default['default'];
+const {assert} = chai__default["default"];
 function dateDecoder(obj) {
   if (typeof obj !== 'string') {
     throw new Error('expected string for tag 1');

package/cjs/node-test/test-7float.js

@@ -10,7 +10,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var chai__default = /*#__PURE__*/_interopDefaultLegacy(chai);
 
-const {assert} = chai__default['default'];
+const {assert} = chai__default["default"];
 const fixtures = [
   {
     data: '8601f5f4f6f720',

package/cjs/node-test/test-bl.js

@@ -7,7 +7,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var chai__default = /*#__PURE__*/_interopDefaultLegacy(chai);
 
-const {assert} = chai__default['default'];
+const {assert} = chai__default["default"];
 describe('Internal bytes list', () => {
   describe('push', () => {
     it('push bits', () => {

package/cjs/node-test/test-cbor-vectors.js

@@ -13,7 +13,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var chai__default = /*#__PURE__*/_interopDefaultLegacy(chai);
 
-const {assert} = chai__default['default'];
+const {assert} = chai__default["default"];
 const tags = [];
 const typeEncoders = {};
 tags[0] = function (obj) {

package/cjs/node-test/test-decode-errors.js

@@ -9,7 +9,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var chai__default = /*#__PURE__*/_interopDefaultLegacy(chai);
 
-const {assert} = chai__default['default'];
+const {assert} = chai__default["default"];
 describe('decode errors', () => {
   it('not Uint8Array', () => {
     for (const arg of [

package/cjs/node-test/test-fuzz.js

@@ -10,7 +10,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var chai__default = /*#__PURE__*/_interopDefaultLegacy(chai);
 
-const {assert} = chai__default['default'];
+const {assert} = chai__default["default"];
 describe('Fuzz round-trip', () => {
   it('random objects', function () {
     this.timeout(5000);

package/esm/browser-test/node-test-bin.js

@@ -6,9 +6,12 @@ import { fileURLToPath } from 'url';
 import bin from '../lib/bin.js';
 const {assert} = chai;
 const binPath = path.join(path.dirname(fileURLToPath(import.meta.url)), '../lib/bin.js');
-async function execBin(cmd) {
+function fromHex(hex) {
+  return new Uint8Array(hex.split('').map((c, i, d) => i % 2 === 0 ? `0x${ c }${ d[i + 1] }` : '').filter(Boolean).map(e => parseInt(e, 16)));
+}
+async function execBin(cmd, stdin) {
   return new Promise((resolve, reject) => {
-    exec(`"${ process.execPath }" "${ binPath }" ${ cmd }`, (err, stdout, stderr) => {
+    const cp = exec(`"${ process.execPath }" "${ binPath }" ${ cmd }`, (err, stdout, stderr) => {
       if (err) {
         err.stdout = stdout;
         err.stderr = stderr;
@@ -19,6 +22,12 @@ async function execBin(cmd) {
         stderr
       });
     });
+    if (stdin != null) {
+      cp.on('spawn', () => {
+        cp.stdin.write(stdin);
+        cp.stdin.end();
+      });
+    }
   });
 }
 describe('Bin', () => {
@@ -30,9 +39,16 @@ describe('Bin', () => {
       assert.strictEqual(e.stdout, '');
       assert.strictEqual(e.stderr, `Usage: cborg <command> <args>
 Valid commands:
-\thex2diag <hex input>
-\thex2json [--pretty] <hex input>
-\tjson2hex '<json input>'
+\thex2diag [hex input]
+\thex2bin [hex input]
+\thex2json [--pretty] [hex input]
+\tbin2hex [binary input]
+\tbin2diag [binary input]
+\tbin2json [--pretty] [binary input]
+\tjson2hex '[json input]'
+\tjson2diag '[json input]'
+\tjson2bin '[json input]'
+Input may either be supplied as an argument or piped via stdin
 `);
     }
   });
@@ -45,9 +61,16 @@ Valid commands:
       assert.strictEqual(e.stderr, `Unknown command: 'blip'
 Usage: cborg <command> <args>
 Valid commands:
-\thex2diag <hex input>
-\thex2json [--pretty] <hex input>
-\tjson2hex '<json input>'
+\thex2diag [hex input]
+\thex2bin [hex input]
+\thex2json [--pretty] [hex input]
+\tbin2hex [binary input]
+\tbin2diag [binary input]
+\tbin2json [--pretty] [binary input]
+\tjson2hex '[json input]'
+\tjson2diag '[json input]'
+\tjson2bin '[json input]'
+Input may either be supplied as an argument or piped via stdin
 `);
     }
   });
@@ -56,27 +79,31 @@ Valid commands:
     assert.strictEqual(stdout, '');
     assert.strictEqual(stderr, `Usage: cborg <command> <args>
 Valid commands:
-\thex2diag <hex input>
-\thex2json [--pretty] <hex input>
-\tjson2hex '<json input>'
+\thex2diag [hex input]
+\thex2bin [hex input]
+\thex2json [--pretty] [hex input]
+\tbin2hex [binary input]
+\tbin2diag [binary input]
+\tbin2json [--pretty] [binary input]
+\tjson2hex '[json input]'
+\tjson2diag '[json input]'
+\tjson2bin '[json input]'
+Input may either be supplied as an argument or piped via stdin
 `);
   });
-  it('hex2json', async () => {
-    const {stdout, stderr} = await execBin('hex2json a3616101616282020365736d696c6564f09f9880');
-    assert.strictEqual(stderr, '');
-    assert.strictEqual(stdout, '{"a":1,"b":[2,3],"smile":"\uD83D\uDE00"}\n');
-    try {
-      await execBin('hex2json');
-      assert.fail('should have errored');
-    } catch (e) {
-      assert.strictEqual(e.stdout, '');
-      assert.isTrue(e.stderr.startsWith('hex2json requires a hexadecimal input string\nUsage: '));
-    }
-  });
-  it('hex2json pretty', async () => {
-    const {stdout, stderr} = await execBin('hex2json --pretty a3616101616282020365736d696c6564f09f9880');
-    assert.strictEqual(stderr, '');
-    assert.strictEqual(stdout, `{
+  for (const stdin of [
+      true,
+      false
+    ]) {
+    it(`hex2json${ stdin ? ' (stdin)' : '' }`, async () => {
+      const {stdout, stderr} = stdin ? await execBin('hex2json a3616101616282020365736d696c6564f09f9880') : await execBin('hex2json', 'a3616101616282020365736d696c6564f09f9880');
+      assert.strictEqual(stderr, '');
+      assert.strictEqual(stdout, '{"a":1,"b":[2,3],"smile":"\uD83D\uDE00"}\n');
+    });
+    it(`hex2json pretty${ stdin ? ' (stdin)' : '' }`, async () => {
+      const {stdout, stderr} = stdin ? await execBin('hex2json --pretty a3616101616282020365736d696c6564f09f9880') : await execBin('hex2json --pretty', 'a3616101616282020365736d696c6564f09f9880');
+      assert.strictEqual(stderr, '');
+      assert.strictEqual(stdout, `{
   "a": 1,
   "b": [
     2,
@@ -85,11 +112,11 @@ Valid commands:
   "smile": "😀"
 }
 `);
-  });
-  it('hex2diag', async () => {
-    const {stdout, stderr} = await execBin('hex2diag a4616101616282020363627566440102036165736d696c6564f09f9880');
-    assert.strictEqual(stderr, '');
-    assert.strictEqual(stdout, `a4                                                # map(4)
+    });
+    it(`hex2diag${ stdin ? ' (stdin)' : '' }`, async () => {
+      const {stdout, stderr} = stdin ? await execBin('hex2diag a4616101616282020363627566440102036165736d696c6564f09f9880') : await execBin('hex2diag', 'a4616101616282020363627566440102036165736d696c6564f09f9880');
+      assert.strictEqual(stderr, '');
+      assert.strictEqual(stdout, `a4                                                # map(4)
   61                                              #   string(1)
     61                                            #     "a"
   01                                              #   uint(1)
@@ -107,24 +134,80 @@ Valid commands:
   64 f09f                                         #   string(2)
     f09f9880                                      #     "😀"
 `);
-    try {
-      await execBin('hex2diag');
-      assert.fail('should have errored');
-    } catch (e) {
-      assert.strictEqual(e.stdout, '');
-      assert.isTrue(e.stderr.startsWith('hex2diag requires a hexadecimal input string\nUsage: '));
-    }
+    });
+    it(`hex2bin${ stdin ? ' (stdin)' : '' }`, async () => {
+      const {stdout, stderr} = stdin ? await execBin('hex2bin a3616101616282020365736d696c6564f09f9880') : await execBin('hex2bin', 'a3616101616282020365736d696c6564f09f9880');
+      assert.strictEqual(stderr, '');
+      assert.strictEqual(stdout, new TextDecoder().decode(fromHex('a3616101616282020365736d696c6564f09f9880')));
+    });
+    it(`json2hex${ stdin ? ' (stdin)' : '' }`, async () => {
+      const {stdout, stderr} = stdin ? await execBin('json2hex "{\\"a\\":1,\\"b\\":[2,3],\\"smile\\":\\"\uD83D\uDE00\\"}"') : await execBin('json2hex', '{"a":1,"b":[2,3],"smile":"\uD83D\uDE00"}');
+      assert.strictEqual(stderr, '');
+      assert.strictEqual(stdout, 'a3616101616282020365736d696c6564f09f9880\n');
+    });
+    it(`json2bin${ stdin ? ' (stdin)' : '' }`, async () => {
+      const {stdout, stderr} = stdin ? await execBin('json2bin "{\\"a\\":1,\\"b\\":[2,3],\\"smile\\":\\"\uD83D\uDE00\\"}"') : await execBin('json2bin', '{"a":1,"b":[2,3],"smile":"\uD83D\uDE00"}');
+      assert.strictEqual(stderr, '');
+      assert.strictEqual(stdout, new TextDecoder().decode(fromHex('a3616101616282020365736d696c6564f09f9880')));
+    });
+    it(`json2diag${ stdin ? ' (stdin)' : '' }`, async () => {
+      const {stdout, stderr} = stdin ? await execBin('json2diag "{\\"a\\":1,\\"b\\":[2,3],\\"smile\\":\\"\uD83D\uDE00\\"}"') : await execBin('json2diag', '{"a":1,"b":[2,3],"smile":"\uD83D\uDE00"}');
+      assert.strictEqual(stderr, '');
+      assert.strictEqual(stdout, `a3                                                # map(3)
+  61                                              #   string(1)
+    61                                            #     "a"
+  01                                              #   uint(1)
+  61                                              #   string(1)
+    62                                            #     "b"
+  82                                              #   array(2)
+    02                                            #     uint(2)
+    03                                            #     uint(3)
+  65                                              #   string(5)
+    736d696c65                                    #     "smile"
+  64 f09f                                         #   string(2)
+    f09f9880                                      #     "😀"
+`);
+    });
+  }
+  it('bin2diag (stdin)', async () => {
+    const {stdout, stderr} = await execBin('bin2diag', fromHex('a3616101616282020365736d696c6564f09f9880'));
+    assert.strictEqual(stderr, '');
+    assert.strictEqual(stdout, `a3                                                # map(3)
+  61                                              #   string(1)
+    61                                            #     "a"
+  01                                              #   uint(1)
+  61                                              #   string(1)
+    62                                            #     "b"
+  82                                              #   array(2)
+    02                                            #     uint(2)
+    03                                            #     uint(3)
+  65                                              #   string(5)
+    736d696c65                                    #     "smile"
+  64 f09f                                         #   string(2)
+    f09f9880                                      #     "😀"
+`);
+  });
+  it('bin2json (stdin)', async () => {
+    const {stdout, stderr} = await execBin('bin2json', fromHex('a3616101616282020365736d696c6564f09f9880'));
+    assert.strictEqual(stderr, '');
+    assert.strictEqual(stdout, '{"a":1,"b":[2,3],"smile":"\uD83D\uDE00"}\n');
+  });
+  it('bin2json pretty (stdin)', async () => {
+    const {stdout, stderr} = await execBin('bin2json --pretty', fromHex('a3616101616282020365736d696c6564f09f9880'));
+    assert.strictEqual(stderr, '');
+    assert.strictEqual(stdout, `{
+  "a": 1,
+  "b": [
+    2,
+    3
+  ],
+  "smile": "😀"
+}
+`);
   });
-  it('json2hex', async () => {
-    const {stdout, stderr} = await execBin('json2hex "{\\"a\\":1,\\"b\\":[2,3],\\"smile\\":\\"\uD83D\uDE00\\"}"');
+  it('bin2hex (stdin)', async () => {
+    const {stdout, stderr} = await execBin('bin2hex', fromHex('a3616101616282020365736d696c6564f09f9880'));
     assert.strictEqual(stderr, '');
     assert.strictEqual(stdout, 'a3616101616282020365736d696c6564f09f9880\n');
-    try {
-      await execBin('json2hex');
-      assert.fail('should have errored');
-    } catch (e) {
-      assert.strictEqual(e.stdout, '');
-      assert.isTrue(e.stderr.startsWith('json2hex requires a JSON input string\nUsage: '));
-    }
   });
 });