dan/oxc
1
0
Fork 0
mirror of https://github.com/danbulant/oxc synced 2026-05-25 04:42:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor(span): change shape of Language (#2680)

Browse source 
Closes #2677.

Also changed the JSON output to be `javascript`, `typescript` or
`typescriptDefinition`. The current value `javaScript` / `typeScript` is
a bit weird.
This commit is contained in:
overlookmotel 2024-03-11 11:03:06 +00:00 committed by GitHub
parent b378e7ecc9
commit 75ae563dbc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
crates/oxc_span/src/source_type.rs
View file

@ -31,13 +31,12 @@ pub struct SourceType {
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, SerAttrs)] #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, SerAttrs)]
#[cfg_attr(feature = "serde", derive(Serialize))] #[cfg_attr(feature = "serde", derive(Serialize))]
#[cfg_attr(feature = "wasm", derive(Tsify))] #[cfg_attr(feature = "wasm", derive(Tsify))]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "lowercase")]
pub enum Language { pub enum Language {
JavaScript, JavaScript,
#[serde(rename_all = "camelCase")] TypeScript,
TypeScript { #[serde(rename = "typescriptDefinition")]
is_definition_file: bool, TypeScriptDefinition,
},
} }
/// Script or Module /// Script or Module
@ -91,15 +90,15 @@ impl SourceType {
} }
pub fn is_javascript(self) -> bool { pub fn is_javascript(self) -> bool {
matches!(self.language, Language::JavaScript) self.language == Language::JavaScript
} }
pub fn is_typescript(self) -> bool { pub fn is_typescript(self) -> bool {
matches!(self.language, Language::TypeScript { .. }) matches!(self.language, Language::TypeScript | Language::TypeScriptDefinition)
} }
pub fn is_typescript_definition(self) -> bool { pub fn is_typescript_definition(self) -> bool {
matches!(self.language, Language::TypeScript { is_definition_file: true }) self.language == Language::TypeScriptDefinition
} }
pub fn is_jsx(self) -> bool { pub fn is_jsx(self) -> bool {
@ -131,7 +130,7 @@ impl SourceType {
#[must_use] #[must_use]
pub fn with_typescript(mut self, yes: bool) -> Self { pub fn with_typescript(mut self, yes: bool) -> Self {
if yes { if yes {
self.language = Language::TypeScript { is_definition_file: false }; self.language = Language::TypeScript;
} }
self self
} }
@ -139,7 +138,7 @@ impl SourceType {
#[must_use] #[must_use]
pub fn with_typescript_definition(mut self, yes: bool) -> Self { pub fn with_typescript_definition(mut self, yes: bool) -> Self {
if yes { if yes {
self.language = Language::TypeScript { is_definition_file: true }; self.language = Language::TypeScriptDefinition;
} }
self self
} }
@ -182,14 +181,15 @@ impl SourceType {
) )
})?; })?;
let is_definition_file = file_name.ends_with(".d.ts")
|| file_name.ends_with(".d.mts")
|| file_name.ends_with(".d.cts");
let language = match extension { let language = match extension {
"js" | "mjs" | "cjs" | "jsx" => Language::JavaScript, "js" | "mjs" | "cjs" | "jsx" => Language::JavaScript,
"ts" | "mts" | "cts" | "tsx" => Language::TypeScript { is_definition_file }, "ts" if file_name.ends_with(".d.ts") => Language::TypeScriptDefinition,
_ => unreachable!(), "mts" if file_name.ends_with(".d.mts") => Language::TypeScriptDefinition,
"cts" if file_name.ends_with(".d.cts") => Language::TypeScriptDefinition,
_ => {
debug_assert!(matches!(extension, "ts" | "mts" | "cts" | "tsx"));
Language::TypeScript
}
}; };
let variant = match extension { let variant = match extension {