Updated test

Author: NicholasLYang

crates/turborepo-lib/src/boundaries/mod.rs

@@ -36,7 +36,6 @@ use turborepo_ui::{color, ColorConfig, BOLD_GREEN, BOLD_RED};
 use crate::{
     boundaries::{imports::DependencyLocations, tags::ProcessedRulesMap, tsconfig::TsConfigLoader},
     run::Run,
-    turbo_json::TurboJson,
 };
 
 #[derive(Clone, Debug, Error, Diagnostic)]
@@ -339,18 +338,15 @@ impl Run {
         )
         .await?;
 
-        if let Ok(TurboJson {
-            tags: Some(tags), ..
-        }) = self.turbo_json_loader().load(package_name)
-        {
-            if let Some(tag_rules) = tag_rules {
-                result.diagnostics.extend(self.check_package_tags(
-                    PackageNode::Workspace(package_name.clone()),
-                    &package_info.package_json,
-                    tags,
-                    tag_rules,
-                )?);
-            } else {
+        if let Ok(turbo_json) = self.turbo_json_loader().load(package_name) {
+            result.diagnostics.extend(self.check_package_tags(
+                PackageNode::Workspace(package_name.clone()),
+                &package_info.package_json,
+                turbo_json.tags.as_ref(),
+                tag_rules.as_ref(),
+            )?);
+
+            if turbo_json.tags.is_some() && tag_rules.is_none() {
                 // NOTE: if we use tags for something other than boundaries, we should remove
                 // this warning
                 warn!(

crates/turborepo-lib/src/boundaries/tags.rs

@@ -228,13 +228,14 @@ impl Run {
         &self,
         pkg: PackageNode,
         package_json: &PackageJson,
-        current_package_tags: &Spanned<Vec<Spanned<String>>>,
-        tags_rules: &ProcessedRulesMap,
+        current_package_tags: Option<&Spanned<Vec<Spanned<String>>>>,
+        tags_rules: Option<&ProcessedRulesMap>,
     ) -> Result<Vec<BoundariesDiagnostic>, Error> {
         let mut diagnostics = Vec::new();
-        let package_boundaries = self
-            .turbo_json_loader()
-            .load(pkg.as_package_name())
+        let package_turbo_json = self.turbo_json_loader().load(pkg.as_package_name());
+        eprintln!("{}", pkg.as_package_name());
+        eprintln!("{:?}", package_turbo_json);
+        let package_boundaries = package_turbo_json
             .ok()
             .and_then(|turbo_json| turbo_json.boundaries.as_ref());
 
@@ -261,37 +262,39 @@ impl Run {
             )?;
         }
 
-        // We don't allow tags to share the same name as the package because
-        // we allow package names to be used as a tag
-        if let Some(rule) = tags_rules.get(pkg.as_package_name().as_str()) {
-            let (tag_span, tag_text) = rule.span.span_and_text("turbo.json");
-            let (package_span, package_text) = package_json
-                .name
-                .as_ref()
-                .map(|name| name.span_and_text("package.json"))
-                .unwrap_or_else(|| (None, NamedSource::new("package.json", "".into())));
-            diagnostics.push(BoundariesDiagnostic::TagSharesPackageName {
-                tag: pkg.as_package_name().to_string(),
-                package: pkg.as_package_name().to_string(),
-                tag_span,
-                tag_text,
-                secondary: [SecondaryDiagnostic::PackageDefinedHere {
+        if let Some(tags_rules) = tags_rules {
+            // We don't allow tags to share the same name as the package because
+            // we allow package names to be used as a tag
+            if let Some(rule) = tags_rules.get(pkg.as_package_name().as_str()) {
+                let (tag_span, tag_text) = rule.span.span_and_text("turbo.json");
+                let (package_span, package_text) = package_json
+                    .name
+                    .as_ref()
+                    .map(|name| name.span_and_text("package.json"))
+                    .unwrap_or_else(|| (None, NamedSource::new("package.json", "".into())));
+                diagnostics.push(BoundariesDiagnostic::TagSharesPackageName {
+                    tag: pkg.as_package_name().to_string(),
                     package: pkg.as_package_name().to_string(),
-                    package_span,
-                    package_text,
-                }],
-            });
-        }
+                    tag_span,
+                    tag_text,
+                    secondary: [SecondaryDiagnostic::PackageDefinedHere {
+                        package: pkg.as_package_name().to_string(),
+                        package_span,
+                        package_text,
+                    }],
+                });
+            }
 
-        for tag in current_package_tags.iter() {
-            if let Some(rule) = tags_rules.get(tag.as_inner()) {
-                self.check_tag(
-                    &mut diagnostics,
-                    rule.dependencies.as_ref(),
-                    rule.dependents.as_ref(),
-                    &pkg,
-                    package_json,
-                )?;
+            for tag in current_package_tags.into_iter().flatten().flatten() {
+                if let Some(rule) = tags_rules.get(tag.as_inner()) {
+                    self.check_tag(
+                        &mut diagnostics,
+                        rule.dependencies.as_ref(),
+                        rule.dependents.as_ref(),
+                        &pkg,
+                        package_json,
+                    )?;
+                }
             }
         }
 

crates/turborepo/tests/snapshots/boundaries__boundaries_tags_get_boundaries_lints_([email protected]).snap

@@ -10,6 +10,10 @@ expression: query_output
           "message": "Package `@vercel/allowed-and-denied-tag` found with tag listed in denylist for `@vercel/my-app`: `unsafe`",
           "import": "@vercel/allowed-and-denied-tag"
         },
+        {
+          "message": "Package `@vercel/not-allowed-dependency` found with tag listed in denylist for `@vercel/package-with-boundaries-rules`: `@vercel/not-allowed-dependency`",
+          "import": "@vercel/not-allowed-dependency"
+        },
         {
           "message": "Package `@vercel/not-allowed-dependent` found without any tag listed in allowlist for `@vercel/allowed-and-denied-tag`",
           "import": "@vercel/not-allowed-dependent"

turborepo-tests/integration/fixtures/boundaries_tags/package-lock.json

@@ -3,9 +3,6 @@
   "scripts": {
     "something": "turbo run build"
   },
-  "dependencies": {
-    "module-package": "*"
-  },
   "packageManager": "[email protected]",
   "workspaces": [
     "apps/*",

turborepo-tests/integration/fixtures/boundaries_tags/package.json

@@ -2,8 +2,5 @@
   "name": "@vercel/allowed-and-denied-tag",
   "scripts": {
     "dev": "echo building"
-  },
-  "dependencies": {
-    "utils": "*"
   }
 }

turborepo-tests/integration/fixtures/boundaries_tags/packages/allowed-and-denied-tag/package.json

@@ -2,7 +2,6 @@
   "name": "@vercel/allowed-tag",
   "module": "my-module.mjs",
   "dependencies": {
-    "@vercel/no-allowlist": "*",
     "@vercel/package-as-tag": "*"
   }
 }

turborepo-tests/integration/fixtures/boundaries_tags/packages/allowed-tag/package.json

@@ -0,0 +1,3 @@
+{
+  "name": "@vercel/not-allowed-dependency"
+}

turborepo-tests/integration/fixtures/boundaries_tags/packages/not-allowed-dependency/package.json

@@ -0,0 +1,6 @@
+{
+  "name": "@vercel/package-with-boundaries-rules",
+  "dependencies": {
+    "@vercel/not-allowed-dependency": "*"
+  }
+}

turborepo-tests/integration/fixtures/boundaries_tags/packages/package-with-boundaries-rules/package.json

@@ -0,0 +1,9 @@
+{
+  "boundaries": {
+    "dependencies": {
+      "deny": [
+        "@vercel/not-allowed-dependency"
+      ]
+    }
+  }
+}