update to 0.1.3.20

Author: levkopo

LICENSE

@@ -47,7 +47,7 @@ authors' sake, the GPL requires that modified versions be marked as
 changed, so that their problems will not be attributed erroneously to
 authors of previous versions.
 
-  Some devices are designed to deny users access to install or run
+  Some devices are designed to deny users accessExpression to install or run
 modified versions of the software inside them, although the manufacturer
 can do so.  This is fundamentally incompatible with the aim of
 protecting users' freedom to change the software.  The systematic
@@ -237,7 +237,7 @@ works, which are not by their nature extensions of the covered work,
 and which are not combined with it such as to form a larger program,
 in or on a volume of a storage or distribution medium, is called an
 "aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
+used to limit the accessExpression or legal rights of the compilation's users
 beyond what the individual works permit.  Inclusion of a covered work
 in an aggregate does not cause this License to apply to the other
 parts of the aggregate.
@@ -263,7 +263,7 @@ in one of these ways:
     product that is covered by this License, on a durable physical
     medium customarily used for software interchange, for a price no
     more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
+    conveying of source, or (2) accessExpression to copy the
     Corresponding Source from a network server at no charge.
 
     c) Convey individual copies of the object code with a copy of the
@@ -272,8 +272,8 @@ in one of these ways:
     only if you received the object code with such an offer, in accord
     with subsection 6b.
 
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
+    d) Convey the object code by offering accessExpression from a designated
+    place (gratis or for a charge), and offer equivalent accessExpression to the
     Corresponding Source in the same way through the same place at no
     further charge.  You need not require recipients to copy the
     Corresponding Source along with the object code.  If the place to

build.gradle

@@ -25,6 +25,6 @@ jar {
 
 dependencies {
     compile group: 'org.json', name: 'json', version: '20210307'
-    compileOnly group: 'com.github.kayjamlang', name: 'executor', version: '0.1.3.17-fix4'
+    compileOnly group: 'com.github.kayjamlang', name: 'executor', version: '0.1.3.20'
     testCompile group: 'junit', name: 'junit', version: '4.12'
 }

src/main/java/com/github/kayjamlang/executor/json/JSONLibrary.java

@@ -1,7 +1,8 @@
 package com.github.kayjamlang.executor.json;
 
-import com.github.kayjamlang.core.Argument;
+import com.github.kayjamlang.core.expressions.data.Argument;
 import com.github.kayjamlang.core.Type;
+import com.github.kayjamlang.executor.Context;
 import com.github.kayjamlang.executor.Executor;
 import com.github.kayjamlang.executor.libs.Library;
 import com.github.kayjamlang.executor.libs.main.ArrayClass;
@@ -18,17 +19,6 @@ public class JSONLibrary extends Library {
 
     public JSONLibrary() throws Exception {
         classes.put("JSON", new JSONClass());
-        addFunction(new LibFunction("jsonDecode", (mainContext, context) -> {
-            String jsonEncoded = (String) context.variables.get("jsonEncoded");
-            try {
-                if(jsonEncoded.startsWith("{"))
-                    return decodeObject(mainContext.executor, new JSONObject(jsonEncoded));
-                return decodeArray(mainContext.executor, new JSONArray(jsonEncoded));
-            }catch (Exception e){
-                e.printStackTrace();
-                return false;
-            }
-        }, new Argument(Type.STRING, "jsonEncoded")));
     }
 
     public Object decode(Executor executor, Object value) throws Exception {
@@ -42,6 +32,41 @@ else if(value instanceof Number)
         return value;
     }
 
+    public Object encodeMap(Executor executor, MapClass object) throws Exception {
+        Map<Object, Object> map = object.getMap((Context) object.data.get("ctx"));
+
+        JSONObject jsonObject = new JSONObject();
+        for(Map.Entry<Object, Object> entry: map.entrySet()) {
+            Object value = entry.getValue();
+            if(value instanceof MapClass)
+                value = encodeMap(executor, (MapClass) value);
+            else if(value instanceof ArrayClass)
+                value = encodeArray(executor, (ArrayClass) value);
+
+            jsonObject.put(entry.getKey().toString(), value);
+        }
+
+
+        return jsonObject;
+    }
+
+    public Object encodeArray(Executor executor, ArrayClass object) throws Exception {
+        List<Object> array = object.getVariable((Context) object.data.get("ctx"), "array");
+
+        JSONArray jsonArray = new JSONArray();
+        for(Object value: array) {
+            if(value instanceof MapClass)
+                value = encodeMap(executor, (MapClass) value);
+            else if(value instanceof ArrayClass)
+                value = encodeArray(executor, (ArrayClass) value);
+
+            jsonArray.put(value);
+        }
+
+
+        return jsonArray;
+    }
+
     public Object decodeObject(Executor executor, JSONObject object) throws Exception {
         Map<Object, Object> map = new HashMap<>();
         for(String key: object.keySet())
@@ -64,8 +89,18 @@ public class JSONClass extends LibClass{
         public JSONClass() throws Exception {
             super("JSON", null);
             setCompanion(new LibObject((object -> {
-                object.addFunction(new LibFunction("decode", (mainContext, context) -> {
-                    String jsonEncoded = (String) context.variables.get("jsonEncoded");
+                object.addFunction(new LibFunction("encode", Type.STRING, (mainContext, context) -> {
+                    Object value = context.getVariable("jsonEncoded");
+                    if(value instanceof ArrayClass)
+                        return encodeArray(mainContext.executor, (ArrayClass) value);
+                    else if(value instanceof MapClass)
+                        return encodeMap(mainContext.executor, (MapClass) value);
+
+                    return false;
+                }, new Argument(Type.ANY, "jsonEncoded")));
+
+                object.addFunction(new LibFunction("decode", Type.ANY, (mainContext, context) -> {
+                    String jsonEncoded = context.getVariable("jsonEncoded");
                     try {
                         if(jsonEncoded.startsWith("{"))
                             return decodeObject(mainContext.executor, new JSONObject(jsonEncoded));