linguist-js 2.5.2 → 2.5.4

package/dist/helpers/convert-pcre.js

@@ -12,16 +12,25 @@ function pcre(regex) {
         replace(match, '');
         [...flags].forEach(flag => finalFlags.add(flag));
     }
-    // Remove invalid syntax
+    // Remove PCRE-only syntax
     replace(/([*+]){2}/g, '$1');
     replace(/\(\?>/g, '(?:');
     // Remove start/end-of-file markers
     if (/\\[AZ]/.test(finalRegex)) {
-        replace(/\\A/g, '^').replace(/\\Z/g, '$');
+        replace(/\\A/g, '^');
+        replace(/\\Z/g, '$');
         finalFlags.delete('m');
     }
-    else
+    else {
         finalFlags.add('m');
+    }
+    // Reformat free-spacing mode
+    if (finalFlags.has('x')) {
+        finalFlags.delete('x');
+        replace(/#.+/g, '');
+        replace(/^\s+|\s+$|\n/gm, '');
+        replace(/\s+/g, ' ');
+    }
     // Return final regex
     return RegExp(finalRegex, [...finalFlags].join(''));
 }

package/dist/index.js

@@ -123,7 +123,7 @@ async function analyse(input, opts = {}) {
                             forcedLang = overrideLang[0];
                         }
                     }
-                    const fullPath = relPath(folder) + '/' + path;
+                    const fullPath = path_1.default.join(relPath(folder), path);
                     overrides[fullPath] = forcedLang;
                 }
             }

package/dist/schema.d.ts

@@ -33,5 +33,5 @@ export interface HeuristicsSchema {
     }>;
     named_patterns: Record<string, string | string[]>;
 }
-export declare type VendorSchema = string[];
+export type VendorSchema = string[];
 export {};

package/dist/types.d.ts

@@ -1,9 +1,9 @@
-export declare type LanguageResult = string | null;
-export declare type Language = string;
-export declare type Category = 'data' | 'markup' | 'programming' | 'prose';
-export declare type FilePath = string;
-export declare type Bytes = Integer;
-export declare type Integer = number;
+export type LanguageResult = string | null;
+export type Language = string;
+export type Category = 'data' | 'markup' | 'programming' | 'prose';
+export type FilePath = string;
+export type Bytes = Integer;
+export type Integer = number;
 export interface Options {
     fileContent?: string | string[];
     ignoredFiles?: string[];

package/ext/documentation.yml

@@ -1,3 +1,5 @@
+
+
 - ^[Dd]ocs?/
 - (^|/)[Dd]ocumentation/
 - (^|/)[Gg]roovydoc/
@@ -5,7 +7,9 @@
 - ^[Mm]an/
 - ^[Ee]xamples/
 - ^[Dd]emos?/
-- (^|/)inst/doc/- (^|/)CITATION(\.cff|(S)?(\.(bib|md))?)$
+- (^|/)inst/doc/
+
+- (^|/)CITATION(\.cff|(S)?(\.(bib|md))?)$
 - (^|/)CHANGE(S|LOG)?(\.|$)
 - (^|/)CONTRIBUTING(\.|$)
 - (^|/)COPYING(\.|$)
@@ -14,4 +18,4 @@
 - (^|/)[Ll]icen[cs]e(\.|$)
 - (^|/)README(\.|$)
 - (^|/)[Rr]eadme(\.|$)
-- ^[Ss]amples?/
+- ^[Ss]amples?/

package/ext/generated.rb

@@ -7,7 +7,9 @@ module Linguist
       @name = name
       @extname = File.extname(name)
       @_data = data
-    end    attr_reader :name, :extname
+    end
+
+    attr_reader :name, :extname
     def data
       @data ||= @_data.respond_to?(:call) ? @_data.call() : @_data
     end
@@ -28,6 +30,7 @@ module Linguist
       go_vendor? ||
       go_lock? ||
       poetry_lock? ||
+      pdm_lock? ||
       esy_lock? ||
       npm_shrinkwrap_or_package_lock? ||
       terraform_lock? ||
@@ -67,7 +70,8 @@ module Linguist
       generated_visualstudio6? ||
       generated_haxe? ||
       generated_jooq? ||
-      generated_pascal_tlb?
+      generated_pascal_tlb? ||
+      generated_sorbet_rbi?
     end
     def xcode_file?
       ['.nib', '.xcworkspacedata', '.xcuserstate'].include?(extname)
@@ -96,7 +100,9 @@ module Linguist
       lines.last(2).any? { |l| l.match(/^\/[*\/][\#@] source(?:Mapping)?URL|sourceURL=/) }
     end
     def source_map?
-      return false unless extname.downcase == '.map'      name =~ /(\.css|\.js)\.map$/i ||
+      return false unless extname.downcase == '.map'
+
+      name =~ /(\.css|\.js)\.map$/i ||
       lines[0] =~ /^{"version":\d+,/ ||
       lines[0] =~ /^\/\*\* Begin line maps\. \*\*\/{/
     end
@@ -104,9 +110,15 @@ module Linguist
       return false unless extname == '.js'
       if lines[0] =~ /^\/\/ Generated by /
         return true
-      end      if lines[0] == '(function() {' &&
+      end
+
+      if lines[0] == '(function() {' &&
           lines[-2] == '}).call(this);' &&
-          lines[-1] == ''        score = 0        lines.each do |line|
+          lines[-1] == ''
+
+        score = 0
+
+        lines.each do |line|
           if line =~ /var /
             score += 1 * line.gsub(/(_fn|_i|_len|_ref|_results)/).count
             score += 3 * line.gsub(/(__bind|__extends|__hasProp|__indexOf|__slice)/).count
@@ -134,7 +146,9 @@ module Linguist
       return false unless extname == '.js'
       if lines[0..4].join('') =~ /^(?:[^\/]|\/[^\*])*\/\*(?:[^\*]|\*[^\/])*Generated by PEG.js/
         return true
-      end      false
+      end
+
+      false
     end
     def generated_postscript?
       return false unless ['.ps', '.eps', '.pfa'].include? extname
@@ -144,29 +158,45 @@ module Linguist
       return true if creator =~ /[0-9]|draw|mpage|ImageMagick|inkscape|MATLAB/ ||
         creator =~ /PCBNEW|pnmtops|\(Unknown\)|Serif Affinity|Filterimage -tops/
       !!creator.include?("EAGLE") and lines[0..4].find {|line| line =~ /^%%Title: EAGLE Drawing /}
-    end    def generated_go?
+    end
+
+    def generated_go?
       return false unless extname == '.go'
-      return false unless lines.count > 1      return lines.first(40).any? { |l| l.include? "Code generated by" }
+      return false unless lines.count > 1
+
+      return lines.first(40).any? { |l| l =~ %r{^// Code generated .*} }
     end
     def generated_protocol_buffer_from_go?
       return false unless extname == '.proto'
-      return false unless lines.count > 1      return lines.first(20).any? { |l| l.include? "This file was autogenerated by go-to-protobuf" }
-    end    PROTOBUF_EXTENSIONS = ['.py', '.java', '.h', '.cc', '.cpp', '.m', '.rb', '.php']
+      return false unless lines.count > 1
+
+      return lines.first(20).any? { |l| l.include? "This file was autogenerated by go-to-protobuf" }
+    end
+
+    PROTOBUF_EXTENSIONS = ['.py', '.java', '.h', '.cc', '.cpp', '.m', '.rb', '.php']
     def generated_protocol_buffer?
       return false unless PROTOBUF_EXTENSIONS.include?(extname)
-      return false unless lines.count > 1      return lines.first(3).any? { |l| l.include?("Generated by the protocol buffer compiler.  DO NOT EDIT!") }
+      return false unless lines.count > 1
+
+      return lines.first(3).any? { |l| l.include?("Generated by the protocol buffer compiler.  DO NOT EDIT!") }
     end
     def generated_javascript_protocol_buffer?
       return false unless extname == ".js"
-      return false unless lines.count > 6      return lines[5].include?("GENERATED CODE -- DO NOT EDIT!")
-    end    APACHE_THRIFT_EXTENSIONS = ['.rb', '.py', '.go', '.js', '.m', '.java', '.h', '.cc', '.cpp', '.php']
+      return false unless lines.count > 6
+
+      return lines[5].include?("GENERATED CODE -- DO NOT EDIT!")
+    end
+
+    APACHE_THRIFT_EXTENSIONS = ['.rb', '.py', '.go', '.js', '.m', '.java', '.h', '.cc', '.cpp', '.php']
     def generated_apache_thrift?
       return false unless APACHE_THRIFT_EXTENSIONS.include?(extname)
       return lines.first(6).any? { |l| l.include?("Autogenerated by Thrift Compiler") }
     end
     def generated_jni_header?
       return false unless extname == '.h'
-      return false unless lines.count > 2      return lines[0].include?("/* DO NOT EDIT THIS FILE - it is machine generated */") &&
+      return false unless lines.count > 2
+
+      return lines[0].include?("/* DO NOT EDIT THIS FILE - it is machine generated */") &&
                lines[1].include?("#include <jni.h>")
     end
     def node_modules?
@@ -181,6 +211,9 @@ module Linguist
     def poetry_lock?
       !!name.match(/poetry\.lock/)
     end
+    def pdm_lock?
+      !!name.match(/pdm\.lock/)
+    end
     def esy_lock?
       !!name.match(/(^|\/)(\w+\.)?esy.lock$/)
     end
@@ -251,7 +284,9 @@ module Linguist
     end
     def generated_roxygen2?
       return false unless extname == '.Rd'
-      return false unless lines.count > 1      return lines[0].include?("% Generated by roxygen2: do not edit by hand")
+      return false unless lines.count > 1
+
+      return lines[0].include?("% Generated by roxygen2: do not edit by hand")
     end
     def generated_jison?
       return false unless extname == '.js'
@@ -292,7 +327,9 @@ module Linguist
     def generated_visualstudio6?
       return false unless extname.downcase == '.dsp'
       lines.first(3).any? { |l| l.include? '# Microsoft Developer Studio Generated Build File' }
-    end    HAXE_EXTENSIONS = ['.js', '.py', '.lua', '.cpp', '.h', '.java', '.cs', '.php']
+    end
+
+    HAXE_EXTENSIONS = ['.js', '.py', '.lua', '.cpp', '.h', '.java', '.cs', '.php']
     def generated_haxe?
       return false unless HAXE_EXTENSIONS.include?(extname)
       return lines.first(3).any? { |l| l.include?("Generated by Haxe") }
@@ -332,6 +369,13 @@ module Linguist
     def generated_pascal_tlb?
       !!name.match(/_tlb\.pas$/i)
     end
+    def generated_sorbet_rbi?
+      return false unless extname.downcase == '.rbi'
+      return false unless lines.count >= 5
+      lines[0].match?(/^# typed:/) &&
+      lines[2].include?("DO NOT EDIT MANUALLY") &&
+      lines[4].match?(/^# Please.*run.*`.*tapioca/)
+    end
     def extract_html_meta(match)
       (match.last.sub(/\/\Z/, "").strip.scan(/
         (?<=^|\s)
@@ -348,4 +392,4 @@ module Linguist
       end.select { |x| x.length == 2 }.to_h
     end
   end
-end
+end

package/ext/heuristics.yml

@@ -67,6 +67,16 @@ disambiguations:
     pattern: '^\s*(# |include|require)\b'
   - language: Clojure
     pattern: '\((def|defn|defmacro|let)\s'
+- extensions: ['.bf']
+  rules:
+  - language: Beef
+    pattern: '(?-m)^\s*using\s+(System|Beefy)(\.(.*))?;\s*$'
+  - language: HyPhy
+    pattern:
+    - '(?-m)^\s*#include\s+".*";\s*$'
+    - '\sfprintf\s*\('
+  - language: Brainfuck
+    pattern: '(>\+>|>\+<)'
 - extensions: ['.bi']
   rules:
   - language: FreeBasic
@@ -99,6 +109,12 @@ disambiguations:
     pattern: '\/\* |\/\/ |^\}'
 - extensions: ['.cls']
   rules:
+  - language: Visual Basic 6.0
+    and:
+    - named_pattern: vb-class
+    - pattern: '^\s*BEGIN\R\s*MultiUse\s*=.*\R\s*Persistable\s*='
+  - language: VBA
+    named_pattern: vb-class  
   - language: TeX
     pattern: '^\s*\\(?:NeedsTeXFormat|ProvidesClass){'
   - language: ObjectScript
@@ -112,7 +128,7 @@ disambiguations:
   - language: Smalltalk
     pattern: '![\w\s]+methodsFor: '
   - language: 'C#'
-    pattern: '^(\s*namespace\s*[\w\.]+\s*({|;)|\s*\/\/)'
+    pattern: '^\s*(using\s+[A-Z][\s\w.]+;|namespace\s*[\w\.]+\s*({|;)|\/\/)'
 - extensions: ['.csc']
   rules:
   - language: GSC
@@ -193,6 +209,16 @@ disambiguations:
   - language: Frege
     pattern: '^\s*(import|module|package|data|type) '
   - language: Text
+- extensions: ['.frm']
+  rules:
+  - language: VBA
+    and:
+    - named_pattern: vb-form
+    - pattern: '^\s*Begin\s+{[0-9A-Z\-]*}\s?'
+  - language: Visual Basic 6.0
+    and:
+    - named_pattern: vb-form
+    - pattern: '^\s*Begin\s+VB\.Form\s+'  
 - extensions: ['.fs']
   rules:
   - language: Forth
@@ -209,6 +235,12 @@ disambiguations:
     pattern: '^(?:<|[a-zA-Z-][a-zA-Z0-9_-]+[ \t]+\w)|\${\w+[^\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']
+  rules:
+  - language: GAP
+    pattern: '\s*(Declare|BindGlobal|KeyDependentOperation|Install(Method|GlobalFunction)|SetPackageInfo)'
+  - language: G-code
+    pattern: '^[MG][0-9]+\n'
 - extensions: ['.gd']
   rules:
   - language: GAP
@@ -251,6 +283,11 @@ disambiguations:
   rules:
   - language: Hack
     pattern: '<\?hh'
+- extensions: ['.html']
+  rules:
+  - language: Ecmarkup
+    pattern: '<emu-(?:alg|annex|biblio|clause|eqn|example|figure|gann|gmod|gprose|grammar|intro|not-ref|note|nt|prodref|production|rhs|table|t|xref)(?:$|\s|>)'
+  - language: HTML
 - extensions: ['.i']
   rules:
   - language: Motorola 68K Assembly
@@ -286,6 +323,13 @@ disambiguations:
     pattern:
     - '(?i:^\s*{\$(?:mode|ifdef|undef|define)[ ]+[a-z0-9_]+})'
     - '^\s*end[.;]\s*$'
+- extensions: ['.json']
+  rules:
+  - language: OASv2-json
+    pattern: '"swagger":\s?"2.[0-9.]+"'
+  - language: OASv3-json
+    pattern: '"openapi":\s?"3.[0-9.]+"'
+  - language: JSON
 - extensions: ['.l']
   rules:
   - language: Common Lisp
@@ -424,7 +468,7 @@ disambiguations:
 - extensions: ['.plist']
   rules:
   - language: XML Property List
-    pattern: '<!DOCTYPE\s+plist'
+    pattern: '^\s*(?:<\?xml\s|<!DOCTYPE\s+plist|<plist(?:\s+version\s*=\s*(["''])\d+(?:\.\d+)?\1)?\s*>\s*$)'
   - language: OpenStep Property List
 - extensions: ['.pm']
   rules:
@@ -458,7 +502,7 @@ disambiguations:
     - pattern: HEADERS
     - pattern: SOURCES
   - language: IDL
-    pattern: '^\s*function[ \w,]+$'
+    pattern: '^\s*(?i:function|pro|compile_opt) \w[ \w,:]*$'
 - extensions: ['.properties']
   rules:
   - language: INI
@@ -537,6 +581,12 @@ disambiguations:
     pattern: '(?i:\^(this|super)\.|^\s*~\w+\s*=\.)'
   - language: Scala
     pattern: '(^\s*import (scala|java)\.|^\s*class\b)'
+- extensions: ['.scd']
+  rules:
+  - language: SuperCollider
+    pattern: '(?i:\^(this|super)\.|^\s*(~\w+\s*=\.|SynthDef\b))'
+  - language: Markdown
+    pattern: '^#+\s+(NAME|SYNOPSIS|DESCRIPTION)'
 - extensions: ['.sol']
   rules:
   - language: Solidity
@@ -581,6 +631,10 @@ disambiguations:
     pattern: '^\s*(?:use\s+v6\b|\bmodule\b|\bmy\s+class\b)'
   - language: Turing
     pattern: '^\s*%[ \t]+|^\s*var\s+\w+(\s*:\s*\w+)?\s*:=\s*\w+'
+- extensions: ['.tag']
+  rules:
+  - language: Java Server Pages
+    pattern: '<%[@!=\s]?\s*(taglib|tag|include|attribute|variable)\s'
 - extensions: ['.toc']
   rules:
   - language: World of Warcraft Addon Data
@@ -607,6 +661,27 @@ disambiguations:
   rules:
   - language: Vim Help File
     pattern: '(?:(?:^|[ \t])(?:vi|Vi(?=m))(?:m[<=>]?[0-9]+|m)?|[ \t]ex)(?=:(?=[ \t]*set?[ \t][^\r\n:]+:)|:(?![ \t]*set?[ \t]))(?:(?:[ \t]*:[ \t]*|[ \t])\w*(?:[ \t]*=(?:[^\\\s]|\\.)*)?)*[ \t:](?:filetype|ft|syntax)[ \t]*=(help)(?=$|\s|:)'
+  - language: Adblock Filter List
+    pattern: |-
+      (?x)\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: ['.url']
   rules:
@@ -641,11 +716,15 @@ disambiguations:
     pattern: '^%(end|ctor|hook|group)\b'
   - language: Linker Script
     pattern: 'OUTPUT_ARCH\(|OUTPUT_FORMAT\(|SECTIONS'
-- extensions: ['.yaml']
+- extensions: ['.yaml', '.yml']
   rules:
   - language: MiniYAML
     pattern: '^\t+.*?[^\s:].*?:'
     negative_pattern: '---'
+  - language: OASv2-yaml
+    pattern: 'swagger:\s?''?"?2.[0-9.]+''?"?'
+  - language: OASv3-yaml
+    pattern: 'openapi:\s?''?"?3.[0-9.]+''?"?'
   - language: YAML
 - extensions: ['.yy']
   rules:
@@ -688,3 +767,5 @@ named_patterns:
   objectivec: '^\s*(@(interface|class|protocol|property|end|synchronised|selector|implementation)\b|#import\s+.+\.h[">])'
   perl5: '\buse\s+(?:strict\b|v?5\.)'
   perl6: '^\s*(?:use\s+v6\b|\bmodule\b|\b(?:my\s+)?class\b)'
+  vb-class: '^\s*VERSION\s+[0-9]\.[0-9]\s+CLASS'
+  vb-form: '^\s*VERSION\s+[0-9]\.[0-9]{2}'

package/ext/languages.yml

@@ -192,6 +192,19 @@ Ada:
   tm_scope: source.ada
   ace_mode: ada
   language_id: 11
+Adblock Filter List:
+  type: data
+  color: "#800000"
+  ace_mode: text
+  extensions:
+  - ".txt"
+  aliases:
+  - ad block filters
+  - ad block
+  - adb
+  - adblock
+  tm_scope: text.adblock
+  language_id: 884614762
 Adobe Font Metrics:
   type: data
   color: "#fa0f00"
@@ -366,6 +379,7 @@ Assembly:
   - ".a51"
   - ".i"
   - ".inc"
+  - ".nas"
   - ".nasm"
   tm_scope: source.assembly
   ace_mode: assembly_x86
@@ -492,6 +506,7 @@ Befunge:
   type: programming
   extensions:
   - ".befunge"
+  - ".bf"
   tm_scope: source.befunge
   ace_mode: text
   language_id: 30
@@ -1294,6 +1309,15 @@ Cycript:
   codemirror_mode: javascript
   codemirror_mime_type: text/javascript
   language_id: 78
+Cypher:
+  type: programming
+  color: "#34c0eb"
+  extensions:
+  - ".cyp"
+  - ".cypher"
+  tm_scope: source.cypher
+  ace_mode: text
+  language_id: 850806976
 Cython:
   type: programming
   color: "#fedf5b"
@@ -1610,10 +1634,25 @@ Ecere Projects:
   codemirror_mode: javascript
   codemirror_mime_type: application/json
   language_id: 98
+Ecmarkup:
+  type: markup
+  color: "#eb8131"
+  group: HTML
+  extensions:
+  - ".html"
+  tm_scope: text.html.ecmarkup
+  ace_mode: html
+  codemirror_mode: htmlmixed
+  codemirror_mime_type: text/html
+  aliases:
+  - ecmarkdown
+  language_id: 844766630
 EditorConfig:
   type: data
   color: "#fff1f2"
   group: INI
+  extensions:
+  - ".editorconfig"
   filenames:
   - ".editorconfig"
   aliases:
@@ -1665,6 +1704,16 @@ Elm:
   codemirror_mode: elm
   codemirror_mime_type: text/x-elm
   language_id: 101
+Elvish:
+  type: programming
+  ace_mode: text
+  extensions:
+  - ".elv"
+  interpreters:
+  - elvish
+  tm_scope: source.elvish
+  color: "#55BB55"
+  language_id: 570996448
 Emacs Lisp:
   type: programming
   tm_scope: source.emacs.lisp
@@ -2095,6 +2144,17 @@ Gemfile.lock:
   filenames:
   - Gemfile.lock
   language_id: 907065713
+Gemini:
+  type: prose
+  color: "#ff6900"
+  ace_mode: text
+  extensions:
+  - ".gmi"
+  aliases:
+  - gemtext
+  wrap: true
+  tm_scope: source.gemini
+  language_id: 310828396
 Genero:
   type: programming
   color: "#63408e"
@@ -2459,6 +2519,14 @@ HLSL:
   ace_mode: text
   tm_scope: source.hlsl
   language_id: 145
+HOCON:
+  type: data
+  color: "#9ff8ee"
+  extensions:
+  - ".hocon"
+  tm_scope: source.hocon
+  ace_mode: text
+  language_id: 679725279
 HTML:
   type: markup
   tm_scope: text.html.basic
@@ -2789,6 +2857,14 @@ ImageJ Macro:
   ace_mode: text
   tm_scope: none
   language_id: 575143428
+Imba:
+  type: programming
+  color: "#16cec6"
+  extensions:
+  - ".imba"
+  ace_mode: text
+  tm_scope: source.imba
+  language_id: 1057618448
 Inform 7:
   type: programming
   wrap: true
@@ -2801,6 +2877,14 @@ Inform 7:
   - inform7
   ace_mode: text
   language_id: 166
+Ink:
+  type: programming
+  wrap: true
+  extensions:
+  - ".ink"
+  tm_scope: source.ink
+  ace_mode: text
+  language_id: 838252715
 Inno Setup:
   type: programming
   color: "#264b99"
@@ -2906,6 +2990,7 @@ JSON:
   - ".yy"
   - ".yyp"
   filenames:
+  - ".all-contributorsrc"
   - ".arcconfig"
   - ".auto-changelog"
   - ".c8rc"
@@ -3019,6 +3104,7 @@ Java:
   extensions:
   - ".java"
   - ".jav"
+  - ".jsh"
   language_id: 181
 Java Properties:
   type: data
@@ -3038,6 +3124,7 @@ Java Server Pages:
   - jsp
   extensions:
   - ".jsp"
+  - ".tag"
   tm_scope: text.html.jsp
   ace_mode: jsp
   codemirror_mode: htmlembedded
@@ -3302,6 +3389,7 @@ Kusto:
   type: data
   extensions:
   - ".csl"
+  - ".kql"
   tm_scope: source.kusto
   ace_mode: text
   language_id: 225697190
@@ -3859,6 +3947,17 @@ Mercury:
   - ".moo"
   tm_scope: source.mercury
   language_id: 229
+Mermaid:
+  type: markup
+  color: "#ff3670"
+  aliases:
+  - mermaid example
+  extensions:
+  - ".mmd"
+  - ".mermaid"
+  tm_scope: source.mermaid
+  ace_mode: text
+  language_id: 385992043
 Meson:
   type: programming
   color: "#007800"
@@ -3905,6 +4004,7 @@ MiniYAML:
   tm_scope: source.miniyaml
   extensions:
   - ".yaml"
+  - ".yml"
   ace_mode: yaml
   codemirror_mode: yaml
   codemirror_mime_type: text/x-yaml
@@ -4027,6 +4127,14 @@ Motorola 68K Assembly:
   tm_scope: source.m68k
   ace_mode: assembly_x86
   language_id: 477582706
+Move:
+  type: programming
+  color: "#4a137a"
+  extensions:
+  - ".move"
+  tm_scope: source.move
+  ace_mode: text
+  language_id: 638334599
 Muse:
   type: prose
   extensions:
@@ -4119,6 +4227,14 @@ NWScript:
   codemirror_mode: clike
   codemirror_mime_type: text/x-csrc
   language_id: 731233819
+Nasal:
+  type: programming
+  color: "#1d2c4e"
+  extensions:
+  - ".nas"
+  tm_scope: none
+  ace_mode: text
+  language_id: 178322513
 Nearley:
   type: programming
   ace_mode: text
@@ -4284,6 +4400,52 @@ Nunjucks:
   tm_scope: text.html.nunjucks
   ace_mode: nunjucks
   language_id: 461856962
+OASv2-json:
+  type: data
+  color: "#85ea2d"
+  extensions:
+  - ".json"
+  group: OpenAPI Specification v2
+  tm_scope: source.json
+  ace_mode: json
+  codemirror_mode: javascript
+  codemirror_mime_type: application/json
+  language_id: 834374816
+OASv2-yaml:
+  type: data
+  color: "#85ea2d"
+  extensions:
+  - ".yaml"
+  - ".yml"
+  group: OpenAPI Specification v2
+  tm_scope: source.yaml
+  ace_mode: yaml
+  codemirror_mode: yaml
+  codemirror_mime_type: text/x-yaml
+  language_id: 105187618
+OASv3-json:
+  type: data
+  color: "#85ea2d"
+  extensions:
+  - ".json"
+  group: OpenAPI Specification v3
+  tm_scope: source.json
+  ace_mode: json
+  codemirror_mode: javascript
+  codemirror_mime_type: application/json
+  language_id: 980062566
+OASv3-yaml:
+  type: data
+  color: "#85ea2d"
+  extensions:
+  - ".yaml"
+  - ".yml"
+  group: OpenAPI Specification v3
+  tm_scope: source.yaml
+  ace_mode: yaml
+  codemirror_mode: yaml
+  codemirror_mime_type: text/x-yaml
+  language_id: 51239111
 OCaml:
   type: programming
   ace_mode: ocaml
@@ -4410,6 +4572,22 @@ Open Policy Agent:
   - ".rego"
   language_id: 840483232
   tm_scope: source.rego
+OpenAPI Specification v2:
+  aliases:
+  - oasv2
+  type: data
+  color: "#85ea2d"
+  tm_scope: none
+  ace_mode: text
+  language_id: 848295328
+OpenAPI Specification v3:
+  aliases:
+  - oasv3
+  type: data
+  color: "#85ea2d"
+  tm_scope: none
+  ace_mode: text
+  language_id: 557959099
 OpenCL:
   type: programming
   color: "#ed2e2d"
@@ -4481,6 +4659,21 @@ OpenType Feature File:
   tm_scope: source.opentype
   ace_mode: text
   language_id: 374317347
+Option List:
+  type: data
+  color: "#476732"
+  aliases:
+  - opts
+  - ackrc
+  filenames:
+  - ".ackrc"
+  - ackrc
+  - mocha.opts
+  tm_scope: source.opts
+  ace_mode: sh
+  codemirror_mode: shell
+  codemirror_mime_type: text/x-sh
+  language_id: 723589315
 Org:
   type: prose
   color: "#77aa99"
@@ -4525,6 +4718,14 @@ P4:
   tm_scope: source.p4
   ace_mode: text
   language_id: 348895984
+PDDL:
+  type: programming
+  color: "#0d00ff"
+  extensions:
+  - ".pddl"
+  tm_scope: source.pddl
+  ace_mode: text
+  language_id: 736235603
 PEG.js:
   type: programming
   color: "#234d6b"
@@ -4717,10 +4918,12 @@ Perl:
   - ".psgi"
   - ".t"
   filenames:
+  - ".latexmkrc"
   - Makefile.PL
   - Rexfile
   - ack
   - cpanfile
+  - latexmkrc
   interpreters:
   - cperl
   - perl
@@ -4815,6 +5018,14 @@ PogoScript:
   tm_scope: source.pogoscript
   ace_mode: text
   language_id: 289
+Polar:
+  type: programming
+  color: "#ae81ff"
+  extensions:
+  - ".polar"
+  tm_scope: source.polar
+  ace_mode: text
+  language_id: 839112914
 Pony:
   type: programming
   extensions:
@@ -5578,6 +5789,16 @@ Rouge:
   - ".rg"
   tm_scope: source.clojure
   language_id: 325
+RouterOS Script:
+  type: programming
+  ace_mode: text
+  extensions:
+  - ".rsc"
+  interpreters:
+  - RouterOS
+  color: "#DE3941"
+  tm_scope: none
+  language_id: 592853203
 Ruby:
   type: programming
   tm_scope: source.ruby
@@ -5886,6 +6107,16 @@ Scaml:
   tm_scope: source.scaml
   ace_mode: text
   language_id: 342
+Scenic:
+  type: programming
+  color: "#fdc700"
+  extensions:
+  - ".scenic"
+  tm_scope: source.scenic
+  ace_mode: text
+  interpreters:
+  - scenic
+  language_id: 619814037
 Scheme:
   type: programming
   color: "#1e4aec"
@@ -6048,6 +6279,19 @@ Sieve:
   codemirror_mode: sieve
   codemirror_mime_type: application/sieve
   language_id: 208976687
+Simple File Verification:
+  type: data
+  group: Checksums
+  color: "#C9BFED"
+  extensions:
+  - ".sfv"
+  aliases:
+  - sfv
+  tm_scope: source.sfv
+  ace_mode: ini
+  codemirror_mode: properties
+  codemirror_mime_type: text/x-properties
+  language_id: 735623761
 Singularity:
   type: programming
   color: "#64E6AD"
@@ -6122,6 +6366,16 @@ Smarty:
   codemirror_mime_type: text/x-smarty
   tm_scope: text.html.smarty
   language_id: 353
+Smithy:
+  type: programming
+  ace_mode: text
+  codemirror_mode: clike
+  codemirror_mime_type: text/x-csrc
+  tm_scope: source.smithy
+  color: "#c44536"
+  extensions:
+  - ".smithy"
+  language_id: 1027892786
 Solidity:
   type: programming
   color: "#AA6746"
@@ -6204,6 +6458,7 @@ Starlark:
   - BUILD.bazel
   - Tiltfile
   - WORKSPACE
+  - WORKSPACE.bazel
   aliases:
   - bazel
   - bzl
@@ -6252,7 +6507,6 @@ SugarSS:
   type: markup
   color: "#2fcc9f"
   tm_scope: source.css.postcss.sugarss
-  group: CSS
   extensions:
   - ".sss"
   ace_mode: text
@@ -6329,6 +6583,7 @@ TOML:
   - Cargo.lock
   - Gopkg.lock
   - Pipfile
+  - pdm.lock
   - poetry.lock
   tm_scope: source.toml
   ace_mode: toml
@@ -6384,8 +6639,13 @@ Tcl:
   extensions:
   - ".tcl"
   - ".adp"
+  - ".sdc"
   - ".tcl.in"
   - ".tm"
+  - ".xdc"
+  aliases:
+  - sdc
+  - xdc
   filenames:
   - owh
   - starfield
@@ -6685,12 +6945,9 @@ VBA:
   - ".bas"
   - ".cls"
   - ".frm"
-  - ".frx"
   - ".vba"
   tm_scope: source.vbnet
   aliases:
-  - vb6
-  - visual basic 6
   - visual basic for applications
   ace_mode: text
   codemirror_mode: vb
@@ -6751,6 +7008,19 @@ Valve Data Format:
   ace_mode: text
   tm_scope: source.keyvalues
   language_id: 544060961
+Velocity Template Language:
+  type: markup
+  color: "#507cff"
+  aliases:
+  - vtl
+  - velocity
+  extensions:
+  - ".vtl"
+  ace_mode: velocity
+  tm_scope: source.velocity
+  codemirror_mode: velocity
+  codemirror_mime_type: text/velocity
+  language_id: 292377326
 Verilog:
   type: programming
   color: "#b2b7f8"
@@ -6828,6 +7098,25 @@ Visual Basic .NET:
   codemirror_mode: vb
   codemirror_mime_type: text/x-vb
   language_id: 389
+Visual Basic 6.0:
+  type: programming
+  color: "#2c6353"
+  extensions:
+  - ".cls"
+  - ".ctl"
+  - ".Dsr"
+  - ".frm"
+  tm_scope: source.vbnet
+  aliases:
+  - vb6
+  - vb 6
+  - visual basic 6
+  - visual basic classic
+  - classic visual basic
+  ace_mode: text
+  codemirror_mode: vb
+  codemirror_mime_type: text/x-vb
+  language_id: 679594952
 Volt:
   type: programming
   color: "#1F1F1F"
@@ -6984,6 +7273,16 @@ World of Warcraft Addon Data:
   tm_scope: source.toc
   ace_mode: text
   language_id: 396
+Wren:
+  type: programming
+  color: "#383838"
+  aliases:
+  - wrenlang
+  extensions:
+  - ".wren"
+  tm_scope: source.wren
+  ace_mode: text
+  language_id: 713580619
 X BitMap:
   type: data
   group: C
@@ -7116,6 +7415,7 @@ XML:
   - ".ps1xml"
   - ".psc1"
   - ".pt"
+  - ".qhelp"
   - ".rdf"
   - ".res"
   - ".resx"
@@ -7492,6 +7792,16 @@ jq:
   - ".jq"
   tm_scope: source.jq
   language_id: 905371884
+just:
+  type: programming
+  aliases:
+  - Justfile
+  color: "#384d54"
+  tm_scope: source.just
+  filenames:
+  - Justfile
+  ace_mode: text
+  language_id: 128447695
 kvlang:
   type: markup
   ace_mode: text
@@ -7630,4 +7940,4 @@ xBase:
   - ".prw"
   tm_scope: source.harbour
   ace_mode: text
-  language_id: 421
+  language_id: 421

package/ext/vendor.yml

@@ -29,7 +29,7 @@
 - (^|/)\.indent\.pro
 - (\.|-)min\.(js|css)$
 - ([^\s]*)import\.(css|less|scss|styl)$
-- (^|/)bootstrap([^/.]*)\.(js|css|less|scss|styl)$
+- (^|/)bootstrap([^/.]*)(?=\.).*\.(js|css|less|scss|styl)$
 - (^|/)custom\.bootstrap([^\s]*)(js|css|less|scss|styl)$
 - (^|/)font-?awesome\.(css|less|scss|styl)$
 - (^|/)font-?awesome/.*\.(css|less|scss|styl)$
@@ -103,7 +103,9 @@
 - (^|/)env/
 - (^|/)fabfile\.py$
 - (^|/)waf$
-- (^|/)\.osx$- \.xctemplate/
+- (^|/)\.osx$
+
+- \.xctemplate/
 - \.imageset/
 - (^|/)Carthage/
 - (^|/)Sparkle/
@@ -151,7 +153,6 @@
 - (^|/)foundation(\..*)?\.js$
 - (^|/)Vagrantfile$
 - (^|/)\.[Dd][Ss]_[Ss]tore$
-- (^|/)vignettes/
 - (^|/)inst/extdata/
 - (^|/)octicons\.css
 - (^|/)sprockets-octicons\.scss
@@ -163,4 +164,4 @@
 - (^|/)\.google_apis/
 - (^|/)Jenkinsfile$
 - (^|/)\.gitpod\.Dockerfile$
-- (^|/)\.github/
+- (^|/)\.github/

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "linguist-js",
-	"version": "2.5.2",
+	"version": "2.5.4",
 	"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,8 +12,8 @@
 	},
 	"scripts": {
 		"download-files": "npx tsx@2 build/download-files",
-		"prepare": "npm run download-files && npm test && npm run perf",
-		"perf": "tsc && node test/perf",
+		"pre-publish": "npm run download-files && npm test && npm run test:perf",
+		"test:perf": "tsc && node test/perf",
 		"test": "tsc && node test/folder && echo --- && node test/unit"
 	},
 	"files": [
@@ -40,18 +40,18 @@
 	"homepage": "https://github.com/Nixinova/Linguist#readme",
 	"dependencies": {
 		"binary-extensions": "^2.2.0",
-		"commander": "^9.3.0",
+		"commander": "^9.5.0",
 		"common-path-prefix": "^3.0.0",
 		"cross-fetch": "^3.1.5",
-		"ignore": "^5.2.0",
-		"isbinaryfile": "^4.0.8",
+		"ignore": "^5.2.4",
+		"isbinaryfile": "^4.0.8 <5",
 		"js-yaml": "^4.1.0",
 		"node-cache": "^5.1.2"
 	},
 	"devDependencies": {
 		"@types/js-yaml": "^4.0.5",
-		"@types/node": "ts4.7",
-		"deep-object-diff": "^1.1.7",
-		"typescript": "~4.7.4"
+		"@types/node": "ts4.9",
+		"deep-object-diff": "^1.1.9",
+		"typescript": "~4.9.4"
 	}
 }