linguist-js 2.7.0-pre → 2.7.1

package/dist/cli.js

@@ -8,6 +8,7 @@ const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const commander_1 = require("commander");
 const index_1 = __importDefault(require("./index"));
+const norm_path_1 = require("./helpers/norm-path");
 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
@@ -92,7 +93,7 @@ if (args.analyze)
                 if (args.listFiles) {
                     console.log(); // padding
                     for (const file of filesPerLanguage[lang]) {
-                        let relFile = path_1.default.relative(path_1.default.resolve('.'), file).replace(/\\/g, '/');
+                        let relFile = (0, norm_path_1.normPath)(path_1.default.relative(path_1.default.resolve('.'), file));
                         if (!relFile.startsWith('../'))
                             relFile = './' + relFile;
                         const bytes = (await fs_1.default.promises.stat(file)).size;

package/dist/helpers/norm-path.d.ts

@@ -0,0 +1,2 @@
+export declare const normPath: (...inputPaths: string[]) => string;
+export declare const normAbsPath: (...inputPaths: string[]) => string;

package/dist/helpers/norm-path.js

@@ -0,0 +1,15 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.normAbsPath = exports.normPath = void 0;
+const path_1 = __importDefault(require("path"));
+const normPath = function normalisedPath(...inputPaths) {
+    return path_1.default.join(...inputPaths).replace(/\\/g, '/');
+};
+exports.normPath = normPath;
+const normAbsPath = function normalisedAbsolutePath(...inputPaths) {
+    return path_1.default.resolve(...inputPaths).replace(/\\/g, '/');
+};
+exports.normAbsPath = normAbsPath;

package/dist/helpers/parse-gitattributes.js

@@ -1,21 +1,19 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const path_1 = __importDefault(require("path"));
+const norm_path_1 = require("./norm-path");
 /**
  * Parses a gitattributes file.
  */
 function parseAttributes(content, folderRoot = '.') {
     var _a, _b;
     const output = [];
-    for (const line of content.split('\n')) {
+    for (const rawLine of content.split('\n')) {
+        const line = rawLine.replace(/#.*/, '').trim();
         if (!line)
             continue;
         const parts = line.split(/\s+/g);
         const fileGlob = parts[0];
-        const relFileGlob = path_1.default.join(folderRoot, fileGlob).replace(/\\/g, '/');
+        const relFileGlob = (0, norm_path_1.normPath)(folderRoot, fileGlob);
         const attrParts = parts.slice(1);
         const isTrue = (str) => !str.startsWith('-') && !str.endsWith('=false');
         const isFalse = (str) => str.startsWith('-') || str.endsWith('=false');

package/dist/helpers/parse-gitignore.d.ts

@@ -0,0 +1 @@
+export default function parseGitignore(content: string): string[];

package/dist/helpers/parse-gitignore.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+function parseGitignore(content) {
+    const readableData = content
+        // Remove comments unless escaped
+        .replace(/(?<!\\)#.+/g, '')
+        // Remove whitespace unless escaped
+        .replace(/(?:(?<!\\)\s)+$/g, '');
+    const arrayData = readableData.split(/\r?\n/).filter(data => data);
+    return arrayData;
+}
+exports.default = parseGitignore;

package/dist/helpers/walk-tree.js

@@ -5,6 +5,8 @@ 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 parse_gitignore_1 = __importDefault(require("./parse-gitignore"));
+const norm_path_1 = require("./norm-path");
 let allFiles;
 let allFolders;
 ;
@@ -24,26 +26,38 @@ function walk(data) {
         // Get list of files and folders inside this folder
         const files = fs_1.default.readdirSync(folder).map(file => {
             // Create path relative to root
-            const base = path_1.default.resolve(folder, file).replace(/\\/g, '/').replace(commonRoot, '.');
+            const base = (0, norm_path_1.normAbsPath)(folder, file).replace(commonRoot, '.');
             // Add trailing slash to mark directories
             const isDir = fs_1.default.lstatSync(path_1.default.resolve(commonRoot, base)).isDirectory();
             return isDir ? `${base}/` : base;
         });
+        // Read and apply gitignores
+        const gitignoreFilename = (0, norm_path_1.normPath)(folder, '.gitignore');
+        if (fs_1.default.existsSync(gitignoreFilename)) {
+            const gitignoreContents = fs_1.default.readFileSync(gitignoreFilename, 'utf-8');
+            const ignoredPaths = (0, parse_gitignore_1.default)(gitignoreContents);
+            ignored.add(ignoredPaths);
+        }
+        // Add gitattributes if present
+        const gitattributesPath = (0, norm_path_1.normPath)(folder, '.gitattributes');
+        if (fs_1.default.existsSync(gitattributesPath)) {
+            allFiles.add(gitattributesPath);
+        }
         // Loop through files and folders
         for (const file of files) {
             // Create absolute path for disc operations
-            const path = path_1.default.resolve(commonRoot, file).replace(/\\/g, '/');
+            const path = (0, norm_path_1.normAbsPath)(commonRoot, file);
             const localPath = localRoot ? file.replace(`./${localRoot}/`, '') : file.replace('./', '');
             // Skip if nonexistant
             const nonExistant = !fs_1.default.existsSync(path);
             if (nonExistant)
                 continue;
-            // Skip if marked as ignored
+            // Skip if marked in gitignore
             const isIgnored = ignored.test(localPath).ignored;
             if (isIgnored)
                 continue;
             // Add absolute folder path to list
-            allFolders.add(path_1.default.resolve(folder).replace(/\\/g, '/'));
+            allFolders.add((0, norm_path_1.normAbsPath)(folder));
             // Check if this is a folder or file
             if (file.endsWith('/')) {
                 // Recurse into subfolders

package/dist/index.js

@@ -37,11 +37,12 @@ const load_data_1 = __importStar(require("./helpers/load-data"));
 const read_file_1 = __importDefault(require("./helpers/read-file"));
 const parse_gitattributes_1 = __importDefault(require("./helpers/parse-gitattributes"));
 const convert_pcre_1 = __importDefault(require("./helpers/convert-pcre"));
-async function analyse(rawInput, opts = {}) {
+const norm_path_1 = require("./helpers/norm-path");
+async function analyse(rawPaths, opts = {}) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
     var _r, _s;
     const useRawContent = opts.fileContent !== undefined;
-    const input = [rawInput !== null && rawInput !== void 0 ? rawInput : []].flat();
+    const input = [rawPaths !== null && rawPaths !== void 0 ? rawPaths : []].flat();
     const manualFileContent = [(_a = opts.fileContent) !== null && _a !== void 0 ? _a : []].flat();
     // Normalise input option arguments
     opts = {
@@ -69,12 +70,10 @@ async function analyse(rawInput, opts = {}) {
         unknown: { count: 0, bytes: 0, extensions: {}, filenames: {} },
     };
     // Set a common root path so that vendor paths do not incorrectly match parent folders
-    const normPath = (file) => file.replace(/\\/g, '/');
-    const resolvedInput = input.map(path => normPath(path_1.default.resolve(path)));
+    const resolvedInput = input.map(path => (0, norm_path_1.normPath)(path_1.default.resolve(path)));
     const commonRoot = (input.length > 1 ? (0, common_path_prefix_1.default)(resolvedInput) : resolvedInput[0]).replace(/\/?$/, '');
-    const localRoot = (folder) => folder.replace(commonRoot, '').replace(/^\//, '');
-    const relPath = (file) => useRawContent ? file : normPath(path_1.default.relative(commonRoot, file));
-    const unRelPath = (file) => useRawContent ? file : normPath(path_1.default.resolve(commonRoot, file));
+    const relPath = (file) => useRawContent ? file : (0, norm_path_1.normPath)(path_1.default.relative(commonRoot, file));
+    const unRelPath = (file) => useRawContent ? file : (0, norm_path_1.normPath)(path_1.default.resolve(commonRoot, file));
     // Other helper functions
     const fileMatchesGlobs = (file, ...globs) => (0, ignore_1.default)().add(globs).ignores(relPath(file));
     const filterOutIgnored = (files, ignored) => ignored.filter(files.map(relPath)).map(unRelPath);
@@ -83,42 +82,39 @@ async function analyse(rawInput, opts = {}) {
     const ignored = (0, ignore_1.default)();
     ignored.add('.git/');
     ignored.add((_b = opts.ignoredFiles) !== null && _b !== void 0 ? _b : []);
-    const regexIgnores = [];
-    if (!opts.keepVendored)
-        regexIgnores.push(...vendorPaths.map(path => RegExp(path, 'i')));
+    const regexIgnores = opts.keepVendored ? [] : vendorPaths.map(path => RegExp(path, 'i'));
     // Load file paths and folders
     let files;
-    let folders;
     if (useRawContent) {
         // Uses raw file content
         files = input;
-        folders = [''];
     }
     else {
         // Uses directory on disc
         const data = (0, walk_tree_1.default)({ init: true, commonRoot, folderRoots: resolvedInput, folders: resolvedInput, ignored });
         files = data.files;
-        folders = data.folders;
-    }
-    // Load gitignore data and apply ignores rules
-    if (!useRawContent) {
-        // TODO switch to be like the gitattributes code
-        for (const folder of folders) {
-            // Parse gitignores
-            const ignoresFile = path_1.default.join(folder, '.gitignore');
-            if (opts.checkIgnored && fs_1.default.existsSync(ignoresFile)) {
-                const ignoresData = await (0, read_file_1.default)(ignoresFile);
-                const localIgnoresData = ignoresData.replace(/^[\/\\]/g, localRoot(folder) + '/');
-                ignored.add(localIgnoresData);
-                files = filterOutIgnored(files, ignored);
-            }
-        }
     }
     // Fetch and normalise gitattributes data of all subfolders and save to metadata
     const manualAttributes = {}; // Maps file globs to gitattribute boolean flags
     const getFlaggedGlobs = (attr, val) => {
         return Object.entries(manualAttributes).filter(([, attrs]) => attrs[attr] === val).map(([glob,]) => glob);
     };
+    const findAttrsForPath = (filePath) => {
+        const resultAttrs = {};
+        for (const glob in manualAttributes) {
+            if ((0, ignore_1.default)().add(glob).ignores(relPath(filePath))) {
+                const matchingAttrs = manualAttributes[glob];
+                for (const [attr, val] of Object.entries(matchingAttrs)) {
+                    if (val !== null)
+                        resultAttrs[attr] = val;
+                }
+            }
+        }
+        if (!JSON.stringify(resultAttrs)) {
+            return null;
+        }
+        return resultAttrs;
+    };
     if (!useRawContent && opts.checkAttributes) {
         const nestedAttrFiles = files.filter(file => file.endsWith('.gitattributes'));
         for (const attrFile of nestedAttrFiles) {
@@ -131,22 +127,41 @@ async function analyse(rawInput, opts = {}) {
             }
         }
     }
+    // Remove files that are linguist-ignored via regex by default unless explicitly unignored in gitattributes
+    const filesToIgnore = [];
+    for (const file of files) {
+        const relFile = relPath(file);
+        const isRegexIgnored = regexIgnores.some(pattern => pattern.test(relFile));
+        if (!isRegexIgnored) {
+            // Checking overrides is moot if file is not even marked as ignored by default
+            continue;
+        }
+        const fileAttrs = findAttrsForPath(file);
+        if ((fileAttrs === null || fileAttrs === void 0 ? void 0 : fileAttrs.generated) === false || (fileAttrs === null || fileAttrs === void 0 ? void 0 : fileAttrs.vendored) === false) {
+            // File is explicitly marked as *not* to be ignored
+            // do nothing
+        }
+        else {
+            filesToIgnore.push(file);
+        }
+    }
+    files = files.filter(file => !filesToIgnore.includes(file));
     // Apply vendor file path matches and filter out vendored files
     if (!opts.keepVendored) {
         // Get data of files that have been manually marked with metadata
         const vendorTrueGlobs = [...getFlaggedGlobs('vendored', true), ...getFlaggedGlobs('generated', true), ...getFlaggedGlobs('documentation', true)];
         const vendorFalseGlobs = [...getFlaggedGlobs('vendored', false), ...getFlaggedGlobs('generated', false), ...getFlaggedGlobs('documentation', false)];
         // Set up glob ignore object to use for expanding globs to match files
-        const vendorOverrides = (0, ignore_1.default)().add(vendorFalseGlobs);
+        const vendorTrueIgnore = (0, ignore_1.default)().add(vendorTrueGlobs);
+        const vendorFalseIgnore = (0, ignore_1.default)().add(vendorFalseGlobs);
         // Remove all files marked as vendored by default
         const excludedFiles = files.filter(file => vendorPaths.some(pathPtn => RegExp(pathPtn, 'i').test(relPath(file))));
         files = files.filter(file => !excludedFiles.includes(file));
         // Re-add removed files that are overridden manually in gitattributes
-        const overriddenExcludedFiles = excludedFiles.filter(file => vendorOverrides.ignores(relPath(file)));
+        const overriddenExcludedFiles = excludedFiles.filter(file => vendorFalseIgnore.ignores(relPath(file)));
         files.push(...overriddenExcludedFiles);
         // Remove files explicitly marked as vendored in gitattributes
-        // TODO change globs.includes(file) to parse the glob using ignore()
-        files = files.filter(file => !vendorTrueGlobs.includes(relPath(file)));
+        files = files.filter(file => !vendorTrueIgnore.ignores(relPath(file)));
     }
     // Filter out binary files
     if (!opts.keepBinary) {
@@ -157,7 +172,6 @@ async function analyse(rawInput, opts = {}) {
         files = filterOutIgnored(files, binaryIgnored);
         // Re-add files manually marked not as binary
         const binaryUnignored = (0, ignore_1.default)().add(getFlaggedGlobs('binary', false));
-        // TODO parse the globs using ignore()
         const unignoredList = filterOutIgnored(files, binaryUnignored);
         files.push(...unignoredList);
     }
@@ -386,7 +400,7 @@ async function analyse(rawInput, opts = {}) {
     if (!useRawContent && 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, '/');
+            let relPath = (0, norm_path_1.normPath)(path_1.default.relative(process.cwd(), file));
             if (!relPath.startsWith('../')) {
                 relPath = './' + relPath;
             }

package/ext/generated.rb

@@ -11,6 +11,7 @@
 - (^|\/)(\w+\.)?esy.lock$
 - npm-shrinkwrap\.json
 - package-lock\.json
+- pnpm-lock\.yaml
 - (^|\/)\.pnp\..*$
 - Godeps\/
 - composer\.lock
@@ -22,3 +23,5 @@
 - ppport\.h$
 - __generated__\/
 - _tlb\.pas$
+- (?:^|\/)htmlcov\/
+- (?:^|.*\/)\.sqlx\/query-.+\.json$

package/ext/heuristics.yml

@@ -45,7 +45,7 @@ disambiguations:
   - language: Public Key
     pattern: '^(----[- ]BEGIN|ssh-(rsa|dss)) '
   - language: AsciiDoc
-    pattern: '^[=-]+(\s|\n)|\{\{[A-Za-z]'
+    pattern: '^[=-]+\s|\{\{[A-Za-z]'
   - language: AGS Script
     pattern: '^(\/\/.+|((import|export)\s+)?(function|int|float|char)\s+((room|repeatedly|on|game)_)?([A-Za-z]+[A-Za-z_0-9]+)\s*[;\(])'
 - extensions: ['.asm']
@@ -74,7 +74,7 @@ disambiguations:
   - language: BlitzBasic
     pattern: '(<^\s*; |End Function)'
   - language: BitBake
-    pattern: '^\s*(# |include|require)\b'
+    pattern: '^(# |include|require|inherit)\b'
   - language: Clojure
     pattern: '\((def|defn|defmacro|let)\s'
 - extensions: ['.bf']
@@ -101,6 +101,8 @@ disambiguations:
     - (?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)$)
+  - language: Bluespec BH
+    pattern: '^package\s+[A-Za-z_][A-Za-z0-9_'']*(?:\s*\(|\s+where)'
 - extensions: ['.builds']
   rules:
   - language: XML
@@ -132,7 +134,7 @@ disambiguations:
 - extensions: ['.cmp']
   rules:
   - language: Gerber Image
-    pattern: '^[DGMT][0-9]{2}\*\r?\n'
+    pattern: '^[DGMT][0-9]{2}\*(?:\r?\n|\r)'
 - extensions: ['.cs']
   rules:
   - language: Smalltalk
@@ -242,7 +244,7 @@ disambiguations:
 - extensions: ['.ftl']
   rules:
   - language: FreeMarker
-    pattern: '^(?:<|[a-zA-Z-][a-zA-Z0-9_-]+[ \t]+\w)|\$\{\w+[^\n]*?\}|^[ \t]*(?:<#--.*?-->|<#([a-z]+)(?=\s|>)[^>]*>.*?</#\1>|\[#--.*?--\]|\[#([a-z]+)(?=\s|\])[^\]]*\].*?\[#\2\])'
+    pattern: '^(?:<|[a-zA-Z-][a-zA-Z0-9_-]+[ \t]+\w)|\$\{\w+[^\r\n]*?\}|^[ \t]*(?:<#--.*?-->|<#([a-z]+)(?=\s|>)[^>]*>.*?</#\1>|\[#--.*?--\]|\[#([a-z]+)(?=\s|\])[^\]]*\].*?\[#\2\])'
   - language: Fluent
     pattern: '^-?[a-zA-Z][a-zA-Z0-9_-]* *=|\{\$-?[a-zA-Z][-\w]*(?:\.[a-zA-Z][-\w]*)?\}'
 - extensions: ['.g']
@@ -250,7 +252,7 @@ disambiguations:
   - language: GAP
     pattern: '\s*(Declare|BindGlobal|KeyDependentOperation|Install(Method|GlobalFunction)|SetPackageInfo)'
   - language: G-code
-    pattern: '^[MG][0-9]+\n'
+    pattern: '^[MG][0-9]+(?:\r?\n|\r)'
 - extensions: ['.gd']
   rules:
   - language: GAP
@@ -282,6 +284,12 @@ disambiguations:
   rules:
   - language: GSC
     named_pattern: gsc
+- extensions: ['.gts']
+  rules:
+  - language: Gerber Image
+    pattern: '^G0.'
+  - language: Glimmer TS
+    negative_pattern: '^G0.'
 - extensions: ['.h']
   rules:
   - language: Objective-C
@@ -333,6 +341,8 @@ disambiguations:
     pattern:
     - '(?i:^\s*\{\$(?:mode|ifdef|undef|define)[ ]+[a-z0-9_]+\})'
     - '^\s*end[.;]\s*$'
+  - language: BitBake
+    pattern: '^inherit(\s+[\w.-]+)+\s*$'
 - extensions: ['.json']
   rules:
   - language: OASv2-json
@@ -350,6 +360,12 @@ disambiguations:
     pattern: '^\.[A-Za-z]{2}(\s|$)'
   - language: PicoLisp
     pattern: '^\((de|class|rel|code|data|must)\s'
+- extensions: ['.lean']
+  rules:
+  - language: Lean
+    pattern: '^import [a-z]'
+  - language: Lean 4
+    pattern: '^import [A-Z]'
 - extensions: ['.ls']
   rules:
   - language: LoomScript
@@ -395,7 +411,7 @@ disambiguations:
   - language: Win32 Message File
     pattern: '(?i)^[ \t]*(?>\/\*\s*)?MessageId=|^\.$'
   - language: M4
-    pattern: '^dnl|^divert\((?:-?\d+)?\)|^\w+\(`[^\n]*?''[),]'
+    pattern: '^dnl|^divert\((?:-?\d+)?\)|^\w+\(`[^\r\n]*?''[),]'
   - language: Monkey C
     pattern: '\b(?:using|module|function|class|var)\s+\w'
 - extensions: ['.md']
@@ -420,6 +436,12 @@ disambiguations:
   - language: Modula-2
     pattern: '^\s*(?i:MODULE|END) [\w\.]+;'
   - language: [Linux Kernel Module, AMPL]
+- extensions: ['.mojo']
+  rules:
+  - language: Mojo
+    pattern: '^\s*(alias|def|from|fn|import|struct|trait)\s'
+  - language: XML
+    pattern: '^\s*<\?xml'
 - extensions: ['.ms']
   rules:
   - language: Roff
@@ -440,7 +462,7 @@ disambiguations:
   - language: XML
     pattern: '^\s*<\?xml\s+version'
   - language: Gerber Image
-    pattern: '^[DGMT][0-9]{2}\*\r?\n'
+    pattern: '^[DGMT][0-9]{2}\*(?:\r?\n|\r)'
   - language: Text
     pattern: 'THE_TITLE'
 - extensions: ['.nl']
@@ -504,7 +526,7 @@ disambiguations:
 - extensions: ['.pod']
   rules:
   - language: Pod 6
-    pattern: '^[\s&&[^\n]]*=(comment|begin pod|begin para|item\d+)'
+    pattern: '^[\s&&[^\r\n]]*=(comment|begin pod|begin para|item\d+)'
   - language: Pod
 - extensions: ['.pp']
   rules:
@@ -543,7 +565,7 @@ disambiguations:
 - extensions: ['.q']
   rules:
   - language: q
-    pattern: '((?i:[A-Z.][\w.]*:\{)|(^|\n)\\(cd?|d|l|p|ts?) )'
+    pattern: '((?i:[A-Z.][\w.]*:\{)|^\\(cd?|d|l|p|ts?) )'
   - language: HiveQL
     pattern: '(?i:SELECT\s+[\w*,]+\s+FROM|(CREATE|ALTER|DROP)\s(DATABASE|SCHEMA|TABLE))'
 - extensions: ['.qs']
@@ -556,6 +578,8 @@ disambiguations:
   rules:
   - language: Rebol
     pattern: '(?i:\bRebol\b)'
+  - language: Rez
+    pattern: '(#include\s+["<](Types\.r|Carbon\/Carbon\.r)[">])|((resource|data|type)\s+''[A-Za-z0-9]{4}''\s+((\(.*\)\s+){0,1}){)'
   - language: R
     pattern: '<-|^\s*#'
 - extensions: ['.re']
@@ -615,7 +639,7 @@ disambiguations:
   - language: Solidity
     pattern: '\bpragma\s+solidity\b|\b(?:abstract\s+)?contract\s+(?!\d)[a-zA-Z0-9$_]+(?:\s+is\s+(?:[a-zA-Z0-9$_][^\{]*?)?)?\s*\{'
   - language: Gerber Image
-    pattern: '^[DGMT][0-9]{2}\*\r?\n'
+    pattern: '^[DGMT][0-9]{2}\*(?:\r?\n|\r)'
 - extensions: ['.sql']
   rules:
   - language: PLpgSQL
@@ -645,7 +669,7 @@ disambiguations:
 - extensions: ['.stl']
   rules:
   - language: STL
-    pattern: '\A\s*solid(?=$|\s)(?:.|[\r\n])*?^endsolid(?:$|\s)'
+    pattern: '\A\s*solid(?:$|\s)[\s\S]*^endsolid(?:$|\s)'
 - extensions: ['.sw']
   rules:
   - language: Sway
@@ -699,10 +723,15 @@ disambiguations:
   - language: Adblock Filter List
     pattern: '\A\[(?<version>(?:[Aa]d[Bb]lock(?:[ \t][Pp]lus)?|u[Bb]lock(?:[ \t][Oo]rigin)?|[Aa]d[Gg]uard)(?:[ \t] \d+(?:\.\d+)*+)?)(?:[ \t]?;[ \t]?\g<version>)*+\]'
   - language: Text
+- extensions: ['.typ']
+  rules:
+  - language: Typst
+    pattern: '^#(import|show|let|set)'
+  - language: XML
 - extensions: ['.url']
   rules:
   - language: INI
-    pattern: '^\[InternetShortcut\](?:\r?\n|\r)(?>[^\s\[][^\n]*(?:\r?\n|\r))*URL='
+    pattern: '^\[InternetShortcut\](?:\r?\n|\r)(?>[^\s\[][^\r\n]*(?:\r?\n|\r))*URL='
 - extensions: ['.v']
   rules:
   - language: Coq
@@ -755,6 +784,7 @@ named_patterns:
   - '^[ \t]*catch\s*\('
   - '^[ \t]*(class|(using[ \t]+)?namespace)\s+\w+'
   - '^[ \t]*(private|public|protected):$'
+  - '__has_cpp_attribute|__cplusplus >'
   - 'std::\w+'
   euphoria:
   - '^\s*namespace\s'
@@ -796,7 +826,7 @@ named_patterns:
   - '^[ ]*(?:Public|Private)? Declare PtrSafe (?:Sub|Function)\b'
   - '^[ ]*#If Win64\b'
   - '^[ ]*(?:Dim|Const) [0-9a-zA-Z_]*[ ]*As Long(?:Ptr|Long)\b'
-  - '^[ ]*Option (?:Private Module|Compare Database)\b'
+  - '^[ ]*Option (?:Private Module|Compare (?:Database|Text|Binary))\b'
   - '(?: |\()(?:Access|Excel|Outlook|PowerPoint|Visio|Word|VBIDE)\.\w'
   - '\b(?:(?:Active)?VBProjects?|VBComponents?|Application\.(?:VBE|ScreenUpdating))\b'
   - '\b(?:ThisDrawing|AcadObject|Active(?:Explorer|Inspector|Window\.Presentation|Presentation|Document)|Selection\.(?:Find|Paragraphs))\b'

package/ext/languages.yml

@@ -538,6 +538,7 @@ Bicep:
   color: "#519aba"
   extensions:
   - ".bicep"
+  - ".bicepparam"
   tm_scope: source.bicep
   ace_mode: text
   language_id: 321200902
@@ -563,9 +564,12 @@ Bison:
 BitBake:
   type: programming
   color: "#00bce4"
-  tm_scope: none
+  tm_scope: source.bb
   extensions:
   - ".bb"
+  - ".bbappend"
+  - ".bbclass"
+  - ".inc"
   ace_mode: text
   language_id: 32
 Blade:
@@ -606,9 +610,28 @@ Bluespec:
   color: "#12223c"
   extensions:
   - ".bsv"
+  aliases:
+  - bluespec bsv
+  - bsv
   tm_scope: source.bsv
   ace_mode: verilog
+  codemirror_mode: verilog
+  codemirror_mime_type: text/x-systemverilog
   language_id: 36
+Bluespec BH:
+  type: programming
+  group: Bluespec
+  color: "#12223c"
+  extensions:
+  - ".bs"
+  aliases:
+  - bh
+  - bluespec classic
+  tm_scope: source.bh
+  ace_mode: haskell
+  codemirror_mode: haskell
+  codemirror_mime_type: text/x-haskell
+  language_id: 641580358
 Boo:
   type: programming
   color: "#d4bec1"
@@ -692,6 +715,7 @@ C#:
   extensions:
   - ".cs"
   - ".cake"
+  - ".cs.pp"
   - ".csx"
   - ".linq"
   language_id: 42
@@ -1157,7 +1181,7 @@ ColdFusion CFC:
   language_id: 65
 Common Lisp:
   type: programming
-  tm_scope: source.lisp
+  tm_scope: source.commonlisp
   color: "#3fb68b"
   aliases:
   - lisp
@@ -1540,6 +1564,7 @@ Dotenv:
   - ".env.local"
   - ".env.prod"
   - ".env.production"
+  - ".env.sample"
   - ".env.staging"
   - ".env.test"
   - ".env.testing"
@@ -1607,7 +1632,7 @@ ECL:
 ECLiPSe:
   type: programming
   color: "#001d9d"
-  group: prolog
+  group: Prolog
   extensions:
   - ".ecl"
   tm_scope: source.prolog.eclipse
@@ -1689,6 +1714,25 @@ Ecmarkup:
   aliases:
   - ecmarkdown
   language_id: 844766630
+Edge:
+  type: markup
+  color: "#0dffe0"
+  extensions:
+  - ".edge"
+  tm_scope: text.html.edge
+  ace_mode: html
+  language_id: 460509620
+EdgeQL:
+  type: programming
+  color: "#31A7FF"
+  aliases:
+  - esdl
+  extensions:
+  - ".edgeql"
+  - ".esdl"
+  ace_mode: text
+  tm_scope: source.edgeql
+  language_id: 925235833
 EditorConfig:
   type: data
   color: "#fff1f2"
@@ -2144,6 +2188,7 @@ GLSL:
   - ".tese"
   - ".vert"
   - ".vrx"
+  - ".vs"
   - ".vsh"
   - ".vshader"
   tm_scope: source.glsl
@@ -2205,20 +2250,20 @@ Gemini:
   wrap: true
   tm_scope: source.gemini
   language_id: 310828396
-Genero:
+Genero 4gl:
   type: programming
   color: "#63408e"
   extensions:
   - ".4gl"
-  tm_scope: source.genero
+  tm_scope: source.genero-4gl
   ace_mode: text
   language_id: 986054050
-Genero Forms:
+Genero per:
   type: markup
   color: "#d8df39"
   extensions:
   - ".per"
-  tm_scope: source.genero-forms
+  tm_scope: source.genero-per
   ace_mode: text
   language_id: 902995658
 Genie:
@@ -2316,7 +2361,6 @@ Gherkin:
 Git Attributes:
   type: data
   color: "#F44D27"
-  group: INI
   aliases:
   - gitattributes
   filenames:
@@ -2361,6 +2405,24 @@ Gleam:
   - ".gleam"
   tm_scope: source.gleam
   language_id: 1054258749
+Glimmer JS:
+  type: programming
+  extensions:
+  - ".gjs"
+  ace_mode: javascript
+  color: "#F5835F"
+  tm_scope: source.gjs
+  group: JavaScript
+  language_id: 5523150
+Glimmer TS:
+  type: programming
+  extensions:
+  - ".gts"
+  ace_mode: typescript
+  color: "#3178c6"
+  tm_scope: source.gts
+  group: TypeScript
+  language_id: 95110458
 Glyph:
   type: programming
   color: "#c1ac7f"
@@ -2489,6 +2551,15 @@ Gradle:
   tm_scope: source.groovy.gradle
   ace_mode: text
   language_id: 136
+Gradle Kotlin DSL:
+  group: Gradle
+  type: data
+  color: "#02303a"
+  extensions:
+  - ".gradle.kts"
+  ace_mode: text
+  tm_scope: source.kotlin
+  language_id: 432600901
 Grammatical Framework:
   type: programming
   aliases:
@@ -2603,8 +2674,8 @@ HOCON:
   extensions:
   - ".hocon"
   filenames:
-  - .scalafix.conf
-  - .scalafmt.conf
+  - ".scalafix.conf"
+  - ".scalafmt.conf"
   tm_scope: source.hocon
   ace_mode: text
   language_id: 679725279
@@ -2812,6 +2883,8 @@ Hosts File:
   filenames:
   - HOSTS
   - hosts
+  aliases:
+  - hosts
   tm_scope: source.hosts
   ace_mode: text
   language_id: 231021894
@@ -2910,7 +2983,6 @@ Idris:
 Ignore List:
   type: data
   color: "#000000"
-  group: INI
   aliases:
   - ignore
   - gitignore
@@ -3071,6 +3143,7 @@ JSON:
   aliases:
   - geojson
   - jsonl
+  - sarif
   - topojson
   extensions:
   - ".json"
@@ -3084,6 +3157,7 @@ JSON:
   - ".JSON-tmLanguage"
   - ".jsonl"
   - ".mcmeta"
+  - ".sarif"
   - ".tfstate"
   - ".tfstate.backup"
   - ".topojson"
@@ -3104,6 +3178,7 @@ JSON:
   - ".watchmanconfig"
   - Pipfile.lock
   - composer.lock
+  - deno.lock
   - flake.lock
   - mcmod.info
   language_id: 174
@@ -3120,6 +3195,7 @@ JSON with Comments:
   extensions:
   - ".jsonc"
   - ".code-snippets"
+  - ".code-workspace"
   - ".sublime-build"
   - ".sublime-commands"
   - ".sublime-completions"
@@ -3623,6 +3699,14 @@ Lean:
   tm_scope: source.lean
   ace_mode: text
   language_id: 197
+Lean 4:
+  type: programming
+  group: Lean
+  extensions:
+  - ".lean"
+  tm_scope: source.lean4
+  ace_mode: text
+  language_id: 455147478
 Less:
   type: markup
   color: "#1d365d"
@@ -4210,6 +4294,16 @@ Module Management System:
   tm_scope: none
   ace_mode: text
   language_id: 235
+Mojo:
+  type: programming
+  color: "#ff4c1f"
+  extensions:
+  - ".mojo"
+  ace_mode: python
+  codemirror_mode: python
+  codemirror_mime_type: text/x-python
+  tm_scope: source.mojo
+  language_id: 1045019587
 Monkey:
   type: programming
   extensions:
@@ -4374,7 +4468,7 @@ Nasal:
   extensions:
   - ".nas"
   tm_scope: source.nasal
-  ace_mode: text
+  ace_mode: nasal
   language_id: 178322513
 Nearley:
   type: programming
@@ -4622,6 +4716,13 @@ OCaml:
   - ocamlscript
   tm_scope: source.ocaml
   language_id: 255
+Oberon:
+  type: programming
+  extensions:
+  - ".ob2"
+  tm_scope: source.modula2
+  ace_mode: text
+  language_id: 677210597
 ObjDump:
   type: data
   extensions:
@@ -4823,6 +4924,8 @@ Option List:
   - ackrc
   filenames:
   - ".ackrc"
+  - ".rspec"
+  - ".yardopts"
   - ackrc
   - mocha.opts
   tm_scope: source.opts
@@ -5101,6 +5204,8 @@ Pic:
   extensions:
   - ".pic"
   - ".chem"
+  aliases:
+  - pikchr
   ace_mode: text
   codemirror_mode: troff
   codemirror_mime_type: text/troff
@@ -5142,6 +5247,15 @@ Pike:
   tm_scope: source.pike
   ace_mode: text
   language_id: 287
+Pip Requirements:
+  type: data
+  color: "#FFD343"
+  filenames:
+  - requirements-dev.txt
+  - requirements.txt
+  ace_mode: text
+  tm_scope: source.pip-requirements
+  language_id: 684385621
 PlantUML:
   type: data
   color: "#fbbd16"
@@ -5257,6 +5371,14 @@ PowerShell:
   interpreters:
   - pwsh
   language_id: 293
+Praat:
+  type: programming
+  color: "#c8506d"
+  tm_scope: source.praat
+  ace_mode: praat
+  extensions:
+  - ".praat"
+  language_id: 106029007
 Prisma:
   type: data
   color: "#0c344b"
@@ -5526,7 +5648,6 @@ R:
   type: programming
   color: "#198CE7"
   aliases:
-  - R
   - Rscript
   - splus
   extensions:
@@ -5851,6 +5972,14 @@ RenderScript:
   tm_scope: none
   ace_mode: text
   language_id: 323
+Rez:
+  type: programming
+  extensions:
+  - ".r"
+  tm_scope: source.rez
+  ace_mode: text
+  color: "#FFDAB3"
+  language_id: 498022874
 Rich Text Format:
   type: markup
   extensions:
@@ -5882,6 +6011,14 @@ RobotFramework:
   tm_scope: text.robot
   ace_mode: text
   language_id: 324
+Roc:
+  type: programming
+  color: "#7c38f5"
+  extensions:
+  - ".roc"
+  tm_scope: source.roc
+  ace_mode: text
+  language_id: 440182480
 Roff:
   type: markup
   color: "#ecdebe"
@@ -6389,6 +6526,7 @@ Shell:
   - ".kshrc"
   - ".login"
   - ".profile"
+  - ".tmux.conf"
   - ".zlogin"
   - ".zlogout"
   - ".zprofile"
@@ -6406,6 +6544,7 @@ Shell:
   - login
   - man
   - profile
+  - tmux.conf
   - zlogin
   - zlogout
   - zprofile
@@ -6499,7 +6638,7 @@ Slash:
 Slice:
   type: programming
   color: "#003fa2"
-  tm_scope: source.slice
+  tm_scope: source.ice
   ace_mode: text
   extensions:
   - ".ice"
@@ -6514,6 +6653,14 @@ Slim:
   codemirror_mode: slim
   codemirror_mime_type: text/x-slim
   language_id: 350
+Slint:
+  type: markup
+  color: "#2379F4"
+  extensions:
+  - ".slint"
+  tm_scope: source.slint
+  ace_mode: text
+  language_id: 119900149
 SmPL:
   type: programming
   extensions:
@@ -6740,7 +6887,7 @@ Svelte:
   language_id: 928734530
 Sway:
   type: programming
-  color: "#dea584"
+  color: "#00F58C"
   extensions:
   - ".sw"
   tm_scope: source.sway
@@ -6748,6 +6895,14 @@ Sway:
   codemirror_mode: rust
   codemirror_mime_type: text/x-rustsrc
   language_id: 271471144
+Sweave:
+  type: prose
+  color: "#198ce7"
+  extensions:
+  - ".rnw"
+  tm_scope: text.tex.latex.sweave
+  ace_mode: tex
+  language_id: 558779190
 Swift:
   type: programming
   color: "#F05138"
@@ -6776,15 +6931,13 @@ TI Program:
   color: "#A0AA87"
   extensions:
   - ".8xp"
-  - ".8xk"
-  - ".8xk.txt"
   - ".8xp.txt"
   language_id: 422
-  tm_scope: none
+  tm_scope: source.8xp
 TL-Verilog:
   type: programming
   extensions:
-    - ".tlv"
+  - ".tlv"
   tm_scope: source.tlverilog
   ace_mode: verilog
   color: "#C40023"
@@ -6939,6 +7092,17 @@ Terra:
   interpreters:
   - lua
   language_id: 371
+Terraform Template:
+  type: markup
+  extensions:
+  - ".tftpl"
+  color: "#7b42bb"
+  tm_scope: source.hcl.terraform
+  ace_mode: ruby
+  codemirror_mode: ruby
+  codemirror_mime_type: text/x-ruby
+  group: HCL
+  language_id: 856832701
 Texinfo:
   type: prose
   wrap: true
@@ -6992,6 +7156,14 @@ Text:
   tm_scope: none
   ace_mode: text
   language_id: 372
+TextGrid:
+  type: data
+  color: "#c8506d"
+  tm_scope: source.textgrid
+  ace_mode: text
+  extensions:
+  - ".TextGrid"
+  language_id: 965696054
 TextMate Properties:
   type: data
   color: "#df66e4"
@@ -7023,6 +7195,14 @@ Thrift:
   - ".thrift"
   ace_mode: text
   language_id: 374
+Toit:
+  type: programming
+  color: "#c2c9fb"
+  extensions:
+  - ".toit"
+  tm_scope: source.toit
+  ace_mode: text
+  language_id: 356554395
 Turing:
   type: programming
   color: "#cf142b"
@@ -7077,6 +7257,16 @@ TypeScript:
   codemirror_mode: javascript
   codemirror_mime_type: application/typescript
   language_id: 378
+Typst:
+  type: programming
+  color: "#239dad"
+  aliases:
+  - typ
+  extensions:
+  - ".typ"
+  tm_scope: source.typst
+  ace_mode: text
+  language_id: 704730682
 Unified Parallel C:
   type: programming
   color: "#4e3617"
@@ -7654,6 +7844,7 @@ XML:
   - ".mjml"
   - ".mm"
   - ".mod"
+  - ".mojo"
   - ".mxml"
   - ".natvis"
   - ".ncl"
@@ -7687,6 +7878,7 @@ XML:
   - ".tml"
   - ".ts"
   - ".tsx"
+  - ".typ"
   - ".ui"
   - ".urdf"
   - ".ux"
@@ -8045,6 +8237,13 @@ jq:
   type: programming
   extensions:
   - ".jq"
+  interpreters:
+  - gojq
+  - jaq
+  - jq
+  - jqjq
+  - jqq
+  - query-json
   tm_scope: source.jq
   language_id: 905371884
 kvlang:

package/license.md

@@ -1,6 +1,6 @@
 # ISC License
 
-Copyright © Nixinova 2021–2022
+Copyright © Nixinova 2021–2024
 
 Permission to use, copy, modify, and/or distribute this software for any
 purpose with or without fee is hereby granted, provided that the above

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "linguist-js",
-	"version": "2.7.0-pre",
+	"version": "2.7.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": {
@@ -11,10 +11,10 @@
 		"node": ">=12"
 	},
 	"scripts": {
-		"download-files": "npx tsx@3 build/download-files",
+		"download-files": "npx tsx@4 build/download-files",
 		"pre-publish": "npm run download-files && npm test && npm run perf",
 		"perf": "tsc && node test/perf",
-		"test": "tsc && node test/folder && echo --- && node test/unit"
+		"test": "tsc && node test/folder && node test/unit"
 	},
 	"files": [
 		"bin/",
@@ -38,7 +38,7 @@
 	},
 	"homepage": "https://github.com/Nixinova/Linguist#readme",
 	"dependencies": {
-		"binary-extensions": "^2.2.0",
+		"binary-extensions": "^2.2.0 <3",
 		"commander": "^9.5.0 <10",
 		"common-path-prefix": "^3.0.0",
 		"cross-fetch": "^3.1.8 <4",

package/readme.md

@@ -95,9 +95,17 @@ Running LinguistJS on this folder will return the following JSON:
 
 ```js
 const linguist = require('linguist-js');
-let folder = './src';
-let options = { keepVendored: false, quick: false };
-const { files, languages, unknown } = linguist(folder, options);
+
+// Analyse folder on disc
+const folder = './src';
+const options = { keepVendored: false, quick: false };
+const { files, languages, unknown } = await linguist(folder, options);
+
+// Analyse file content from raw input
+const fileNames = ['file1.ts', 'file2.ts', 'ignoreme.js'];
+const fileContent = ['#!/usr/bin/env node', 'console.log("Example");', '"ignored"'];
+const options = { ignoredFiles: ['ignore*'] };
+const { files, languages, unknown } = await linguist(fileNames, { fileContent, ...options });
 ```
 
 - `linguist(entry?, opts?)` (default export):
@@ -122,7 +130,7 @@ const { files, languages, unknown } = linguist(folder, options);
       Alias for `checkAttributes:false, checkIgnored:false, checkHeuristics:false, checkShebang:false, checkModeline:false`.
     - `offline` (boolean):
       Whether to use pre-packaged metadata files instead of fetching them from GitHub at runtime (defaults to `false`).
-  - `keepVendored` (boolean):
+    - `keepVendored` (boolean):
       Whether to keep vendored files (dependencies, etc) (defaults to `false`).
       Does nothing when `fileContent` is set.
     - `keepBinary` (boolean):