foster/denoland-deno
0
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-02-01 12:16:11 -05:00
Code Issues Packages 1 Wiki Activity

move ops

Browse source
This commit is contained in:
Bartek Iwańczuk 2024-12-22 21:20:52 +01:00
parent 8479e9541d
commit 6d03bafd1e
No known key found for this signature in database
GPG key ID: 0C6BCDDC3B3AD750
3 changed files with 88 additions and 107 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

85
cli/ops/lint.rs
View file

@ -2,13 +2,71 @@
use deno_ast::MediaType;
use deno_ast::ModuleSpecifier;
use deno_ast::SourceRange;
use deno_ast::SourceTextInfo;
use deno_ast::SourceTextProvider;
use deno_core::error::generic_error;
use deno_core::error::AnyError;
use deno_core::op2;
use deno_core::OpState;
use deno_lint::diagnostic::LintDiagnostic;
use deno_lint::diagnostic::LintDiagnosticDetails;
use deno_lint::diagnostic::LintDiagnosticRange;
use crate::tools::lint;
deno_core::extension!(deno_lint, ops = [op_lint_create_serialized_ast,],);
deno_core::extension!(
deno_lint_ext,
ops = [
op_lint_create_serialized_ast,
op_lint_report,
op_lint_get_source
],
state = |state| {
state.put(LintPluginContainer::default());
}
);
#[derive(Default)]
pub struct LintPluginContainer {
pub diagnostics: Vec<LintDiagnostic>,
pub source_text_info: Option<SourceTextInfo>,
}
impl LintPluginContainer {
fn report(
&mut self,
id: String,
specifier: String,
message: String,
start: usize,
end: usize,
) {
let source_text_info = self.source_text_info.as_ref().unwrap();
let start_pos = source_text_info.start_pos();
let source_range = SourceRange::new(start_pos + start, start_pos + end);
let range = LintDiagnosticRange {
range: source_range,
description: None,
text_info: source_text_info.clone(),
};
let lint_diagnostic = LintDiagnostic {
// TODO: fix
specifier: ModuleSpecifier::parse(&format!("file:///{}", specifier))
.unwrap(),
range: Some(range),
details: LintDiagnosticDetails {
message,
code: id,
hint: None,
fixes: vec![],
custom_docs_url: None,
info: vec![],
},
};
self.diagnostics.push(lint_diagnostic);
}
}
#[op2]
#[buffer]
@ -32,3 +90,28 @@ fn op_lint_create_serialized_ast(
})?;
Ok(lint::serialize_ast_to_buffer(&parsed_source))
}
#[op2(fast)]
fn op_lint_report(
state: &mut OpState,
#[string] id: String,
#[string] specifier: String,
#[string] message: String,
#[smi] start: usize,
#[smi] end: usize,
) {
let container = state.borrow_mut::<LintPluginContainer>();
container.report(id, specifier, message, start, end);
}
#[op2]
#[string]
fn op_lint_get_source(state: &mut OpState) -> String {
let container = state.borrow_mut::<LintPluginContainer>();
container
.source_text_info
.as_ref()
.unwrap()
.text_str()
.to_string()
}

107
cli/tools/lint/plugins.rs
View file

@ -2,20 +2,14 @@
use deno_ast::ModuleSpecifier;
use deno_ast::ParsedSource;
use deno_ast::SourceRange;
use deno_ast::SourceTextInfo;
use deno_ast::SourceTextProvider;
use deno_core::error::custom_error;
use deno_core::error::AnyError;
use deno_core::futures::FutureExt;
use deno_core::op2;
use deno_core::resolve_url_or_path;
use deno_core::v8;
use deno_core::OpState;
use deno_core::PollEventLoopOptions;
use deno_lint::diagnostic::LintDiagnostic;
use deno_lint::diagnostic::LintDiagnosticDetails;
use deno_lint::diagnostic::LintDiagnosticRange;
use deno_runtime::deno_permissions::Permissions;
use deno_runtime::deno_permissions::PermissionsContainer;
use deno_runtime::tokio_util;
@ -32,6 +26,7 @@ use crate::args::DenoSubcommand;
use crate::args::Flags;
use crate::args::LintFlags;
use crate::factory::CliFactory;
use crate::ops::lint::LintPluginContainer;
use crate::tools::lint::serialize_ast_to_buffer;
#[derive(Debug)]
@ -105,7 +100,7 @@ impl PluginRunner {
WorkerExecutionMode::Run,
main_module.clone(),
permissions,
vec![deno_lint_ext::init_ops()],
vec![crate::ops::lint::deno_lint_ext::init_ops()],
Default::default(),
)
.await?;
@ -115,30 +110,6 @@ impl PluginRunner {
log::debug!("before loaded");
// match runtime.lazy_load_es_module_with_code(
// "ext:cli/40_lint_selector.js",
// deno_core::ascii_str_include!(concat!(
// "../../js/40_lint_selector.js"
// )),
// ) {
// Ok(_) => {}
// Err(err) => {
// eprintln!("after load error {:#?}", err);
// return Err(err);
// }
// }
// let obj_result = runtime.lazy_load_es_module_with_code(
// "ext:cli/40_lint.js",
// deno_core::ascii_str_include!(concat!("../../js/40_lint.js")),
// );
// let obj = match obj_result {
// Ok(obj) => obj,
// Err(err) => {
// eprintln!("after load error {:#?}", err);
// return Err(err);
// }
// };
let obj = runtime.execute_script("lint.js", "Deno[Deno.internal]")?;
log::debug!("After plugin loaded, capturing exports");
@ -415,77 +386,3 @@ pub fn serialize_ast(parsed_source: ParsedSource) -> Result<Vec<u8>, AnyError> {
);
Ok(r)
}
#[derive(Default)]
struct LintPluginContainer {
diagnostics: Vec<LintDiagnostic>,
source_text_info: Option<SourceTextInfo>,
}
impl LintPluginContainer {
fn report(
&mut self,
id: String,
specifier: String,
message: String,
start: usize,
end: usize,
) {
let source_text_info = self.source_text_info.as_ref().unwrap();
let start_pos = source_text_info.start_pos();
let source_range = SourceRange::new(start_pos + start, start_pos + end);
let range = LintDiagnosticRange {
range: source_range,
description: None,
text_info: source_text_info.clone(),
};
let lint_diagnostic = LintDiagnostic {
// TODO: fix
specifier: ModuleSpecifier::parse(&format!("file:///{}", specifier))
.unwrap(),
range: Some(range),
details: LintDiagnosticDetails {
message,
code: id,
hint: None,
fixes: vec![],
custom_docs_url: None,
info: vec![],
},
};
self.diagnostics.push(lint_diagnostic);
}
}
deno_core::extension!(
deno_lint_ext,
ops = [op_lint_report, op_lint_get_source],
state = |state| {
state.put(LintPluginContainer::default());
},
);
#[op2(fast)]
fn op_lint_report(
state: &mut OpState,
#[string] id: String,
#[string] specifier: String,
#[string] message: String,
#[smi] start: usize,
#[smi] end: usize,
) {
let container = state.borrow_mut::<LintPluginContainer>();
container.report(id, specifier, message, start, end);
}
#[op2]
#[string]
fn op_lint_get_source(state: &mut OpState) -> String {
let container = state.borrow_mut::<LintPluginContainer>();
container
.source_text_info
.as_ref()
.unwrap()
.text_str()
.to_string()
}

3
cli/tools/test/mod.rs
View file

@ -618,7 +618,8 @@ async fn configure_main_worker(
permissions_container,
vec![
ops::testing::deno_test::init_ops(worker_sender.sender),
ops::lint::deno_lint::init_ops(),
// TODO(bartlomieju): this is temporary and should be removed before landing plugin support
ops::lint::deno_lint_ext::init_ops(),
],
Stdio {
stdin: StdioPipe::inherit(),