Cargo.lock

@@ -2272,7 +2272,7 @@ dependencies = [
 
 [[package]]
 name = "torn-api"
-version = "1.4.0"
+version = "1.3.0"
 dependencies = [
  "bon",
  "bytes",
@@ -2293,7 +2293,7 @@ dependencies = [
 
 [[package]]
 name = "torn-api-codegen"
-version = "0.4.0"
+version = "0.3.0"
 dependencies = [
  "heck",
  "indexmap",

torn-api-codegen/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "torn-api-codegen"
 authors = ["Pyrit [2111649]"]
-version = "0.4.0"
+version = "0.3.0"
 edition = "2021"
 description = "Contains the v2 torn API model descriptions and codegen for the bindings"
 license-file = { workspace = true }

torn-api-codegen/src/model/mod.rs

@@ -61,11 +61,11 @@ impl Model {
 #[cfg(test)]
 mod test {
     use super::*;
-    use crate::openapi::schema::test::get_schema;
+    use crate::openapi::schema::OpenApiSchema;
 
     #[test]
     fn resolve_newtypes() {
-        let schema = get_schema();
+        let schema = OpenApiSchema::read().unwrap();
 
         let user_id_schema = schema.components.schemas.get("UserId").unwrap();
 
@@ -100,7 +100,7 @@ mod test {
 
     #[test]
     fn resolve_all() {
-        let schema = get_schema();
+        let schema = OpenApiSchema::read().unwrap();
 
         let mut unresolved = vec![];
         let total = schema.components.schemas.len();

torn-api-codegen/src/model/object.rs

@@ -420,11 +420,11 @@ impl ObjectNamespace<'_> {
 mod test {
     use super::*;
 
-    use crate::openapi::schema::test::get_schema;
+    use crate::openapi::schema::OpenApiSchema;
 
     #[test]
     fn resolve_object() {
-        let schema = get_schema();
+        let schema = OpenApiSchema::read().unwrap();
 
         let attack = schema.components.schemas.get("FactionUpgrades").unwrap();
 
@@ -436,7 +436,7 @@ mod test {
 
     #[test]
     fn resolve_objects() {
-        let schema = get_schema();
+        let schema = OpenApiSchema::read().unwrap();
 
         let mut objects = 0;
         let mut unresolved = vec![];

torn-api-codegen/src/model/parameter.rs

@@ -342,13 +342,13 @@ The default value [Self::{}](self::{}#variant.{})"#,
 
 #[cfg(test)]
 mod test {
-    use crate::openapi::{path::OpenApiPathParameter, schema::test::get_schema};
+    use crate::openapi::{path::OpenApiPathParameter, schema::OpenApiSchema};
 
     use super::*;
 
     #[test]
     fn resolve_components() {
-        let schema = get_schema();
+        let schema = OpenApiSchema::read().unwrap();
 
         let mut parameters = 0;
         let mut unresolved = vec![];
@@ -376,7 +376,7 @@ mod test {
 
     #[test]
     fn resolve_inline() {
-        let schema = get_schema();
+        let schema = OpenApiSchema::read().unwrap();
 
         let mut params = 0;
         let mut unresolved = Vec::new();
@@ -404,7 +404,7 @@ mod test {
 
     #[test]
     fn codegen_inline() {
-        let schema = get_schema();
+        let schema = OpenApiSchema::read().unwrap();
 
         let mut params = 0;
         let mut unresolved = Vec::new();

torn-api-codegen/src/model/path.rs

@@ -592,11 +592,11 @@ impl PathNamespace<'_> {
 mod test {
     use super::*;
 
-    use crate::openapi::schema::test::get_schema;
+    use crate::openapi::schema::OpenApiSchema;
 
     #[test]
     fn resolve_paths() {
-        let schema = get_schema();
+        let schema = OpenApiSchema::read().unwrap();
 
         let mut paths = 0;
         let mut unresolved = vec![];
@@ -624,7 +624,7 @@ mod test {
 
     #[test]
     fn codegen_paths() {
-        let schema = get_schema();
+        let schema = OpenApiSchema::read().unwrap();
 
         let mut paths = 0;
         let mut unresolved = vec![];

torn-api-codegen/src/openapi/parameter.rs

@@ -9,14 +9,14 @@ pub enum ParameterLocation {
     Path,
 }
 
-#[derive(Debug, Clone, Deserialize, PartialEq, Eq)]
+#[derive(Debug, Clone, Deserialize)]
 #[serde(untagged)]
 pub enum OpenApiParameterDefault<'a> {
     Int(i32),
     Str(&'a str),
 }
 
-#[derive(Debug, Clone, Deserialize, PartialEq, Eq)]
+#[derive(Debug, Clone, Deserialize)]
 pub struct OpenApiParameterSchema<'a> {
     #[serde(rename = "$ref")]
     pub ref_path: Option<&'a str>,
@@ -29,7 +29,7 @@ pub struct OpenApiParameterSchema<'a> {
     pub items: Option<Box<OpenApiParameterSchema<'a>>>,
 }
 
-#[derive(Debug, Clone, Deserialize, PartialEq, Eq)]
+#[derive(Debug, Clone, Deserialize)]
 pub struct OpenApiParameter<'a> {
     pub name: &'a str,
     pub description: Option<Cow<'a, str>>,

torn-api-codegen/src/openapi/path.rs

@@ -1,10 +1,10 @@
 use std::borrow::Cow;
 
-use serde::{Deserialize, Deserializer, Serialize};
+use serde::{Deserialize, Deserializer};
 
 use super::parameter::OpenApiParameter;
 
-#[derive(Debug, Clone, Deserialize, PartialEq, Eq)]
+#[derive(Debug, Clone, Deserialize)]
 #[serde(untagged)]
 pub enum OpenApiPathParameter<'a> {
     Link {
@@ -14,13 +14,13 @@ pub enum OpenApiPathParameter<'a> {
     Inline(OpenApiParameter<'a>),
 }
 
-#[derive(Debug, Clone, Deserialize, PartialEq, Eq)]
+#[derive(Debug, Clone, Deserialize)]
 pub struct SchemaLink<'a> {
     #[serde(rename = "$ref")]
     pub ref_path: &'a str,
 }
 
-#[derive(Debug, Clone, Deserialize, PartialEq, Eq)]
+#[derive(Debug, Clone, Deserialize)]
 #[serde(untagged)]
 pub enum OpenApiResponseBody<'a> {
     Schema(SchemaLink<'a>),
@@ -30,9 +30,6 @@ pub enum OpenApiResponseBody<'a> {
     },
 }
 
-#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, Eq)]
-pub struct OperationId(pub String);
-
 fn deserialize_response_body<'de, D>(deserializer: D) -> Result<OpenApiResponseBody<'de>, D::Error>
 where
     D: Deserializer<'de>,
@@ -63,8 +60,7 @@ where
     Ok(responses.ok.content.json.schema)
 }
 
-#[derive(Debug, Clone, Deserialize, PartialEq, Eq)]
+#[derive(Debug, Clone, Deserialize)]
-#[serde(rename_all = "snake_case")]
 pub struct OpenApiPathBody<'a> {
     pub summary: Option<Cow<'a, str>>,
     pub description: Option<Cow<'a, str>>,
@@ -76,7 +72,6 @@ pub struct OpenApiPathBody<'a> {
         deserialize_with = "deserialize_response_body"
     )]
     pub response_content: OpenApiResponseBody<'a>,
-    pub operation_id: Option<OperationId>,
 }
 
 #[derive(Debug, Clone, Deserialize)]

torn-api-codegen/src/openapi/schema.rs

@@ -19,12 +19,20 @@ pub struct OpenApiSchema<'a> {
     pub components: Components<'a>,
 }
 
+impl OpenApiSchema<'_> {
+    pub fn read() -> Result<Self, serde_json::Error> {
+        let s = include_str!("../../openapi.json");
+
+        serde_json::from_str(s)
+    }
+}
+
 #[cfg(test)]
-pub(crate) mod test {
+mod test {
     use super::*;
 
-    pub(crate) fn get_schema() -> OpenApiSchema<'static> {
+    #[test]
-        let s = include_str!("../../../torn-api/openapi.json");
+    fn read() {
-        serde_json::from_str(s).unwrap()
+        OpenApiSchema::read().unwrap();
     }
 }

torn-api/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "torn-api"
-version = "1.4.0"
+version = "1.3.0"
 edition = "2021"
 description = "Auto-generated bindings for the v2 torn api"
 license-file = { workspace = true }
@@ -37,8 +37,7 @@ chrono = { version = "0.4.41", features = ["serde"] }
 tokio = { version = "1", features = ["full"] }
 
 [build-dependencies]
-torn-api-codegen = { path = "../torn-api-codegen", version = "0.4.0" }
+torn-api-codegen = { path = "../torn-api-codegen", version = "0.3.0" }
 syn = { workspace = true, features = ["parsing"] }
 proc-macro2 = { workspace = true }
 prettyplease = "0.2"
-serde_json = { workspace = true }

torn-api/build.rs

@@ -15,8 +15,7 @@ fn main() {
     let requests_dest = Path::new(&out_dir).join("requests.rs");
     let scopes_dest = Path::new(&out_dir).join("scopes.rs");
 
-    let s = include_str!("./openapi.json");
+    let schema = OpenApiSchema::read().unwrap();
-    let schema: OpenApiSchema = serde_json::from_str(s).unwrap();
 
     let mut models_code = TokenStream::new();