chore: simplify api generator (#223)

Author: yury-s

playwright/src/main/java/com/microsoft/playwright/BrowserContext.java

@@ -130,7 +130,7 @@ class AddCookie {
     /**
      * Unix time in seconds. Optional.
      */
-    public Long expires;
+    public Double expires;
     /**
      * Optional.
      */
@@ -164,7 +164,7 @@ public AddCookie withPath(String path) {
       this.path = path;
       return this;
     }
-    public AddCookie withExpires(Long expires) {
+    public AddCookie withExpires(double expires) {
       this.expires = expires;
       return this;
     }
@@ -189,7 +189,7 @@ class Cookie {
     /**
      * Unix time in seconds.
      */
-    private long expires;
+    private double expires;
     private boolean httpOnly;
     private boolean secure;
     private SameSite sameSite;
@@ -206,7 +206,7 @@ public String domain() {
     public String path() {
       return this.path;
     }
-    public long expires() {
+    public double expires() {
       return this.expires;
     }
     public boolean httpOnly() {

playwright/src/main/java/com/microsoft/playwright/Keyboard.java

@@ -30,6 +30,28 @@
 public interface Keyboard {
   enum Modifier { ALT, CONTROL, META, SHIFT }
 
+  class PressOptions {
+    /**
+     * Time to wait between {@code keydown} and {@code keyup} in milliseconds. Defaults to 0.
+     */
+    public Double delay;
+
+    public PressOptions withDelay(double delay) {
+      this.delay = delay;
+      return this;
+    }
+  }
+  class TypeOptions {
+    /**
+     * Time to wait between key presses in milliseconds. Defaults to 0.
+     */
+    public Double delay;
+
+    public TypeOptions withDelay(double delay) {
+      this.delay = delay;
+      return this;
+    }
+  }
   /**
    * Dispatches a {@code keydown} event.
    *
@@ -68,7 +90,7 @@ enum Modifier { ALT, CONTROL, META, SHIFT }
    */
   void insertText(String text);
   default void press(String key) {
-    press(key, 0);
+    press(key, null);
   }
   /**
    * {@code key} can specify the intended [keyboardEvent.key](https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key)
@@ -92,9 +114,9 @@ default void press(String key) {
    *
    * @param key Name of the key to press or a character to generate, such as {@code ArrowLeft} or {@code a}.
    */
-  void press(String key, int delay);
+  void press(String key, PressOptions delay);
   default void type(String text) {
-    type(text, 0);
+    type(text, null);
   }
   /**
    * Sends a {@code keydown}, {@code keypress}/{@code input}, and {@code keyup} event for each character in the text.
@@ -105,7 +127,7 @@ default void type(String text) {
    *
    * @param text A text to type into a focused element.
    */
-  void type(String text, int delay);
+  void type(String text, TypeOptions delay);
   /**
    * Dispatches a {@code keyup} event.
    *

playwright/src/main/java/com/microsoft/playwright/Route.java

@@ -86,7 +86,7 @@ class FulfillOptions {
     /**
      * Response status code, defaults to {@code 200}.
      */
-    public int status;
+    public Integer status;
 
     public FulfillOptions withBody(byte[] body) {
       this.bodyBytes = body;

playwright/src/main/java/com/microsoft/playwright/impl/KeyboardImpl.java

@@ -19,6 +19,8 @@
 import com.google.gson.JsonObject;
 import com.microsoft.playwright.Keyboard;
 
+import static com.microsoft.playwright.impl.Serialization.gson;
+
 class KeyboardImpl extends LoggingSupport implements Keyboard {
   private final ChannelOwner page;
 
@@ -45,27 +47,31 @@ public void insertText(String text) {
   }
 
   @Override
-  public void press(String key, int delay) {
-    withLogging("Keyboard.press", () -> {
-      JsonObject params = new JsonObject();
-      params.addProperty("key", key);
-      if (delay != 0) {
-        params.addProperty("delay", delay);
-      }
-      page.sendMessage("keyboardPress", params);
-    });
+  public void press(String key, PressOptions options) {
+    withLogging("Keyboard.press", () -> pressImpl(key, options));
   }
 
-  @Override
-  public void type(String text, int delay) {
-    withLogging("Keyboard.type", () -> {
-      JsonObject params = new JsonObject();
-      params.addProperty("text", text);
-      if (delay != 0) {
-        params.addProperty("delay", delay);
-      }
-      page.sendMessage("keyboardType", params);
-    });
+  private void pressImpl(String key, PressOptions options) {
+    if (options == null) {
+      options = new PressOptions();
+    }
+    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
+    params.addProperty("key", key);
+    page.sendMessage("keyboardPress", params);
+  }
+
+    @Override
+  public void type(String text, TypeOptions options) {
+    withLogging("Keyboard.type", () -> typeImpl(text, options));
+  }
+
+  private void typeImpl(String text, TypeOptions options) {
+    if (options == null) {
+      options = new TypeOptions();
+    }
+    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
+    params.addProperty("text", text);
+    page.sendMessage("keyboardType", params);
   }
 
   @Override

playwright/src/main/java/com/microsoft/playwright/impl/RouteImpl.java

@@ -79,7 +79,7 @@ private void fulfillImpl(FulfillOptions options) {
       options = new FulfillOptions();
     }
 
-    int status = options.status == 0 ? 200 : options.status;
+    int status = options.status == null ? 200 : options.status;
     String body = "";
     boolean isBase64 = false;
     int length = 0;

tools/api-generator/src/main/java/com/microsoft/playwright/tools/ApiGenerator.java

@@ -238,14 +238,25 @@ String toJava() {
         return "Boolean";
       }
     }
-    if (jsonName.replace("null|", "").contains("|")) {
-      throw new RuntimeException("Missing mapping for type union: " + jsonPath + ": " + jsonName);
-    }
-//    System.out.println(jsonPath + " : " + jsonName);
-//    if (jsonName.equals("Promise")) {
-//      System.out.println(jsonElement);
-//    }
-    return convertBuiltinType(jsonElement.getAsJsonObject());
+    return convertBuiltinType(stripNullable());
+  }
+
+  private JsonObject stripNullable() {
+    JsonObject jsonType = jsonElement.getAsJsonObject();
+    if (!"union".equals(jsonType.get("name").getAsString())) {
+      return jsonType;
+    }
+    JsonArray values = jsonType.getAsJsonArray("union");
+    if (values.size() != 2) {
+      throw new RuntimeException("Unexpected union without custom mapping " + jsonPath + ": " + jsonType);
+    }
+    for (JsonElement item : values) {
+      JsonObject o = item.getAsJsonObject();
+      if (!"null".equals(o.get("name").getAsString())) {
+        return o;
+      }
+    }
+    throw new RuntimeException("Unexpected union " + jsonPath + ": " + jsonType);
   }
 
   private static String convertBuiltinType(JsonObject jsonType) {
@@ -265,6 +276,15 @@ private static String convertBuiltinType(JsonObject jsonType) {
     if ("path".equals(name)) {
       return "Path";
     }
+    if ("EvaluationArgument".equals(name)) {
+      return "Object";
+    }
+    if ("Serializable".equals(name)) {
+      return "Object";
+    }
+    if ("Buffer".equals(name)) {
+      return "byte[]";
+    }
     if ("Array".equals(name)) {
       return "List<" + convertTemplateParams(jsonType) + ">";
     }