Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ java {

allprojects {
group = "com.instancify.scriptify"
version = "1.3.6-SNAPSHOT"
version = "1.3.7-SNAPSHOT"
}

subprojects {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,11 @@
import com.instancify.scriptify.api.script.Script;
import com.instancify.scriptify.api.script.function.ScriptFunction;
import com.instancify.scriptify.api.script.function.argument.ScriptFunctionArgument;
import org.graalvm.polyglot.proxy.ProxyExecutable;
import org.graalvm.polyglot.Value;
import org.graalvm.polyglot.proxy.ProxyExecutable;

import java.util.ArrayList;
import java.util.List;

public class JsFunction implements ProxyExecutable {

Expand All @@ -21,12 +24,37 @@ public JsFunction(Script<?> script, ScriptFunction function) {
public Object execute(Value... arguments) {
ScriptFunctionArgument[] args = new ScriptFunctionArgument[arguments.length];
for (int i = 0; i < arguments.length; i++) {
args[i] = ScriptFunctionArgument.of(arguments[i].as(Object.class));
args[i] = ScriptFunctionArgument.of(convertValue(arguments[i]));
}
try {
return function.invoke(script, args);
} catch (ScriptFunctionException e) {
throw new RuntimeException(e);
}
}

/**
* Converts the Value object to the appropriate Java type.
*/
private Object convertValue(Value value) {
if (value.isNull()) {
return null;
} else if (value.hasArrayElements()) {
List<Object> list = new ArrayList<>();
for (long j = 0; j < value.getArraySize(); j++) {
list.add(convertValue(value.getArrayElement(j)));
}
return list;
} else if (value.isHostObject()) {
return value.asHostObject();
} else if (value.isString()) {
return value.asString();
} else if (value.isBoolean()) {
return value.asBoolean();
} else if (value.isNumber()) {
return value.as(Number.class);
} else {
return value.as(Object.class);
}
}
}
Loading