fix: updating ast

.github/workflows/ci.yml

@@ -1,11 +1,11 @@
 name: CI
 
 on:
-  push:
-    branches: [main]
+  pull_request:
+    types: [opened, synchronize, reopened]
   merge_group:
     types: [checks_requested]
-  pull_request:
+  push:
     branches: [main]
 
 permissions:
@@ -16,21 +16,27 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
+  read_msrv:
+    name: Read MSRV
+    uses: actions-rust-lang/msrv/.github/workflows/msrv.yml@main
+
   test:
+    needs: read_msrv
+
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         toolchain:
-          - { name: msrv, version: "1.68" }
+          - { name: msrv, version: "${{ needs.read_msrv.outputs.msrv }}" }
           - { name: stable, version: stable }
 
     name: Test / ${{ matrix.toolchain.name }}
     steps:
       - uses: actions/checkout@v4
 
       - name: Install Rust (${{ matrix.toolchain.name }})
-        uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
+        uses: actions-rust-lang/setup-rust-toolchain@v1.9.0
         with:
           toolchain: ${{ matrix.toolchain.version }}
 

.github/workflows/dependabot-reviewer.yml

@@ -17,7 +17,7 @@ jobs:
     steps:
       - name: Fetch Dependabot metadata
         id: dependabot-metadata
-        uses: dependabot/fetch-metadata@v2.0.0
+        uses: dependabot/fetch-metadata@v2.1.0
 
       - name: Enable auto-merge for Dependabot PRs
         run: gh pr merge --auto --squash "$PR_URL"

.github/workflows/lint.yml

@@ -23,28 +23,25 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install Rust
-        uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
+        uses: actions-rust-lang/setup-rust-toolchain@v1.9.0
         with:
           components: clippy
 
-      - name: Install cargo-hack
-        uses: taiki-e/install-action@v2.29.7
+      - name: Install just, cargo-hack
+        uses: taiki-e/install-action@v2.38.0
         with:
-          tool: cargo-hack
+          tool: just,cargo-hack
 
       - name: Check with Clippy
-        run: |
-          cargo clippy --workspace --no-default-features
-          cargo clippy --workspace --no-default-features --all-features
-          cargo hack --feature-powerset --depth=3 clippy --workspace
+        run: just clippy
 
   rustfmt:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
 
       - name: Install Rust (nightly)
-        uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
+        uses: actions-rust-lang/setup-rust-toolchain@v1.9.0
         with:
           toolchain: nightly
           components: rustfmt
@@ -58,7 +55,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install Rust (nightly)
-        uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
+        uses: actions-rust-lang/setup-rust-toolchain@v1.9.0
         with:
           toolchain: nightly
           components: rust-docs
@@ -80,12 +77,12 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Install Rust
-        uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
+        uses: actions-rust-lang/setup-rust-toolchain@v1.9.0
         with:
-          toolchain: nightly-2023-08-25
+          toolchain: nightly-2024-04-26
 
       - name: Install cargo-public-api
-        uses: taiki-e/install-action@v2.29.7
+        uses: taiki-e/install-action@v2.38.0
         with:
           tool: cargo-public-api
 

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## 0.5.0
+
+- Update `http` dependency to `1`.
+
 ## 0.4.0
 
 - The `bearer_format` field of `SecurityScheme::Http` is now optional.

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "oas3"
 description = "Structures and tools to parse, navigate and validate OpenAPI v3 specifications."
-version = "0.4.0"
+version = "0.5.0"
 authors = [
     "softprops <[email protected]>",
     "Rob Ede <[email protected]>",
@@ -11,6 +11,7 @@ categories = ["data-structures", "development-tools::testing", "parsing"]
 repository = "https://github.com/x52dev/oas3-rs"
 license = "MIT"
 edition = "2021"
+rust-version = "1.65"
 
 [features]
 default = ["validation"]
@@ -21,7 +22,7 @@ conformance = ["validation", "reqwest", "prettytable-rs", "colored"]
 bytes = "1.5"
 derive_more = "0.99"
 futures-util = "0.3"
-http = "0.2"
+http = "1"
 log = "0.4"
 once_cell = "1"
 regex = "1"

justfile

@@ -0,0 +1,37 @@
+_list:
+    @just --list
+
+msrv := ```
+    cargo metadata --format-version=1 \
+    | jq -r 'first(.packages[] | select(.source == null and .rust_version)) | .rust_version' \
+    | sed -E 's/^1\.([0-9]{2})$/1\.\1\.0/'
+```
+msrv_rustup := "+" + msrv
+
+# Format project.
+fmt:
+    just --unstable --fmt
+    fd --hidden --extension=toml --exec-batch taplo format
+    fd --hidden --type=file --extension=md --extension=yml --exec-batch prettier --write
+    cargo +nightly fmt
+
+# Lint workspace with Clippy.
+clippy:
+    cargo clippy --workspace --no-default-features
+    cargo clippy --workspace --no-default-features --all-features
+    cargo hack --feature-powerset clippy --workspace
+
+# Downgrade dev-dependencies necessary to run MSRV checks/tests.
+[private]
+downgrade-msrv:
+    @ echo "No downgrades currently necessary"
+
+# Test workspace using MSRV
+test-msrv: downgrade-msrv (test msrv_rustup)
+
+# Test workspace.
+test toolchain="":
+    cargo {{ toolchain }} nextest run --workspace --no-default-features
+    cargo {{ toolchain }} nextest run --workspace --all-features
+    cargo {{ toolchain }} test --doc --workspace --all-features
+    RUSTDOCFLAGS="-D warnings" cargo {{ toolchain }} doc --workspace --no-deps --all-features

src/lib.rs

@@ -14,6 +14,8 @@
 #![deny(rust_2018_idioms, nonstandard_style)]
 #![warn(missing_debug_implementations)]
 
+use serde::de::{Deserializer, MapAccess, Visitor};
+use std::fmt;
 use std::{fs::File, io::Read, path::Path};
 
 mod error;
@@ -61,6 +63,35 @@ pub fn to_json(spec: &OpenApiV3Spec) -> Result<String, Error> {
     Ok(serde_json::to_string_pretty(spec)?)
 }
 
+pub fn deserialize_extensions<'de, D>(deserializer: D) -> Result<serde_yaml::Value, D::Error>
+where
+    D: Deserializer<'de>,
+{
+    struct ExtraFieldsVisitor;
+
+    impl<'de> Visitor<'de> for ExtraFieldsVisitor {
+        type Value = serde_yaml::Value;
+
+        fn expecting(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
+            formatter.write_str("extensions")
+        }
+
+        fn visit_map<M>(self, mut access: M) -> Result<Self::Value, M::Error>
+        where
+            M: MapAccess<'de>,
+        {
+            let mut map = serde_yaml::Mapping::new();
+            while let Some((key, value)) = access.next_entry()? {
+                map.insert(key, value);
+            }
+
+            Ok(map.into())
+        }
+    }
+
+    deserializer.deserialize_map(ExtraFieldsVisitor)
+}
+
 #[cfg(test)]
 mod tests {
     use std::{

src/spec/components.rs

@@ -1,5 +1,6 @@
 use std::collections::BTreeMap;
 
+use crate::deserialize_extensions;
 use serde::{Deserialize, Serialize};
 
 use super::{
@@ -64,5 +65,8 @@ pub struct Components {
     #[serde(default)]
     #[serde(skip_serializing_if = "BTreeMap::is_empty")]
     pub callbacks: BTreeMap<String, ObjectOrReference<Callback>>,
-    // TODO: Add "Specification Extensions" https://github.com/OAI/OpenAPI-Specification/blob/HEAD/versions/3.1.0.md#specificationExtensions}
+
+    #[serde(default)]
+    #[serde(deserialize_with = "deserialize_extensions")]
+    pub extensions: serde_yaml::Value,
 }

src/spec/parameter.rs

@@ -63,13 +63,21 @@ pub struct Parameter {
     /// `header` - `simple`; for cookie - `form`.
     #[serde(skip_serializing_if = "Option::is_none")]
     style: Option<ParameterStyle>,
+
+    #[serde(skip_serializing_if = "Option::is_none")]
+    explode: Option<bool>,
+
+    #[serde(skip_serializing_if = "Option::is_none")]
+    #[serde(rename = "in")]
+    param_in: Option<String>,
 }
 
 #[derive(Clone, Debug, Deserialize, Serialize, PartialEq)]
 #[serde(rename_all = "camelCase")]
 enum ParameterStyle {
     Form,
     Simple,
+    DeepObject,
 }
 
 impl FromRef for Parameter {

src/spec/schema.rs

@@ -30,6 +30,12 @@ pub enum Type {
     Array,
     Object,
 }
+#[derive(Clone, Debug, Deserialize, Serialize, PartialEq)]
+#[serde(untagged)]
+pub enum ObjectOrFalse<T> {
+    False(bool),
+    Object(T),
+}
 
 // FIXME: Verify against OpenAPI 3.0
 /// The Schema Object allows the definition of input and output data types.
@@ -84,7 +90,7 @@ pub struct Schema {
     /// See <https://github.com/OAI/OpenAPI-Specification/blob/HEAD/versions/3.1.0.md#properties>.
     #[serde(rename = "additionalProperties")]
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub additional_properties: Option<Box<ObjectOrReference<Schema>>>,
+    pub additional_properties: Option<Box<ObjectOrFalse<ObjectOrReference<Schema>>>>,
 
     //
     // additional metadata
@@ -104,7 +110,7 @@ pub struct Schema {
     #[serde(default)]
     #[serde(rename = "enum")]
     #[serde(skip_serializing_if = "Vec::is_empty")]
-    pub enum_values: Vec<String>,
+    pub enum_values: Vec<serde_yaml::Value>,
 
     #[serde(skip_serializing_if = "Option::is_none")]
     pub pattern: Option<String>,

src/spec/security_scheme.rs

@@ -48,7 +48,7 @@ mod tests {
     #[test]
     fn test_http_basic_deser() {
         const HTTP_BASIC_SAMPLE: &str = r#"{"type": "http", "scheme": "basic"}"#;
-        let obj: SecurityScheme = serde_json::from_str(&HTTP_BASIC_SAMPLE).unwrap();
+        let obj: SecurityScheme = serde_json::from_str(HTTP_BASIC_SAMPLE).unwrap();
 
         assert!(matches!(
             obj,