cborg 1.4.2 → 1.5.3

package/test/node-test-bin.js

@@ -12,9 +12,16 @@ 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((/** @type {string} */ c, /** @type {number} */ i, /** @type {string[]} */ d) => i % 2 === 0 ? `0x${c}${d[i + 1]}` : '')
+    .filter(Boolean)
+    .map((/** @type {string} */ 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
@@ -22,6 +29,12 @@ async function execBin (cmd) {
       }
       resolve({ stdout, stderr })
     })
+    if (stdin != null) {
+      cp.on('spawn', () => {
+        cp.stdin.write(stdin)
+        cp.stdin.end()
+      })
+    }
   })
 }
 
@@ -35,9 +48,16 @@ describe('Bin', () => {
       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
 `)
     }
   })
@@ -52,9 +72,16 @@ Valid commands:
 `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,30 +92,34 @@ Valid commands:
     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":"😀"}\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: '))
-    }
-  })
+  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":"😀"}\n')
+    })
 
-  it('hex2json pretty', async () => {
-    const { stdout, stderr } = await execBin('hex2json --pretty a3616101616282020365736d696c6564f09f9880')
-    assert.strictEqual(stderr, '')
-    assert.strictEqual(stdout,
+    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": [
@@ -98,12 +129,14 @@ Valid commands:
   "smile": "😀"
 }
 `)
-  })
+    })
 
-  it('hex2diag', async () => {
-    const { stdout, stderr } = await execBin('hex2diag a4616101616282020363627566440102036165736d696c6564f09f9880')
-    assert.strictEqual(stderr, '')
-    assert.strictEqual(stdout,
+    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"
@@ -122,27 +155,99 @@ 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\\":\\"😀\\"}"')
+        : await execBin('json2hex', '{"a":1,"b":[2,3],"smile":"😀"}')
+      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\\":\\"😀\\"}"')
+        : await execBin('json2bin', '{"a":1,"b":[2,3],"smile":"😀"}')
+      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\\":\\"😀\\"}"')
+        : await execBin('json2diag', '{"a":1,"b":[2,3],"smile":"😀"}')
+      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('json2hex', async () => {
-    const { stdout, stderr } = await execBin('json2hex "{\\"a\\":1,\\"b\\":[2,3],\\"smile\\":\\"😀\\"}"')
+  it('bin2json (stdin)', async () => {
+    const { stdout, stderr } = await execBin('bin2json', fromHex('a3616101616282020365736d696c6564f09f9880'))
     assert.strictEqual(stderr, '')
-    assert.strictEqual(stdout, 'a3616101616282020365736d696c6564f09f9880\n')
+    assert.strictEqual(stdout, '{"a":1,"b":[2,3],"smile":"😀"}\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: '))
-    }
+  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('bin2hex (stdin)', async () => {
+    const { stdout, stderr } = await execBin('bin2hex', fromHex('a3616101616282020365736d696c6564f09f9880'))
+    assert.strictEqual(stderr, '')
+    assert.strictEqual(stdout, 'a3616101616282020365736d696c6564f09f9880\n')
   })
 })

package/types/lib/common.d.ts

@@ -1,6 +1,6 @@
 export const decodeErrPrefix: "CBOR decode error:";
 export const encodeErrPrefix: "CBOR encode error:";
-export let uintMinorPrefixBytes: any[];
+export const uintMinorPrefixBytes: any[];
 /**
  * @param {Uint8Array} data
  * @param {number} pos

package/types/lib/common.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../lib/common.js"],"names":[],"mappings":"AAAA,mDAA4C;AAC5C,mDAA4C;AAE5C,uCAA+B;AAO/B;;;;GAIG;AACH,uCAJW,UAAU,OACV,MAAM,QACN,MAAM,QAMhB"}
+{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../lib/common.js"],"names":[],"mappings":"AAAA,mDAA4C;AAC5C,mDAA4C;AAE5C,yCAA+B;AAO/B;;;;GAIG;AACH,uCAJW,UAAU,OACV,MAAM,QACN,MAAM,QAMhB"}