Merge pull request #188 from hildjj/fix-diag-null

Fix #187

.eslintrc.js

@@ -11,6 +11,7 @@ module.exports = {
   ],
   rules: {
     'no-empty': ['error', {allowEmptyCatch: true}],
+    'jsdoc/imports-as-dependencies': 'off',
   },
   overrides: [
     {

packages/cbor/lib/utils.js

@@ -237,13 +237,15 @@ exports.cborValueToString = function cborValueToString(val, float_bytes = -1) {
       return (float_bytes > 0) ? `${s}_${float_bytes}` : s
     }
     case 'object': {
-      // A null should be caught above
+      if (!val) {
+        return 'null'
+      }
       const buf = exports.bufferishToBuffer(val)
       if (buf) {
         const hex = buf.toString('hex')
         return (float_bytes === -Infinity) ? hex : `h'${hex}'`
       }
-      if (typeof val[Symbol.for('nodejs.util.inspect.custom')] === 'function') {
+      if (val && typeof val[Symbol.for('nodejs.util.inspect.custom')] === 'function') {
         return val[Symbol.for('nodejs.util.inspect.custom')]()
       }
       // Shouldn't get non-empty arrays here

packages/cbor/test/cases.js

@@ -679,7 +679,10 @@ exports.good = [
         18          -- Bytes, length: 24
           000000000000000100000000000000020000000000000003 -- 000000000000000100000000000000020000000000000003
 0xd8435818000000000000000100000000000000020000000000000003`]),
-
+  [[null], '[null]', `
+  81                -- Array, 1 item
+    f6              -- [0], null
+0x81f6`],
 ]
 
 exports.encodeGood = [

packages/cbor/test/tagged.ava.js

@@ -140,7 +140,7 @@ test('Typed Arrays', t => {
 })
 
 test('null converter', t => {
-  const buf = Buffer.from('c100', 'hex');
-  t.deepEqual(cbor.decode(buf), new Date(0));
-  t.deepEqual(cbor.decode(buf, {tags: {1: null}}), new cbor.Tagged(1, 0));
+  const buf = Buffer.from('c100', 'hex')
+  t.deepEqual(cbor.decode(buf), new Date(0))
+  t.deepEqual(cbor.decode(buf, {tags: {1: null}}), new cbor.Tagged(1, 0))
 })