Build your personal knowledge base with Trilium Notes
TypeScript electronelectron-appknowledge-baseknowledge-graphknowledge-managementknowledge-management-graphlocal-firstnote-managmentnote-takernote-takingnotebooknotesnotes-apppersonal-knowledge-basepersonal-wikiscriptableself-hostedself-hostingwiki
fix(export): keep 50 more code languages through Markdown round trips
Elian Doran04da5dba1f84
diff --git a/packages/commons/src/lib/mime_type.spec.ts b/packages/commons/src/lib/mime_type.spec.tsindex e98d6e72c4..7e55101ef5 100644--- a/packages/commons/src/lib/mime_type.spec.ts+++ b/packages/commons/src/lib/mime_type.spec.ts@@ -54,6 +54,26 @@ describe("getMimeTypeFromMarkdownName", () => {expect(getMimeTypeFromMarkdownName("clike")?.mime).toBe("text/x-csrc");});+ it("resolves the fence names of GitHub Linguist", () => {+ expect(getMimeTypeFromMarkdownName("scala")?.mime).toBe("text/x-scala");+ expect(getMimeTypeFromMarkdownName("restructuredtext")?.mime).toBe("text/x-rst");+ expect(getMimeTypeFromMarkdownName("rst")?.mime).toBe("text/x-rst");+ expect(getMimeTypeFromMarkdownName("matlab")?.mime).toBe("text/x-octave");+ expect(getMimeTypeFromMarkdownName("lhs")?.mime).toBe("text/x-literate-haskell");+ expect(getMimeTypeFromMarkdownName("jinja")?.mime).toBe("text/jinja2");+ expect(getMimeTypeFromMarkdownName("tex")?.mime).toBe("text/x-stex");+ expect(getMimeTypeFromMarkdownName("roff")?.mime).toBe("text/troff");+ });++ it("lets no alias take the mdLanguageCode of another entry", () => {+ for (const mimeType of MIME_TYPES_DICT) {+ if (mimeType.mdLanguageCode) {+ const resolved = getMimeTypeFromMarkdownName(mimeType.mdLanguageCode);+ expect(resolved?.mdLanguageCode, mimeType.mime).toBe(mimeType.mdLanguageCode);+ }+ }+ });+it("lists each alias on one entry only", () => {const aliases = MIME_TYPES_DICT.flatMap((mimeType) => mimeType.aliases ?? []);expect(new Set(aliases).size).toBe(aliases.length);@@ -85,6 +105,8 @@ describe("getMarkdownNameFromCKEditorLanguage", () => {expect(getMarkdownNameFromCKEditorLanguage("text-x-rustsrc")).toBe("rust");expect(getMarkdownNameFromCKEditorLanguage("text-x-nginx-conf")).toBe("nginx");expect(getMarkdownNameFromCKEditorLanguage("text-typescript-jsx")).toBe("tsx");+ expect(getMarkdownNameFromCKEditorLanguage("text-jinja2")).toBe("jinja");+ expect(getMarkdownNameFromCKEditorLanguage("text-x-stex")).toBe("tex");});it("returns undefined for an unknown language or one whose names resolve elsewhere", () => {diff --git a/packages/commons/src/lib/mime_type.ts b/packages/commons/src/lib/mime_type.tsindex 6fd1f92448..df9b306cba 100644--- a/packages/commons/src/lib/mime_type.ts+++ b/packages/commons/src/lib/mime_type.ts@@ -58,9 +58,9 @@ const MIME_TYPES_DICT_RAW = [// Keep sorted alphabetically.{ title: "ABAP (SAP)", mime: "text/x-abap", mdLanguageCode: "abap" },- { title: "APL", mime: "text/apl" },- { title: "ASN.1", mime: "text/x-ttcn-asn" },- { title: "ASP.NET", mime: "application/x-aspx" },+ { title: "APL", mime: "text/apl", aliases: ["apl"] },+ { title: "ASN.1", mime: "text/x-ttcn-asn", aliases: ["asn.1"] },+ { title: "ASP.NET", mime: "application/x-aspx", aliases: ["aspx", "asp.net"] },{ title: "Asterisk", mime: "text/x-asterisk" },{ title: "Batch file (DOS)", mime: "application/x-bat", mdLanguageCode: "dos", aliases: ["bat", "batch"], icon: "bx bx-terminal" },{ title: "Brainfuck", mime: "text/x-brainfuck", mdLanguageCode: "brainfuck" },@@ -71,57 +71,57 @@ const MIME_TYPES_DICT_RAW = [{ title: "ClojureScript", mime: "text/x-clojurescript" },{ title: "Closure Stylesheets (GSS)", mime: "text/x-gss" },{ title: "CMake", mime: "text/x-cmake", mdLanguageCode: "cmake" },- { title: "Cobol", mime: "text/x-cobol" },+ { title: "Cobol", mime: "text/x-cobol", aliases: ["cobol"] },{ title: "CoffeeScript", mime: "text/coffeescript", mdLanguageCode: "coffeescript", icon: "bx bx-coffee" },{ title: "Common Lisp", mime: "text/x-common-lisp", mdLanguageCode: "lisp" },- { title: "CQL", mime: "text/x-cassandra" },+ { title: "CQL", mime: "text/x-cassandra", aliases: ["cql"] },{ title: "Crystal", mime: "text/x-crystal", mdLanguageCode: "crystal" },{ title: "CSS", mime: "text/css", mdLanguageCode: "css", default: true, icon: "bx bxs-file-css" },- { title: "Cypher", mime: "application/x-cypher-query" },- { title: "Cython", mime: "text/x-cython" },+ { title: "Cypher", mime: "application/x-cypher-query", aliases: ["cypher"] },+ { title: "Cython", mime: "text/x-cython", aliases: ["cython", "pyrex"] },{ title: "D", mime: "text/x-d", mdLanguageCode: "d" },{ title: "Dart", mime: "application/dart", mdLanguageCode: "dart" },{ title: "diff", mime: "text/x-diff", mdLanguageCode: "diff" },{ title: "Django", mime: "text/x-django", mdLanguageCode: "django", icon: "bx bxl-django" },{ title: "Dockerfile", mime: "text/x-dockerfile", mdLanguageCode: "dockerfile", default: true, icon: "bx bxl-docker" },{ title: "DTD", mime: "application/xml-dtd", icon: "bx bx-code" },- { title: "Dylan", mime: "text/x-dylan" },+ { title: "Dylan", mime: "text/x-dylan", aliases: ["dylan"] },{ title: "EBNF", mime: "text/x-ebnf", mdLanguageCode: "ebnf" },- { title: "ECL", mime: "text/x-ecl" },- { title: "edn", mime: "application/edn" },- { title: "Eiffel", mime: "text/x-eiffel" },+ { title: "ECL", mime: "text/x-ecl", aliases: ["ecl"] },+ { title: "edn", mime: "application/edn", aliases: ["edn"] },+ { title: "Eiffel", mime: "text/x-eiffel", aliases: ["eiffel"] },{ title: "Elixir", mime: "text/x-elixir", mdLanguageCode: "elixir" },{ title: "Elm", mime: "text/x-elm", mdLanguageCode: "elm" },- { title: "Embedded Javascript", mime: "application/x-ejs" },+ { title: "Embedded Javascript", mime: "application/x-ejs", aliases: ["ejs"] },{ title: "Embedded Ruby", mime: "application/x-erb", mdLanguageCode: "erb" },{ title: "Erlang", mime: "text/x-erlang", mdLanguageCode: "erlang" },{ title: "Esper", mime: "text/x-esper" },{ title: "F#", mime: "text/x-fsharp", mdLanguageCode: "fsharp" },- { title: "Factor", mime: "text/x-factor" },+ { title: "Factor", mime: "text/x-factor", aliases: ["factor"] },{ title: "FCL", mime: "text/x-fcl" },- { title: "Forth", mime: "text/x-forth" },+ { title: "Forth", mime: "text/x-forth", aliases: ["forth"] },{ title: "Fortran", mime: "text/x-fortran", mdLanguageCode: "fortran" },- { title: "Gas", mime: "text/x-gas" },- { title: "GDScript (Godot)", mime: "text/x-gdscript" },+ { title: "Gas", mime: "text/x-gas", aliases: ["gas", "unix-assembly"] },+ { title: "GDScript (Godot)", mime: "text/x-gdscript", aliases: ["gdscript"] },{ title: "Gherkin", mime: "text/x-feature", mdLanguageCode: "gherkin" },{ title: "GitHub Flavored Markdown", mime: "text/x-gfm", mdLanguageCode: "markdown", icon: "bx bxl-markdown" },{ title: "Go", mime: "text/x-go", mdLanguageCode: "go", default: true, icon: "bx bxl-go-lang" },{ title: "Groovy", mime: "text/x-groovy", mdLanguageCode: "groovy" },{ title: "HAML", mime: "text/x-haml", mdLanguageCode: "haml" },- { title: "Haskell (Literate)", mime: "text/x-literate-haskell" },+ { title: "Haskell (Literate)", mime: "text/x-literate-haskell", aliases: ["literate-haskell", "lhaskell", "lhs"] },{ title: "Haskell", mime: "text/x-haskell", mdLanguageCode: "haskell" },{ title: "Haxe", mime: "text/x-haxe", mdLanguageCode: "haxe" },{ title: "HTML", mime: "text/html", mdLanguageCode: "html", default: true, icon: "bx bxl-html5" },{ title: "HTTP", mime: "message/http", mdLanguageCode: "http" },- { title: "HXML", mime: "text/x-hxml" },- { title: "IDL", mime: "text/x-idl" },- { title: "Java Server Pages", mime: "application/x-jsp", mdLanguageCode: "java", icon: "bx bxl-java" },+ { title: "HXML", mime: "text/x-hxml", aliases: ["hxml"] },+ { title: "IDL", mime: "text/x-idl", aliases: ["idl"] },+ { title: "Java Server Pages", mime: "application/x-jsp", mdLanguageCode: "java", aliases: ["jsp", "java-server-pages"], icon: "bx bxl-java" },{ title: "Java", mime: "text/x-java", mdLanguageCode: "java", aliases: ["java"], default: true, icon: "bx bxl-java" },{ title: "JavaScript", mime: "text/javascript", mdLanguageCode: "javascript", aliases: ["js"], default: true, icon: "bx bxl-javascript" },{ title: "JavaScript (Trilium backend)", mime: "application/javascript;env=backend", mdLanguageCode: "javascript", default: true, icon: "bx bxl-javascript" },{ title: "JavaScript (Trilium frontend)", mime: "application/javascript;env=frontend", mdLanguageCode: "javascript", default: true, icon: "bx bxl-javascript" },- { title: "Jinja2", mime: "text/jinja2" },- { title: "JSON-LD", mime: "application/ld+json", mdLanguageCode: "json", icon: "bx bxs-file-json" },+ { title: "Jinja2", mime: "text/jinja2", aliases: ["jinja", "html+jinja"] },+ { title: "JSON-LD", mime: "application/ld+json", mdLanguageCode: "json", aliases: ["jsonld"], icon: "bx bxs-file-json" },{ title: "JSON", mime: "application/json", mdLanguageCode: "json", aliases: ["json", "jsonc"], default: true, icon: "bx bxs-file-json" },{ title: "JSX", mime: "text/jsx", mdLanguageCode: "jsx", aliases: ["javascriptreact"], default: true },{ title: "Julia", mime: "text/x-julia", mdLanguageCode: "julia" },@@ -134,14 +134,14 @@ const MIME_TYPES_DICT_RAW = [{ title: "MariaDB SQL", mime: "text/x-mariadb", mdLanguageCode: "sql" },{ title: "Markdown", mime: "text/x-markdown", mdLanguageCode: "markdown", default: true, icon: "bx bxl-markdown" },{ title: "Mathematica", mime: "text/x-mathematica", mdLanguageCode: "mathematica" },- { title: "mbox", mime: "application/mbox" },+ { title: "mbox", mime: "application/mbox", aliases: ["mbox", "email", "eml"] },{ title: "MIPS Assembler", mime: "text/x-asm-mips", mdLanguageCode: "mips" },{ title: "mIRC", mime: "text/mirc" },- { title: "Modelica", mime: "text/x-modelica" },+ { title: "Modelica", mime: "text/x-modelica", aliases: ["modelica"] },{ title: "MS SQL", mime: "text/x-mssql", mdLanguageCode: "sql", icon: "bx bx-data" },{ title: "mscgen", mime: "text/x-mscgen" },{ title: "msgenny", mime: "text/x-msgenny" },- { title: "MUMPS", mime: "text/x-mumps" },+ { title: "MUMPS", mime: "text/x-mumps", aliases: ["mumps"] },{ title: "MySQL", mime: "text/x-mysql", mdLanguageCode: "sql", icon: "bx bx-data" },{ title: "Nginx", mime: "text/x-nginx-conf", mdLanguageCode: "nginx" },{ title: "Nim", mime: "text/x-nim", mdLanguageCode: "nim" },@@ -150,75 +150,75 @@ const MIME_TYPES_DICT_RAW = [{ title: "NTriples", mime: "application/n-triples" },{ title: "Objective-C", mime: "text/x-objectivec", mdLanguageCode: "objectivec", aliases: ["objective-c", "objc"] },{ title: "OCaml", mime: "text/x-ocaml", mdLanguageCode: "ocaml" },- { title: "Octave", mime: "text/x-octave" },- { title: "Oz", mime: "text/x-oz" },+ { title: "Octave", mime: "text/x-octave", aliases: ["octave", "matlab"] },+ { title: "Oz", mime: "text/x-oz", aliases: ["oz"] },{ title: "Pascal", mime: "text/x-pascal", mdLanguageCode: "delphi" },- { title: "PEG.js", mime: "text/x-pegjs" },+ { title: "PEG.js", mime: "text/x-pegjs", aliases: ["peg.js"] },{ title: "Perl", mime: "text/x-perl", aliases: ["perl"] },{ title: "PGP", mime: "application/pgp" },{ title: "PHP", mime: "text/x-php", aliases: ["php"], default: true, icon: "bx bxl-php" },- { title: "Pig", mime: "text/x-pig" },- { title: "PLSQL", mime: "text/x-plsql", mdLanguageCode: "sql" },+ { title: "Pig", mime: "text/x-pig", aliases: ["piglatin"] },+ { title: "PLSQL", mime: "text/x-plsql", mdLanguageCode: "sql", aliases: ["plsql"] },{ title: "PostgreSQL", mime: "text/x-pgsql", mdLanguageCode: "pgsql", icon: "bx bxl-postgresql" },{ title: "PowerShell", mime: "application/x-powershell", mdLanguageCode: "powershell", default: true, icon: "bx bxs-terminal" },{ title: "Properties files", mime: "text/x-properties", mdLanguageCode: "properties" },{ title: "ProtoBuf", mime: "text/x-protobuf", mdLanguageCode: "protobuf" },- { title: "Pug", mime: "text/x-pug" },+ { title: "Pug", mime: "text/x-pug", aliases: ["pug"] },{ title: "Puppet", mime: "text/x-puppet", mdLanguageCode: "puppet" },{ title: "Python", mime: "text/x-python", mdLanguageCode: "python", aliases: ["py"], default: true, icon: "bx bxl-python" },{ title: "Q", mime: "text/x-q", mdLanguageCode: "q" },{ title: "R", mime: "text/x-rsrc", mdLanguageCode: "r" },- { title: "reStructuredText", mime: "text/x-rst" },+ { title: "reStructuredText", mime: "text/x-rst", aliases: ["restructuredtext", "rst"] },{ title: "RPM Changes", mime: "text/x-rpm-changes" },- { title: "RPM Spec", mime: "text/x-rpm-spec" },+ { title: "RPM Spec", mime: "text/x-rpm-spec", aliases: ["rpm-spec", "specfile"] },{ title: "Ruby", mime: "text/x-ruby", mdLanguageCode: "ruby", default: true },{ title: "Rust", mime: "text/x-rustsrc", mdLanguageCode: "rust", default: true },{ title: "SAS", mime: "text/x-sas", mdLanguageCode: "sas" },- { title: "Sass", mime: "text/x-sass", icon: "bx bxl-sass" },- { title: "Scala", mime: "text/x-scala" },- { title: "Scheme", mime: "text/x-scheme" },+ { title: "Sass", mime: "text/x-sass", aliases: ["sass"], icon: "bx bxl-sass" },+ { title: "Scala", mime: "text/x-scala", aliases: ["scala"] },+ { title: "Scheme", mime: "text/x-scheme", aliases: ["scheme"] },{ title: "SCSS", mime: "text/x-scss", mdLanguageCode: "scss" },{ title: "Shell (bash)", mime: "text/x-sh", mdLanguageCode: "sh", aliases: ["bash", "shell", "shellscript", "zsh"], default: true, icon: "bx bx-terminal" },- { title: "Sieve", mime: "application/sieve" },- { title: "Slim", mime: "text/x-slim" },+ { title: "Sieve", mime: "application/sieve", aliases: ["sieve"] },+ { title: "Slim", mime: "text/x-slim", aliases: ["slim"] },{ title: "Smalltalk", mime: "text/x-stsrc", mdLanguageCode: "smalltalk" },- { title: "Smarty", mime: "text/x-smarty" },+ { title: "Smarty", mime: "text/x-smarty", aliases: ["smarty"] },{ title: "SML", mime: "text/x-sml", mdLanguageCode: "sml" },{ title: "Solr", mime: "text/x-solr" },- { title: "Soy", mime: "text/x-soy" },- { title: "SPARQL", mime: "application/sparql-query" },+ { title: "Soy", mime: "text/x-soy", aliases: ["soy", "closure-templates"] },+ { title: "SPARQL", mime: "application/sparql-query", aliases: ["sparql"] },{ title: "Spreadsheet", mime: "text/x-spreadsheet" },{ title: "SQL", mime: "text/x-sql", mdLanguageCode: "sql", aliases: ["sql"], default: true, icon: "bx bx-data" },{ title: "SQLite (Trilium)", mime: "text/x-sqlite;schema=trilium", mdLanguageCode: "sql", default: true, icon: "bx bx-data" },{ title: "SQLite", mime: "text/x-sqlite", mdLanguageCode: "sql", icon: "bx bx-data" },- { title: "Squirrel", mime: "text/x-squirrel" },- { title: "sTeX", mime: "text/x-stex" },+ { title: "Squirrel", mime: "text/x-squirrel", aliases: ["squirrel"] },+ { title: "sTeX", mime: "text/x-stex", aliases: ["tex"] },{ title: "Stylus", mime: "text/x-styl", mdLanguageCode: "stylus" },{ title: "Swift", mime: "text/x-swift", aliases: ["swift"], default: true },- { title: "SystemVerilog", mime: "text/x-systemverilog" },+ { title: "SystemVerilog", mime: "text/x-systemverilog", aliases: ["systemverilog"] },{ title: "Tcl", mime: "text/x-tcl", mdLanguageCode: "tcl" },{ title: "Terraform (HCL)", mime: "text/x-hcl", mdLanguageCode: "terraform", aliases: ["hcl"] },- { title: "Textile", mime: "text/x-textile" },+ { title: "Textile", mime: "text/x-textile", aliases: ["textile"] },{ title: "TiddlyWiki ", mime: "text/x-tiddlywiki" },{ title: "Tiki wiki", mime: "text/tiki" },{ title: "TOML", mime: "text/x-toml", mdLanguageCode: "ini", aliases: ["toml"], icon: "bx bx-bracket" },{ title: "Tornado", mime: "text/x-tornado" },{ title: "Trilium Log", mime: "text/x-trilium-log", icon: "bx bx-list-ul" },{ title: "Trilium Search Query", mime: "text/x-trilium-search", icon: "bx bx-search" },- { title: "troff", mime: "text/troff" },+ { title: "troff", mime: "text/troff", aliases: ["roff", "troff", "groff", "nroff", "manpage"] },{ title: "TTCN_CFG", mime: "text/x-ttcn-cfg" },{ title: "TTCN", mime: "text/x-ttcn" },- { title: "Turtle", mime: "text/turtle" },+ { title: "Turtle", mime: "text/turtle", aliases: ["turtle"] },{ title: "Twig", mime: "text/x-twig", mdLanguageCode: "twig" },{ title: "TypeScript-JSX", mime: "text/typescript-jsx", aliases: ["tsx", "typescriptreact"], default: true },{ title: "TypeScript", mime: "application/typescript", mdLanguageCode: "typescript", aliases: ["ts"], default: true, icon: "bx bxl-typescript" },{ title: "VB.NET", mime: "text/x-vb", mdLanguageCode: "vbnet", aliases: ["vb"] },{ title: "VBScript", mime: "text/vbscript", mdLanguageCode: "vbscript" },- { title: "Velocity", mime: "text/velocity" },+ { title: "Velocity", mime: "text/velocity", aliases: ["velocity", "vtl"] },{ title: "Verilog", mime: "text/x-verilog", mdLanguageCode: "verilog" },{ title: "VHDL", mime: "text/x-vhdl", mdLanguageCode: "vhdl" },- { title: "Vue.js Component", mime: "text/x-vue" },- { title: "Web IDL", mime: "text/x-webidl" },+ { title: "Vue.js Component", mime: "text/x-vue", aliases: ["vue"] },+ { title: "Web IDL", mime: "text/x-webidl", aliases: ["webidl"] },{ title: "XML", mime: "text/xml", mdLanguageCode: "xml", default: true, icon: "bx bx-code-alt" },{ title: "XQuery", mime: "application/xquery", mdLanguageCode: "xquery" },{ title: "xu", mime: "text/x-xu" },diff --git a/packages/trilium-core/src/services/export/markdown.spec.ts b/packages/trilium-core/src/services/export/markdown.spec.tsindex 18c12ee233..670ff02d28 100644--- a/packages/trilium-core/src/services/export/markdown.spec.ts+++ b/packages/trilium-core/src/services/export/markdown.spec.ts@@ -19,7 +19,10 @@ describe("Markdown export", () => {"language-text-x-c-src": "cpp","language-text-x-rustsrc": "rust","language-text-typescript-jsx": "tsx",- "language-text-x-toml": "toml"+ "language-text-x-toml": "toml",+ "language-text-x-scala": "scala",+ "language-text-jinja2": "jinja",+ "language-text-x-literate-haskell": "literate-haskell"};for (const [ input, output ] of Object.entries(conversionTable)) {diff --git a/packages/trilium-core/src/services/import/markdown.spec.ts b/packages/trilium-core/src/services/import/markdown.spec.tsindex c4cfb979bc..06536d54bb 100644--- a/packages/trilium-core/src/services/import/markdown.spec.ts+++ b/packages/trilium-core/src/services/import/markdown.spec.ts@@ -35,7 +35,8 @@ describe("markdown", () => {.map((mimeType) => normalizeMimeTypeForCKEditor(mimeType.mime)).filter((language) => getMarkdownNameFromCKEditorLanguage(language) !== undefined);expect(languages).toEqual(expect.arrayContaining([- "text-plain", "text-x-csrc", "text-x-c-src", "text-typescript-jsx"+ "text-plain", "text-x-csrc", "text-x-c-src", "text-typescript-jsx", "text-x-scala",+ "text-jinja2"]));for (const language of languages) {