Fix fileUrlToFsPath on Windows

assetgraph · Jan 23, 2018 · ae18606 · ae18606
1 parent 79a7294
commit ae18606
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 1 deletion.
diff --git a/lib/index.js b/lib/index.js
@@ -137,7 +137,14 @@ exports.ensureTrailingSlash = function (url) {
 
 exports.fileUrlToFsPath = function (fileUrl) {
     fileUrl = fileUrl.replace(/[?#].*$/, ''); // Strip query string and fragment identifier
-    return decodeURI(fileUrl).substr((process.platform === 'win32' ? 'file:///' : 'file://').length).replace(/[#\?].*$/, '');
+    var fsPath = decodeURI(fileUrl).substr('file://'.length).replace(/[#\?].*$/, '');
+
+    if (process.platform === 'win32') {
+        fsPath = fsPath.replace(/^\/([^/]+)/, function ($0, encodedDriveLetter) {
+            return decodeURIComponent(encodedDriveLetter);
+        });
+    }
+    return fsPath;
 };
 
 exports.fsFilePathToFileUrl = function (fsFilePath) {

diff --git a/test/index.js b/test/index.js
@@ -199,3 +199,23 @@ describe('urlTools', function () {
         });
     });
 });
+
+describe('on Windows', function () {
+    var originalPlatform = process.platform;
+    beforeEach(function () {
+        Object.defineProperty(process, 'platform', { value: 'win32' });
+    });
+    afterEach(function () {
+        Object.defineProperty(process, 'platform', { value: originalPlatform });
+    });
+
+    describe('#urlOrFsPathToUrl', function () {
+        it('should reinstate the drive letter in decoded form', function () {
+            expect(
+                urlTools.fileUrlToFsPath('file:///C%3A/foo/bar%20quux.png'),
+                'to equal',
+                'C:/foo/bar quux.png'
+            );
+        });
+    });
+});