Use oxc_resolver for ppx path resolution

Author: tsnobip

rewatch/Cargo.lock

@@ -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]

rewatch/Cargo.toml

@@ -78,7 +78,6 @@ pub fn get_compiler_args(path: &Path) -> Result<String> {
         &rescript_config,
         &root_rescript_config,
         relative_filename,
-        &workspace_root,
         workspace_root.as_ref().unwrap_or(&package_root),
         &contents,
     );

rewatch/src/build.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<PathBuf>,
     root_path: &Path,
     contents: &str,
 ) -> (PathBuf, Vec<String>) {
     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<PathBuf>,
 ) -> Result<(PathBuf, Option<helpers::StdErr>), 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,
     );

rewatch/src/build/parse.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<OneOrMore<String>>>) -> Vec<String> {
 
 /// 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<Vec<OneOrMore<String>>>,
-    package_name: &String,
-) -> Vec<String> {
+pub fn flatten_ppx_flags(root_path: &Path, flags: &Option<Vec<OneOrMore<String>>>) -> Vec<String> {
+    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]

rewatch/src/config.rs

@@ -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"
   },

rewatch/testrepo/package.json

@@ -12,6 +12,6 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@testrepo/dep02": "*"
+    "@testrepo/dep02": "workspace:*"
   }
 }

rewatch/testrepo/packages/dep01/package.json

@@ -12,7 +12,7 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@testrepo/compiled-by-legacy": "*",
-    "@testrepo/dep01": "*"
+    "@testrepo/compiled-by-legacy": "workspace:*",
+    "@testrepo/dep01": "workspace:*"
   }
 }

rewatch/testrepo/packages/main/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"
+  }
+}

rewatch/testrepo/packages/with-ppx/package.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"]
+}