Update specta (#234)

oscartbeaumont · Oct 22, 2023 · f5031c7 · f5031c7
1 parent 899a185
commit f5031c7
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -63,9 +63,9 @@ pprof = { version = "0.13.0", features = ["flamegraph", "criterion", "protobuf-c
 members = ["./crates/*", "./examples", "./examples/axum", "./examples/vercel", "./examples/tauri/src-tauri"]
 
 [workspace.dependencies]
-specta = { version = "=2.0.0-rc.1", default-features = false, features = ["serde", "serde_json"] }
+specta = { version = "=2.0.0-rc.5", default-features = false, features = ["serde", "serde_json"] }
 serde = { version = "1", default-features = false, features = ["derive"] }
 thiserror = { version = "1.0.49", default-features = false }
 
 [patch.crates-io]
-specta = { git = "https://github.com/oscartbeaumont/specta", rev = "5948d80f2551780eda2c7bf38450fc796c74cfbf" }
+specta = { git = "https://github.com/oscartbeaumont/specta", rev = "4dea4d52ebced76e9ccf5970f8122b00772b809c" }
diff --git a/crates/core/src/error.rs b/crates/core/src/error.rs
@@ -1,7 +1,7 @@
 use std::{error, fmt, sync::Arc};
 
 use serde::Serialize;
-use specta::{ts::TsExportError, Type};
+use specta::{ts, Type};
 
 #[derive(Clone, Debug, Serialize, PartialEq, Eq, Type)]
 pub enum ProcedureError {
@@ -151,7 +151,7 @@ pub enum ExportError {
  #[error("IO error exporting bindings: {0}")]
  IOErr(#[from] std::io::Error),
  #[error("error exporting typescript bindings: {0}")]
- TsExportErr(#[from] TsExportError),
+ TsExportErr(#[from] ts::ExportError),
 }
 
 #[derive(Clone, Debug, Serialize, Type)]

diff --git a/crates/core/src/procedure_store.rs b/crates/core/src/procedure_store.rs
@@ -1,9 +1,6 @@
 use std::{borrow::Cow, convert::Infallible};
 
-use specta::{
- ts::TsExportError, DataType, DataTypeFrom, DefOpts, NamedDataType, StructType, TupleType, Type,
- TypeMap,
-};
+use specta::{ts, DataType, DataTypeFrom, DefOpts, NamedDataType, StructType, Type, TypeMap};
 
 use crate::{
  layer::{DynLayer, Layer},
@@ -66,14 +63,13 @@ fn never() -> DataType {
  },
  &[],
  )
- .expect("rspc: error exporting `never`")
 }
 
 impl ProcedureDef {
  pub fn from_tys<TArg, TResult, TError>(
  key: Cow<'static, str>,
  type_map: &mut TypeMap,
- ) -> Result<Self, TsExportError>
+ ) -> Result<Self, ts::ExportError>
  where
  TArg: Type,
  TResult: Type,
@@ -87,8 +83,10 @@ impl ProcedureDef {
  type_map,
  },
  &[],
- )? {
- DataType::Tuple(TupleType::Named { fields, .. }) if fields.is_empty() => never(),
+ )
+ .inner
+ {
+ DataType::Tuple(tuple) if tuple.elements().is_empty() => never(),
  t => t,
  },
  result: TResult::reference(
@@ -97,14 +95,16 @@ impl ProcedureDef {
  type_map,
  },
  &[],
- )?,
+ )
+ .inner,
  error: TError::reference(
  DefOpts {
  parent_inline: false,
  type_map,
  },
  &[],
- )?,
+ )
+ .inner,
  })
  }
 }

diff --git a/crates/core/src/router.rs b/crates/core/src/router.rs
@@ -9,7 +9,7 @@ use std::{
 };
 
 use specta::{
- ts::{self, FormatterFn, TsExportError},
+ ts::{self, FormatterFn},
  TypeMap,
 };
 
@@ -152,7 +152,7 @@ where
  {
  if existing_sid != sid {
  return Err(ExportError::TsExportErr(
- TsExportError::DuplicateTypeName(
+ ts::ExportError::DuplicateTypeName(
  dt.name().clone(),
  *ext.impl_location(),
  existing_impl_location,