Unverified Commit a81b4594 authored by Donny/강동윤's avatar Donny/강동윤 Committed by GitHub

build: Update `swc_core` to `v16.4.0` (#76596)

### What?

ChangeLog:
https://github.com/swc-project/swc/compare/swc_core%40v16.0.0...swc_core%40v16.4.0

### Why?

To apply https://github.com/swc-project/swc/pull/10119 and fix random panics.

---------
Co-authored-by: 's avatarCPunisher <1343316114@qq.com>
parent ee5c7d39
...@@ -3604,6 +3604,15 @@ dependencies = [ ...@@ -3604,6 +3604,15 @@ dependencies = [
"serde_json", "serde_json",
] ]
[[package]]
name = "jsonc-parser"
version = "0.26.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b558af6b49fd918e970471374e7a798b2c9bbcda624a210ffa3901ee5614bc8e"
dependencies = [
"serde_json",
]
[[package]] [[package]]
name = "kqueue" name = "kqueue"
version = "1.0.8" version = "1.0.8"
...@@ -4103,12 +4112,12 @@ dependencies = [ ...@@ -4103,12 +4112,12 @@ dependencies = [
[[package]] [[package]]
name = "mdxjs" name = "mdxjs"
version = "0.3.2" version = "0.3.2"
source = "git+https://github.com/kdy1/mdxjs-rs.git?branch=swc-core-15#2113f02a46ef0299a94248fe3ae064306888fc56" source = "git+https://github.com/kdy1/mdxjs-rs.git?branch=swc-core-16#bb0b5dbccd35943d7982b6b5f40f062bf039918a"
dependencies = [ dependencies = [
"markdown", "markdown",
"rustc-hash 2.1.0", "rustc-hash 2.1.0",
"serde", "serde",
"swc_core 15.0.1", "swc_core",
] ]
[[package]] [[package]]
...@@ -4428,7 +4437,7 @@ dependencies = [ ...@@ -4428,7 +4437,7 @@ dependencies = [
"serde", "serde",
"serde_json", "serde_json",
"shadow-rs", "shadow-rs",
"swc_core 16.0.0", "swc_core",
"tracing", "tracing",
"turbo-rcstr", "turbo-rcstr",
"turbo-tasks", "turbo-tasks",
...@@ -4517,7 +4526,7 @@ dependencies = [ ...@@ -4517,7 +4526,7 @@ dependencies = [
"rustc-hash 2.1.0", "rustc-hash 2.1.0",
"serde", "serde",
"serde_json", "serde_json",
"swc_core 16.0.0", "swc_core",
"swc_relay", "swc_relay",
"thiserror", "thiserror",
"tracing", "tracing",
...@@ -4571,7 +4580,7 @@ dependencies = [ ...@@ -4571,7 +4580,7 @@ dependencies = [
"sha1", "sha1",
"styled_components", "styled_components",
"styled_jsx", "styled_jsx",
"swc_core 16.0.0", "swc_core",
"swc_emotion", "swc_emotion",
"swc_relay", "swc_relay",
"testing", "testing",
...@@ -4609,7 +4618,7 @@ dependencies = [ ...@@ -4609,7 +4618,7 @@ dependencies = [
"serde", "serde",
"serde_json", "serde_json",
"shadow-rs", "shadow-rs",
"swc_core 16.0.0", "swc_core",
"tokio", "tokio",
"tracing", "tracing",
"tracing-chrome", "tracing-chrome",
...@@ -6995,16 +7004,16 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" ...@@ -6995,16 +7004,16 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
[[package]] [[package]]
name = "swc" name = "swc"
version = "16.0.0" version = "16.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "908e306e4abcb0bdcf42ffa08325b178e4a27d9ed62d24208cd8f2e5d456a3d6" checksum = "afca37a21a7f4eed3a77bb067e5693fa7dedb98bb85fd90a9bd9a04df4882174"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"base64 0.21.4", "base64 0.22.1",
"dashmap 5.5.3", "dashmap 5.5.3",
"either", "either",
"indexmap 2.7.1", "indexmap 2.7.1",
"jsonc-parser", "jsonc-parser 0.26.2",
"lru", "lru",
"napi", "napi",
"napi-derive", "napi-derive",
...@@ -7056,7 +7065,7 @@ dependencies = [ ...@@ -7056,7 +7065,7 @@ dependencies = [
"clap", "clap",
"owo-colors 3.5.0", "owo-colors 3.5.0",
"regex", "regex",
"swc_core 16.0.0", "swc_core",
] ]
[[package]] [[package]]
...@@ -7172,12 +7181,12 @@ dependencies = [ ...@@ -7172,12 +7181,12 @@ dependencies = [
[[package]] [[package]]
name = "swc_compiler_base" name = "swc_compiler_base"
version = "13.0.0" version = "13.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4cc6e0eaba5b6410fda9c3189145616b3146ac14328ffc000cfe8319e0dea530" checksum = "278d50af64cf07f4e9893a294b5b25488de48de56e352fc5cdebff985854ecd8"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"base64 0.21.4", "base64 0.22.1",
"napi", "napi",
"napi-derive", "napi-derive",
"once_cell", "once_cell",
...@@ -7227,26 +7236,9 @@ dependencies = [ ...@@ -7227,26 +7236,9 @@ dependencies = [
[[package]] [[package]]
name = "swc_core" name = "swc_core"
version = "15.0.1" version = "16.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a622dbfdda214d472e8da044d5bd5975c831d6e17c5016fcde4b2681c2be1cf2"
dependencies = [
"swc_allocator",
"swc_atoms",
"swc_common",
"swc_ecma_ast",
"swc_ecma_codegen",
"swc_ecma_parser",
"swc_ecma_transforms_base",
"swc_ecma_visit",
"vergen 9.0.1",
]
[[package]]
name = "swc_core"
version = "16.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "78a1b29d23d2c215a9cd55cd821e3383f64694b4a3172317c13162cfd3763074" checksum = "9ee84d0cb86de8dae582aab106dbf2ea5e0045232656f2f4c149126f561caf57"
dependencies = [ dependencies = [
"binding_macros", "binding_macros",
"swc", "swc",
...@@ -7437,9 +7429,9 @@ dependencies = [ ...@@ -7437,9 +7429,9 @@ dependencies = [
[[package]] [[package]]
name = "swc_ecma_codegen" name = "swc_ecma_codegen"
version = "8.0.1" version = "8.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "874889c00e41e5ae487886ff4af2533944584e8b479bc469a3f9708cab7ecdb7" checksum = "92103aa982740f265d6850bb3ffffbf6c3c1dee30ab0ed25117ca553f0d7467d"
dependencies = [ dependencies = [
"ascii", "ascii",
"compact_str", "compact_str",
...@@ -7683,9 +7675,9 @@ dependencies = [ ...@@ -7683,9 +7675,9 @@ dependencies = [
[[package]] [[package]]
name = "swc_ecma_lints" name = "swc_ecma_lints"
version = "11.0.0" version = "11.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5aa46331be775b9ab6f114251ceb79cf7adb8e43d27183673615752a7ac828e5" checksum = "39c61cc0dd2b072152de9cdb6eaf6cb57e979b359ed8d0eb86ce8c3450308b2e"
dependencies = [ dependencies = [
"auto_impl", "auto_impl",
"dashmap 5.5.3", "dashmap 5.5.3",
...@@ -7727,9 +7719,9 @@ dependencies = [ ...@@ -7727,9 +7719,9 @@ dependencies = [
[[package]] [[package]]
name = "swc_ecma_minifier" name = "swc_ecma_minifier"
version = "12.0.1" version = "12.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5fc1b838f90630f1c620113c3517eed44f1b36b09274ada47ed7e4cb4ec10899" checksum = "7ab1450f85ca7d1bb35cd913227d31f01a744f25cd22026f735a2128c9fa4c61"
dependencies = [ dependencies = [
"arrayvec 0.7.4", "arrayvec 0.7.4",
"indexmap 2.7.1", "indexmap 2.7.1",
...@@ -7863,9 +7855,9 @@ dependencies = [ ...@@ -7863,9 +7855,9 @@ dependencies = [
[[package]] [[package]]
name = "swc_ecma_transforms_base" name = "swc_ecma_transforms_base"
version = "11.1.0" version = "11.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "04434877d7529c9067def1a15ad436d6f65d0997657bd1c56430af70914064dc" checksum = "39889063ff4819eae414dfe6426aa5cd72ebb0f9f48739a1fa1e7eb82d0adc78"
dependencies = [ dependencies = [
"better_scoped_tls", "better_scoped_tls",
"bitflags 2.5.0", "bitflags 2.5.0",
...@@ -8004,9 +7996,9 @@ dependencies = [ ...@@ -8004,9 +7996,9 @@ dependencies = [
[[package]] [[package]]
name = "swc_ecma_transforms_proposal" name = "swc_ecma_transforms_proposal"
version = "11.0.0" version = "11.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6eecc30b94780216450f9389ee63854882b1b3c8ec95790497d123cda7888104" checksum = "a3072700bb4401fffed5a152248d0d173a41da94584a4267355fa6772538880b"
dependencies = [ dependencies = [
"either", "either",
"rustc-hash 2.1.0", "rustc-hash 2.1.0",
...@@ -8024,11 +8016,11 @@ dependencies = [ ...@@ -8024,11 +8016,11 @@ dependencies = [
[[package]] [[package]]
name = "swc_ecma_transforms_react" name = "swc_ecma_transforms_react"
version = "12.0.0" version = "12.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "311218980029ea376a1f53292418d852d50b461d15d9d39f830abf0d1c3bdd6c" checksum = "3db098e259f9543aaa0f77961e64d351a7fd1394ab7588a691eb15aee2ab236e"
dependencies = [ dependencies = [
"base64 0.21.4", "base64 0.22.1",
"dashmap 5.5.3", "dashmap 5.5.3",
"indexmap 2.7.1", "indexmap 2.7.1",
"once_cell", "once_cell",
...@@ -8051,13 +8043,13 @@ dependencies = [ ...@@ -8051,13 +8043,13 @@ dependencies = [
[[package]] [[package]]
name = "swc_ecma_transforms_testing" name = "swc_ecma_transforms_testing"
version = "11.0.0" version = "11.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7dce5bbd4417919ff4e7a15500c18d88fc135e57b512f3ebd59cf82439d80ef9" checksum = "13c4d8c48a36ad5d02626f853edcf52ae82b65d238389e7e76270ddf564b69ab"
dependencies = [ dependencies = [
"ansi_term", "ansi_term",
"anyhow", "anyhow",
"base64 0.21.4", "base64 0.22.1",
"hex", "hex",
"serde", "serde",
"serde_json", "serde_json",
...@@ -8078,9 +8070,9 @@ dependencies = [ ...@@ -8078,9 +8070,9 @@ dependencies = [
[[package]] [[package]]
name = "swc_ecma_transforms_typescript" name = "swc_ecma_transforms_typescript"
version = "12.0.0" version = "12.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "19c32ebb3dd1942d35142de60c9dc0f3c034d26567de7eb8b3ad6de426f5b0e9" checksum = "ff4f2ea9134fa999039ace105daee34e4811cc58e34322605bafcd57de4a124c"
dependencies = [ dependencies = [
"once_cell", "once_cell",
"rustc-hash 2.1.0", "rustc-hash 2.1.0",
...@@ -9344,7 +9336,7 @@ dependencies = [ ...@@ -9344,7 +9336,7 @@ dependencies = [
"futures-retry", "futures-retry",
"include_dir", "include_dir",
"indexmap 2.7.1", "indexmap 2.7.1",
"jsonc-parser", "jsonc-parser 0.21.0",
"mime", "mime",
"notify", "notify",
"parking_lot", "parking_lot",
...@@ -9645,7 +9637,7 @@ dependencies = [ ...@@ -9645,7 +9637,7 @@ dependencies = [
"serde_json", "serde_json",
"smallvec", "smallvec",
"sourcemap", "sourcemap",
"swc_core 16.0.0", "swc_core",
"tokio", "tokio",
"tracing", "tracing",
"turbo-prehash", "turbo-prehash",
...@@ -9684,7 +9676,7 @@ dependencies = [ ...@@ -9684,7 +9676,7 @@ dependencies = [
"rustc-hash 2.1.0", "rustc-hash 2.1.0",
"serde", "serde",
"smallvec", "smallvec",
"swc_core 16.0.0", "swc_core",
"tracing", "tracing",
"turbo-rcstr", "turbo-rcstr",
"turbo-tasks", "turbo-tasks",
...@@ -9758,7 +9750,7 @@ dependencies = [ ...@@ -9758,7 +9750,7 @@ dependencies = [
"smallvec", "smallvec",
"sourcemap", "sourcemap",
"strsim 0.11.1", "strsim 0.11.1",
"swc_core 16.0.0", "swc_core",
"tokio", "tokio",
"tracing", "tracing",
"turbo-rcstr", "turbo-rcstr",
...@@ -9799,7 +9791,7 @@ dependencies = [ ...@@ -9799,7 +9791,7 @@ dependencies = [
"serde_json", "serde_json",
"styled_components", "styled_components",
"styled_jsx", "styled_jsx",
"swc_core 16.0.0", "swc_core",
"swc_emotion", "swc_emotion",
"swc_relay", "swc_relay",
"tracing", "tracing",
...@@ -9993,7 +9985,7 @@ version = "0.1.0" ...@@ -9993,7 +9985,7 @@ version = "0.1.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"parking_lot", "parking_lot",
"swc_core 16.0.0", "swc_core",
"turbo-rcstr", "turbo-rcstr",
"turbo-tasks", "turbo-tasks",
"turbo-tasks-build", "turbo-tasks-build",
...@@ -10662,7 +10654,7 @@ dependencies = [ ...@@ -10662,7 +10654,7 @@ dependencies = [
"next-custom-transforms", "next-custom-transforms",
"serde-wasm-bindgen", "serde-wasm-bindgen",
"serde_json", "serde_json",
"swc_core 16.0.0", "swc_core",
"tracing", "tracing",
"wasm-bindgen", "wasm-bindgen",
"wasm-bindgen-futures", "wasm-bindgen-futures",
......
...@@ -299,7 +299,7 @@ turbopack-trace-utils = { path = "turbopack/crates/turbopack-trace-utils" } ...@@ -299,7 +299,7 @@ turbopack-trace-utils = { path = "turbopack/crates/turbopack-trace-utils" }
turbopack-wasm = { path = "turbopack/crates/turbopack-wasm" } turbopack-wasm = { path = "turbopack/crates/turbopack-wasm" }
# SWC crates # SWC crates
swc_core = { version = "16.0.0", features = [ swc_core = { version = "16.4.0", features = [
"ecma_loader_lru", "ecma_loader_lru",
"ecma_loader_parking_lot", "ecma_loader_parking_lot",
] } ] }
...@@ -435,4 +435,4 @@ wasmer-cache = { git = "https://github.com/kdy1/wasmer", branch = "build-deps" } ...@@ -435,4 +435,4 @@ wasmer-cache = { git = "https://github.com/kdy1/wasmer", branch = "build-deps" }
wasmer-compiler-cranelift = { git = "https://github.com/kdy1/wasmer", branch = "build-deps" } wasmer-compiler-cranelift = { git = "https://github.com/kdy1/wasmer", branch = "build-deps" }
wasmer-wasix = { git = "https://github.com/kdy1/wasmer", branch = "build-deps" } wasmer-wasix = { git = "https://github.com/kdy1/wasmer", branch = "build-deps" }
mdxjs = { git="https://github.com/kdy1/mdxjs-rs.git", branch = "swc-core-15" } mdxjs = { git="https://github.com/kdy1/mdxjs-rs.git", branch = "swc-core-16" }
...@@ -56,8 +56,14 @@ pub fn benchmark(c: &mut Criterion) { ...@@ -56,8 +56,14 @@ pub fn benchmark(c: &mut Criterion) {
let top_level_mark = Mark::new(); let top_level_mark = Mark::new();
program.visit_mut_with(&mut resolver(unresolved_mark, top_level_mark, false)); program.visit_mut_with(&mut resolver(unresolved_mark, top_level_mark, false));
let eval_context = let eval_context = EvalContext::new(
EvalContext::new(&program, unresolved_mark, top_level_mark, None, None); &program,
unresolved_mark,
top_level_mark,
Default::default(),
None,
None,
);
let var_graph = create_graph(&program, &eval_context); let var_graph = create_graph(&program, &eval_context);
let input = BenchInput { let input = BenchInput {
......
use std::{ use std::{
iter, iter,
mem::{replace, take}, mem::{replace, take},
sync::Arc,
}; };
use rustc_hash::FxHashMap; use rustc_hash::{FxHashMap, FxHashSet};
use swc_core::{ use swc_core::{
atoms::Atom, atoms::Atom,
common::{comments::Comments, pass::AstNodePath, Mark, Span, Spanned, SyntaxContext, GLOBALS}, common::{comments::Comments, pass::AstNodePath, Mark, Span, Spanned, SyntaxContext, GLOBALS},
...@@ -295,6 +296,7 @@ pub struct EvalContext { ...@@ -295,6 +296,7 @@ pub struct EvalContext {
pub(crate) unresolved_mark: Mark, pub(crate) unresolved_mark: Mark,
pub(crate) top_level_mark: Mark, pub(crate) top_level_mark: Mark,
pub(crate) imports: ImportMap, pub(crate) imports: ImportMap,
pub(crate) force_free_values: Arc<FxHashSet<Id>>,
} }
impl EvalContext { impl EvalContext {
...@@ -305,6 +307,7 @@ impl EvalContext { ...@@ -305,6 +307,7 @@ impl EvalContext {
module: &Program, module: &Program,
unresolved_mark: Mark, unresolved_mark: Mark,
top_level_mark: Mark, top_level_mark: Mark,
force_free_values: Arc<FxHashSet<Id>>,
comments: Option<&dyn Comments>, comments: Option<&dyn Comments>,
source: Option<ResolvedVc<Box<dyn Source>>>, source: Option<ResolvedVc<Box<dyn Source>>>,
) -> Self { ) -> Self {
...@@ -312,6 +315,7 @@ impl EvalContext { ...@@ -312,6 +315,7 @@ impl EvalContext {
unresolved_mark, unresolved_mark,
top_level_mark, top_level_mark,
imports: ImportMap::analyze(module, source, comments), imports: ImportMap::analyze(module, source, comments),
force_free_values,
} }
} }
...@@ -378,7 +382,7 @@ impl EvalContext { ...@@ -378,7 +382,7 @@ impl EvalContext {
if let Some(imported) = self.imports.get_import(&id) { if let Some(imported) = self.imports.get_import(&id) {
return imported; return imported;
} }
if is_unresolved(i, self.unresolved_mark) { if is_unresolved(i, self.unresolved_mark) || self.force_free_values.contains(&id) {
JsValue::FreeVar(i.sym.clone()) JsValue::FreeVar(i.sym.clone())
} else { } else {
JsValue::Variable(id) JsValue::Variable(id)
...@@ -1875,7 +1879,9 @@ impl VisitAstPath for Analyzer<'_> { ...@@ -1875,7 +1879,9 @@ impl VisitAstPath for Analyzer<'_> {
span: ident.span(), span: ident.span(),
in_try: is_in_try(ast_path), in_try: is_in_try(ast_path),
}) })
} else if is_unresolved(ident, self.eval_context.unresolved_mark) { } else if is_unresolved(ident, self.eval_context.unresolved_mark)
|| self.eval_context.force_free_values.contains(&ident.to_id())
{
self.add_effect(Effect::FreeVar { self.add_effect(Effect::FreeVar {
var: Box::new(JsValue::FreeVar(ident.sym.clone())), var: Box::new(JsValue::FreeVar(ident.sym.clone())),
ast_path: as_parent_path(ast_path), ast_path: as_parent_path(ast_path),
......
...@@ -4041,8 +4041,14 @@ mod tests { ...@@ -4041,8 +4041,14 @@ mod tests {
let top_level_mark = Mark::new(); let top_level_mark = Mark::new();
m.visit_mut_with(&mut resolver(unresolved_mark, top_level_mark, false)); m.visit_mut_with(&mut resolver(unresolved_mark, top_level_mark, false));
let eval_context = let eval_context = EvalContext::new(
EvalContext::new(&m, unresolved_mark, top_level_mark, Some(&comments), None); &m,
unresolved_mark,
top_level_mark,
Default::default(),
Some(&comments),
None,
);
let mut var_graph = create_graph(&m, &eval_context); let mut var_graph = create_graph(&m, &eval_context);
let var_cache = Default::default(); let var_cache = Default::default();
......
use std::{future::Future, sync::Arc}; use std::{future::Future, sync::Arc};
use anyhow::{anyhow, Context, Result}; use anyhow::{anyhow, Context, Result};
use rustc_hash::FxHashSet;
use swc_core::{ use swc_core::{
base::SwcComments, base::SwcComments,
common::{ common::{
...@@ -10,14 +11,14 @@ use swc_core::{ ...@@ -10,14 +11,14 @@ use swc_core::{
BytePos, FileName, Globals, LineCol, Mark, SyntaxContext, GLOBALS, BytePos, FileName, Globals, LineCol, Mark, SyntaxContext, GLOBALS,
}, },
ecma::{ ecma::{
ast::{EsVersion, Program}, ast::{EsVersion, Id, ObjectPatProp, Pat, Program, VarDecl},
lints::{config::LintConfig, rules::LintParams}, lints::{config::LintConfig, rules::LintParams},
parser::{lexer::Lexer, EsSyntax, Parser, Syntax, TsSyntax}, parser::{lexer::Lexer, EsSyntax, Parser, Syntax, TsSyntax},
transforms::base::{ transforms::base::{
helpers::{Helpers, HELPERS}, helpers::{Helpers, HELPERS},
resolver, resolver,
}, },
visit::VisitMutWith, visit::{noop_visit_type, Visit, VisitMutWith, VisitWith},
}, },
}; };
use tracing::Instrument; use tracing::Instrument;
...@@ -356,6 +357,12 @@ async fn parse_file_content( ...@@ -356,6 +357,12 @@ async fn parse_file_content(
parsed_program.mutate(swc_core::ecma::transforms::proposal::explicit_resource_management::explicit_resource_management()); parsed_program.mutate(swc_core::ecma::transforms::proposal::explicit_resource_management::explicit_resource_management());
let var_with_ts_declare = if is_typescript {
VarDeclWithTsDeclareCollector::collect(&parsed_program)
} else {
FxHashSet::default()
};
let transform_context = TransformContext { let transform_context = TransformContext {
comments: &comments, comments: &comments,
source_map: &source_map, source_map: &source_map,
...@@ -402,6 +409,7 @@ async fn parse_file_content( ...@@ -402,6 +409,7 @@ async fn parse_file_content(
&parsed_program, &parsed_program,
unresolved_mark, unresolved_mark,
top_level_mark, top_level_mark,
Arc::new(var_with_ts_declare),
Some(&comments), Some(&comments),
Some(source), Some(source),
); );
...@@ -478,3 +486,68 @@ impl Issue for ReadSourceIssue { ...@@ -478,3 +486,68 @@ impl Issue for ReadSourceIssue {
IssueStage::Load.cell() IssueStage::Load.cell()
} }
} }
struct VarDeclWithTsDeclareCollector {
id_with_no_ts_declare: FxHashSet<Id>,
id_with_ts_declare: FxHashSet<Id>,
}
impl VarDeclWithTsDeclareCollector {
fn collect<N: VisitWith<VarDeclWithTsDeclareCollector>>(n: &N) -> FxHashSet<Id> {
let mut collector = VarDeclWithTsDeclareCollector {
id_with_no_ts_declare: Default::default(),
id_with_ts_declare: Default::default(),
};
n.visit_with(&mut collector);
collector
.id_with_ts_declare
.retain(|id| !collector.id_with_no_ts_declare.contains(id));
collector.id_with_ts_declare
}
fn handle_pat(&mut self, pat: &Pat, declare: bool) {
match pat {
Pat::Ident(binding_ident) => {
if declare {
self.id_with_ts_declare.insert(binding_ident.to_id());
} else {
self.id_with_no_ts_declare.insert(binding_ident.to_id());
}
}
Pat::Array(array_pat) => {
for pat in array_pat.elems.iter().flatten() {
self.handle_pat(pat, declare);
}
}
Pat::Object(object_pat) => {
for prop in object_pat.props.iter() {
match prop {
ObjectPatProp::KeyValue(key_value_pat_prop) => {
self.handle_pat(&key_value_pat_prop.value, declare);
}
ObjectPatProp::Assign(assign_pat_prop) => {
if declare {
self.id_with_ts_declare.insert(assign_pat_prop.key.to_id());
} else {
self.id_with_no_ts_declare
.insert(assign_pat_prop.key.to_id());
}
}
_ => {}
}
}
}
_ => {}
}
}
}
impl Visit for VarDeclWithTsDeclareCollector {
noop_visit_type!();
fn visit_var_decl(&mut self, node: &VarDecl) {
for decl in node.decls.iter() {
self.handle_pat(&decl.name, node.declare);
}
}
}
...@@ -575,6 +575,7 @@ pub(super) async fn split( ...@@ -575,6 +575,7 @@ pub(super) async fn split(
&program, &program,
eval_context.unresolved_mark, eval_context.unresolved_mark,
eval_context.top_level_mark, eval_context.top_level_mark,
eval_context.force_free_values.clone(),
None, None,
Some(source), Some(source),
); );
...@@ -699,6 +700,7 @@ pub(crate) async fn part_of_module( ...@@ -699,6 +700,7 @@ pub(crate) async fn part_of_module(
&program, &program,
eval_context.unresolved_mark, eval_context.unresolved_mark,
eval_context.top_level_mark, eval_context.top_level_mark,
eval_context.force_free_values.clone(),
None, None,
None, None,
); );
......
...@@ -204,7 +204,6 @@ function createPromise() { ...@@ -204,7 +204,6 @@ function createPromise() {
const turbopackQueues = Symbol("turbopack queues"); const turbopackQueues = Symbol("turbopack queues");
const turbopackExports = Symbol("turbopack exports"); const turbopackExports = Symbol("turbopack exports");
const turbopackError = Symbol("turbopack error"); const turbopackError = Symbol("turbopack error");
;
function resolveQueue(queue) { function resolveQueue(queue) {
if (queue && queue.status !== 1) { if (queue && queue.status !== 1) {
queue.status = 1; queue.status = 1;
......
...@@ -215,7 +215,6 @@ function createPromise() { ...@@ -215,7 +215,6 @@ function createPromise() {
const turbopackQueues = Symbol("turbopack queues"); const turbopackQueues = Symbol("turbopack queues");
const turbopackExports = Symbol("turbopack exports"); const turbopackExports = Symbol("turbopack exports");
const turbopackError = Symbol("turbopack error"); const turbopackError = Symbol("turbopack error");
;
function resolveQueue(queue) { function resolveQueue(queue) {
if (queue && queue.status !== 1) { if (queue && queue.status !== 1) {
queue.status = 1; queue.status = 1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment