@tracecode/harness 0.5.0 → 0.5.1

package/dist/index.js

@@ -1415,7 +1415,7 @@ def _serialize(obj, depth=0, node_refs=None):
         except TypeError:
             sorted_vals = [_serialize(x, depth + 1, node_refs) for x in obj]
         return {"__type__": "set", "values": sorted_vals}
-    elif (hasattr(obj, 'val') or hasattr(obj, 'value')) and (hasattr(obj, 'left') or hasattr(obj, 'right')):
+    elif isinstance(obj, TreeNode):
         obj_ref = id(obj)
         if obj_ref in node_refs:
             return {"__ref__": node_refs[obj_ref]}
@@ -1431,7 +1431,7 @@ def _serialize(obj, depth=0, node_refs=None):
         if hasattr(obj, 'right'):
             result["right"] = _serialize(obj.right, depth + 1, node_refs)
         return result
-    elif (hasattr(obj, 'val') or hasattr(obj, 'value')) and hasattr(obj, 'next'):
+    elif isinstance(obj, ListNode):
         obj_ref = id(obj)
         if obj_ref in node_refs:
             return {"__ref__": node_refs[obj_ref]}
@@ -1509,14 +1509,14 @@ def _serialize(obj, depth=0):
             return {"__type__": "set", "values": sorted([_serialize(x, depth + 1) for x in obj])}
         except TypeError:
             return {"__type__": "set", "values": [_serialize(x, depth + 1) for x in obj]}
-    elif (hasattr(obj, 'val') or hasattr(obj, 'value')) and (hasattr(obj, 'left') or hasattr(obj, 'right')):
+    elif isinstance(obj, TreeNode):
         result = {"__type__": "TreeNode", "val": _serialize(getattr(obj, 'val', getattr(obj, 'value', None)), depth + 1)}
         if hasattr(obj, 'left'):
             result["left"] = _serialize(obj.left, depth + 1)
         if hasattr(obj, 'right'):
             result["right"] = _serialize(obj.right, depth + 1)
         return result
-    elif (hasattr(obj, 'val') or hasattr(obj, 'value')) and hasattr(obj, 'next'):
+    elif isinstance(obj, ListNode):
         result = {"__type__": "ListNode", "val": _serialize(getattr(obj, 'val', getattr(obj, 'value', None)), depth + 1)}
         result["next"] = _serialize(obj.next, depth + 1)
         return result
@@ -1591,14 +1591,14 @@ def _serialize(obj, depth=0):
             return {"__type__": "set", "values": sorted([_serialize(x, depth + 1) for x in obj])}
         except TypeError:
             return {"__type__": "set", "values": [_serialize(x, depth + 1) for x in obj]}
-    elif hasattr(obj, 'val') and (hasattr(obj, 'left') or hasattr(obj, 'right')):
+    elif isinstance(obj, TreeNode):
         result = {"__type__": "TreeNode", "val": _serialize(getattr(obj, 'val', None), depth + 1)}
         if hasattr(obj, 'left'):
             result["left"] = _serialize(obj.left, depth + 1)
         if hasattr(obj, 'right'):
             result["right"] = _serialize(obj.right, depth + 1)
         return result
-    elif hasattr(obj, 'val') and hasattr(obj, 'next'):
+    elif isinstance(obj, ListNode):
         result = {"__type__": "ListNode", "val": _serialize(getattr(obj, 'val', None), depth + 1)}
         result["next"] = _serialize(obj.next, depth + 1)
         return result
@@ -1630,14 +1630,14 @@ def _serialize(obj, depth=0):
             return {"__type__": "set", "values": sorted([_serialize(x, depth + 1) for x in obj])}
         except TypeError:
             return {"__type__": "set", "values": [_serialize(x, depth + 1) for x in obj]}
-    elif (hasattr(obj, 'val') or hasattr(obj, 'value')) and (hasattr(obj, 'left') or hasattr(obj, 'right')):
+    elif isinstance(obj, TreeNode):
         result = {"__type__": "TreeNode", "val": _serialize(getattr(obj, 'val', getattr(obj, 'value', None)), depth + 1)}
         if hasattr(obj, 'left'):
             result["left"] = _serialize(obj.left, depth + 1)
         if hasattr(obj, 'right'):
             result["right"] = _serialize(obj.right, depth + 1)
         return result
-    elif (hasattr(obj, 'val') or hasattr(obj, 'value')) and hasattr(obj, 'next'):
+    elif isinstance(obj, ListNode):
         result = {"__type__": "ListNode", "val": _serialize(getattr(obj, 'val', getattr(obj, 'value', None)), depth + 1)}
         result["next"] = _serialize(obj.next, depth + 1)
         return result
@@ -1865,7 +1865,7 @@ def _serialize(obj, depth=0, node_refs=None):
         except TypeError:
             sorted_vals = [_serialize(x, depth + 1, node_refs) for x in obj]
         return {"__type__": "set", "values": sorted_vals}
-    elif (hasattr(obj, 'val') or hasattr(obj, 'value')) and (hasattr(obj, 'left') or hasattr(obj, 'right')):
+    elif isinstance(obj, TreeNode):
         obj_ref = id(obj)
         if obj_ref in node_refs:
             return {"__ref__": node_refs[obj_ref]}
@@ -1881,7 +1881,7 @@ def _serialize(obj, depth=0, node_refs=None):
         if hasattr(obj, 'right'):
             result["right"] = _serialize(obj.right, depth + 1, node_refs)
         return result
-    elif (hasattr(obj, 'val') or hasattr(obj, 'value')) and hasattr(obj, 'next'):
+    elif isinstance(obj, ListNode):
         obj_ref = id(obj)
         if obj_ref in node_refs:
             return {"__ref__": node_refs[obj_ref]}
@@ -1959,14 +1959,14 @@ def _serialize(obj, depth=0):
             return {"__type__": "set", "values": sorted([_serialize(x, depth + 1) for x in obj])}
         except TypeError:
             return {"__type__": "set", "values": [_serialize(x, depth + 1) for x in obj]}
-    elif (hasattr(obj, 'val') or hasattr(obj, 'value')) and (hasattr(obj, 'left') or hasattr(obj, 'right')):
+    elif isinstance(obj, TreeNode):
         result = {"__type__": "TreeNode", "val": _serialize(getattr(obj, 'val', getattr(obj, 'value', None)), depth + 1)}
         if hasattr(obj, 'left'):
             result["left"] = _serialize(obj.left, depth + 1)
         if hasattr(obj, 'right'):
             result["right"] = _serialize(obj.right, depth + 1)
         return result
-    elif (hasattr(obj, 'val') or hasattr(obj, 'value')) and hasattr(obj, 'next'):
+    elif isinstance(obj, ListNode):
         result = {"__type__": "ListNode", "val": _serialize(getattr(obj, 'val', getattr(obj, 'value', None)), depth + 1)}
         result["next"] = _serialize(obj.next, depth + 1)
         return result
@@ -2041,14 +2041,14 @@ def _serialize(obj, depth=0):
             return {"__type__": "set", "values": sorted([_serialize(x, depth + 1) for x in obj])}
         except TypeError:
             return {"__type__": "set", "values": [_serialize(x, depth + 1) for x in obj]}
-    elif hasattr(obj, 'val') and (hasattr(obj, 'left') or hasattr(obj, 'right')):
+    elif isinstance(obj, TreeNode):
         result = {"__type__": "TreeNode", "val": _serialize(getattr(obj, 'val', None), depth + 1)}
         if hasattr(obj, 'left'):
             result["left"] = _serialize(obj.left, depth + 1)
         if hasattr(obj, 'right'):
             result["right"] = _serialize(obj.right, depth + 1)
         return result
-    elif hasattr(obj, 'val') and hasattr(obj, 'next'):
+    elif isinstance(obj, ListNode):
         result = {"__type__": "ListNode", "val": _serialize(getattr(obj, 'val', None), depth + 1)}
         result["next"] = _serialize(obj.next, depth + 1)
         return result
@@ -2142,16 +2142,17 @@ function createConsoleProxy(output) {
 }
 function isLikelyTreeNodeValue(value) {
   if (!value || typeof value !== "object" || Array.isArray(value)) return false;
-  const hasValue = "val" in value || "value" in value;
-  const hasTreeLinks = "left" in value || "right" in value;
-  return hasValue && hasTreeLinks;
+  const record = value;
+  if (record.__type__ === "TreeNode") return true;
+  const ctor = value.constructor;
+  return ctor?.name === "TreeNode";
 }
 function isLikelyListNodeValue(value) {
   if (!value || typeof value !== "object" || Array.isArray(value)) return false;
-  const hasValue = "val" in value || "value" in value;
-  const hasTreeLinks = "left" in value || "right" in value;
-  const hasListLinks = "next" in value || "prev" in value;
-  return hasValue && hasListLinks && !hasTreeLinks;
+  const record = value;
+  if (record.__type__ === "ListNode") return true;
+  const ctor = value.constructor;
+  return ctor?.name === "ListNode";
 }
 function getCustomClassName(value) {
   if (!value || typeof value !== "object" || Array.isArray(value)) return null;
@@ -2206,22 +2207,25 @@ function serializeValue(value, depth = 0, seen = /* @__PURE__ */ new WeakSet(),
       const nodePrefix = isTree ? "tree" : "list";
       const nodeId = `${nodePrefix}-${nodeRefState.nextId++}`;
       nodeRefState.ids.set(objectValue, nodeId);
-      if (isTree) {
-        return {
-          __type__: "TreeNode",
-          __id__: nodeId,
-          val: serializeValue(nodeValue.val ?? nodeValue.value ?? null, depth + 1, seen, nodeRefState),
-          left: serializeValue(nodeValue.left ?? null, depth + 1, seen, nodeRefState),
-          right: serializeValue(nodeValue.right ?? null, depth + 1, seen, nodeRefState)
-        };
-      }
-      return {
+      const out2 = isTree ? {
+        __type__: "TreeNode",
+        __id__: nodeId,
+        val: serializeValue(nodeValue.val ?? nodeValue.value ?? null, depth + 1, seen, nodeRefState),
+        left: serializeValue(nodeValue.left ?? null, depth + 1, seen, nodeRefState),
+        right: serializeValue(nodeValue.right ?? null, depth + 1, seen, nodeRefState)
+      } : {
         __type__: "ListNode",
         __id__: nodeId,
         val: serializeValue(nodeValue.val ?? nodeValue.value ?? null, depth + 1, seen, nodeRefState),
         next: serializeValue(nodeValue.next ?? null, depth + 1, seen, nodeRefState),
         ..."prev" in nodeValue ? { prev: serializeValue(nodeValue.prev ?? null, depth + 1, seen, nodeRefState) } : {}
       };
+      const skipped = isTree ? /* @__PURE__ */ new Set(["__id__", "__type__", "__class__", "val", "value", "left", "right"]) : /* @__PURE__ */ new Set(["__id__", "__type__", "__class__", "val", "value", "next", "prev"]);
+      for (const [k, v] of Object.entries(nodeValue)) {
+        if (skipped.has(k)) continue;
+        out2[k] = serializeValue(v, depth + 1, seen, nodeRefState);
+      }
+      return out2;
     }
     const customClassName = getCustomClassName(value);
     if (customClassName) {
@@ -2385,21 +2389,31 @@ function materializeTreeInput(value) {
   }
   const record = value;
   if (isLikelyTreeNodeValue(record)) {
-    return {
+    const node = {
       val: record.val ?? record.value ?? null,
       value: record.val ?? record.value ?? null,
       left: materializeTreeInput(record.left ?? null),
       right: materializeTreeInput(record.right ?? null)
     };
+    for (const [key, nested] of Object.entries(record)) {
+      if (key === "__id__" || key === "__type__" || key === "val" || key === "value" || key === "left" || key === "right") continue;
+      node[key] = materializeTreeInput(nested);
+    }
+    return node;
   }
   const taggedRecord = value;
   if (taggedRecord.__type__ === "TreeNode") {
-    return {
+    const node = {
       val: taggedRecord.val ?? taggedRecord.value ?? null,
       value: taggedRecord.val ?? taggedRecord.value ?? null,
       left: materializeTreeInput(taggedRecord.left ?? null),
       right: materializeTreeInput(taggedRecord.right ?? null)
     };
+    for (const [key, nested] of Object.entries(taggedRecord)) {
+      if (key === "__id__" || key === "__type__" || key === "val" || key === "value" || key === "left" || key === "right") continue;
+      node[key] = materializeTreeInput(nested);
+    }
+    return node;
   }
   return value;
 }
@@ -2443,6 +2457,10 @@ function materializeListInput(value, refs = /* @__PURE__ */ new Map(), materiali
       refs.set(taggedRecord.__id__, node);
     }
     node.next = materializeListInput(taggedRecord.next ?? null, refs, materialized);
+    for (const [key, nested] of Object.entries(taggedRecord)) {
+      if (key === "__id__" || key === "__type__" || key === "__class__" || key === "val" || key === "value" || key === "next") continue;
+      node[key] = materializeListInput(nested, refs, materialized);
+    }
     return node;
   }
   return value;