Merge ec87f8b into 593c551

hildjj · Jul 21, 2023 · fe878c6 · fe878c6
2 parents 593c551 + ec87f8b
commit fe878c6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/packages/cbor-web/dist/cbor.js b/packages/cbor-web/dist/cbor.js
diff --git a/packages/cbor/lib/tagged.js b/packages/cbor/lib/tagged.js
@@ -332,6 +332,9 @@ class Tagged {
    */
   convert(converters) {
     let f = (converters == null) ? undefined : converters[this.tag]
+    if (f === null) { // === is intentional. null has semantic meaning as above
+      return this
+    }
     if (typeof f !== 'function') {
       f = Tagged.TAGS[this.tag]
       if (typeof f !== 'function') {

diff --git a/packages/cbor/test/tagged.ava.js b/packages/cbor/test/tagged.ava.js
@@ -138,3 +138,9 @@ test('Typed Arrays', t => {
   tag = new cbor.Tagged(73, Buffer.from('000100020003', 'hex'))
   t.deepEqual(_toTypedArray(tag.value, tag), new Int16Array([1, 2, 3]))
 })
+
+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));
+})