Use latest source-map-version

Resolves #1427

Author: jaylinski

lib/precompiler.js

@@ -150,7 +150,8 @@ function loadFiles(opts, callback) {
   );
 }
 
-module.exports.cli = function(opts) {
+module.exports.cli = async function(opts) {
+  // TODO what implications does this have?
   if (opts.version) {
     console.log(Handlebars.VERSION);
     return;
@@ -219,7 +220,7 @@ module.exports.cli = function(opts) {
     output.add('{};\n');
   }
 
-  opts.templates.forEach(function(template) {
+  for (const template of opts.templates) {
     let options = {
       knownHelpers: known,
       knownHelpersOnly: opts.o
@@ -236,11 +237,12 @@ module.exports.cli = function(opts) {
 
     // If we are generating a source map, we have to reconstruct the SourceNode object
     if (opts.map) {
-      let consumer = new SourceMapConsumer(precompiled.map);
+      let consumer = await new SourceMapConsumer(precompiled.map);
       precompiled = SourceNode.fromStringWithSourceMap(
         precompiled.code,
         consumer
       );
+      consumer.destroy();
     }
 
     if (opts.simple) {
@@ -262,7 +264,7 @@ module.exports.cli = function(opts) {
         ');\n'
       ]);
     }
-  });
+  }
 
   // Output the content
   if (!opts.simple) {

package-lock.json

@@ -22,7 +22,7 @@
   "dependencies": {
     "@handlebars/parser": "^1.1.0",
     "neo-async": "^2.6.2",
-    "source-map": "^0.6.1",
+    "source-map": "^0.7.3",
     "yargs": "^16.2.0"
   },
   "peerDependencies": {

package.json

@@ -83,14 +83,14 @@ describe('precompiler', function() {
     console.error = errorLogFunction;
   });
 
-  it('should output version', function() {
-    Precompiler.cli({ templates: [], version: true });
+  it('should output version', async function() { // TODO do this for all other tests
+    await Precompiler.cli({ templates: [], version: true });
     equals(log, Handlebars.VERSION);
   });
-  it('should throw if lacking templates', function() {
+  it('should throw if lacking templates', async function() {
     shouldThrow(
       function() {
-        Precompiler.cli({ templates: [] });
+        await Precompiler.cli({ templates: [] });
       },
       Handlebars.Exception,
       'Must define at least one template or directory.'

spec/precompiler.js

@@ -21,7 +21,7 @@ describe('source-map', function() {
     equal(!!template.code, true);
     equal(!!template.map, !CompilerContext.browser);
   });
-  it('should map source properly', function() {
+  it('should map source properly', async function() {
     var templateSource =
         '  b{{hello}}  \n  {{bar}}a {{#block arg hash=(subex 1 subval)}}{{/block}}',
       template = Handlebars.precompile(templateSource, {
@@ -30,13 +30,15 @@ describe('source-map', function() {
       });
 
     if (template.map) {
-      var consumer = new SourceMapConsumer(template.map),
+      var consumer = await new SourceMapConsumer(template.map),
         lines = template.code.split('\n'),
         srcLines = templateSource.split('\n'),
         generated = grepLine('"  b"', lines),
         source = grepLine('  b', srcLines);
 
       var mapped = consumer.originalPositionFor(generated);
+      consumer.destroy();
+
       equal(mapped.line, source.line);
       equal(mapped.column, source.column);
     }

spec/source-map.js

@@ -22,7 +22,7 @@ var template = Handlebars.precompile(script, {
 if (!verbose) {
   console.log(template);
 } else {
-  var consumer = new SourceMapConsumer(template.map),
+  var consumer = await new SourceMapConsumer(template.map),
     lines = template.code.split('\n'),
     srcLines = script.split('\n');
 
@@ -111,4 +111,6 @@ if (!verbose) {
       );
     }
   });
+
+  consumer.destroy();
 }