Source maps support

bem · Jan 16, 2016 · b949d9d · b949d9d
1 parent 2c96253
commit b949d9d
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 27 deletions.
diff --git a/bin/bem-xjst b/bin/bem-xjst
@@ -35,6 +35,13 @@ require('coa').Cmd()
         .short('e').long('engine')
         .def('bemhtml')
         .end()
+    .opt()
+        .name('sourceMap').title('Generate source map (default: false)')
+        .short('s').long('source-map')
+        .def(false)
+        .flag()
+        .end()
+
     .act(function(options) {
       var input = [],
       deferred = q.defer();
@@ -51,7 +58,10 @@ require('coa').Cmd()
 
       function finish(source) {
         var out = bem_xjst[options.engine].generate(source, {
-          'no-opt': options['no-opt']
+          'no-opt': options['no-opt'],
+          from: options.input.path,
+          to: options.output.path,
+          sourceMap: options.sourceMap
         });
 
         options.output.write(out);

diff --git a/lib/compiler.js b/lib/compiler.js
@@ -1,4 +1,5 @@
 var vm = require('vm');
+var SourceMapFile = require('enb-source-map/lib/file');
 
 function Compiler(runtime) {
   this.runtime = runtime;
@@ -8,6 +9,7 @@ exports.Compiler = Compiler;
 
 Compiler.prototype.generate = function generate(code, options) {
   if (!options) options = {};
+  if (!options.to) options.to = process.cwd();
 
   // It is fine to compile without templates at first
   if (!code)
@@ -22,33 +24,39 @@ Compiler.prototype.generate = function generate(code, options) {
 
   var locals = this.runtime.prototype.locals;
 
-  var source = [
-    '/// -------------------------------------',
-    '/// --------- BEM-XJST Runtime Start ----',
-    '/// -------------------------------------',
-    'var ' + exportName + ' = function(module, exports) {',
-    this.runtime.source + ';',
-    '  return module.exports ||',
-    '      exports.' + exportName + ';',
-    '}({}, {});',
-    '/// -------------------------------------',
-    '/// --------- BEM-XJST Runtime End ------',
-    '/// -------------------------------------',
-    '',
-    'var api = new ' + engine + '(' + JSON.stringify(options) + ');',
-    '/// -------------------------------------',
-    '/// ------ BEM-XJST User-code Start -----',
-    '/// -------------------------------------',
-    'api.compile(function(' + locals.join(', ') + ') {',
-    code + ';',
-    '});',
-    'api.exportApply(exports);',
-    '/// -------------------------------------',
-    '/// ------ BEM-XJST User-code End -------',
-    '/// -------------------------------------\n'
-  ].join('\n');
+  var file = new SourceMapFile(options.to, { sourceMap: options.sourceMap });
 
-  return source;
+  file
+    .writeLine('/// -------------------------------------')
+    .writeLine('/// --------- BEM-XJST Runtime Start ----')
+    .writeLine('/// -------------------------------------')
+    .writeLine('var ' + exportName + ' = function(module, exports) {')
+    .writeContent(this.runtime.source).write(';')
+    .writeLine('  return module.exports ||')
+    .writeLine('      exports.' + exportName + ';')
+    .writeLine('}({}, {});')
+    .writeLine('/// -------------------------------------')
+    .writeLine('/// --------- BEM-XJST Runtime End ------')
+    .writeLine('/// -------------------------------------')
+    .writeLine('')
+    .writeLine('var api = new ' + engine + '(' + JSON.stringify(options) + ');')
+    .writeLine('/// -------------------------------------')
+    .writeLine('/// ------ BEM-XJST User-code Start -----')
+    .writeLine('/// -------------------------------------')
+    .writeLine('api.compile(function(' + locals.join(', ') + ') {')
+    .writeFileContent(options.from, code).write(';')
+    .writeLine('});')
+    .writeLine('api.exportApply(exports);')
+    .writeLine('/// -------------------------------------')
+    .writeLine('/// ------ BEM-XJST User-code End -------')
+    .writeLine('/// -------------------------------------');
+
+  return options.sourcemap && options.sourcemap.include === false ?
+    {
+      content: file.getContent(),
+      sourcemap: file.getSourceMap()
+    } :
+    file.render();
 };
 
 Compiler.prototype.compile = function compile(code, options) {

diff --git a/package.json b/package.json
@@ -23,6 +23,7 @@
   "license": "MPL-2.0",
   "dependencies": {
     "coa": "~0.3.9",
+    "enb-source-map": "^1.9.0",
     "inherits": "^2.0.1",
     "minimalistic-assert": "^1.0.0",
     "q": "~0.9.3"