Merge pull request #1395 from quarto-dev/bugfix/exc-glob

Smart glob handling incorrectly ignoring `!`

Author: jjallaire

src/core/path.ts

@@ -189,16 +189,28 @@ export function resolveGlobs(
   const excludeGlobs: string[] = [];
 
   // deal with implicit ** syntax and ability to escape negation (!)
-  const asFullGlob = (glob: string) => {
-    const preventSmartGlobs = options?.mode === "strict" ||
-      (options?.mode === "auto" && !isGlob(glob));
+  const asFullGlob = (glob: string, preferSmart?: boolean) => {
+    const useSmartGlobs = () => {
+      if (options?.mode === "strict") {
+        return false;
+      } else if (options?.mode === "always") {
+        return true;
+      } else {
+        if (preferSmart) {
+          return true;
+        } else {
+          return isGlob(glob);
+        }
+      }
+    };
+    const smartGlob = useSmartGlobs();
 
     // handle negation
     if (glob.startsWith("\\!")) {
       glob = glob.slice(1);
     }
     // ending w/ a slash means everything in the dir
-    if (!preventSmartGlobs) {
+    if (smartGlob) {
       if (glob.endsWith("/")) {
         glob = glob + "**/*";
       } else {
@@ -215,7 +227,7 @@ export function resolveGlobs(
     }
 
     if (!glob.startsWith("/")) {
-      if (!preventSmartGlobs) {
+      if (smartGlob) {
         return "**/" + glob;
       } else {
         return glob;
@@ -228,7 +240,9 @@ export function resolveGlobs(
   // divide globs into include and exclude
   for (const glob of globs) {
     if (glob.startsWith("!")) {
-      excludeGlobs.push(asFullGlob(glob.slice(1)));
+      // We should always force smart globs in the event
+      // of excludes since these would normally qualify
+      excludeGlobs.push(asFullGlob(glob.slice(1), true));
     } else {
       includeGlobs.push(asFullGlob(glob));
     }

tests/unit/glob.test.ts

@@ -0,0 +1,52 @@
+/*
+* glob.test.ts
+*
+* Copyright (C) 2020 by RStudio, PBC
+*
+*/
+import { assert, assertEquals } from "testing/asserts.ts";
+import { filterPaths } from "../../src/core/path.ts";
+import { unitTest } from "../test.ts";
+
+unitTest(
+  "globs",
+  //deno-lint-ignore require-await
+  async () => {
+    const paths = [
+      "/test.qmd",
+      "/test2.qmd",
+      "/test3.qmd",
+      "/folder/test.qmd",
+      "/folder/test2.qmd",
+      "/folder/test.txt",
+    ];
+
+    const globDescs = [
+      { globs: ["*.qmd"], includes: 5, excludes: 0 },
+      { globs: ["**"], includes: 6, excludes: 0 },
+      { globs: ["*.qmd", "!folder"], includes: 5, excludes: 0 },
+      { globs: ["*.qmd", "!folder/"], includes: 5, excludes: 3 },
+      { globs: ["test*.*", "!folder/"], includes: 6, excludes: 3 },
+      { globs: ["test*.*", "!*.txt"], includes: 6, excludes: 1 },
+      { globs: ["folder/*.txt"], includes: 1, excludes: 0 },
+      { globs: ["folder/*.*", "!*.txt"], includes: 3, excludes: 1 },
+      { globs: ["folder/**"], includes: 3, excludes: 0 },
+      { globs: ["test2.*", "!folder/"], includes: 2, excludes: 3 },
+    ];
+    for (const globDesc of globDescs) {
+      const filtered = filterPaths("/", paths, globDesc.globs);
+      assert(
+        filtered.include.length === globDesc.includes,
+        `Globs [${
+          globDesc.globs.join(",")
+        }] result in the wrong number of 'includes' matches.`,
+      );
+      assert(
+        filtered.exclude.length === globDesc.excludes,
+        `Globs [${
+          globDesc.globs.join(",")
+        }] result in the wrong number of 'excludes' matches.`,
+      );
+    }
+  },
+);