linguist-js 2.5.0 → 2.5.1

package/dist/helpers/load-data.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const promises_1 = __importDefault(require("fs/promises"));
+const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const cross_fetch_1 = __importDefault(require("cross-fetch"));
 const node_cache_1 = __importDefault(require("node-cache"));
@@ -21,7 +21,7 @@ async function loadWebFile(file) {
 }
 async function loadLocalFile(file) {
     const filePath = path_1.default.resolve(__dirname, '../../ext', file);
-    return promises_1.default.readFile(filePath).then(buffer => buffer.toString());
+    return fs_1.default.promises.readFile(filePath).then(buffer => buffer.toString());
 }
 /** Load a data file from github-linguist. */
 async function loadFile(file, offline = false) {

package/dist/index.js

@@ -14,8 +14,8 @@ const load_data_1 = __importDefault(require("./helpers/load-data"));
 const read_file_1 = __importDefault(require("./helpers/read-file"));
 const convert_pcre_1 = __importDefault(require("./helpers/convert-pcre"));
 async function analyse(input, opts = {}) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
-    var _t, _u, _v;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
+    var _u, _v, _w;
     const useRawContent = opts.fileContent !== undefined;
     input = [input !== null && input !== void 0 ? input : []].flat();
     opts.fileContent = [(_a = opts.fileContent) !== null && _a !== void 0 ? _a : []].flat();
@@ -269,8 +269,16 @@ async function analyse(input, opts = {}) {
                         normalise(heuristic.pattern);
                     if (heuristic.named_pattern)
                         normalise(heuristicsData.named_patterns[heuristic.named_pattern]);
+                    if (heuristic.and) {
+                        for (const data of heuristic.and) {
+                            if (data.pattern)
+                                normalise(data.pattern);
+                            if (data.named_pattern)
+                                normalise(heuristicsData.named_patterns[data.named_pattern]);
+                        }
+                    }
                     // Check file contents and apply heuristic patterns
-                    const fileContent = opts.fileContent ? opts.fileContent[files.indexOf(file)] : await (0, read_file_1.default)(file).catch(() => null);
+                    const fileContent = ((_l = opts.fileContent) === null || _l === void 0 ? void 0 : _l.length) ? 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))) {
@@ -280,10 +288,10 @@ async function analyse(input, opts = {}) {
                 }
             }
         // If no heuristics, assign a language
-        (_l = (_t = results.files.results)[file]) !== null && _l !== void 0 ? _l : (_t[file] = fileAssociations[file][0]);
+        (_m = (_u = results.files.results)[file]) !== null && _m !== void 0 ? _m : (_u[file] = fileAssociations[file][0]);
     }
     // Skip specified categories
-    if ((_m = opts.categories) === null || _m === void 0 ? void 0 : _m.length) {
+    if ((_o = opts.categories) === null || _o === void 0 ? void 0 : _o.length) {
         const categories = ['data', 'markup', 'programming', 'prose'];
         const hiddenCategories = categories.filter(cat => !opts.categories.includes(cat));
         for (const [file, lang] of Object.entries(results.files.results)) {
@@ -319,21 +327,21 @@ async function analyse(input, opts = {}) {
     for (const [file, lang] of Object.entries(results.files.results)) {
         if (lang && !langData[lang])
             continue;
-        const fileSize = (_q = (_p = (_o = opts.fileContent) === null || _o === void 0 ? void 0 : _o[files.indexOf(file)]) === null || _p === void 0 ? void 0 : _p.length) !== null && _q !== void 0 ? _q : fs_1.default.statSync(file).size;
+        const fileSize = (_r = (_q = (_p = opts.fileContent) === null || _p === void 0 ? void 0 : _p[files.indexOf(file)]) === null || _q === void 0 ? void 0 : _q.length) !== null && _r !== void 0 ? _r : fs_1.default.statSync(file).size;
         results.files.bytes += fileSize;
         // If no language found, add extension in other section
         if (!lang) {
             const ext = path_1.default.extname(file);
             const unknownType = ext === '' ? 'filenames' : 'extensions';
             const name = ext === '' ? path_1.default.basename(file) : ext;
-            (_r = (_u = results.unknown[unknownType])[name]) !== null && _r !== void 0 ? _r : (_u[name] = 0);
+            (_s = (_v = results.unknown[unknownType])[name]) !== null && _s !== void 0 ? _s : (_v[name] = 0);
             results.unknown[unknownType][name] += fileSize;
             results.unknown.bytes += fileSize;
             continue;
         }
         // Add language and bytes data to corresponding section
         const { type } = langData[lang];
-        (_s = (_v = results.languages.results)[lang]) !== null && _s !== void 0 ? _s : (_v[lang] = { type, bytes: 0, color: langData[lang].color });
+        (_t = (_w = results.languages.results)[lang]) !== null && _t !== void 0 ? _t : (_w[lang] = { type, bytes: 0, color: langData[lang].color });
         if (opts.childLanguages) {
             results.languages.results[lang].parent = langData[lang].group;
         }

package/ext/heuristics.yml

@@ -65,10 +65,22 @@ disambiguations:
     pattern: '(<^\s*; |End Function)'
   - language: BitBake
     pattern: '^\s*(# |include|require)\b'
+  - language: Clojure
+    pattern: '\((def|defn|defmacro|let)\s'
 - extensions: ['.bi']
   rules:
   - language: FreeBasic
     pattern: '^[ \t]*#(?:define|endif|endmacro|ifn?def|if|include|lang|macro)\s'
+- extensions: ['.bs']
+  rules:
+  - language: Bikeshed
+    pattern: '^(?i:<pre\s+class)\s*=\s*(''|\"|\b)metadata\b\1[^>\r\n]*>'
+  - language: BrighterScript
+    pattern:
+    - (?i:^\s*(?=^sub\s)(?:sub\s*\w+\(.*?\))|(?::\s*sub\(.*?\))$)
+    - (?i:^\s*(end\ssub)$)
+    - (?i:^\s*(?=^function\s)(?:function\s*\w+\(.*?\)\s*as\s*\w*)|(?::\s*function\(.*?\)\s*as\s*\w*)$)
+    - (?i:^\s*(end\sfunction)$)
 - extensions: ['.builds']
   rules:
   - language: XML
@@ -552,6 +564,15 @@ disambiguations:
     pattern: '\$\w+[($]|(.)!\s*.+?\s*!\1|<!\s*.+?\s*!>|\[!\s*.+?\s*!\]|\{!\s*.+?\s*!\}'
   - language: Smalltalk
     pattern: '\A\s*[\[{(^"''\w#]|[a-zA-Z_]\w*\s*:=\s*[a-zA-Z_]\w*|class\s*>>\s*[a-zA-Z_]\w*|^[a-zA-Z_]\w*\s+[a-zA-Z_]\w*:|^Class\s*{|if(?:True|False):\s*\['
+- extensions: ['.star']
+  rules:
+  - language: STAR
+    pattern: '^loop_\s*$'
+  - language: Starlark
+- extensions: ['.stl']
+  rules:
+  - language: STL
+    pattern: '\A\s*solid(?=$|\s)(?m:.*?)\Rendsolid(?:$|\s)'
 - extensions: ['.t']
   rules:
   - language: Perl

package/ext/languages.yml

@@ -270,6 +270,16 @@ Ant Build System:
   codemirror_mode: xml
   codemirror_mime_type: application/xml
   language_id: 15
+Antlers:
+  type: markup
+  color: "#ff269e"
+  extensions:
+  - ".antlers.html"
+  - ".antlers.php"
+  - ".antlers.xml"
+  tm_scope: text.html.statamic
+  ace_mode: text
+  language_id: 1067292663
 ApacheConf:
   type: data
   color: "#d12127"
@@ -515,6 +525,16 @@ Bicep:
   tm_scope: source.bicep
   ace_mode: text
   language_id: 321200902
+Bikeshed:
+  type: markup
+  color: "#5562ac"
+  extensions:
+  - ".bs"
+  tm_scope: source.csswg
+  ace_mode: html
+  codemirror_mode: htmlmixed
+  codemirror_mime_type: text/html
+  language_id: 1055528081
 Bison:
   type: programming
   color: "#6A463F"
@@ -602,12 +622,20 @@ Brainfuck:
   codemirror_mode: brainfuck
   codemirror_mime_type: text/x-brainfuck
   language_id: 38
+BrighterScript:
+  type: programming
+  color: "#66AABB"
+  extensions:
+  - ".bs"
+  tm_scope: source.brs
+  ace_mode: text
+  language_id: 943571030
 Brightscript:
   type: programming
   color: "#662D91"
   extensions:
   - ".brs"
-  tm_scope: source.brightscript
+  tm_scope: source.brs
   ace_mode: text
   language_id: 39
 Browserslist:
@@ -699,6 +727,16 @@ C2hs Haskell:
   codemirror_mode: haskell
   codemirror_mime_type: text/x-haskell
   language_id: 45
+CAP CDS:
+  type: programming
+  tm_scope: source.cds
+  color: "#0092d1"
+  aliases:
+  - cds
+  extensions:
+  - ".cds"
+  ace_mode: text
+  language_id: 390788699
 CIL:
   type: data
   tm_scope: source.cil
@@ -885,6 +923,39 @@ Charity:
   tm_scope: none
   ace_mode: text
   language_id: 56
+Checksums:
+  type: data
+  tm_scope: text.checksums
+  aliases:
+  - checksum
+  - hash
+  - hashes
+  - sum
+  - sums
+  filenames:
+  - MD5SUMS
+  - SHA1SUMS
+  - SHA256SUMS
+  - SHA256SUMS.txt
+  - SHA512SUMS
+  - checksums.txt
+  - cksums
+  - md5sum.txt
+  extensions:
+  - ".crc32"
+  - ".md2"
+  - ".md4"
+  - ".md5"
+  - ".sha1"
+  - ".sha2"
+  - ".sha224"
+  - ".sha256"
+  - ".sha256sum"
+  - ".sha3"
+  - ".sha384"
+  - ".sha512"
+  ace_mode: text
+  language_id: 372063053
 ChucK:
   type: programming
   color: "#3f8000"
@@ -955,6 +1026,7 @@ Clojure:
   color: "#db5855"
   extensions:
   - ".clj"
+  - ".bb"
   - ".boot"
   - ".cl2"
   - ".cljc"
@@ -965,6 +1037,8 @@ Clojure:
   - ".hic"
   filenames:
   - riemann.config
+  interpreters:
+  - bb
   language_id: 62
 Closure Templates:
   type: markup
@@ -1685,6 +1759,7 @@ F*:
   - fstar
   extensions:
   - ".fst"
+  - ".fsti"
   tm_scope: source.fstar
   ace_mode: text
   language_id: 336943375
@@ -2158,6 +2233,16 @@ Git Config:
   codemirror_mime_type: text/x-properties
   tm_scope: source.gitconfig
   language_id: 807968997
+Git Revision List:
+  type: data
+  color: "#F44D27"
+  aliases:
+  - Git Blame Ignore Revs
+  filenames:
+  - ".git-blame-ignore-revs"
+  tm_scope: source.git-revlist
+  ace_mode: text
+  language_id: 461881235
 Gleam:
   type: programming
   color: "#ffaff3"
@@ -2626,8 +2711,11 @@ INI:
   - ".properties"
   - ".url"
   filenames:
+  - ".coveragerc"
   - ".flake8"
+  - ".pylintrc"
   - buildozer.spec
+  - pylintrc
   tm_scope: source.ini
   aliases:
   - dosini
@@ -2794,8 +2882,14 @@ JSON:
   ace_mode: json
   codemirror_mode: javascript
   codemirror_mime_type: application/json
+  aliases:
+  - geojson
+  - jsonl
+  - topojson
   extensions:
   - ".json"
+  - ".4DForm"
+  - ".4DProject"
   - ".avsc"
   - ".geojson"
   - ".gltf"
@@ -3020,6 +3114,20 @@ Jest Snapshot:
   codemirror_mode: javascript
   codemirror_mime_type: application/javascript
   language_id: 774635084
+JetBrains MPS:
+  type: programming
+  aliases:
+  - mps
+  color: "#21D789"
+  extensions:
+  - ".mps"
+  - ".mpl"
+  - ".msd"
+  ace_mode: xml
+  codemirror_mode: xml
+  codemirror_mime_type: text/xml
+  tm_scope: none
+  language_id: 465165328
 Jinja:
   type: markup
   color: "#a52a22"
@@ -3164,6 +3272,7 @@ KiCad Schematic:
   aliases:
   - eeschema schematic
   extensions:
+  - ".kicad_sch"
   - ".sch"
   tm_scope: source.pcb.schematic
   ace_mode: text
@@ -3653,6 +3762,7 @@ Markdown:
   wrap: true
   extensions:
   - ".md"
+  - ".livemd"
   - ".markdown"
   - ".mdown"
   - ".mdwn"
@@ -4712,6 +4822,14 @@ Pony:
   tm_scope: source.pony
   ace_mode: text
   language_id: 290
+Portugol:
+  type: programming
+  color: "#f8bd00"
+  extensions:
+  - ".por"
+  tm_scope: source.portugol
+  ace_mode: text
+  language_id: 832391833
 PostCSS:
   type: markup
   color: "#dc3a0c"
@@ -5667,6 +5785,24 @@ SSH Config:
   ace_mode: text
   tm_scope: source.ssh-config
   language_id: 554920715
+STAR:
+  type: data
+  extensions:
+  - ".star"
+  tm_scope: source.star
+  ace_mode: text
+  language_id: 424510560
+STL:
+  type: data
+  color: "#373b5e"
+  aliases:
+  - ascii stl
+  - stla
+  extensions:
+  - ".stl"
+  tm_scope: source.stl
+  ace_mode: text
+  language_id: 455361735
 STON:
   type: data
   group: Smalltalk
@@ -6061,6 +6197,7 @@ Starlark:
   color: "#76d275"
   extensions:
   - ".bzl"
+  - ".star"
   filenames:
   - BUCK
   - BUILD
@@ -6216,7 +6353,7 @@ TSV:
   language_id: 1035892117
 TSX:
   type: programming
-  color: "#2b7489"
+  color: "#3178c6"
   group: TypeScript
   extensions:
   - ".tsx"
@@ -6442,7 +6579,7 @@ Type Language:
   language_id: 632765617
 TypeScript:
   type: programming
-  color: "#2b7489"
+  color: "#3178c6"
   aliases:
   - ts
   interpreters:
@@ -6450,6 +6587,8 @@ TypeScript:
   - ts-node
   extensions:
   - ".ts"
+  - ".cts"
+  - ".mts"
   tm_scope: source.ts
   ace_mode: typescript
   codemirror_mode: javascript
@@ -6488,6 +6627,10 @@ Unix Assembly:
   extensions:
   - ".s"
   - ".ms"
+  aliases:
+  - gas
+  - gnu asm
+  - unix asm
   tm_scope: source.x86
   ace_mode: assembly_x86
   language_id: 120
@@ -6759,9 +6902,11 @@ WebIDL:
 WebVTT:
   type: data
   wrap: true
+  aliases:
+  - vtt
   extensions:
   - ".vtt"
-  tm_scope: source.vtt
+  tm_scope: text.vtt
   ace_mode: text
   language_id: 658679714
 Wget Config:
@@ -6774,6 +6919,14 @@ Wget Config:
   tm_scope: source.wgetrc
   ace_mode: text
   language_id: 668457123
+Whiley:
+  type: programming
+  color: "#d5c397"
+  extensions:
+  - ".whiley"
+  tm_scope: source.whiley
+  ace_mode: text
+  language_id: 888779559
 Wikitext:
   type: prose
   color: "#fc5757"

package/ext/vendor.yml

@@ -163,3 +163,4 @@
 - (^|/)\.google_apis/
 - (^|/)Jenkinsfile$
 - (^|/)\.gitpod\.Dockerfile$
+- (^|/)\.github/

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "linguist-js",
-	"version": "2.5.0",
+	"version": "2.5.1",
 	"description": "Analyse languages used in a folder. Powered by GitHub Linguist, although it doesn't need to be installed.",
 	"main": "dist/index.js",
 	"bin": {
@@ -40,7 +40,7 @@
 	"homepage": "https://github.com/Nixinova/Linguist#readme",
 	"dependencies": {
 		"binary-extensions": "^2.2.0",
-		"commander": "^9.2.0",
+		"commander": "^9.3.0",
 		"common-path-prefix": "^3.0.0",
 		"cross-fetch": "^3.1.5",
 		"ignore": "^5.2.0",
@@ -49,10 +49,9 @@
 		"node-cache": "^5.1.2"
 	},
 	"devDependencies": {
-		"@types/glob-to-regexp": "ts4.6",
-		"@types/js-yaml": "ts4.6",
-		"@types/node": "ts4.6",
+		"@types/js-yaml": "^4.0.5",
+		"@types/node": "ts4.7",
 		"deep-object-diff": "^1.1.7",
-		"typescript": "~4.6.4"
+		"typescript": "~4.7.4"
 	}
 }

package/readme.md

@@ -77,7 +77,6 @@ Running LinguistJS on this folder will return the following JSON:
 ### Notes
 
 - 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 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.