improve integration

Laeri · Jul 9, 2024 · 952bcd9 · 952bcd9
1 parent 30d0d76
commit 952bcd9
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 28 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -15,14 +15,14 @@ description = "Parse jetbrains .http/.rest http client formatted files into a mo
 [features]
 default = ["serde"]
 serde = ["dep:serde", "dep:serde_json"]
-rspc = ["dep:rspc"]
+specta = ["dep:specta"]
 
 [dependencies]
 http = "0.2.9"
 regex = "1.7.3"
-serde_json = {version = "1.0.96", optional = true}
-serde = {version =  "1.0.160", features = ["derive"], optional = true}
-rspc = { version = "0.1.3", optional = true}
+serde_json = { version = "1.0.96", optional = true }
+serde = { version =  "1.0.160", features = ["derive"], optional = true }
+specta = { version = "1.0.5", optional = true }
 url = "2.4.0"
 thiserror = "1.0.43"
 

diff --git a/src/error.rs b/src/error.rs
@@ -1,5 +1,5 @@
-#[cfg(feature = "rspc")]
-use rspc::Type;
+#[cfg(feature = "specta")]
+use specta::Type;
 
 use std::path::PathBuf;
 
@@ -9,10 +9,9 @@ use thiserror::Error;
 use crate::model::PartialRequest;
 
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "rspc", derive(Type))]
+#[cfg_attr(feature = "specta", derive(Type))]
 #[derive(Error, Debug, PartialEq, Eq, Clone)]
 pub enum ParseError {
-
     #[error("Could not read the file: '{0}'.")]
     CouldNotReadRequestFile(PathBuf),
 

diff --git a/src/model.rs b/src/model.rs
@@ -1,5 +1,5 @@
-#[cfg(feature = "rspc")]
-use rspc::Type;
+#[cfg(feature = "specta")]
+use specta::Type;
 
 use serde::{Deserialize, Serialize};
 
@@ -152,7 +152,7 @@ impl<T: std::cmp::PartialEq> PartialEq for WithDefault<T> {
 #[allow(clippy::upper_case_acronyms)]
 #[derive(Debug, Clone, PartialEq, Eq, Default)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "rspc", derive(Type))]
+#[cfg_attr(feature = "specta", derive(Type))]
 pub enum HttpMethod {
     #[default]
     GET,
@@ -204,7 +204,7 @@ impl HttpMethod {
 
 #[derive(PartialEq, Debug, Clone)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "rspc", derive(Type))]
+#[cfg_attr(feature = "specta", derive(Type))]
 pub enum RequestTarget {
     RelativeOrigin { uri: String },
     Absolute { uri: String },
@@ -215,7 +215,7 @@ pub enum RequestTarget {
 
 #[derive(Debug, Clone, PartialEq, Eq)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "rspc", derive(Type))]
+#[cfg_attr(feature = "specta", derive(Type))]
 pub enum SettingsEntry {
     NoRedirect,
     NoLog,
@@ -225,7 +225,7 @@ pub enum SettingsEntry {
 
 #[derive(Debug, Clone, PartialEq, Eq)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "rspc", derive(Type))]
+#[cfg_attr(feature = "specta", derive(Type))]
 pub struct RequestSettings {
     pub no_redirect: Option<bool>,
     pub no_log: Option<bool>,
@@ -272,7 +272,7 @@ impl RequestSettings {
 
 #[derive(Debug, Clone, PartialEq, Eq)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "rspc", derive(Type))]
+#[cfg_attr(feature = "specta", derive(Type))]
 pub struct DispositionField {
     pub name: String,
     pub filename: Option<String>,
@@ -305,7 +305,7 @@ impl DispositionField {
 
 #[derive(PartialEq, Debug, Clone)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "rspc", derive(Type))]
+#[cfg_attr(feature = "specta", derive(Type))]
 pub struct Multipart {
     pub data: DataSource<String>,
     pub disposition: DispositionField,
@@ -314,7 +314,7 @@ pub struct Multipart {
 
 #[derive(Debug, Clone, PartialEq, Eq)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "rspc", derive(Type))]
+#[cfg_attr(feature = "specta", derive(Type))]
 pub enum DataSource<T> {
     Raw(T),
     FromFilepath(String),
@@ -331,7 +331,7 @@ impl ToString for DataSource<String> {
 
 #[derive(Debug, Clone, PartialEq, Eq)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "rspc", derive(Type))]
+#[cfg_attr(feature = "specta", derive(Type))]
 pub struct UrlEncodedParam {
     pub key: String,
     pub value: String,
@@ -352,7 +352,7 @@ impl UrlEncodedParam {
 
 #[derive(Debug, Clone, PartialEq)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "rspc", derive(Type))]
+#[cfg_attr(feature = "specta", derive(Type))]
 pub enum RequestBody {
     None,
 
@@ -489,7 +489,7 @@ impl RequestTarget {
 
 #[derive(PartialEq, Debug, Clone)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "rspc", derive(Type))]
+#[cfg_attr(feature = "specta", derive(Type))]
 pub struct Header {
     pub key: String,
     pub value: String,
@@ -514,7 +514,7 @@ impl ToString for Header {
 
 #[derive(PartialEq, Debug, Clone)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "rspc", derive(Type))]
+#[cfg_attr(feature = "specta", derive(Type))]
 pub enum HttpRestFileExtension {
     Http,
     Rest,
@@ -561,7 +561,7 @@ pub struct HttpRestFile {
 }
 
 #[derive(PartialEq, Debug, Clone, Eq)]
-#[cfg_attr(feature = "rspc", derive(Type))]
+#[cfg_attr(feature = "specta", derive(Type))]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 pub enum PreRequestScript {
     FromFilepath(String),
@@ -581,15 +581,15 @@ impl ToString for PreRequestScript {
 
 #[derive(PartialEq, Debug, Clone, Eq)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "rspc", derive(Type))]
+#[cfg_attr(feature = "specta", derive(Type))]
 pub enum ResponseHandler {
     FromFilepath(String),
     Script(String),
 }
 
 #[derive(PartialEq, Debug, Clone, Eq)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "rspc", derive(Type))]
+#[cfg_attr(feature = "specta", derive(Type))]
 ///https://www.jetbrains.com/help/idea/http-client-in-product-code-editor.html#redirect-output-to-a-custom-file-or-directory
 pub enum SaveResponse {
     // save the response into a new file if there exists already an existing save (use incremental
@@ -631,7 +631,7 @@ impl Default for Request {
 
 #[derive(PartialEq, Debug, Clone)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "rspc", derive(Type))]
+#[cfg_attr(feature = "specta", derive(Type))]
 pub enum CommentKind {
     // //
     DoubleSlash,
@@ -665,7 +665,7 @@ impl std::str::FromStr for CommentKind {
 
 #[derive(PartialEq, Debug, Clone)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "rspc", derive(Type))]
+#[cfg_attr(feature = "specta", derive(Type))]
 pub struct Comment {
     pub value: String,
     pub kind: CommentKind,
@@ -683,7 +683,7 @@ impl ToString for Comment {
 
 #[derive(PartialEq, Debug, Clone, Eq)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "rspc", derive(Type))]
+#[cfg_attr(feature = "specta", derive(Type))]
 pub struct HttpVersion {
     pub major: u32,
     pub minor: u32,

diff --git a/src/parser.rs b/src/parser.rs
@@ -23,7 +23,7 @@ pub struct Parser {}
 type ParseResult<T> = Result<(T, Vec<ParseErrorDetails>), ParseErrorDetails>;
 
 impl Parser {
-    pub const REST_FILE_EXTENSIONS: [&str; 2] = ["http", "rest"];
+    pub const REST_FILE_EXTENSIONS: [&'static str; 2] = ["http", "rest"];
 
     #[allow(dead_code)]
     pub fn has_valid_extension<T: AsRef<std::path::Path>>(path: &T) -> bool {