linguist-js 2.8.1 → 2.9.0

package/dist/cli.js

@@ -22,6 +22,7 @@ commander_1.program
     .option('-j|--json [bool]', 'Display the output as JSON', false)
     .option('-t|--tree <traversal>', 'Which part of the output JSON to display (dot-delimited)')
     .option('-F|--listFiles [bool]', 'Whether to list every matching file under the language results', false)
+    .option('-m|--minSize <size>', 'Minimum size of file to show language results for (must have a unit: b, kb, mb, %, or loc)')
     .option('-q|--quick [bool]', 'Skip complex language analysis (alias for -{A|I|H|S}=false)', false)
     .option('-o|--offline [bool]', 'Use packaged data files instead of fetching latest from GitHub', false)
     .option('-L|--calculateLines [bool]', 'Calculate lines of code totals', true)
@@ -62,7 +63,39 @@ if (args.analyze)
         const { files, languages, unknown } = data;
         // Print output
         if (!args.json) {
-            const sortedEntries = Object.entries(languages.results).sort((a, b) => a[1].bytes < b[1].bytes ? +1 : -1);
+            // Ignore languages with a bytes/% size less than the declared min size
+            if (args.minSize) {
+                const totalSize = languages.bytes;
+                const minSizeAmt = parseFloat(args.minSize.replace(/[a-z]+$/i, '')); // '2KB' -> 2
+                const minSizeUnit = args.minSize.replace(/^\d+/, '').toLowerCase(); // '2KB' -> 'kb'
+                const checkBytes = minSizeUnit !== 'loc'; // whether to check bytes or loc
+                const conversionFactors = {
+                    'b': n => n,
+                    'kb': n => n * 1e3,
+                    'mb': n => n * 1e6,
+                    '%': n => n * totalSize / 100,
+                    'loc': n => n,
+                };
+                const minBytesSize = conversionFactors[minSizeUnit](+minSizeAmt);
+                const other = { bytes: 0, lines: { total: 0, content: 0, code: 0 } };
+                // Apply specified minimums: delete language results that do not reach the threshold
+                for (const [lang, data] of Object.entries(languages.results)) {
+                    const checkUnit = checkBytes ? data.bytes : data.lines.code;
+                    if (checkUnit < minBytesSize) {
+                        // Add to 'other' count
+                        other.bytes += data.bytes;
+                        other.lines.total += data.lines.total;
+                        other.lines.content += data.lines.content;
+                        other.lines.code += data.lines.code;
+                        // Remove language result
+                        delete languages.results[lang];
+                    }
+                }
+                if (other.bytes) {
+                    languages.results["Other"] = { ...other, type: null };
+                }
+            }
+            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 Language analysis results: \n`);

package/dist/helpers/convert-pcre.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = pcre;
 /** Convert a PCRE regex into JS. */
 function pcre(regex) {
     let finalRegex = regex;
@@ -36,3 +35,4 @@ function pcre(regex) {
     // Return final regex
     return RegExp(finalRegex, [...finalFlags].join(''));
 }
+exports.default = pcre;

package/dist/helpers/load-data.js

@@ -3,8 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseGeneratedDataFile = parseGeneratedDataFile;
-exports.default = loadFile;
+exports.parseGeneratedDataFile = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const cross_fetch_1 = __importDefault(require("cross-fetch"));
@@ -31,7 +30,9 @@ function parseGeneratedDataFile(fileContent) {
     var _a;
     return [...(_a = fileContent.match(/(?<=name\.match\(\/).+?(?=(?<!\\)\/)/gm)) !== null && _a !== void 0 ? _a : []];
 }
+exports.parseGeneratedDataFile = parseGeneratedDataFile;
 /** Load a data file from github-linguist. */
 function loadFile(file, offline = false) {
     return offline ? loadLocalFile(file) : loadWebFile(file);
 }
+exports.default = loadFile;

package/dist/helpers/parse-gitattributes.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = parseAttributes;
 const norm_path_1 = require("./norm-path");
 /**
  * Parses a gitattributes file.
@@ -35,3 +34,4 @@ function parseAttributes(content, folderRoot = '.') {
     }
     return output;
 }
+exports.default = parseAttributes;

package/dist/helpers/parse-gitignore.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = parseGitignore;
 function parseGitignore(content) {
     const readableData = content
         // Remove comments unless escaped
@@ -10,3 +9,4 @@ function parseGitignore(content) {
     const arrayData = readableData.split(/\r?\n/).filter(data => data);
     return arrayData;
 }
+exports.default = parseGitignore;

package/dist/helpers/read-file.js

@@ -3,7 +3,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = readFileChunk;
 const fs_1 = __importDefault(require("fs"));
 /**
  * Read part of a file on disc.
@@ -21,3 +20,4 @@ async function readFileChunk(filename, onlyFirstLine = false) {
     }
     return content;
 }
+exports.default = readFileChunk;

package/dist/helpers/walk-tree.js

@@ -3,7 +3,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = walk;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const parse_gitignore_1 = __importDefault(require("./parse-gitignore"));
@@ -88,3 +87,4 @@ function walk(data) {
         folders: [...allFolders],
     };
 }
+exports.default = walk;

package/dist/index.js

@@ -46,7 +46,7 @@ async function analyse(rawPaths, opts = {}) {
     const manualFileContent = [(_a = opts.fileContent) !== null && _a !== void 0 ? _a : []].flat();
     // Normalise input option arguments
     opts = {
-        calculateLines: (_b = opts.calculateLines) !== null && _b !== void 0 ? _b : true, // default to true if unset
+        calculateLines: (_b = opts.calculateLines) !== null && _b !== void 0 ? _b : true,
         checkIgnored: !opts.quick,
         checkDetected: !opts.quick,
         checkAttributes: !opts.quick,

package/ext/heuristics.yml

@@ -380,6 +380,11 @@ disambiguations:
     pattern: '^import [a-z]'
   - language: Lean 4
     pattern: '^import [A-Z]'
+- extensions: ['.lp']
+  rules:
+  - language: Linear Programming
+    pattern: '^(?i:minimize|minimum|min|maximize|maximum|max)(?i:\s+multi-objectives)?$'
+  - language: Answer Set Programming
 - extensions: ['.ls']
   rules:
   - language: LoomScript
@@ -469,8 +474,8 @@ disambiguations:
   - language: MAXScript
 - extensions: ['.msg']
   rules:
-  - language: omnetpp-msg
-    pattern: '^cplusplus \{\{|^namespace[\s]*([^.\s]*\.)*[^.\s]*;|^struct \{|^message [\S]* (extends)? [\S]*[\s]*\{|^packet \{|^class (extends) [\S]*[\s]*\{|^enum \{|^import ([^.\s]*\.)*[^.\s]*;'
+  - language: OMNeT++ MSG
+    pattern: '^cplusplus\(?[\S]*\)?[\s]*\{?\{?|^namespace[\s]+([^.\s]*\.)*[^.\s]*;|^struct[\s]+[\S]+|^message[\s]+[\S]+(extends )?[\S]*[\s]*|^packet[\s]+[\S]+|^class[\s]+[\S]+(extends )?[\S]*[\s]*|^enum[\s]+[\S]+|^import ([^.\s]*\.)*[^.\s]*;'
 - extensions: ['.n']
   rules:
   - language: Roff
@@ -707,6 +712,11 @@ disambiguations:
   rules:
   - language: STL
     pattern: '\A\s*solid(?:$|\s)[\s\S]*^endsolid(?:$|\s)'
+- extensions: ['.svx']
+  rules:
+  - language: Survex data
+    pattern: '\A(;|\*[^*]+$)'
+  - language: mdsvex
 - extensions: ['.sw']
   rules:
   - language: Sway
@@ -849,7 +859,6 @@ named_patterns:
   freebasic:
   - '(?i)^[ \t]*#(?:define|endif|endmacro|ifn?def|include|lang|macro|pragma)(?:$|\s)'
   - '(?i)^[ \t]*dim( shared)? [a-z_][a-z0-9_]* as [a-z_][a-z0-9_]* ptr'
-  - '(?i)^[ \t]*dim( shared)? as [a-z_][a-z0-9_]* [a-z_][a-z0-9_]*'
   gsc:
   - '^\s*#\s*(?:using|insert|include|define|namespace)[ \t]+\w'
   - '^\s*(?>(?:autoexec|private)\s+){0,2}function\s+(?>(?:autoexec|private)\s+){0,2}\w+\s*\('

package/ext/languages.yml

@@ -271,6 +271,16 @@ AngelScript:
   codemirror_mode: clike
   codemirror_mime_type: text/x-c++src
   language_id: 389477596
+Answer Set Programming:
+  type: programming
+  color: "#A9CC29"
+  extensions:
+  - ".lp"
+  interpreters:
+  - clingo
+  tm_scope: source.answersetprogramming
+  ace_mode: prolog
+  language_id: 433009171
 Ant Build System:
   type: data
   color: "#A9157E"
@@ -305,7 +315,7 @@ ApacheConf:
   - ".htaccess"
   - apache2.conf
   - httpd.conf
-  tm_scope: source.apache-config
+  tm_scope: source.apacheconf
   ace_mode: apache_conf
   language_id: 16
 Apex:
@@ -313,6 +323,7 @@ Apex:
   color: "#1797c0"
   extensions:
   - ".cls"
+  - ".apex"
   - ".trigger"
   tm_scope: source.apex
   ace_mode: java
@@ -712,6 +723,7 @@ C:
   - ".c"
   - ".cats"
   - ".h"
+  - ".h.in"
   - ".idc"
   interpreters:
   - tcc
@@ -2799,9 +2811,9 @@ HTML+EEX:
   - heex
   - leex
   extensions:
-  - ".eex"
-  - ".html.heex"
-  - ".html.leex"
+  - ".html.eex"
+  - ".heex"
+  - ".leex"
   ace_mode: text
   codemirror_mode: htmlmixed
   codemirror_mime_type: text/html
@@ -3349,6 +3361,14 @@ JSONiq:
   - ".jq"
   tm_scope: source.jsoniq
   language_id: 177
+Jai:
+  type: programming
+  color: "#ab8b4b"
+  ace_mode: text
+  tm_scope: source.jai
+  extensions:
+  - ".jai"
+  language_id: 70127133
 Janet:
   type: programming
   color: "#0886a5"
@@ -3606,6 +3626,16 @@ Just:
   - ".just"
   ace_mode: text
   language_id: 128447695
+KDL:
+  type: data
+  color: "#ffb3b3"
+  extensions:
+  - ".kdl"
+  tm_scope: source.kdl
+  ace_mode: tcl
+  codemirror_mode: yacas
+  codemirror_mime_type: text/x-yacas
+  language_id: 931123626
 KRL:
   type: programming
   color: "#28430A"
@@ -3879,6 +3909,13 @@ Limbo:
   tm_scope: none
   ace_mode: text
   language_id: 201
+Linear Programming:
+  type: programming
+  extensions:
+  - ".lp"
+  tm_scope: none
+  ace_mode: text
+  language_id: 377204539
 Linker Script:
   type: data
   extensions:
@@ -4372,6 +4409,21 @@ MiniYAML:
   codemirror_mode: yaml
   codemirror_mime_type: text/x-yaml
   language_id: 4896465
+MiniZinc:
+  type: programming
+  color: "#06a9e6"
+  extensions:
+  - ".mzn"
+  tm_scope: source.mzn
+  ace_mode: text
+  language_id: 238874535
+MiniZinc Data:
+  type: data
+  extensions:
+  - ".dzn"
+  tm_scope: source.mzn
+  ace_mode: text
+  language_id: 938193433
 Mint:
   type: programming
   extensions:
@@ -4882,6 +4934,26 @@ OCaml:
   - ocamlscript
   tm_scope: source.ocaml
   language_id: 255
+OMNeT++ MSG:
+  type: programming
+  extensions:
+  - ".msg"
+  color: "#a0e0a0"
+  tm_scope: source.msg
+  ace_mode: text
+  aliases:
+  - omnetpp-msg
+  language_id: 664100008
+OMNeT++ NED:
+  type: programming
+  extensions:
+  - ".ned"
+  color: "#08607c"
+  tm_scope: source.ned
+  ace_mode: text
+  aliases:
+  - omnetpp-ned
+  language_id: 924868392
 Oberon:
   type: programming
   extensions:
@@ -5108,6 +5180,15 @@ Org:
   tm_scope: none
   ace_mode: text
   language_id: 267
+OverpassQL:
+  type: programming
+  color: "#cce2aa"
+  wrap: true
+  extensions:
+  - ".overpassql"
+  tm_scope: source.overpassql
+  ace_mode: text
+  language_id: 689079655
 Ox:
   type: programming
   extensions:
@@ -7085,6 +7166,14 @@ SuperCollider:
   tm_scope: source.supercollider
   ace_mode: text
   language_id: 361
+Survex data:
+  type: data
+  color: "#ffcc99"
+  tm_scope: none
+  ace_mode: text
+  extensions:
+  - ".svx"
+  language_id: 24470517
 Svelte:
   type: markup
   color: "#ff3e00"
@@ -8076,6 +8165,7 @@ XML:
   - ".glade"
   - ".gml"
   - ".gmx"
+  - ".gpx"
   - ".grxml"
   - ".gst"
   - ".hzp"
@@ -8239,6 +8329,14 @@ XSLT:
   codemirror_mime_type: text/xml
   color: "#EB8CEB"
   language_id: 404
+Xmake:
+  type: programming
+  color: "#22a079"
+  filenames:
+  - xmake.lua
+  tm_scope: source.xmake
+  ace_mode: text
+  language_id: 225223071
 Xojo:
   type: programming
   color: "#81bd41"
@@ -8542,6 +8640,17 @@ mcfunction:
   tm_scope: source.mcfunction
   ace_mode: text
   language_id: 462488745
+mdsvex:
+  type: markup
+  color: "#5f9ea0"
+  tm_scope: none
+  ace_mode: markdown
+  codemirror_mode: gfm
+  codemirror_mime_type: text/x-gfm
+  wrap: true
+  extensions:
+  - ".svx"
+  language_id: 566198445
 mupad:
   type: programming
   color: "#244963"
@@ -8570,22 +8679,6 @@ nesC:
   ace_mode: text
   tm_scope: source.nesc
   language_id: 417
-omnetpp-msg:
-  type: programming
-  extensions:
-  - ".msg"
-  color: "#a0e0a0"
-  tm_scope: source.msg
-  ace_mode: text
-  language_id: 664100008
-omnetpp-ned:
-  type: programming
-  extensions:
-  - ".ned"
-  color: "#08607c"
-  tm_scope: source.ned
-  ace_mode: text
-  language_id: 924868392
 ooc:
   type: programming
   color: "#b0b77e"

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "linguist-js",
-	"version": "2.8.1",
+	"version": "2.9.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": {
@@ -42,8 +42,8 @@
 		"binary-extensions": "^2.3.0 <3",
 		"commander": "^9.5.0 <10",
 		"common-path-prefix": "^3.0.0",
-		"cross-fetch": "^3.1.8 <4",
-		"ignore": "^5.3.2",
+		"cross-fetch": "^3.2.0 <4",
+		"ignore": "^7.0.3",
 		"isbinaryfile": "^4.0.10 <5",
 		"js-yaml": "^4.1.0",
 		"node-cache": "^5.1.2"

package/readme.md

@@ -50,11 +50,11 @@ Running LinguistJS on this folder will return the following JSON:
   "files": {
     "count": 5,
     "bytes": 6020,
-	"lines": {
-		"total": 100,
-		"content": 90,
-		"code": 80,
-	},
+    "lines": {
+        "total": 100,
+        "content": 90,
+        "code": 80,
+    },
     "results": {
       "/src/index.ts": "TypeScript",
       "/src/cli.js": "JavaScript",
@@ -69,26 +69,46 @@ Running LinguistJS on this folder will return the following JSON:
   "languages": {
     "count": 3,
     "bytes": 6010,
-	"lines": {
-		"total": 90,
-		"content": 80,
-		"code": 70,
-	},
+    "lines": {
+        "total": 90,
+        "content": 80,
+        "code": 70,
+    },
     "results": {
-        "JavaScript": { "type": "programming", "bytes": 1000, "lines": { "total": 49, "content": 49, "code": 44 }, "color": "#f1e05a" },
-        "Markdown": { "type": "prose", "bytes": 3000, "lines": { "total": 10, "content": 5, "code": 5 }, "color": "#083fa1" },
-        "Ruby": { "type": "programming", "bytes": 10, "lines": { "total": 1, "content": 1, "code": 1 }, "color": "#701516" },
-        "TypeScript": { "type": "programming", "bytes": 2000, "lines": { "total": 30, "content": 25, "code": 20 }, "color": "#2b7489" },
+       "JavaScript": {
+            "type": "programming",
+            "bytes": 1000,
+            "lines": { "total": 49, "content": 49, "code": 44 },
+            "color": "#f1e05a"
+        },
+        "Markdown": {
+            "type": "prose",
+            "bytes": 3000,
+            "lines": { "total": 10, "content": 5, "code": 5 },
+            "color": "#083fa1"
+        },
+        "Ruby": {
+            "type": "programming",
+            "bytes": 10,
+            "lines": { "total": 1, "content": 1, "code": 1 },
+            "color": "#701516"
+        },
+        "TypeScript": {
+            "type": "programming",
+            "bytes": 2000,
+            "lines": { "total": 30, "content": 25, "code": 20 },
+            "color": "#2b7489"
+        },
     },
   },
   "unknown": {
     "count": 1,
     "bytes": 10,
-	"lines": {
-		"total": 10,
-		"content": 10,
-		"code": 10,
-	},
+    "lines": {
+        "total": 10,
+        "content": 10,
+        "code": 10,
+    },
     "filenames": {
       "no-lang": 10,
     },