linguist-js 2.3.0 → 2.3.1

package/dist/helpers/convert-pcre.js

@@ -3,23 +3,26 @@ Object.defineProperty(exports, "__esModule", { value: true });
 /** Convert a PCRE regex into JS. */
 function pcre(regex) {
     let finalRegex = regex;
+    const replace = (search, replace) => finalRegex = finalRegex.replace(search, replace);
     const finalFlags = new Set();
     // Convert inline flag declarations
     const inlineMatches = regex.matchAll(/\?([a-z]):/g);
     const startMatches = regex.matchAll(/\(\?([a-z]+)\)/g);
     for (const [match, flags] of [...inlineMatches, ...startMatches]) {
-        finalRegex = finalRegex.replace(match, '');
+        replace(match, '');
         [...flags].forEach(flag => finalFlags.add(flag));
     }
-    // Remove invalid modifiers
-    finalRegex = finalRegex.replace(/([*+]){2}/g, '$1');
+    // Remove invalid syntax
+    replace(/([*+]){2}/g, '$1');
+    replace(/\(\?>/g, '(?:');
     // Remove start/end-of-file markers
     if (/\\[AZ]/.test(finalRegex)) {
-        finalRegex = finalRegex.replace(/\\A/g, '^').replace(/\\Z/g, '$');
+        replace(/\\A/g, '^').replace(/\\Z/g, '$');
         finalFlags.delete('m');
     }
     else
         finalFlags.add('m');
+    // Return final regex
     return RegExp(finalRegex, [...finalFlags].join(''));
 }
 exports.default = pcre;

package/dist/index.js

@@ -14,8 +14,9 @@ const read_file_1 = __importDefault(require("./helpers/read-file"));
 const convert_pcre_1 = __importDefault(require("./helpers/convert-pcre"));
 const convert_glob_1 = __importDefault(require("./helpers/convert-glob"));
 async function analyse(input, opts = {}) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
-    var _r, _s, _t;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
+    var _s, _t, _u;
+    const useRawContent = opts.fileContent !== undefined;
     const langData = await (0, load_data_1.default)('languages.yml').then(js_yaml_1.default.load);
     const vendorData = await (0, load_data_1.default)('vendor.yml').then(js_yaml_1.default.load);
     const heuristicsData = await (0, load_data_1.default)('heuristics.yml').then(js_yaml_1.default.load);
@@ -59,7 +60,7 @@ async function analyse(input, opts = {}) {
     const customIgnored = [];
     const customBinary = [];
     const customText = [];
-    if (!opts.fileContent && !opts.quick) {
+    if (!useRawContent && !opts.quick) {
         for (const folder of folders) {
             // Skip if folder is marked in gitattributes
             if (customIgnored.some(path => (0, convert_glob_1.default)(path).test(folder)))
@@ -106,7 +107,7 @@ async function analyse(input, opts = {}) {
         }
     }
     // Check vendored files
-    if (!opts.fileContent && !opts.keepVendored) {
+    if (!useRawContent && !opts.keepVendored) {
         // Filter out any files that match a vendor file path
         const matcher = (match) => RegExp(match.replace(/\/$/, '/.+$').replace(/^\.\//, ''));
         files = files.filter(file => !customIgnored.some(pattern => matcher(pattern).test(file)));
@@ -119,7 +120,7 @@ async function analyse(input, opts = {}) {
         }
         const parent = !opts.childLanguages && result && langData[result].group || false;
         fileAssociations[file].push(parent || result);
-        extensions[file] = path_1.default.extname(file);
+        extensions[file] = path_1.default.extname(file).toLowerCase();
     };
     const overridesArray = Object.entries(overrides);
     // List all languages that could be associated with a given file
@@ -147,7 +148,7 @@ async function analyse(input, opts = {}) {
             }
         }
         // Check override for manual language classification
-        if (!opts.fileContent && !opts.quick && opts.checkAttributes) {
+        if (!useRawContent && !opts.quick && opts.checkAttributes) {
             const match = overridesArray.find(item => RegExp(item[0]).test(file));
             if (match) {
                 const forcedLang = match[1];
@@ -179,7 +180,7 @@ async function analyse(input, opts = {}) {
     // Narrow down file associations to the best fit
     for (const file in fileAssociations) {
         // Skip binary files
-        if (!opts.fileContent && !opts.keepBinary) {
+        if (!useRawContent && !opts.keepBinary) {
             const isCustomText = customText.some(path => RegExp(path).test(file));
             const isCustomBinary = customBinary.some(path => RegExp(path).test(file));
             const isBinaryExt = binary_extensions_1.default.some(ext => file.endsWith('.' + ext));
@@ -201,8 +202,9 @@ async function analyse(input, opts = {}) {
                         heuristic.language = heuristic.language[0];
                     }
                     // Make sure the results includes this language
+                    const languageGroup = (_j = langData[heuristic.language]) === null || _j === void 0 ? void 0 : _j.group;
                     const matchesLang = fileAssociations[file].includes(heuristic.language);
-                    const matchesParent = langData[heuristic.language].group && fileAssociations[file].includes(langData[heuristic.language].group);
+                    const matchesParent = languageGroup && fileAssociations[file].includes(languageGroup);
                     if (!matchesLang && !matchesParent)
                         continue;
                     // Normalise heuristic data
@@ -223,10 +225,10 @@ async function analyse(input, opts = {}) {
                 }
             }
         // If no heuristics, assign a language
-        (_j = (_r = results.files.results)[file]) !== null && _j !== void 0 ? _j : (_r[file] = fileAssociations[file][0]);
+        (_k = (_s = results.files.results)[file]) !== null && _k !== void 0 ? _k : (_s[file] = fileAssociations[file][0]);
     }
     // Skip specified categories
-    if ((_k = opts.categories) === null || _k === void 0 ? void 0 : _k.length) {
+    if ((_l = opts.categories) === null || _l === void 0 ? void 0 : _l.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)) {
@@ -244,7 +246,7 @@ async function analyse(input, opts = {}) {
         }
     }
     // Convert paths to relative
-    if (!opts.fileContent && opts.relativePaths) {
+    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, '/');
@@ -258,21 +260,21 @@ async function analyse(input, opts = {}) {
     for (const [file, lang] of Object.entries(results.files.results)) {
         if (lang && !langData[lang])
             continue;
-        const fileSize = (_o = (_m = (_l = opts.fileContent) === null || _l === void 0 ? void 0 : _l[files.indexOf(file)]) === null || _m === void 0 ? void 0 : _m.length) !== null && _o !== void 0 ? _o : fs_1.default.statSync(file).size;
+        const fileSize = (_p = (_o = (_m = opts.fileContent) === null || _m === void 0 ? void 0 : _m[files.indexOf(file)]) === null || _o === void 0 ? void 0 : _o.length) !== null && _p !== void 0 ? _p : 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;
-            (_p = (_s = results.unknown[unknownType])[name]) !== null && _p !== void 0 ? _p : (_s[name] = 0);
+            (_q = (_t = results.unknown[unknownType])[name]) !== null && _q !== void 0 ? _q : (_t[name] = 0);
             results.unknown[unknownType][name] += fileSize;
             results.unknown.bytes += fileSize;
             continue;
         }
         // Add language and bytes data to corresponding section
         const { type } = langData[lang];
-        (_q = (_t = results.languages.results)[lang]) !== null && _q !== void 0 ? _q : (_t[lang] = { type, bytes: 0, color: langData[lang].color });
+        (_r = (_u = results.languages.results)[lang]) !== null && _r !== void 0 ? _r : (_u[lang] = { type, bytes: 0, color: langData[lang].color });
         if (opts.childLanguages)
             results.languages.results[lang].parent = langData[lang].group;
         results.languages.results[lang].bytes += fileSize;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "linguist-js",
-	"version": "2.3.0",
+	"version": "2.3.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": {