Fix: Skip micromatch when ignore file is empty (#1043)

Author: sqrrrl

src/core/files.ts

@@ -1,6 +1,6 @@
 import path from 'path';
 import chalk from 'chalk';
-import chokidar from 'chokidar';
+import chokidar, {Matcher} from 'chokidar';
 import Debug from 'debug';
 import {fdir} from 'fdir';
 import fs from 'fs/promises';
@@ -39,8 +39,14 @@ async function getLocalFiles(rootDir: string, ignorePatterns: string[], recursiv
     fdirBuilder = fdirBuilder.withMaxDepth(0);
   }
   const files = await fdirBuilder.crawl(rootDir).withPromise();
-  const filteredFiles = micromatch.not(files, ignorePatterns, {dot: true});
-  debug('Filtered %d files from ignore rules', files.length - filteredFiles.length);
+  let filteredFiles: string[];
+  if (ignorePatterns && ignorePatterns.length) {
+    filteredFiles = micromatch.not(files, ignorePatterns, {dot: true});
+    debug('Filtered %d files from ignore rules', files.length - filteredFiles.length);
+  } else {
+    debug('Ignore rules are empty, using all files.');
+    filteredFiles = files;
+  }
   filteredFiles.sort((a, b) => a.localeCompare(b));
   return filteredFiles[Symbol.iterator]();
 }
@@ -222,13 +228,17 @@ export class Files {
     const onChange = async (path: string) => {
       collector(path);
     };
+    let matcher: Matcher | undefined;
+    if (ignorePatterns && ignorePatterns.length) {
+      matcher = file => {
+        return micromatch.not([file], ignorePatterns, {dot: true}).length === 0;
+      };
+    }
     const watcher = chokidar.watch(this.options.files.contentDir, {
       persistent: true,
       ignoreInitial: true,
       cwd: this.options.files.contentDir,
-      ignored: file => {
-        return micromatch.not([file], ignorePatterns, {dot: true}).length === 0;
-      },
+      ignored: matcher,
     });
     watcher.on('ready', onReady); // Push on start
     watcher.on('add', onChange);

test/core/files.ts

@@ -526,4 +526,28 @@ describe('File operations', function () {
       expect(pulledFiles[2].localPath).to.equal('Page.htmlx');
     });
   });
+
+  describe('with valid project, empty ignore file', function () {
+    beforeEach(function () {
+      mockfs({
+        'appsscript.json': mockfs.load(path.resolve(__dirname, '../fixtures/appsscript-no-services.json')),
+        'Code.js': mockfs.load(path.resolve(__dirname, '../fixtures/Code.js')),
+        'subdir/Code.js': mockfs.load(path.resolve(__dirname, '../fixtures/Code.js')),
+        'page.html': mockfs.load(path.resolve(__dirname, '../fixtures/page.html')),
+        '.clasp.json': mockfs.load(path.resolve(__dirname, '../fixtures/dot-clasp-no-settings.json')),
+        '.claspignore': '',
+        [path.resolve(os.homedir(), '.clasprc.json')]: mockfs.load(
+          path.resolve(__dirname, '../fixtures/dot-clasprc-authenticated.json'),
+        ),
+      });
+    });
+
+    it('should collect local files', async function () {
+      const clasp = await initClaspInstance({
+        credentials: mockCredentials(),
+      });
+      const foundFiles = await clasp.files.collectLocalFiles();
+      expect(foundFiles).to.have.length(4);
+    });
+  });
 });