diff --git a/docs/release_notes.md b/docs/release_notes.md index 99c389de..69efe1e2 100644 --- a/docs/release_notes.md +++ b/docs/release_notes.md @@ -2,6 +2,7 @@ ## 0.9.0 +* Upgraded deno_ast to v0.39.0 * Added `create()` to AST types ## 0.8.0 diff --git a/rust/.rustfmt.toml b/rust/.rustfmt.toml index e38d4267..7714fe0a 100644 --- a/rust/.rustfmt.toml +++ b/rust/.rustfmt.toml @@ -1,3 +1,2 @@ -# Copyright 2018-2019 the Deno authors. All rights reserved. MIT license. max_width = 120 tab_spaces = 2 diff --git a/rust/Cargo.lock b/rust/Cargo.lock index f7da8db8..912972fb 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -54,9 +54,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "ast_node" -version = "0.9.7" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e521452c6bce47ee5a5461c5e5d707212907826de14124962c58fcaf463115e" +checksum = "2ab31376d309dd3bfc9cfb3c11c93ce0e0741bbe0354b20e7f8c60b044730b79" dependencies = [ "proc-macro2", "quote", @@ -264,9 +264,9 @@ dependencies = [ [[package]] name = "deno_ast" -version = "0.38.1" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e2417aad5382d10d035e46d35f2f5fbbb93a922816408245ee585e7ca775194" +checksum = "32edef567e3090862e865c75628f4d35ace80ca90e0fc5263a7d10fa307ae899" dependencies = [ "anyhow", "base64 0.21.7", @@ -385,9 +385,9 @@ dependencies = [ [[package]] name = "from_variant" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a0b11eeb173ce52f84ebd943d42e58813a2ebb78a6a3ff0a243b71c5199cd7b" +checksum = "fdc9cc75639b041067353b9bce2450d6847e547276c6fbe4487d7407980e07db" dependencies = [ "proc-macro2", "swc_macros_common", @@ -978,9 +978,9 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "string_enum" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6960defec35d15d58331ffb8a315d551634f757fe139c7b3d6063cae88ec90f6" +checksum = "05e383308aebc257e7d7920224fa055c632478d92744eca77f99be8fa1545b90" dependencies = [ "proc-macro2", "quote", @@ -1013,9 +1013,9 @@ dependencies = [ [[package]] name = "swc_bundler" -version = "0.226.0" +version = "0.227.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60aeba6588ba222a184e7ae34bc349330d5196797fd2b7f921dfac6ef62db7f9" +checksum = "d1a212bd08b1121c7204a04407ea055779fc00cf80024fc666dd97b00749cf87" dependencies = [ "anyhow", "crc", @@ -1057,9 +1057,9 @@ dependencies = [ [[package]] name = "swc_common" -version = "0.33.25" +version = "0.33.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a529796c240cd87da18d26d63f9de4c7ad3680cf0a04b95f0c37f4c4f0a0da63" +checksum = "a2f9706038906e66f3919028f9f7a37f3ed552f1b85578e93f4468742e2da438" dependencies = [ "ast_node", "better_scoped_tls", @@ -1083,9 +1083,9 @@ dependencies = [ [[package]] name = "swc_config" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ada712ac5e28a301683c8af957e8a56deca675cbc376473dd207a527b989efb5" +checksum = "7be1a689e146be1eae53139482cb061dcf0fa01dff296bbe7b96fff92d8e2936" dependencies = [ "anyhow", "indexmap", @@ -1097,9 +1097,9 @@ dependencies = [ [[package]] name = "swc_config_macro" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b2574f75082322a27d990116cd2a24de52945fc94172b24ca0b3e9e2a6ceb6b" +checksum = "7c5f56139042c1a95b54f5ca48baa0e0172d369bcc9d3d473dad1de36bae8399" dependencies = [ "proc-macro2", "quote", @@ -1109,9 +1109,9 @@ dependencies = [ [[package]] name = "swc_ecma_ast" -version = "0.113.0" +version = "0.113.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f99fdda741656887f4cf75c1cee249a5f0374d67d30acc2b073182e902546ff2" +checksum = "dc1690cc0c9ab60b44ac0225ba1e231ac532f7ba1d754df761c6ee607561afae" dependencies = [ "bitflags 2.5.0", "is-macro", @@ -1127,9 +1127,9 @@ dependencies = [ [[package]] name = "swc_ecma_codegen" -version = "0.149.0" +version = "0.149.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c21b8ae99bc3b95c6f7909915cd1e5994bec4e5b576f2e2a6879e56f2770760" +checksum = "4fef147127a2926ca26171c7afcbf028ff86dc543ced87d316713f25620a15b9" dependencies = [ "memchr", "num-bigint", @@ -1146,9 +1146,9 @@ dependencies = [ [[package]] name = "swc_ecma_codegen_macros" -version = "0.7.5" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ab87ba81ae05efd394ab4a8cbdba595ac3554a5e393c76699449d47c43582e" +checksum = "090e409af49c8d1a3c13b3aab1ed09dd4eda982207eb3e63c2ad342f072b49c8" dependencies = [ "proc-macro2", "quote", @@ -1158,9 +1158,9 @@ dependencies = [ [[package]] name = "swc_ecma_compat_bugfixes" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72d17f39021080f81116fadc0865e750f3a4e3a6e0cb27f93062d449b9352319" +checksum = "47dad0d8b1c4ca3264a8c5ac59a10127e4f1c3ec5ed271692c8897228f306d05" dependencies = [ "swc_atoms", "swc_common", @@ -1175,9 +1175,9 @@ dependencies = [ [[package]] name = "swc_ecma_compat_common" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7df6e95b8664048e74d7fac4917690b07c89859ea95fe4ab048b336aaeded6a" +checksum = "d888bcaea9c3b8178ea4abf65adf64457a95a5dd3a3c109a69e02c3c38878e96" dependencies = [ "swc_common", "swc_ecma_ast", @@ -1188,9 +1188,9 @@ dependencies = [ [[package]] name = "swc_ecma_compat_es2015" -version = "0.5.0" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dd896c8d356af644ff7fc9b7d6b209a1ac52209cf5cc9e60c3e8a7b92900081" +checksum = "6f0d3d5d4637af5195265444b2a708020ee90973008ec50c665dad83dd5f1c70" dependencies = [ "arrayvec", "indexmap", @@ -1214,9 +1214,9 @@ dependencies = [ [[package]] name = "swc_ecma_compat_es2016" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397522b9ecfbedbf20aa7477d3c8fe3144480ec2d41f6b27baba53a346957cbb" +checksum = "8d7222c8114ae47fb2e46a65f426b125edab523192e835aecbe3136541f96500" dependencies = [ "swc_atoms", "swc_common", @@ -1231,9 +1231,9 @@ dependencies = [ [[package]] name = "swc_ecma_compat_es2017" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "795a8becc4d996c1b92f3343ef728ac71315f2da9e6e4260333ddd29c0f53010" +checksum = "8ccdc725616ef5a558fb905b991cf328a3a36a4d1b8423173708a02568077a14" dependencies = [ "serde", "swc_atoms", @@ -1249,9 +1249,9 @@ dependencies = [ [[package]] name = "swc_ecma_compat_es2018" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbaa39c03bc8e47e265986578154d469dc36bc7ec1243df3bfcc237e84ddf9f0" +checksum = "4a6c329c3980fb20c6c3f7f2afc94975bfe640d53dbb90b74a4707a514f16882" dependencies = [ "serde", "swc_atoms", @@ -1268,9 +1268,9 @@ dependencies = [ [[package]] name = "swc_ecma_compat_es2019" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84076476c57cb5c727425305517306b597c07f70ebabcdd64d7b6f18048f0a69" +checksum = "f1934f5021e80f6b76e5e0bd06e331d719eb9541c13cb5c128a2b994931952a4" dependencies = [ "swc_atoms", "swc_common", @@ -1284,9 +1284,9 @@ dependencies = [ [[package]] name = "swc_ecma_compat_es2020" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55dbd19a66baead4b378ba88462b6664cfec43b1eba0018bed5673b06ac2574a" +checksum = "0aeddeba198fef2e0ed2bc4a5a0b412a04063f062dc47f93e191b492fc07db4f" dependencies = [ "serde", "swc_atoms", @@ -1302,9 +1302,9 @@ dependencies = [ [[package]] name = "swc_ecma_compat_es2021" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c07098d69a7e498d61c2e3941bbf00e997e118e2ea2836df06cfb2a1bb811026" +checksum = "288ad7b2cc410dc4fb08687915c1f588f6a714d737e0a4d4128657124902bcae" dependencies = [ "swc_atoms", "swc_common", @@ -1318,9 +1318,9 @@ dependencies = [ [[package]] name = "swc_ecma_compat_es2022" -version = "0.5.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cff061044de96f6fe5d89c8888d9e1ca842d58066945d6ef87718b7db17cb0c" +checksum = "8d4a8a9fde6f96316e8b0792a72baa209277e0ce3050b476ee3ab408ec579a2d" dependencies = [ "swc_atoms", "swc_common", @@ -1337,9 +1337,9 @@ dependencies = [ [[package]] name = "swc_ecma_compat_es3" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e007bf69cd820975877f065a8042658f73e36d4747ae80a188144dcec5de3d57" +checksum = "bc88d41bf1d86c163997a48b10ad47a40d2d0c8b9c6ee03ead151d0022975789" dependencies = [ "swc_common", "swc_ecma_ast", @@ -1352,9 +1352,9 @@ dependencies = [ [[package]] name = "swc_ecma_loader" -version = "0.45.27" +version = "0.45.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a923880fc27cf5f3d2a684debb7c5a0ee60100af1bfe424cb5e722d290bf88a" +checksum = "92c68f934bd2c51f29c4ad0bcae09924e9dc30d7ce0680367d45b42d40338a67" dependencies = [ "anyhow", "pathdiff", @@ -1366,9 +1366,9 @@ dependencies = [ [[package]] name = "swc_ecma_parser" -version = "0.144.0" +version = "0.144.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3da9f3a58f0a64410f4006eb1fdb64d190ad3cc6cd12a7bf1f0dbb916e4ca4c7" +checksum = "0499e69683ae5d67a20ff0279b94bc90f29df7922a46331b54d5dd367bf89570" dependencies = [ "either", "new_debug_unreachable", @@ -1388,9 +1388,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_base" -version = "0.138.0" +version = "0.138.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91771e358664649cf2cabec86a270bd9ce267f5213f299cacb255951b5edf06b" +checksum = "eddb95c2bdad1c9c29edf35712e1e0f9b9ddc1cdb5ba2d582fd93468cb075a03" dependencies = [ "better_scoped_tls", "bitflags 2.5.0", @@ -1411,9 +1411,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_classes" -version = "0.127.0" +version = "0.127.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfa5cd60314f35a114dc85955c6b645e9bb13fdfda4f732137ed62a482ca8990" +checksum = "53043d81678f3c693604eeb1d1f0fe6ba10f303104a31b954dbeebed9cadf530" dependencies = [ "swc_atoms", "swc_common", @@ -1425,9 +1425,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_compat" -version = "0.164.0" +version = "0.164.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d38cd03a67ad86a3f798b212d7cce0026d80173bc0e2d1b2326a042b3a2226" +checksum = "7d4e2942c5d8b7afdf81b8d1eec2f4a961aa9fc89ab05ebe5cbd0f6066b60afc" dependencies = [ "arrayvec", "indexmap", @@ -1461,9 +1461,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_macros" -version = "0.5.4" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17e309b88f337da54ef7fe4c5b99c2c522927071f797ee6c9fb8b6bf2d100481" +checksum = "500a1dadad1e0e41e417d633b3d6d5de677c9e0d3159b94ba3348436cdb15aab" dependencies = [ "proc-macro2", "quote", @@ -1473,9 +1473,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_optimization" -version = "0.199.0" +version = "0.199.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba0d1c320c74b97e6f79f8ff5bae05b78cc211492b29654994963e4f1fe4a01f" +checksum = "32ea30b3df748236c619409f222f0ba68ebeebc08dfff109d2195664a15689f9" dependencies = [ "dashmap", "indexmap", @@ -1497,9 +1497,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_proposal" -version = "0.172.0" +version = "0.172.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "067a79cba791af32fb0634c0ca08051e47b56ccfe8d07349b7787b22da401084" +checksum = "7fbc414d6a9c5479cfb4c6e92fcdac504582bd7bc89a0ed7f8808b72dc8bd1f0" dependencies = [ "either", "rustc-hash", @@ -1517,9 +1517,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_react" -version = "0.184.0" +version = "0.184.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69c87599f4a10987fe2687967e5448858b458f2924faa62f044acd56f4e3ffda" +checksum = "565a76c4ca47ce31d78301c0beab878e4c2cb4f624691254d834ec8c0e236755" dependencies = [ "base64 0.21.7", "dashmap", @@ -1541,9 +1541,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_typescript" -version = "0.189.0" +version = "0.189.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08ea0dc9076708448e8ded8e1119717e0e6e095b1ba42b4c8d7fdb1d26fba418" +checksum = "e209026c1d3c577cafac257d87e7c0d23119282fbdc8ed03d7f56077e95beb90" dependencies = [ "ryu-js", "serde", @@ -1558,9 +1558,9 @@ dependencies = [ [[package]] name = "swc_ecma_utils" -version = "0.128.0" +version = "0.128.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd533f5751b7a8673bd843151c4e6e64a2dcf6c1f65331401e88f244c0e85de7" +checksum = "fe5242670bc74e0a0b64b9d4912b37be36944517ce0881314162aeb4381272c3" dependencies = [ "indexmap", "num_cpus", @@ -1576,9 +1576,9 @@ dependencies = [ [[package]] name = "swc_ecma_visit" -version = "0.99.0" +version = "0.99.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c74008ebc5e0d3d9a1b3df54083ddbff1a375cfadff857da1fdc7837b48c52d" +checksum = "28a6ce28ad8e591f8d627f1f9cb26b25e5d83052a9bc1b674d95fc28040cfa98" dependencies = [ "num-bigint", "swc_atoms", @@ -1601,9 +1601,9 @@ dependencies = [ [[package]] name = "swc_fast_graph" -version = "0.21.21" +version = "0.21.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54db83cdbd924cc8b5082ab54ff2a1b4f53ecde8f53c87b9f9c877c9daef4569" +checksum = "f3fdd64bc3d161d6c1ea9a8ae5779e4ba132afc67e7b8ece5420bfc9c6e1275d" dependencies = [ "indexmap", "petgraph", @@ -1613,9 +1613,9 @@ dependencies = [ [[package]] name = "swc_graph_analyzer" -version = "0.22.22" +version = "0.22.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02b66d0e18899b3a69eca103e5b4af2f0c837427aa07a60be1c4ceb4346ea245" +checksum = "c728a8f9b82b7160a1ae246e31232177b371f827eb0d01006c0f120a3494871c" dependencies = [ "auto_impl", "petgraph", @@ -1626,9 +1626,9 @@ dependencies = [ [[package]] name = "swc_macros_common" -version = "0.3.10" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a5be7766a95a2840ded618baeaab63809b71230ef19094b34f76c8af4d85aa2" +checksum = "91745f3561057493d2da768437c427c0e979dff7396507ae02f16c981c4a8466" dependencies = [ "proc-macro2", "quote", @@ -1648,9 +1648,9 @@ dependencies = [ [[package]] name = "swc_visit" -version = "0.5.13" +version = "0.5.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0263be55289abfe9c877ffef83d877b5bdfac036ffe2de793f48f5e47e41dbae" +checksum = "043d11fe683dcb934583ead49405c0896a5af5face522e4682c16971ef7871b9" dependencies = [ "either", "swc_visit_macros", @@ -1658,9 +1658,9 @@ dependencies = [ [[package]] name = "swc_visit_macros" -version = "0.5.11" +version = "0.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33fc817055fe127b4285dc85058596768bfde7537ae37da82c67815557f03e33" +checksum = "4ae9ef18ff8daffa999f729db056d2821cd2f790f3a11e46422d19f46bb193e7" dependencies = [ "Inflector", "proc-macro2", @@ -1806,9 +1806,9 @@ checksum = "b1b6def86329695390197b82c1e244a54a131ceb66c996f2088a3876e2ae083f" [[package]] name = "unicode-id-start" -version = "1.1.2" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8f73150333cb58412db36f2aca8f2875b013049705cc77b94ded70a1ab1f5da" +checksum = "02aebfa694eccbbbffdd92922c7de136b9fe764396d2f10e21bce1681477cfc1" [[package]] name = "unicode-ident" diff --git a/rust/Cargo.toml b/rust/Cargo.toml index 1050ed7d..cba2540f 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -11,7 +11,7 @@ crate_type = ["cdylib", "rlib"] [dependencies] base64 = "0.22.1" debug_print = "1.0.0" -deno_ast = { version = "0.38.1", features = [ +deno_ast = { version = "0.39.0", features = [ "bundler", "cjs", "codegen", diff --git a/rust/src/core.rs b/rust/src/core.rs index db8738bb..f7724ce4 100644 --- a/rust/src/core.rs +++ b/rust/src/core.rs @@ -28,11 +28,11 @@ const VERSION: &'static str = "0.9.0"; fn parse_by_mode( parse_params: ParseParams, - code: &str, parse_mode: enums::ParseMode, plugin_host: &mut Option, ) -> Result { if let Some(plugin_host) = plugin_host { + let code: &str = &parse_params.text.to_owned(); match parse_mode { enums::ParseMode::Module => { parse_module_with_post_process(parse_params, |module, _| plugin_host.process_module(code, module)) @@ -54,14 +54,14 @@ fn parse_by_mode( pub fn parse<'local>(code: String, options: options::ParseOptions) -> Result { let parse_params = ParseParams { specifier: options.get_specifier(), - text_info: SourceTextInfo::from_string(code.to_owned()), + text: code.into(), media_type: options.media_type, capture_tokens: options.capture_tokens, maybe_syntax: None, scope_analysis: options.scope_analysis, }; let mut plugin_host = options.plugin_host.clone(); - match parse_by_mode(parse_params, &code.as_str(), options.parse_mode, &mut plugin_host) { + match parse_by_mode(parse_params, options.parse_mode, &mut plugin_host) { Ok(parsed_source) => Ok(outputs::ParseOutput::new(&options, &parsed_source)), Err(e) => Err(e.to_string()), } @@ -70,14 +70,14 @@ pub fn parse<'local>(code: String, options: options::ParseOptions) -> Result(code: String, options: options::TransformOptions) -> Result { let parse_params = ParseParams { specifier: options.get_specifier(), - text_info: SourceTextInfo::from_string(code.to_owned()), + text: code.clone().into(), media_type: options.media_type, capture_tokens: false, maybe_syntax: None, scope_analysis: false, }; let mut plugin_host = options.plugin_host.clone(); - match parse_by_mode(parse_params, &code.as_str(), options.parse_mode, &mut plugin_host) { + match parse_by_mode(parse_params, options.parse_mode, &mut plugin_host) { Ok(parsed_source) => { let source_map = Lrc::new(SourceMap::new(FilePathMapping::empty())); source_map.new_source_file(FileName::Url(options.get_specifier()), code.to_owned()); @@ -160,14 +160,14 @@ pub fn transform<'local>(code: String, options: options::TransformOptions) -> Re pub fn transpile<'local>(code: String, options: options::TranspileOptions) -> Result { let parse_params = ParseParams { specifier: options.get_specifier(), - text_info: SourceTextInfo::from_string(code.to_owned()), + text: code.into(), media_type: options.media_type, capture_tokens: options.capture_tokens, maybe_syntax: None, scope_analysis: options.scope_analysis, }; let mut plugin_host = options.plugin_host.clone(); - match parse_by_mode(parse_params, &code.as_str(), options.parse_mode, &mut plugin_host) { + match parse_by_mode(parse_params, options.parse_mode, &mut plugin_host) { Ok(parsed_source) => { let transpile_options = TranspileOptions { emit_metadata: options.emit_metadata, @@ -186,7 +186,7 @@ pub fn transpile<'local>(code: String, options: options::TranspileOptions) -> Re }; let emit_options = EmitOptions { inline_sources: options.inline_sources, - keep_comments: options.keep_comments, + remove_comments: !options.keep_comments, source_map: options.source_map, source_map_file: None, }; diff --git a/rust/src/outputs.rs b/rust/src/outputs.rs index 58fd24de..2da14829 100644 --- a/rust/src/outputs.rs +++ b/rust/src/outputs.rs @@ -270,7 +270,7 @@ impl ParseOutput { } else { None }; - let source_text = parsed_source.text_info().text().to_string(); + let source_text = parsed_source.text().to_string(); let tokens = if parse_options.capture_tokens { Some(Arc::new(parsed_source.tokens().to_vec())) } else { @@ -414,7 +414,7 @@ impl TranspileOutput { None }; let emitted_source = transpile_result.clone().into_source(); - let code = emitted_source.text.to_owned(); + let code = String::from_utf8(emitted_source.source).unwrap_or_default(); let media_type = parsed_source.media_type(); let parse_mode = if parsed_source.is_module() { ParseMode::Module @@ -426,8 +426,8 @@ impl TranspileOutput { } else { None }; - let source_map = emitted_source.source_map.to_owned(); - let source_text = parsed_source.text_info().text().to_string(); + let source_map = emitted_source.source_map.map(|source_map| String::from_utf8(source_map).unwrap_or_default()); + let source_text = parsed_source.text().to_string(); let tokens = if transpile_options.capture_tokens { Some(Arc::new(parsed_source.tokens().to_vec())) } else {