cborg 1.6.1 → 1.8.0

package/cjs/lib/bin.js

@@ -14,15 +14,18 @@ var process__default = /*#__PURE__*/_interopDefaultLegacy(process);
 function usage(code) {
   console.error('Usage: cborg <command> <args>');
   console.error('Valid commands:');
-  console.error('\thex2diag [hex input]');
-  console.error('\thex2bin [hex input]');
-  console.error('\thex2json [--pretty] [hex input]');
-  console.error('\tbin2hex [binary input]');
   console.error('\tbin2diag [binary input]');
+  console.error('\tbin2hex [binary input]');
   console.error('\tbin2json [--pretty] [binary input]');
-  console.error('\tjson2hex \'[json input]\'');
-  console.error('\tjson2diag \'[json input]\'');
+  console.error('\tdiag2bin [diagnostic input]');
+  console.error('\tdiag2hex [diagnostic input]');
+  console.error('\tdiag2json [--pretty] [diagnostic input]');
+  console.error('\thex2bin [hex input]');
+  console.error('\thex2diag [hex input]');
+  console.error('\thex2json [--pretty] [hex input]');
   console.error('\tjson2bin \'[json input]\'');
+  console.error('\tjson2diag \'[json input]\'');
+  console.error('\tjson2hex \'[json input]\'');
   console.error('Input may either be supplied as an argument or piped via stdin');
   process__default["default"].exit(code || 0);
 }
@@ -54,22 +57,13 @@ async function run() {
   case 'help': {
       return usage(0);
     }
-  case 'hex2json': {
-      const {argv, pretty} = argvPretty();
-      const bin = fromHex(argv.length < 4 ? (await fromStdin()).toString() : argv[3]);
-      return console.log(JSON.stringify(decode.decode(bin), undefined, pretty ? 2 : undefined));
-    }
-  case 'hex2diag': {
-      const bin = fromHex(process__default["default"].argv.length < 4 ? (await fromStdin()).toString() : process__default["default"].argv[3]);
+  case 'bin2diag': {
+      const bin = process__default["default"].argv.length < 4 ? await fromStdin() : new TextEncoder().encode(process__default["default"].argv[3]);
       for (const line of diagnostic.tokensToDiagnostic(bin)) {
         console.log(line);
       }
       return;
     }
-  case 'hex2bin': {
-      const bin = fromHex(process__default["default"].argv.length < 4 ? (await fromStdin()).toString() : process__default["default"].argv[3]);
-      return process__default["default"].stdout.write(bin);
-    }
   case 'bin2hex': {
       const bin = process__default["default"].argv.length < 4 ? await fromStdin() : new TextEncoder().encode(process__default["default"].argv[3]);
       return console.log(byteUtils.toHex(bin));
@@ -79,17 +73,39 @@ async function run() {
       const bin = argv.length < 4 ? await fromStdin() : new TextEncoder().encode(argv[3]);
       return console.log(JSON.stringify(decode.decode(bin), undefined, pretty ? 2 : undefined));
     }
-  case 'bin2diag': {
-      const bin = process__default["default"].argv.length < 4 ? await fromStdin() : new TextEncoder().encode(process__default["default"].argv[3]);
+  case 'diag2bin': {
+      const bin = diagnostic.fromDiag(process__default["default"].argv.length < 4 ? (await fromStdin()).toString() : process__default["default"].argv[3]);
+      return process__default["default"].stdout.write(bin);
+    }
+  case 'diag2hex': {
+      const bin = diagnostic.fromDiag(process__default["default"].argv.length < 4 ? (await fromStdin()).toString() : process__default["default"].argv[3]);
+      return console.log(byteUtils.toHex(bin));
+    }
+  case 'diag2json': {
+      const {argv, pretty} = argvPretty();
+      const bin = diagnostic.fromDiag(argv.length < 4 ? (await fromStdin()).toString() : argv[3]);
+      return console.log(JSON.stringify(decode.decode(bin), undefined, pretty ? 2 : undefined));
+    }
+  case 'hex2bin': {
+      const bin = fromHex(process__default["default"].argv.length < 4 ? (await fromStdin()).toString() : process__default["default"].argv[3]);
+      return process__default["default"].stdout.write(bin);
+    }
+  case 'hex2diag': {
+      const bin = fromHex(process__default["default"].argv.length < 4 ? (await fromStdin()).toString() : process__default["default"].argv[3]);
       for (const line of diagnostic.tokensToDiagnostic(bin)) {
         console.log(line);
       }
       return;
     }
-  case 'json2hex': {
+  case 'hex2json': {
+      const {argv, pretty} = argvPretty();
+      const bin = fromHex(argv.length < 4 ? (await fromStdin()).toString() : argv[3]);
+      return console.log(JSON.stringify(decode.decode(bin), undefined, pretty ? 2 : undefined));
+    }
+  case 'json2bin': {
       const inp = process__default["default"].argv.length < 4 ? (await fromStdin()).toString() : process__default["default"].argv[3];
       const obj = JSON.parse(inp);
-      return console.log(byteUtils.toHex(encode.encode(obj)));
+      return process__default["default"].stdout.write(encode.encode(obj));
     }
   case 'json2diag': {
       const inp = process__default["default"].argv.length < 4 ? (await fromStdin()).toString() : process__default["default"].argv[3];
@@ -99,10 +115,10 @@ async function run() {
       }
       return;
     }
-  case 'json2bin': {
+  case 'json2hex': {
       const inp = process__default["default"].argv.length < 4 ? (await fromStdin()).toString() : process__default["default"].argv[3];
       const obj = JSON.parse(inp);
-      return process__default["default"].stdout.write(encode.encode(obj));
+      return console.log(byteUtils.toHex(encode.encode(obj)));
     }
   default: {
       if (process__default["default"].argv.findIndex(a => a.endsWith('mocha')) === -1) {

package/cjs/lib/diagnostic.js

@@ -4,9 +4,12 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var decode = require('./decode.js');
 var byteUtils = require('./byte-utils.js');
+var _0uint = require('./0uint.js');
 
+const utf8Encoder = new TextEncoder();
+const utf8Decoder = new TextDecoder();
 function* tokensToDiagnostic(inp, width = 100) {
-  const tokeniser = new decode.Tokeniser(inp);
+  const tokeniser = new decode.Tokeniser(inp, { retainStringBytes: true });
   let pos = 0;
   const indent = [];
   const slc = (start, length) => {
@@ -17,6 +20,7 @@ function* tokensToDiagnostic(inp, width = 100) {
     let margin = ''.padStart(indent.length * 2, ' ');
     let vLength = token.encodedLength - 1;
     let v = String(token.value);
+    let outp = `${ margin }${ slc(0, 1) }`;
     const str = token.type.name === 'bytes' || token.type.name === 'string';
     if (token.type.name === 'string') {
       v = v.length;
@@ -25,7 +29,29 @@ function* tokensToDiagnostic(inp, width = 100) {
       v = token.value.length;
       vLength -= v;
     }
-    let outp = `${ margin }${ slc(0, 1) } ${ slc(1, vLength) }`;
+    let multilen;
+    switch (token.type.name) {
+    case 'string':
+    case 'bytes':
+    case 'map':
+    case 'array':
+      multilen = token.type.name === 'string' ? utf8Encoder.encode(token.value).length : token.value.length;
+      if (multilen >= _0uint.uintBoundaries[0]) {
+        if (multilen < _0uint.uintBoundaries[1]) {
+          outp += ` ${ slc(1, 1) }`;
+        } else if (multilen < _0uint.uintBoundaries[2]) {
+          outp += ` ${ slc(1, 2) }`;
+        } else if (multilen < _0uint.uintBoundaries[3]) {
+          outp += ` ${ slc(1, 4) }`;
+        } else if (multilen < _0uint.uintBoundaries[4]) {
+          outp += ` ${ slc(1, 8) }`;
+        }
+      }
+      break;
+    default:
+      outp += ` ${ slc(1, vLength) }`;
+      break;
+    }
     outp = outp.padEnd(width / 2, ' ');
     outp += `# ${ margin }${ token.type.name }`;
     if (token.type.name !== v) {
@@ -33,15 +59,22 @@ function* tokensToDiagnostic(inp, width = 100) {
     }
     yield outp;
     if (str) {
+      let asString = token.type.name === 'string';
       margin += '  ';
-      const repr = token.type.name === 'bytes' ? token.value : new TextEncoder().encode(token.value);
+      let repr = asString ? utf8Encoder.encode(token.value) : token.value;
+      if (asString && token.byteValue !== undefined) {
+        if (repr.length !== token.byteValue.length) {
+          repr = token.byteValue;
+          asString = false;
+        }
+      }
       const wh = (width / 2 - margin.length - 1) / 2;
       let snip = 0;
       while (repr.length - snip > 0) {
         const piece = repr.slice(snip, snip + wh);
         snip += piece.length;
-        const st = token.type.name === 'string' ? new TextDecoder().decode(piece) : piece.reduce((p, c) => {
-          if (c < 32 || c === 127) {
+        const st = asString ? utf8Decoder.decode(piece) : piece.reduce((p, c) => {
+          if (c < 32 || c >= 127 && c < 161 || c === 173) {
             return `${ p }\\x${ c.toString(16).padStart(2, '0') }`;
           }
           return `${ p }${ String.fromCharCode(c) }`;
@@ -49,17 +82,16 @@ function* tokensToDiagnostic(inp, width = 100) {
         yield `${ margin }${ byteUtils.toHex(piece) }`.padEnd(width / 2, ' ') + `# ${ margin }"${ st }"`;
       }
     }
+    if (indent.length) {
+      indent[indent.length - 1]--;
+    }
     if (!token.type.terminal) {
       switch (token.type.name) {
       case 'map':
-        if (token.value) {
-          indent.push(token.value * 2);
-        }
+        indent.push(token.value * 2);
         break;
       case 'array':
-        if (token.value) {
-          indent.push(token.value);
-        }
+        indent.push(token.value);
         break;
       case 'tag':
         indent.push(1);
@@ -67,16 +99,23 @@ function* tokensToDiagnostic(inp, width = 100) {
       default:
         throw new Error(`Unknown token type '${ token.type.name }'`);
       }
-    } else {
-      if (indent.length) {
-        indent[indent.length - 1]--;
-        if (indent[indent.length - 1] === 0) {
-          indent.pop();
-        }
-      }
+    }
+    while (indent.length && indent[indent.length - 1] <= 0) {
+      indent.pop();
     }
     pos += token.encodedLength;
   }
 }
+function fromDiag(input) {
+  if (typeof input !== 'string') {
+    throw new TypeError('Expected string input');
+  }
+  input = input.replace(/#.*?$/mg, '').replace(/[\s\r\n]+/mg, '');
+  if (/[^a-f0-9]/i.test(input)) {
+    throw new TypeError('Input string was not CBOR diagnostic format');
+  }
+  return byteUtils.fromHex(input);
+}
 
+exports.fromDiag = fromDiag;
 exports.tokensToDiagnostic = tokensToDiagnostic;

package/cjs/lib/token.js

@@ -35,6 +35,7 @@ class Token {
     this.value = value;
     this.encodedLength = encodedLength;
     this.encodedBytes = undefined;
+    this.byteValue = undefined;
   }
   toString() {
     return `Token[${ this.type }].${ this.value }`;