Skip to content

Extend wrapped JS function coverage in core runtime types #12263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Oct 28, 2025
Merged

Extend wrapped JS function coverage in core runtime types #12263

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7bf670a
add functions to JSObject, JSNumber, JSString, JSSymbol, JSValue; ren…
Atur256 Sep 30, 2025
16caca3
add tests for JSNumber, JSObject, JSString, JSSymbol
Atur256 Oct 3, 2025
be7ba5e
implement pr comments
Atur256 Oct 8, 2025
69c5127
implement pr comments
Atur256 Oct 14, 2025
13ac2f3
implement pr comments
Atur256 Oct 14, 2025
cbcdb84
implement pr comments
Atur256 Oct 27, 2025
3c49212
implement pr comments
Atur256 Oct 27, 2025
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
10 changes: 6 additions & 4 deletions sdk/src/org.graalvm.webimage.api/src/org/graalvm/webimage/api/JSString.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,14 +87,16 @@ public int hashCode() {
@JS(value = "return String.fromCharCode(...codeUnits);")
public static native JSString fromCharCode(int... codeUnits);
Copy link
Member

@patrick96 patrick96 Oct 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could use use char... codeUnits instead here? The function only accepts numbers from 0 to 65535 anyway.

Copy link
Contributor Author

@Atur256 Atur256 Oct 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using int... matches JavaScript’s fromCharCode, which takes numbers, not characters. While char... would work for values ≤ 65535, it forces explicit casting for int values.

Copy link
Member

@patrick96 patrick96 Oct 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In that case, we should have an overload that accepts char...


@JS.Coerce
@JS(value = "return String.fromCharCode(...codeUnits);")
public static native JSString fromCharCode(char... codeUnits);


@JS.Coerce
@JS(value = "return String.fromCodePoint(...codePoints);")
public static native JSString fromCodePoint(int... codePoints);

@JS(value = """
const sub = Array.from(substitutions);
console.log(sub);
return String.raw(template, ...sub);""")
@JS(value = "return String.raw(template, ...Array.from(substitutions));")
public static native JSString raw(JSObject template, Object... substitutions);

@JS.Coerce
Expand Down
2 changes: 1 addition & 1 deletion sdk/src/org.graalvm.webimage.api/src/org/graalvm/webimage/api/JSSymbol.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ public int hashCode() {

public static String keyFor(JSSymbol sym) {
JSValue result = keyForRaw(sym);
return result.typeof().equals("undefined") ? null : result.asString();
return result instanceof JSUndefined ? null : result.asString();
}

@JS.Coerce
Expand Down
4 changes: 2 additions & 2 deletions ...osted.webimage/src/com/oracle/svm/hosted/webimage/codegen/oop/ClassWithMirrorLowerer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,7 +558,7 @@ protected void lowerClassEnd() {

// Store the mapping from the imported JavaScript class constructor to the Java facade class
// under which the JavaScript class was imported.
if (isImportedClass) {
// if (isImportedClass) {
buffer.emitScopeBegin();
buffer.emitLetDeclPrefix("facades");
buffer.emitText("runtime.ensureFacadeSetFor(" + internalMirrorClassName(codeGenTool, type) + ");");
Expand All @@ -570,6 +570,6 @@ protected void lowerClassEnd() {
buffer.emitScopeEnd();
buffer.emitNewLine();
buffer.emitNewLine();
}
// }
}
}
2 changes: 1 addition & 1 deletion ...le.svm.hosted.webimage/src/com/oracle/svm/hosted/webimage/codegen/runtime/jsconversion.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,7 @@ class Conversion {
const facades = runtime.findFacadesFor(obj.constructor);
const rawJavaHub = cls[runtime.symbol.javaNative];
const internalJavaClass = rawJavaHub[runtime.symbol.jsClass];
if (facades.has(internalJavaClass)) {
if (obj.constructor === ({}).constructor || facades.has(internalJavaClass)) {
const rawJavaMirror = new internalJavaClass();
// Note: only one-way handshake, since the JavaScript object could be recast to a different Java facade class.
this.setJavaScriptNative(rawJavaMirror, obj);
Expand Down
1 change: 0 additions & 1 deletion ...age/src/com.oracle.svm.webimage.jtt/src/com/oracle/svm/webimage/jtt/api/JSStringTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,7 +514,6 @@ public static void testTrim() {
assertEquals(" To be, or not to be", padded.trimEnd().asString());
}


public static void testSubstring() {
JSString text = JSString.of("JavaScript");

Expand Down