Switch to source-map compatible @jridgewell/source-map

This preserves API compatibility, so that loading source-map in the browser is still supported.
terser · May 1, 2022 · 970a8c9 · 970a8c9
1 parent 8f938df
commit 970a8c9
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 31 deletions.
diff --git a/lib/sourcemap.js b/lib/sourcemap.js
@@ -43,11 +43,10 @@
 
 "use strict";
 
-import {GenMapping, maybeAddMapping, toDecodedMap, toEncodedMap, setSourceContent} from "@jridgewell/gen-mapping";
-import {AnyMap, originalPositionFor} from "@jridgewell/trace-mapping";
+import {SourceMapConsumer, SourceMapGenerator} from "@jridgewell/source-map";
 import {defaults, HOP} from "./utils/index.js";
 
-// a small wrapper around source-map and @jridgewell/trace-mapping
+// a small wrapper around source-map and @jridgewell/source-map
 function SourceMap(options) {
     options = defaults(options, {
         file : null,
@@ -57,7 +56,7 @@ function SourceMap(options) {
     });
 
     var orig_map;
-    var generator = new GenMapping({
+    var generator = new SourceMapGenerator({
         file       : options.file,
         sourceRoot : options.root
     });
@@ -68,9 +67,9 @@ function SourceMap(options) {
         sourcesContent[name] = files[name];
     }
     if (options.orig) {
-        orig_map = new AnyMap(options.orig);
+        orig_map = new SourceMapConsumer(options.orig);
         if (orig_map.sourcesContent) {
-            orig_map.resolvedSources.forEach(function(source, i) {
+            orig_map.sources.forEach(function(source, i) {
                 var content = orig_map.sourcesContent[i];
                 if (content) {
                     sourcesContent[source] = content;
@@ -81,7 +80,7 @@ function SourceMap(options) {
 
     function add(source, gen_line, gen_col, orig_line, orig_col, name) {
         if (orig_map) {
-            var info = originalPositionFor(orig_map, {
+            var info = orig_map.originalPositionFor({
                 line: orig_line,
                 column: orig_col
             });
@@ -93,13 +92,13 @@ function SourceMap(options) {
             orig_col = info.column;
             name = info.name || name;
         }
-        maybeAddMapping(generator, {
+        generator.addMapping({
             generated : { line: gen_line, column: gen_col },
             original  : { line: orig_line, column: orig_col },
             source    : source,
             name      : name
         });
-        setSourceContent(generator, source, sourcesContent[source]);
+        generator.setSourceContent(source, sourcesContent[source]);
     }
 
     function clean(map) {
@@ -112,8 +111,11 @@ function SourceMap(options) {
 
     return {
         add             : add,
-        getDecoded      : function() { return clean(toDecodedMap(generator)); },
-        getEncoded      : function() { return clean(toEncodedMap(generator)); },
+        getDecoded      : function() {
+            if (!generator.toDecodedMap) return null;
+            return clean(generator.toDecodedMap());
+        },
+        getEncoded      : function() { return clean(generator.toJSON()); },
     };
 }
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -43,8 +43,7 @@
     "main.js"
   ],
   "dependencies": {
-    "@jridgewell/gen-mapping": "^0.3.0",
-    "@jridgewell/trace-mapping": "^0.3.5",
+    "@jridgewell/source-map": "^0.3.1",
     "acorn": "^8.5.0",
     "commander": "^2.20.0",
     "source-map-support": "~0.5.20"

diff --git a/rollup.config.js b/rollup.config.js
@@ -5,7 +5,7 @@ export default () => {
             file: "dist/bundle.min.js",
             format: "umd",
             globals: {
-                "source-map": "sourceMap",
+                "@jridgewell/source-map": "sourceMap",
             },
             name: "Terser",
             sourcemap: false,