mol_vary 0.0.88 → 0.0.90

package/web.mjs

@@ -28,6 +28,16 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var $ = ( typeof module === 'object' ) ? ( module['export'+'s'] = globalThis ) : globalThis
 $.$$ = $
 
+;
+"use strict";
+var $;
+(function ($) {
+    function $mol_fail(error) {
+        throw error;
+    }
+    $.$mol_fail = $mol_fail;
+})($ || ($ = {}));
+
 ;
 "use strict";
 var $;
@@ -50,16 +60,6 @@ var $;
     $.$mol_bigint_encode = $mol_bigint_encode;
 })($ || ($ = {}));
 
-;
-"use strict";
-var $;
-(function ($) {
-    function $mol_fail(error) {
-        throw error;
-    }
-    $.$mol_fail = $mol_fail;
-})($ || ($ = {}));
-
 ;
 "use strict";
 var $;
@@ -160,59 +160,6 @@ var $;
     $.$mol_charset_decode = $mol_charset_decode;
 })($ || ($ = {}));
 
-;
-"use strict";
-var $;
-(function ($) {
-    function $mol_charset_decode_from(buffer, from, count) {
-        const codes = [];
-        let pos = from;
-        while (pos < buffer.length && codes.length < count) {
-            const byte1 = buffer[pos++];
-            if (byte1 <= 0x7F) {
-                codes.push(byte1);
-            }
-            else if ((byte1 & 0xE0) === 0xC0) {
-                if (pos >= buffer.length)
-                    break;
-                const byte2 = buffer[pos++];
-                const code = ((byte1 & 0x1F) << 6) | (byte2 & 0x3F);
-                codes.push(code);
-            }
-            else if ((byte1 & 0xF0) === 0xE0) {
-                if (pos + 1 >= buffer.length)
-                    break;
-                const byte2 = buffer[pos++];
-                const byte3 = buffer[pos++];
-                const code = ((byte1 & 0x0F) << 12) | ((byte2 & 0x3F) << 6) | (byte3 & 0x3F);
-                codes.push(code);
-            }
-            else if ((byte1 & 0xF8) === 0xF0) {
-                if (pos + 2 >= buffer.length)
-                    break;
-                const byte2 = buffer[pos++];
-                const byte3 = buffer[pos++];
-                const byte4 = buffer[pos++];
-                let code = ((byte1 & 0x07) << 18) | ((byte2 & 0x3F) << 12) | ((byte3 & 0x3F) << 6) | (byte4 & 0x3F);
-                if (code > 0xFFFF) {
-                    code -= 0x10000;
-                    const hi = 0xD800 + (code >> 10);
-                    const lo = 0xDC00 + (code & 0x3FF);
-                    codes.push(hi, lo);
-                }
-                else {
-                    codes.push(code);
-                }
-            }
-            else {
-                codes.push(0xFFFD);
-            }
-        }
-        return [String.fromCharCode(...codes), pos - from];
-    }
-    $.$mol_charset_decode_from = $mol_charset_decode_from;
-})($ || ($ = {}));
-
 ;
 "use strict";
 var $;
@@ -323,8 +270,21 @@ var $;
             const release = (size) => {
                 capacity -= size;
             };
-            const dump_unum = (tip, val) => {
-                if (val < $mol_vary_len.L1) {
+            const calc_size = (val) => {
+                if (val < $mol_vary_len.L1)
+                    return 1;
+                if (val < 2 ** 8)
+                    return 2;
+                if (val < 2 ** 16)
+                    return 3;
+                if (val < 2 ** 32)
+                    return 5;
+                if (val < 2n ** 64n)
+                    return 9;
+                return $mol_fail(new Error('Too large number'));
+            };
+            const dump_unum = (tip, val, max = val) => {
+                if (max < $mol_vary_len.L1) {
                     this.array[pos++] = tip | Number(val);
                     release(8);
                     return;
@@ -334,24 +294,24 @@ var $;
                     if (offset !== undefined)
                         return dump_unum($mol_vary_tip.link, offset);
                 }
-                if (val < 2 ** 8) {
+                if (max < 2 ** 8) {
                     this.array[pos++] = tip | $mol_vary_len.L1;
                     this.array[pos++] = Number(val);
                     release(7);
                 }
-                else if (val < 2 ** 16) {
+                else if (max < 2 ** 16) {
                     this.array[pos++] = tip | $mol_vary_len.L2;
                     this.buffer.setUint16(pos, Number(val), true);
                     pos += 2;
                     release(6);
                 }
-                else if (val < 2 ** 32) {
+                else if (max < 2 ** 32) {
                     this.array[pos++] = tip | $mol_vary_len.L4;
                     this.buffer.setUint32(pos, Number(val), true);
                     pos += 4;
                     release(4);
                 }
-                else if (val < 2n ** 64n) {
+                else if (max < 2n ** 64n) {
                     this.array[pos++] = tip | $mol_vary_len.L8;
                     this.buffer.setBigUint64(pos, BigInt(val), true);
                     pos += 8;
@@ -422,11 +382,13 @@ var $;
                 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, this.array, pos);
+                const len_max = val.length * 3;
+                const len_size = calc_size(len_max);
+                acquire(len_max);
+                const len = $mol_charset_encode_to(val, this.array, pos + len_size);
+                dump_unum($mol_vary_tip.text, len, len_max);
                 pos += len;
-                release(val.length * 3 - len);
+                release(len_max - len);
                 offsets.set(val, offsets.size);
                 return;
             };
@@ -632,8 +594,8 @@ var $;
             };
             const read_text = (kind) => {
                 const len = read_unum(kind);
-                const [text, bytes] = $mol_charset_decode_from(array, pos, len);
-                pos += bytes;
+                const text = $mol_charset_decode(new Uint8Array(array.buffer, array.byteOffset + pos, len));
+                pos += len;
                 stream.push(text);
                 return text;
             };

package/web.test.js

@@ -1410,32 +1410,6 @@ var $;
     });
 })($ || ($ = {}));
 
-;
-"use strict";
-var $;
-(function ($) {
-    $mol_test({
-        'encode empty'() {
-            $mol_assert_equal($mol_charset_decode_from(new Uint8Array([]), 0, 0), ['', 0]);
-        },
-        'encode 1 octet'() {
-            $mol_assert_equal($mol_charset_decode_from(new Uint8Array([0x46]), 0, 1), ['F', 1]);
-        },
-        'encode 2 octet'() {
-            $mol_assert_equal($mol_charset_decode_from(new Uint8Array([0xd0, 0x91]), 0, 1), ['Б', 2]);
-        },
-        'encode 3 octet'() {
-            $mol_assert_equal($mol_charset_decode_from(new Uint8Array([0xe0, 0xa4, 0xb9]), 0, 1), ['ह', 3]);
-        },
-        'encode 4 octet'() {
-            $mol_assert_equal($mol_charset_decode_from(new Uint8Array([0xf0, 0x90, 0x8d, 0x88]), 0, 1), ['𐍈', 4]);
-        },
-        'encode surrogate pair'() {
-            $mol_assert_equal($mol_charset_decode_from(new Uint8Array([0xf0, 0x9f, 0x98, 0x80]), 0, 2), ['😀', 4]);
-        },
-    });
-})($ || ($ = {}));
-
 ;
 "use strict";
 var $;
@@ -1679,8 +1653,11 @@ var $;
             },
             "vary pack text"($) {
                 check(['foo'], [text | 3, ...str('foo')]);
-                const long = 'abcdefghijklmnopqrstuvwxyzЖЫ';
-                check([long], [text | L1, 28, ...str(long)]);
+                check(['абв'], [text | 6, ...str('абв')]);
+                const long_lat = 'abcdefghijklmnopqrst';
+                check([long_lat], [text | L1, 20, ...str(long_lat)]);
+                const long_cyr = 'абвгдеёжзийклмнопрст';
+                check([long_cyr], [text | L1, 40, ...str(long_cyr)]);
             },
             "vary pack dedup text"($) {
                 check([["f", "f"]], [list | 2, text | 1, ...str('f'), link | 0]);