args();
/**
diff --git a/playwright/src/main/java/com/microsoft/playwright/Page.java b/playwright/src/main/java/com/microsoft/playwright/Page.java
index aabb7265..950e02ea 100644
--- a/playwright/src/main/java/com/microsoft/playwright/Page.java
+++ b/playwright/src/main/java/com/microsoft/playwright/Page.java
@@ -3135,7 +3135,7 @@ public interface Page extends AutoCloseable {
* NOTE: Headless mode doesn't support navigation to a PDF document. See the upstream issue.
*
- *
Shortcut for main frame's {@link Frame#goto Frame.goto()}
+ *
Shortcut for main frame's {@link Frame#navigate Frame.navigate()}
*
* @param url URL to navigate page to. The url should include scheme, e.g. {@code https://}. When a {@code baseURL} via the context options was
* provided and the passed URL is a path, it gets merged via the NOTE: Headless mode doesn't support navigation to a PDF document. See the upstream issue.
*
- *
Shortcut for main frame's {@link Frame#goto Frame.goto()}
+ *
Shortcut for main frame's {@link Frame#navigate Frame.navigate()}
*
* @param url URL to navigate page to. The url should include scheme, e.g. {@code https://}. When a {@code baseURL} via the context options was
* provided and the passed URL is a path, it gets merged via the
* {@link Page#goBack Page.goBack()}
* {@link Page#goForward Page.goForward()}
- * {@link Page#goto Page.goto()}
+ * {@link Page#navigate Page.navigate()}
* {@link Page#reload Page.reload()}
* {@link Page#setContent Page.setContent()}
* {@link Page#waitForNavigation Page.waitForNavigation()}
@@ -4560,7 +4560,7 @@ public interface Page extends AutoCloseable {
/**
* Performs action and waits for a {@code ConsoleMessage} to be logged by in the page. If predicate is provided, it passes
* {@code ConsoleMessage} value into the {@code predicate} function and waits for {@code predicate(message)} to return a truthy value. Will
- * throw an error if the page is closed before the {@link Page#onConsole Page.onConsole()} event is fired.
+ * throw an error if the page is closed before the {@link Page#onConsoleMessage Page.onConsoleMessage()} event is fired.
*
* @param callback Callback that performs the action triggering the event.
*/
@@ -4570,7 +4570,7 @@ public interface Page extends AutoCloseable {
/**
* Performs action and waits for a {@code ConsoleMessage} to be logged by in the page. If predicate is provided, it passes
* {@code ConsoleMessage} value into the {@code predicate} function and waits for {@code predicate(message)} to return a truthy value. Will
- * throw an error if the page is closed before the {@link Page#onConsole Page.onConsole()} event is fired.
+ * throw an error if the page is closed before the {@link Page#onConsoleMessage Page.onConsoleMessage()} event is fired.
*
* @param callback Callback that performs the action triggering the event.
*/
diff --git a/tools/api-generator/src/main/java/com/microsoft/playwright/tools/ApiGenerator.java b/tools/api-generator/src/main/java/com/microsoft/playwright/tools/ApiGenerator.java
index c4b34441..d4a12235 100644
--- a/tools/api-generator/src/main/java/com/microsoft/playwright/tools/ApiGenerator.java
+++ b/tools/api-generator/src/main/java/com/microsoft/playwright/tools/ApiGenerator.java
@@ -160,6 +160,9 @@ abstract class Element {
while (matcher.find()) {
linkified += paragraph.substring(start, matcher.start());
String name = matcher.group(2);
+ if (ApiGenerator.aliases.containsKey(name)) {
+ name = ApiGenerator.aliases.get(name);
+ }
if ("event".equals(matcher.group(1))) {
String[] parts = name.split("\\.");
name = parts[0] + ".on" + toTitle(parts[1]);
@@ -1048,12 +1051,16 @@ class Enum extends TypeDefinition {
}
public class ApiGenerator {
+ // TODO: make it an instance field.
+ static final Map aliases = new HashMap<>();
+
ApiGenerator(Reader reader) throws IOException {
JsonArray api = new Gson().fromJson(reader, JsonArray.class);
File cwd = FileSystems.getDefault().getPath(".").toFile();
File dir = new File(cwd, "playwright/src/main/java/com/microsoft/playwright");
System.out.println("Writing files to: " + dir.getCanonicalPath());
- filterOtherLangs(api);
+ Stack path = new Stack<>();
+ filterOtherLangs(api, path);
Map topLevelTypes = new HashMap<>();
for (JsonElement entry: api) {
String name = entry.getAsJsonObject().get("name").getAsString();
@@ -1080,14 +1087,14 @@ public class ApiGenerator {
}
}
- private static void filterOtherLangs(JsonElement json) {
+ private static void filterOtherLangs(JsonElement json, Stack path) {
if (json.isJsonArray()) {
List toRemove = new ArrayList<>();
JsonArray array = json.getAsJsonArray();
for (int i = 0; i < array.size(); i++) {
JsonElement item = array.get(i);
if (isSupported(item)) {
- filterOtherLangs(item);
+ filterOtherLangs(item, path);
} else {
toRemove.add(i);
}
@@ -1099,19 +1106,25 @@ public class ApiGenerator {
} else if (json.isJsonObject()) {
List toRemove = new ArrayList<>();
JsonObject object = json.getAsJsonObject();
+ path.push(object.has("name") ? object.get("name").getAsString() : "");
String alias = alias(object);
if (alias != null) {
+ List aliasPath = new ArrayList<>(path);
+ aliasPath.set(aliasPath.size() - 1, alias);
+ aliases.put(String.join(".", path), String.join(".", aliasPath));
// Rename in place.
object.addProperty("name", alias);
}
overrideType(object);
+
for (Map.Entry entry : object.entrySet()) {
if (isSupported(entry.getValue())) {
- filterOtherLangs(entry.getValue());
+ filterOtherLangs(entry.getValue(), path);
} else {
toRemove.add(entry.getKey());
}
}
+ path.pop();
for (String key : toRemove) {
object.remove(key);
}