diff --git a/Cargo.lock b/Cargo.lock index 7c32a02..b18a20d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -343,9 +343,9 @@ dependencies = [ [[package]] name = "compact_str" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b79c4069c6cad78e2e0cdfcbd26275770669fb39fd308a752dc110e83b9af32" +checksum = "3fdb1325a1cece981e8a296ab8f0f9b63ae357bd0784a9faaf548cc7b480707a" dependencies = [ "castaway", "cfg-if", @@ -1092,9 +1092,9 @@ checksum = "1036865bb9422d3300cf723f657c2851d0e9ab12567854b1f4eba3d77decf564" [[package]] name = "oxc" -version = "0.56.5" +version = "0.60.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cae6276febbc5abc1f1e4cf49167d54ab341818656ae4f622d5992b65fcdd371" +checksum = "3ceb3e662702022eb9714815de93b138d63e165c6773c1fcaf39e086ef9932ed" dependencies = [ "oxc_allocator", "oxc_ast", @@ -1124,23 +1124,23 @@ dependencies = [ [[package]] name = "oxc-miette" -version = "1.0.2" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e03e63fd113c068b82d07c9c614b0b146c08a3ac0a4dface3ea1d1a9d14d549e" +checksum = "112f8458565c773a1f6555c14d6cd0255f56c85dd372932029e4baeb15308bbe" dependencies = [ "cfg-if", "owo-colors", "oxc-miette-derive", "textwrap", - "thiserror 1.0.69", + "thiserror 2.0.11", "unicode-width 0.2.0", ] [[package]] name = "oxc-miette-derive" -version = "1.0.2" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e21f680e8c5f1900297d394627d495351b9e37761f7bbf90116bd5eeb6e80967" +checksum = "4c0c893f53900e3fe01eca3d6d3b54085573c3e48fe25af9d57dd94ef600dcd3" dependencies = [ "proc-macro2", "quote", @@ -1149,11 +1149,12 @@ dependencies = [ [[package]] name = "oxc_allocator" -version = "0.56.5" +version = "0.60.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22cc5cd078806a1b7061fa146dc4228a57d0765da6c85e99500d069b86f57e94" +checksum = "0fb8b78d9f70b5123bb01212458971da4cf0f796ad131602864df51d779290df" dependencies = [ "allocator-api2", + "assert-unchecked", "bumpalo", "hashbrown 0.15.2", "rustc-hash 2.1.1", @@ -1162,9 +1163,9 @@ dependencies = [ [[package]] name = "oxc_ast" -version = "0.56.5" +version = "0.60.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4722414ac21a2e28a16b76de8390672c01a39adcb703d405b848149cfaeeaf7" +checksum = "d5cae7318a452457a303b688a1d12735e72e122114ac76bffa029ee34a5d0292" dependencies = [ "bitflags", "cow-utils", @@ -1179,9 +1180,9 @@ dependencies = [ [[package]] name = "oxc_ast_macros" -version = "0.56.5" +version = "0.60.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f1505d8622b2ea6ed0274f355bd5e4ee3f09df5d9b39c8a3a673f344d87b82a" +checksum = "9ef30e196e021dcf6afd96417b9cd0fe223f0e517107aafdac9648022b280c1f" dependencies = [ "proc-macro2", "quote", @@ -1190,9 +1191,9 @@ dependencies = [ [[package]] name = "oxc_ast_visit" -version = "0.56.5" +version = "0.60.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf45370c6da0dd142a70468e5b25127d6a34caa71056105c85087559c8ee9afb" +checksum = "1ac568f9ce9b9abf31b5f53d6c2f50b3bdb638c71539d177fb566a646cd32cf8" dependencies = [ "oxc_allocator", "oxc_ast", @@ -1202,9 +1203,9 @@ dependencies = [ [[package]] name = "oxc_cfg" -version = "0.56.5" +version = "0.60.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96be30717d29eb7d1780758d033e92fcc208b8cce83b3b4869d2155fa4c9b7bd" +checksum = "70c2580450c194b945007dbf2ed99ce167a9c61b0c6039d339c65735c35660fc" dependencies = [ "bitflags", "itertools 0.14.0", @@ -1217,9 +1218,9 @@ dependencies = [ [[package]] name = "oxc_codegen" -version = "0.56.5" +version = "0.60.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5fd891e06aa19c7d22e129d366e55644ffeed99167e3495dcaec8149a0631b3" +checksum = "cdb54f7e72e0e345e06a79a5c7807d365ab8b8b438742878a0ab8d3bdbba6a0e" dependencies = [ "bitflags", "cow-utils", @@ -1238,9 +1239,9 @@ dependencies = [ [[package]] name = "oxc_data_structures" -version = "0.56.5" +version = "0.60.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb49a2ee880952c2079b61851ecc35d7671d9d3509e306f5e704ccacd2783984" +checksum = "1c5ff1571a7cbbaa30abd7dd624274b2fa67bf896d3121e8a0fff2ae50fa889a" dependencies = [ "assert-unchecked", "ropey", @@ -1248,9 +1249,9 @@ dependencies = [ [[package]] name = "oxc_diagnostics" -version = "0.56.5" +version = "0.60.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea83fe2415b0580980ac83364c1ae943f8ee9c00becf5395a89e800a9526a080" +checksum = "8c44fd92c6601ec6c5d02b210a8196027a0e49eebcc5ea7bcef2efe3c697ad64" dependencies = [ "cow-utils", "oxc-miette", @@ -1258,9 +1259,9 @@ dependencies = [ [[package]] name = "oxc_ecmascript" -version = "0.56.5" +version = "0.60.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c7e7bcc382cf901e93a16f86e70f2737c507aaa833656b0d8484d64f8ae358a" +checksum = "008ecf89e067b5ab8f5e1ac5890059f7c3cd5c9a8ae2db8ef4560dc93f53f01c" dependencies = [ "cow-utils", "num-bigint", @@ -1272,9 +1273,9 @@ dependencies = [ [[package]] name = "oxc_estree" -version = "0.56.5" +version = "0.60.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cb66484735d21f096b07c894badc96d89a0c6d31b4bdd46b33b3e44da9b97ac" +checksum = "0e3ec988abe93acf6e99a5ddc3d08116977426fe64c78ed4d5d55852cdf13e14" [[package]] name = "oxc_index" @@ -1284,9 +1285,9 @@ checksum = "2fa07b0cfa997730afed43705766ef27792873fdf5215b1391949fec678d2392" [[package]] name = "oxc_parser" -version = "0.56.5" +version = "0.60.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a7414e779b9723b0bd2880fe69b0ee517e583f88c5118a7c9053cf3317b95b1" +checksum = "b70aae5a851f227bde01ffe9d6ad7b00cf1b836f62c9ea089da8372f4a30c78c" dependencies = [ "assert-unchecked", "bitflags", @@ -1307,9 +1308,9 @@ dependencies = [ [[package]] name = "oxc_regular_expression" -version = "0.56.5" +version = "0.60.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d18196c212eac24a7faf613e373e5f9317d3542578a088d01dc1a548fa1e1cb3" +checksum = "7ed30ec210725f78e8f8c8d1cf597af11b40f18a62d4be5b97d3366ef0baee01" dependencies = [ "oxc_allocator", "oxc_ast_macros", @@ -1323,9 +1324,9 @@ dependencies = [ [[package]] name = "oxc_semantic" -version = "0.56.5" +version = "0.60.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4556f1c700baaec8589872ddf2af41d9a964db52fdbec9a5d07d7477dce45cf8" +checksum = "8a593327201c47df95293d5c2a85b13debd093b67c5a2ca4b5cbd6628a8e62dd" dependencies = [ "assert-unchecked", "itertools 0.14.0", @@ -1360,11 +1361,11 @@ dependencies = [ [[package]] name = "oxc_span" -version = "0.56.5" +version = "0.60.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "318f925e26bd118adc082d290538d07611fe2434987a5c60cf5084381ecb42e6" +checksum = "d1d4588fc61610c944557dc5b40a93ddbf497a98717f660f2258253ead7978a9" dependencies = [ - "compact_str 0.8.1", + "compact_str 0.9.0", "oxc-miette", "oxc_allocator", "oxc_ast_macros", @@ -1373,9 +1374,9 @@ dependencies = [ [[package]] name = "oxc_syntax" -version = "0.56.5" +version = "0.60.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cb68ceb7c6902f3043fe8fe49bb886826b1d7741dc2904337297d53692b1b9c" +checksum = "c8584c190328b5841abeeeba41342f4a187979eb75098fd506e522927c725211" dependencies = [ "assert-unchecked", "bitflags", @@ -1394,12 +1395,12 @@ dependencies = [ [[package]] name = "oxc_transformer" -version = "0.56.5" +version = "0.60.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37e44f0de58265ac636680ced8189b6eec24ab8c026847a41d1281f4e0218f59" +checksum = "70594abb45fea0a69e20b31f7f8f0bd4adfdae8a1a1799dc55d0236ceb9738ba" dependencies = [ "base64", - "compact_str 0.8.1", + "compact_str 0.9.0", "cow-utils", "indexmap", "itoa", @@ -1424,11 +1425,11 @@ dependencies = [ [[package]] name = "oxc_traverse" -version = "0.56.5" +version = "0.60.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8a090c9cd461d468f5faf3fe3f56378a4e27d80febe34ad39f2a04920f594d4" +checksum = "53fa9743c952a78f5e66050a85f4dd60a549e305fb2aca565442186e7ac8db3c" dependencies = [ - "compact_str 0.8.1", + "compact_str 0.9.0", "itoa", "oxc_allocator", "oxc_ast", @@ -2996,13 +2997,13 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "textwrap" -version = "0.16.1" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" +checksum = "c13547615a44dc9c452a8a534638acdf07120d4b6847c8178705da06306a3057" dependencies = [ "smawk", "unicode-linebreak", - "unicode-width 0.1.14", + "unicode-width 0.2.0", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 12b5c45..c89b2be 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,7 +21,7 @@ test = false doctest = false [dependencies] -oxc = { version = "0.56.5", features = ["transformer", "codegen", "semantic"] } +oxc = { version = "0.60.0", features = ["transformer", "codegen", "semantic"] } swc = "16.1.1" swc_common = "8.0.0" diff --git a/src/lib.rs b/src/lib.rs index 1d6d210..ff8c918 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -23,15 +23,12 @@ pub mod oxc { let source_type = SourceType::from_path(path).unwrap(); let ret = Parser::new(&allocator, source_text, source_type).parse(); let mut program = ret.program; - let (symbols, scopes) = SemanticBuilder::new() + let scoping = SemanticBuilder::new() .build(&program) .semantic - .into_symbol_table_and_scope_tree(); - let ret = Transformer::new(&allocator, path, options).build_with_symbols_and_scopes( - symbols, - scopes, - &mut program, - ); + .into_scoping(); + let ret = + Transformer::new(&allocator, path, options).build_with_scoping(scoping, &mut program); assert!(ret.errors.is_empty()); let printed = CodeGenerator::new().build(&program).code;