From c55b479b9976c368bf5a2458b07d9f45c9a85d78 Mon Sep 17 00:00:00 2001 From: tsnobip Date: Wed, 30 Jul 2025 13:50:13 +0200 Subject: [PATCH 1/2] Use oxc_resolver for ppx path resolution --- rewatch/Cargo.lock | 428 ++++++++++++++++++ rewatch/Cargo.toml | 1 + rewatch/src/build.rs | 1 - rewatch/src/build/parse.rs | 15 +- rewatch/src/config.rs | 51 +-- rewatch/testrepo/package.json | 18 +- rewatch/testrepo/packages/dep01/package.json | 2 +- rewatch/testrepo/packages/main/package.json | 4 +- .../testrepo/packages/with-ppx/package.json | 14 + .../testrepo/packages/with-ppx/rescript.json | 16 + .../packages/with-ppx/src/FileWithPpx.mjs | 17 + .../packages/with-ppx/src/FileWithPpx.res | 6 + rewatch/testrepo/rescript.json | 3 +- rewatch/testrepo/yarn.lock | 43 +- ...-dev-dependency-used-by-non-dev-source.txt | 2 +- rewatch/tests/snapshots/dependency-cycle.txt | 2 +- rewatch/tests/snapshots/remove-file.txt | 2 +- .../rename-file-internal-dep-namespace.txt | 2 +- .../snapshots/rename-file-internal-dep.txt | 2 +- .../snapshots/rename-file-with-interface.txt | 2 +- rewatch/tests/snapshots/rename-file.txt | 2 +- .../tests/snapshots/rename-interface-file.txt | 2 +- rewatch/tests/suffix.sh | 2 +- 23 files changed, 555 insertions(+), 82 deletions(-) create mode 100644 rewatch/testrepo/packages/with-ppx/package.json create mode 100644 rewatch/testrepo/packages/with-ppx/rescript.json create mode 100644 rewatch/testrepo/packages/with-ppx/src/FileWithPpx.mjs create mode 100644 rewatch/testrepo/packages/with-ppx/src/FileWithPpx.res diff --git a/rewatch/Cargo.lock b/rewatch/Cargo.lock index a679f628a5..9594712ead 100644 --- a/rewatch/Cargo.lock +++ b/rewatch/Cargo.lock @@ -278,6 +278,17 @@ dependencies = [ "windows-sys 0.59.0", ] +[[package]] +name = "displaydoc" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "either" version = "1.15.0" @@ -303,6 +314,12 @@ dependencies = [ "termcolor", ] +[[package]] +name = "equivalent" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" + [[package]] name = "errno" version = "0.3.13" @@ -331,6 +348,15 @@ dependencies = [ "windows-sys 0.59.0", ] +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + [[package]] name = "fsevent-sys" version = "4.1.0" @@ -447,6 +473,12 @@ dependencies = [ "wasi 0.14.2+wasi-0.2.4", ] +[[package]] +name = "hashbrown" +version = "0.15.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5" + [[package]] name = "heck" version = "0.5.0" @@ -465,6 +497,124 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b112acc8b3adf4b107a8ec20977da0273a8c386765a3ec0229bd500a1443f9f" +[[package]] +name = "icu_collections" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47" +dependencies = [ + "displaydoc", + "potential_utf", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_locale_core" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_normalizer" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3" + +[[package]] +name = "icu_properties" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_locale_core", + "icu_properties_data", + "icu_provider", + "potential_utf", + "zerotrie", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632" + +[[package]] +name = "icu_provider" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af" +dependencies = [ + "displaydoc", + "icu_locale_core", + "stable_deref_trait", + "tinystr", + "writeable", + "yoke", + "zerofrom", + "zerotrie", + "zerovec", +] + +[[package]] +name = "idna" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" +dependencies = [ + "idna_adapter", + "smallvec", + "utf8_iter", +] + +[[package]] +name = "idna_adapter" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344" +dependencies = [ + "icu_normalizer", + "icu_properties", +] + +[[package]] +name = "indexmap" +version = "2.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661" +dependencies = [ + "equivalent", + "hashbrown", + "serde", +] + [[package]] name = "indicatif" version = "0.17.11" @@ -531,6 +681,15 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "json-strip-comments" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b271732a960335e715b6b2ae66a086f115c74eb97360e996d2bd809bfc063bba" +dependencies = [ + "memchr", +] + [[package]] name = "kqueue" version = "1.1.1" @@ -574,6 +733,12 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12" +[[package]] +name = "litemap" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956" + [[package]] name = "log" version = "0.4.27" @@ -666,6 +831,42 @@ version = "1.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad" +[[package]] +name = "oxc_resolver" +version = "11.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e1ea056149e636f8d6426febc4c86a82a1a491811fcf8410a60076e3916c85c" +dependencies = [ + "cfg-if", + "indexmap", + "json-strip-comments", + "once_cell", + "papaya", + "rustc-hash", + "serde", + "serde_json", + "simdutf8", + "thiserror", + "tracing", + "url", +] + +[[package]] +name = "papaya" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f92dd0b07c53a0a0c764db2ace8c541dc47320dad97c2200c2a637ab9dd2328f" +dependencies = [ + "equivalent", + "seize", +] + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + [[package]] name = "pin-project-lite" version = "0.2.16" @@ -684,6 +885,15 @@ version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483" +[[package]] +name = "potential_utf" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5a7c30837279ca13e7c867e9e40053bc68740f988cb07f7ca6df43cc734b585" +dependencies = [ + "zerovec", +] + [[package]] name = "proc-macro2" version = "1.0.95" @@ -785,6 +995,7 @@ dependencies = [ "log", "notify", "num_cpus", + "oxc_resolver", "rayon", "regex", "serde", @@ -793,6 +1004,12 @@ dependencies = [ "tempfile", ] +[[package]] +name = "rustc-hash" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" + [[package]] name = "rustix" version = "1.0.8" @@ -821,6 +1038,16 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "seize" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4b8d813387d566f627f3ea1b914c068aac94c40ae27ec43f5f33bde65abefe7" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + [[package]] name = "serde" version = "1.0.219" @@ -847,6 +1074,7 @@ version = "1.0.140" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" dependencies = [ + "indexmap", "itoa", "memchr", "ryu", @@ -859,12 +1087,30 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" +[[package]] +name = "simdutf8" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" + [[package]] name = "slab" version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04dc19736151f35336d325007ac991178d504a119863a2fcb3758cdb5e52c50d" +[[package]] +name = "smallvec" +version = "1.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" + +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + [[package]] name = "strsim" version = "0.11.1" @@ -882,6 +1128,17 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "synstructure" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "sysinfo" version = "0.29.11" @@ -919,6 +1176,67 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "thiserror" +version = "2.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "2.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tinystr" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b" +dependencies = [ + "displaydoc", + "zerovec", +] + +[[package]] +name = "tracing" +version = "0.1.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" +dependencies = [ + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tracing-core" +version = "0.1.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678" +dependencies = [ + "once_cell", +] + [[package]] name = "unicode-ident" version = "1.0.18" @@ -937,6 +1255,23 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4a1a07cc7db3810833284e8d372ccdc6da29741639ecc70c9ec107df0fa6154c" +[[package]] +name = "url" +version = "2.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + [[package]] name = "utf8parse" version = "0.2.2" @@ -1090,6 +1425,15 @@ dependencies = [ "windows-targets 0.48.5", ] +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.6", +] + [[package]] name = "windows-sys" version = "0.59.0" @@ -1286,6 +1630,36 @@ dependencies = [ "bitflags 2.9.1", ] +[[package]] +name = "writeable" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb" + +[[package]] +name = "yoke" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "synstructure", +] + [[package]] name = "zerocopy" version = "0.8.26" @@ -1305,3 +1679,57 @@ dependencies = [ "quote", "syn", ] + +[[package]] +name = "zerofrom" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "synstructure", +] + +[[package]] +name = "zerotrie" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", +] + +[[package]] +name = "zerovec" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a05eb080e015ba39cc9e23bbe5e7fb04d5fb040350f99f34e338d5fdd294428" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] diff --git a/rewatch/Cargo.toml b/rewatch/Cargo.toml index 05fc03f8c6..17959f290c 100644 --- a/rewatch/Cargo.toml +++ b/rewatch/Cargo.toml @@ -26,6 +26,7 @@ serde = { version = "1.0.152", features = ["derive"] } serde_json = { version = "1.0.93" } sysinfo = "0.29.10" tempfile = "3.10.1" +oxc_resolver = "11.6.0" [profile.release] diff --git a/rewatch/src/build.rs b/rewatch/src/build.rs index 990333ca05..0a4dfa80f2 100644 --- a/rewatch/src/build.rs +++ b/rewatch/src/build.rs @@ -78,7 +78,6 @@ pub fn get_compiler_args(path: &Path) -> Result { &rescript_config, &root_rescript_config, relative_filename, - &workspace_root, workspace_root.as_ref().unwrap_or(&package_root), &contents, ); diff --git a/rewatch/src/build/parse.rs b/rewatch/src/build/parse.rs index 67908e772e..9c9ebede94 100644 --- a/rewatch/src/build/parse.rs +++ b/rewatch/src/build/parse.rs @@ -53,7 +53,6 @@ pub fn generate_asts( root_package.to_owned(), &source_file.implementation.path.to_owned(), &build_state.bsc_path, - &build_state.workspace_root, ); let iast_result = match source_file.interface.as_ref().map(|i| i.path.to_owned()) { @@ -62,7 +61,6 @@ pub fn generate_asts( root_package.to_owned(), &interface_file_path.to_owned(), &build_state.bsc_path, - &build_state.workspace_root, ) .map(Some), _ => Ok(None), @@ -243,21 +241,12 @@ pub fn parser_args( config: &config::Config, root_config: &config::Config, filename: &Path, - workspace_root: &Option, root_path: &Path, contents: &str, ) -> (PathBuf, Vec) { let file = &filename; let ast_path = helpers::get_ast_path(file); - let ppx_flags = config::flatten_ppx_flags( - &if let Some(workspace_root) = workspace_root { - workspace_root.join("node_modules") - } else { - root_path.join("node_modules") - }, - &filter_ppx_flags(&config.ppx_flags, contents), - &config.name, - ); + let ppx_flags = config::flatten_ppx_flags(root_path, &filter_ppx_flags(&config.ppx_flags, contents)); let jsx_args = root_config.get_jsx_args(); let jsx_module_args = root_config.get_jsx_module_args(); let jsx_mode_args = root_config.get_jsx_mode_args(); @@ -292,7 +281,6 @@ fn generate_ast( root_package: packages::Package, filename: &Path, bsc_path: &PathBuf, - workspace_root: &Option, ) -> Result<(PathBuf, Option), String> { let file_path = PathBuf::from(&package.path).join(filename); let contents = helpers::read_file(&file_path).expect("Error reading file"); @@ -302,7 +290,6 @@ fn generate_ast( &package.config, &root_package.config, filename, - workspace_root, &root_package.path, &contents, ); diff --git a/rewatch/src/config.rs b/rewatch/src/config.rs index 6d2878c790..6e162fe13c 100644 --- a/rewatch/src/config.rs +++ b/rewatch/src/config.rs @@ -2,6 +2,7 @@ use crate::build::packages; use crate::helpers::deserialize::*; use anyhow::{Result, bail}; use convert_case::{Case, Casing}; +use oxc_resolver::{ResolveOptions, Resolver}; use serde::Deserialize; use std::fs; use std::path::{Path, PathBuf}; @@ -288,46 +289,30 @@ pub fn flatten_flags(flags: &Option>>) -> Vec { /// Since ppx-flags could be one or more, and could potentially be nested, this function takes the /// flags and flattens them. -pub fn flatten_ppx_flags( - node_modules_dir: &Path, - flags: &Option>>, - package_name: &String, -) -> Vec { +pub fn flatten_ppx_flags(root_path: &Path, flags: &Option>>) -> Vec { + let oxc_resolver = Resolver::new(ResolveOptions::default()); match flags { None => vec![], Some(flags) => flags .iter() .flat_map(|x| match x { - OneOrMore::Single(y) => { - let first_character = y.chars().next(); - match first_character { - Some('.') => { - vec![ - "-ppx".to_string(), - node_modules_dir - .join(package_name) - .join(y) - .to_string_lossy() - .to_string(), - ] - } - _ => vec![ - "-ppx".to_string(), - node_modules_dir.join(y).to_string_lossy().to_string(), - ], - } - } + OneOrMore::Single(y) => vec![ + "-ppx".to_string(), + oxc_resolver + .resolve(root_path, y) + .unwrap() + .full_path() + .to_string_lossy() + .to_string(), + ], OneOrMore::Multiple(ys) if ys.is_empty() => vec![], OneOrMore::Multiple(ys) => { - let first_character = ys[0].chars().next(); - let ppx = match first_character { - Some('.') => node_modules_dir - .join(package_name) - .join(&ys[0]) - .to_string_lossy() - .to_string(), - _ => node_modules_dir.join(&ys[0]).to_string_lossy().to_string(), - }; + let ppx = oxc_resolver + .resolve(root_path, &ys[0]) + .unwrap() + .full_path() + .to_string_lossy() + .to_string(); vec![ "-ppx".to_string(), vec![ppx] diff --git a/rewatch/testrepo/package.json b/rewatch/testrepo/package.json index f42be392d8..b1362b1611 100644 --- a/rewatch/testrepo/package.json +++ b/rewatch/testrepo/package.json @@ -1,21 +1,9 @@ { "name": "testrepo", "private": true, - "workspaces": { - "packages": [ - "packages/main", - "packages/dep01", - "packages/dep02", - "packages/new-namespace", - "packages/namespace-casing", - "packages/with-dev-deps", - "packages/compiled-by-legacy", - "packages/nonexisting-dev-files", - "packages/deprecated-config", - "packages/file-casing", - "packages/file-casing-no-namespace" - ] - }, + "workspaces": [ + "packages/*" + ], "dependencies": { "rescript": "12.0.0-beta.1" }, diff --git a/rewatch/testrepo/packages/dep01/package.json b/rewatch/testrepo/packages/dep01/package.json index 9209fbbaf8..da23efca56 100644 --- a/rewatch/testrepo/packages/dep01/package.json +++ b/rewatch/testrepo/packages/dep01/package.json @@ -12,6 +12,6 @@ "author": "", "license": "MIT", "dependencies": { - "@testrepo/dep02": "*" + "@testrepo/dep02": "workspace:*" } } diff --git a/rewatch/testrepo/packages/main/package.json b/rewatch/testrepo/packages/main/package.json index 1813de299d..437083433f 100644 --- a/rewatch/testrepo/packages/main/package.json +++ b/rewatch/testrepo/packages/main/package.json @@ -12,7 +12,7 @@ "author": "", "license": "MIT", "dependencies": { - "@testrepo/compiled-by-legacy": "*", - "@testrepo/dep01": "*" + "@testrepo/compiled-by-legacy": "workspace:*", + "@testrepo/dep01": "workspace:*" } } diff --git a/rewatch/testrepo/packages/with-ppx/package.json b/rewatch/testrepo/packages/with-ppx/package.json new file mode 100644 index 0000000000..47fa3340f8 --- /dev/null +++ b/rewatch/testrepo/packages/with-ppx/package.json @@ -0,0 +1,14 @@ +{ + "name": "@testrepo/with-ppx", + "version": "0.0.1", + "keywords": [ + "rescript" + ], + "author": "", + "license": "MIT", + "dependencies": { + "rescript-nodejs": "16.1.0", + "rescript-schema": "9.3.0-rescript12.0", + "rescript-schema-ppx": "9.0.1" + } +} diff --git a/rewatch/testrepo/packages/with-ppx/rescript.json b/rewatch/testrepo/packages/with-ppx/rescript.json new file mode 100644 index 0000000000..9828fe1584 --- /dev/null +++ b/rewatch/testrepo/packages/with-ppx/rescript.json @@ -0,0 +1,16 @@ +{ + "name": "@testrepo/with-ppx", + "sources": [ + { + "dir": "src" + } + ], + "dependencies": ["rescript-nodejs", "rescript-schema"], + "package-specs": { + "module": "es6", + "in-source": true + }, + "suffix": ".res.js", + "compiler-flags": ["-open RescriptSchema"], + "ppx-flags": ["rescript-schema-ppx/bin"] +} diff --git a/rewatch/testrepo/packages/with-ppx/src/FileWithPpx.mjs b/rewatch/testrepo/packages/with-ppx/src/FileWithPpx.mjs new file mode 100644 index 0000000000..a06d952729 --- /dev/null +++ b/rewatch/testrepo/packages/with-ppx/src/FileWithPpx.mjs @@ -0,0 +1,17 @@ +// Generated by ReScript, PLEASE EDIT WITH CARE + +import * as S$RescriptSchema from "rescript-schema/src/S.mjs"; + +let schema = S$RescriptSchema.schema(s => ({ + foo: s.m(S$RescriptSchema.string) +})); + +let foo = S$RescriptSchema.parseOrThrow("{ \"foo\": \"bar\" }", schema); + +console.log(foo); + +export { + schema, + foo, +} +/* schema Not a pure module */ diff --git a/rewatch/testrepo/packages/with-ppx/src/FileWithPpx.res b/rewatch/testrepo/packages/with-ppx/src/FileWithPpx.res new file mode 100644 index 0000000000..088bde0f27 --- /dev/null +++ b/rewatch/testrepo/packages/with-ppx/src/FileWithPpx.res @@ -0,0 +1,6 @@ +@schema +type t = {foo: string} + +let foo = S.parseOrThrow(`{ "foo": "bar" }`, schema) + +Console.log(foo) diff --git a/rewatch/testrepo/rescript.json b/rewatch/testrepo/rescript.json index ae437e38dd..7f9a8f81f2 100644 --- a/rewatch/testrepo/rescript.json +++ b/rewatch/testrepo/rescript.json @@ -25,6 +25,7 @@ "@testrepo/nonexisting-dev-files", "@testrepo/deprecated-config", "@testrepo/file-casing", - "@testrepo/file-casing-no-namespace" + "@testrepo/file-casing-no-namespace", + "@testrepo/with-ppx" ] } diff --git a/rewatch/testrepo/yarn.lock b/rewatch/testrepo/yarn.lock index 808197041f..b6ba1d0100 100644 --- a/rewatch/testrepo/yarn.lock +++ b/rewatch/testrepo/yarn.lock @@ -49,21 +49,21 @@ __metadata: languageName: node linkType: hard -"@testrepo/compiled-by-legacy@npm:*, @testrepo/compiled-by-legacy@workspace:packages/compiled-by-legacy": +"@testrepo/compiled-by-legacy@workspace:*, @testrepo/compiled-by-legacy@workspace:packages/compiled-by-legacy": version: 0.0.0-use.local resolution: "@testrepo/compiled-by-legacy@workspace:packages/compiled-by-legacy" languageName: unknown linkType: soft -"@testrepo/dep01@npm:*, @testrepo/dep01@workspace:packages/dep01": +"@testrepo/dep01@workspace:*, @testrepo/dep01@workspace:packages/dep01": version: 0.0.0-use.local resolution: "@testrepo/dep01@workspace:packages/dep01" dependencies: - "@testrepo/dep02": "npm:*" + "@testrepo/dep02": "workspace:*" languageName: unknown linkType: soft -"@testrepo/dep02@npm:*, @testrepo/dep02@workspace:packages/dep02": +"@testrepo/dep02@workspace:*, @testrepo/dep02@workspace:packages/dep02": version: 0.0.0-use.local resolution: "@testrepo/dep02@workspace:packages/dep02" languageName: unknown @@ -91,8 +91,8 @@ __metadata: version: 0.0.0-use.local resolution: "@testrepo/main@workspace:packages/main" dependencies: - "@testrepo/compiled-by-legacy": "npm:*" - "@testrepo/dep01": "npm:*" + "@testrepo/compiled-by-legacy": "workspace:*" + "@testrepo/dep01": "workspace:*" languageName: unknown linkType: soft @@ -123,6 +123,16 @@ __metadata: languageName: unknown linkType: soft +"@testrepo/with-ppx@workspace:packages/with-ppx": + version: 0.0.0-use.local + resolution: "@testrepo/with-ppx@workspace:packages/with-ppx" + dependencies: + rescript-nodejs: "npm:16.1.0" + rescript-schema: "npm:9.3.0-rescript12.0" + rescript-schema-ppx: "npm:9.0.1" + languageName: unknown + linkType: soft + "rescript-nodejs@npm:16.1.0": version: 16.1.0 resolution: "rescript-nodejs@npm:16.1.0" @@ -130,6 +140,27 @@ __metadata: languageName: node linkType: hard +"rescript-schema-ppx@npm:9.0.1": + version: 9.0.1 + resolution: "rescript-schema-ppx@npm:9.0.1" + peerDependencies: + rescript-schema: 9.x + checksum: 10c0/c6f95183d3c138f1b1c1110314480c3601366010bbd406f6ab8876e1eef9ab64f87109bda1467801f9905ff30b81c3bf1c6c11ea8bb1ca5ceb801012b0bab39e + languageName: node + linkType: hard + +"rescript-schema@npm:9.3.0-rescript12.0": + version: 9.3.0-rescript12.0 + resolution: "rescript-schema@npm:9.3.0-rescript12.0" + peerDependencies: + rescript: ^12.0.0-alpha.8 + peerDependenciesMeta: + rescript: + optional: true + checksum: 10c0/61dc401034ea310233c531d91ab2ce688644bd255f6dc98c42d632a082639fd5501ac4a97ab53982c56845b0296da2c7d4ff07542878a5eef8a90db2451b4c2e + languageName: node + linkType: hard + "rescript@npm:12.0.0-beta.1, rescript@npm:^12.0.0-alpha.13": version: 12.0.0-beta.1 resolution: "rescript@npm:12.0.0-beta.1" diff --git a/rewatch/tests/snapshots/bs-dev-dependency-used-by-non-dev-source.txt b/rewatch/tests/snapshots/bs-dev-dependency-used-by-non-dev-source.txt index 04222b84a0..2a0fbfd905 100644 --- a/rewatch/tests/snapshots/bs-dev-dependency-used-by-non-dev-source.txt +++ b/rewatch/tests/snapshots/bs-dev-dependency-used-by-non-dev-source.txt @@ -1,4 +1,4 @@ -Cleaned 0/60 +Cleaned 0/64 Parsed 2 source files Compiled 2 modules diff --git a/rewatch/tests/snapshots/dependency-cycle.txt b/rewatch/tests/snapshots/dependency-cycle.txt index cc25fb9c92..c03cea3c23 100644 --- a/rewatch/tests/snapshots/dependency-cycle.txt +++ b/rewatch/tests/snapshots/dependency-cycle.txt @@ -1,4 +1,4 @@ -Cleaned 0/60 +Cleaned 0/64 Parsed 1 source files Compiled 0 modules diff --git a/rewatch/tests/snapshots/remove-file.txt b/rewatch/tests/snapshots/remove-file.txt index a19c44e596..8a9a7f8ba0 100644 --- a/rewatch/tests/snapshots/remove-file.txt +++ b/rewatch/tests/snapshots/remove-file.txt @@ -1,4 +1,4 @@ -Cleaned 1/60 +Cleaned 1/64 Parsed 0 source files Compiled 1 modules diff --git a/rewatch/tests/snapshots/rename-file-internal-dep-namespace.txt b/rewatch/tests/snapshots/rename-file-internal-dep-namespace.txt index a0e20f68f0..c0d4961b3f 100644 --- a/rewatch/tests/snapshots/rename-file-internal-dep-namespace.txt +++ b/rewatch/tests/snapshots/rename-file-internal-dep-namespace.txt @@ -1,4 +1,4 @@ -Cleaned 2/60 +Cleaned 2/64 Parsed 2 source files Compiled 3 modules diff --git a/rewatch/tests/snapshots/rename-file-internal-dep.txt b/rewatch/tests/snapshots/rename-file-internal-dep.txt index 34d9fc9c90..ae66f0c44a 100644 --- a/rewatch/tests/snapshots/rename-file-internal-dep.txt +++ b/rewatch/tests/snapshots/rename-file-internal-dep.txt @@ -1,4 +1,4 @@ -Cleaned 2/60 +Cleaned 2/64 Parsed 2 source files Compiled 2 modules diff --git a/rewatch/tests/snapshots/rename-file-with-interface.txt b/rewatch/tests/snapshots/rename-file-with-interface.txt index fa2b3dcd73..b1342a049d 100644 --- a/rewatch/tests/snapshots/rename-file-with-interface.txt +++ b/rewatch/tests/snapshots/rename-file-with-interface.txt @@ -1,5 +1,5 @@  No implementation file found for interface file (skipping): src/ModuleWithInterface.resi -Cleaned 2/60 +Cleaned 2/64 Parsed 1 source files Compiled 2 modules diff --git a/rewatch/tests/snapshots/rename-file.txt b/rewatch/tests/snapshots/rename-file.txt index 388a7fa123..e467c191dc 100644 --- a/rewatch/tests/snapshots/rename-file.txt +++ b/rewatch/tests/snapshots/rename-file.txt @@ -1,4 +1,4 @@ -Cleaned 1/60 +Cleaned 1/64 Parsed 1 source files Compiled 1 modules diff --git a/rewatch/tests/snapshots/rename-interface-file.txt b/rewatch/tests/snapshots/rename-interface-file.txt index 7ab0b0c690..d01646a824 100644 --- a/rewatch/tests/snapshots/rename-interface-file.txt +++ b/rewatch/tests/snapshots/rename-interface-file.txt @@ -1,5 +1,5 @@  No implementation file found for interface file (skipping): src/ModuleWithInterface2.resi -Cleaned 1/60 +Cleaned 1/64 Parsed 1 source files Compiled 2 modules diff --git a/rewatch/tests/suffix.sh b/rewatch/tests/suffix.sh index aa67fcfde9..32450befea 100755 --- a/rewatch/tests/suffix.sh +++ b/rewatch/tests/suffix.sh @@ -31,7 +31,7 @@ fi # Count files with new extension file_count=$(find ./packages -name *.res.js | wc -l) -if [ "$file_count" -eq 36 ]; +if [ "$file_count" -eq 38 ]; then success "Found files with correct suffix" else From 88c80e9c0bf67c8fa28f94d9675f8651afb5a04a Mon Sep 17 00:00:00 2001 From: tsnobip Date: Wed, 30 Jul 2025 14:28:32 +0200 Subject: [PATCH 2/2] fix version echoing --- rewatch/tests/suite-ci.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rewatch/tests/suite-ci.sh b/rewatch/tests/suite-ci.sh index 76cc50b21c..42424b3db2 100755 --- a/rewatch/tests/suite-ci.sh +++ b/rewatch/tests/suite-ci.sh @@ -19,7 +19,7 @@ export RESCRIPT_BSC_EXE source ./utils.sh bold "Rescript version" -(cd ../testrepo && ./node_modules/.bin/rescript -v) +rewatch --version # we need to reset the yarn.lock and package.json to the original state # so there is not diff in git. The CI will install new ReScript package