Refactor createLanguage to use function transform (#6676)

src/language-css/index.js

@@ -5,37 +5,35 @@ const options = require("./options");
 const createLanguage = require("../utils/create-language");
 
 const languages = [
-  createLanguage(require("linguist-languages/data/CSS"), {
+  createLanguage(require("linguist-languages/data/CSS"), data =>
-    override: {
+    Object.assign(data, {
       since: "1.4.0",
       parsers: ["css"],
       vscodeLanguageIds: ["css"]
-    }
+    })
-  }),
+  ),
-  createLanguage(require("linguist-languages/data/PostCSS"), {
+  createLanguage(require("linguist-languages/data/PostCSS"), data =>
-    override: {
+    Object.assign(data, {
       since: "1.4.0",
       parsers: ["css"],
-      vscodeLanguageIds: ["postcss"]
+      vscodeLanguageIds: ["postcss"],
-    },
+      extensions: data.extensions.concat(".postcss")
-    extend: {
+    })
-      extensions: [".postcss"]
+  ),
-    }
+  createLanguage(require("linguist-languages/data/Less"), data =>
-  }),
+    Object.assign(data, {
-  createLanguage(require("linguist-languages/data/Less"), {
-    override: {
       since: "1.4.0",
       parsers: ["less"],
       vscodeLanguageIds: ["less"]
-    }
+    })
-  }),
+  ),
-  createLanguage(require("linguist-languages/data/SCSS"), {
+  createLanguage(require("linguist-languages/data/SCSS"), data =>
-    override: {
+    Object.assign(data, {
       since: "1.4.0",
       parsers: ["scss"],
       vscodeLanguageIds: ["scss"]
-    }
+    })
-  })
+  )
 ];
 
 const printers = {

src/language-graphql/index.js

@@ -5,13 +5,13 @@ const options = require("./options");
 const createLanguage = require("../utils/create-language");
 
 const languages = [
-  createLanguage(require("linguist-languages/data/GraphQL"), {
+  createLanguage(require("linguist-languages/data/GraphQL"), data =>
-    override: {
+    Object.assign(data, {
       since: "1.5.0",
       parsers: ["graphql"],
       vscodeLanguageIds: ["graphql"]
-    }
+    })
-  })
+  )
 ];
 
 const printers = {

src/language-handlebars/index.js

@@ -4,13 +4,13 @@ const printer = require("./printer-glimmer");
 const createLanguage = require("../utils/create-language");
 
 const languages = [
-  createLanguage(require("linguist-languages/data/Handlebars"), {
+  createLanguage(require("linguist-languages/data/Handlebars"), data =>
-    override: {
+    Object.assign(data, {
       since: null, // unreleased
       parsers: ["glimmer"],
       vscodeLanguageIds: ["handlebars"]
-    }
+    })
-  })
+  )
 ];
 
 const printers = {

src/language-html/index.js

@@ -5,47 +5,43 @@ const createLanguage = require("../utils/create-language");
 const options = require("./options");
 
 const languages = [
-  createLanguage(require("linguist-languages/data/HTML"), {
+  createLanguage(require("linguist-languages/data/HTML"), data =>
-    override: {
+    Object.assign(data, {
       name: "Angular",
       since: "1.15.0",
       parsers: ["angular"],
       vscodeLanguageIds: ["html"],
-
       extensions: [".component.html"],
       filenames: []
-    }
+    })
-  }),
+  ),
-  createLanguage(require("linguist-languages/data/HTML"), {
+  createLanguage(require("linguist-languages/data/HTML"), data =>
-    override: {
+    Object.assign(data, {
       since: "1.15.0",
       parsers: ["html"],
-      vscodeLanguageIds: ["html"]
+      vscodeLanguageIds: ["html"],
-    },
+      extensions: data.extensions.concat([
-    extend: {
-      extensions: [
         ".mjml" // MJML is considered XML in Linguist but it should be formatted as HTML
-      ]
+      ])
-    }
+    })
-  }),
+  ),
-  createLanguage(require("linguist-languages/data/HTML"), {
+  createLanguage(require("linguist-languages/data/HTML"), data =>
-    override: {
+    Object.assign(data, {
       name: "Lightning Web Components",
       since: "1.17.0",
       parsers: ["lwc"],
       vscodeLanguageIds: ["html"],
-
       extensions: [],
       filenames: []
-    }
+    })
-  }),
+  ),
-  createLanguage(require("linguist-languages/data/Vue"), {
+  createLanguage(require("linguist-languages/data/Vue"), data =>
-    override: {
+    Object.assign(data, {
       since: "1.10.0",
       parsers: ["vue"],
       vscodeLanguageIds: ["vue"]
-    }
+    })
-  })
+  )
 ];
 
 const printers = {

src/language-js/index.js

@@ -6,18 +6,16 @@ const options = require("./options");
 const createLanguage = require("../utils/create-language");
 
 const languages = [
-  createLanguage(require("linguist-languages/data/JavaScript"), {
+  createLanguage(require("linguist-languages/data/JavaScript"), data =>
-    override: {
+    Object.assign(data, {
       since: "0.0.0",
       parsers: ["babel", "flow"],
-      vscodeLanguageIds: ["javascript"]
+      vscodeLanguageIds: ["javascript"],
-    },
+      interpreters: data.interpreters.concat(["nodejs"])
-    extend: {
+    })
-      interpreters: ["nodejs"]
+  ),
-    }
+  createLanguage(require("linguist-languages/data/JavaScript"), data =>
-  }),
+    Object.assign(data, {
-  createLanguage(require("linguist-languages/data/JavaScript"), {
-    override: {
       name: "Flow",
       since: "0.0.0",
       parsers: ["babel", "flow"],
@@ -25,66 +23,62 @@ const languages = [
       aliases: [],
       filenames: [],
       extensions: [".js.flow"]
-    }
+    })
-  }),
+  ),
-  createLanguage(require("linguist-languages/data/JSX"), {
+  createLanguage(require("linguist-languages/data/JSX"), data =>
-    override: {
+    Object.assign(data, {
       since: "0.0.0",
       parsers: ["babel", "flow"],
       vscodeLanguageIds: ["javascriptreact"]
-    }
+    })
-  }),
+  ),
-  createLanguage(require("linguist-languages/data/TypeScript"), {
+  createLanguage(require("linguist-languages/data/TypeScript"), data =>
-    override: {
+    Object.assign(data, {
       since: "1.4.0",
       parsers: ["typescript"],
       vscodeLanguageIds: ["typescript"]
-    }
+    })
-  }),
+  ),
-  createLanguage(require("linguist-languages/data/TSX"), {
+  createLanguage(require("linguist-languages/data/TSX"), data =>
-    override: {
+    Object.assign(data, {
       since: "1.4.0",
       parsers: ["typescript"],
       vscodeLanguageIds: ["typescriptreact"]
-    }
+    })
-  }),
+  ),
-  createLanguage(require("linguist-languages/data/JSON"), {
+  createLanguage(require("linguist-languages/data/JSON"), data =>
-    override: {
+    Object.assign(data, {
       name: "JSON.stringify",
       since: "1.13.0",
       parsers: ["json-stringify"],
       vscodeLanguageIds: ["json"],
       extensions: [], // .json file defaults to json instead of json-stringify
       filenames: ["package.json", "package-lock.json", "composer.json"]
-    }
+    })
-  }),
+  ),
-  createLanguage(require("linguist-languages/data/JSON"), {
+  createLanguage(require("linguist-languages/data/JSON"), data =>
-    override: {
+    Object.assign(data, {
       since: "1.5.0",
       parsers: ["json"],
-      vscodeLanguageIds: ["json"]
+      vscodeLanguageIds: ["json"],
-    },
+      filenames: data.filenames.concat([".prettierrc"])
-    extend: {
+    })
-      filenames: [".prettierrc"]
+  ),
-    }
+  createLanguage(require("linguist-languages/data/JSON with Comments"), data =>
-  }),
+    Object.assign(data, {
-  createLanguage(require("linguist-languages/data/JSON with Comments"), {
-    override: {
       since: "1.5.0",
       parsers: ["json"],
-      vscodeLanguageIds: ["jsonc"]
+      vscodeLanguageIds: ["jsonc"],
-    },
+      filenames: data.filenames.concat([".eslintrc"])
-    extend: {
+    })
-      filenames: [".eslintrc"]
+  ),
-    }
+  createLanguage(require("linguist-languages/data/JSON5"), data =>
-  }),
+    Object.assign(data, {
-  createLanguage(require("linguist-languages/data/JSON5"), {
-    override: {
       since: "1.13.0",
       parsers: ["json5"],
       vscodeLanguageIds: ["json5"]
-    }
+    })
-  })
+  )
 ];
 
 const printers = {

src/language-markdown/index.js

@@ -5,29 +5,25 @@ const options = require("./options");
 const createLanguage = require("../utils/create-language");
 
 const languages = [
-  createLanguage(require("linguist-languages/data/Markdown"), {
+  createLanguage(require("linguist-languages/data/Markdown"), data =>
-    override: {
+    Object.assign(data, {
       since: "1.8.0",
       parsers: ["remark"],
-      vscodeLanguageIds: ["markdown"]
+      vscodeLanguageIds: ["markdown"],
-    },
+      filenames: data.filenames.concat(["README"]),
-    extend: {
+      extensions: data.extensions.filter(extension => extension !== ".mdx")
-      filenames: ["README"]
+    })
-    },
+  ),
-    exclude: {
+  createLanguage(require("linguist-languages/data/Markdown"), data =>
-      extensions: [".mdx"]
+    Object.assign(data, {
-    }
-  }),
-  createLanguage(require("linguist-languages/data/Markdown"), {
-    override: {
       name: "MDX",
       since: "1.15.0",
       parsers: ["mdx"],
       vscodeLanguageIds: ["mdx"],
       filenames: [],
       extensions: [".mdx"]
-    }
+    })
-  })
+  )
 ];
 
 const printers = {

src/language-yaml/index.js

@@ -5,13 +5,13 @@ const options = require("./options");
 const createLanguage = require("../utils/create-language");
 
 const languages = [
-  createLanguage(require("linguist-languages/data/YAML"), {
+  createLanguage(require("linguist-languages/data/YAML"), data =>
-    override: {
+    Object.assign(data, {
       since: "1.14.0",
       parsers: ["yaml"],
       vscodeLanguageIds: ["yaml"]
-    }
+    })
-  })
+  )
 ];
 
 module.exports = {

src/utils/create-language.js

@@ -1,6 +1,6 @@
 "use strict";
 
-module.exports = function(linguistData, { extend, override, exclude }) {
+module.exports = function(linguistData, transform) {
   const language = {};
 
   for (const key in linguistData) {
@@ -8,23 +8,5 @@ module.exports = function(linguistData, { extend, override, exclude }) {
     language[newKey] = linguistData[key];
   }
 
-  if (extend) {
+  return transform(language);
-    for (const key in extend) {
-      language[key] = (language[key] || []).concat(extend[key]);
-    }
-  }
-
-  if (exclude) {
-    for (const key in exclude) {
-      language[key] = (language[key] || []).filter(
-        value => (exclude[key] || []).indexOf(value) === -1
-      );
-    }
-  }
-
-  for (const key in override) {
-    language[key] = override[key];
-  }
-
-  return language;
 };