mol_vary 0.0.28 → 0.0.30

package/node.mjs

@@ -251,15 +251,15 @@ var $;
 "use strict";
 var $;
 (function ($) {
-    const catched = new WeakMap();
+    const catched = new WeakSet();
     function $mol_fail_catch(error) {
         if (typeof error !== 'object')
             return false;
         if ($mol_promise_like(error))
             $mol_fail_hidden(error);
-        if (catched.get(error))
+        if (catched.has(error))
             return false;
-        catched.set(error, true);
+        catched.add(error);
         return true;
     }
     $.$mol_fail_catch = $mol_fail_catch;
@@ -2361,22 +2361,18 @@ var $;
             const release = (size) => {
                 capacity -= size;
             };
-            const dump_bint = (val) => {
-                const buf = $mol_bigint_encode(val);
-                acquire(buf.byteLength - 7);
-                if (buf.byteLength > 264)
-                    $mol_fail(new Error('Number too high', { cause: { val } }));
-                buffer[pos++] = -$mol_vary_len.LA;
-                buffer[pos++] = buf.byteLength - 9;
-                buffer.set(buf, pos);
-                pos += buf.byteLength;
-            };
             const dump_unum = (tip, val) => {
                 if (val < $mol_vary_len.L1) {
                     buffer[pos++] = tip | Number(val);
                     release(8);
+                    return;
+                }
+                if (tip == $mol_vary_tip.uint) {
+                    const offset = offsets.get(val);
+                    if (offset !== undefined)
+                        return dump_unum($mol_vary_tip.link, offset);
                 }
-                else if (val < 2 ** 8) {
+                if (val < 2 ** 8) {
                     buffer[pos++] = tip | $mol_vary_len.L1;
                     buffer[pos++] = Number(val);
                     release(7);
@@ -2401,13 +2397,19 @@ var $;
                 else {
                     dump_bint(val);
                 }
+                if (tip == $mol_vary_tip.uint)
+                    offsets.set(val, offsets.size);
             };
             const dump_snum = (val) => {
                 if (val > -$mol_vary_len.L1) {
                     buffer[pos++] = Number(val);
                     release(8);
+                    return;
                 }
-                else if (val >= -(2 ** 7)) {
+                const offset = offsets.get(val);
+                if (offset !== undefined)
+                    return dump_unum($mol_vary_tip.link, offset);
+                if (val >= -(2 ** 7)) {
                     buffer[pos++] = -$mol_vary_len.L1;
                     buffer[pos++] = Number(val);
                     release(7);
@@ -2432,28 +2434,43 @@ var $;
                 else {
                     dump_bint(val);
                 }
+                offsets.set(val, offsets.size);
+            };
+            const dump_bint = (val) => {
+                const buf = $mol_bigint_encode(val);
+                if (buf.byteLength > 264)
+                    $mol_fail(new Error('Number too high', { cause: { val } }));
+                acquire(buf.byteLength - 7);
+                buffer[pos++] = -$mol_vary_len.LA;
+                buffer[pos++] = buf.byteLength - 9;
+                buffer.set(buf, pos);
+                pos += buf.byteLength;
+            };
+            const dump_float = (val) => {
+                const offset = offsets.get(val);
+                if (offset !== undefined)
+                    return dump_unum($mol_vary_tip.link, offset);
+                buffer[pos++] = $mol_vary_spec.fp64;
+                pack.setFloat64(pos, val, true);
+                pos += 8;
+                offsets.set(val, offsets.size);
             };
             const dump_string = (val) => {
-                if (val.length) {
-                    const offset = offsets.get(val);
-                    if (offset !== undefined)
-                        return dump_unum($mol_vary_tip.link, offset);
-                }
+                const offset = offsets.get(val);
+                if (offset !== undefined)
+                    return dump_unum($mol_vary_tip.link, offset);
                 dump_unum($mol_vary_tip.text, val.length);
                 acquire(val.length * 3);
                 const len = $mol_charset_encode_to(val, buffer, pos);
                 pos += len;
                 release(val.length * 3 - len);
-                if (val.length)
-                    offsets.set(val, offsets.size);
+                offsets.set(val, offsets.size);
                 return;
             };
             const dump_buffer = (val) => {
-                if (val.byteLength) {
-                    const offset = offsets.get(val);
-                    if (offset !== undefined)
-                        return dump_unum($mol_vary_tip.link, offset);
-                }
+                const offset = offsets.get(val);
+                if (offset !== undefined)
+                    return dump_unum($mol_vary_tip.link, offset);
                 dump_unum($mol_vary_tip.blob, val.byteLength);
                 if (val instanceof Uint8Array)
                     buffer[pos++] = $mol_vary_tip.uint | $mol_vary_len.L1;
@@ -2483,21 +2500,17 @@ var $;
                 acquire(val.byteLength);
                 buffer.set(src, pos);
                 pos += val.byteLength;
-                if (val.byteLength)
-                    offsets.set(val, offsets.size);
+                offsets.set(val, offsets.size);
             };
             const dump_list = (val) => {
-                if (val.length) {
-                    const offset = offsets.get(val);
-                    if (offset !== undefined)
-                        return dump_unum($mol_vary_tip.link, offset);
-                }
+                const offset = offsets.get(val);
+                if (offset !== undefined)
+                    return dump_unum($mol_vary_tip.link, offset);
                 dump_unum($mol_vary_tip.list, val.length);
                 acquire(val.length * 9);
                 for (const item of val)
                     dump(item);
-                if (val.length)
-                    offsets.set(val, offsets.size);
+                offsets.set(val, offsets.size);
             };
             const dump_object = (val) => {
                 const offset = offsets.get(val);
@@ -2511,8 +2524,7 @@ var $;
                     dump(item);
                 for (const item of vals)
                     dump(item);
-                if (vals.length)
-                    offsets.set(val, offsets.size);
+                offsets.set(val, offsets.size);
             };
             const dump = (val) => {
                 switch (typeof val) {
@@ -2527,12 +2539,8 @@ var $;
                         return;
                     }
                     case 'number': {
-                        if (!Number.isInteger(val)) {
-                            buffer[pos++] = $mol_vary_spec.fp64;
-                            pack.setFloat64(pos, val, true);
-                            pos += 8;
-                            return;
-                        }
+                        if (!Number.isInteger(val))
+                            return dump_float(val);
                     }
                     case 'bigint': {
                         if (val < 0) {
@@ -2591,6 +2599,8 @@ var $;
                 else {
                     $mol_fail(new Error('Unsupported unum', { cause: { num } }));
                 }
+                if ((kind & 0b111_00000) === $mol_vary_tip.uint)
+                    stream.push(res);
                 return res;
             };
             const read_snum = (kind) => {
@@ -2623,21 +2633,20 @@ var $;
                 else {
                     $mol_fail(new Error('Unsupported snum', { cause: { num } }));
                 }
+                stream.push(res);
                 return res;
             };
             const read_text = (kind) => {
                 const len = read_unum(kind);
                 const [text, bytes] = $mol_charset_decode_from(buffer, pack.byteOffset + pos, len);
                 pos += bytes;
-                if (text.length)
-                    stream.push(text);
+                stream.push(text);
                 return text;
             };
             const read_buffer = (len, TypedArray) => {
                 const bin = new TypedArray(buffer.slice(pos, pos + len).buffer);
                 pos += len;
-                if (len)
-                    stream.push(bin);
+                stream.push(bin);
                 return bin;
             };
             const read_blob = (kind) => {
@@ -2664,8 +2673,7 @@ var $;
                 const list = new Array(len);
                 for (let i = 0; i < len; ++i)
                     list[i] = read_vary();
-                if (len)
-                    stream.push(list);
+                stream.push(list);
                 return list;
             };
             const read_link = (kind) => {
@@ -2693,8 +2701,7 @@ var $;
                     for (let i = 0; i < len; ++i)
                         obj[keys[i]] = vals[i];
                 }
-                if (vals.length)
-                    stream.push(obj);
+                stream.push(obj);
                 return obj;
             };
             const read_spec = (kind) => {
@@ -2713,16 +2720,19 @@ var $;
                         return undefined;
                     case $mol_vary_spec.fp64: {
                         const val = pack.getFloat64(++pos, true);
+                        stream.push(val);
                         pos += 8;
                         return val;
                     }
                     case $mol_vary_spec.fp32: {
                         const val = pack.getFloat32(++pos, true);
+                        stream.push(val);
                         pos += 4;
                         return val;
                     }
                     case $mol_vary_spec.fp16: {
                         const val = pack.getFloat16(++pos, true);
+                        stream.push(val);
                         pos += 2;
                         return val;
                     }

package/node.test.js

@@ -242,15 +242,15 @@ var $;
 "use strict";
 var $;
 (function ($) {
-    const catched = new WeakMap();
+    const catched = new WeakSet();
     function $mol_fail_catch(error) {
         if (typeof error !== 'object')
             return false;
         if ($mol_promise_like(error))
             $mol_fail_hidden(error);
-        if (catched.get(error))
+        if (catched.has(error))
             return false;
-        catched.set(error, true);
+        catched.add(error);
         return true;
     }
     $.$mol_fail_catch = $mol_fail_catch;
@@ -2352,22 +2352,18 @@ var $;
             const release = (size) => {
                 capacity -= size;
             };
-            const dump_bint = (val) => {
-                const buf = $mol_bigint_encode(val);
-                acquire(buf.byteLength - 7);
-                if (buf.byteLength > 264)
-                    $mol_fail(new Error('Number too high', { cause: { val } }));
-                buffer[pos++] = -$mol_vary_len.LA;
-                buffer[pos++] = buf.byteLength - 9;
-                buffer.set(buf, pos);
-                pos += buf.byteLength;
-            };
             const dump_unum = (tip, val) => {
                 if (val < $mol_vary_len.L1) {
                     buffer[pos++] = tip | Number(val);
                     release(8);
+                    return;
+                }
+                if (tip == $mol_vary_tip.uint) {
+                    const offset = offsets.get(val);
+                    if (offset !== undefined)
+                        return dump_unum($mol_vary_tip.link, offset);
                 }
-                else if (val < 2 ** 8) {
+                if (val < 2 ** 8) {
                     buffer[pos++] = tip | $mol_vary_len.L1;
                     buffer[pos++] = Number(val);
                     release(7);
@@ -2392,13 +2388,19 @@ var $;
                 else {
                     dump_bint(val);
                 }
+                if (tip == $mol_vary_tip.uint)
+                    offsets.set(val, offsets.size);
             };
             const dump_snum = (val) => {
                 if (val > -$mol_vary_len.L1) {
                     buffer[pos++] = Number(val);
                     release(8);
+                    return;
                 }
-                else if (val >= -(2 ** 7)) {
+                const offset = offsets.get(val);
+                if (offset !== undefined)
+                    return dump_unum($mol_vary_tip.link, offset);
+                if (val >= -(2 ** 7)) {
                     buffer[pos++] = -$mol_vary_len.L1;
                     buffer[pos++] = Number(val);
                     release(7);
@@ -2423,28 +2425,43 @@ var $;
                 else {
                     dump_bint(val);
                 }
+                offsets.set(val, offsets.size);
+            };
+            const dump_bint = (val) => {
+                const buf = $mol_bigint_encode(val);
+                if (buf.byteLength > 264)
+                    $mol_fail(new Error('Number too high', { cause: { val } }));
+                acquire(buf.byteLength - 7);
+                buffer[pos++] = -$mol_vary_len.LA;
+                buffer[pos++] = buf.byteLength - 9;
+                buffer.set(buf, pos);
+                pos += buf.byteLength;
+            };
+            const dump_float = (val) => {
+                const offset = offsets.get(val);
+                if (offset !== undefined)
+                    return dump_unum($mol_vary_tip.link, offset);
+                buffer[pos++] = $mol_vary_spec.fp64;
+                pack.setFloat64(pos, val, true);
+                pos += 8;
+                offsets.set(val, offsets.size);
             };
             const dump_string = (val) => {
-                if (val.length) {
-                    const offset = offsets.get(val);
-                    if (offset !== undefined)
-                        return dump_unum($mol_vary_tip.link, offset);
-                }
+                const offset = offsets.get(val);
+                if (offset !== undefined)
+                    return dump_unum($mol_vary_tip.link, offset);
                 dump_unum($mol_vary_tip.text, val.length);
                 acquire(val.length * 3);
                 const len = $mol_charset_encode_to(val, buffer, pos);
                 pos += len;
                 release(val.length * 3 - len);
-                if (val.length)
-                    offsets.set(val, offsets.size);
+                offsets.set(val, offsets.size);
                 return;
             };
             const dump_buffer = (val) => {
-                if (val.byteLength) {
-                    const offset = offsets.get(val);
-                    if (offset !== undefined)
-                        return dump_unum($mol_vary_tip.link, offset);
-                }
+                const offset = offsets.get(val);
+                if (offset !== undefined)
+                    return dump_unum($mol_vary_tip.link, offset);
                 dump_unum($mol_vary_tip.blob, val.byteLength);
                 if (val instanceof Uint8Array)
                     buffer[pos++] = $mol_vary_tip.uint | $mol_vary_len.L1;
@@ -2474,21 +2491,17 @@ var $;
                 acquire(val.byteLength);
                 buffer.set(src, pos);
                 pos += val.byteLength;
-                if (val.byteLength)
-                    offsets.set(val, offsets.size);
+                offsets.set(val, offsets.size);
             };
             const dump_list = (val) => {
-                if (val.length) {
-                    const offset = offsets.get(val);
-                    if (offset !== undefined)
-                        return dump_unum($mol_vary_tip.link, offset);
-                }
+                const offset = offsets.get(val);
+                if (offset !== undefined)
+                    return dump_unum($mol_vary_tip.link, offset);
                 dump_unum($mol_vary_tip.list, val.length);
                 acquire(val.length * 9);
                 for (const item of val)
                     dump(item);
-                if (val.length)
-                    offsets.set(val, offsets.size);
+                offsets.set(val, offsets.size);
             };
             const dump_object = (val) => {
                 const offset = offsets.get(val);
@@ -2502,8 +2515,7 @@ var $;
                     dump(item);
                 for (const item of vals)
                     dump(item);
-                if (vals.length)
-                    offsets.set(val, offsets.size);
+                offsets.set(val, offsets.size);
             };
             const dump = (val) => {
                 switch (typeof val) {
@@ -2518,12 +2530,8 @@ var $;
                         return;
                     }
                     case 'number': {
-                        if (!Number.isInteger(val)) {
-                            buffer[pos++] = $mol_vary_spec.fp64;
-                            pack.setFloat64(pos, val, true);
-                            pos += 8;
-                            return;
-                        }
+                        if (!Number.isInteger(val))
+                            return dump_float(val);
                     }
                     case 'bigint': {
                         if (val < 0) {
@@ -2582,6 +2590,8 @@ var $;
                 else {
                     $mol_fail(new Error('Unsupported unum', { cause: { num } }));
                 }
+                if ((kind & 0b111_00000) === $mol_vary_tip.uint)
+                    stream.push(res);
                 return res;
             };
             const read_snum = (kind) => {
@@ -2614,21 +2624,20 @@ var $;
                 else {
                     $mol_fail(new Error('Unsupported snum', { cause: { num } }));
                 }
+                stream.push(res);
                 return res;
             };
             const read_text = (kind) => {
                 const len = read_unum(kind);
                 const [text, bytes] = $mol_charset_decode_from(buffer, pack.byteOffset + pos, len);
                 pos += bytes;
-                if (text.length)
-                    stream.push(text);
+                stream.push(text);
                 return text;
             };
             const read_buffer = (len, TypedArray) => {
                 const bin = new TypedArray(buffer.slice(pos, pos + len).buffer);
                 pos += len;
-                if (len)
-                    stream.push(bin);
+                stream.push(bin);
                 return bin;
             };
             const read_blob = (kind) => {
@@ -2655,8 +2664,7 @@ var $;
                 const list = new Array(len);
                 for (let i = 0; i < len; ++i)
                     list[i] = read_vary();
-                if (len)
-                    stream.push(list);
+                stream.push(list);
                 return list;
             };
             const read_link = (kind) => {
@@ -2684,8 +2692,7 @@ var $;
                     for (let i = 0; i < len; ++i)
                         obj[keys[i]] = vals[i];
                 }
-                if (vals.length)
-                    stream.push(obj);
+                stream.push(obj);
                 return obj;
             };
             const read_spec = (kind) => {
@@ -2704,16 +2711,19 @@ var $;
                         return undefined;
                     case $mol_vary_spec.fp64: {
                         const val = pack.getFloat64(++pos, true);
+                        stream.push(val);
                         pos += 8;
                         return val;
                     }
                     case $mol_vary_spec.fp32: {
                         const val = pack.getFloat32(++pos, true);
+                        stream.push(val);
                         pos += 4;
                         return val;
                     }
                     case $mol_vary_spec.fp16: {
                         const val = pack.getFloat16(++pos, true);
+                        stream.push(val);
                         pos += 2;
                         return val;
                     }
@@ -4921,6 +4931,13 @@ var $;
                 const box = [seven];
                 check([box, box, seven], [list | 3, list | 1, list | 1, 7, link | 1, link | 0]);
             },
+            "vary pack dedup uint"($) {
+                check([28, 28], [list | 2, uint | L1, 28, link | 0]);
+                check([2n ** 64n, 2n ** 64n], [list | 2, sint | -LA, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, link | 0]);
+            },
+            "vary pack dedup float"($) {
+                check([1.5, 1.5], [list | 2, fp64, ...new Uint8Array(new Float64Array([1.5]).buffer), link | 0]);
+            },
             "vary pack text"($) {
                 check('foo', [text | 3, ...str('foo')]);
                 const long = 'abcdefghijklmnopqrstuvwxyzЖЫ';