Merge pull request firefox-devtools#363 from jasonLaster/sm-ref2

jasonLaster · web-flow · commit 1f41cae8b4c5 · 2016-07-19T17:20:17.000-04:00
Additional source-map util refactors
diff --git a/public/js/actions/sources.js b/public/js/actions/sources.js
@@ -14,7 +14,7 @@ const constants = require("../constants");
 const Prefs = require("../prefs");
 const invariant = require("invariant");
 const { isEnabled } = require("../../../config/feature");
-const { setSourceMap, createOriginalSources, getGeneratedSourceId,
+const { createOriginalSources, getGeneratedSourceId,
         isOriginal, getOriginalSource } = require("../util/source-map");
 
 /**
@@ -85,8 +85,7 @@ function loadSourceMap(generatedSource) {
         const sourceMapURL = getSourceMapURL(getState(), generatedSource);
         sourceMap = await networkRequest(sourceMapURL);
 
-        setSourceMap(generatedSource, sourceMap);
-        createOriginalSources(generatedSource)
+        createOriginalSources(generatedSource, sourceMap)
           .forEach(s => dispatch(newSource(s)));
 
         return { sourceMap };
diff --git a/public/js/util/source-map.js b/public/js/util/source-map.js
@@ -5,33 +5,21 @@ const { Source } = require("../types");
 let sourceMapConsumers = new Map();
 let sourceNodes = new Map();
 
-function hasConsumer(sourceId) {
+function _hasConsumer(sourceId) {
   return sourceMapConsumers.has(sourceId);
 }
 
-function getConsumer(sourceId) {
+function _getConsumer(sourceId) {
   return sourceMapConsumers.get(sourceId);
 }
 
-function getOriginalSources(sourceId) {
-  const consumer = getConsumer(sourceId);
+function _getOriginalSources(sourceId) {
+  const consumer = _getConsumer(sourceId);
   return consumer.sources;
 }
 
-function isOriginal(originalSource) {
-  return !!getGeneratedSourceId(originalSource);
-}
-
-function getGeneratedSourceId(originalSource) {
-  const match = [...sourceMapConsumers].find(
-    ([x, consumer]) => consumer.sources.includes(originalSource.url)
-  );
-
-  return match ? match[0] : null;
-}
-
-function setSourceMap(source, sourceMap) {
-  if (hasConsumer(source.id)) {
+function _setConsumer(source, sourceMap) {
+  if (_hasConsumer(source.id)) {
     return null;
   }
 
@@ -40,32 +28,54 @@ function setSourceMap(source, sourceMap) {
   return consumer;
 }
 
-function getSourceNode(generatedSourceId, text) {
+function _getSourceNode(generatedSourceId, text) {
   if (sourceNodes.has(generatedSourceId)) {
     return sourceNodes.get(generatedSourceId);
   }
 
-  const consumer = getConsumer(generatedSourceId);
+  const consumer = _getConsumer(generatedSourceId);
   invariant(consumer, "source map must be present");
 
   const sourceNode = SourceNode.fromStringWithSourceMap(text, consumer);
   sourceNodes.set(generatedSourceId, sourceNode);
   return sourceNode;
 }
 
-function createOriginalSources(generatedSource) {
-  return getOriginalSources(generatedSource.id)
-    .map((source, index) => Source({
-      url: source,
-      id: generatedSource.id + "/" + index,
-      isPrettyPrinted: false
-    }));
+function isOriginal(originalSource) {
+  return !!getGeneratedSourceId(originalSource);
+}
+
+function isGenerated(source) {
+  return [...sourceMapConsumers.keys()].includes(source.id);
+}
+
+function getGeneratedSourceLocation(originalSource, originalLocation) {
+  const generatedSourceId = getGeneratedSourceId(originalSource);
+  const consumer = _getConsumer(generatedSourceId);
+  const generatedLocation = consumer.generatedPositionFor({
+    source: originalSource.url,
+    line: originalLocation.line,
+    column: 0
+  });
+
+  return {
+    sourceId: generatedSourceId,
+    line: generatedLocation.line
+  };
+}
+
+function getGeneratedSourceId(originalSource) {
+  const match = [...sourceMapConsumers].find(
+    ([x, consumer]) => consumer.sources.includes(originalSource.url)
+  );
+
+  return match ? match[0] : null;
 }
 
 function getOriginalSource(
   originalSource, generatedSource, generatedSourceText
 ) {
-  const sourceNode = getSourceNode(
+  const sourceNode = _getSourceNode(
     generatedSource.id,
     generatedSourceText.text
   );
@@ -78,10 +88,23 @@ function getOriginalSource(
   };
 }
 
+function createOriginalSources(generatedSource, sourceMap) {
+  if (!_hasConsumer(generatedSource.id)) {
+    _setConsumer(generatedSource, sourceMap);
+  }
+  return _getOriginalSources(generatedSource.id)
+    .map((source, index) => Source({
+      url: source,
+      id: generatedSource.id + "/" + index,
+      isPrettyPrinted: false
+    }));
+}
+
 module.exports = {
-  setSourceMap,
   getOriginalSource,
+  getGeneratedSourceLocation,
   createOriginalSources,
   isOriginal,
+  isGenerated,
   getGeneratedSourceId
 };
