chore: move enums and second level nested classes into options package (#267)

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

@@ -16,6 +16,7 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.options.*;
 import java.nio.file.Path;
 import java.util.*;
 import java.util.function.Consumer;

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

@@ -16,6 +16,7 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.options.*;
 import java.nio.file.Path;
 import java.util.*;
 import java.util.function.Consumer;

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

@@ -16,6 +16,7 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.options.*;
 import java.nio.file.Path;
 import java.util.*;
 

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

@@ -16,6 +16,7 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.options.*;
 import java.nio.file.Path;
 import java.util.*;
 

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

@@ -16,6 +16,7 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.options.*;
 import java.nio.file.Path;
 import java.util.*;
 import java.util.function.Predicate;

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

@@ -16,6 +16,7 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.options.*;
 import java.util.*;
 
 /**

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

@@ -16,6 +16,7 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.options.*;
 import java.util.*;
 
 /**

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

@@ -16,6 +16,7 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.options.*;
 import java.nio.file.Path;
 import java.util.*;
 import java.util.function.Consumer;

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

@@ -20,6 +20,7 @@ import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.microsoft.playwright.*;
+import com.microsoft.playwright.options.*;
 
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;

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

@@ -20,7 +20,7 @@ import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.microsoft.playwright.ElementHandle;
-import com.microsoft.playwright.ElementState;
+import com.microsoft.playwright.options.ElementState;
 import com.microsoft.playwright.FileChooser;
 import com.microsoft.playwright.Frame;
 
@@ -29,8 +29,8 @@ import java.util.ArrayList;
 import java.util.Base64;
 import java.util.List;
 
-import static com.microsoft.playwright.ScreenshotType.JPEG;
-import static com.microsoft.playwright.ScreenshotType.PNG;
+import static com.microsoft.playwright.options.ScreenshotType.JPEG;
+import static com.microsoft.playwright.options.ScreenshotType.PNG;
 import static com.microsoft.playwright.impl.Serialization.*;
 
 public class ElementHandleImpl extends JSHandleImpl implements ElementHandle {

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

@@ -20,6 +20,7 @@ import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.microsoft.playwright.*;
+import com.microsoft.playwright.options.*;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -28,7 +29,7 @@ import java.nio.file.Path;
 import java.util.*;
 import java.util.function.Consumer;
 
-import static com.microsoft.playwright.LoadState.*;
+import static com.microsoft.playwright.options.LoadState.*;
 import static com.microsoft.playwright.impl.Serialization.*;
 import static com.microsoft.playwright.impl.Utils.convertViaJson;
 import static com.microsoft.playwright.impl.Utils.isFunctionBody;

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

@@ -19,6 +19,7 @@ package com.microsoft.playwright.impl;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import com.microsoft.playwright.*;
+import com.microsoft.playwright.options.*;
 
 import java.nio.file.Path;
 import java.util.*;
@@ -26,8 +27,8 @@ import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
 
-import static com.microsoft.playwright.ScreenshotType.JPEG;
-import static com.microsoft.playwright.ScreenshotType.PNG;
+import static com.microsoft.playwright.options.ScreenshotType.JPEG;
+import static com.microsoft.playwright.options.ScreenshotType.PNG;
 import static com.microsoft.playwright.impl.Serialization.gson;
 import static com.microsoft.playwright.impl.Utils.convertViaJson;
 import static com.microsoft.playwright.impl.Utils.isSafeCloseError;

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

@@ -20,6 +20,7 @@ import com.google.gson.*;
 import com.google.gson.reflect.TypeToken;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
+import com.microsoft.playwright.options.*;
 import com.microsoft.playwright.*;
 
 import java.io.ByteArrayOutputStream;

playwright/src/main/java/com/microsoft/playwright/options/ColorScheme.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.microsoft.playwright;
+package com.microsoft.playwright.options;
 
 public enum ColorScheme {
   LIGHT,

playwright/src/main/java/com/microsoft/playwright/options/ElementState.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.microsoft.playwright;
+package com.microsoft.playwright.options;
 
 public enum ElementState {
   VISIBLE,

playwright/src/main/java/com/microsoft/playwright/options/Geolocation.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.microsoft.playwright;
+package com.microsoft.playwright.options;
 
 public class Geolocation {
   public double latitude;

playwright/src/main/java/com/microsoft/playwright/options/KeyboardModifier.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.microsoft.playwright;
+package com.microsoft.playwright.options;
 
 public enum KeyboardModifier {
   ALT,

playwright/src/main/java/com/microsoft/playwright/options/LoadState.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.microsoft.playwright;
+package com.microsoft.playwright.options;
 
 public enum LoadState {
   LOAD,

playwright/src/main/java/com/microsoft/playwright/options/Media.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.microsoft.playwright;
+package com.microsoft.playwright.options;
 
 public enum Media {
   SCREEN,

playwright/src/main/java/com/microsoft/playwright/options/MouseButton.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.microsoft.playwright;
+package com.microsoft.playwright.options;
 
 public enum MouseButton {
   LEFT,

playwright/src/main/java/com/microsoft/playwright/options/Position.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.microsoft.playwright;
+package com.microsoft.playwright.options;
 
 public class Position {
   public int x;

playwright/src/main/java/com/microsoft/playwright/options/SameSiteAttribute.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.microsoft.playwright;
+package com.microsoft.playwright.options;
 
 public enum SameSiteAttribute {
   STRICT,

playwright/src/main/java/com/microsoft/playwright/options/ScreenshotType.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.microsoft.playwright;
+package com.microsoft.playwright.options;
 
 public enum ScreenshotType {
   PNG,

playwright/src/main/java/com/microsoft/playwright/options/WaitForSelectorState.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.microsoft.playwright;
+package com.microsoft.playwright.options;
 
 public enum WaitForSelectorState {
   ATTACHED,

playwright/src/main/java/com/microsoft/playwright/options/WaitUntilState.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.microsoft.playwright;
+package com.microsoft.playwright.options;
 
 public enum WaitUntilState {
   LOAD,

playwright/src/test/java/com/microsoft/playwright/TestBrowserContextCookies.java

@@ -16,6 +16,7 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.options.SameSiteAttribute;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.DisabledIf;
 

playwright/src/test/java/com/microsoft/playwright/TestClick.java

@@ -23,8 +23,8 @@ import org.junit.jupiter.api.condition.EnabledIf;
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.microsoft.playwright.KeyboardModifier.SHIFT;
-import static com.microsoft.playwright.MouseButton.RIGHT;
+import static com.microsoft.playwright.options.KeyboardModifier.SHIFT;
+import static com.microsoft.playwright.options.MouseButton.RIGHT;
 import static java.util.Arrays.asList;
 import static java.util.Collections.emptyList;
 import static org.junit.jupiter.api.Assertions.*;

playwright/src/test/java/com/microsoft/playwright/TestDefaultBrowserContext2.java

@@ -1,5 +1,6 @@
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.options.Geolocation;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.DisabledIf;
@@ -12,7 +13,7 @@ import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.stream.Collectors;
 
-import static com.microsoft.playwright.ColorScheme.DARK;
+import static com.microsoft.playwright.options.ColorScheme.DARK;
 import static com.microsoft.playwright.Utils.mapOf;
 import static java.util.Arrays.asList;
 import static org.junit.jupiter.api.Assertions.*;

playwright/src/test/java/com/microsoft/playwright/TestDownload.java

@@ -31,7 +31,7 @@ import java.nio.file.Paths;
 import java.time.Duration;
 import java.time.Instant;
 
-import static com.microsoft.playwright.KeyboardModifier.ALT;
+import static com.microsoft.playwright.options.KeyboardModifier.ALT;
 import static com.microsoft.playwright.Utils.copy;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.nio.file.Files.readAllBytes;

playwright/src/test/java/com/microsoft/playwright/TestElementHandleOwnerFrame.java

@@ -18,7 +18,7 @@ package com.microsoft.playwright;
 
 import org.junit.jupiter.api.Test;
 
-import static com.microsoft.playwright.LoadState.DOMCONTENTLOADED;
+import static com.microsoft.playwright.options.LoadState.DOMCONTENTLOADED;
 import static com.microsoft.playwright.Utils.attachFrame;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;

playwright/src/test/java/com/microsoft/playwright/TestElementHandleQuerySelector.java

@@ -6,7 +6,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import static com.microsoft.playwright.LoadState.DOMCONTENTLOADED;
+import static com.microsoft.playwright.options.LoadState.DOMCONTENTLOADED;
 import static org.junit.jupiter.api.Assertions.*;
 
 public class TestElementHandleQuerySelector extends TestBase {

playwright/src/test/java/com/microsoft/playwright/TestElementHandleWaitForElementState.java

@@ -19,7 +19,7 @@ package com.microsoft.playwright;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.DisabledIf;
 
-import static com.microsoft.playwright.ElementState.*;
+import static com.microsoft.playwright.options.ElementState.*;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 

playwright/src/test/java/com/microsoft/playwright/TestFrameNavigate.java

@@ -18,7 +18,7 @@ package com.microsoft.playwright;
 
 import org.junit.jupiter.api.Test;
 
-import static com.microsoft.playwright.WaitUntilState.NETWORKIDLE;
+import static com.microsoft.playwright.options.WaitUntilState.NETWORKIDLE;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 

playwright/src/test/java/com/microsoft/playwright/TestGeolocation.java

@@ -16,6 +16,7 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.options.Geolocation;
 import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;

playwright/src/test/java/com/microsoft/playwright/TestHar.java

@@ -29,7 +29,7 @@ import java.io.Reader;
 import java.nio.file.Files;
 import java.nio.file.Path;
 
-import static com.microsoft.playwright.LoadState.DOMCONTENTLOADED;
+import static com.microsoft.playwright.options.LoadState.DOMCONTENTLOADED;
 import static org.junit.jupiter.api.Assertions.*;
 
 public class TestHar extends TestBase {

playwright/src/test/java/com/microsoft/playwright/TestPageBasic.java

@@ -25,8 +25,8 @@ import java.util.List;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
-import static com.microsoft.playwright.LoadState.DOMCONTENTLOADED;
-import static com.microsoft.playwright.LoadState.LOAD;
+import static com.microsoft.playwright.options.LoadState.DOMCONTENTLOADED;
+import static com.microsoft.playwright.options.LoadState.LOAD;
 import static org.junit.jupiter.api.Assertions.*;
 
 public class TestPageBasic extends TestBase {

playwright/src/test/java/com/microsoft/playwright/TestPageEmulateMedia.java

@@ -20,9 +20,9 @@ import org.junit.jupiter.api.Test;
 
 import java.util.function.Supplier;
 
-import static com.microsoft.playwright.ColorScheme.DARK;
-import static com.microsoft.playwright.ColorScheme.LIGHT;
-import static com.microsoft.playwright.Media.PRINT;
+import static com.microsoft.playwright.options.ColorScheme.DARK;
+import static com.microsoft.playwright.options.ColorScheme.LIGHT;
+import static com.microsoft.playwright.options.Media.PRINT;
 import static com.microsoft.playwright.Utils.attachFrame;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 

playwright/src/test/java/com/microsoft/playwright/TestPageExposeFunction.java

@@ -21,7 +21,7 @@ import org.junit.jupiter.api.Test;
 import java.util.Map;
 
 import static com.microsoft.playwright.Utils.mapOf;
-import static com.microsoft.playwright.WaitUntilState.LOAD;
+import static com.microsoft.playwright.options.WaitUntilState.LOAD;
 import static java.util.Arrays.asList;
 import static org.junit.jupiter.api.Assertions.*;
 

playwright/src/test/java/com/microsoft/playwright/TestPageWaitForNavigation.java

@@ -16,6 +16,7 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.options.WaitUntilState;
 import org.junit.jupiter.api.Test;
 
 import java.net.MalformedURLException;

playwright/src/test/java/com/microsoft/playwright/TestPopup.java

@@ -24,7 +24,7 @@ import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 
-import static com.microsoft.playwright.LoadState.DOMCONTENTLOADED;
+import static com.microsoft.playwright.options.LoadState.DOMCONTENTLOADED;
 import static com.microsoft.playwright.Utils.mapOf;
 import static org.junit.jupiter.api.Assertions.*;
 

playwright/src/test/java/com/microsoft/playwright/TestTap.java

@@ -24,7 +24,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.Semaphore;
 
-import static com.microsoft.playwright.KeyboardModifier.ALT;
+import static com.microsoft.playwright.options.KeyboardModifier.ALT;
 import static com.microsoft.playwright.Utils.mapOf;
 import static java.util.Arrays.asList;
 import static org.junit.jupiter.api.Assertions.assertEquals;

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

@@ -925,6 +925,9 @@ class Interface extends TypeDefinition {
     if ("Playwright".equals(jsonName)) {
       output.add("import com.microsoft.playwright.impl.PlaywrightImpl;");
     }
+    if (asList("Page", "Frame", "ElementHandle", "Browser", "BrowserContext", "BrowserType", "Mouse", "Keyboard").contains(jsonName)) {
+      output.add("import com.microsoft.playwright.options.*;");
+    }
     if (jsonName.equals("Route")) {
       output.add("import java.nio.charset.StandardCharsets;");
     }
@@ -1265,9 +1268,10 @@ public class ApiGenerator {
         writer.write(text);
       }
     }
+    dir = new File(dir, "options");
     for (Enum e : enums.values()) {
       List<String> lines = new ArrayList<>();
-      lines.add(Interface.header);
+      lines.add(Interface.header.replace("package com.microsoft.playwright;", "package com.microsoft.playwright.options;"));
       e.writeTo(lines);
       String text = String.join("\n", lines);
       try (FileWriter writer = new FileWriter(new File(dir, e.jsonName + ".java"))) {