linguist-js 3.0.0 → 3.0.1

package/dist/program/data/loadDataFiles.js

@@ -1,3 +1,4 @@
+import YAML from 'js-yaml';
 import Cache from 'node-cache';
 import FS from 'node:fs';
 import Path from 'node:path';
@@ -14,8 +15,15 @@ async function loadWebFile(file) {
     // Load file content, falling back to the local file if the request fails
     const fileContent = await fetch(dataUrl(file))
         .then((data) => data.text())
-        .catch(async () => await loadLocalFile(file));
+        .catch(async (x) => void x);
+    if (!fileContent) {
+        return await loadLocalFile(file);
+    }
     cache.set(file, fileContent);
+    // Clean up lengthy files
+    if (file === 'generated.rb') {
+        return YAML.dump(parseGeneratedDataFile(fileContent));
+    }
     return fileContent;
 }
 async function loadLocalFile(file) {

package/dist/program/data/retrieveData.d.ts

@@ -1,10 +1,7 @@
-import { HeuristicsSchema, LanguagesScema, VendorSchema } from '../../types/schema.js';
+import { HeuristicsSchema, LanguagesScema } from '../../types/schema.js';
 type LoadedData = {
     langData: LanguagesScema;
-    vendorData: VendorSchema;
-    docData: VendorSchema;
     heuristicsData: HeuristicsSchema;
-    generatedData: string[];
     vendorPaths: string[];
 };
 /** Load data from github-linguist web repo or cached local file. */

package/dist/program/data/retrieveData.js

@@ -1,22 +1,19 @@
 import YAML from 'js-yaml';
-import { loadFile, parseGeneratedDataFile } from './loadDataFiles.js';
+import { loadFile } from './loadDataFiles.js';
 let data = null;
 async function initRetrieveData(offline) {
-    // Only load the data on mont
+    // Only load the data on mount
     if (data)
         return;
     const langData = (await loadFile('languages.yml', offline).then(YAML.load));
     const vendorData = (await loadFile('vendor.yml', offline).then(YAML.load));
     const docData = (await loadFile('documentation.yml', offline).then(YAML.load));
     const heuristicsData = (await loadFile('heuristics.yml', offline).then(YAML.load));
-    const generatedData = (await loadFile('generated.rb', offline).then(parseGeneratedDataFile));
+    const generatedData = (await loadFile('generated.rb', offline).then(YAML.load));
     const vendorPaths = [...vendorData, ...docData, ...generatedData];
     data = {
         langData,
-        vendorData,
-        docData,
         heuristicsData,
-        generatedData,
         vendorPaths,
     };
 }

package/dist/program/utils/pcre.js

@@ -14,6 +14,7 @@ export default function pcre(regex) {
     // Remove PCRE-only syntax
     replace(/([*+]){2}/g, '$1');
     replace(/\(\?>/g, '(?:');
+    replace(/\\g\<[^>]+\>/g, '.*?'); // referenced named groups not supported
     // Remove start/end-of-file markers
     if (/\\[AZ]/.test(finalRegex)) {
         replace(/\\A/g, '^');

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "linguist-js",
-	"version": "3.0.0",
+	"version": "3.0.1",
 	"description": "Analyse the programming languages used in a folder or from raw content, using the same rules that GitHub Linguist does.",
 	"main": "dist/index.js",
 	"type": "module",

package/readme.md

@@ -50,8 +50,8 @@ Running LinguistJS on this will return the following JSON:
 {
   "files": {
     "count": 4,
-    "bytes": 31,
-    "lines": { "total": 8, "content": 4, "code": 4 },
+    "bytes": 6010,
+    "lines": { "total": 150, "content": 75 },
     "results": {
       "/info.md": "Markdown",
       "/no-lang": null,
@@ -61,35 +61,25 @@ Running LinguistJS on this will return the following JSON:
   },
   "languages": {
     "count": 3,
-    "bytes": 18,
-    "lines": { "total": 6, "content": 3, "code": 3 },
+    "bytes": 6000,
+    "lines": { "total": 147, "content": 74 },
     "results": {
-      "Markdown": {
-        "type": "prose",
-        "bytes": 6,
-        "lines": { "total": 2, "content": 1, "code": 1 },
-        "color": "#083fa1"
-      },
-      "JavaScript": {
-        "type": "programming",
-        "bytes": 6,
-        "lines": { "total": 2, "content": 1, "code": 1 },
-        "color": "#f1e05a"
-      },
-      "TypeScript": {
-        "type": "programming",
-        "bytes": 6,
-        "lines": { "total": 2, "content": 1, "code": 1 },
-        "color": "#3178c6"
-      }
+      "Markdown": { "count": 1, "bytes": 3000, "lines": { "total": 10, "content": 5 } },
+      "JavaScript": { "count": 1, "bytes": 1000, "lines": { "total": 46, "content": 23 } },
+      "TypeScript": { "count": 1, "bytes": 2000, "lines": { "total": 91, "content": 46 } }
     }
   },
   "unknown": {
     "count": 1,
-    "bytes": 13,
-    "lines": { "total": 2, "content": 1, "code": 1 },
+    "bytes": 10,
+    "lines": { "total": 3, "content": 1 },
     "extensions": {},
-    "filenames": { "no-lang": 13 }
+    "filenames": { "no-lang": 10 }
+  },
+  "repository": {
+    "Markdown": { "type": "prose", "color": "#083fa1" },
+    "JavaScript": { "type": "programming", "color": "#f1e05a" },
+    "TypeScript": { "type": "programming", "color": "#3178c6" }
   }
 }
 ```