feat: add support for npm 7 workspaces

If there is no `lerna.json` manfiest, try reading a list of package
files or globs out of a `workspaces` key in the root `package.json`
manifest.

Author: EricCrosson

src/lerna_manifest.rs

@@ -16,21 +16,25 @@ struct LernaManifestFile {
     packages: Vec<String>,
 }
 
+#[derive(Serialize, Deserialize, Debug)]
+struct PackageManifestFile {
+    workspaces: Vec<String>,
+}
+
 #[derive(Debug)]
-pub struct LernaManifest {
+pub struct MonorepoManifest {
     pub internal_package_manifests: Vec<PackageManifest>,
 }
 
-fn get_internal_package_manifests<P>(
+fn get_internal_package_manifests<'a, P, I>(
     directory: P,
-    lerna_manifest_file: &LernaManifestFile,
+    package_globs: I,
 ) -> Result<Vec<PackageManifest>, Box<dyn Error>>
 where
     P: AsRef<Path>,
+    I: Iterator<Item = &'a String>,
 {
-    let mut package_manifests: Vec<String> = lerna_manifest_file
-        .packages
-        .iter()
+    let mut package_manifests: Vec<String> = package_globs
         .map(|package_manifest_glob| {
             Path::new(package_manifest_glob)
                 .join("package.json")
@@ -64,21 +68,48 @@ where
         .collect::<Result<Vec<_>, Box<dyn Error>>>()
 }
 
-impl LernaManifest {
-    const FILENAME: &'static str = "lerna.json";
+impl MonorepoManifest {
+    const LERNA_MANIFEST_FILENAME: &'static str = "lerna.json";
+    const PACKAGE_MANIFEST_FILENAME: &'static str = "package.json";
 
-    pub fn from_directory<P>(root: P) -> Result<LernaManifest, Box<dyn Error>>
+    fn from_lerna_manifest<P>(root: P) -> Result<MonorepoManifest, Box<dyn Error>>
     where
         P: AsRef<Path>,
     {
-        let file = File::open(root.as_ref().join(Self::FILENAME))?;
+        let file = File::open(root.as_ref().join(Self::LERNA_MANIFEST_FILENAME))?;
         let reader = BufReader::new(file);
-        let manifest_contents: LernaManifestFile = serde_json::from_reader(reader)?;
-        Ok(LernaManifest {
-            internal_package_manifests: get_internal_package_manifests(&root, &manifest_contents)?,
+        let lerna_manifest_contents: LernaManifestFile = serde_json::from_reader(reader)?;
+        Ok(MonorepoManifest {
+            internal_package_manifests: get_internal_package_manifests(
+                &root,
+                lerna_manifest_contents.packages.iter(),
+            )?,
         })
     }
 
+    fn from_package_manifest<P>(root: P) -> Result<MonorepoManifest, Box<dyn Error>>
+    where
+        P: AsRef<Path>,
+    {
+        let file = File::open(root.as_ref().join(Self::PACKAGE_MANIFEST_FILENAME))?;
+        let reader = BufReader::new(file);
+        let package_manifest_contents: PackageManifestFile = serde_json::from_reader(reader)?;
+        Ok(MonorepoManifest {
+            internal_package_manifests: get_internal_package_manifests(
+                &root,
+                package_manifest_contents.workspaces.iter(),
+            )?,
+        })
+    }
+
+    pub fn from_directory<P>(root: P) -> Result<MonorepoManifest, Box<dyn Error>>
+    where
+        P: AsRef<Path>,
+    {
+        MonorepoManifest::from_lerna_manifest(&root)
+            .or_else(|_| MonorepoManifest::from_package_manifest(&root))
+    }
+
     pub fn package_manifests_by_package_name(
         &self,
     ) -> Result<HashMap<String, &PackageManifest>, Box<dyn Error>> {

src/link.rs

@@ -8,7 +8,7 @@ use crate::configuration_file::ConfigurationFile;
 use crate::io::{
     write_project_references, TypescriptParentProjectReference, TypescriptProjectReference,
 };
-use crate::lerna_manifest::LernaManifest;
+use crate::lerna_manifest::MonorepoManifest;
 use crate::package_manifest::PackageManifest;
 use crate::typescript_config::TypescriptConfig;
 
@@ -59,7 +59,7 @@ fn vecs_match<T: PartialEq>(a: &[T], b: &[T]) -> bool {
 // This permits us to build the monorepo from the top down.
 fn link_children_packages(
     opts: &crate::opts::Link,
-    lerna_manifest: &LernaManifest,
+    lerna_manifest: &MonorepoManifest,
 ) -> Result<bool, Box<dyn Error>> {
     let mut is_exit_success = true;
 
@@ -106,7 +106,7 @@ fn link_children_packages(
 
 fn link_package_dependencies(
     opts: &crate::opts::Link,
-    lerna_manifest: &LernaManifest,
+    lerna_manifest: &MonorepoManifest,
 ) -> Result<bool, Box<dyn Error>> {
     let package_manifest_by_package_name = lerna_manifest
         .package_manifests_by_package_name()
@@ -199,7 +199,7 @@ fn link_package_dependencies(
 
 pub fn link_typescript_project_references(opts: crate::opts::Link) -> Result<(), Box<dyn Error>> {
     let lerna_manifest =
-        LernaManifest::from_directory(&opts.root).expect("Unable to read lerna manifest");
+        MonorepoManifest::from_directory(&opts.root).expect("Unable to read monorepo manifest");
 
     let is_children_link_success =
         link_children_packages(&opts, &lerna_manifest).expect("Unable to link children packages");

src/make_depend.rs

@@ -7,7 +7,7 @@ use askama::Template;
 use pathdiff::diff_paths;
 
 use crate::configuration_file::ConfigurationFile;
-use crate::lerna_manifest::LernaManifest;
+use crate::lerna_manifest::MonorepoManifest;
 use crate::package_manifest::PackageManifest;
 
 #[derive(Template)]
@@ -26,7 +26,7 @@ struct MakefileTemplate<'a> {
 }
 
 pub fn make_dependency_makefile(opts: crate::opts::MakeDepend) -> Result<(), Box<dyn Error>> {
-    let lerna_manifest = LernaManifest::from_directory(&opts.root)?;
+    let lerna_manifest = MonorepoManifest::from_directory(&opts.root)?;
     let package_manifest = PackageManifest::from_directory(&opts.root, &opts.package_directory)?;
 
     // determine the complete set of internal dependencies (and self!)

src/pin.rs

@@ -2,7 +2,7 @@ use std::collections::HashMap;
 use std::error::Error;
 
 use crate::configuration_file::ConfigurationFile;
-use crate::lerna_manifest::LernaManifest;
+use crate::lerna_manifest::MonorepoManifest;
 use crate::package_manifest::DependencyGroup;
 
 #[derive(Clone)]
@@ -15,7 +15,7 @@ struct UnpinnedDependency {
 pub fn pin_version_numbers_in_internal_packages(
     opts: crate::opts::Pin,
 ) -> Result<(), Box<dyn Error>> {
-    let lerna_manifest = LernaManifest::from_directory(&opts.root)?;
+    let lerna_manifest = MonorepoManifest::from_directory(&opts.root)?;
     let mut package_manifest_by_package_name = lerna_manifest
         .into_package_manifests_by_package_name()
         .expect("Unable to read all package manifests");

src/query.rs

@@ -4,7 +4,7 @@ use std::error::Error;
 use crate::opts;
 
 use crate::configuration_file::ConfigurationFile;
-use crate::lerna_manifest::LernaManifest;
+use crate::lerna_manifest::MonorepoManifest;
 
 pub fn handle_subcommand(opts: crate::opts::Query) -> Result<(), Box<dyn Error>> {
     match opts.subcommand {
@@ -16,7 +16,7 @@ fn query_internal_dependencies(
     opts: &crate::opts::InternalDependencies,
 ) -> Result<(), Box<dyn Error>> {
     let lerna_manifest =
-        LernaManifest::from_directory(&opts.root).expect("Unable to read lerna manifest");
+        MonorepoManifest::from_directory(&opts.root).expect("Unable to read monorepo manifest");
 
     let package_manifest_by_package_name = lerna_manifest
         .package_manifests_by_package_name()