feat: 优化 toMap 的循环引用处理逻辑

Author: HarlonWang

wrapper-android/src/androidTest/java/com/whl/quickjs/wrapper/QuickJSTest.java

@@ -1193,11 +1193,11 @@ public void testAsyncErrorInByteCode() {
     public void testObjectToMap() {
         try (QuickJSContext context = createContext()) {
             JSObject ret = (JSObject) context.evaluate("var a = {'a': '123', 'b': [1, 2]};a.c = a;a;");
-            assertEquals("{a=123, b=[1, 2]}", ret.toMap().toString());
+            assertEquals("{a=123, b=[1, 2], c=(this Map)}", ret.toMap().toString());
             ret.release();
 
             JSArray array = (JSArray) context.evaluate("var b = [{a: { c : 'xxx'}}, 2, 'qqq', 1.22]; b.push(b); b;");
-            assertEquals("[{a={c=xxx}}, 2, qqq, 1.22]", array.toArray().toString());
+            assertEquals("[{a={c=xxx}}, 2, qqq, 1.22, (this Collection)]", array.toArray().toString());
             array.release();
 
             JSObject emptyObj = (JSObject) context.evaluate("var a = { emptyArray: [] };a;");
@@ -1211,7 +1211,7 @@ public void testObjectToMap() {
     public void testObjectToMapFilter() {
         try (QuickJSContext context = createContext()) {
             HashMap<String, Object> map = context.getGlobalObject().toMap((key, pointer, extra) -> key.equals("Math") || key.equals("Infinity"));
-            assertEquals("{console={}, Reflect={}, NaN=NaN, JSON={}, Atomics={}, undefined=null}", map.toString());
+            assertEquals("{globalThis=(this Map), console={}, Reflect={}, NaN=NaN, JSON={}, Atomics={}, undefined=null}", map.toString());
         }
     }
 
@@ -1309,4 +1309,26 @@ public void testDynamicImport() {
         }
     }
 
+    @Test
+    public void testArraySameRefToMap() {
+        try (QuickJSContext context = createContext()){
+            JSObject ret = (JSObject) context.evaluate("const a = [7]\n" +
+                    "\n" +
+                    "const b = {\n" +
+                    "\tc: {\n" +
+                    "\t\td: a\n" +
+                    "\t},\n" +
+                    "\te: a,\n" +
+                    "\tg: null,\n" +
+                    "\tk: undefined\n" +
+                    "}\n" +
+                    "\n" +
+                    "b.f = b\n" +
+                    "\n" +
+                    "console.log(b)\n" +
+                    "b;");
+            assertEquals("{c={d=[7]}, e=[7], f=(this Map), g=null, k=null}", ret.toMap().toString());
+        }
+    }
+
 }

wrapper-java/src/main/java/com/whl/quickjs/wrapper/QuickJSArray.java

@@ -55,7 +55,7 @@ public ArrayList<Object> toArray(MapFilter filter) {
     @Override
     public ArrayList<Object> toArray(MapFilter filter, Object extra, MapCreator creator) {
         ArrayList<Object> arrayList = new ArrayList<>(length());
-        HashSet<Long> circulars = new HashSet<>();
+        HashMap<Long, Object> circulars = new HashMap<>();
         convertToMap(this, arrayList, circulars, filter, extra, creator);
         circulars.clear();
         return arrayList;

wrapper-java/src/main/java/com/whl/quickjs/wrapper/QuickJSObject.java

@@ -272,7 +272,7 @@ public HashMap<String, Object> toMap(MapFilter filter) {
     @Override
     public Map<String, Object> toMap(MapFilter filter, Object extra, MapCreator mapCreator) {
         Map<String, Object> objectMap = mapCreator.get();
-        HashSet<Long> circulars = new HashSet<>();
+        HashMap<Long, Object> circulars = new HashMap<>();
         convertToMap(this, objectMap, circulars, filter, extra, mapCreator);
         circulars.clear();
         return objectMap;
@@ -290,10 +290,12 @@ public ArrayList<Object> toArray(MapFilter filter) {
     }
 
     /**
-     * 注意点：循环引用的对象会被过滤掉
+     * 注意点：
+     * 1. 循环引用的对象会被过滤掉
+     * 2. 当 value 值为 undefined ，和 null 的处理逻辑一样，未做区分
      */
-    protected void convertToMap(Object target, Object map, HashSet<Long> circulars, MapFilter filter, Object extra, MapCreator mapCreator) {
-        circulars.add(((JSObject) target).getPointer());
+    protected void convertToMap(Object target, Object map, HashMap<Long, Object> circulars, MapFilter filter, Object extra, MapCreator mapCreator) {
+        circulars.put(((JSObject) target).getPointer(), map);
 
         boolean isArray = target instanceof JSArray;
         JSArray array = isArray ? (JSArray) target : ((JSObject) target).getNames();
@@ -313,8 +315,14 @@ protected void convertToMap(Object target, Object map, HashSet<Long> circulars,
 
             if (value instanceof JSObject) {
                 long pointer = ((JSObject) value).getPointer();
-                if (circulars.contains(pointer)) {
-                    // Circular reference objects, no processing needed.
+                if (circulars.containsKey(pointer)) {
+                    // Circular reference objects.
+                    Object refValue = circulars.get(pointer);
+                    if (map instanceof Map) {
+                        ((Map<String, Object>) map).put(key, refValue);
+                    } else if (map instanceof ArrayList){
+                        ((ArrayList<Object>) map).add(refValue);
+                    }
                     continue;
                 }
             }