Fix vendored files not being hidden

Vendored files fetched from github-linguist were not being checked properly.

Also doubles performance vs 1.8.0.

changelog.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 1.8.2
+- Fixed known vendored files not being removed from output.
+
 ## 1.8.1
 - Fixed input folder paths being case sensitive.
 - Fixed dotfiles not showing up in the output.

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "linguist-js",
-	"version": "1.8.1",
+	"version": "1.8.2",
 	"description": "Analyse languages used in a folder. Powered by GitHub Linguist, although it doesn't need to be installed.",
 	"main": "dist/index.js",
 	"bin": {

src/helpers/walk-tree.ts

@@ -1,25 +1,23 @@
 import fs from 'fs';
 import paths from 'path';
-import glob2regex from 'glob-to-regexp';
 
 const allFiles = new Set<string>();
 const allFolders = new Set<string>();
 
 /** Generate list of files in a directory. */
-export default function walk(folder: string | string[], ignoredGlobs: string[] = []): { files: string[], folders: string[] } {
-	const ignored = ignoredGlobs.map(glob => glob2regex(glob, { extended: true }));
+export default function walk(folder: string | string[], ignored: RegExp[] = []): { files: string[], folders: string[] } {
 	if (Array.isArray(folder)) {
-		for (const path of folder) walk(path, ignoredGlobs);
+		for (const path of folder) walk(path, ignored);
 	}
 	else {
-		allFolders.add(folder.replace(/\\/g, '/'));
 		const files = fs.readdirSync(folder);
 		for (const file of files) {
-			if (ignored.some(pattern => pattern.test(file))) continue;
-			const path = paths.resolve(folder, file);
+			const path = paths.resolve(folder, file).replace(/\\/g, '/');
+			if (ignored.some(pattern => pattern.test(path))) continue;
+			allFolders.add(folder.replace(/\\/g, '/'));
 			if (fs.lstatSync(path).isDirectory()) {
 				allFolders.add(path.replace(/\\/g, '/'))
-				walk(path);
+				walk(path, ignored);
 				continue;
 			}
 			allFiles.add(path.replace(/\\/g, '/'));

src/index.ts

@@ -36,11 +36,11 @@ async function analyse(input?: string | string[], opts: T.Options = {}): Promise
 	};
 
 	const ignoredFiles = [
-		'.git',
-		opts.keepVendored ? vendorData.map(path => pcre(path).source) : [],
-		opts.ignore?.map(path => glob2regex('*' + path + '*', { extended: true }).source) ?? [],
+		/\/\.git\//,
+		opts.keepVendored ? [] : vendorData.map(path => pcre(path)),
+		opts.ignore?.map(path => glob2regex('*' + path + '*', { extended: true })) ?? [],
 	].flat();
-	let {files, folders} = walk(input ?? '.', ignoredFiles);
+	let { files, folders } = walk(input ?? '.', ignoredFiles);
 
 	// Apply aliases
 	opts = { checkIgnored: !opts.quick, checkAttributes: !opts.quick, checkHeuristics: !opts.quick, checkShebang: !opts.quick, ...opts };

test/perf.js

@@ -9,12 +9,13 @@ async function perfTest() {
 		let t2 = +new Date();
 		time += t2 - t1;
 	}
-	const total = time / 1e3;
+	const unit = 'ms';
+	const total = time;
 	const average = total / amount;
-	const EXPECTED_MAX = 0.160; // 1.6
+	const EXPECTED_MAX = 80; // 1.8.2
 	console.log('\n<Performance test results>');
-	console.log('Total:', total, 'sec', `(n=${amount})`);
-	console.log('Average:', average, 'sec');
+	console.log('Total:', total, unit, `(n=${amount})`);
+	console.log('Average:', average, unit);
 	if (average > EXPECTED_MAX) console.warn('Warning: average runtime higher than expected');
 }
 perfTest();