fix(fs,path): expandGlob, expandGlobSync, and isGlob match @(alternate) syntax with only one member (#6850)

Author: lionel-rowe

fs/expand_glob.ts

@@ -297,8 +297,8 @@ export async function* expandGlob(
   const excludePatterns = exclude
     .map(resolveFromRoot)
     .map((s: string): RegExp => globToRegExp(s, globOptions));
-  const shouldInclude = (path: string): boolean =>
-    !excludePatterns.some((p: RegExp): boolean => !!path.match(p));
+  const shouldInclude = (path: string) =>
+    !excludePatterns.some((p) => p.test(path));
 
   let fixedRoot = isGlobAbsolute ? winRoot ?? "/" : absRoot;
   while (segments.length > 0 && !isGlob(segments[0]!)) {
@@ -454,8 +454,8 @@ export function* expandGlobSync(
   const excludePatterns = exclude
     .map(resolveFromRoot)
     .map((s: string): RegExp => globToRegExp(s, globOptions));
-  const shouldInclude = (path: string): boolean =>
-    !excludePatterns.some((p: RegExp): boolean => !!path.match(p));
+  const shouldInclude = (path: string) =>
+    !excludePatterns.some((p) => p.test(path));
 
   let fixedRoot = isGlobAbsolute ? winRoot ?? "/" : absRoot;
   while (segments.length > 0 && !isGlob(segments[0]!)) {

fs/expand_glob_test.ts

@@ -197,7 +197,9 @@ Deno.test("expandGlob() accepts extended option set as true", async function ()
     "abcdef",
     "abcdefghi",
   ]);
+  assertEquals(await expandGlobArray("abc@(def)", options), ["abcdef"]);
   assertEquals(await expandGlobArray("abc@(def|ghi)", options), ["abcdef"]);
+  assertEquals(await expandGlobArray("abc{def}", options), ["abcdef"]);
   assertEquals(await expandGlobArray("abc{def,ghi}", options), ["abcdef"]);
   assertEquals(await expandGlobArray("abc!(def|ghi)", options), ["abc"]);
 });
@@ -217,7 +219,9 @@ Deno.test("expandGlobSync() accepts extended option set as true", function () {
     "abcdef",
     "abcdefghi",
   ]);
+  assertEquals(expandGlobSyncArray("abc@(def)", options), ["abcdef"]);
   assertEquals(expandGlobSyncArray("abc@(def|ghi)", options), ["abcdef"]);
+  assertEquals(expandGlobSyncArray("abc{def}", options), ["abcdef"]);
   assertEquals(expandGlobSyncArray("abc{def,ghi}", options), ["abcdef"]);
   assertEquals(expandGlobSyncArray("abc!(def|ghi)", options), ["abc"]);
 });

path/is_glob.ts

@@ -19,7 +19,7 @@
 export function isGlob(str: string): boolean {
   const chars: Record<string, string> = { "{": "}", "(": ")", "[": "]" };
   const regex =
-    /\\(.)|(^!|\*|\?|[\].+)]\?|\[[^[\\\]]+\]|\{[^{\\}]+\}|\(\?[:!=][^\\)]+\)|\([^(|]+\|[^\\)]+\))/;
+    /\\(.)|(^!|\*|\?|[\].+)]\?|\[[^[\\\]]+\]|\{[^{\\}]+\}|\(\?[:!=][^\\)]+\)|\([^(|]+\|[^\\)]+\)|@\([^)]+\))/;
 
   if (str === "") {
     return false;

path/is_glob_test.ts

@@ -91,7 +91,10 @@ Deno.test({
     assert(isGlob("a/b/c/[a-z].js"));
     assert(isGlob("abc/(aaa|bbb).js"));
     assert(isGlob("abc/*.js"));
+    assert(isGlob("abc/{a}.js"));
     assert(isGlob("abc/{a,b}.js"));
+    assert(isGlob("abc/@(a).js"));
+    assert(isGlob("abc/@(a|b).js"));
     assert(isGlob("abc/{a..z..2}.js"));
     assert(isGlob("abc/{a..z}.js"));