From 6b1cb852c2f60f42e181d49b1548c12fa7fa1629 Mon Sep 17 00:00:00 2001
From: TopchetoEU <36534413+TopchetoEU@users.noreply.github.com>
Date: Sun, 26 Nov 2023 13:51:56 +0200
Subject: [PATCH] fix: arrays wrongly stringified in JSONLib

---
 src/me/topchetoeu/jscript/json/JSON.java | 30 ++++++++++++------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/me/topchetoeu/jscript/json/JSON.java b/src/me/topchetoeu/jscript/json/JSON.java
index 457a885..fcf6355 100644
--- a/src/me/topchetoeu/jscript/json/JSON.java
+++ b/src/me/topchetoeu/jscript/json/JSON.java
@@ -37,21 +37,6 @@ public class JSON {
         if (val instanceof Number) return JSONElement.number(((Number)val).doubleValue());
         if (val instanceof String) return JSONElement.string((String)val);
         if (val == Values.NULL) return JSONElement.NULL;
-        if (val instanceof ObjectValue) {
-            if (prev.contains(val)) throw new EngineException("Circular dependency in JSON.");
-            prev.add(val);
-
-            var res = new JSONMap();
-
-            for (var el : ((ObjectValue)val).keys(false)) {
-                var jsonEl = fromJs(ctx, ((ObjectValue)val).getMember(ctx, el), prev);
-                if (jsonEl == null) continue;
-                if (el instanceof String || el instanceof Number) res.put(el.toString(), jsonEl);
-            }
-
-            prev.remove(val);
-            return JSONElement.of(res);
-        }
         if (val instanceof ArrayValue) {
             if (prev.contains(val)) throw new EngineException("Circular dependency in JSON.");
             prev.add(val);
@@ -67,6 +52,21 @@ public class JSON {
             prev.remove(val);
             return JSONElement.of(res);
         }
+        if (val instanceof ObjectValue) {
+            if (prev.contains(val)) throw new EngineException("Circular dependency in JSON.");
+            prev.add(val);
+
+            var res = new JSONMap();
+
+            for (var el : ((ObjectValue)val).keys(false)) {
+                var jsonEl = fromJs(ctx, ((ObjectValue)val).getMember(ctx, el), prev);
+                if (jsonEl == null) continue;
+                if (el instanceof String || el instanceof Number) res.put(el.toString(), jsonEl);
+            }
+
+            prev.remove(val);
+            return JSONElement.of(res);
+        }
         if (val == null) return null;
         return null;
     }