@abaplint/transpiler-cli 2.10.75 → 2.10.77

package/build/bundle.js

@@ -52062,7 +52062,7 @@ class Table extends _abstract_object_1.AbstractObject {
                 }
                 if (found instanceof Types.StructureType) {
                     if (field.GROUPNAME !== undefined) {
-                        components.push({ name: field.GROUPNAME, type: found });
+                        components.push({ name: field.GROUPNAME, type: found, asInclude: true });
                     }
                     if (field.FIELDNAME.startsWith(".INCLU-") === false
                         || field.FIELDNAME === ".INCLU--AP") {
@@ -53585,7 +53585,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.113.149";
+        return "2.113.150";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -67361,6 +67361,7 @@ exports.MethodParameterNames = MethodParameterNames;
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.MixReturning = exports.MixReturningConf = void 0;
+/* eslint-disable max-len */
 const issue_1 = __webpack_require__(/*! ../issue */ "./node_modules/@abaplint/core/build/src/issue.js");
 const _abap_rule_1 = __webpack_require__(/*! ./_abap_rule */ "./node_modules/@abaplint/core/build/src/rules/_abap_rule.js");
 const Statements = __webpack_require__(/*! ../abap/2_statements/statements */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/index.js");
@@ -67380,9 +67381,10 @@ class MixReturning extends _abap_rule_1.ABAPRule {
             key: "mix_returning",
             title: "Mix of returning and exporting",
             shortDescription: `Checks that methods don't have a mixture of returning and exporting/changing parameters`,
-            // eslint-disable-next-line max-len
-            extendedInformation: `https://github.com/SAP/styleguides/blob/main/clean-abap/CleanABAP.md#use-either-returning-or-exporting-or-changing-but-not-a-combination`,
-            tags: [_irule_1.RuleTag.Styleguide, _irule_1.RuleTag.SingleFile],
+            extendedInformation: `https://github.com/SAP/styleguides/blob/main/clean-abap/CleanABAP.md#use-either-returning-or-exporting-or-changing-but-not-a-combination
+
+This syntax is not allowed on versions earlier than 740sp02, https://help.sap.com/doc/abapdocu_752_index_htm/7.52/en-us/abennews-740-abap_objects.htm#!ABAP_MODIFICATION_1@1@`,
+            tags: [_irule_1.RuleTag.Styleguide, _irule_1.RuleTag.SingleFile, _irule_1.RuleTag.Syntax],
             badExample: `CLASS lcl DEFINITION.
   PUBLIC SECTION.
     METHODS
@@ -89242,13 +89244,30 @@ class TranspileTypes {
             const list = [];
             const suffix = {};
             const asInclude = {};
+            /*
+            const skipFields: Set<string> = new Set();
+      
+            for (const c of type.getComponents()) {
+              if (c.type instanceof abaplint.BasicTypes.StructureType) {
+                for (const f of c.type.getComponents()) {
+                  skipFields.add(f.name.toLowerCase());
+                }
+              }
+            }
+              */
             for (const c of type.getComponents()) {
-                list.push(`"` + c.name.toLowerCase() + `": ` + this.toType(c.type));
+                const lower = c.name.toLowerCase();
+                /*
+                if (skipFields.has(lower)) {
+                  continue; // skip fields from nested structures
+                }
+                */
+                list.push(`"` + lower + `": ` + this.toType(c.type));
                 if (c.suffix) {
-                    suffix[c.name.toLowerCase()] = c.suffix;
+                    suffix[lower] = c.suffix;
                 }
                 if (c.asInclude) {
-                    asInclude[c.name.toLowerCase()] = true;
+                    asInclude[lower] = true;
                 }
             }
             extra = "{\n" + list.join(",\n") + "}";
@@ -95789,7 +95808,7 @@ class ArraySet {
    * @param String aStr
    */
   has(aStr) {
-      return this._set.has(aStr);
+    return this._set.has(aStr);
   }
 
   /**
@@ -95800,7 +95819,7 @@ class ArraySet {
   indexOf(aStr) {
     const idx = this._set.get(aStr);
     if (idx >= 0) {
-        return idx;
+      return idx;
     }
     throw new Error('"' + aStr + '" is not in the set.');
   }
@@ -95906,24 +95925,7 @@ const VLQ_CONTINUATION_BIT = VLQ_BASE;
  *   2 becomes 4 (100 binary), -2 becomes 5 (101 binary)
  */
 function toVLQSigned(aValue) {
-  return aValue < 0
-    ? ((-aValue) << 1) + 1
-    : (aValue << 1) + 0;
-}
-
-/**
- * Converts to a two-complement value from a value where the sign bit is
- * placed in the least significant bit.  For example, as decimals:
- *   2 (10 binary) becomes 1, 3 (11 binary) becomes -1
- *   4 (100 binary) becomes 2, 5 (101 binary) becomes -2
- */
-// eslint-disable-next-line no-unused-vars
-function fromVLQSigned(aValue) {
-  const isNegative = (aValue & 1) === 1;
-  const shifted = aValue >> 1;
-  return isNegative
-    ? -shifted
-    : shifted;
+  return aValue < 0 ? (-aValue << 1) + 1 : (aValue << 1) + 0;
 }
 
 /**
@@ -95965,12 +95967,13 @@ exports.encode = function base64VLQ_encode(aValue) {
  * http://opensource.org/licenses/BSD-3-Clause
  */
 
-const intToCharMap = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".split("");
+const intToCharMap =
+  "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".split("");
 
 /**
  * Encode an integer in the range of 0 to 63 to a single base 64 digit.
  */
-exports.encode = function(number) {
+exports.encode = function (number) {
   if (0 <= number && number < intToCharMap.length) {
     return intToCharMap[number];
   }
@@ -96033,7 +96036,7 @@ function recursiveSearch(aLow, aHigh, aNeedle, aHaystack, aCompare, aBias) {
 
     // The exact needle element was not found in this haystack. Determine if
     // we are in termination case (3) or (2) and return the appropriate thing.
-    if (aBias == exports.LEAST_UPPER_BOUND) {
+    if (aBias === exports.LEAST_UPPER_BOUND) {
       return aHigh < aHaystack.length ? aHigh : -1;
     }
     return mid;
@@ -96075,13 +96078,19 @@ exports.search = function search(aNeedle, aHaystack, aCompare, aBias) {
     return -1;
   }
 
-  let index = recursiveSearch(-1, aHaystack.length, aNeedle, aHaystack,
-                              aCompare, aBias || exports.GREATEST_LOWER_BOUND);
+  let index = recursiveSearch(
+    -1,
+    aHaystack.length,
+    aNeedle,
+    aHaystack,
+    aCompare,
+    aBias || exports.GREATEST_LOWER_BOUND
+  );
   if (index < 0) {
     return -1;
   }
 
-  // We have found either the exact element, or the next-closest element than
+  // We have found either the exact element, or the next-closest element to
   // the one we are searching for. However, there may be more than one such
   // element. Make sure we always return the smallest of these.
   while (index - 1 >= 0) {
@@ -96122,8 +96131,11 @@ function generatedPositionAfter(mappingA, mappingB) {
   const lineB = mappingB.generatedLine;
   const columnA = mappingA.generatedColumn;
   const columnB = mappingB.generatedColumn;
-  return lineB > lineA || lineB == lineA && columnB >= columnA ||
-         util.compareByGeneratedPositionsInflated(mappingA, mappingB) <= 0;
+  return (
+    lineB > lineA ||
+    (lineB == lineA && columnB >= columnA) ||
+    util.compareByGeneratedPositionsInflated(mappingA, mappingB) <= 0
+  );
 }
 
 /**
@@ -96136,7 +96148,7 @@ class MappingList {
     this._array = [];
     this._sorted = true;
     // Serves as infimum
-    this._last = {generatedLine: -1, generatedColumn: 0};
+    this._last = { generatedLine: -1, generatedColumn: 0 };
   }
 
   /**
@@ -96193,55 +96205,34 @@ exports.MappingList = MappingList;
   \**************************************************/
 /***/ ((module, __unused_webpack_exports, __webpack_require__) => {
 
-/* Determine browser vs node environment by testing the default top level context. Solution courtesy of: https://stackoverflow.com/questions/17575790/environment-detection-node-js-or-browser */
-const isBrowserEnvironment = (function() {
-    // eslint-disable-next-line no-undef
-    return (typeof window !== "undefined") && (this === window);
-}).call();
+"use strict";
 
-if (isBrowserEnvironment) {
-  // Web version of reading a wasm file into an array buffer.
 
-  let mappingsWasm = null;
+// Note: This file is replaced with "read-wasm-browser.js" when this module is
+// bundled with a packager that takes package.json#browser fields into account.
 
-  module.exports = function readWasm() {
-    if (typeof mappingsWasm === "string") {
-      return fetch(mappingsWasm)
-        .then(response => response.arrayBuffer());
-    }
-    if (mappingsWasm instanceof ArrayBuffer) {
-      return Promise.resolve(mappingsWasm);
-    }
-    throw new Error("You must provide the string URL or ArrayBuffer contents " +
-                    "of lib/mappings.wasm by calling " +
-                    "SourceMapConsumer.initialize({ 'lib/mappings.wasm': ... }) " +
-                    "before using SourceMapConsumer");
-  };
+const fs = __webpack_require__(/*! fs */ "fs");
+const path = __webpack_require__(/*! path */ "path");
 
-  module.exports.initialize = input => mappingsWasm = input;
-} else {
-  // Node version of reading a wasm file into an array buffer.
-  const fs = __webpack_require__(/*! fs */ "fs");
-  const path = __webpack_require__(/*! path */ "path");
-
-  module.exports = function readWasm() {
-    return new Promise((resolve, reject) => {
-      const wasmPath = path.join(__dirname, "mappings.wasm");
-      fs.readFile(wasmPath, null, (error, data) => {
-        if (error) {
-          reject(error);
-          return;
-        }
+module.exports = function readWasm() {
+  return new Promise((resolve, reject) => {
+    const wasmPath = path.join(__dirname, "mappings.wasm");
+    fs.readFile(wasmPath, null, (error, data) => {
+      if (error) {
+        reject(error);
+        return;
+      }
 
-        resolve(data.buffer);
-      });
+      resolve(data.buffer);
     });
-  };
+  });
+};
 
-  module.exports.initialize = _ => {
-    console.debug("SourceMapConsumer.initialize is a no-op when running in node.js");
-  };
-}
+module.exports.initialize = _ => {
+  console.debug(
+    "SourceMapConsumer.initialize is a no-op when running in node.js"
+  );
+};
 
 
 /***/ }),
@@ -96327,15 +96318,6 @@ class SourceMapConsumer {
     }
   }
 
-  /**
-   * Parse the mappings in a string in to a data structure which we can easily
-   * query (the ordered arrays in the `this.__generatedMappings` and
-   * `this.__originalMappings` properties).
-   */
-  _parseMappings(aStr, aSourceRoot) {
-    throw new Error("Subclasses must implement _parseMappings");
-  }
-
   /**
    * Iterate over each mapping between an original source/line/column and a
    * generated line/column in this source map.
@@ -96442,14 +96424,19 @@ class BasicSourceMapConsumer extends SourceMapConsumer {
       }
 
       const version = util.getArg(sourceMap, "version");
-      let sources = util.getArg(sourceMap, "sources");
+      const sources = util.getArg(sourceMap, "sources").map(String);
       // Sass 3.3 leaves out the 'names' array, so we deviate from the spec (which
       // requires the array) to play nice here.
       const names = util.getArg(sourceMap, "names", []);
-      let sourceRoot = util.getArg(sourceMap, "sourceRoot", null);
+      const sourceRoot = util.getArg(sourceMap, "sourceRoot", null);
       const sourcesContent = util.getArg(sourceMap, "sourcesContent", null);
       const mappings = util.getArg(sourceMap, "mappings");
       const file = util.getArg(sourceMap, "file", null);
+      const x_google_ignoreList = util.getArg(
+        sourceMap,
+        "x_google_ignoreList",
+        null
+      );
 
       // Once again, Sass deviates from the spec and supplies the version as a
       // string rather than a number, so we use loose equality checking here.
@@ -96457,25 +96444,7 @@ class BasicSourceMapConsumer extends SourceMapConsumer {
         throw new Error("Unsupported version: " + version);
       }
 
-      if (sourceRoot) {
-        sourceRoot = util.normalize(sourceRoot);
-      }
-
-      sources = sources
-        .map(String)
-        // Some source maps produce relative source paths like "./foo.js" instead of
-        // "foo.js".  Normalize these first so that future comparisons will succeed.
-        // See bugzil.la/1090768.
-        .map(util.normalize)
-        // Always ensure that absolute sources are internally stored relative to
-        // the source root, if the source root is absolute. Not doing this would
-        // be particularly problematic when the source root is a prefix of the
-        // source (valid, but why??). See github issue #199 and bugzil.la/1188982.
-        .map(function(source) {
-          return sourceRoot && util.isAbsolute(sourceRoot) && util.isAbsolute(source)
-            ? util.relative(sourceRoot, source)
-            : source;
-        });
+      that._sourceLookupCache = new Map();
 
       // Pass `true` below to allow duplicate names and sources. While source maps
       // are intended to be compressed and deduplicated, the TypeScript compiler
@@ -96484,15 +96453,19 @@ class BasicSourceMapConsumer extends SourceMapConsumer {
       that._names = ArraySet.fromArray(names.map(String), true);
       that._sources = ArraySet.fromArray(sources, true);
 
-      that._absoluteSources = that._sources.toArray().map(function(s) {
-        return util.computeSourceURL(sourceRoot, s, aSourceMapURL);
-      });
+      that._absoluteSources = ArraySet.fromArray(
+        that._sources.toArray().map(function (s) {
+          return util.computeSourceURL(sourceRoot, s, aSourceMapURL);
+        }),
+        true
+      );
 
       that.sourceRoot = sourceRoot;
       that.sourcesContent = sourcesContent;
       that._mappings = mappings;
       that._sourceMapURL = aSourceMapURL;
       that.file = file;
+      that.x_google_ignoreList = x_google_ignoreList;
 
       that._computedColumnSpans = false;
       that._mappingsPtr = 0;
@@ -96510,23 +96483,38 @@ class BasicSourceMapConsumer extends SourceMapConsumer {
    * found.
    */
   _findSourceIndex(aSource) {
-    let relativeSource = aSource;
-    if (this.sourceRoot != null) {
-      relativeSource = util.relative(this.sourceRoot, relativeSource);
-    }
-
-    if (this._sources.has(relativeSource)) {
-      return this._sources.indexOf(relativeSource);
+    // In the most common usecases, we'll be constantly looking up the index for the same source
+    // files, so we cache the index lookup to avoid constantly recomputing the full URLs.
+    const cachedIndex = this._sourceLookupCache.get(aSource);
+    if (typeof cachedIndex === "number") {
+      return cachedIndex;
+    }
+
+    // Treat the source as map-relative overall by default.
+    const sourceAsMapRelative = util.computeSourceURL(
+      null,
+      aSource,
+      this._sourceMapURL
+    );
+    if (this._absoluteSources.has(sourceAsMapRelative)) {
+      const index = this._absoluteSources.indexOf(sourceAsMapRelative);
+      this._sourceLookupCache.set(aSource, index);
+      return index;
     }
 
-    // Maybe aSource is an absolute URL as returned by |sources|.  In
-    // this case we can't simply undo the transform.
-    for (let i = 0; i < this._absoluteSources.length; ++i) {
-      if (this._absoluteSources[i] == aSource) {
-        return i;
-      }
+    // Fall back to treating the source as sourceRoot-relative.
+    const sourceAsSourceRootRelative = util.computeSourceURL(
+      this.sourceRoot,
+      aSource,
+      this._sourceMapURL
+    );
+    if (this._absoluteSources.has(sourceAsSourceRootRelative)) {
+      const index = this._absoluteSources.indexOf(sourceAsSourceRootRelative);
+      this._sourceLookupCache.set(aSource, index);
+      return index;
     }
 
+    // To avoid this cache growing forever, we do not cache lookup misses.
     return -1;
   }
 
@@ -96544,12 +96532,12 @@ class BasicSourceMapConsumer extends SourceMapConsumer {
   }
 
   get sources() {
-    return this._absoluteSources.slice();
+    return this._absoluteSources.toArray();
   }
 
   _getMappingsPtr() {
     if (this._mappingsPtr === 0) {
-      this._parseMappings(this._mappings, this.sourceRoot);
+      this._parseMappings();
     }
 
     return this._mappingsPtr;
@@ -96560,11 +96548,18 @@ class BasicSourceMapConsumer extends SourceMapConsumer {
    * query (the ordered arrays in the `this.__generatedMappings` and
    * `this.__originalMappings` properties).
    */
-  _parseMappings(aStr, aSourceRoot) {
+  _parseMappings() {
+    const aStr = this._mappings;
     const size = aStr.length;
 
-    const mappingsBufPtr = this._wasm.exports.allocate_mappings(size);
-    const mappingsBuf = new Uint8Array(this._wasm.exports.memory.buffer, mappingsBufPtr, size);
+    // Interpret signed result of allocate_mappings as unsigned, otherwise
+    // addresses higher than 2GB will be negative.
+    const mappingsBufPtr = this._wasm.exports.allocate_mappings(size) >>> 0;
+    const mappingsBuf = new Uint8Array(
+      this._wasm.exports.memory.buffer,
+      mappingsBufPtr,
+      size
+    );
     for (let i = 0; i < size; i++) {
       mappingsBuf[i] = aStr.charCodeAt(i);
     }
@@ -96575,10 +96570,11 @@ class BasicSourceMapConsumer extends SourceMapConsumer {
       const error = this._wasm.exports.get_last_error();
       let msg = `Error parsing mappings (code ${error}): `;
 
-      // XXX: keep these error codes in sync with `fitzgen/source-map-mappings`.
+      // XXX: keep these error codes in sync with `wasm-mappings`.
       switch (error) {
         case 1:
-          msg += "the mappings contained a negative line, column, source index, or name index";
+          msg +=
+            "the mappings contained a negative line, column, source index, or name index";
           break;
         case 2:
           msg += "the mappings contained a number larger than 2**32";
@@ -96603,31 +96599,32 @@ class BasicSourceMapConsumer extends SourceMapConsumer {
   eachMapping(aCallback, aContext, aOrder) {
     const context = aContext || null;
     const order = aOrder || SourceMapConsumer.GENERATED_ORDER;
-    const sourceRoot = this.sourceRoot;
 
     this._wasm.withMappingCallback(
       mapping => {
         if (mapping.source !== null) {
-          mapping.source = this._sources.at(mapping.source);
-          mapping.source = util.computeSourceURL(sourceRoot, mapping.source, this._sourceMapURL);
+          mapping.source = this._absoluteSources.at(mapping.source);
 
           if (mapping.name !== null) {
             mapping.name = this._names.at(mapping.name);
           }
         }
+        if (this._computedColumnSpans && mapping.lastGeneratedColumn === null) {
+          mapping.lastGeneratedColumn = Infinity;
+        }
 
         aCallback.call(context, mapping);
       },
       () => {
         switch (order) {
-        case SourceMapConsumer.GENERATED_ORDER:
-          this._wasm.exports.by_generated_location(this._getMappingsPtr());
-          break;
-        case SourceMapConsumer.ORIGINAL_ORDER:
-          this._wasm.exports.by_original_location(this._getMappingsPtr());
-          break;
-        default:
-          throw new Error("Unknown order of iteration.");
+          case SourceMapConsumer.GENERATED_ORDER:
+            this._wasm.exports.by_generated_location(this._getMappingsPtr());
+            break;
+          case SourceMapConsumer.ORIGINAL_ORDER:
+            this._wasm.exports.by_original_location(this._getMappingsPtr());
+            break;
+          default:
+            throw new Error("Unknown order of iteration.");
         }
       }
     );
@@ -96664,7 +96661,8 @@ class BasicSourceMapConsumer extends SourceMapConsumer {
           column: m.generatedColumn,
           lastColumn,
         });
-      }, () => {
+      },
+      () => {
         this._wasm.exports.all_generated_locations_for(
           this._getMappingsPtr(),
           source,
@@ -96725,7 +96723,7 @@ class BasicSourceMapConsumer extends SourceMapConsumer {
   originalPositionFor(aArgs) {
     const needle = {
       generatedLine: util.getArg(aArgs, "line"),
-      generatedColumn: util.getArg(aArgs, "column")
+      generatedColumn: util.getArg(aArgs, "column"),
     };
 
     if (needle.generatedLine < 1) {
@@ -96736,27 +96734,33 @@ class BasicSourceMapConsumer extends SourceMapConsumer {
       throw new Error("Column numbers must be >= 0");
     }
 
-    let bias = util.getArg(aArgs, "bias", SourceMapConsumer.GREATEST_LOWER_BOUND);
+    let bias = util.getArg(
+      aArgs,
+      "bias",
+      SourceMapConsumer.GREATEST_LOWER_BOUND
+    );
     if (bias == null) {
       bias = SourceMapConsumer.GREATEST_LOWER_BOUND;
     }
 
     let mapping;
-    this._wasm.withMappingCallback(m => mapping = m, () => {
-      this._wasm.exports.original_location_for(
-        this._getMappingsPtr(),
-        needle.generatedLine - 1,
-        needle.generatedColumn,
-        bias
-      );
-    });
+    this._wasm.withMappingCallback(
+      m => (mapping = m),
+      () => {
+        this._wasm.exports.original_location_for(
+          this._getMappingsPtr(),
+          needle.generatedLine - 1,
+          needle.generatedColumn,
+          bias
+        );
+      }
+    );
 
     if (mapping) {
       if (mapping.generatedLine === needle.generatedLine) {
         let source = util.getArg(mapping, "source", null);
         if (source !== null) {
-          source = this._sources.at(source);
-          source = util.computeSourceURL(this.sourceRoot, source, this._sourceMapURL);
+          source = this._absoluteSources.at(source);
         }
 
         let name = util.getArg(mapping, "name", null);
@@ -96768,7 +96772,7 @@ class BasicSourceMapConsumer extends SourceMapConsumer {
           source,
           line: util.getArg(mapping, "originalLine", null),
           column: util.getArg(mapping, "originalColumn", null),
-          name
+          name,
         };
       }
     }
@@ -96777,7 +96781,7 @@ class BasicSourceMapConsumer extends SourceMapConsumer {
       source: null,
       line: null,
       column: null,
-      name: null
+      name: null,
     };
   }
 
@@ -96789,8 +96793,12 @@ class BasicSourceMapConsumer extends SourceMapConsumer {
     if (!this.sourcesContent) {
       return false;
     }
-    return this.sourcesContent.length >= this._sources.size() &&
-      !this.sourcesContent.some(function(sc) { return sc == null; });
+    return (
+      this.sourcesContent.length >= this._sources.size() &&
+      !this.sourcesContent.some(function (sc) {
+        return sc == null;
+      })
+    );
   }
 
   /**
@@ -96808,30 +96816,6 @@ class BasicSourceMapConsumer extends SourceMapConsumer {
       return this.sourcesContent[index];
     }
 
-    let relativeSource = aSource;
-    if (this.sourceRoot != null) {
-      relativeSource = util.relative(this.sourceRoot, relativeSource);
-    }
-
-    let url;
-    if (this.sourceRoot != null
-        && (url = util.urlParse(this.sourceRoot))) {
-      // XXX: file:// URIs and absolute paths lead to unexpected behavior for
-      // many users. We can help them out when they expect file:// URIs to
-      // behave like it would if they were running a local HTTP server. See
-      // https://bugzilla.mozilla.org/show_bug.cgi?id=885597.
-      const fileUriAbsPath = relativeSource.replace(/^file:\/\//, "");
-      if (url.scheme == "file"
-          && this._sources.has(fileUriAbsPath)) {
-        return this.sourcesContent[this._sources.indexOf(fileUriAbsPath)];
-      }
-
-      if ((!url.path || url.path == "/")
-          && this._sources.has("/" + relativeSource)) {
-        return this.sourcesContent[this._sources.indexOf("/" + relativeSource)];
-      }
-    }
-
     // This function is used recursively from
     // IndexedSourceMapConsumer.prototype.sourceContentFor. In that case, we
     // don't want to throw if we can't find the source - we just want to
@@ -96840,7 +96824,7 @@ class BasicSourceMapConsumer extends SourceMapConsumer {
       return null;
     }
 
-    throw new Error('"' + relativeSource + '" is not in the SourceMap.');
+    throw new Error('"' + aSource + '" is not in the SourceMap.');
   }
 
   /**
@@ -96873,14 +96857,14 @@ class BasicSourceMapConsumer extends SourceMapConsumer {
       return {
         line: null,
         column: null,
-        lastColumn: null
+        lastColumn: null,
       };
     }
 
     const needle = {
       source,
       originalLine: util.getArg(aArgs, "line"),
-      originalColumn: util.getArg(aArgs, "column")
+      originalColumn: util.getArg(aArgs, "column"),
     };
 
     if (needle.originalLine < 1) {
@@ -96891,21 +96875,28 @@ class BasicSourceMapConsumer extends SourceMapConsumer {
       throw new Error("Column numbers must be >= 0");
     }
 
-    let bias = util.getArg(aArgs, "bias", SourceMapConsumer.GREATEST_LOWER_BOUND);
+    let bias = util.getArg(
+      aArgs,
+      "bias",
+      SourceMapConsumer.GREATEST_LOWER_BOUND
+    );
     if (bias == null) {
       bias = SourceMapConsumer.GREATEST_LOWER_BOUND;
     }
 
     let mapping;
-    this._wasm.withMappingCallback(m => mapping = m, () => {
-      this._wasm.exports.generated_location_for(
-        this._getMappingsPtr(),
-        needle.source,
-        needle.originalLine - 1,
-        needle.originalColumn,
-        bias
-      );
-    });
+    this._wasm.withMappingCallback(
+      m => (mapping = m),
+      () => {
+        this._wasm.exports.generated_location_for(
+          this._getMappingsPtr(),
+          needle.source,
+          needle.originalLine - 1,
+          needle.originalColumn,
+          bias
+        );
+      }
+    );
 
     if (mapping) {
       if (mapping.source === needle.source) {
@@ -96924,7 +96915,7 @@ class BasicSourceMapConsumer extends SourceMapConsumer {
     return {
       line: null,
       column: null,
-      lastColumn: null
+      lastColumn: null,
     };
   }
 }
@@ -96996,125 +96987,56 @@ class IndexedSourceMapConsumer extends SourceMapConsumer {
         throw new Error("Unsupported version: " + version);
       }
 
-      that._sources = new ArraySet();
-      that._names = new ArraySet();
-      that.__generatedMappings = null;
-      that.__originalMappings = null;
-      that.__generatedMappingsUnsorted = null;
-      that.__originalMappingsUnsorted = null;
-
       let lastOffset = {
         line: -1,
-        column: 0
+        column: 0,
       };
-      return Promise.all(sections.map(s => {
-        if (s.url) {
-          // The url field will require support for asynchronicity.
-          // See https://github.com/mozilla/source-map/issues/16
-          throw new Error("Support for url field in sections not implemented.");
-        }
-        const offset = util.getArg(s, "offset");
-        const offsetLine = util.getArg(offset, "line");
-        const offsetColumn = util.getArg(offset, "column");
-
-        if (offsetLine < lastOffset.line ||
-            (offsetLine === lastOffset.line && offsetColumn < lastOffset.column)) {
-          throw new Error("Section offsets must be ordered and non-overlapping.");
-        }
-        lastOffset = offset;
-
-        const cons = new SourceMapConsumer(util.getArg(s, "map"), aSourceMapURL);
-        return cons.then(consumer => {
-          return {
-            generatedOffset: {
-              // The offset fields are 0-based, but we use 1-based indices when
-              // encoding/decoding from VLQ.
-              generatedLine: offsetLine + 1,
-              generatedColumn: offsetColumn + 1
-            },
-            consumer
-          };
-        });
-      })).then(s => {
+      return Promise.all(
+        sections.map(s => {
+          if (s.url) {
+            // The url field will require support for asynchronicity.
+            // See https://github.com/mozilla/source-map/issues/16
+            throw new Error(
+              "Support for url field in sections not implemented."
+            );
+          }
+          const offset = util.getArg(s, "offset");
+          const offsetLine = util.getArg(offset, "line");
+          const offsetColumn = util.getArg(offset, "column");
+
+          if (
+            offsetLine < lastOffset.line ||
+            (offsetLine === lastOffset.line && offsetColumn < lastOffset.column)
+          ) {
+            throw new Error(
+              "Section offsets must be ordered and non-overlapping."
+            );
+          }
+          lastOffset = offset;
+
+          const cons = new SourceMapConsumer(
+            util.getArg(s, "map"),
+            aSourceMapURL
+          );
+          return cons.then(consumer => {
+            return {
+              generatedOffset: {
+                // The offset fields are 0-based, but we use 1-based indices when
+                // encoding/decoding from VLQ.
+                generatedLine: offsetLine + 1,
+                generatedColumn: offsetColumn + 1,
+              },
+              consumer,
+            };
+          });
+        })
+      ).then(s => {
         that._sections = s;
         return that;
       });
     });
   }
 
-  // `__generatedMappings` and `__originalMappings` are arrays that hold the
-  // parsed mapping coordinates from the source map's "mappings" attribute. They
-  // are lazily instantiated, accessed via the `_generatedMappings` and
-  // `_originalMappings` getters respectively, and we only parse the mappings
-  // and create these arrays once queried for a source location. We jump through
-  // these hoops because there can be many thousands of mappings, and parsing
-  // them is expensive, so we only want to do it if we must.
-  //
-  // Each object in the arrays is of the form:
-  //
-  //     {
-  //       generatedLine: The line number in the generated code,
-  //       generatedColumn: The column number in the generated code,
-  //       source: The path to the original source file that generated this
-  //               chunk of code,
-  //       originalLine: The line number in the original source that
-  //                     corresponds to this chunk of generated code,
-  //       originalColumn: The column number in the original source that
-  //                       corresponds to this chunk of generated code,
-  //       name: The name of the original symbol which generated this chunk of
-  //             code.
-  //     }
-  //
-  // All properties except for `generatedLine` and `generatedColumn` can be
-  // `null`.
-  //
-  // `_generatedMappings` is ordered by the generated positions.
-  //
-  // `_originalMappings` is ordered by the original positions.
-  get _generatedMappings() {
-    if (!this.__generatedMappings) {
-      this._sortGeneratedMappings();
-    }
-
-    return this.__generatedMappings;
-  }
-
-  get _originalMappings() {
-    if (!this.__originalMappings) {
-      this._sortOriginalMappings();
-    }
-
-    return this.__originalMappings;
-  }
-
-  get _generatedMappingsUnsorted() {
-    if (!this.__generatedMappingsUnsorted) {
-      this._parseMappings(this._mappings, this.sourceRoot);
-    }
-
-    return this.__generatedMappingsUnsorted;
-  }
-
-  get _originalMappingsUnsorted() {
-    if (!this.__originalMappingsUnsorted) {
-      this._parseMappings(this._mappings, this.sourceRoot);
-    }
-
-    return this.__originalMappingsUnsorted;
-  }
-
-  _sortGeneratedMappings() {
-    const mappings = this._generatedMappingsUnsorted;
-    mappings.sort(util.compareByGeneratedPositionsDeflated);
-    this.__generatedMappings = mappings;
-  }
-
-  _sortOriginalMappings() {
-    const mappings = this._originalMappingsUnsorted;
-    mappings.sort(util.compareByOriginalPositions);
-    this.__originalMappings = mappings;
-  }
-
   /**
    * The list of original sources.
    */
@@ -97150,21 +97072,29 @@ class IndexedSourceMapConsumer extends SourceMapConsumer {
   originalPositionFor(aArgs) {
     const needle = {
       generatedLine: util.getArg(aArgs, "line"),
-      generatedColumn: util.getArg(aArgs, "column")
+      generatedColumn: util.getArg(aArgs, "column"),
     };
 
     // Find the section containing the generated position we're trying to map
     // to an original position.
-    const sectionIndex = binarySearch.search(needle, this._sections,
-      function(aNeedle, section) {
-        const cmp = aNeedle.generatedLine - section.generatedOffset.generatedLine;
+    const sectionIndex = binarySearch.search(
+      needle,
+      this._sections,
+      function (aNeedle, section) {
+        const cmp =
+          aNeedle.generatedLine - section.generatedOffset.generatedLine;
         if (cmp) {
           return cmp;
         }
 
-        return (aNeedle.generatedColumn -
-                section.generatedOffset.generatedColumn);
-      });
+        // The generated column is 0-based, but the section offset column is
+        // stored 1-based.
+        return (
+          aNeedle.generatedColumn -
+          (section.generatedOffset.generatedColumn - 1)
+        );
+      }
+    );
     const section = this._sections[sectionIndex];
 
     if (!section) {
@@ -97172,18 +97102,18 @@ class IndexedSourceMapConsumer extends SourceMapConsumer {
         source: null,
         line: null,
         column: null,
-        name: null
+        name: null,
       };
     }
 
     return section.consumer.originalPositionFor({
-      line: needle.generatedLine -
-        (section.generatedOffset.generatedLine - 1),
-      column: needle.generatedColumn -
+      line: needle.generatedLine - (section.generatedOffset.generatedLine - 1),
+      column:
+        needle.generatedColumn -
         (section.generatedOffset.generatedLine === needle.generatedLine
-         ? section.generatedOffset.generatedColumn - 1
-         : 0),
-      bias: aArgs.bias
+          ? section.generatedOffset.generatedColumn - 1
+          : 0),
+      bias: aArgs.bias,
     });
   }
 
@@ -97192,7 +97122,7 @@ class IndexedSourceMapConsumer extends SourceMapConsumer {
    * map, false otherwise.
    */
   hasContentsOfAllSources() {
-    return this._sections.every(function(s) {
+    return this._sections.every(function (s) {
       return s.consumer.hasContentsOfAllSources();
     });
   }
@@ -97217,6 +97147,16 @@ class IndexedSourceMapConsumer extends SourceMapConsumer {
     throw new Error('"' + aSource + '" is not in the SourceMap.');
   }
 
+  _findSectionIndex(source) {
+    for (let i = 0; i < this._sections.length; i++) {
+      const { consumer } = this._sections[i];
+      if (consumer._findSourceIndex(source) !== -1) {
+        return i;
+      }
+    }
+    return -1;
+  }
+
   /**
    * Returns the generated line and column information for the original source,
    * line, and column positions provided. The only argument is an object with
@@ -97236,230 +97176,124 @@ class IndexedSourceMapConsumer extends SourceMapConsumer {
    *     The column number is 0-based.
    */
   generatedPositionFor(aArgs) {
-    for (let i = 0; i < this._sections.length; i++) {
-      const section = this._sections[i];
+    const index = this._findSectionIndex(util.getArg(aArgs, "source"));
+    const section = index >= 0 ? this._sections[index] : null;
+    const nextSection =
+      index >= 0 && index + 1 < this._sections.length
+        ? this._sections[index + 1]
+        : null;
 
-      // Only consider this section if the requested source is in the list of
-      // sources of the consumer.
-      if (section.consumer._findSourceIndex(util.getArg(aArgs, "source")) === -1) {
-        continue;
+    const generatedPosition =
+      section && section.consumer.generatedPositionFor(aArgs);
+    if (generatedPosition && generatedPosition.line !== null) {
+      const lineShift = section.generatedOffset.generatedLine - 1;
+      const columnShift = section.generatedOffset.generatedColumn - 1;
+
+      if (generatedPosition.line === 1) {
+        generatedPosition.column += columnShift;
+        if (typeof generatedPosition.lastColumn === "number") {
+          generatedPosition.lastColumn += columnShift;
+        }
       }
-      const generatedPosition = section.consumer.generatedPositionFor(aArgs);
-      if (generatedPosition) {
-        const ret = {
-          line: generatedPosition.line +
-            (section.generatedOffset.generatedLine - 1),
-          column: generatedPosition.column +
-            (section.generatedOffset.generatedLine === generatedPosition.line
-             ? section.generatedOffset.generatedColumn - 1
-             : 0)
-        };
-        return ret;
+
+      if (
+        generatedPosition.lastColumn === Infinity &&
+        nextSection &&
+        generatedPosition.line === nextSection.generatedOffset.generatedLine
+      ) {
+        generatedPosition.lastColumn =
+          nextSection.generatedOffset.generatedColumn - 2;
       }
+      generatedPosition.line += lineShift;
+
+      return generatedPosition;
     }
 
     return {
       line: null,
-      column: null
+      column: null,
+      lastColumn: null,
     };
   }
 
-  /**
-   * Parse the mappings in a string in to a data structure which we can easily
-   * query (the ordered arrays in the `this.__generatedMappings` and
-   * `this.__originalMappings` properties).
-   */
-  _parseMappings(aStr, aSourceRoot) {
-    const generatedMappings = this.__generatedMappingsUnsorted = [];
-    const originalMappings = this.__originalMappingsUnsorted = [];
-    for (let i = 0; i < this._sections.length; i++) {
-      const section = this._sections[i];
-
-      const sectionMappings = [];
-      section.consumer.eachMapping(m => sectionMappings.push(m));
+  allGeneratedPositionsFor(aArgs) {
+    const index = this._findSectionIndex(util.getArg(aArgs, "source"));
+    const section = index >= 0 ? this._sections[index] : null;
+    const nextSection =
+      index >= 0 && index + 1 < this._sections.length
+        ? this._sections[index + 1]
+        : null;
 
-      for (let j = 0; j < sectionMappings.length; j++) {
-        const mapping = sectionMappings[j];
+    if (!section) return [];
 
-        // TODO: test if null is correct here.  The original code used
-        // `source`, which would actually have gotten used as null because
-        // var's get hoisted.
-        // See: https://github.com/mozilla/source-map/issues/333
-        let source = util.computeSourceURL(section.consumer.sourceRoot, null, this._sourceMapURL);
-        this._sources.add(source);
-        source = this._sources.indexOf(source);
+    return section.consumer
+      .allGeneratedPositionsFor(aArgs)
+      .map(generatedPosition => {
+        const lineShift = section.generatedOffset.generatedLine - 1;
+        const columnShift = section.generatedOffset.generatedColumn - 1;
 
-        let name = null;
-        if (mapping.name) {
-          this._names.add(mapping.name);
-          name = this._names.indexOf(mapping.name);
+        if (generatedPosition.line === 1) {
+          generatedPosition.column += columnShift;
+          if (typeof generatedPosition.lastColumn === "number") {
+            generatedPosition.lastColumn += columnShift;
+          }
         }
 
-        // The mappings coming from the consumer for the section have
-        // generated positions relative to the start of the section, so we
-        // need to offset them to be relative to the start of the concatenated
-        // generated file.
-        const adjustedMapping = {
-          source,
-          generatedLine: mapping.generatedLine +
-            (section.generatedOffset.generatedLine - 1),
-          generatedColumn: mapping.generatedColumn +
-            (section.generatedOffset.generatedLine === mapping.generatedLine
-            ? section.generatedOffset.generatedColumn - 1
-            : 0),
-          originalLine: mapping.originalLine,
-          originalColumn: mapping.originalColumn,
-          name
-        };
-
-        generatedMappings.push(adjustedMapping);
-        if (typeof adjustedMapping.originalLine === "number") {
-          originalMappings.push(adjustedMapping);
+        if (
+          generatedPosition.lastColumn === Infinity &&
+          nextSection &&
+          generatedPosition.line === nextSection.generatedOffset.generatedLine
+        ) {
+          generatedPosition.lastColumn =
+            nextSection.generatedOffset.generatedColumn - 2;
         }
-      }
-    }
-  }
-
-  eachMapping(aCallback, aContext, aOrder) {
-    const context = aContext || null;
-    const order = aOrder || SourceMapConsumer.GENERATED_ORDER;
-
-    let mappings;
-    switch (order) {
-    case SourceMapConsumer.GENERATED_ORDER:
-      mappings = this._generatedMappings;
-      break;
-    case SourceMapConsumer.ORIGINAL_ORDER:
-      mappings = this._originalMappings;
-      break;
-    default:
-      throw new Error("Unknown order of iteration.");
-    }
+        generatedPosition.line += lineShift;
 
-    const sourceRoot = this.sourceRoot;
-    mappings.map(function(mapping) {
-      let source = null;
-      if (mapping.source !== null) {
-        source = this._sources.at(mapping.source);
-        source = util.computeSourceURL(sourceRoot, source, this._sourceMapURL);
-      }
-      return {
-        source,
-        generatedLine: mapping.generatedLine,
-        generatedColumn: mapping.generatedColumn,
-        originalLine: mapping.originalLine,
-        originalColumn: mapping.originalColumn,
-        name: mapping.name === null ? null : this._names.at(mapping.name)
-      };
-    }, this).forEach(aCallback, context);
-  }
-
-  /**
-   * Find the mapping that best matches the hypothetical "needle" mapping that
-   * we are searching for in the given "haystack" of mappings.
-   */
-  _findMapping(aNeedle, aMappings, aLineName,
-              aColumnName, aComparator, aBias) {
-    // To return the position we are searching for, we must first find the
-    // mapping for the given position and then return the opposite position it
-    // points to. Because the mappings are sorted, we can use binary search to
-    // find the best mapping.
-
-    if (aNeedle[aLineName] <= 0) {
-      throw new TypeError("Line must be greater than or equal to 1, got "
-                          + aNeedle[aLineName]);
-    }
-    if (aNeedle[aColumnName] < 0) {
-      throw new TypeError("Column must be greater than or equal to 0, got "
-                          + aNeedle[aColumnName]);
-    }
-
-    return binarySearch.search(aNeedle, aMappings, aComparator, aBias);
+        return generatedPosition;
+      });
   }
 
-  allGeneratedPositionsFor(aArgs) {
-    const line = util.getArg(aArgs, "line");
-
-    // When there is no exact match, BasicSourceMapConsumer.prototype._findMapping
-    // returns the index of the closest mapping less than the needle. By
-    // setting needle.originalColumn to 0, we thus find the last mapping for
-    // the given line, provided such a mapping exists.
-    const needle = {
-      source: util.getArg(aArgs, "source"),
-      originalLine: line,
-      originalColumn: util.getArg(aArgs, "column", 0)
-    };
-
-    needle.source = this._findSourceIndex(needle.source);
-    if (needle.source < 0) {
-      return [];
-    }
+  eachMapping(aCallback, aContext, aOrder) {
+    this._sections.forEach((section, index) => {
+      const nextSection =
+        index + 1 < this._sections.length ? this._sections[index + 1] : null;
+      const { generatedOffset } = section;
 
-    if (needle.originalLine < 1) {
-      throw new Error("Line numbers must be >= 1");
-    }
+      const lineShift = generatedOffset.generatedLine - 1;
+      const columnShift = generatedOffset.generatedColumn - 1;
 
-    if (needle.originalColumn < 0) {
-      throw new Error("Column numbers must be >= 0");
-    }
+      section.consumer.eachMapping(
+        function (mapping) {
+          if (mapping.generatedLine === 1) {
+            mapping.generatedColumn += columnShift;
 
-    const mappings = [];
-
-    let index = this._findMapping(needle,
-                                  this._originalMappings,
-                                  "originalLine",
-                                  "originalColumn",
-                                  util.compareByOriginalPositions,
-                                  binarySearch.LEAST_UPPER_BOUND);
-    if (index >= 0) {
-      let mapping = this._originalMappings[index];
-
-      if (aArgs.column === undefined) {
-        const originalLine = mapping.originalLine;
-
-        // Iterate until either we run out of mappings, or we run into
-        // a mapping for a different line than the one we found. Since
-        // mappings are sorted, this is guaranteed to find all mappings for
-        // the line we found.
-        while (mapping && mapping.originalLine === originalLine) {
-          let lastColumn = mapping.lastGeneratedColumn;
-          if (this._computedColumnSpans && lastColumn === null) {
-            lastColumn = Infinity;
+            if (typeof mapping.lastGeneratedColumn === "number") {
+              mapping.lastGeneratedColumn += columnShift;
+            }
           }
-          mappings.push({
-            line: util.getArg(mapping, "generatedLine", null),
-            column: util.getArg(mapping, "generatedColumn", null),
-            lastColumn,
-          });
 
-          mapping = this._originalMappings[++index];
-        }
-      } else {
-        const originalColumn = mapping.originalColumn;
-
-        // Iterate until either we run out of mappings, or we run into
-        // a mapping for a different line than the one we were searching for.
-        // Since mappings are sorted, this is guaranteed to find all mappings for
-        // the line we are searching for.
-        while (mapping &&
-               mapping.originalLine === line &&
-               mapping.originalColumn == originalColumn) {
-          let lastColumn = mapping.lastGeneratedColumn;
-          if (this._computedColumnSpans && lastColumn === null) {
-            lastColumn = Infinity;
+          if (
+            mapping.lastGeneratedColumn === Infinity &&
+            nextSection &&
+            mapping.generatedLine === nextSection.generatedOffset.generatedLine
+          ) {
+            mapping.lastGeneratedColumn =
+              nextSection.generatedOffset.generatedColumn - 2;
           }
-          mappings.push({
-            line: util.getArg(mapping, "generatedLine", null),
-            column: util.getArg(mapping, "generatedColumn", null),
-            lastColumn,
-          });
+          mapping.generatedLine += lineShift;
 
-          mapping = this._originalMappings[++index];
-        }
-      }
-    }
+          aCallback.call(this, mapping);
+        },
+        aContext,
+        aOrder
+      );
+    });
+  }
 
-    return mappings;
+  computeColumnSpans() {
+    for (let i = 0; i < this._sections.length; i++) {
+      this._sections[i].consumer.computeColumnSpans();
+    }
   }
 
   destroy() {
@@ -97480,7 +97314,8 @@ function _factory(aSourceMap, aSourceMapURL) {
     sourceMap = util.parseSourceMapInput(aSourceMap);
   }
 
-  const consumer = sourceMap.sections != null
+  const consumer =
+    sourceMap.sections != null
       ? new IndexedSourceMapConsumer(sourceMap, aSourceMapURL)
       : new BasicSourceMapConsumer(sourceMap, aSourceMapURL);
   return Promise.resolve(consumer);
@@ -97542,14 +97377,14 @@ class SourceMapGenerator {
     const sourceRoot = aSourceMapConsumer.sourceRoot;
     const generator = new SourceMapGenerator({
       file: aSourceMapConsumer.file,
-      sourceRoot
+      sourceRoot,
     });
-    aSourceMapConsumer.eachMapping(function(mapping) {
+    aSourceMapConsumer.eachMapping(function (mapping) {
       const newMapping = {
         generated: {
           line: mapping.generatedLine,
-          column: mapping.generatedColumn
-        }
+          column: mapping.generatedColumn,
+        },
       };
 
       if (mapping.source != null) {
@@ -97560,7 +97395,7 @@ class SourceMapGenerator {
 
         newMapping.original = {
           line: mapping.originalLine,
-          column: mapping.originalColumn
+          column: mapping.originalColumn,
         };
 
         if (mapping.name != null) {
@@ -97570,9 +97405,9 @@ class SourceMapGenerator {
 
       generator.addMapping(newMapping);
     });
-    aSourceMapConsumer.sources.forEach(function(sourceFile) {
+    aSourceMapConsumer.sources.forEach(function (sourceFile) {
       let sourceRelative = sourceFile;
-      if (sourceRoot !== null) {
+      if (sourceRoot != null) {
         sourceRelative = util.relative(sourceRoot, sourceFile);
       }
 
@@ -97625,10 +97460,10 @@ class SourceMapGenerator {
     this._mappings.add({
       generatedLine: generated.line,
       generatedColumn: generated.column,
-      originalLine: original != null && original.line,
-      originalColumn: original != null && original.column,
+      originalLine: original && original.line,
+      originalColumn: original && original.column,
       source,
-      name
+      name,
     });
   }
 
@@ -97681,7 +97516,7 @@ class SourceMapGenerator {
       if (aSourceMapConsumer.file == null) {
         throw new Error(
           "SourceMapGenerator.prototype.applySourceMap requires either an explicit source file, " +
-          'or the source map\'s "file" property. Both were omitted.'
+            'or the source map\'s "file" property. Both were omitted.'
         );
       }
       sourceFile = aSourceMapConsumer.file;
@@ -97693,18 +97528,17 @@ class SourceMapGenerator {
     }
     // Applying the SourceMap can add and remove items from the sources and
     // the names array.
-    const newSources = this._mappings.toArray().length > 0
-      ? new ArraySet()
-      : this._sources;
+    const newSources =
+      this._mappings.toArray().length > 0 ? new ArraySet() : this._sources;
     const newNames = new ArraySet();
 
     // Find mappings for the "sourceFile"
-    this._mappings.unsortedForEach(function(mapping) {
+    this._mappings.unsortedForEach(function (mapping) {
       if (mapping.source === sourceFile && mapping.originalLine != null) {
         // Check if it can be mapped by the source map, then update the mapping.
         const original = aSourceMapConsumer.originalPositionFor({
           line: mapping.originalLine,
-          column: mapping.originalColumn
+          column: mapping.originalColumn,
         });
         if (original.source != null) {
           // Copy mapping
@@ -97732,13 +97566,12 @@ class SourceMapGenerator {
       if (name != null && !newNames.has(name)) {
         newNames.add(name);
       }
-
     }, this);
     this._sources = newSources;
     this._names = newNames;
 
     // Copy sourcesContents of applied map.
-    aSourceMapConsumer.sources.forEach(function(srcFile) {
+    aSourceMapConsumer.sources.forEach(function (srcFile) {
       const content = aSourceMapConsumer.sourceContentFor(srcFile);
       if (content != null) {
         if (aSourceMapPath != null) {
@@ -97768,33 +97601,53 @@ class SourceMapGenerator {
     // it is most likely a programmer error. In this case we throw a very
     // specific error message to try to guide them the right way.
     // For example: https://github.com/Polymer/polymer-bundler/pull/519
-    if (aOriginal && typeof aOriginal.line !== "number" && typeof aOriginal.column !== "number") {
-        throw new Error(
-            "original.line and original.column are not numbers -- you probably meant to omit " +
-            "the original mapping entirely and only map the generated position. If so, pass " +
-            "null for the original mapping instead of an object with empty or null values."
-        );
+    if (
+      aOriginal &&
+      typeof aOriginal.line !== "number" &&
+      typeof aOriginal.column !== "number"
+    ) {
+      throw new Error(
+        "original.line and original.column are not numbers -- you probably meant to omit " +
+          "the original mapping entirely and only map the generated position. If so, pass " +
+          "null for the original mapping instead of an object with empty or null values."
+      );
     }
 
-    if (aGenerated && "line" in aGenerated && "column" in aGenerated
-        && aGenerated.line > 0 && aGenerated.column >= 0
-        && !aOriginal && !aSource && !aName) {
+    if (
+      aGenerated &&
+      "line" in aGenerated &&
+      "column" in aGenerated &&
+      aGenerated.line > 0 &&
+      aGenerated.column >= 0 &&
+      !aOriginal &&
+      !aSource &&
+      !aName
+    ) {
       // Case 1.
-
-    } else if (aGenerated && "line" in aGenerated && "column" in aGenerated
-             && aOriginal && "line" in aOriginal && "column" in aOriginal
-             && aGenerated.line > 0 && aGenerated.column >= 0
-             && aOriginal.line > 0 && aOriginal.column >= 0
-             && aSource) {
+    } else if (
+      aGenerated &&
+      "line" in aGenerated &&
+      "column" in aGenerated &&
+      aOriginal &&
+      "line" in aOriginal &&
+      "column" in aOriginal &&
+      aGenerated.line > 0 &&
+      aGenerated.column >= 0 &&
+      aOriginal.line > 0 &&
+      aOriginal.column >= 0 &&
+      aSource
+    ) {
       // Cases 2 and 3.
-
     } else {
-      throw new Error("Invalid mapping: " + JSON.stringify({
-        generated: aGenerated,
-        source: aSource,
-        original: aOriginal,
-        name: aName
-      }));
+      throw new Error(
+        "Invalid mapping: " +
+          JSON.stringify({
+            generated: aGenerated,
+            source: aSource,
+            original: aOriginal,
+            name: aName,
+          })
+      );
     }
   }
 
@@ -97827,14 +97680,17 @@ class SourceMapGenerator {
           previousGeneratedLine++;
         }
       } else if (i > 0) {
-        if (!util.compareByGeneratedPositionsInflated(mapping, mappings[i - 1])) {
+        if (
+          !util.compareByGeneratedPositionsInflated(mapping, mappings[i - 1])
+        ) {
           continue;
         }
         next += ",";
       }
 
-      next += base64VLQ.encode(mapping.generatedColumn
-                                 - previousGeneratedColumn);
+      next += base64VLQ.encode(
+        mapping.generatedColumn - previousGeneratedColumn
+      );
       previousGeneratedColumn = mapping.generatedColumn;
 
       if (mapping.source != null) {
@@ -97843,12 +97699,14 @@ class SourceMapGenerator {
         previousSource = sourceIdx;
 
         // lines are stored 0-based in SourceMap spec version 3
-        next += base64VLQ.encode(mapping.originalLine - 1
-                                   - previousOriginalLine);
+        next += base64VLQ.encode(
+          mapping.originalLine - 1 - previousOriginalLine
+        );
         previousOriginalLine = mapping.originalLine - 1;
 
-        next += base64VLQ.encode(mapping.originalColumn
-                                   - previousOriginalColumn);
+        next += base64VLQ.encode(
+          mapping.originalColumn - previousOriginalColumn
+        );
         previousOriginalColumn = mapping.originalColumn;
 
         if (mapping.name != null) {
@@ -97865,7 +97723,7 @@ class SourceMapGenerator {
   }
 
   _generateSourcesContent(aSources, aSourceRoot) {
-    return aSources.map(function(source) {
+    return aSources.map(function (source) {
       if (!this._sourcesContents) {
         return null;
       }
@@ -97887,7 +97745,7 @@ class SourceMapGenerator {
       version: this._version,
       sources: this._sources.toArray(),
       names: this._names.toArray(),
-      mappings: this._serializeMappings()
+      mappings: this._serializeMappings(),
     };
     if (this._file != null) {
       map.file = this._file;
@@ -97896,7 +97754,10 @@ class SourceMapGenerator {
       map.sourceRoot = this._sourceRoot;
     }
     if (this._sourcesContents) {
-      map.sourcesContent = this._generateSourcesContent(map.sources, map.sourceRoot);
+      map.sourcesContent = this._generateSourcesContent(
+        map.sources,
+        map.sourceRoot
+      );
     }
 
     return map;
@@ -97976,7 +97837,11 @@ class SourceNode {
    * @param aRelativePath Optional. The path that relative sources in the
    *        SourceMapConsumer should be relative to.
    */
-  static fromStringWithSourceMap(aGeneratedCode, aSourceMapConsumer, aRelativePath) {
+  static fromStringWithSourceMap(
+    aGeneratedCode,
+    aSourceMapConsumer,
+    aRelativePath
+  ) {
     // The SourceNode we want to fill with the generated code
     // and the SourceMap
     const node = new SourceNode();
@@ -97987,20 +97852,22 @@ class SourceNode {
     // Processed fragments are accessed by calling `shiftNextLine`.
     const remainingLines = aGeneratedCode.split(REGEX_NEWLINE);
     let remainingLinesIndex = 0;
-    const shiftNextLine = function() {
+    const shiftNextLine = function () {
       const lineContents = getNextLine();
       // The last line of a file might not have a newline.
       const newLine = getNextLine() || "";
       return lineContents + newLine;
 
       function getNextLine() {
-        return remainingLinesIndex < remainingLines.length ?
-            remainingLines[remainingLinesIndex++] : undefined;
+        return remainingLinesIndex < remainingLines.length
+          ? remainingLines[remainingLinesIndex++]
+          : undefined;
       }
     };
 
     // We need to remember the position of "remainingLines"
-    let lastGeneratedLine = 1, lastGeneratedColumn = 0;
+    let lastGeneratedLine = 1,
+      lastGeneratedColumn = 0;
 
     // The generate SourceNodes we need a code range.
     // To extract it current and last mapping is used.
@@ -98008,7 +97875,7 @@ class SourceNode {
     let lastMapping = null;
     let nextLine;
 
-    aSourceMapConsumer.eachMapping(function(mapping) {
+    aSourceMapConsumer.eachMapping(function (mapping) {
       if (lastMapping !== null) {
         // We add the code from "lastMapping" to "mapping":
         // First check if there is a new line in between.
@@ -98023,10 +97890,13 @@ class SourceNode {
           // Associate the code between "lastGeneratedColumn" and
           // "mapping.generatedColumn" with "lastMapping"
           nextLine = remainingLines[remainingLinesIndex] || "";
-          const code = nextLine.substr(0, mapping.generatedColumn -
-                                        lastGeneratedColumn);
-          remainingLines[remainingLinesIndex] = nextLine.substr(mapping.generatedColumn -
-                                              lastGeneratedColumn);
+          const code = nextLine.substr(
+            0,
+            mapping.generatedColumn - lastGeneratedColumn
+          );
+          remainingLines[remainingLinesIndex] = nextLine.substr(
+            mapping.generatedColumn - lastGeneratedColumn
+          );
           lastGeneratedColumn = mapping.generatedColumn;
           addMappingWithCode(lastMapping, code);
           // No more remaining code, continue
@@ -98044,7 +97914,9 @@ class SourceNode {
       if (lastGeneratedColumn < mapping.generatedColumn) {
         nextLine = remainingLines[remainingLinesIndex] || "";
         node.add(nextLine.substr(0, mapping.generatedColumn));
-        remainingLines[remainingLinesIndex] = nextLine.substr(mapping.generatedColumn);
+        remainingLines[remainingLinesIndex] = nextLine.substr(
+          mapping.generatedColumn
+        );
         lastGeneratedColumn = mapping.generatedColumn;
       }
       lastMapping = mapping;
@@ -98060,7 +97932,7 @@ class SourceNode {
     }
 
     // Copy sourcesContent into SourceNode
-    aSourceMapConsumer.sources.forEach(function(sourceFile) {
+    aSourceMapConsumer.sources.forEach(function (sourceFile) {
       const content = aSourceMapConsumer.sourceContentFor(sourceFile);
       if (content != null) {
         if (aRelativePath != null) {
@@ -98079,11 +97951,15 @@ class SourceNode {
         const source = aRelativePath
           ? util.join(aRelativePath, mapping.source)
           : mapping.source;
-        node.add(new SourceNode(mapping.originalLine,
-                                mapping.originalColumn,
-                                source,
-                                code,
-                                mapping.name));
+        node.add(
+          new SourceNode(
+            mapping.originalLine,
+            mapping.originalColumn,
+            source,
+            code,
+            mapping.name
+          )
+        );
       }
     }
   }
@@ -98096,7 +97972,7 @@ class SourceNode {
    */
   add(aChunk) {
     if (Array.isArray(aChunk)) {
-      aChunk.forEach(function(chunk) {
+      aChunk.forEach(function (chunk) {
         this.add(chunk);
       }, this);
     } else if (aChunk[isSourceNode] || typeof aChunk === "string") {
@@ -98105,7 +97981,8 @@ class SourceNode {
       }
     } else {
       throw new TypeError(
-        "Expected a SourceNode, string, or an array of SourceNodes and strings. Got " + aChunk
+        "Expected a SourceNode, string, or an array of SourceNodes and strings. Got " +
+          aChunk
       );
     }
     return this;
@@ -98126,7 +98003,8 @@ class SourceNode {
       this.children.unshift(aChunk);
     } else {
       throw new TypeError(
-        "Expected a SourceNode, string, or an array of SourceNodes and strings. Got " + aChunk
+        "Expected a SourceNode, string, or an array of SourceNodes and strings. Got " +
+          aChunk
       );
     }
     return this;
@@ -98146,10 +98024,12 @@ class SourceNode {
       if (chunk[isSourceNode]) {
         chunk.walk(aFn);
       } else if (chunk !== "") {
-        aFn(chunk, { source: this.source,
-                      line: this.line,
-                      column: this.column,
-                      name: this.name });
+        aFn(chunk, {
+          source: this.source,
+          line: this.line,
+          column: this.column,
+          name: this.name,
+        });
       }
     }
   }
@@ -98188,7 +98068,10 @@ class SourceNode {
     if (lastChild[isSourceNode]) {
       lastChild.replaceRight(aPattern, aReplacement);
     } else if (typeof lastChild === "string") {
-      this.children[this.children.length - 1] = lastChild.replace(aPattern, aReplacement);
+      this.children[this.children.length - 1] = lastChild.replace(
+        aPattern,
+        aReplacement
+      );
     } else {
       this.children.push("".replace(aPattern, aReplacement));
     }
@@ -98231,7 +98114,7 @@ class SourceNode {
    */
   toString() {
     let str = "";
-    this.walk(function(chunk) {
+    this.walk(function (chunk) {
       str += chunk;
     });
     return str;
@@ -98245,7 +98128,7 @@ class SourceNode {
     const generated = {
       code: "",
       line: 1,
-      column: 0
+      column: 0,
     };
     const map = new SourceMapGenerator(aArgs);
     let sourceMappingActive = false;
@@ -98253,26 +98136,30 @@ class SourceNode {
     let lastOriginalLine = null;
     let lastOriginalColumn = null;
     let lastOriginalName = null;
-    this.walk(function(chunk, original) {
+    this.walk(function (chunk, original) {
       generated.code += chunk;
-      if (original.source !== null
-          && original.line !== null
-          && original.column !== null) {
-        if (lastOriginalSource !== original.source
-          || lastOriginalLine !== original.line
-          || lastOriginalColumn !== original.column
-          || lastOriginalName !== original.name) {
+      if (
+        original.source !== null &&
+        original.line !== null &&
+        original.column !== null
+      ) {
+        if (
+          lastOriginalSource !== original.source ||
+          lastOriginalLine !== original.line ||
+          lastOriginalColumn !== original.column ||
+          lastOriginalName !== original.name
+        ) {
           map.addMapping({
             source: original.source,
             original: {
               line: original.line,
-              column: original.column
+              column: original.column,
             },
             generated: {
               line: generated.line,
-              column: generated.column
+              column: generated.column,
             },
-            name: original.name
+            name: original.name,
           });
         }
         lastOriginalSource = original.source;
@@ -98284,8 +98171,8 @@ class SourceNode {
         map.addMapping({
           generated: {
             line: generated.line,
-            column: generated.column
-          }
+            column: generated.column,
+          },
         });
         lastOriginalSource = null;
         sourceMappingActive = false;
@@ -98303,13 +98190,13 @@ class SourceNode {
               source: original.source,
               original: {
                 line: original.line,
-                column: original.column
+                column: original.column,
               },
               generated: {
                 line: generated.line,
-                column: generated.column
+                column: generated.column,
               },
-              name: original.name
+              name: original.name,
             });
           }
         } else {
@@ -98317,7 +98204,7 @@ class SourceNode {
         }
       }
     });
-    this.walkSourceContents(function(sourceFile, sourceContent) {
+    this.walkSourceContents(function (sourceFile, sourceContent) {
       map.setSourceContent(sourceFile, sourceContent);
     });
 
@@ -98328,13 +98215,37 @@ class SourceNode {
 exports.SourceNode = SourceNode;
 
 
+/***/ }),
+
+/***/ "./node_modules/source-map/lib/url.js":
+/*!********************************************!*\
+  !*** ./node_modules/source-map/lib/url.js ***!
+  \********************************************/
+/***/ ((module, __unused_webpack_exports, __webpack_require__) => {
+
+"use strict";
+/* -*- Mode: js; js-indent-level: 2; -*- */
+/*
+ * Copyright 2011 Mozilla Foundation and contributors
+ * Licensed under the New BSD license. See LICENSE or:
+ * http://opensource.org/licenses/BSD-3-Clause
+ */
+
+
+// Note: This file is overridden in the 'package.json#browser' field to
+// substitute lib/url-browser.js instead.
+
+// Use the URL global for Node 10, and the 'url' module for Node 8.
+module.exports = typeof URL === "function" ? URL : (__webpack_require__(/*! url */ "url").URL);
+
+
 /***/ }),
 
 /***/ "./node_modules/source-map/lib/util.js":
 /*!*********************************************!*\
   !*** ./node_modules/source-map/lib/util.js ***!
   \*********************************************/
-/***/ ((__unused_webpack_module, exports) => {
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 /* -*- Mode: js; js-indent-level: 2; -*- */
 /*
@@ -98343,6 +98254,8 @@ exports.SourceNode = SourceNode;
  * http://opensource.org/licenses/BSD-3-Clause
  */
 
+const URL = __webpack_require__(/*! ./url */ "./node_modules/source-map/lib/url.js");
+
 /**
  * This is a helper function for getting values from parameter/options
  * objects.
@@ -98359,270 +98272,14 @@ function getArg(aArgs, aName, aDefaultValue) {
   } else if (arguments.length === 3) {
     return aDefaultValue;
   }
-    throw new Error('"' + aName + '" is a required argument.');
-
+  throw new Error('"' + aName + '" is a required argument.');
 }
 exports.getArg = getArg;
 
-const urlRegexp = /^(?:([\w+\-.]+):)?\/\/(?:(\w+:\w+)@)?([\w.-]*)(?::(\d+))?(.*)$/;
-const dataUrlRegexp = /^data:.+\,.+$/;
-
-function urlParse(aUrl) {
-  const match = aUrl.match(urlRegexp);
-  if (!match) {
-    return null;
-  }
-  return {
-    scheme: match[1],
-    auth: match[2],
-    host: match[3],
-    port: match[4],
-    path: match[5]
-  };
-}
-exports.urlParse = urlParse;
-
-function urlGenerate(aParsedUrl) {
-  let url = "";
-  if (aParsedUrl.scheme) {
-    url += aParsedUrl.scheme + ":";
-  }
-  url += "//";
-  if (aParsedUrl.auth) {
-    url += aParsedUrl.auth + "@";
-  }
-  if (aParsedUrl.host) {
-    url += aParsedUrl.host;
-  }
-  if (aParsedUrl.port) {
-    url += ":" + aParsedUrl.port;
-  }
-  if (aParsedUrl.path) {
-    url += aParsedUrl.path;
-  }
-  return url;
-}
-exports.urlGenerate = urlGenerate;
-
-const MAX_CACHED_INPUTS = 32;
-
-/**
- * Takes some function `f(input) -> result` and returns a memoized version of
- * `f`.
- *
- * We keep at most `MAX_CACHED_INPUTS` memoized results of `f` alive. The
- * memoization is a dumb-simple, linear least-recently-used cache.
- */
-function lruMemoize(f) {
-  const cache = [];
-
-  return function(input) {
-    for (let i = 0; i < cache.length; i++) {
-      if (cache[i].input === input) {
-        const temp = cache[0];
-        cache[0] = cache[i];
-        cache[i] = temp;
-        return cache[0].result;
-      }
-    }
-
-    const result = f(input);
-
-    cache.unshift({
-      input,
-      result,
-    });
-
-    if (cache.length > MAX_CACHED_INPUTS) {
-      cache.pop();
-    }
-
-    return result;
-  };
-}
-
-/**
- * Normalizes a path, or the path portion of a URL:
- *
- * - Replaces consecutive slashes with one slash.
- * - Removes unnecessary '.' parts.
- * - Removes unnecessary '<dir>/..' parts.
- *
- * Based on code in the Node.js 'path' core module.
- *
- * @param aPath The path or url to normalize.
- */
-const normalize = lruMemoize(function normalize(aPath) {
-  let path = aPath;
-  const url = urlParse(aPath);
-  if (url) {
-    if (!url.path) {
-      return aPath;
-    }
-    path = url.path;
-  }
-  const isAbsolute = exports.isAbsolute(path);
-
-  // Split the path into parts between `/` characters. This is much faster than
-  // using `.split(/\/+/g)`.
-  const parts = [];
-  let start = 0;
-  let i = 0;
-  while (true) {
-    start = i;
-    i = path.indexOf("/", start);
-    if (i === -1) {
-      parts.push(path.slice(start));
-      break;
-    } else {
-      parts.push(path.slice(start, i));
-      while (i < path.length && path[i] === "/") {
-        i++;
-      }
-    }
-  }
-
-  let up = 0;
-  for (i = parts.length - 1; i >= 0; i--) {
-    const part = parts[i];
-    if (part === ".") {
-      parts.splice(i, 1);
-    } else if (part === "..") {
-      up++;
-    } else if (up > 0) {
-      if (part === "") {
-        // The first part is blank if the path is absolute. Trying to go
-        // above the root is a no-op. Therefore we can remove all '..' parts
-        // directly after the root.
-        parts.splice(i + 1, up);
-        up = 0;
-      } else {
-        parts.splice(i, 2);
-        up--;
-      }
-    }
-  }
-  path = parts.join("/");
-
-  if (path === "") {
-    path = isAbsolute ? "/" : ".";
-  }
-
-  if (url) {
-    url.path = path;
-    return urlGenerate(url);
-  }
-  return path;
-});
-exports.normalize = normalize;
-
-/**
- * Joins two paths/URLs.
- *
- * @param aRoot The root path or URL.
- * @param aPath The path or URL to be joined with the root.
- *
- * - If aPath is a URL or a data URI, aPath is returned, unless aPath is a
- *   scheme-relative URL: Then the scheme of aRoot, if any, is prepended
- *   first.
- * - Otherwise aPath is a path. If aRoot is a URL, then its path portion
- *   is updated with the result and aRoot is returned. Otherwise the result
- *   is returned.
- *   - If aPath is absolute, the result is aPath.
- *   - Otherwise the two paths are joined with a slash.
- * - Joining for example 'http://' and 'www.example.com' is also supported.
- */
-function join(aRoot, aPath) {
-  if (aRoot === "") {
-    aRoot = ".";
-  }
-  if (aPath === "") {
-    aPath = ".";
-  }
-  const aPathUrl = urlParse(aPath);
-  const aRootUrl = urlParse(aRoot);
-  if (aRootUrl) {
-    aRoot = aRootUrl.path || "/";
-  }
-
-  // `join(foo, '//www.example.org')`
-  if (aPathUrl && !aPathUrl.scheme) {
-    if (aRootUrl) {
-      aPathUrl.scheme = aRootUrl.scheme;
-    }
-    return urlGenerate(aPathUrl);
-  }
-
-  if (aPathUrl || aPath.match(dataUrlRegexp)) {
-    return aPath;
-  }
-
-  // `join('http://', 'www.example.com')`
-  if (aRootUrl && !aRootUrl.host && !aRootUrl.path) {
-    aRootUrl.host = aPath;
-    return urlGenerate(aRootUrl);
-  }
-
-  const joined = aPath.charAt(0) === "/"
-    ? aPath
-    : normalize(aRoot.replace(/\/+$/, "") + "/" + aPath);
-
-  if (aRootUrl) {
-    aRootUrl.path = joined;
-    return urlGenerate(aRootUrl);
-  }
-  return joined;
-}
-exports.join = join;
-
-exports.isAbsolute = function(aPath) {
-  return aPath.charAt(0) === "/" || urlRegexp.test(aPath);
-};
-
-/**
- * Make a path relative to a URL or another path.
- *
- * @param aRoot The root path or URL.
- * @param aPath The path or URL to be made relative to aRoot.
- */
-function relative(aRoot, aPath) {
-  if (aRoot === "") {
-    aRoot = ".";
-  }
-
-  aRoot = aRoot.replace(/\/$/, "");
-
-  // It is possible for the path to be above the root. In this case, simply
-  // checking whether the root is a prefix of the path won't work. Instead, we
-  // need to remove components from the root one by one, until either we find
-  // a prefix that fits, or we run out of components to remove.
-  let level = 0;
-  while (aPath.indexOf(aRoot + "/") !== 0) {
-    const index = aRoot.lastIndexOf("/");
-    if (index < 0) {
-      return aPath;
-    }
-
-    // If the only part of the root that is left is the scheme (i.e. http://,
-    // file:///, etc.), one or more slashes (/), or simply nothing at all, we
-    // have exhausted all components, so the path is not relative to the root.
-    aRoot = aRoot.slice(0, index);
-    if (aRoot.match(/^([^\/]+:\/)?\/*$/)) {
-      return aPath;
-    }
-
-    ++level;
-  }
-
-  // Make sure we add a "../" for each component we removed from the root.
-  return Array(level + 1).join("../") + aPath.substr(aRoot.length + 1);
-}
-exports.relative = relative;
-
-const supportsNullProto = (function() {
+const supportsNullProto = (function () {
   const obj = Object.create(null);
   return !("__proto__" in obj);
-}());
+})();
 
 function identity(s) {
   return s;
@@ -98667,15 +98324,17 @@ function isProtoString(s) {
   }
 
   /* eslint-disable no-multi-spaces */
-  if (s.charCodeAt(length - 1) !== 95  /* '_' */ ||
-      s.charCodeAt(length - 2) !== 95  /* '_' */ ||
-      s.charCodeAt(length - 3) !== 111 /* 'o' */ ||
-      s.charCodeAt(length - 4) !== 116 /* 't' */ ||
-      s.charCodeAt(length - 5) !== 111 /* 'o' */ ||
-      s.charCodeAt(length - 6) !== 114 /* 'r' */ ||
-      s.charCodeAt(length - 7) !== 112 /* 'p' */ ||
-      s.charCodeAt(length - 8) !== 95  /* '_' */ ||
-      s.charCodeAt(length - 9) !== 95  /* '_' */) {
+  if (
+    s.charCodeAt(length - 1) !== 95 /* '_' */ ||
+    s.charCodeAt(length - 2) !== 95 /* '_' */ ||
+    s.charCodeAt(length - 3) !== 111 /* 'o' */ ||
+    s.charCodeAt(length - 4) !== 116 /* 't' */ ||
+    s.charCodeAt(length - 5) !== 111 /* 'o' */ ||
+    s.charCodeAt(length - 6) !== 114 /* 'r' */ ||
+    s.charCodeAt(length - 7) !== 112 /* 'p' */ ||
+    s.charCodeAt(length - 8) !== 95 /* '_' */ ||
+    s.charCodeAt(length - 9) !== 95 /* '_' */
+  ) {
     return false;
   }
   /* eslint-enable no-multi-spaces */
@@ -98689,61 +98348,38 @@ function isProtoString(s) {
   return true;
 }
 
-/**
- * Comparator between two mappings where the original positions are compared.
- *
- * Optionally pass in `true` as `onlyCompareGenerated` to consider two
- * mappings with the same original source/line/column, but different generated
- * line and column the same. Useful when searching for a mapping with a
- * stubbed out mapping.
- */
-function compareByOriginalPositions(mappingA, mappingB, onlyCompareOriginal) {
-  let cmp = strcmp(mappingA.source, mappingB.source);
-  if (cmp !== 0) {
-    return cmp;
-  }
-
-  cmp = mappingA.originalLine - mappingB.originalLine;
-  if (cmp !== 0) {
-    return cmp;
+function strcmp(aStr1, aStr2) {
+  if (aStr1 === aStr2) {
+    return 0;
   }
 
-  cmp = mappingA.originalColumn - mappingB.originalColumn;
-  if (cmp !== 0 || onlyCompareOriginal) {
-    return cmp;
+  if (aStr1 === null) {
+    return 1; // aStr2 !== null
   }
 
-  cmp = mappingA.generatedColumn - mappingB.generatedColumn;
-  if (cmp !== 0) {
-    return cmp;
+  if (aStr2 === null) {
+    return -1; // aStr1 !== null
   }
 
-  cmp = mappingA.generatedLine - mappingB.generatedLine;
-  if (cmp !== 0) {
-    return cmp;
+  if (aStr1 > aStr2) {
+    return 1;
   }
 
-  return strcmp(mappingA.name, mappingB.name);
+  return -1;
 }
-exports.compareByOriginalPositions = compareByOriginalPositions;
 
 /**
- * Comparator between two mappings with deflated source and name indices where
+ * Comparator between two mappings with inflated source and name strings where
  * the generated positions are compared.
- *
- * Optionally pass in `true` as `onlyCompareGenerated` to consider two
- * mappings with the same generated line and column, but different
- * source/name/original line and column the same. Useful when searching for a
- * mapping with a stubbed out mapping.
  */
-function compareByGeneratedPositionsDeflated(mappingA, mappingB, onlyCompareGenerated) {
+function compareByGeneratedPositionsInflated(mappingA, mappingB) {
   let cmp = mappingA.generatedLine - mappingB.generatedLine;
   if (cmp !== 0) {
     return cmp;
   }
 
   cmp = mappingA.generatedColumn - mappingB.generatedColumn;
-  if (cmp !== 0 || onlyCompareGenerated) {
+  if (cmp !== 0) {
     return cmp;
   }
 
@@ -98764,122 +98400,295 @@ function compareByGeneratedPositionsDeflated(mappingA, mappingB, onlyCompareGene
 
   return strcmp(mappingA.name, mappingB.name);
 }
-exports.compareByGeneratedPositionsDeflated = compareByGeneratedPositionsDeflated;
+exports.compareByGeneratedPositionsInflated =
+  compareByGeneratedPositionsInflated;
 
-function strcmp(aStr1, aStr2) {
-  if (aStr1 === aStr2) {
-    return 0;
-  }
+/**
+ * Strip any JSON XSSI avoidance prefix from the string (as documented
+ * in the source maps specification), and then parse the string as
+ * JSON.
+ */
+function parseSourceMapInput(str) {
+  return JSON.parse(str.replace(/^\)]}'[^\n]*\n/, ""));
+}
+exports.parseSourceMapInput = parseSourceMapInput;
 
-  if (aStr1 === null) {
-    return 1; // aStr2 !== null
-  }
+// We use 'http' as the base here because we want URLs processed relative
+// to the safe base to be treated as "special" URLs during parsing using
+// the WHATWG URL parsing. This ensures that backslash normalization
+// applies to the path and such.
+const PROTOCOL = "http:";
+const PROTOCOL_AND_HOST = `${PROTOCOL}//host`;
 
-  if (aStr2 === null) {
-    return -1; // aStr1 !== null
+/**
+ * Make it easy to create small utilities that tweak a URL's path.
+ */
+function createSafeHandler(cb) {
+  return input => {
+    const type = getURLType(input);
+    const base = buildSafeBase(input);
+    const url = new URL(input, base);
+
+    cb(url);
+
+    const result = url.toString();
+
+    if (type === "absolute") {
+      return result;
+    } else if (type === "scheme-relative") {
+      return result.slice(PROTOCOL.length);
+    } else if (type === "path-absolute") {
+      return result.slice(PROTOCOL_AND_HOST.length);
+    }
+
+    // This assumes that the callback will only change
+    // the path, search and hash values.
+    return computeRelativeURL(base, result);
+  };
+}
+
+function withBase(url, base) {
+  return new URL(url, base).toString();
+}
+
+function buildUniqueSegment(prefix, str) {
+  let id = 0;
+  do {
+    const ident = prefix + id++;
+    if (str.indexOf(ident) === -1) return ident;
+  } while (true);
+}
+
+function buildSafeBase(str) {
+  const maxDotParts = str.split("..").length - 1;
+
+  // If we used a segment that also existed in `str`, then we would be unable
+  // to compute relative paths. For example, if `segment` were just "a":
+  //
+  //   const url = "../../a/"
+  //   const base = buildSafeBase(url); // http://host/a/a/
+  //   const joined = "http://host/a/";
+  //   const result = relative(base, joined);
+  //
+  // Expected: "../../a/";
+  // Actual: "a/"
+  //
+  const segment = buildUniqueSegment("p", str);
+
+  let base = `${PROTOCOL_AND_HOST}/`;
+  for (let i = 0; i < maxDotParts; i++) {
+    base += `${segment}/`;
   }
+  return base;
+}
 
-  if (aStr1 > aStr2) {
-    return 1;
+const ABSOLUTE_SCHEME = /^[A-Za-z0-9\+\-\.]+:/;
+function getURLType(url) {
+  if (url[0] === "/") {
+    if (url[1] === "/") return "scheme-relative";
+    return "path-absolute";
   }
 
-  return -1;
+  return ABSOLUTE_SCHEME.test(url) ? "absolute" : "path-relative";
 }
 
 /**
- * Comparator between two mappings with inflated source and name strings where
- * the generated positions are compared.
+ * Given two URLs that are assumed to be on the same
+ * protocol/host/user/password build a relative URL from the
+ * path, params, and hash values.
+ *
+ * @param rootURL The root URL that the target will be relative to.
+ * @param targetURL The target that the relative URL points to.
+ * @return A rootURL-relative, normalized URL value.
  */
-function compareByGeneratedPositionsInflated(mappingA, mappingB) {
-  let cmp = mappingA.generatedLine - mappingB.generatedLine;
-  if (cmp !== 0) {
-    return cmp;
+function computeRelativeURL(rootURL, targetURL) {
+  if (typeof rootURL === "string") rootURL = new URL(rootURL);
+  if (typeof targetURL === "string") targetURL = new URL(targetURL);
+
+  const targetParts = targetURL.pathname.split("/");
+  const rootParts = rootURL.pathname.split("/");
+
+  // If we've got a URL path ending with a "/", we remove it since we'd
+  // otherwise be relative to the wrong location.
+  if (rootParts.length > 0 && !rootParts[rootParts.length - 1]) {
+    rootParts.pop();
   }
 
-  cmp = mappingA.generatedColumn - mappingB.generatedColumn;
-  if (cmp !== 0) {
-    return cmp;
+  while (
+    targetParts.length > 0 &&
+    rootParts.length > 0 &&
+    targetParts[0] === rootParts[0]
+  ) {
+    targetParts.shift();
+    rootParts.shift();
   }
 
-  cmp = strcmp(mappingA.source, mappingB.source);
-  if (cmp !== 0) {
-    return cmp;
+  const relativePath = rootParts
+    .map(() => "..")
+    .concat(targetParts)
+    .join("/");
+
+  return relativePath + targetURL.search + targetURL.hash;
+}
+
+/**
+ * Given a URL, ensure that it is treated as a directory URL.
+ *
+ * @param url
+ * @return A normalized URL value.
+ */
+const ensureDirectory = createSafeHandler(url => {
+  url.pathname = url.pathname.replace(/\/?$/, "/");
+});
+
+/**
+ * Given a URL, strip off any filename if one is present.
+ *
+ * @param url
+ * @return A normalized URL value.
+ */
+const trimFilename = createSafeHandler(url => {
+  url.href = new URL(".", url.toString()).toString();
+});
+
+/**
+ * Normalize a given URL.
+ * * Convert backslashes.
+ * * Remove any ".." and "." segments.
+ *
+ * @param url
+ * @return A normalized URL value.
+ */
+const normalize = createSafeHandler(url => {});
+exports.normalize = normalize;
+
+/**
+ * Joins two paths/URLs.
+ *
+ * All returned URLs will be normalized.
+ *
+ * @param aRoot The root path or URL. Assumed to reference a directory.
+ * @param aPath The path or URL to be joined with the root.
+ * @return A joined and normalized URL value.
+ */
+function join(aRoot, aPath) {
+  const pathType = getURLType(aPath);
+  const rootType = getURLType(aRoot);
+
+  aRoot = ensureDirectory(aRoot);
+
+  if (pathType === "absolute") {
+    return withBase(aPath, undefined);
+  }
+  if (rootType === "absolute") {
+    return withBase(aPath, aRoot);
   }
 
-  cmp = mappingA.originalLine - mappingB.originalLine;
-  if (cmp !== 0) {
-    return cmp;
+  if (pathType === "scheme-relative") {
+    return normalize(aPath);
+  }
+  if (rootType === "scheme-relative") {
+    return withBase(aPath, withBase(aRoot, PROTOCOL_AND_HOST)).slice(
+      PROTOCOL.length
+    );
   }
 
-  cmp = mappingA.originalColumn - mappingB.originalColumn;
-  if (cmp !== 0) {
-    return cmp;
+  if (pathType === "path-absolute") {
+    return normalize(aPath);
+  }
+  if (rootType === "path-absolute") {
+    return withBase(aPath, withBase(aRoot, PROTOCOL_AND_HOST)).slice(
+      PROTOCOL_AND_HOST.length
+    );
   }
 
-  return strcmp(mappingA.name, mappingB.name);
+  const base = buildSafeBase(aPath + aRoot);
+  const newPath = withBase(aPath, withBase(aRoot, base));
+  return computeRelativeURL(base, newPath);
 }
-exports.compareByGeneratedPositionsInflated = compareByGeneratedPositionsInflated;
+exports.join = join;
 
 /**
- * Strip any JSON XSSI avoidance prefix from the string (as documented
- * in the source maps specification), and then parse the string as
- * JSON.
+ * Make a path relative to a URL or another path. If returning a
+ * relative URL is not possible, the original target will be returned.
+ * All returned URLs will be normalized.
+ *
+ * @param aRoot The root path or URL.
+ * @param aPath The path or URL to be made relative to aRoot.
+ * @return A rootURL-relative (if possible), normalized URL value.
  */
-function parseSourceMapInput(str) {
-  return JSON.parse(str.replace(/^\)]}'[^\n]*\n/, ""));
+function relative(rootURL, targetURL) {
+  const result = relativeIfPossible(rootURL, targetURL);
+
+  return typeof result === "string" ? result : normalize(targetURL);
+}
+exports.relative = relative;
+
+function relativeIfPossible(rootURL, targetURL) {
+  const urlType = getURLType(rootURL);
+  if (urlType !== getURLType(targetURL)) {
+    return null;
+  }
+
+  const base = buildSafeBase(rootURL + targetURL);
+  const root = new URL(rootURL, base);
+  const target = new URL(targetURL, base);
+
+  try {
+    new URL("", target.toString());
+  } catch (err) {
+    // Bail if the URL doesn't support things being relative to it,
+    // For example, data: and blob: URLs.
+    return null;
+  }
+
+  if (
+    target.protocol !== root.protocol ||
+    target.user !== root.user ||
+    target.password !== root.password ||
+    target.hostname !== root.hostname ||
+    target.port !== root.port
+  ) {
+    return null;
+  }
+
+  return computeRelativeURL(root, target);
 }
-exports.parseSourceMapInput = parseSourceMapInput;
 
 /**
  * Compute the URL of a source given the the source root, the source's
  * URL, and the source map's URL.
  */
 function computeSourceURL(sourceRoot, sourceURL, sourceMapURL) {
-  sourceURL = sourceURL || "";
-
-  if (sourceRoot) {
-    // This follows what Chrome does.
-    if (sourceRoot[sourceRoot.length - 1] !== "/" && sourceURL[0] !== "/") {
-      sourceRoot += "/";
-    }
-    // The spec says:
-    //   Line 4: An optional source root, useful for relocating source
-    //   files on a server or removing repeated values in the
-    //   “sources” entry.  This value is prepended to the individual
-    //   entries in the “source” field.
-    sourceURL = sourceRoot + sourceURL;
-  }
-
-  // Historically, SourceMapConsumer did not take the sourceMapURL as
-  // a parameter.  This mode is still somewhat supported, which is why
-  // this code block is conditional.  However, it's preferable to pass
-  // the source map URL to SourceMapConsumer, so that this function
-  // can implement the source URL resolution algorithm as outlined in
-  // the spec.  This block is basically the equivalent of:
-  //    new URL(sourceURL, sourceMapURL).toString()
-  // ... except it avoids using URL, which wasn't available in the
-  // older releases of node still supported by this library.
+  // The source map spec states that "sourceRoot" and "sources" entries are to be appended. While
+  // that is a little vague, implementations have generally interpreted that as joining the
+  // URLs with a `/` between then, assuming the "sourceRoot" doesn't already end with one.
+  // For example,
   //
-  // The spec says:
-  //   If the sources are not absolute URLs after prepending of the
-  //   “sourceRoot”, the sources are resolved relative to the
-  //   SourceMap (like resolving script src in a html document).
-  if (sourceMapURL) {
-    const parsed = urlParse(sourceMapURL);
-    if (!parsed) {
-      throw new Error("sourceMapURL could not be parsed");
-    }
-    if (parsed.path) {
-      // Strip the last path component, but keep the "/".
-      const index = parsed.path.lastIndexOf("/");
-      if (index >= 0) {
-        parsed.path = parsed.path.substring(0, index + 1);
-      }
-    }
-    sourceURL = join(urlGenerate(parsed), sourceURL);
+  //   sourceRoot: "some-dir",
+  //   sources: ["/some-path.js"]
+  //
+  // and
+  //
+  //   sourceRoot: "some-dir/",
+  //   sources: ["/some-path.js"]
+  //
+  // must behave as "some-dir/some-path.js".
+  //
+  // With this library's the transition to a more URL-focused implementation, that behavior is
+  // preserved here. To acheive that, we trim the "/" from absolute-path when a sourceRoot value
+  // is present in order to make the sources entries behave as if they are relative to the
+  // "sourceRoot", as they would have if the two strings were simply concated.
+  if (sourceRoot && getURLType(sourceURL) === "path-absolute") {
+    sourceURL = sourceURL.replace(/^\//, "");
   }
 
-  return normalize(sourceURL);
+  let url = normalize(sourceURL || "");
+
+  // Parsing URLs can be expensive, so we only perform these joins when needed.
+  if (sourceRoot) url = join(sourceRoot, url);
+  if (sourceMapURL) url = join(trimFilename(sourceMapURL), url);
+  return url;
 }
 exports.computeSourceURL = computeSourceURL;
 
@@ -98916,7 +98725,8 @@ module.exports = function wasm() {
 
   const callbackStack = [];
 
-  cachedWasm = readWasm().then(buffer => {
+  cachedWasm = readWasm()
+    .then(buffer => {
       return WebAssembly.instantiate(buffer, {
         env: {
           mapping_callback(
@@ -98958,44 +98768,74 @@ module.exports = function wasm() {
             callbackStack[callbackStack.length - 1](mapping);
           },
 
-          start_all_generated_locations_for() { console.time("all_generated_locations_for"); },
-          end_all_generated_locations_for() { console.timeEnd("all_generated_locations_for"); },
+          start_all_generated_locations_for() {
+            console.time("all_generated_locations_for");
+          },
+          end_all_generated_locations_for() {
+            console.timeEnd("all_generated_locations_for");
+          },
 
-          start_compute_column_spans() { console.time("compute_column_spans"); },
-          end_compute_column_spans() { console.timeEnd("compute_column_spans"); },
+          start_compute_column_spans() {
+            console.time("compute_column_spans");
+          },
+          end_compute_column_spans() {
+            console.timeEnd("compute_column_spans");
+          },
 
-          start_generated_location_for() { console.time("generated_location_for"); },
-          end_generated_location_for() { console.timeEnd("generated_location_for"); },
+          start_generated_location_for() {
+            console.time("generated_location_for");
+          },
+          end_generated_location_for() {
+            console.timeEnd("generated_location_for");
+          },
 
-          start_original_location_for() { console.time("original_location_for"); },
-          end_original_location_for() { console.timeEnd("original_location_for"); },
+          start_original_location_for() {
+            console.time("original_location_for");
+          },
+          end_original_location_for() {
+            console.timeEnd("original_location_for");
+          },
 
-          start_parse_mappings() { console.time("parse_mappings"); },
-          end_parse_mappings() { console.timeEnd("parse_mappings"); },
+          start_parse_mappings() {
+            console.time("parse_mappings");
+          },
+          end_parse_mappings() {
+            console.timeEnd("parse_mappings");
+          },
 
-          start_sort_by_generated_location() { console.time("sort_by_generated_location"); },
-          end_sort_by_generated_location() { console.timeEnd("sort_by_generated_location"); },
+          start_sort_by_generated_location() {
+            console.time("sort_by_generated_location");
+          },
+          end_sort_by_generated_location() {
+            console.timeEnd("sort_by_generated_location");
+          },
 
-          start_sort_by_original_location() { console.time("sort_by_original_location"); },
-          end_sort_by_original_location() { console.timeEnd("sort_by_original_location"); },
-        }
+          start_sort_by_original_location() {
+            console.time("sort_by_original_location");
+          },
+          end_sort_by_original_location() {
+            console.timeEnd("sort_by_original_location");
+          },
+        },
       });
-  }).then(Wasm => {
-    return {
-      exports: Wasm.instance.exports,
-      withMappingCallback: (mappingCallback, f) => {
-        callbackStack.push(mappingCallback);
-        try {
-          f();
-        } finally {
-          callbackStack.pop();
-        }
-      }
-    };
-  }).then(null, e => {
-    cachedWasm = null;
-    throw e;
-  });
+    })
+    .then(Wasm => {
+      return {
+        exports: Wasm.instance.exports,
+        withMappingCallback: (mappingCallback, f) => {
+          callbackStack.push(mappingCallback);
+          try {
+            f();
+          } finally {
+            callbackStack.pop();
+          }
+        },
+      };
+    })
+    .then(null, e => {
+      cachedWasm = null;
+      throw e;
+    });
 
   return cachedWasm;
 };
@@ -99011,7 +98851,7 @@ module.exports = function wasm() {
 
 /*
  * Copyright 2009-2011 Mozilla Foundation and contributors
- * Licensed under the New BSD license. See LICENSE.txt or:
+ * Licensed under the New BSD license. See LICENSE or:
  * http://opensource.org/licenses/BSD-3-Clause
  */
 exports.SourceMapGenerator = __webpack_require__(/*! ./lib/source-map-generator */ "./node_modules/source-map/lib/source-map-generator.js").SourceMapGenerator;
@@ -101544,6 +101384,17 @@ module.exports = require("path");
 
 /***/ }),
 
+/***/ "url":
+/*!**********************!*\
+  !*** external "url" ***!
+  \**********************/
+/***/ ((module) => {
+
+"use strict";
+module.exports = require("url");
+
+/***/ }),
+
 /***/ "util":
 /*!***********************!*\
   !*** external "util" ***!