optimize code

Tidyzq · Tidyzq · commit c8b6460b9590 · 2017-05-23T14:03:32.000+08:00
diff --git a/lib/markdown-compiler.js b/lib/markdown-compiler.js
@@ -1,4 +1,5 @@
 var loaderUtils = require('loader-utils')
+var hljs = require('highlight.js')
 var cheerio = require('cheerio')
 var markdown = require('markdown-it')
 
@@ -11,6 +12,21 @@ var replaceDelimiters = function (str) {
   return str.replace(/({{|}})/g, '<span>$1</span>')
 }
 
+/**
+ * renderHighlight
+ * @param  {string} str
+ * @param  {string} lang
+ */
+var renderHighlight = function (str, lang) {
+  if (!(lang && hljs.getLanguage(lang))) {
+    return ''
+  }
+
+  try {
+    return replaceDelimiters(hljs.highlight(lang, str, true).value)
+  } catch (err) {}
+}
+
 /**
  * html => vue file template
  * @param  {[type]} html [description]
@@ -45,14 +61,15 @@ module.exports = function (source) {
   var parser
   var params = loaderUtils.parseQuery(this.query) || {}
   var vueMarkdownOptions = Object.create(this.options.__vueMarkdownOptions__ ? this.options.__vueMarkdownOptions__.__proto__ : {})
-  var opts = Object.assign(vueMarkdownOptions, params, this.options.__vueMarkdownOptions__, this.options.vueMarkdown)
+  var opts = Object.assign(vueMarkdownOptions, params, this.options.__vueMarkdownOptions__, this.vueMarkdown, this.options.vueMarkdown)
 
   if ({}.toString.call(opts.render) === '[object Function]') {
     parser = opts
   } else {
     opts = Object.assign({
       preset: 'default',
       html: true,
+      highlight: renderHighlight
     }, opts)
 
     var plugins = opts.use
@@ -82,21 +99,14 @@ module.exports = function (source) {
     source = preprocess.call(this, parser, source)
   }
 
-  function exportContent (content) {
-    if (opts.raw) {
-      callback(null, content)
-    } else {
-      callback(null, 'module.exports = ' + JSON.stringify(content))
-    }
-  }
-
   source = source.replace(/@/g, '__at__')
 
   var content = parser.render(source).replace(/__at__/g, '@')
   var result = renderVueTemplate(content)
 
-  // for relative includes
-  opts.filename = this.resourcePath
-
-  exportContent(result)
+  if (opts.raw) {
+    return result
+  } else {
+    return 'module.exports = ' + JSON.stringify(result)
+  }
 }
