linguist-js 2.1.4 → 2.2.0

package/dist/cli.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const VERSION = require('../package.json').version;
 const commander_1 = require("commander");
 const index_1 = __importDefault(require("./index"));
+const walk_tree_1 = __importDefault(require("./helpers/walk-tree"));
 const colouredMsg = ([r, g, b], msg) => `\u001B[${38};2;${r};${g};${b}m${msg}${'\u001b[0m'}`;
 const hexToRgb = (hex) => [parseInt(hex.slice(1, 3), 16), parseInt(hex.slice(3, 5), 16), parseInt(hex.slice(5, 7), 16)];
 commander_1.program
@@ -21,6 +22,7 @@ commander_1.program
     .option('-q|--quick [bool]', 'Skip complex language analysis (alias for -{A|I|H|S}=false)', false)
     .option('-V|--keepVendored [bool]', 'Prevent skipping over vendored/generated files', false)
     .option('-B|--keepBinary [bool]', 'Prevent skipping over binary files', false)
+    .option('-r|--relativePaths [bool]', 'Convert absolute file paths to relative', false)
     .option('-A|--checkAttributes [bool]', 'Force the checking of gitattributes files', true)
     .option('-I|--checkIgnored [bool]', 'Force the checking of gitignore files', true)
     .option('-H|--checkHeuristics [bool]', 'Apply heuristics to ambiguous languages', true)
@@ -51,16 +53,20 @@ if (args.analyze)
         const root = args.analyze === true ? '.' : args.analyze;
         const data = await (0, index_1.default)(root, args);
         const { files, languages, unknown } = data;
+        // Get file count
+        let totalFiles = (0, walk_tree_1.default)(root).files.length;
         // Print output
         if (!args.json) {
             const sortedEntries = Object.entries(languages.results).sort((a, b) => a[1].bytes < b[1].bytes ? +1 : -1);
             const totalBytes = languages.bytes;
-            console.log(`\n Analysed ${files.bytes.toLocaleString()} B from ${files.count} files with linguist-js`);
+            console.log(`\n Analysed ${files.bytes.toLocaleString()} B from ${totalFiles} files (${totalFiles - files.count} ignored) with linguist-js`);
             console.log(`\n Language analysis results:`);
-            let i = 0;
+            let count = 0;
+            if (sortedEntries.length === 0)
+                console.log(`  None`);
             for (const [lang, { bytes, color }] of sortedEntries) {
                 const fmtd = {
-                    index: (++i).toString().padStart(2, ' '),
+                    index: (++count).toString().padStart(2, ' '),
                     lang: lang.padEnd(24, ' '),
                     percent: (bytes / (totalBytes || 1) * 100).toFixed(2).padStart(5, ' '),
                     bytes: bytes.toLocaleString().padStart(10, ' '),
@@ -75,7 +81,7 @@ if (args.analyze)
                     console.log(`  '${name}': ${bytes.toLocaleString()} B`);
                 }
                 for (const [ext, bytes] of Object.entries(unknown.extensions)) {
-                    console.log(`  '${ext}': ${bytes.toLocaleString()} B`);
+                    console.log(`  '*${ext}': ${bytes.toLocaleString()} B`);
                 }
                 console.log(` Total: ${unknown.bytes.toLocaleString()} B`);
             }

package/dist/helpers/convert-glob.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const glob_to_regexp_1 = __importDefault(require("glob-to-regexp"));
 function parseGitGlob(path) {
-    const globPath = `**/${path}`.replace(/\[:(space|digit):\]/, (_, val) => `\\${val[0]}`);
+    const globPath = `**/${path}`.replace(/\\/g, '/').replace(/\[:(space|digit):\]/g, (_, val) => `\\${val[0]}`);
     return (0, glob_to_regexp_1.default)(globPath, { globstar: true, extended: true });
 }
 exports.default = parseGitGlob;

package/dist/index.js

@@ -224,6 +224,17 @@ async function analyse(input, opts = {}) {
             }
         }
     }
+    // Convert paths to relative
+    if (opts.relativePaths) {
+        const newMap = {};
+        for (const [file, lang] of Object.entries(results.files.results)) {
+            let relPath = path_1.default.relative(process.cwd(), file).replace(/\\/g, '/');
+            if (!relPath.startsWith('../'))
+                relPath = './' + relPath;
+            newMap[relPath] = lang;
+        }
+        results.files.results = newMap;
+    }
     // Load language bytes size
     for (const [file, lang] of Object.entries(results.files.results)) {
         if (lang && !langData[lang])

package/dist/types.d.ts

@@ -10,6 +10,7 @@ export interface Options {
     categories?: Category[];
     keepVendored?: boolean;
     keepBinary?: boolean;
+    relativePaths?: boolean;
     childLanguages?: boolean;
     quick?: boolean;
     checkIgnored?: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "linguist-js",
-	"version": "2.1.4",
+	"version": "2.2.0",
 	"description": "Analyse languages used in a folder. Powered by GitHub Linguist, although it doesn't need to be installed.",
 	"main": "dist/index.js",
 	"bin": {
@@ -37,7 +37,7 @@
 	"homepage": "https://github.com/Nixinova/Linguist#readme",
 	"dependencies": {
 		"binary-extensions": "^2.2.0",
-		"commander": "^8.2.0",
+		"commander": "^8.3.0",
 		"cross-fetch": "^3.1.4",
 		"glob-to-regexp": "~0.4.1",
 		"isbinaryfile": "^4.0.8",
@@ -49,6 +49,6 @@
 		"@types/js-yaml": "ts4.4",
 		"@types/node": "ts4.4",
 		"deep-object-diff": "^1.1.0",
-		"typescript": "~4.4.3"
+		"typescript": "~4.5.4"
 	}
 }

package/readme.md

@@ -115,6 +115,8 @@ const { files, languages, unknown } = linguist(folder, options);
       Whether to keep vendored files (dependencies, etc) (defaults to `false`).
     - `keepBinary` (boolean):
       Whether binary files should be included in the output (defaults to `false`).
+    - `relativePaths` (boolean):
+      Change the absolute file paths in the output to be relative to the current working directory (defaults to `false`).
     - `checkAttributes` (boolean):
       Force the checking of `.gitattributes` files (defaults to `true` unless `quick` is set).
     - `checkIgnored` (boolean):
@@ -155,6 +157,8 @@ linguist --help
     Whether to include vendored files (auto-generated files, dependencies folder, etc).
   - `--keepBinary`:
     Whether binary files should be excluded from the output.
+  - `--relativePaths`:
+    Change the absolute file paths in the output to be relative to the current working directory.
   - `--checkAttributes`:
     Force the checking of `.gitatributes` files (use alongside `--quick` to overwrite).
   - `--checkIgnored`: