1.32 dev

.github/workflows/ci.yml

@@ -22,7 +22,7 @@ jobs:
       - name: Install latest nightly
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: stable
+          toolchain: nightly
           override: true
           components: rustfmt, clippy
 

.gitignore

@@ -2,3 +2,7 @@ target
 Cargo.lock
 driver
 tarpaulin-report.html
+/.idea/
+/playwright-rust-randall.iml
+/scripts/scripts.iml
+/src/api/generated.rs

Cargo.toml

@@ -8,7 +8,7 @@ documentation = "https://docs.rs/playwright/"
 repository = "https://github.com/octaltree/playwright-rust"
 categories = ["web-programming"]
 keywords = ["testing", "headless", "web", "browser", "automation"]
-edition = "2018"
+edition = "2021"
 build = "src/build.rs"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -20,23 +20,24 @@ reqwest = { version = "0.11.4", features = ["blocking"] }
 log = "0.4.14"
 serde = { version = "1.0.126", features = ["derive"] }
 serde_json = "1.0.66"
-zip = "0.5.13"
+zip = "0.6.4"
 thiserror = "1.0.26"
 strong = { version = "0.3.4", features = ["serde", "shorthand"] }
 tokio = { version = "1.9.0", features = ["sync", "rt-multi-thread", "macros"] }
 actix-rt = { version = "2.2.0", optional = true }
 async-std = { version = "1.9.0", features = ["attributes"], optional = true }
-dirs = "3.0.2"
+dirs = "5.0.0"
 paste = "1.0.5"
-base64 = "0.13.0"
+base64 = "0.21.0"
 itertools = "0.10.1"
 chrono = { version = "0.4.19", optional = true, features = ["serde"] }
 tokio-stream = { version = "0.1.7", features = ["sync"] }
 futures = "0.3.16"
-serde_with = { version = "1.9.4", default-features = false, features = ["macros"] }
+serde_with = { version = "2.3.2", default-features = false, features = ["macros"] }
+parking_lot = "0.12.1"
 
 [dev-dependencies]
-env_logger = "0.9.0"
+env_logger = "0.10.0"
 tempdir = "0.3.7"
 tide = "0.16.0"
 warp = "0.3.1"

scripts/src/api.rs

@@ -1,6 +1,6 @@
 pub mod types;
 
-use serde::{Deserialize, Serialize};
+use serde::{Deserialize, Deserializer, Serialize};
 
 #[derive(Debug, Deserialize)]
 #[serde(transparent)]
@@ -35,12 +35,26 @@ pub struct Member {
     pub ty: Type,
     // langs
     // paramOrOption null
+    #[serde(default)]
+    #[serde(deserialize_with = "string_as_bool")]
     pub deprecated: bool,
     //#[serde(default)]
     // pub comment: String,
     pub spec: Vec<SpecNode>
 }
 
+fn string_as_bool<'de, D>(deserializer: D) -> Result<bool, D::Error>
+    where
+        D: Deserializer<'de>,
+{
+    let s = <String as Deserialize>::deserialize(deserializer);
+    Ok(match s {
+        Err(_) => false,
+        _ => true
+    })
+}
+
+
 #[derive(Debug, Deserialize, PartialEq, Eq, Clone, Copy)]
 #[serde(rename_all = "camelCase")]
 pub enum Kind {
@@ -79,6 +93,8 @@ pub struct Arg {
     #[serde(default)]
     pub spec: Vec<SpecNode>,
     pub required: bool,
+    #[serde(default)]
+    #[serde(deserialize_with = "string_as_bool")]
     pub deprecated: bool,
     #[serde(rename = "async")]
     pub is_async: bool

scripts/src/api/types.rs

@@ -341,15 +341,17 @@ fn declare_ty<'a>(scope: Vec<&'a str>, ty: &'a Type, allow_borrow: bool) -> Rc<M
                 Rc::new(Model::Vec(declare_ty(scope, t, allow_borrow)))
             }
             (true, false) => {
+                let option = ty.expression.as_deref();
                 assert!(
-                    ty.expression.as_deref()
+                    option
                         == Some("[IReadOnlyDictionary<string, BrowserNewContextOptions>]")
-                        || ty.expression.as_deref() == Some("[Map]<[string], [JSHandle]>")
-                        || ty.expression.as_deref() == Some("[Object]<[string], [string]>")
-                        || ty.expression.as_deref()
+                        || option == Some("[Map]<[string], [JSHandle]>")
+                        || option == Some("[Map<string, Object>]")
+                        || option == Some("[Object]<[string], [string]>")
+                        || option
                             == Some("[Object]<[string], [string]|[float]|[boolean]>")
-                        || ty.expression.as_deref() == Some("[Object]<[string], [Serializable]>")
-                        || ty.expression.as_deref() == Some("[Object]<[string], [any]>"),
+                        || option == Some("[Object]<[string], [Serializable]>")
+                        || option == Some("[Object]<[string], [any]>"),
                     "{:?}",
                     &ty
                 );

scripts/src/generate_api.rs

@@ -143,21 +143,24 @@ fn format_use_ty(x: &types::Model) -> TokenStream {
             let z = format_use_ty(z);
             quote!(HashMap<#y, #z>)
         }
-        Model::Known { name, .. } => match name.as_ref() {
-            "binary" if reference => quote!(&'a [u8]),
-            "binary" => quote!(Vec<u8>),
-            "json" if reference => quote!(&'a str),
-            "json" => quote!(String),
-            "string" if reference => quote!(&'a str),
-            "string" => quote!(String),
-            "number" => quote!(serde_json::Number),
-            "float" => quote!(f64),
-            "boolean" => quote!(bool),
-            "void" => quote!(()),
-            _ => {
-                let n = format_ident!("{}", name);
-                assert!(!reference);
-                quote!(#n)
+        Model::Known { name, .. } => {
+            match name.as_ref() {
+                "binary" if reference => quote!(&'a [u8]),
+                "binary" => quote!(Vec<u8>),
+                "json" if reference => quote!(&'a str),
+                "json" => quote!(String),
+                "string" if reference => quote!(&'a str),
+                "string" => quote!(String),
+                "number" => quote!(serde_json::Number),
+                "float" => quote!(f64),
+                "boolean" => quote!(bool),
+                "void" => quote!(()),
+                "JsonElement?" => quote!(()),
+                _ => {
+                    let n = format_ident!("{}", name);
+                    assert!(!reference);
+                    quote!(#n)
+                }
             }
         }
     }

scripts/src/generate_protocol.rs

@@ -59,7 +59,7 @@ fn enum_tokens(name: &str, x: &Enum) -> TokenStream {
         .collect::<Vec<_>>();
     let name = format_ident!("{}", name);
     quote! {
-        #[derive(Debug, Serialize, Deserialize, PartialEq, Eq, Clone)]
+        #[derive(Debug, Serialize, Deserialize, PartialEq, Eq, Clone, Hash)]
         pub enum #name {
             #(#variants),*
         }