more cleanup

Author: cknitt

rewatch/CompilerConfigurationSpec.md

@@ -13,13 +13,13 @@ This document contains a list of all bsconfig parameters with remarks, and wheth
 | sources              | Source                  |        |     [x]      |
 | sources              | array of Source         |        |     [x]      |
 | ignored-dirs         | array of string         |        |     [_]      |
-| bs-dependencies      | array of string         |        |     [x]      |
-| bs-dev-dependencies  | array of string         |        |     [x]      |
+| dependencies         | array of string         |        |     [x]      |
+| dev-dependencies     | array of string         |        |     [x]      |
 | generators           | array of Rule-Generator |        |     [_]      |
 | cut-generators       | boolean                 |        |     [_]      |
 | jsx                  | JSX                     |        |     [x]      |
 | gentypeconfig        | Gentype                 |        |     [_]      |
-| bsc-flags            | array of string         |        |     [x]      |
+| compiler-flags       | array of string         |        |     [x]      |
 | warnings             | Warnings                |        |     [x]      |
 | ppx-flags            | array of string         |        |     [x]      |
 | pp-flags             | array of string         |        |     [_]      |

rewatch/src/build/packages.rs

@@ -891,36 +891,36 @@ fn get_unallowed_dependents(
 }
 #[derive(Debug, Clone)]
 struct UnallowedDependency {
-    bs_deps: Vec<String>,
-    bs_build_dev_deps: Vec<String>,
+    deps: Vec<String>,
+    dev_deps: Vec<String>,
 }
 
 pub fn validate_packages_dependencies(packages: &AHashMap<String, Package>) -> bool {
     let mut detected_unallowed_dependencies: AHashMap<String, UnallowedDependency> = AHashMap::new();
 
     for (package_name, package) in packages {
-        let bs_dependencies = &package.config.dependencies.to_owned().unwrap_or(vec![]);
+        let dependencies = &package.config.dependencies.to_owned().unwrap_or(vec![]);
         let dev_dependencies = &package.config.dev_dependencies.to_owned().unwrap_or(vec![]);
 
         [
-            ("bs-dependencies", bs_dependencies),
-            ("bs-dev-dependencies", dev_dependencies),
+            ("dependencies", dependencies),
+            ("dev-dependencies", dev_dependencies),
         ]
         .iter()
         .for_each(|(dependency_type, dependencies)| {
             if let Some(unallowed_dependency_name) =
                 get_unallowed_dependents(packages, package_name, dependencies)
             {
                 let empty_unallowed_deps = UnallowedDependency {
-                    bs_deps: vec![],
-                    bs_build_dev_deps: vec![],
+                    deps: vec![],
+                    dev_deps: vec![],
                 };
 
                 let unallowed_dependency = detected_unallowed_dependencies.entry(String::from(package_name));
                 let value = unallowed_dependency.or_insert_with(|| empty_unallowed_deps);
                 match *dependency_type {
-                    "bs-dependencies" => value.bs_deps.push(unallowed_dependency_name),
-                    "bs-dev-dependencies" => value.bs_build_dev_deps.push(unallowed_dependency_name),
+                    "dependencies" => value.deps.push(unallowed_dependency_name),
+                    "dev-dependencies" => value.dev_deps.push(unallowed_dependency_name),
                     _ => (),
                 }
             }
@@ -934,8 +934,8 @@ pub fn validate_packages_dependencies(packages: &AHashMap<String, Package>) -> b
         );
 
         [
-            ("bs-dependencies", unallowed_deps.bs_deps.to_owned()),
-            ("bs-dev-dependencies", unallowed_deps.bs_build_dev_deps.to_owned()),
+            ("dependencies", unallowed_deps.deps.to_owned()),
+            ("dev-dependencies", unallowed_deps.dev_deps.to_owned()),
         ]
         .iter()
         .for_each(|(deps_type, map)| {
@@ -970,7 +970,7 @@ mod test {
 
     pub struct CreatePackageArgs {
         name: String,
-        bs_deps: Vec<String>,
+        deps: Vec<String>,
         build_dev_deps: Vec<String>,
         allowed_dependents: Option<Vec<String>>,
     }
@@ -980,7 +980,7 @@ mod test {
             name: args.name.clone(),
             config: config::tests::create_config(config::tests::CreateConfigArgs {
                 name: args.name,
-                bs_deps: args.bs_deps,
+                deps: args.deps,
                 build_dev_deps: args.build_dev_deps,
                 allowed_dependents: args.allowed_dependents,
             }),
@@ -995,13 +995,13 @@ mod test {
         }
     }
     #[test]
-    fn should_return_false_with_invalid_parents_as_bs_dependencies() {
+    fn should_return_false_with_invalid_parents_as_dependencies() {
         let mut packages: AHashMap<String, Package> = AHashMap::new();
         packages.insert(
             String::from("Package1"),
             create_package(CreatePackageArgs {
                 name: String::from("Package1"),
-                bs_deps: vec![String::from("Package2")],
+                deps: vec![String::from("Package2")],
                 build_dev_deps: vec![],
                 allowed_dependents: None,
             }),
@@ -1010,7 +1010,7 @@ mod test {
             String::from("Package2"),
             create_package(CreatePackageArgs {
                 name: String::from("Package2"),
-                bs_deps: vec![],
+                deps: vec![],
                 build_dev_deps: vec![],
                 allowed_dependents: Some(vec![String::from("Package3")]),
             }),
@@ -1027,7 +1027,7 @@ mod test {
             String::from("Package1"),
             create_package(CreatePackageArgs {
                 name: String::from("Package1"),
-                bs_deps: vec![],
+                deps: vec![],
                 build_dev_deps: vec![String::from("Package2")],
                 allowed_dependents: None,
             }),
@@ -1036,7 +1036,7 @@ mod test {
             String::from("Package2"),
             create_package(CreatePackageArgs {
                 name: String::from("Package2"),
-                bs_deps: vec![],
+                deps: vec![],
                 build_dev_deps: vec![],
                 allowed_dependents: Some(vec![String::from("Package3")]),
             }),
@@ -1053,7 +1053,7 @@ mod test {
             String::from("Package1"),
             create_package(CreatePackageArgs {
                 name: String::from("Package1"),
-                bs_deps: vec![String::from("Package2")],
+                deps: vec![String::from("Package2")],
                 build_dev_deps: vec![],
                 allowed_dependents: None,
             }),
@@ -1062,7 +1062,7 @@ mod test {
             String::from("Package2"),
             create_package(CreatePackageArgs {
                 name: String::from("Package2"),
-                bs_deps: vec![],
+                deps: vec![],
                 build_dev_deps: vec![],
                 allowed_dependents: Some(vec![String::from("Package1")]),
             }),