Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions crates/oxc_linter/src/loader/partial_loader/astro.rs
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
use memchr::memmem::Finder;
use memchr::memmem::{Finder, FinderRev};

use oxc_span::{SourceType, Span};

use crate::loader::JavaScriptSource;

use super::{SCRIPT_END, SCRIPT_START};
use super::{COMMENT_END, COMMENT_START, SCRIPT_END, SCRIPT_START, find_script_start};

const ASTRO_SPLIT: &str = "---";

Expand Down Expand Up @@ -55,6 +55,8 @@ impl<'a> AstroPartialLoader<'a> {
fn parse_scripts(&self, start: usize) -> Vec<JavaScriptSource<'a>> {
let script_start_finder = Finder::new(SCRIPT_START);
let script_end_finder = Finder::new(SCRIPT_END);
let comment_start_finder = FinderRev::new(COMMENT_START);
let comment_end_finder = Finder::new(COMMENT_END);

let mut results = vec![];
let mut pointer = start;
Expand All @@ -63,9 +65,14 @@ impl<'a> AstroPartialLoader<'a> {
let js_start;
let js_end;
// find opening "<script"
if let Some(offset) = script_start_finder.find(&self.source_text.as_bytes()[pointer..])
{
pointer += offset + SCRIPT_START.len();
if let Some(offset) = find_script_start(
self.source_text,
pointer,
&script_start_finder,
&comment_start_finder,
&comment_end_finder,
) {
pointer += offset;
} else {
break;
}
Expand Down
31 changes: 31 additions & 0 deletions crates/oxc_linter/src/loader/partial_loader/mod.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
use memchr::{memmem::Finder, memmem::FinderRev};
use oxc_span::VALID_EXTENSIONS;

use crate::loader::JavaScriptSource;
Expand All @@ -11,6 +12,8 @@ pub use vue::VuePartialLoader;

const SCRIPT_START: &str = "<script";
const SCRIPT_END: &str = "</script>";
const COMMENT_START: &str = "<!--";
const COMMENT_END: &str = "-->";

/// File extensions that can contain JS/TS code in certain parts, such as in `<script>` tags, and can
/// be loaded using the [`PartialLoader`].
Expand Down Expand Up @@ -69,3 +72,31 @@ fn find_script_closing_angle(source_text: &str, pointer: usize) -> Option<usize>

None
}

fn find_script_start(
source_text: &str,
pointer: usize,
script_start_finder: &Finder<'_>,
comment_start_finder: &FinderRev<'_>,
comment_end_finder: &Finder<'_>,
) -> Option<usize> {
let mut new_pointer = pointer;

loop {
new_pointer +=
script_start_finder.find(&source_text.as_bytes()[new_pointer..])? + SCRIPT_START.len();

if let Some(offset) = comment_start_finder.rfind(&source_text.as_bytes()[..new_pointer]) {
if comment_end_finder
.find(&source_text.as_bytes()[offset + COMMENT_START.len()..new_pointer])
.is_some()
{
break;
}
} else {
break;
}
}

Some(new_pointer - pointer)
}
19 changes: 14 additions & 5 deletions crates/oxc_linter/src/loader/partial_loader/svelte.rs
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
use memchr::memmem::Finder;
use memchr::memmem::{Finder, FinderRev};

use oxc_span::SourceType;

use crate::loader::JavaScriptSource;

use super::{SCRIPT_END, SCRIPT_START, find_script_closing_angle};
use super::{
COMMENT_END, COMMENT_START, SCRIPT_END, SCRIPT_START, find_script_closing_angle,
find_script_start,
};

pub struct SveltePartialLoader<'a> {
source_text: &'a str,
Expand Down Expand Up @@ -37,10 +40,16 @@ impl<'a> SveltePartialLoader<'a> {
fn parse_script(&self, pointer: &mut usize) -> Option<JavaScriptSource<'a>> {
let script_start_finder = Finder::new(SCRIPT_START);
let script_end_finder = Finder::new(SCRIPT_END);

let comment_start_finder = FinderRev::new(COMMENT_START);
let comment_end_finder: Finder<'_> = Finder::new(COMMENT_END);
// find opening "<script"
let offset = script_start_finder.find(&self.source_text.as_bytes()[*pointer..])?;
*pointer += offset + SCRIPT_START.len();
*pointer += find_script_start(
self.source_text,
*pointer,
&script_start_finder,
&comment_start_finder,
&comment_end_finder,
)?;

// find closing ">"
let offset = find_script_closing_angle(self.source_text, *pointer)?;
Expand Down
34 changes: 28 additions & 6 deletions crates/oxc_linter/src/loader/partial_loader/vue.rs
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
use memchr::memmem::Finder;
use memchr::memmem::{Finder, FinderRev};

use oxc_span::SourceType;

use crate::frameworks::FrameworkOptions;

use super::{JavaScriptSource, SCRIPT_END, SCRIPT_START, find_script_closing_angle};
use super::{
COMMENT_END, COMMENT_START, JavaScriptSource, SCRIPT_END, SCRIPT_START,
find_script_closing_angle, find_script_start,
};

pub struct VuePartialLoader<'a> {
source_text: &'a str,
Expand Down Expand Up @@ -36,10 +39,16 @@ impl<'a> VuePartialLoader<'a> {

fn parse_script(&self, pointer: &mut usize) -> Option<JavaScriptSource<'a>> {
let script_start_finder = Finder::new(SCRIPT_START);

let comment_start_finder = FinderRev::new(COMMENT_START);
let comment_end_finder: Finder<'_> = Finder::new(COMMENT_END);
// find opening "<script"
let offset = script_start_finder.find(&self.source_text.as_bytes()[*pointer..])?;
*pointer += offset + SCRIPT_START.len();
*pointer += find_script_start(
self.source_text,
*pointer,
&script_start_finder,
&comment_start_finder,
&comment_end_finder,
)?;

// skip `<script-`
if !self.source_text[*pointer..].starts_with([' ', '>']) {
Expand All @@ -65,7 +74,7 @@ impl<'a> VuePartialLoader<'a> {
let js_start = *pointer;

// find "</script>"
let script_end_finder = Finder::new(SCRIPT_END);
let script_end_finder: Finder<'_> = Finder::new(SCRIPT_END);
let offset = script_end_finder.find(&self.source_text.as_bytes()[*pointer..])?;
let js_end = *pointer + offset;
*pointer += offset + SCRIPT_END.len();
Expand Down Expand Up @@ -289,6 +298,19 @@ mod test {
assert_eq!(result.source_text, "a");
}

#[test]
fn test_script_inside_code_comment() {
let source_text = r"
<!-- <script>a</script> -->
<!-- <script> -->
<script>b</script>
";

let result: JavaScriptSource<'_> = parse_vue(source_text);
assert_eq!(result.source_text, "b");
assert_eq!(result.start, 79);
}

#[test]
fn lang() {
let cases = [
Expand Down
Loading