Update linguist-languages to v8 (#17569)

changelog_unreleased/api/17331.md

@@ -2,7 +2,7 @@
 
 Previously, `languages` API for custom plugin only supported to infer parser based on the file basename or extension.
 
-Prettier main added `isSupported: ({ filepath: string }) => boolean` function to allow plugin check if file is supported based on the full path (eg: files in a specific directory).
+Prettier main added `isSupported: (options: { filepath: string }) => boolean` function to allow plugin check if file is supported based on the full path (eg: files in a specific directory).
 
 :::note
 

docs/api.md

@@ -124,7 +124,7 @@ The support information looks like this:
     filenames?: string[];
     linguistLanguageId?: number;
     vscodeLanguageIds?: string[];
-    isSupported?({ filepath: string }): boolean;
+    isSupported?(options: { filepath: string }): boolean;
   }>;
 }
 ```

package.json

@@ -76,7 +76,7 @@
     "jest-docblock": "30.0.0-beta.3",
     "json5": "2.2.3",
     "leven": "4.0.0",
-    "linguist-languages": "7.31.2",
+    "linguist-languages": "8.0.0",
     "meriyah": "6.0.6",
     "micromatch": "4.0.8",
     "minimist": "1.2.8",

src/index.d.ts

@@ -680,7 +680,7 @@ export interface SupportLanguage {
   linguistLanguageId?: number | undefined;
   vscodeLanguageIds?: string[] | undefined;
   interpreters?: string[] | undefined;
-  isSupported?: (({ filepath: string }) => boolean) | undefined;
+  isSupported?: ((options: { filepath: string }) => boolean) | undefined;
 }
 
 export interface SupportOptionRange {

src/language-css/languages.evaluate.js

@@ -1,4 +1,4 @@
-import linguistLanguages from "linguist-languages";
+import * as linguistLanguages from "linguist-languages";
 import createLanguage from "../utils/create-language.js";
 
 const languages = [

src/language-graphql/languages.evaluate.js

@@ -1,4 +1,4 @@
-import linguistLanguages from "linguist-languages";
+import * as linguistLanguages from "linguist-languages";
 import createLanguage from "../utils/create-language.js";
 
 const languages = [

src/language-handlebars/languages.evaluate.js

@@ -1,4 +1,4 @@
-import linguistLanguages from "linguist-languages";
+import * as linguistLanguages from "linguist-languages";
 import createLanguage from "../utils/create-language.js";
 
 const languages = [

src/language-html/languages.evaluate.js

@@ -1,4 +1,4 @@
-import linguistLanguages from "linguist-languages";
+import * as linguistLanguages from "linguist-languages";
 import createLanguage from "../utils/create-language.js";
 
 const languages = [

src/language-js/languages.evaluate.js

@@ -1,4 +1,4 @@
-import linguistLanguages from "linguist-languages";
+import * as linguistLanguages from "linguist-languages";
 import createLanguage from "../utils/create-language.js";
 
 const languages = [

src/language-json/languages.evaluate.js

@@ -1,4 +1,4 @@
-import linguistLanguages from "linguist-languages";
+import * as linguistLanguages from "linguist-languages";
 import createLanguage from "../utils/create-language.js";
 
 const ignoredFilenames = new Set([

src/language-markdown/languages.evaluate.js

@@ -1,4 +1,4 @@
-import linguistLanguages from "linguist-languages";
+import * as linguistLanguages from "linguist-languages";
 import createLanguage from "../utils/create-language.js";
 
 const languages = [

src/language-yaml/languages.evaluate.js

@@ -1,4 +1,4 @@
-import linguistLanguages from "linguist-languages";
+import * as linguistLanguages from "linguist-languages";
 import createLanguage from "../utils/create-language.js";
 
 const ignoredFilenames = new Set([

src/utils/create-language.js

@@ -1,39 +1,64 @@
-function assertUniqueArray(array, message) {
+import assert from "node:assert";
-  if (new Set(array).size === array.length) {
+
-    return;
+/** @import {Language as LinguistLanguage} from 'linguist-languages' */
+/**
+@typedef {{
+  name: string;
+  parsers?: readonly string[];
+  group?: string | undefined;
+  tmScope?: string | undefined;
+  aceMode?: string | undefined;
+  codemirrorMode?: string | undefined;
+  codemirrorMimeType?: string | undefined;
+  aliases?: readonly string[] | undefined;
+  extensions?: readonly string[] | undefined;
+  filenames?: readonly string[] | undefined;
+  linguistLanguageId?: number | undefined;
+  vscodeLanguageIds?: readonly string[] | undefined;
+  interpreters?: readonly string[] | undefined;
+  isSupported?: ((options: {filepath: string}) => boolean) | undefined;
+}} Language
+*/
+
+const excludedFields = new Set([
+  "color",
+  // Rename as `linguistLanguageId`
+  "languageId",
+]);
+
+const arrayTypeFields = new Set([
+  "parsers",
+  "aliases",
+  "extensions",
+  "interpreters",
+  "filenames",
+  "vscodeLanguageIds",
+]);
+
+/**
+ * @param {LinguistLanguage} linguistLanguage
+ * @param {(data: LinguistLanguage) => Partial<LinguistLanguage & Language>} getOverrides
+ * @returns {Language}
+ */
+function createLanguage(linguistLanguage, getOverrides) {
+  const language = { ...linguistLanguage, ...getOverrides(linguistLanguage) };
+  language.linguistLanguageId = language.languageId;
+
+  for (const field of excludedFields) {
+    delete language[field];
   }
 
-  /* c8 ignore next */
+  for (const property of arrayTypeFields) {
-  throw new Error(message);
+    const value = language[property];
-}
 
-function createLanguage(linguistData, getOverrides) {
+    assert.ok(
-  const { languageId, ...restData } = linguistData;
+      value === undefined ||
-  const overrides = getOverrides(linguistData);
+        (Array.isArray(value) && new Set(value).size === value.length),
-
+      `Language property '${property}' should be 'undefined' or unique array.`,
-  if (process.env.NODE_ENV !== "production" && overrides) {
+    );
-    for (const property of [
-      "parsers",
-      "extensions",
-      "interpreters",
-      "filenames",
-    ]) {
-      const value = overrides[property];
-
-      if (value) {
-        assertUniqueArray(
-          value,
-          `Language property '${property}' should be unique.`,
-        );
-      }
-    }
   }
 
-  return {
+  return language;
-    linguistLanguageId: languageId,
-    ...restData,
-    ...overrides,
-  };
 }
 
 export default createLanguage;

tests/integration/__tests__/__snapshots__/support-info.js.snap

@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`API getSupportInfo() 1`] = `
 {
@@ -314,7 +314,6 @@ exports[`CLI --support-info  1`] = `
       "aliases": ["xhtml"],
       "codemirrorMimeType": "text/html",
       "codemirrorMode": "htmlmixed",
-      "color": "#e34c26",
       "extensions": [".component.html"],
       "filenames": [],
       "linguistLanguageId": 146,
@@ -328,7 +327,6 @@ exports[`CLI --support-info  1`] = `
       "aceMode": "css",
       "codemirrorMimeType": "text/css",
       "codemirrorMode": "css",
-      "color": "#663399",
       "extensions": [".css", ".wxss"],
       "linguistLanguageId": 50,
       "name": "CSS",
@@ -342,7 +340,6 @@ exports[`CLI --support-info  1`] = `
       "aliases": [],
       "codemirrorMimeType": "text/javascript",
       "codemirrorMode": "javascript",
-      "color": "#f1e05a",
       "extensions": [".js.flow"],
       "filenames": [],
       "interpreters": [
@@ -366,7 +363,6 @@ exports[`CLI --support-info  1`] = `
     },
     {
       "aceMode": "text",
-      "color": "#e10098",
       "extensions": [".graphql", ".gql", ".graphqls"],
       "linguistLanguageId": 139,
       "name": "GraphQL",
@@ -378,7 +374,6 @@ exports[`CLI --support-info  1`] = `
     {
       "aceMode": "handlebars",
       "aliases": ["hbs", "htmlbars"],
-      "color": "#f7931e",
       "extensions": [".handlebars", ".hbs"],
       "linguistLanguageId": 155,
       "name": "Handlebars",
@@ -392,7 +387,6 @@ exports[`CLI --support-info  1`] = `
       "aliases": ["xhtml"],
       "codemirrorMimeType": "text/html",
       "codemirrorMode": "htmlmixed",
-      "color": "#e34c26",
       "extensions": [
         ".html",
         ".hta",
@@ -414,7 +408,6 @@ exports[`CLI --support-info  1`] = `
       "aliases": ["js", "node"],
       "codemirrorMimeType": "text/javascript",
       "codemirrorMode": "javascript",
-      "color": "#f1e05a",
       "extensions": [
         ".js",
         "._js",
@@ -478,7 +471,6 @@ exports[`CLI --support-info  1`] = `
       "aliases": ["geojson", "jsonl", "sarif", "topojson"],
       "codemirrorMimeType": "application/json",
       "codemirrorMode": "javascript",
-      "color": "#292929",
       "extensions": [
         ".json",
         ".4DForm",
@@ -530,7 +522,6 @@ exports[`CLI --support-info  1`] = `
       "aliases": ["jsonc"],
       "codemirrorMimeType": "text/javascript",
       "codemirrorMode": "javascript",
-      "color": "#292929",
       "extensions": [
         ".jsonc",
         ".code-snippets",
@@ -564,7 +555,6 @@ exports[`CLI --support-info  1`] = `
       "aliases": ["geojson", "jsonl", "sarif", "topojson"],
       "codemirrorMimeType": "application/json",
       "codemirrorMode": "javascript",
-      "color": "#292929",
       "extensions": [".importmap"],
       "filenames": ["package.json", "package-lock.json", "composer.json"],
       "linguistLanguageId": 174,
@@ -578,7 +568,6 @@ exports[`CLI --support-info  1`] = `
       "aceMode": "javascript",
       "codemirrorMimeType": "application/json",
       "codemirrorMode": "javascript",
-      "color": "#267CB9",
       "extensions": [".json5"],
       "linguistLanguageId": 175,
       "name": "JSON5",
@@ -613,7 +602,6 @@ exports[`CLI --support-info  1`] = `
       "aliases": ["less-css"],
       "codemirrorMimeType": "text/css",
       "codemirrorMode": "css",
-      "color": "#1d365d",
       "extensions": [".less"],
       "linguistLanguageId": 198,
       "name": "Less",
@@ -627,7 +615,6 @@ exports[`CLI --support-info  1`] = `
       "aliases": ["xhtml"],
       "codemirrorMimeType": "text/html",
       "codemirrorMode": "htmlmixed",
-      "color": "#e34c26",
       "extensions": [],
       "filenames": [],
       "linguistLanguageId": 146,
@@ -642,7 +629,6 @@ exports[`CLI --support-info  1`] = `
       "aliases": ["md", "pandoc"],
       "codemirrorMimeType": "text/x-gfm",
       "codemirrorMode": "gfm",
-      "color": "#083fa1",
       "extensions": [
         ".md",
         ".livemd",
@@ -670,7 +656,6 @@ exports[`CLI --support-info  1`] = `
       "aliases": ["md", "pandoc"],
       "codemirrorMimeType": "text/x-gfm",
       "codemirrorMode": "gfm",
-      "color": "#083fa1",
       "extensions": [".mdx"],
       "filenames": [],
       "linguistLanguageId": 222,
@@ -686,7 +671,6 @@ exports[`CLI --support-info  1`] = `
       "aliases": ["MJML", "mjml"],
       "codemirrorMimeType": "text/html",
       "codemirrorMode": "htmlmixed",
-      "color": "#e34c26",
       "extensions": [".mjml"],
       "filenames": [],
       "linguistLanguageId": 146,
@@ -698,7 +682,6 @@ exports[`CLI --support-info  1`] = `
     },
     {
       "aceMode": "text",
-      "color": "#dc3a0c",
       "extensions": [".pcss", ".postcss"],
       "group": "CSS",
       "linguistLanguageId": 262764437,
@@ -712,7 +695,6 @@ exports[`CLI --support-info  1`] = `
       "aceMode": "scss",
       "codemirrorMimeType": "text/x-scss",
       "codemirrorMode": "css",
-      "color": "#c6538c",
       "extensions": [".scss"],
       "linguistLanguageId": 329,
       "name": "SCSS",
@@ -725,7 +707,6 @@ exports[`CLI --support-info  1`] = `
       "aceMode": "javascript",
       "codemirrorMimeType": "text/jsx",
       "codemirrorMode": "jsx",
-      "color": "#3178c6",
       "extensions": [".tsx"],
       "group": "TypeScript",
       "linguistLanguageId": 94901924,
@@ -740,7 +721,6 @@ exports[`CLI --support-info  1`] = `
       "aliases": ["ts"],
       "codemirrorMimeType": "application/typescript",
       "codemirrorMode": "javascript",
-      "color": "#3178c6",
       "extensions": [".ts", ".cts", ".mts"],
       "interpreters": ["bun", "deno", "ts-node", "tsx"],
       "linguistLanguageId": 378,
@@ -752,7 +732,6 @@ exports[`CLI --support-info  1`] = `
     },
     {
       "aceMode": "html",
-      "color": "#41b883",
       "extensions": [".vue"],
       "linguistLanguageId": 391,
       "name": "Vue",
@@ -766,7 +745,6 @@ exports[`CLI --support-info  1`] = `
       "aliases": ["yml"],
       "codemirrorMimeType": "text/x-yaml",
       "codemirrorMode": "yaml",
-      "color": "#cb171e",
       "extensions": [
         ".yml",
         ".mir",

yarn.lock

@@ -6374,10 +6374,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"linguist-languages@npm:7.31.2":
+"linguist-languages@npm:8.0.0":
-  version: 7.31.2
+  version: 8.0.0
-  resolution: "linguist-languages@npm:7.31.2"
+  resolution: "linguist-languages@npm:8.0.0"
-  checksum: 10/2cf3963e92bd735afb8d490e6a5b351c4b1a6c9c44350f4efee844855c5d0226029d18f172be2750d4915c21d4ff8e117233777680d20a35cc81c1e805447407
+  checksum: 10/89e390f16b0da76666573db5cd9ad65b5046c71953b298fddef3605b7057a537dfa5c4525ddeb8b6aa6fbf3e53da52907abee7447fa7a6e500818261bf519f60
   languageName: node
   linkType: hard
 
@@ -7388,7 +7388,7 @@ __metadata:
     json5: "npm:2.2.3"
     knip: "npm:5.50.5"
     leven: "npm:4.0.0"
-    linguist-languages: "npm:7.31.2"
+    linguist-languages: "npm:8.0.0"
     magic-string: "npm:0.30.17"
     meriyah: "npm:6.0.6"
     micromatch: "npm:4.0.8"