Skip to content

Commit 4180819

Browse files
committed
fix: 调整 config_schema 读取方式
1 parent 68a5c2f commit 4180819

4 files changed

Lines changed: 10 additions & 16 deletions

File tree

Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
[package]
22
edition = "2021"
33
name = "tarojs_doctor"
4-
version = "0.0.0"
4+
version = "0.0.3"
5+
include = ["assets/**"]
56

67
[lib]
78
crate-type = ["cdylib"]

js-binding.d.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
/* auto-generated by NAPI-RS */
55

6-
export function validateConfig(configStr: string): boolean
7-
export function validatePackage(appPath: string, nodeModulesPath: string): boolean
8-
export function validateEnv(): boolean
9-
export function validateRecommend(appPath: string): boolean
10-
export function validateEslint(): boolean
6+
export function validateConfig(configStr: string): void
7+
export function validatePackage(appPath: string, nodeModulesPath: string): void
8+
export function validateEnv(): void
9+
export function validateRecommend(appPath: string): void
10+
export function validateEslint(): void

src/lib.rs

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
mod validators;
44

5-
use std::{ fs, error::Error, path::PathBuf, env };
5+
use std::{ fs, error::Error, path::PathBuf };
66

77
use validators::{env::EnvValidator, recommend::RecommendValidator};
88

@@ -74,15 +74,8 @@ fn validate_config_core(config_str: String) -> Result<bool, Box<dyn Error>> {
7474
solution: None
7575
};
7676
println!("{}", tip);
77-
let current_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
78-
let mut path = PathBuf::new();
79-
path.push(current_dir);
80-
path.push("src");
81-
path.push("validators");
82-
path.push("config_schema.json");
83-
let schema_path = path.as_path();
84-
let schema_str = fs::read_to_string(schema_path)?;
85-
let config_validator_result = ConfigValidator::build(schema_str, config_str);
77+
let schema_str = include_str!("../assets/config_schema.json");
78+
let config_validator_result = ConfigValidator::build(String::from(schema_str), config_str);
8679
let messages = match config_validator_result {
8780
Ok(config_validator) => config_validator.validate(),
8881
Err(e) => vec![

0 commit comments

Comments
 (0)