From 8d740a0aa30c1da671900692429cbf15b5af997d Mon Sep 17 00:00:00 2001
From: Jakub Pawlowicz <contact@jakubpawlowicz.com>
Date: Sun, 1 Mar 2015 10:46:05 +0000
Subject: [PATCH] Refactores source map tracking.

On unknown source a `$stdin` value is now used instead of `__stdin__.css`.
---
 lib/selectors/source-map-stringifier.js      |   9 +-
 lib/utils/input-source-map-tracker.js        |   6 +-
 lib/utils/source-maps.js                     |   8 +-
 test/selectors/tokenizer-source-maps-test.js | 170 +++++++++----------
 test/source-map-test.js                      |  50 +++---
 5 files changed, 124 insertions(+), 119 deletions(-)

diff --git a/lib/selectors/source-map-stringifier.js b/lib/selectors/source-map-stringifier.js
index a2d38896..35258a1b 100644
--- a/lib/selectors/source-map-stringifier.js
+++ b/lib/selectors/source-map-stringifier.js
@@ -3,6 +3,7 @@ var fs = require('fs');
 var url = require('url');
 
 var SourceMapGenerator = require('source-map').SourceMapGenerator;
+var SourceMap = require('../utils/source-maps');
 
 var lineBreak = require('os').EOL;
 
@@ -112,7 +113,7 @@ Rebuilder.prototype.track = function (value, metadata, allowNFallbacks) {
 };
 
 Rebuilder.prototype.trackMetadata = function (metadata, value, allowNFallbacks) {
-  var original = this.inputMapTracker.isTracking(metadata) ?
+  var original = this.inputMapTracker.isTracking(metadata.source) ?
     this.inputMapTracker.originalPositionFor(metadata, value, allowNFallbacks) :
     {};
 
@@ -121,10 +122,10 @@ Rebuilder.prototype.trackMetadata = function (metadata, value, allowNFallbacks)
       line: this.line,
       column: this.column
     },
-    source: this.stylingSourceFor(original, metadata) || '__stdin__.css',
+    source: this.stylingSourceFor(original, metadata) || SourceMap.unknownSource,
     original: {
-      line: original.line || metadata.line,
-      column: original.column || metadata.column
+      line: original.line || metadata.original.line,
+      column: original.column || metadata.original.column
     }
   });
 };
diff --git a/lib/utils/input-source-map-tracker.js b/lib/utils/input-source-map-tracker.js
index 31eda870..d7bee48c 100644
--- a/lib/utils/input-source-map-tracker.js
+++ b/lib/utils/input-source-map-tracker.js
@@ -141,12 +141,12 @@ InputSourceMapStore.prototype.trackLoaded = function (sourceFile, sourceMap) {
   this.maps[sourceFile] = new SourceMapConsumer(sourceMap);
 };
 
-InputSourceMapStore.prototype.isTracking = function (sourceInfo) {
-  return !!this.maps[sourceInfo.source];
+InputSourceMapStore.prototype.isTracking = function (source) {
+  return !!this.maps[source];
 };
 
 InputSourceMapStore.prototype.originalPositionFor = function (sourceInfo, token, allowNFallbacks) {
-  return originalPositionIn(this.maps[sourceInfo.source], sourceInfo, token, allowNFallbacks);
+  return originalPositionIn(this.maps[sourceInfo.source], sourceInfo.original, token, allowNFallbacks);
 };
 
 module.exports = InputSourceMapStore;
diff --git a/lib/utils/source-maps.js b/lib/utils/source-maps.js
index c028bdf0..4b3f41df 100644
--- a/lib/utils/source-maps.js
+++ b/lib/utils/source-maps.js
@@ -19,12 +19,16 @@ function trimLeft(value, context) {
 }
 
 var SourceMaps = {
+  unknownSource: '$stdin',
+
   saveAndTrack: function (data, context, hasSuffix) {
     var trimmedValue = trimLeft(data, context);
 
     var metadata = {
-      line: context.line,
-      column: context.column,
+      original: {
+        line: context.line,
+        column: context.column
+      },
       source: context.source
     };
 
diff --git a/test/selectors/tokenizer-source-maps-test.js b/test/selectors/tokenizer-source-maps-test.js
index 8968eb85..f8dd6c9d 100644
--- a/test/selectors/tokenizer-source-maps-test.js
+++ b/test/selectors/tokenizer-source-maps-test.js
@@ -35,7 +35,7 @@ vows.describe('source-maps/analyzer')
         'a{}',
         [{
           kind: 'selector',
-          value: [{ value: 'a', metadata: { line: 1, column: 0, source: undefined } }],
+          value: [{ value: 'a', metadata: { original: { line: 1, column: 0 }, source: undefined } }],
           body: []
         }]
       ],
@@ -44,8 +44,8 @@ vows.describe('source-maps/analyzer')
         [{
           kind: 'selector',
           value: [
-            { value: 'a', metadata: { line: 1, column: 0, source: undefined } },
-            { value: 'div', metadata: { line: 1, column: 2, source: undefined } }
+            { value: 'a', metadata: { original: { line: 1, column: 0 }, source: undefined } },
+            { value: 'div', metadata: { original: { line: 1, column: 2 }, source: undefined } }
           ],
           body: []
         }]
@@ -55,8 +55,8 @@ vows.describe('source-maps/analyzer')
         [{
           kind: 'selector',
           value: [
-            { value: 'a', metadata: { line: 1, column: 1, source: undefined } },
-            { value: '\n\ndiv', metadata: { line: 3, column: 0, source: undefined } }
+            { value: 'a', metadata: { original: { line: 1, column: 1 }, source: undefined } },
+            { value: '\n\ndiv', metadata: { original: { line: 3, column: 0 }, source: undefined } }
           ],
           body: []
         }]
@@ -66,9 +66,9 @@ vows.describe('source-maps/analyzer')
         [{
           kind: 'selector',
           value: [
-            { value: 'a', metadata: { line: 1, column: 0, source: undefined } },
-            { value: 'div', metadata: { line: 1, column: 2, source: undefined } },
-            { value: 'p', metadata: { line: 1, column: 6, source: undefined } }
+            { value: 'a', metadata: { original: { line: 1, column: 0 }, source: undefined } },
+            { value: 'div', metadata: { original: { line: 1, column: 2 }, source: undefined } },
+            { value: 'p', metadata: { original: { line: 1, column: 6 }, source: undefined } }
           ],
           body: []
         }]
@@ -78,9 +78,9 @@ vows.describe('source-maps/analyzer')
         [{
           kind: 'selector',
           value: [
-            { value: 'a', metadata: { line: 1, column: 1, source: undefined } },
-            { value: '\n\ndiv\na', metadata: { line: 3, column: 0, source: undefined } },
-            { value: '\n p', metadata: { line: 5, column: 1, source: undefined } }
+            { value: 'a', metadata: { original: { line: 1, column: 1 }, source: undefined } },
+            { value: '\n\ndiv\na', metadata: { original: { line: 3, column: 0 }, source: undefined } },
+            { value: '\n p', metadata: { original: { line: 5, column: 1 }, source: undefined } }
           ],
           body: []
         }]
@@ -90,12 +90,12 @@ vows.describe('source-maps/analyzer')
         [
           {
             kind: 'selector',
-            value: [{ value: 'a', metadata: { line: 1, column: 0, source: undefined } }],
+            value: [{ value: 'a', metadata: { original: { line: 1, column: 0 }, source: undefined } }],
             body: []
           },
           {
             kind: 'selector',
-            value: [{ value: 'div', metadata: { line: 1, column: 3, source: undefined } }],
+            value: [{ value: 'div', metadata: { original: { line: 1, column: 3 }, source: undefined } }],
             body: []
           }
         ]
@@ -105,17 +105,17 @@ vows.describe('source-maps/analyzer')
         [
           {
             kind: 'selector',
-            value: [{ value: 'a ', metadata: { line: 1, column: 0, source: undefined } }],
+            value: [{ value: 'a ', metadata: { original: { line: 1, column: 0 }, source: undefined } }],
             body: []
           },
           {
             kind: 'selector',
-            value: [{ value: 'div', metadata: { line: 3, column: 0, source: undefined } }],
+            value: [{ value: 'div', metadata: { original: { line: 3, column: 0 }, source: undefined } }],
             body: []
           },
           {
             kind: 'selector',
-            value: [{ value: 'p', metadata: { line: 5, column: 2, source: undefined } }],
+            value: [{ value: 'p', metadata: { original: { line: 5, column: 2 }, source: undefined } }],
             body: []
           }
         ]
@@ -128,18 +128,18 @@ vows.describe('source-maps/analyzer')
         'a{color:red}',
         [{
           kind: 'selector',
-          value: [{ value: 'a', metadata: { line: 1, column: 0, source: undefined } }],
-          body: [{ value: 'color:red', metadata: { line: 1, column: 2, source: undefined } }]
+          value: [{ value: 'a', metadata: { original: { line: 1, column: 0 }, source: undefined } }],
+          body: [{ value: 'color:red', metadata: { original: { line: 1, column: 2 }, source: undefined } }]
         }]
       ],
       'double': [
         'a{color:red;border:none}',
         [{
           kind: 'selector',
-          value: [{ value: 'a', metadata: { line: 1, column: 0, source: undefined } }],
+          value: [{ value: 'a', metadata: { original: { line: 1, column: 0 }, source: undefined } }],
           body: [
-            { value: 'color:red', metadata: { line: 1, column: 2, source: undefined } },
-            { value: 'border:none', metadata: { line: 1, column: 12, source: undefined } }
+            { value: 'color:red', metadata: { original: { line: 1, column: 2 }, source: undefined } },
+            { value: 'border:none', metadata: { original: { line: 1, column: 12 }, source: undefined } }
           ]
         }]
       ],
@@ -147,11 +147,11 @@ vows.describe('source-maps/analyzer')
         'a{color:red;\nborder:\nnone;\n\n  display:block}',
         [{
           kind: 'selector',
-          value: [{ value: 'a', metadata: { line: 1, column: 0, source: undefined } }],
+          value: [{ value: 'a', metadata: { original: { line: 1, column: 0 }, source: undefined } }],
           body: [
-            { value: 'color:red', metadata: { line: 1, column: 2, source: undefined } },
-            { value: 'border:none', metadata: { line: 2, column: 0, source: undefined } },
-            { value: 'display:block', metadata: { line: 5, column: 2, source: undefined } }
+            { value: 'color:red', metadata: { original: { line: 1, column: 2 }, source: undefined } },
+            { value: 'border:none', metadata: { original: { line: 2, column: 0 }, source: undefined } },
+            { value: 'display:block', metadata: { original: { line: 5, column: 2 }, source: undefined } }
           ]
         }]
       ],
@@ -160,13 +160,13 @@ vows.describe('source-maps/analyzer')
         [
           {
             kind: 'selector',
-            value: [{ value: 'a', metadata: { line: 1, column: 0, source: undefined } }],
-            body: [{ value: 'color:red', metadata: { line: 1, column: 2, source: undefined } }]
+            value: [{ value: 'a', metadata: { original: { line: 1, column: 0 }, source: undefined } }],
+            body: [{ value: 'color:red', metadata: { original: { line: 1, column: 2 }, source: undefined } }]
           },
           {
             kind: 'selector',
-            value: [{ value: 'div', metadata: { line: 1, column: 12, source: undefined } }],
-            body: [{ value: 'color:blue', metadata: { line: 1, column: 16, source: undefined } }]
+            value: [{ value: 'div', metadata: { original: { line: 1, column: 12 }, source: undefined } }],
+            body: [{ value: 'color:blue', metadata: { original: { line: 1, column: 16 }, source: undefined } }]
           }
         ]
       ],
@@ -175,13 +175,13 @@ vows.describe('source-maps/analyzer')
         [
           {
             kind: 'selector',
-            value: [{ value: 'a', metadata: { line: 1, column: 0, source: undefined } }],
-            body: [{ value: 'color:red', metadata: { line: 1, column: 2, source: undefined } }]
+            value: [{ value: 'a', metadata: { original: { line: 1, column: 0 }, source: undefined } }],
+            body: [{ value: 'color:red', metadata: { original: { line: 1, column: 2 }, source: undefined } }]
           },
           {
             kind: 'selector',
-            value: [{ value: 'div', metadata: { line: 2, column: 1, source: undefined } }],
-            body: [{ value: 'color:blue', metadata: { line: 2, column: 5, source: undefined } }]
+            value: [{ value: 'div', metadata: { original: { line: 2, column: 1 }, source: undefined } }],
+            body: [{ value: 'color:blue', metadata: { original: { line: 2, column: 5 }, source: undefined } }]
           }
         ]
       ],
@@ -190,13 +190,13 @@ vows.describe('source-maps/analyzer')
         [
           {
             kind: 'selector',
-            value: [{ value: 'a', metadata: { line: 1, column: 0, source: undefined } }],
-            body: [{ value: 'color:red', metadata: { line: 1, column: 2, source: undefined } }]
+            value: [{ value: 'a', metadata: { original: { line: 1, column: 0 }, source: undefined } }],
+            body: [{ value: 'color:red', metadata: { original: { line: 1, column: 2 }, source: undefined } }]
           },
           {
             kind: 'selector',
-            value: [{ value: 'div', metadata: { line: 3, column: 1, source: undefined } }],
-            body: [{ value: 'color:blue', metadata: { line: 3, column: 5, source: undefined } }]
+            value: [{ value: 'div', metadata: { original: { line: 3, column: 1 }, source: undefined } }],
+            body: [{ value: 'color:blue', metadata: { original: { line: 3, column: 5 }, source: undefined } }]
           }
         ]
       ]
@@ -209,18 +209,18 @@ vows.describe('source-maps/analyzer')
         [
           {
             kind: 'selector',
-            value: [{ value: 'a', metadata: { line: 1, column: 0, source: undefined } }],
+            value: [{ value: 'a', metadata: { original: { line: 1, column: 0 }, source: undefined } }],
             body: []
           },
           {
             kind: 'at-rule',
             value: '@import \n"test.css";',
-            metadata: { line: 1, column: 3, source: undefined }
+            metadata: { original: { line: 1, column: 3 }, source: undefined }
           },
           {
             kind: 'selector',
-            value: [{ value: 'a', metadata: { line: 4, column: 0, source: undefined } }],
-            body: [{ value: 'color:red', metadata: { line: 4, column: 2, source: undefined } }]
+            value: [{ value: 'a', metadata: { original: { line: 4, column: 0 }, source: undefined } }],
+            body: [{ value: 'color:red', metadata: { original: { line: 4, column: 2 }, source: undefined } }]
           }
         ]
       ],
@@ -230,12 +230,12 @@ vows.describe('source-maps/analyzer')
           {
             kind: 'at-rule',
             value: '@charset "utf-8";',
-            metadata: { line: 1, column: 0, source: undefined }
+            metadata: { original: { line: 1, column: 0 }, source: undefined }
           },
           {
             kind: 'selector',
-            value: [{ value: 'a', metadata: { line: 1, column: 18, source: undefined } }],
-            body: [{ value: 'color:red', metadata: { line: 1, column: 20, source: undefined } }]
+            value: [{ value: 'a', metadata: { original: { line: 1, column: 18 }, source: undefined } }],
+            body: [{ value: 'color:red', metadata: { original: { line: 1, column: 20 }, source: undefined } }]
           }
         ]
       ]
@@ -249,12 +249,12 @@ vows.describe('source-maps/analyzer')
           {
             kind: 'block',
             value: '@media (min-width:980px)',
-            metadata: { line: 1, column: 0, source: undefined },
+            metadata: { original: { line: 1, column: 0 }, source: undefined },
             isFlatBlock: false,
             body: [{
               kind: 'selector',
-              value: [{ value: 'a', metadata: { line: 1, column: 25, source: undefined } }],
-              body: [{ value: 'color:red', metadata: { line: 1, column: 27, source: undefined } }]
+              value: [{ value: 'a', metadata: { original: { line: 1, column: 25 }, source: undefined } }],
+              body: [{ value: 'color:red', metadata: { original: { line: 1, column: 27 }, source: undefined } }]
             }]
           }
         ]
@@ -265,17 +265,17 @@ vows.describe('source-maps/analyzer')
           {
             kind: 'block',
             value: '@media (\nmin-width:980px)',
-            metadata: { line: 1, column: 0, source: undefined },
+            metadata: { original: { line: 1, column: 0 }, source: undefined },
             isFlatBlock: false,
             body: [
               {
                 kind: 'selector',
-                value: [{ value: 'a', metadata: { line: 4, column: 0, source: undefined } }],
-                body: [{ value: 'color:red', metadata: { line: 5, column: 0, source: undefined } }]
+                value: [{ value: 'a', metadata: { original: { line: 4, column: 0 }, source: undefined } }],
+                body: [{ value: 'color:red', metadata: { original: { line: 5, column: 0 }, source: undefined } }]
               },
               {
                 kind: 'selector',
-                value: [{ value: 'p', metadata: { line: 6, column: 4, source: undefined } }],
+                value: [{ value: 'p', metadata: { original: { line: 6, column: 4 }, source: undefined } }],
                 body: []
               }
             ]
@@ -288,20 +288,20 @@ vows.describe('source-maps/analyzer')
           {
             kind: 'block',
             value: '@media (min-width:980px)',
-            metadata: { line: 1, column: 0, source: undefined },
+            metadata: { original: { line: 1, column: 0 }, source: undefined },
             isFlatBlock: false,
             body: [
               {
                 kind: 'selector',
-                value: [{ value: 'a', metadata: { line: 1, column: 25, source: undefined } }],
-                body: [{ value: 'color:red', metadata: { line: 1, column: 27, source: undefined } }]
+                value: [{ value: 'a', metadata: { original: { line: 1, column: 25 }, source: undefined } }],
+                body: [{ value: 'color:red', metadata: { original: { line: 1, column: 27 }, source: undefined } }]
               }
             ]
           },
           {
             kind: 'selector',
-            value: [{ value: 'p', metadata: { line: 1, column: 39, source: undefined } }],
-            body: [{ value: 'color:red', metadata: { line: 1, column: 41, source: undefined } }]
+            value: [{ value: 'p', metadata: { original: { line: 1, column: 39 }, source: undefined } }],
+            body: [{ value: 'color:red', metadata: { original: { line: 1, column: 41 }, source: undefined } }]
           }
         ]
       ],
@@ -311,18 +311,18 @@ vows.describe('source-maps/analyzer')
           {
             kind: 'block',
             value: '@font-face',
-            metadata: { line: 1, column: 0, source: undefined },
+            metadata: { original: { line: 1, column: 0 }, source: undefined },
             isFlatBlock: true,
             body: [
-              { value: 'font-family:"Font"', metadata: { line: 1, column: 11, source: undefined } },
-              { value: 'src:url("font.ttf")', metadata: { line: 2, column: 0, source: undefined } },
-              { value: 'font-weight:normal', metadata: { line: 3, column: 0, source: undefined } },
-              { value: 'font-style:normal', metadata: { line: 3, column: 20, source: undefined } }
+              { value: 'font-family:"Font"', metadata: { original: { line: 1, column: 11 }, source: undefined } },
+              { value: 'src:url("font.ttf")', metadata: { original: { line: 2, column: 0 }, source: undefined } },
+              { value: 'font-weight:normal', metadata: { original: { line: 3, column: 0 }, source: undefined } },
+              { value: 'font-style:normal', metadata: { original: { line: 3, column: 20 }, source: undefined } }
             ]
           },
           {
             kind: 'selector',
-            value: [{ value: 'a', metadata: { line: 3, column: 39, source: undefined } }],
+            value: [{ value: 'a', metadata: { original: { line: 3, column: 39 }, source: undefined } }],
             body: []
           }
         ]
@@ -333,10 +333,10 @@ vows.describe('source-maps/analyzer')
           {
             kind: 'block',
             value: '@font-face',
-            metadata: { line: 2, column: 0, source: undefined },
+            metadata: { original: { line: 2, column: 0 }, source: undefined },
             isFlatBlock: true,
             body: [
-              { value: 'font-family:"Font"', metadata: { line: 3, column: 1, source: undefined } }
+              { value: 'font-family:"Font"', metadata: { original: { line: 3, column: 1 }, source: undefined } }
             ]
           }
         ]
@@ -350,7 +350,7 @@ vows.describe('source-maps/analyzer')
         [
           {
             kind: 'selector',
-            value: [{ value: 'a', metadata: { line: 1, column: 5, source: undefined } }],
+            value: [{ value: 'a', metadata: { original: { line: 1, column: 5 }, source: undefined } }],
             body: []
           }
         ]
@@ -360,7 +360,7 @@ vows.describe('source-maps/analyzer')
         [
           {
             kind: 'selector',
-            value: [{ value: 'a', metadata: { line: 3, column: 5, source: undefined } }],
+            value: [{ value: 'a', metadata: { original: { line: 3, column: 5 }, source: undefined } }],
             body: []
           }
         ]
@@ -370,10 +370,10 @@ vows.describe('source-maps/analyzer')
         [{
           kind: 'selector',
           value: [
-            { value: 'div[data-type=__ESCAPED_FREE_TEXT_CLEAN_CSS0(1,3)__]', metadata: { line: 1, column: 0, source: undefined } },
-            { value: 'div[data-id=__ESCAPED_FREE_TEXT_CLEAN_CSS1(0,7)__]', metadata: { line: 2, column: 5, source: undefined } }
+            { value: 'div[data-type=__ESCAPED_FREE_TEXT_CLEAN_CSS0(1,3)__]', metadata: { original: { line: 1, column: 0 }, source: undefined } },
+            { value: 'div[data-id=__ESCAPED_FREE_TEXT_CLEAN_CSS1(0,7)__]', metadata: { original: { line: 2, column: 5 }, source: undefined } }
           ],
-          body: [{ value: 'color:red', metadata: { line: 2, column: 26, source: undefined } }]
+          body: [{ value: 'color:red', metadata: { original: { line: 2, column: 26 }, source: undefined } }]
         }]
       ],
       'in properties': [
@@ -381,19 +381,19 @@ vows.describe('source-maps/analyzer')
         [
           {
             kind: 'selector',
-            value: [{ value: 'div', metadata: { line: 1, column: 0, source: undefined } }],
+            value: [{ value: 'div', metadata: { original: { line: 1, column: 0 }, source: undefined } }],
             body: [
-              { value: '__ESCAPED_COMMENT_SPECIAL_CLEAN_CSS0(2,5)__', metadata: { line: 1, column: 4, source: undefined }},
-              { value: 'background:url(__ESCAPED_URL_CLEAN_CSS0(0,20)__)', metadata: { line: 3, column: 5, source: undefined } },
-              { value: 'color:blue', metadata: { line: 3, column: 42, source: undefined } }
+              { value: '__ESCAPED_COMMENT_SPECIAL_CLEAN_CSS0(2,5)__', metadata: { original: { line: 1, column: 4 }, source: undefined }},
+              { value: 'background:url(__ESCAPED_URL_CLEAN_CSS0(0,20)__)', metadata: { original: { line: 3, column: 5 }, source: undefined } },
+              { value: 'color:blue', metadata: { original: { line: 3, column: 42 }, source: undefined } }
             ]
           },
           {
             kind: 'selector',
-            value: [{ value: 'a', metadata: { line: 3, column: 53, source: undefined } }],
+            value: [{ value: 'a', metadata: { original: { line: 3, column: 53 }, source: undefined } }],
             body: [
-              { value: 'font-family:__ESCAPED_FREE_TEXT_CLEAN_CSS0(1,3)__', metadata: { line: 3, column: 55, source: undefined } },
-              { value: 'color:red', metadata: { line: 4, column: 4, source: undefined } }
+              { value: 'font-family:__ESCAPED_FREE_TEXT_CLEAN_CSS0(1,3)__', metadata: { original: { line: 3, column: 55 }, source: undefined } },
+              { value: 'color:red', metadata: { original: { line: 4, column: 4 }, source: undefined } }
             ]
           }
         ]
@@ -404,11 +404,11 @@ vows.describe('source-maps/analyzer')
           {
             kind: 'at-rule',
             value: '@charset __ESCAPED_FREE_TEXT_CLEAN_CSS0(1, 5)__;',
-            metadata: { line: 1, column: 0, source: undefined }
+            metadata: { original: { line: 1, column: 0 }, source: undefined }
           },
           {
             kind: 'selector',
-            value: [{ value: 'div', metadata: { line: 2, column: 7, source: undefined } }],
+            value: [{ value: 'div', metadata: { original: { line: 2, column: 7 }, source: undefined } }],
             body: []
           }
         ]
@@ -419,12 +419,12 @@ vows.describe('source-maps/analyzer')
           {
             kind: 'block',
             value: '@media (__ESCAPED_COMMENT_CLEAN_CSS0(2, 1)__min-width:980px)',
-            metadata: { line: 1, column: 0, source: undefined },
+            metadata: { original: { line: 1, column: 0 }, source: undefined },
             isFlatBlock: false,
             body: [{
               kind: 'selector',
-              value: [{ value: 'a', metadata: { line: 3, column: 18, source: undefined } }],
-              body: [{ value: 'color:red', metadata: { line: 3, column: 20, source: undefined } }]
+              value: [{ value: 'a', metadata: { original: { line: 3, column: 18 }, source: undefined } }],
+              body: [{ value: 'color:red', metadata: { original: { line: 3, column: 20 }, source: undefined } }]
             }]
           }
         ]
@@ -442,7 +442,7 @@ vows.describe('source-maps/analyzer')
         },
         [{
           kind: 'selector',
-          value: [{ value: 'a', metadata: { line: 1, column: 0, source: 'one.css' } }],
+          value: [{ value: 'a', metadata: { original: { line: 1, column: 0 }, source: 'one.css' } }],
           body: []
         }]
       ],
@@ -458,16 +458,16 @@ vows.describe('source-maps/analyzer')
           {
             kind: 'selector',
             value: [
-              { value: 'a', metadata: { line: 1, column: 0, source: 'one.css' } }
+              { value: 'a', metadata: { original: { line: 1, column: 0 }, source: 'one.css' } }
             ],
             body: []
           },
           {
             kind: 'selector',
             value: [
-              { value: 'a', metadata: { line: 2, column: 0, source: 'two.css' } }
+              { value: 'a', metadata: { original: { line: 2, column: 0 }, source: 'two.css' } }
             ],
-            body: [{ value: 'color:red', metadata: { line: 2, column: 2, source: 'two.css' } }]
+            body: [{ value: 'color:red', metadata: { original: { line: 2, column: 2 }, source: 'two.css' } }]
           }
         ]
       ]
diff --git a/test/source-map-test.js b/test/source-map-test.js
index 477482ed..a46d69b4 100644
--- a/test/source-map-test.js
+++ b/test/source-map-test.js
@@ -36,7 +36,7 @@ vows.describe('source-map')
           generatedColumn: 8,
           originalLine: 1,
           originalColumn: 8,
-          source: '__stdin__.css',
+          source: '$stdin',
           name: null
         };
         assert.deepEqual(minified.sourceMap._mappings._array[0], mapping);
@@ -47,7 +47,7 @@ vows.describe('source-map')
           generatedColumn: 29,
           originalLine: 1,
           originalColumn: 31,
-          source: '__stdin__.css',
+          source: '$stdin',
           name: null
         };
         assert.deepEqual(minified.sourceMap._mappings._array[1], mapping);
@@ -64,7 +64,7 @@ vows.describe('source-map')
           generatedColumn: 0,
           originalLine: 1,
           originalColumn: 0,
-          source: '__stdin__.css',
+          source: '$stdin',
           name: null
         };
         assert.deepEqual(minified.sourceMap._mappings._array[0], mapping);
@@ -75,7 +75,7 @@ vows.describe('source-map')
           generatedColumn: 14,
           originalLine: 2,
           originalColumn: 0,
-          source: '__stdin__.css',
+          source: '$stdin',
           name: null
         };
         assert.deepEqual(minified.sourceMap._mappings._array[1], mapping);
@@ -86,7 +86,7 @@ vows.describe('source-map')
           generatedColumn: 25,
           originalLine: 4,
           originalColumn: 0,
-          source: '__stdin__.css',
+          source: '$stdin',
           name: null
         };
         assert.deepEqual(minified.sourceMap._mappings._array[2], mapping);
@@ -103,7 +103,7 @@ vows.describe('source-map')
           generatedColumn: 0,
           originalLine: 1,
           originalColumn: 0,
-          source: '__stdin__.css',
+          source: '$stdin',
           name: null
         };
         assert.deepEqual(minified.sourceMap._mappings._array[0], mapping);
@@ -114,7 +114,7 @@ vows.describe('source-map')
           generatedColumn: 14,
           originalLine: 1,
           originalColumn: 16,
-          source: '__stdin__.css',
+          source: '$stdin',
           name: null
         };
         assert.deepEqual(minified.sourceMap._mappings._array[1], mapping);
@@ -125,7 +125,7 @@ vows.describe('source-map')
           generatedColumn: 16,
           originalLine: 1,
           originalColumn: 18,
-          source: '__stdin__.css',
+          source: '$stdin',
           name: null
         };
         assert.deepEqual(minified.sourceMap._mappings._array[2], mapping);
@@ -136,7 +136,7 @@ vows.describe('source-map')
           generatedColumn: 0,
           originalLine: 1,
           originalColumn: 29,
-          source: '__stdin__.css',
+          source: '$stdin',
           name: null
         };
         assert.deepEqual(minified.sourceMap._mappings._array[3], mapping);
@@ -147,7 +147,7 @@ vows.describe('source-map')
           generatedColumn: 2,
           originalLine: 1,
           originalColumn: 32,
-          source: '__stdin__.css',
+          source: '$stdin',
           name: null
         };
         assert.deepEqual(minified.sourceMap._mappings._array[4], mapping);
@@ -158,7 +158,7 @@ vows.describe('source-map')
           generatedColumn: 0,
           originalLine: 1,
           originalColumn: 45,
-          source: '__stdin__.css',
+          source: '$stdin',
           name: null
         };
         assert.deepEqual(minified.sourceMap._mappings._array[5], mapping);
@@ -169,7 +169,7 @@ vows.describe('source-map')
           generatedColumn: 4,
           originalLine: 1,
           originalColumn: 49,
-          source: '__stdin__.css',
+          source: '$stdin',
           name: null
         };
         assert.deepEqual(minified.sourceMap._mappings._array[6], mapping);
@@ -186,7 +186,7 @@ vows.describe('source-map')
           generatedColumn: 0,
           originalLine: 1,
           originalColumn: 0,
-          source: '__stdin__.css',
+          source: '$stdin',
           name: null
         };
         assert.deepEqual(minified.sourceMap._mappings._array[0], mapping);
@@ -197,7 +197,7 @@ vows.describe('source-map')
           generatedColumn: 2,
           originalLine: 1,
           originalColumn: 2,
-          source: '__stdin__.css',
+          source: '$stdin',
           name: null
         };
         assert.deepEqual(minified.sourceMap._mappings._array[1], mapping);
@@ -208,7 +208,7 @@ vows.describe('source-map')
           generatedColumn: 28,
           originalLine: 1,
           originalColumn: 28,
-          source: '__stdin__.css',
+          source: '$stdin',
           name: null
         };
         assert.deepEqual(minified.sourceMap._mappings._array[2], mapping);
@@ -225,7 +225,7 @@ vows.describe('source-map')
           generatedColumn: 0,
           originalLine: 1,
           originalColumn: 0,
-          source: '__stdin__.css',
+          source: '$stdin',
           name: null
         };
         assert.deepEqual(minified.sourceMap._mappings._array[0], mapping);
@@ -236,7 +236,7 @@ vows.describe('source-map')
           generatedColumn: 26,
           originalLine: 2,
           originalColumn: 2,
-          source: '__stdin__.css',
+          source: '$stdin',
           name: null
         };
         assert.deepEqual(minified.sourceMap._mappings._array[1], mapping);
@@ -247,7 +247,7 @@ vows.describe('source-map')
           generatedColumn: 29,
           originalLine: 3,
           originalColumn: 4,
-          source: '__stdin__.css',
+          source: '$stdin',
           name: null
         };
         assert.deepEqual(minified.sourceMap._mappings._array[2], mapping);
@@ -258,7 +258,7 @@ vows.describe('source-map')
           generatedColumn: 40,
           originalLine: 5,
           originalColumn: 2,
-          source: '__stdin__.css',
+          source: '$stdin',
           name: null
         };
         assert.deepEqual(minified.sourceMap._mappings._array[3], mapping);
@@ -269,7 +269,7 @@ vows.describe('source-map')
           generatedColumn: 45,
           originalLine: 6,
           originalColumn: 4,
-          source: '__stdin__.css',
+          source: '$stdin',
           name: null
         };
         assert.deepEqual(minified.sourceMap._mappings._array[4], mapping);
@@ -286,7 +286,7 @@ vows.describe('source-map')
           generatedColumn: 0,
           originalLine: 3,
           originalColumn: 0,
-          source: '__stdin__.css',
+          source: '$stdin',
           name: null
         };
         assert.deepEqual(minified.sourceMap._mappings._array[0], mapping);
@@ -297,7 +297,7 @@ vows.describe('source-map')
           generatedColumn: 4,
           originalLine: 3,
           originalColumn: 4,
-          source: '__stdin__.css',
+          source: '$stdin',
           name: null
         };
         assert.deepEqual(minified.sourceMap._mappings._array[1], mapping);
@@ -913,7 +913,7 @@ vows.describe('source-map')
             generatedColumn: 13,
             originalLine: 1,
             originalColumn: 46,
-            source: '__stdin__.css',
+            source: '$stdin',
             name: null
           };
           assert.deepEqual(minified.sourceMap._mappings._array[2], mapping);
@@ -924,7 +924,7 @@ vows.describe('source-map')
             generatedColumn: 18,
             originalLine: 1,
             originalColumn: 13,
-            source: '__stdin__.css',
+            source: '$stdin',
             name: null
           };
           assert.deepEqual(minified.sourceMap._mappings._array[3], mapping);
@@ -935,7 +935,7 @@ vows.describe('source-map')
             generatedColumn: 22,
             originalLine: 1,
             originalColumn: 66,
-            source: '__stdin__.css',
+            source: '$stdin',
             name: null
           };
           assert.deepEqual(minified.sourceMap._mappings._array[4], mapping);
-- 
2.34.1