🎨 - Relative Paths

Author: Roland Peelen

src/sourcedirs.rs

@@ -6,6 +6,7 @@ use serde::Serialize;
 use serde_json::json;
 use std::fs::File;
 use std::io::prelude::*;
+use std::path::PathBuf;
 
 type Dir = String;
 type PackageName = String;
@@ -20,33 +21,28 @@ pub struct SourceDirs {
 }
 
 pub fn print(buildstate: &BuildState) {
-    let (_name, package) = buildstate
-        .packages
-        .iter()
-        .find(|(_name, package)| package.is_root)
-        .expect("Could not find root package");
-
-    // First do all child packages
+    // Take all packages apart from the root package
     let child_packages = buildstate
         .packages
         .par_iter()
         .filter(|(_name, package)| !package.is_root)
         .map(|(_name, package)| {
-            let path = package.get_bs_build_path();
+            let path = package.get_build_path();
 
             let dirs = package
                 .dirs
                 .to_owned()
                 .unwrap_or(AHashSet::new())
                 .iter()
-                .filter_map(|path| path.to_str().map(|x| x.to_string()))
+                .filter_map(|path| path.to_str().map(String::from))
                 .collect::<AHashSet<String>>();
 
             fn deps_to_pkgs<'a>(
                 packages: &'a AHashMap<String, Package>,
-                xs: &'a Option<Vec<String>>,
+                dependencies: &'a Option<Vec<String>>,
             ) -> AHashSet<(String, PackagePath)> {
-                xs.as_ref()
+                dependencies
+                    .as_ref()
                     .unwrap_or(&vec![])
                     .iter()
                     .filter_map(|name| {
@@ -94,16 +90,30 @@ pub fn print(buildstate: &BuildState) {
     let mut all_dirs = AHashSet::new();
     let mut all_pkgs: AHashMap<PackageName, AbsolutePath> = AHashMap::new();
 
+    // Find Root Package
+    let (_name, root_package) = buildstate
+        .packages
+        .iter()
+        .find(|(_name, package)| package.is_root)
+        .expect("Could not find root package");
+
     child_packages.iter().for_each(|(package_path, dirs, pkgs)| {
+        let relative_filename = PathBuf::from(&package_path)
+            .strip_prefix(PathBuf::from(&root_package.path))
+            .unwrap()
+            .to_string_lossy()
+            .to_string();
+
         dirs.iter().for_each(|dir| {
-            all_dirs.insert(format!("{package_path}/{dir}"));
+            all_dirs.insert(format!("{relative_filename}/{dir}"));
         });
 
         all_pkgs.extend(pkgs.to_owned());
     });
 
-    let path = package.get_bs_build_path();
+    let path = root_package.get_bs_build_path();
     let name = path + "/.sourcedirs.json";
+
     let _ = File::create(name.clone()).map(|mut file| {
         let all_source_files = SourceDirs {
             dirs: all_dirs.into_iter().collect::<Vec<String>>(),
@@ -113,5 +123,47 @@ pub fn print(buildstate: &BuildState) {
         file.write(json!(all_source_files).to_string().as_bytes())
     });
 
-    let _ = std::fs::copy(package.get_bs_build_path(), package.get_build_path());
+    let _ = std::fs::copy(root_package.get_bs_build_path(), root_package.get_build_path());
+}
+
+/*
+{
+  "dirs": [
+    "/Users/rwjpeelen/Git/rewatch/testrepo/packages/dep02/src",
+    "/Users/rwjpeelen/Git/rewatch/testrepo/packages/main/src",
+    "/Users/rwjpeelen/Git/rewatch/testrepo/packages/new-namespace/src",
+    "/Users/rwjpeelen/Git/rewatch/testrepo/packages/dep01/src"
+  ],
+  "generated": [],
+  "pkgs": [
+    [
+      "@testrepo/new-namespace",
+      "/Users/rwjpeelen/Git/rewatch/testrepo/packages/new-namespace"
+    ],
+    ["@testrepo/dep01", "/Users/rwjpeelen/Git/rewatch/testrepo/packages/dep01"],
+    ["@testrepo/dep02", "/Users/rwjpeelen/Git/rewatch/testrepo/packages/dep02"]
+  ]
+}
+*/
+
+/*
+ {
+   "dirs":[
+      "src",
+      "src/assets"
+   ],
+   "pkgs":[
+      [
+         "@rescript/core",
+         "/Users/rwjpeelen/Git/walnut/test-reanalyze/node_modules/@rescript/core"
+      ],
+      [
+         "@rescript/react",
+         "/Users/rwjpeelen/Git/walnut/test-reanalyze/node_modules/@rescript/react"
+      ]
+   ],
+   "generated":[
+
+   ]
 }
+* */