Skip to content

Fix & complete find_imports for AST visitor #103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix & complete find_imports for AST visitor #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e8f4aab
comment out buggy code
zdivelbiss Oct 19, 2024
5d0aade
fix file importing
zdivelbiss Oct 25, 2024
f9a4cf6
final cleanup
zdivelbiss Oct 26, 2024
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
113 changes: 58 additions & 55 deletions crates/compiler/src/evaluate/visitor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -799,73 +799,76 @@ impl<'a> Visitor<'a> {
/// <https://sass-lang.com/documentation/at-rules/import#load-paths>
#[allow(clippy::cognitive_complexity, clippy::redundant_clone)]
pub fn find_import(&self, path: &Path) -> Option<PathBuf> {
let path_buf = if path.is_absolute() {
path.into()
} else {
self.current_import_path
.parent()
.unwrap_or_else(|| Path::new(""))
.join(path)
};

macro_rules! try_path {
($path:expr) => {
let path = $path;
let dirname = path.parent().unwrap_or_else(|| Path::new(""));
let basename = path.file_name().unwrap_or_else(|| OsStr::new(".."));

let partial = dirname.join(format!("_{}", basename.to_str().unwrap()));
fn test_path(options: &Options, path: impl AsRef<Path>) -> Option<PathBuf> {
let path = path.as_ref();
options.fs.is_file(path).then(|| path.to_path_buf())
}

if self.options.fs.is_file(&path) {
return Some(path.to_path_buf());
}
fn test_extension(
options: &Options,
path: impl AsRef<Path>,
extension: impl AsRef<Path>,
) -> Option<PathBuf> {
let path = path.as_ref();
let extension = extension.as_ref();

if self.options.fs.is_file(&partial) {
return Some(partial);
}
};
if !path.ends_with(extension) {
test_path(options, path.with_extension(extension))
} else {
None
}
}

if path_buf.extension() == Some(OsStr::new("scss"))
|| path_buf.extension() == Some(OsStr::new("sass"))
|| path_buf.extension() == Some(OsStr::new("css"))
{
let extension = path_buf.extension().unwrap();
try_path!(path_buf.with_extension(format!(".import{}", extension.to_str().unwrap())));
try_path!(path_buf);
// todo: consider load paths
return None;
}

macro_rules! try_path_with_extensions {
($path:expr) => {
let path = $path;
try_path!(path.with_extension("import.sass"));
try_path!(path.with_extension("import.scss"));
try_path!(path.with_extension("import.css"));
try_path!(path.with_extension("sass"));
try_path!(path.with_extension("scss"));
try_path!(path.with_extension("css"));
};
fn try_path_with_extensions(options: &Options, path: impl AsRef<Path>) -> Option<PathBuf> {
let path = path.as_ref();

test_path(options, path)
.or_else(|| test_extension(options, path, "import.sass"))
.or_else(|| test_extension(options, path, "import.scss"))
.or_else(|| test_extension(options, path, "import.css"))
.or_else(|| test_extension(options, path, "sass"))
.or_else(|| test_extension(options, path, "scss"))
.or_else(|| test_extension(options, path, "css"))
}

try_path_with_extensions!(path_buf.clone());
fn try_path(options: &Options, path: impl AsRef<Path>) -> Option<PathBuf> {
let path = path.as_ref();

if self.options.fs.is_dir(&path_buf) {
try_path_with_extensions!(path_buf.join("index"));
}
try_path_with_extensions(options, path)
.or_else(|| {
let parent_dir = path.parent()?;
let path_name = path.file_name().and_then(OsStr::to_str)?;

for load_path in &self.options.load_paths {
let path_buf = load_path.join(path);
if path_name.starts_with('_') {
// already a partial file name, so skip
return None;
}

try_path_with_extensions!(&path_buf);
try_path_with_extensions(options, parent_dir.join(format!("_{path_name}")))
})
.or_else(|| test_path(options, path.join("index.sass")))
.or_else(|| test_path(options, path.join("index.scss")))
.or_else(|| test_path(options, path.join("_index.scss")))
.or_else(|| test_path(options, path.join("_index.scss")))
}

if self.options.fs.is_dir(&path_buf) {
try_path_with_extensions!(path_buf.join("index"));
let initial_path = {
if path.is_absolute() {
path.to_path_buf()
} else {
self.current_import_path
.parent()
.unwrap_or(Path::new(""))
.join(path)
}
}
};

None
try_path(self.options, &initial_path).or_else(|| {
self.options
.load_paths
.iter()
.find_map(|load_path| try_path(self.options, load_path.join(path)))
})
}

fn parse_file(
Expand Down
2 changes: 1 addition & 1 deletion crates/compiler/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ pub fn from_path<P: AsRef<Path>>(p: P, options: &Options) -> Result<String> {
/// ```
#[inline]
pub fn from_string<S: Into<String>>(input: S, options: &Options) -> Result<String> {
from_string_with_file_name(input.into(), "stdin", options)
from_string_with_file_name(input.into(), "", options)
}

#[cfg(feature = "wasm-exports")]
Expand Down