feat(groups): handle negation for packages option

Closes #232
JamieMason · Jul 24, 2024 · 0d6b608 · 0d6b608
1 parent 15a5184
commit 0d6b608
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/site/src/partials/group-config/_packages.mdx b/site/src/partials/group-config/_packages.mdx
@@ -4,6 +4,7 @@ import OptionalPill from '@site/components/pill/optional.astro';
 
 - An array of strings which should match the `name` properties of your package.json files.
 - If omitted, the default behaviour is to match every package.
+- Negated types are also supported, so a value of `["!my-client", "!my-server"]` would assign everything **except** the packages `my-client` and `my-server` to this group.
 - The strings can be any combination of exact matches or [minimatch](https://github.com/isaacs/minimatch) glob patterns:
 
 ```json title="Examples of valid values"
@@ -16,6 +17,12 @@ packages: ["@my-repo/**"]
 // ✅ match specific packages by name
 packages: ["my-server", "my-client"]
 
+// ✅ match all packages except negated ones
+packages: ["!my-server", "!@my-repo/**]
+
+// ❌ no mixing of specific and negated packages
+packages: ["my-client", "!@my-repo/**"]
+
 // ❌ not file system paths, name properties of package.json files
 packages: ["packages/my-client"]
 

diff --git a/src/guards/can-add-to-group.ts b/src/guards/can-add-to-group.ts
@@ -39,9 +39,7 @@ function matchesDependencies(
 }
 
 function matchesPackages(packages: unknown, instance: Instance) {
-  // matches if not defined
-  if (!isNonEmptyArray(packages)) return true;
-  return packages.some((pattern) => minimatch(instance.pkgName, pattern));
+  return matchesKnownList(packages, instance.pkgName);
 }
 
 function matchesDependencyTypes(dependencyTypes: unknown, instance: Instance): boolean {
@@ -65,6 +63,10 @@ function matchesKnownList(values: unknown, value: string): boolean {
       positive.push(name);
     }
   });
-  if (isNonEmptyArray(negative) && !negative.includes(value)) return true;
-  return isNonEmptyArray(positive) && positive.includes(value);
+  if (isNonEmptyArray(negative) && !someMinimatch(value, negative)) return true;
+  return isNonEmptyArray(positive) && someMinimatch(value, positive);
+}
+
+function someMinimatch(value: string, patterns: string[]): boolean {
+  return patterns.some((pattern) => minimatch(value, pattern))
 }