mol_vary 0.0.42 → 0.0.44

package/node.meta.tree

@@ -1,6 +1,6 @@
 \/
 	pack bun git \https://github.com/spleekz/mam_bun.git
-	pack gd git \https://github.com/giper-dev/gd.git
+	pack giper git \https://github.com/giper-dev/gd.git
 	pack hyoo git \https://github.com/hyoo-ru/mam_hyoo.git
 	pack iva git \https://github.com/thenesterov/mam_iva.git
 	pack jin git \https://github.com/nin-jin/mam_jin.git

package/node.mjs

@@ -2339,8 +2339,9 @@ var $;
         $mol_vary_spec[$mol_vary_spec["fp16"] = 'H'.charCodeAt(0)] = "fp16";
         $mol_vary_spec[$mol_vary_spec["fp32"] = 'S'.charCodeAt(0)] = "fp32";
         $mol_vary_spec[$mol_vary_spec["fp64"] = 'D'.charCodeAt(0)] = "fp64";
+        $mol_vary_spec[$mol_vary_spec["f128"] = 'Q'.charCodeAt(0)] = "f128";
+        $mol_vary_spec[$mol_vary_spec["f256"] = 'O'.charCodeAt(0)] = "f256";
     })($mol_vary_spec = $.$mol_vary_spec || ($.$mol_vary_spec = {}));
-    $.$mol_vary_lean = Symbol.for('$mol_vary_lean');
     const pojo_maker = (keys) => (vals) => {
         const obj = {};
         for (let i = 0; i < keys.length; ++i)
@@ -2348,6 +2349,7 @@ var $;
         return obj;
     };
     class $mol_vary_class extends Object {
+        lean_symbol = Symbol('$mol_vary_lean');
         array = new Uint8Array(256);
         buffer = new DataView(this.array.buffer);
         pack(data) {
@@ -2540,7 +2542,7 @@ var $;
                 const offset = offsets.get(val);
                 if (offset !== undefined)
                     return dump_unum($mol_vary_tip.link, offset);
-                const [keys, vals] = val[$.$mol_vary_lean]?.(val) ?? [shape(val), Object.values(val)];
+                const [keys, vals] = this.lean_find(val)?.(val) ?? [shape(val), Object.values(val)];
                 dump_unum($mol_vary_tip.tupl, vals.length);
                 acquire((vals.length + 1) * 9);
                 dump_list(keys);
@@ -2787,6 +2789,7 @@ var $;
         ]);
         room() {
             const room = new $mol_vary_class;
+            Object.setPrototypeOf(room, this);
             const index_clone = (map) => new Map([...map].map(([k, v]) => [k, k === null ? v : index_clone(v)]));
             room.rich_index = index_clone(this.rich_index);
             return room;
@@ -2802,9 +2805,18 @@ var $;
             }
             return node;
         }
+        lean_find(val) {
+            const lean = val[this.lean_symbol];
+            if (lean)
+                return lean;
+            const sup = Object.getPrototypeOf(this);
+            if (sup === Object.prototype)
+                return;
+            return sup.lean_find(val);
+        }
         type({ type, keys, rich, lean }) {
             this.rich_node(keys).set(null, rich);
-            type.prototype[$.$mol_vary_lean] = (val) => [keys, lean(val)];
+            type.prototype[this.lean_symbol] = (val) => [keys, lean(val)];
         }
     }
     $.$mol_vary_class = $mol_vary_class;

package/node.test.js

@@ -2330,8 +2330,9 @@ var $;
         $mol_vary_spec[$mol_vary_spec["fp16"] = 'H'.charCodeAt(0)] = "fp16";
         $mol_vary_spec[$mol_vary_spec["fp32"] = 'S'.charCodeAt(0)] = "fp32";
         $mol_vary_spec[$mol_vary_spec["fp64"] = 'D'.charCodeAt(0)] = "fp64";
+        $mol_vary_spec[$mol_vary_spec["f128"] = 'Q'.charCodeAt(0)] = "f128";
+        $mol_vary_spec[$mol_vary_spec["f256"] = 'O'.charCodeAt(0)] = "f256";
     })($mol_vary_spec = $.$mol_vary_spec || ($.$mol_vary_spec = {}));
-    $.$mol_vary_lean = Symbol.for('$mol_vary_lean');
     const pojo_maker = (keys) => (vals) => {
         const obj = {};
         for (let i = 0; i < keys.length; ++i)
@@ -2339,6 +2340,7 @@ var $;
         return obj;
     };
     class $mol_vary_class extends Object {
+        lean_symbol = Symbol('$mol_vary_lean');
         array = new Uint8Array(256);
         buffer = new DataView(this.array.buffer);
         pack(data) {
@@ -2531,7 +2533,7 @@ var $;
                 const offset = offsets.get(val);
                 if (offset !== undefined)
                     return dump_unum($mol_vary_tip.link, offset);
-                const [keys, vals] = val[$.$mol_vary_lean]?.(val) ?? [shape(val), Object.values(val)];
+                const [keys, vals] = this.lean_find(val)?.(val) ?? [shape(val), Object.values(val)];
                 dump_unum($mol_vary_tip.tupl, vals.length);
                 acquire((vals.length + 1) * 9);
                 dump_list(keys);
@@ -2778,6 +2780,7 @@ var $;
         ]);
         room() {
             const room = new $mol_vary_class;
+            Object.setPrototypeOf(room, this);
             const index_clone = (map) => new Map([...map].map(([k, v]) => [k, k === null ? v : index_clone(v)]));
             room.rich_index = index_clone(this.rich_index);
             return room;
@@ -2793,9 +2796,18 @@ var $;
             }
             return node;
         }
+        lean_find(val) {
+            const lean = val[this.lean_symbol];
+            if (lean)
+                return lean;
+            const sup = Object.getPrototypeOf(this);
+            if (sup === Object.prototype)
+                return;
+            return sup.lean_find(val);
+        }
         type({ type, keys, rich, lean }) {
             this.rich_node(keys).set(null, rich);
-            type.prototype[$.$mol_vary_lean] = (val) => [keys, lean(val)];
+            type.prototype[this.lean_symbol] = (val) => [keys, lean(val)];
         }
     }
     $.$mol_vary_class = $mol_vary_class;
@@ -4926,8 +4938,8 @@ var $;
         const str = $mol_charset_encode;
         function check(vary, ideal, Vary = $mol_vary) {
             const pack = Vary.pack(vary);
-            $mol_assert_equal(pack, new Uint8Array(ideal));
             $mol_assert_equal(Vary.take(pack), vary);
+            $mol_assert_equal(pack, new Uint8Array(ideal));
         }
         $mol_test({
             "vary pack logical"($) {
@@ -5104,7 +5116,7 @@ var $;
                     tupl | 2, list | 2, text | 6, ...str('target'), text | 4, ...str('text'), text | 3, ...str('foo'), text | 3, ...str('bar'),
                 ]);
             },
-            "vary pack custom class"($) {
+            "vary pack custom types in rooms"($) {
                 class Foo {
                     a;
                     b;
@@ -5125,7 +5137,7 @@ var $;
                     rich: ([summ, diff]) => new Foo((summ + diff) / 2, (summ - diff) / 2),
                 });
                 check(new Foo(4, 2), [tupl | 2, list | 2, text | 4, ...str('summ'), text | 4, ...str('diff'), 6, 2], Vary);
-                $mol_assert_equal($mol_vary.take($mol_vary.pack(new Foo(4, 2))), { summ: 6, diff: 2 });
+                $mol_assert_equal($mol_vary.take($mol_vary.pack(new Foo(4, 2))), { a: 4, b: 2 });
                 $mol_assert_equal(Vary.take(Vary.pack(new Map([[1, 2]]))), new Map([[1, 2]]));
             },
         });