fix: correct array handling in poliglot script executor, issue #10532

tglman · tglman · commit e5e906d6e0e6 · 2025-09-01T10:19:04.000+01:00
diff --git a/core/src/main/java/com/orientechnologies/orient/core/command/script/OPolyglotScriptExecutor.java b/core/src/main/java/com/orientechnologies/orient/core/command/script/OPolyglotScriptExecutor.java
@@ -12,7 +12,6 @@
 import com.orientechnologies.orient.core.metadata.function.OFunction;
 import com.orientechnologies.orient.core.metadata.security.ORole;
 import com.orientechnologies.orient.core.metadata.security.ORule;
-import com.orientechnologies.orient.core.sql.executor.OResultInternal;
 import com.orientechnologies.orient.core.sql.executor.OResultSet;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -168,23 +167,7 @@ public Object executeFunction(
 
       Value result = ctx.eval(language, scriptManager.getFunctionInvoke(f, args));
 
-      Object finalResult;
-      if (result.isNull()) {
-        finalResult = null;
-      } else if (result.hasArrayElements()) {
-        final List<Object> array = new ArrayList<>((int) result.getArraySize());
-        for (int i = 0; i < result.getArraySize(); ++i)
-          array.add(new OResultInternal(result.getArrayElement(i).asHostObject()));
-        finalResult = array;
-      } else if (result.isHostObject()) {
-        finalResult = result.asHostObject();
-      } else if (result.isString()) {
-        finalResult = result.asString();
-      } else if (result.isNumber()) {
-        finalResult = result.asDouble();
-      } else {
-        finalResult = result;
-      }
+      Object finalResult = toObject(result);
       scriptManager.unbind(null, bindings, null, null);
       return finalResult;
     } catch (PolyglotException e) {
@@ -197,6 +180,27 @@ public Object executeFunction(
     }
   }
 
+  protected Object toObject(Value result) {
+    Object finalResult;
+    if (result.isNull()) {
+      finalResult = null;
+    } else if (result.hasArrayElements()) {
+      final List<Object> array = new ArrayList<>((int) result.getArraySize());
+      for (int i = 0; i < result.getArraySize(); ++i)
+        array.add(toObject(result.getArrayElement(i)));
+      finalResult = array;
+    } else if (result.isHostObject()) {
+      finalResult = result.asHostObject();
+    } else if (result.isString()) {
+      finalResult = result.asString();
+    } else if (result.isNumber()) {
+      finalResult = result.asDouble();
+    } else {
+      finalResult = transformer.toResult(result);
+    }
+    return finalResult;
+  }
+
   @Override
   public void close(String iDatabaseName) {
     OResourcePool<ODatabaseDocumentInternal, Context> contextPool =
diff --git a/core/src/test/java/com/orientechnologies/orient/core/command/script/JSScriptTest.java b/core/src/test/java/com/orientechnologies/orient/core/command/script/JSScriptTest.java
@@ -6,6 +6,7 @@
 import com.orientechnologies.orient.core.db.OrientDB;
 import com.orientechnologies.orient.core.db.OrientDBInternal;
 import com.orientechnologies.orient.core.db.document.ODatabaseDocument;
+import com.orientechnologies.orient.core.metadata.function.OFunction;
 import com.orientechnologies.orient.core.sql.executor.OResult;
 import com.orientechnologies.orient.core.sql.executor.OResultSet;
 import java.io.IOException;
@@ -295,4 +296,30 @@ public void jsSandboxWithOrient() {
       orientDB.close();
     }
   }
+
+  @Test
+  public void jsFunctionArray() throws IOException {
+    final OrientDB orientDB =
+        OCreateDatabaseUtil.createDatabase("test", "embedded:", OCreateDatabaseUtil.TYPE_MEMORY);
+    final ODatabaseDocument db =
+        orientDB.open("test", "admin", OCreateDatabaseUtil.NEW_ADMIN_PASSWORD);
+    try {
+      OFunction func = db.getMetadata().getFunctionLibrary().createFunction("testFunction");
+      func.setLanguage("javascript");
+      func.setCode(
+          "     \n"
+              + "\n"
+              + "// Convert to JS native array\n"
+              + "var jsList = [];\n"
+              + "for (var i = 0; i < 10; i++) {\n"
+              + "    jsList.push(i);\n"
+              + "}\n"
+              + "\n"
+              + "return jsList;");
+      func.execute();
+    } finally {
+      orientDB.drop("test");
+    }
+    orientDB.close();
+  }
 }
