-
Notifications
You must be signed in to change notification settings - Fork 108
feat: support case sensitive #1714
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
24 commits
Select commit
Hold shift + click to select a range
347a706
feat: add CaseSensitivePlugin
8c36ff2
FIX: update path check
3d7b4de
Merge remote-tracking branch 'origin/master' into case—sensitive
6941fbf
fix: clippy error
a4ed48b
fix: 调整判断
7a0e83e
fix: 修复目录读取
1d8b0c6
fix: 修改参数名称
b6dc82e
fix: 调整测试方式添加e2e断言,并增加配置项只有mac系统下才需要开启相关配置
b3c8ee9
fix: 删除过滤条件
2c351a9
Merge branch 'master' into feat/case_sensitive
2ea746b
fix: 删除多余测试文件,增加更新内容
769e5eb
fix: 删除多余log
8510c58
fix: 测试执行
40f798c
fix: 添加测试系统
fff6657
fix: 调整顺序
d067e81
fix: 添加测试系统
8b0829f
fix: 非mac环境断言
4ca027d
Merge remote-tracking branch 'origin/master' into feat/case_sensitive
559984b
fix: 引用遗漏
1ee863f
fix: 断言
4ff3cf7
fix: 删除默认
9f9e892
fix: 默认配置
b0a2e66
fix: 测试覆盖
e12e460
Revert "fix: 测试覆盖"
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| use std::collections::HashMap; | ||
| use std::fs; | ||
| use std::path::Path; | ||
| use std::sync::{Arc, Mutex}; | ||
|
|
||
| use anyhow::{anyhow, Result}; | ||
|
|
||
| use crate::ast::file::Content; | ||
| use crate::compiler::Context; | ||
| use crate::plugin::{Plugin, PluginLoadParam}; | ||
|
|
||
| pub struct CaseSensitivePlugin { | ||
| cache_map: Arc<Mutex<HashMap<String, Vec<String>>>>, | ||
| } | ||
|
|
||
| impl CaseSensitivePlugin { | ||
| pub fn new() -> Self { | ||
| CaseSensitivePlugin { | ||
| cache_map: Default::default(), | ||
| } | ||
| } | ||
|
|
||
| pub fn is_checkable(&self, load_param: &PluginLoadParam, root: &String) -> bool { | ||
| let file_path = &load_param.file.path; | ||
| if !file_path.starts_with(root) { | ||
| return false; | ||
| } | ||
| for component in file_path.iter() { | ||
| if component.eq_ignore_ascii_case("node_modules") { | ||
| return false; | ||
| } | ||
| } | ||
| true | ||
| } | ||
|
|
||
| pub fn check_case_sensitive(&self, file: &Path, root: &str) -> String { | ||
| // 可变变量,在循环内会被修改 | ||
| let mut file_path = file.to_path_buf(); | ||
| let mut case_name = String::new(); | ||
| // 缓存map,file path做为key存在对应路径下的文件名和文件夹名 | ||
| let mut cache_map = self.cache_map.lock().unwrap_or_else(|e| e.into_inner()); | ||
notcold marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| while file_path.to_string_lossy().len() >= root.len() { | ||
| if let Some(current) = file_path.file_name() { | ||
| let current_str = current.to_string_lossy().to_string(); | ||
| file_path.pop(); // parent directory | ||
| let mut entries: Vec<String> = Vec::new(); | ||
| if let Some(dir) = file_path.to_str() { | ||
| if let Some(i) = cache_map.get(dir as &str) { | ||
| entries = i.to_vec(); | ||
| } else if let Ok(files) = fs::read_dir(dir) { | ||
| files.for_each(|entry| { | ||
| entries.push(entry.unwrap().file_name().to_string_lossy().to_string()); | ||
| }); | ||
| cache_map.insert(dir.to_string(), entries.to_vec()); | ||
| } | ||
| } | ||
| if !entries.contains(¤t_str) { | ||
| if let Some(correct_name) = entries | ||
| .iter() | ||
| .find(|&x| x.to_lowercase() == current_str.to_lowercase()) | ||
| { | ||
| case_name = correct_name.to_string(); | ||
| break; | ||
| } | ||
| } | ||
| } | ||
| } | ||
| case_name | ||
| } | ||
| } | ||
|
|
||
| impl Plugin for CaseSensitivePlugin { | ||
| fn name(&self) -> &str { | ||
| "case_sensitive_plugin" | ||
| } | ||
|
|
||
| fn load( | ||
| &self, | ||
| load_param: &PluginLoadParam, | ||
| context: &Arc<Context>, | ||
| ) -> Result<Option<Content>> { | ||
| let root = &context.root.to_string_lossy().to_string(); | ||
| if self.is_checkable(load_param, root) { | ||
| let dist_path = self.check_case_sensitive(load_param.file.path.as_path(), root); | ||
| if !dist_path.is_empty() { | ||
notcold marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| return Err(anyhow!( | ||
| "{} does not match the corresponding path on disk [{}]", | ||
| load_param.file.path.to_string_lossy().to_string(), | ||
| dist_path | ||
| )); | ||
| } | ||
| } | ||
| Ok(None) | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| const assert = require("assert"); | ||
| const os = require("os"); | ||
|
|
||
| module.exports = (err) => { | ||
| if (os.platform() === "darwin") { | ||
| assert( | ||
| err.stderr.includes( | ||
| `/Assets/umi-logo.png does not match the corresponding path on disk [assets]` | ||
| ), | ||
| "should throw error" | ||
| ); | ||
| } else { | ||
| assert( | ||
| err.stderr.includes( | ||
| `Module not found: Can't resolve './Assets/umi-logo.png'` | ||
| ), | ||
| "should throw error" | ||
| ); | ||
| } | ||
| }; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| import UmiLogo from "./Assets/umi-logo.png"; | ||
| console.log(UmiLogo); | ||
|
|
||
| export default UmiLogo; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| { | ||
| "mode": "production", | ||
| "caseSensitiveCheck": true | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| { | ||
| "name": "test", | ||
| "version": "1.0.0", | ||
| "dependencies": { | ||
| "a": "~1.0.0", | ||
| "b": "~1.0.0" | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.