mol_vary 0.0.21 → 0.0.23

package/web.mjs

@@ -117,27 +117,27 @@ var $;
 var $;
 (function ($) {
     function $mol_charset_decode_from(buffer, from, count) {
-        let res = '';
+        const codes = [];
         let pos = from;
-        while (pos < buffer.length && res.length < count) {
+        while (pos < buffer.length && codes.length < count) {
             const byte1 = buffer[pos++];
             if (byte1 <= 0x7F) {
-                res += String.fromCharCode(byte1);
+                codes.push(byte1);
             }
             else if ((byte1 & 0xE0) === 0xC0) {
                 if (pos >= buffer.length)
                     break;
                 const byte2 = buffer[pos++];
-                let code = ((byte1 & 0x1F) << 6) | (byte2 & 0x3F);
-                res += String.fromCharCode(code);
+                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++];
-                let code = ((byte1 & 0x0F) << 12) | ((byte2 & 0x3F) << 6) | (byte3 & 0x3F);
-                res += String.fromCharCode(code);
+                const code = ((byte1 & 0x0F) << 12) | ((byte2 & 0x3F) << 6) | (byte3 & 0x3F);
+                codes.push(code);
             }
             else if ((byte1 & 0xF8) === 0xF0) {
                 if (pos + 2 >= buffer.length)
@@ -150,21 +150,41 @@ var $;
                     code -= 0x10000;
                     const hi = 0xD800 + (code >> 10);
                     const lo = 0xDC00 + (code & 0x3FF);
-                    res += String.fromCharCode(hi, lo);
+                    codes.push(hi, lo);
                 }
                 else {
-                    res += String.fromCharCode(code);
+                    codes.push(code);
                 }
             }
             else {
-                res += '�';
+                codes.push(0xFFFD);
             }
         }
-        return [res, pos - from];
+        return [String.fromCharCode(...codes), pos - from];
     }
     $.$mol_charset_decode_from = $mol_charset_decode_from;
 })($ || ($ = {}));
 
+;
+"use strict";
+var $;
+(function ($) {
+})($ || ($ = {}));
+
+;
+"use strict";
+var $;
+(function ($) {
+    $.$mol_dom_context = self;
+})($ || ($ = {}));
+
+;
+"use strict";
+var $;
+(function ($) {
+    $.$mol_dom = $mol_dom_context;
+})($ || ($ = {}));
+
 ;
 "use strict";
 var $;
@@ -276,7 +296,7 @@ var $;
                     pos += 8;
                 }
                 else {
-                    $mol_fail(new Error('Number too high', { cause: val }));
+                    $mol_fail(new Error('Number too high', { cause: { val } }));
                 }
             };
             const dump_string = (val) => {
@@ -347,10 +367,8 @@ var $;
                 const offset = offsets.get(val);
                 if (offset !== undefined)
                     return dump_unum($mol_vary_tip.link, offset);
-                const proto = Reflect.getPrototypeOf(val);
-                const lean = this.leanes.get(proto);
-                const keys = lean ? this.keys.get(proto) : Object.keys(val);
-                const vals = lean ? lean(val) : Object.values(val);
+                const keys = val[$.$mol_vary_keys] ?? Object.keys(val);
+                const vals = val[$.$mol_vary_lean]?.(val) ?? Object.values(val);
                 dump_unum($mol_vary_tip.tupl, vals.length);
                 acquire(vals.length * 2 * 9);
                 for (const item of keys)
@@ -589,22 +607,34 @@ var $;
             };
             return read_vary();
         }
-        static leanes = new Map();
-        static keys = new Map();
         static riches = new Map();
-        static type(keys, rich, lean) {
-            const obj = rich();
-            const proto = Reflect.getPrototypeOf(obj);
-            const shape = JSON.stringify(keys);
-            this.leanes.set(proto, lean);
-            this.keys.set(proto, keys);
-            this.riches.set(shape, rich);
+        static type(Class, keys, lean, rich) {
+            this.riches.set(JSON.stringify(keys), rich);
+            Class.prototype[$.$mol_vary_lean] = lean;
+            Class.prototype[$.$mol_vary_keys] = keys;
         }
     }
     $.$mol_vary = $mol_vary;
-    $mol_vary.type(['keys', 'vals'], (keys = [], vals = []) => new Map(keys.map((k, i) => [k, vals[i]])), obj => [[...obj.keys()], [...obj.values()]]);
-    $mol_vary.type(['set'], (vals = []) => new Set(vals), obj => [[...obj.values()]]);
-    $mol_vary.type(['unix_time'], (ts = 0) => new Date(ts * 1000), obj => [obj.valueOf() / 1000]);
+    $.$mol_vary_lean = Symbol.for('$mol_vary_lean');
+    $.$mol_vary_keys = Symbol.for('$mol_vary_keys');
+    $mol_vary.type(Map, ['keys', 'vals'], obj => [[...obj.keys()], [...obj.values()]], (keys, vals) => new Map(keys.map((k, i) => [k, vals[i]])));
+    $mol_vary.type(Set, ['set'], obj => [[...obj.values()]], vals => new Set(vals));
+    $mol_vary.type(Date, ['unix_time'], obj => [obj.valueOf() / 1000], ts => new Date(ts * 1000));
+    $mol_vary.type($mol_dom.Element, ['elem', 'keys', 'vals', 'kids'], node => {
+        const attrs = [...node.attributes];
+        const kids = [...node.childNodes].map(kid => kid instanceof $mol_dom.Text ? kid.nodeValue : kid);
+        return [node.nodeName, attrs.map(attr => attr.nodeName), attrs.map(attr => attr.nodeValue), kids];
+    }, (name, keys, vals, kids) => {
+        const el = $mol_dom.document.createElement(name);
+        for (let i = 0; i < keys.length; ++i)
+            el.setAttribute(keys[i], vals[i]);
+        for (let kid of kids) {
+            if (typeof kid === 'string')
+                kid = $mol_dom.document.createTextNode(kid);
+            el.appendChild(kid);
+        }
+        return el;
+    });
 })($ || ($ = {}));
 
 

package/web.test.js

@@ -120,26 +120,6 @@ var $;
     $.$mol_test_complete = $mol_test_complete;
 })($ || ($ = {}));
 
-;
-"use strict";
-var $;
-(function ($) {
-})($ || ($ = {}));
-
-;
-"use strict";
-var $;
-(function ($) {
-    $.$mol_dom_context = self;
-})($ || ($ = {}));
-
-;
-"use strict";
-var $;
-(function ($) {
-    $.$mol_dom = $mol_dom_context;
-})($ || ($ = {}));
-
 ;
 "use strict";
 var $;
@@ -1634,6 +1614,34 @@ var $;
                 const date2 = new Date('2025-01-02T03:04:05.678');
                 check(date2, [tupl | 1, text | 9, ...str('unix_time'), fp64, ...new Uint8Array(new Float64Array([date2.valueOf() / 1000]).buffer)]);
             },
+            "vary pack Node"($) {
+                check($mol_jsx("span", null), [
+                    tupl | 4, text | 4, ...str('elem'), text | 4, ...str('keys'), text | 4, ...str('vals'), text | 4, ...str('kids'),
+                    text | 4, ...str('SPAN'), list | 0, list | 0, list | 0
+                ]);
+                check($mol_jsx("svg", null), [
+                    tupl | 4, text | 4, ...str('elem'), text | 4, ...str('keys'), text | 4, ...str('vals'), text | 4, ...str('kids'),
+                    text | 3, ...str('SVG'), list | 0, list | 0, list | 0
+                ]);
+                check($mol_jsx("span", { tabIndex: "0" }), [
+                    tupl | 4, text | 4, ...str('elem'), text | 4, ...str('keys'), text | 4, ...str('vals'), text | 4, ...str('kids'),
+                    text | 4, ...str('SPAN'), list | 1, text | 8, ...str('tabindex'), list | 1, text | 1, ...str('0'), list | 0
+                ]);
+                check($mol_jsx("span", null, "text"), [
+                    tupl | 4, text | 4, ...str('elem'), text | 4, ...str('keys'), text | 4, ...str('vals'), text | 4, ...str('kids'),
+                    text | 4, ...str('SPAN'), list | 0, list | 0, list | 1,
+                    text | 4, ...str('text')
+                ]);
+                check($mol_jsx("div", null,
+                    $mol_jsx("span", null),
+                    " "), [
+                    tupl | 4, text | 4, ...str('elem'), text | 4, ...str('keys'), text | 4, ...str('vals'), text | 4, ...str('kids'),
+                    text | 3, ...str('DIV'), list | 0, list | 0, list | 2,
+                    tupl | 4, link | 0, link | 1, link | 2, link | 3,
+                    text | 4, ...str('SPAN'), list | 0, list | 0, list | 0,
+                    text | 1, ...str(' '),
+                ]);
+            },
             "vary pack custom class"($) {
                 class Foo {
                     a;
@@ -1647,7 +1655,7 @@ var $;
                         return [this.a, this.b].values();
                     }
                 }
-                $mol_vary.type(['a', 'b'], (a = 0, b = 0) => new Foo(a, b), foo => [foo.a, foo.b]);
+                $mol_vary.type(Foo, ['a', 'b'], foo => [foo.a, foo.b], (a = 0, b = 0) => new Foo(a, b));
                 check(new Foo(1, 2), [tupl | 2, text | 1, ...str('a'), text | 1, ...str('b'), 1, 2]);
             },
         });