dan/oxc
1
0
Fork 0
mirror of https://github.com/danbulant/oxc synced 2026-05-24 12:21:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor(span): reduce #[cfg_attr] boilerplate in type defs (#4702)

Browse source 
Similar to #4375 and #4698. #4696 added `#[ast]` attribute to types in `oxc_span`, so these types can use `#[serde]` attrs without the `#[cfg_attr(feature = "serialize", ...)]` guard.
This commit is contained in:
overlookmotel 2024-08-06 18:00:07 +00:00
parent 125c5fd8ed
commit e1429e5ef1
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
crates/oxc_span/src/source_type/types.rs
View file

@ -6,7 +6,7 @@ use ::{serde::Serialize, tsify::Tsify};
#[ast] #[ast]
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
#[cfg_attr(feature = "serialize", derive(Serialize, Tsify))] #[cfg_attr(feature = "serialize", derive(Serialize, Tsify))]
#[cfg_attr(feature = "serialize", serde(rename_all = "camelCase"))] #[serde(rename_all = "camelCase")]
pub struct SourceType { pub struct SourceType {
/// JavaScript or TypeScript, default JavaScript /// JavaScript or TypeScript, default JavaScript
pub(super) language: Language, pub(super) language: Language,
@ -26,11 +26,11 @@ pub struct SourceType {
#[ast] #[ast]
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
#[cfg_attr(feature = "serialize", derive(Serialize, Tsify))] #[cfg_attr(feature = "serialize", derive(Serialize, Tsify))]
#[cfg_attr(feature = "serialize", serde(rename_all = "lowercase"))] #[serde(rename_all = "lowercase")]
pub enum Language { pub enum Language {
JavaScript = 0, JavaScript = 0,
TypeScript = 1, TypeScript = 1,
#[cfg_attr(feature = "serialize", serde(rename = "typescriptDefinition"))] #[serde(rename = "typescriptDefinition")]
TypeScriptDefinition = 2, TypeScriptDefinition = 2,
} }
@ -38,7 +38,7 @@ pub enum Language {
#[ast] #[ast]
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
#[cfg_attr(feature = "serialize", derive(Serialize, Tsify))] #[cfg_attr(feature = "serialize", derive(Serialize, Tsify))]
#[cfg_attr(feature = "serialize", serde(rename_all = "camelCase"))] #[serde(rename_all = "camelCase")]
pub enum ModuleKind { pub enum ModuleKind {
Script = 0, Script = 0,
Module = 1, Module = 1,
@ -48,7 +48,7 @@ pub enum ModuleKind {
#[ast] #[ast]
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
#[cfg_attr(feature = "serialize", derive(Serialize, Tsify))] #[cfg_attr(feature = "serialize", derive(Serialize, Tsify))]
#[cfg_attr(feature = "serialize", serde(rename_all = "camelCase"))] #[serde(rename_all = "camelCase")]
pub enum LanguageVariant { pub enum LanguageVariant {
Standard = 0, Standard = 0,
Jsx = 1, Jsx = 1,

4
crates/oxc_span/src/span.rs
View file

@ -8,9 +8,7 @@ use std::{
use miette::{LabeledSpan, SourceOffset, SourceSpan}; use miette::{LabeledSpan, SourceOffset, SourceSpan};
#[cfg(feature = "serialize")] #[cfg(feature = "serialize")]
use serde::Serialize; use ::{serde::Serialize, tsify::Tsify};
#[cfg(feature = "serialize")]
use tsify::Tsify;
/// An Empty span useful for creating AST nodes. /// An Empty span useful for creating AST nodes.
pub const SPAN: Span = Span::new(0, 0); pub const SPAN: Span = Span::new(0, 0);