linguist-js 2.4.1 → 2.4.2

package/dist/helpers/walk-tree.js

@@ -5,10 +5,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
-const allFiles = new Set();
-const allFolders = new Set();
+let allFiles;
+let allFolders;
 /** Generate list of files in a directory. */
-function walk(root, folders, gitignores, regexIgnores) {
+function walk(init, root, folders, gitignores, regexIgnores) {
+    // Initialise files and folders lists
+    if (init) {
+        allFiles = new Set();
+        allFolders = new Set();
+    }
     // Walk tree of a folder
     if (folders.length === 1) {
         const folder = folders[0];
@@ -36,7 +41,7 @@ function walk(root, folders, gitignores, regexIgnores) {
             if (file.endsWith('/')) {
                 // Recurse into subfolders
                 allFolders.add(path);
-                walk(root, [path], gitignores, regexIgnores);
+                walk(false, root, [path], gitignores, regexIgnores);
             }
             else {
                 // Add relative file path to list
@@ -47,7 +52,7 @@ function walk(root, folders, gitignores, regexIgnores) {
     // Recurse into all folders
     else {
         for (const path of folders) {
-            walk(root, [path], gitignores, regexIgnores);
+            walk(false, root, [path], gitignores, regexIgnores);
         }
     }
     // Return absolute files and folders lists

package/dist/index.js

@@ -58,7 +58,7 @@ async function analyse(input, opts = {}) {
     }
     else {
         // Uses directory on disc
-        const data = (0, walk_tree_1.default)(commonRoot, input, gitignores, regexIgnores);
+        const data = (0, walk_tree_1.default)(true, commonRoot, input, gitignores, regexIgnores);
         files = data.files;
         folders = data.folders;
     }
@@ -86,7 +86,7 @@ async function analyse(input, opts = {}) {
     if (!useRawContent && opts.checkAttributes) {
         for (const folder of folders) {
             // Skip if folder is marked in gitattributes
-            if (relPath(folder) && gitignores.test(relPath(folder)).ignored)
+            if (relPath(folder) && gitignores.ignores(relPath(folder)))
                 continue;
             // Parse gitignores
             const ignoresFile = path_1.default.join(folder, '.gitignore');
@@ -190,7 +190,7 @@ async function analyse(input, opts = {}) {
         }
         // Check override for manual language classification
         if (!useRawContent && !opts.quick && opts.checkAttributes) {
-            const isOverridden = (path) => (0, ignore_1.default)().add(path).test(relPath(file)).ignored;
+            const isOverridden = (path) => (0, ignore_1.default)().add(path).ignores(relPath(file));
             const match = overridesArray.find(item => isOverridden(item[0]));
             if (match) {
                 const forcedLang = match[1];
@@ -229,8 +229,8 @@ async function analyse(input, opts = {}) {
         }
         // Skip binary files
         if (!useRawContent && !opts.keepBinary) {
-            const isCustomText = customText.test(relPath(file)).ignored;
-            const isCustomBinary = customBinary.test(relPath(file)).ignored;
+            const isCustomText = customText.ignores(relPath(file));
+            const isCustomBinary = customBinary.ignores(relPath(file));
             const isBinaryExt = binary_extensions_1.default.some(ext => file.endsWith('.' + ext));
             if (!isCustomText && (isCustomBinary || isBinaryExt || await (0, isbinaryfile_1.isBinaryFile)(file))) {
                 continue;
@@ -263,7 +263,7 @@ async function analyse(input, opts = {}) {
                     if (heuristic.named_pattern)
                         normalise(heuristicsData.named_patterns[heuristic.named_pattern]);
                     // Check file contents and apply heuristic patterns
-                    const fileContent = await (0, read_file_1.default)(file).catch(() => null);
+                    const fileContent = opts.fileContent ? opts.fileContent[files.indexOf(file)] : await (0, read_file_1.default)(file).catch(() => null);
                     if (fileContent === null)
                         continue;
                     if (!patterns.length || patterns.some(pattern => (0, convert_pcre_1.default)(pattern).test(fileContent))) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "linguist-js",
-	"version": "2.4.1",
+	"version": "2.4.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": {
@@ -12,7 +12,7 @@
 	"scripts": {
 		"prepare": "npm test && npm run perf",
 		"perf": "tsc && node test/perf",
-		"test": "tsc && node test/test"
+		"test": "tsc && node test/folder && echo --- && node test/unit"
 	},
 	"files": [
 		"bin/",
@@ -37,7 +37,7 @@
 	"homepage": "https://github.com/Nixinova/Linguist#readme",
 	"dependencies": {
 		"binary-extensions": "^2.2.0",
-		"commander": "^9.0.0",
+		"commander": "^9.1.0",
 		"common-path-prefix": "^3.0.0",
 		"cross-fetch": "^3.1.5",
 		"ignore": "^5.2.0",
@@ -50,6 +50,6 @@
 		"@types/js-yaml": "ts4.6",
 		"@types/node": "ts4.6",
 		"deep-object-diff": "^1.1.7",
-		"typescript": "~4.6.1-rc"
+		"typescript": "~4.6.2"
 	}
 }

package/readme.md

@@ -2,7 +2,7 @@
 [![Last updated](https://img.shields.io/github/release-date/Nixinova/Linguist?label=updated&style=flat-square)](https://github.com/Nixinova/Linguist/releases)
 [![npm downloads](https://img.shields.io/npm/dt/linguist-js?logo=npm)](https://www.npmjs.com/package/linguist-js)
 
-# Linguist
+# LinguistJS
 
 Analyses the languages of all files in a given folder and collates the results.
 
@@ -11,7 +11,7 @@ Powered by [github-linguist](https://github.com/github/linguist), although it do
 ## Install
 
 [Node.js](https://nodejs.org) must be installed to be able to use this.
-Linguist is available [on npm](https://npmjs.com/package/linguist-js) as `linguist-js`.
+LinguistJS is available [on npm](https://npmjs.com/package/linguist-js) as `linguist-js`.
 
 Install locally using `npm install linguist-js` and import it into your code like so:
 
@@ -27,7 +27,7 @@ linguist --help
 
 ## Usage
 
-Linguist contains one function which analyses a given folder.
+LinguistJS contains one function which analyses a given folder.
 
 As an example, take the following file structure:
 
@@ -40,7 +40,7 @@ As an example, take the following file structure:
 | no-lang 10B
 ```
 
-Running Linguist on this folder will return the following JSON:
+Running LinguistJS on this folder will return the following JSON:
 
 ```json
 {
@@ -78,7 +78,7 @@ Running Linguist on this folder will return the following JSON:
 
 - File paths in the output use only forward slashes as delimiters, even on Windows.
 - This tool does not work when offline.
-- Do not rely on any language classification output from Linguist being unchanged between runs.
+- Do not rely on any language classification output from LinguistJS being unchanged between runs.
   Language data is fetched each run from the latest classifications of [`github-linguist`](https://github.com/github/linguist).
   This data is subject to change at any time and may change the results of a run even when using the same version of Linguist.