metro-source-map 0.73.2 → 0.73.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "metro-source-map",
-  "version": "0.73.2",
+  "version": "0.73.5",
   "description": "🚇 Source map generator for Metro.",
   "main": "src/source-map.js",
   "repository": {
@@ -13,11 +13,11 @@
   },
   "dependencies": {
     "@babel/traverse": "^7.14.0",
-    "@babel/types": "^7.0.0",
+    "@babel/types": "^7.20.0",
     "invariant": "^2.2.4",
-    "metro-symbolicate": "0.73.2",
+    "metro-symbolicate": "0.73.5",
     "nullthrows": "^1.1.1",
-    "ob1": "0.73.2",
+    "ob1": "0.73.5",
     "source-map": "^0.5.6",
     "vlq": "^1.0.0"
   },

package/src/B64Builder.js

@@ -8,14 +8,15 @@
  * @format
  * @oncall react_native
  */
+
 "use strict";
 
 const encode = require("./encode");
-
 const MAX_SEGMENT_LENGTH = 7;
 const ONE_MEG = 1024 * 1024;
 const COMMA = 0x2c;
 const SEMICOLON = 0x3b;
+
 /**
  * Efficient builder for base64 VLQ mappings strings.
  *
@@ -28,81 +29,70 @@ const SEMICOLON = 0x3b;
  * For details about source map terminology and specification, check
  * https://docs.google.com/document/d/1U1RGAehQwRypUTovF1KRlpiOFze0b-_2gc6fAH0KY0k/edit
  */
-
 class B64Builder {
   constructor() {
     this.buffer = Buffer.alloc(ONE_MEG);
     this.pos = 0;
     this.hasSegment = false;
   }
+
   /**
    * Adds `n` markers for generated lines to the mappings.
    */
-
   markLines(n) {
     if (n < 1) {
       return this;
     }
-
     this.hasSegment = false;
-
     if (this.pos + n >= this.buffer.length) {
       this._realloc();
     }
-
     while (n--) {
       this.buffer[this.pos++] = SEMICOLON;
     }
-
     return this;
   }
+
   /**
    * Starts a segment at the specified column offset in the current line.
    */
-
   startSegment(column) {
     if (this.hasSegment) {
       this._writeByte(COMMA);
     } else {
       this.hasSegment = true;
     }
-
     this.append(column);
     return this;
   }
+
   /**
    * Appends a single number to the mappings.
    */
-
   append(value) {
     if (this.pos + MAX_SEGMENT_LENGTH >= this.buffer.length) {
       this._realloc();
     }
-
     this.pos = encode(value, this.buffer, this.pos);
     return this;
   }
+
   /**
    * Returns the string representation of the mappings.
    */
-
   toString() {
     return this.buffer.toString("ascii", 0, this.pos);
   }
-
   _writeByte(byte) {
     if (this.pos === this.buffer.length) {
       this._realloc();
     }
-
     this.buffer[this.pos++] = byte;
   }
-
   _realloc() {
     const { buffer } = this;
     this.buffer = Buffer.alloc(buffer.length * 2);
     buffer.copy(this.buffer);
   }
 }
-
 module.exports = B64Builder;

package/src/BundleBuilder.js

@@ -8,6 +8,7 @@
  * @format
  * @oncall react_native
  */
+
 "use strict";
 
 const EMPTY_MAP = {
@@ -16,6 +17,7 @@ const EMPTY_MAP = {
   names: [],
   mappings: "A",
 };
+
 /**
  * Builds a source-mapped bundle by concatenating strings and their
  * corresponding source maps (if any).
@@ -30,7 +32,6 @@ const EMPTY_MAP = {
  * const code = builder.getCode();
  * const map = builder.getMap();
  */
-
 class BundleBuilder {
   constructor(file) {
     this._file = file;
@@ -40,7 +41,6 @@ class BundleBuilder {
     this._code = "";
     this._afterMappedContent = false;
   }
-
   _pushMapSection(map) {
     this._sections.push({
       map,
@@ -50,73 +50,56 @@ class BundleBuilder {
       },
     });
   }
-
   _endMappedContent() {
     if (this._afterMappedContent) {
       this._pushMapSection(EMPTY_MAP);
-
       this._afterMappedContent = false;
     }
   }
-
   append(code, map) {
     if (!code.length) {
       return this;
     }
-
     const { lineBreaks, lastLineColumns } = measureString(code);
-
     if (map) {
       this._pushMapSection(map);
-
       this._afterMappedContent = true;
     } else {
       this._endMappedContent();
     }
-
     this._afterMappedContent = !!map;
     this._line = this._line + lineBreaks;
-
     if (lineBreaks > 0) {
       this._column = lastLineColumns;
     } else {
       this._column = this._column + lastLineColumns;
     }
-
     this._code = this._code + code;
     return this;
   }
-
   getMap() {
     this._endMappedContent();
-
     return createIndexMap(this._file, this._sections);
   }
-
   getCode() {
     return this._code;
   }
 }
-
 const reLineBreak = /\r\n|\r|\n/g;
-
 function measureString(str) {
   let lineBreaks = 0;
   let match;
   let lastLineStart = 0;
-
   while ((match = reLineBreak.exec(str))) {
     ++lineBreaks;
     lastLineStart = match.index + match[0].length;
   }
-
   const lastLineColumns = str.length - lastLineStart;
   return {
     lineBreaks,
     lastLineColumns,
   };
 }
-
 function createIndexMap(file, sections) {
   return {
     version: 3,
@@ -124,7 +107,6 @@ function createIndexMap(file, sections) {
     sections,
   };
 }
-
 module.exports = {
   BundleBuilder,
   createIndexMap,

package/src/BundleBuilder.js.flow

@@ -15,8 +15,8 @@ import type {IndexMap, IndexMapSection, MixedSourceMap} from './source-map';
 
 const EMPTY_MAP = {
   version: 3,
-  sources: [],
-  names: [],
+  sources: ([]: Array<string>),
+  names: ([]: Array<string>),
   mappings: 'A',
 };
 

package/src/Consumer/AbstractConsumer.js

@@ -8,43 +8,39 @@
  * @format
  * @oncall react_native
  */
+
 "use strict";
 
 const { GENERATED_ORDER, iterationOrderToString } = require("./constants");
+const invariant = require("invariant");
 
-const invariant = require("invariant"); // Implementation details shared between MappingsConsumer and SectionsConsumer
-
+// Implementation details shared between MappingsConsumer and SectionsConsumer
 class AbstractConsumer {
   constructor(sourceMap) {
     this._sourceMap = sourceMap;
   }
-
   originalPositionFor(generatedPosition) {
     invariant(false, "Not implemented");
   }
-
   generatedMappings() {
     invariant(false, "Not implemented");
   }
-
   eachMapping(callback, context = null, order = GENERATED_ORDER) {
     invariant(
       order === GENERATED_ORDER,
       `Iteration order not implemented: ${iterationOrderToString(order)}`
     );
-
     for (const mapping of this.generatedMappings()) {
       callback.call(context, mapping);
     }
-  } // flowlint-next-line unsafe-getters-setters:off
+  }
 
+  // flowlint-next-line unsafe-getters-setters:off
   get file() {
     return this._sourceMap.file;
   }
-
   sourceContentFor(source, nullOnMissing) {
     invariant(false, "Not implemented");
   }
 }
-
 module.exports = AbstractConsumer;

package/src/Consumer/DelegatingConsumer.js

@@ -8,6 +8,7 @@
  * @format
  * @oncall react_native
  */
+
 "use strict";
 
 const {
@@ -16,45 +17,39 @@ const {
   LEAST_UPPER_BOUND,
   ORIGINAL_ORDER,
 } = require("./constants");
-
 const createConsumer = require("./createConsumer");
+
 /**
  * A source map consumer that supports both "basic" and "indexed" source maps.
  * Uses `MappingsConsumer` and `SectionsConsumer` under the hood (via
  * `createConsumer`).
  */
-
 class DelegatingConsumer {
   static GENERATED_ORDER = GENERATED_ORDER;
   static ORIGINAL_ORDER = ORIGINAL_ORDER;
   static GREATEST_LOWER_BOUND = GREATEST_LOWER_BOUND;
   static LEAST_UPPER_BOUND = LEAST_UPPER_BOUND;
-
   // $FlowFixMe[incompatible-return]
   constructor(sourceMap) {
     this._rootConsumer = createConsumer(sourceMap);
     return this._rootConsumer;
   }
-
   originalPositionFor(generatedPosition) {
     return this._rootConsumer.originalPositionFor(generatedPosition);
   }
-
   generatedMappings() {
     return this._rootConsumer.generatedMappings();
   }
-
   eachMapping(callback, context, order) {
     return this._rootConsumer.eachMapping(callback, context, order);
-  } // flowlint-next-line unsafe-getters-setters:off
+  }
 
+  // flowlint-next-line unsafe-getters-setters:off
   get file() {
     return this._rootConsumer.file;
   }
-
   sourceContentFor(source, nullOnMissing) {
     return this._rootConsumer.sourceContentFor(source, nullOnMissing);
   }
 }
-
 module.exports = DelegatingConsumer;

package/src/Consumer/MappingsConsumer.js

@@ -8,10 +8,10 @@
  * @format
  * @oncall react_native
  */
+
 "use strict";
 
 const AbstractConsumer = require("./AbstractConsumer");
-
 const {
   EMPTY_POSITION,
   FIRST_COLUMN,
@@ -19,21 +19,16 @@ const {
   GREATEST_LOWER_BOUND,
   lookupBiasToString,
 } = require("./constants");
-
 const normalizeSourcePath = require("./normalizeSourcePath");
-
 const { greatestLowerBound } = require("./search");
-
 const invariant = require("invariant");
-
 const { add, add0, get0, inc, sub } = require("ob1");
-
 const { decode: decodeVlq } = require("vlq");
+
 /**
  * A source map consumer that supports "basic" source maps (that have a
  * `mappings` field and no sections).
  */
-
 class MappingsConsumer extends AbstractConsumer {
   constructor(sourceMap) {
     super(sourceMap);
@@ -41,14 +36,13 @@ class MappingsConsumer extends AbstractConsumer {
     this._decodedMappings = null;
     this._normalizedSources = null;
   }
-
   originalPositionFor(generatedPosition) {
     const { line, column } = generatedPosition;
-
     if (line == null || column == null) {
-      return { ...EMPTY_POSITION };
+      return {
+        ...EMPTY_POSITION,
+      };
     }
-
     if (generatedPosition.bias != null) {
       invariant(
         generatedPosition.bias === GREATEST_LOWER_BOUND,
@@ -58,9 +52,7 @@ class MappingsConsumer extends AbstractConsumer {
         )}`
       );
     }
-
     const mappings = this._decodeAndCacheMappings();
-
     const index = greatestLowerBound(
       mappings,
       {
@@ -71,11 +63,9 @@ class MappingsConsumer extends AbstractConsumer {
         if (position.line === mapping.generatedLine) {
           return get0(sub(position.column, mapping.generatedColumn));
         }
-
         return get0(sub(position.line, mapping.generatedLine));
       }
     );
-
     if (
       index != null &&
       mappings[index].generatedLine === generatedPosition.line
@@ -88,10 +78,10 @@ class MappingsConsumer extends AbstractConsumer {
         column: mapping.originalColumn,
       };
     }
-
-    return { ...EMPTY_POSITION };
+    return {
+      ...EMPTY_POSITION,
+    };
   }
-
   *_decodeMappings() {
     let generatedLine = FIRST_LINE;
     let generatedColumn = FIRST_COLUMN;
@@ -99,46 +89,36 @@ class MappingsConsumer extends AbstractConsumer {
     let originalColumn = FIRST_COLUMN;
     let nameIndex = add0(0);
     let sourceIndex = add0(0);
-
     const normalizedSources = this._normalizeAndCacheSources();
-
     const { mappings: mappingsRaw, names } = this._sourceMap;
     let next;
     const vlqCache = new Map();
-
     for (let i = 0; i < mappingsRaw.length; i = next) {
       switch (mappingsRaw[i]) {
         case ";":
           generatedLine = inc(generatedLine);
           generatedColumn = FIRST_COLUMN;
-
         /* falls through */
-
         case ",":
           next = i + 1;
           continue;
       }
-
       findNext: for (next = i + 1; next < mappingsRaw.length; ++next) {
         switch (mappingsRaw[next]) {
           case ";":
           /* falls through */
-
           case ",":
             break findNext;
         }
       }
-
       const mappingRaw = mappingsRaw.slice(i, next);
       let decodedVlqValues;
-
       if (vlqCache.has(mappingRaw)) {
         decodedVlqValues = vlqCache.get(mappingRaw);
       } else {
         decodedVlqValues = decodeVlq(mappingRaw);
         vlqCache.set(mappingRaw, decodedVlqValues);
       }
-
       invariant(Array.isArray(decodedVlqValues), "Decoding VLQ tuple failed");
       const [
         generatedColumnDelta,
@@ -158,7 +138,6 @@ class MappingsConsumer extends AbstractConsumer {
         originalLine: null,
         originalColumn: null,
       };
-
       if (sourceIndexDelta != null) {
         sourceIndex = add(sourceIndex, sourceIndexDelta);
         mapping.source = normalizedSources[get0(sourceIndex)];
@@ -168,71 +147,54 @@ class MappingsConsumer extends AbstractConsumer {
         originalColumn = add(originalColumn, originalColumnDelta);
         mapping.originalLine = originalLine;
         mapping.originalColumn = originalColumn;
-
         if (nameIndexDelta != null) {
           nameIndex = add(nameIndex, nameIndexDelta);
           mapping.name = names[get0(nameIndex)];
         }
       }
-
       yield mapping;
     }
   }
-
   _normalizeAndCacheSources() {
     if (!this._normalizedSources) {
       this._normalizedSources = this._sourceMap.sources.map((source) =>
         normalizeSourcePath(source, this._sourceMap)
       );
     }
-
     return this._normalizedSources;
   }
-
   _decodeAndCacheMappings() {
     if (!this._decodedMappings) {
       this._decodedMappings = [...this._decodeMappings()];
     }
-
     return this._decodedMappings;
   }
-
   generatedMappings() {
     return this._decodeAndCacheMappings();
   }
-
   _indexOfSource(source) {
     const idx = this._normalizeAndCacheSources().indexOf(
       normalizeSourcePath(source, this._sourceMap)
     );
-
     if (idx === -1) {
       return null;
     }
-
     return add0(idx);
   }
-
   sourceContentFor(source, nullOnMissing) {
     var _sourcesContent$get;
-
     const { sourcesContent } = this._sourceMap;
-
     if (!sourcesContent) {
       return null;
     }
-
     const idx = this._indexOfSource(source);
-
     if (idx == null) {
       return null;
     }
-
     return (_sourcesContent$get = sourcesContent[get0(idx)]) !== null &&
       _sourcesContent$get !== void 0
       ? _sourcesContent$get
       : null;
   }
 }
-
 module.exports = MappingsConsumer;

package/src/Consumer/MappingsConsumer.js.flow

@@ -104,7 +104,7 @@ class MappingsConsumer extends AbstractConsumer implements IConsumer {
 
     const {mappings: mappingsRaw, names} = this._sourceMap;
     let next;
-    const vlqCache = new Map();
+    const vlqCache = new Map<string, any>();
     for (let i = 0; i < mappingsRaw.length; i = next) {
       switch (mappingsRaw[i]) {
         case ';':

package/src/Consumer/SectionsConsumer.js

@@ -8,24 +8,20 @@
  * @format
  * @oncall react_native
  */
+
 "use strict";
 
 const AbstractConsumer = require("./AbstractConsumer");
-
 const { EMPTY_POSITION, FIRST_COLUMN, FIRST_LINE } = require("./constants");
-
 const createConsumer = require("./createConsumer");
-
 const { subtractOffsetFromPosition } = require("./positionMath");
-
 const { greatestLowerBound } = require("./search");
-
 const { add, add0, get0, get1, sub, sub1 } = require("ob1");
+
 /**
  * A source map consumer that supports "indexed" source maps (that have a
  * `sections` field and no top-level mappings).
  */
-
 class SectionsConsumer extends AbstractConsumer {
   constructor(sourceMap) {
     super(sourceMap);
@@ -38,24 +34,21 @@ class SectionsConsumer extends AbstractConsumer {
       return [generatedOffset, consumer];
     });
   }
-
   originalPositionFor(generatedPosition) {
     const [generatedOffset, consumer] =
       this._consumerForPosition(generatedPosition) || [];
-
     if (!consumer) {
-      return { ...EMPTY_POSITION };
+      return {
+        ...EMPTY_POSITION,
+      };
     }
-
     return consumer.originalPositionFor(
       subtractOffsetFromPosition(generatedPosition, generatedOffset)
     );
   }
-
   *generatedMappings() {
     for (const [generatedOffset, consumer] of this._consumers) {
       let first = true;
-
       for (const mapping of consumer.generatedMappings()) {
         if (
           first &&
@@ -70,7 +63,6 @@ class SectionsConsumer extends AbstractConsumer {
             originalColumn: null,
           };
         }
-
         first = false;
         yield {
           ...mapping,
@@ -83,42 +75,33 @@ class SectionsConsumer extends AbstractConsumer {
       }
     }
   }
-
   _consumerForPosition(generatedPosition) {
     const { line, column } = generatedPosition;
-
     if (line == null || column == null) {
       return null;
     }
-
     const index = greatestLowerBound(
       this._consumers,
       generatedPosition,
       (position, [offset]) => {
         const line0 = sub1(line);
         const column0 = column;
-
         if (line0 === offset.lines) {
           return get0(sub(column0, offset.columns));
         }
-
         return get0(sub(line0, offset.lines));
       }
     );
     return index != null ? this._consumers[index] : null;
   }
-
   sourceContentFor(source, nullOnMissing) {
     for (const [_, consumer] of this._consumers) {
       const content = consumer.sourceContentFor(source, nullOnMissing);
-
       if (content != null) {
         return content;
       }
     }
-
     return null;
   }
 }
-
 module.exports = SectionsConsumer;

package/src/Consumer/constants.js

@@ -8,10 +8,10 @@
  * @format
  * @oncall react_native
  */
+
 "use strict";
 
 const { add0, add1 } = require("ob1");
-
 const FIRST_COLUMN = add0(0);
 const FIRST_LINE = add1(0);
 const GENERATED_ORDER = "GENERATED_ORDER";
@@ -24,15 +24,12 @@ const EMPTY_POSITION = Object.freeze({
   line: null,
   column: null,
 });
-
 function iterationOrderToString(x) {
   return x;
 }
-
 function lookupBiasToString(x) {
   return x;
 }
-
 module.exports = {
   FIRST_COLUMN,
   FIRST_LINE,