hikaru-coffee - npm Package Compare versions

Comparing version 2.2.0 to 2.3.0

libs/highlight.js

@@ -15,5 +15,3 @@ // Generated by CoffeeScript 2.3.2
     var alias, j, k, lAliases, lang, len, len1, ref;
-    aliases = {
-      "plain": "plain"
-    };
+    aliases = {};
     ref = hljs.listLanguages();
@@ -43,8 +41,7 @@ for (j = 0, len = ref.length; j < len; j++) {
     data = hljs.highlightAuto(str);
-    if (data["relevance"] > 0 && data["language"]) {
+    if (data["relevance"] > 0 && (data["language"] != null)) {
       return data;
     }
     return {
-      "value": escapeHTML(str),
-      "language": "plain"
+      "value": escapeHTML(str)
     };
@@ -63,14 +60,28 @@ };
     }
-    options["lang"] = aliases[options["lang"]];
+    // Guess when no lang was given,
     if (options["lang"] == null) {
       data = highlightAuto(str);
+    // Skip auto guess when user sets lang to plain,
+    // plain is not in the alias list, so judge it first.
     } else if (options["lang"] === "plain") {
       data = {
-        "value": escapeHTML(str),
-        "language": "plain"
+        "value": escapeHTML(str)
       };
+    // Guess when this lang is given but not in highlightjs' alias list, too.
+    } else if (aliases[options["lang"]] == null) {
+      data = highlightAuto(str);
     } else {
-      data = hljs.highlight(options["lang"], str);
+      // We have correct lang alias, tell highlightjs to handle it.
+      // If given language does not match string content,
+      // highlightjs will set language to undefined.
+      data = hljs.highlight(aliases[options["lang"]], str);
     }
-    results = [`<figure class="highlight hljs ${data["language"].toLowerCase()}">`];
+    // Language in <figure>'s class is highlight's detected result, not user input.
+    // To get user input, marked set it to parent <code>'s class.
+    results = ["<figure class=\"highlight hljs"];
+    if (data["language"] != null) {
+      results.push(` ${data["language"].toLowerCase()}">`);
+    } else {
+      results.push("\">");
+    }
     if (options["gutter"]) {
@@ -77,0 +88,0 @@ gutters = ["<pre class=\"gutter\">"];

package.json

 {
   "name": "hikaru-coffee",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "description": "A static site generator that generates routes based on directories naturally.",
@@ -5,0 +5,0 @@ "main": "libs/index.js",

No alert changes

Improved metrics

Total package byte prevSize

81599

increased by0.78%

Lines of code

1785

increased by0.62%

No dependency changes