Added sourcemaps support

Author: unlight

.gitignore

@@ -1,3 +1,4 @@
+/test
 /node_modules/
 __*
 ~*

gulp-cssimport.js

@@ -9,6 +9,8 @@ var collect = require("collect-stream");
 var hh = require("http-https");
 var minimatch = require("minimatch");
 var phpfn = require("phpfn");
+var applySourceMap = require("vinyl-sourcemaps-apply");
+var MagicString = require("magic-string");
 
 var PLUGIN_NAME = "gulp-cssimport";
 var readFile = pify(fs.readFile);
@@ -39,7 +41,6 @@ module.exports = function cssImport(options) {
 	var cssCount = 0;
 
 	function fileContents(vinyl, encoding, callback) {
-		// console.log('fileContents ' , vinyl.path);
 
 		if (!stream) {
 			stream = this;
@@ -69,18 +70,21 @@ module.exports = function cssImport(options) {
 			}
 
 			(function(index) {
+				var result = {index: index, importPath: importPath};
 				if (!isUrl(importPath)) {
 					var importFile = path.resolve(path.dirname(vinyl.path), importPath);
-					// console.log('importFile %s from %s' , importFile, vinyl.path);
-					promises.push(readFile(importFile, "utf8").then(function(data) {
-						return {index: index, importFile: importFile, data: data};
+					promises.push(readFile(importFile, "utf8").then(function(contents) {
+						result.importFile = importFile;
+						result.contents = contents;
+						return result;
 					}));
 				} else {
 					promises[promises.length] = new Promise(function(resolve, reject) {
 						var req = hh.request(importPath, function (res) {
 							collect(res, function (err, data) {
 								if (err) return reject(err);
-								resolve({index: index, data: data.toString()});
+								result.contents = data.toString();
+								resolve(result);
 							});
 						});
 						req.on("error", reject);
@@ -99,29 +103,53 @@ module.exports = function cssImport(options) {
 		// Waiting promises.
 		Promise.all(promises).then(function(results) {
 			for (var i = 0; i < results.length; i++) {
-				var item = results[i];
-				// file[item.index] = item.data;
+				var result = results[i];
 				var vfile = new gutil.File({
-					path: item.importFile,
-					contents: new Buffer(item.data)
+					path: result.importFile,
+					contents: new Buffer(result.contents)
 				});
-				(function(item) {
+				(function(result) {
 					results[i] = pify(fileContents)(vfile, null).then(function(vfile) {
-						return {index: item.index, data: vfile.contents.toString()};
+						result.contents = vfile.contents.toString();
+						return result;
 					});
-				})(item);
+				})(result);
 			}
 			return Promise.all(results);
 		})
 		.then(function(results) {
+			var iterator = function() {};
+			if (vinyl.sourceMap) {
+				var bundle = new MagicString.Bundle();
+				iterator = function(file, result) {
+					bundle.addSource({
+					  	filename: result.importPath,
+					  	content: new MagicString(result.contents)
+					});
+				};
+			}
 			for (var i = 0; i < results.length; i++) {
-				var index = results[i].index;
-				file[index] = results[i].data;
+				var result = results[i];
+				var index = result.index;
+				var contents = result.contents;
+				file[index] = contents;
+				iterator(file, result);
 			}
 			vinyl.contents = new Buffer(file.join(""));
+			if (vinyl.sourceMap) {
+				var map = bundle.generateMap({
+					file: vinyl.relative,
+					includeContent: true,
+					hires: true
+				});
+				applySourceMap(vinyl, map);
+			}
 			callback(null, vinyl);
 		})
-		.catch(callback);
+		.catch(function(err) {
+			console.log('err ' , err);
+			callback(new gutil.PluginError(PLUGIN_NAME, err));
+		});
 	}
 
 	return through.obj(fileContents);

package.json

@@ -20,16 +20,19 @@
     "deep-extend": "^0.4.0",
     "gulp-util": "2.2.X",
     "http-https": "^1.0.0",
+    "magic-string": "^0.10.2",
     "minimatch": "^2.0.8",
     "phpfn": "^1.0.0",
     "pify": "^2.3.0",
-    "through2": "0.4.X"
+    "through2": "0.4.X",
+    "vinyl-sourcemaps-apply": "^0.2.1"
   },
   "devDependencies": {
     "gulp": "^3.9.0",
     "gulp-bump": "0.1.X",
     "gulp-eslint": "0.1.X",
     "gulp-load-plugins": "0.7.X",
+    "gulp-sourcemaps": "^1.6.0",
     "minimist": "1.1.X",
     "tape": "^4.0.0"
   },

readme.md

@@ -79,7 +79,7 @@ TIPS AND TRICKS
 @import "b.css";
 ```
 If you will do `gulp.src("*.css")` gulp will read `a.css` and `b.css`,
-and plugin also will try to read these files. It is double job.  
+and plugin also will try to read these files. It is extra job.  
 Do instead: `gulp.src("main.css")`
 
 **Use filter option:**  
@@ -137,5 +137,6 @@ CHANGELOG
 - added option 'matchPattern'
 
 3.0 [28 Feb 2016]
-- Removed node streams support, now only gulp
-- Removed directory option
+- removed node streams support, now only gulp
+- removed directory option
+- added sourcemaps support

test/complete/index.js

@@ -7,11 +7,10 @@ var gulp = require("gulp");
 var options = {
 };
 
-test("Gulp complete", {timeout: 5000}, function (t) {
+test("Complete", {timeout: 5000}, function (t) {
 	var result = fs.readFileSync("result.css", { encoding: "utf8" });
 	var stream = gulp.src("design/style.css")
-		.pipe(plugin(options))
-		.pipe(gulp.dest("/dev/null"));
+		.pipe(plugin(options));
 	collect(stream, function (err, data) {
 		var file = data[0];
 		data = file.contents.toString();

test/options-matchpattern/index.js

@@ -8,15 +8,14 @@ var options = {
     matchPattern: '*.css',
 };
 
-test("Gulp parent", function(t) {
+test("Parent", function(t) {
     var stream;
     t.plan(1);
     var result = fs.readFileSync("result.css", {
         encoding: "utf8"
     });
     stream = gulp.src("design/style/css/main/style.css")
-        .pipe(plugin(options))
-        .pipe(gulp.dest("/dev/null"));
+        .pipe(plugin(options));
     collect(stream, function(err, data) {
         var file = data[0];
         data = file.contents.toString();

test/parent/index.js

@@ -6,12 +6,11 @@ var gulp = require("gulp");
 
 var options = { matchPattern: '*.css' };
 
-test("Gulp parent", function (t) {
+test("Parent", function (t) {
 	var stream;
 	var result = fs.readFileSync("result.css", { encoding: "utf8" });
 	stream = gulp.src("design/style/css/main/style.css")
-		.pipe(plugin(options))
-		.pipe(gulp.dest("/dev/null"));
+		.pipe(plugin(options));
 	collect(stream, function (err, data) {
 		var file = data[0];
 		data = file.contents.toString();

test/sourcemaps/a.css

@@ -0,0 +1,3 @@
+.a {
+	font-color: red;
+}

test/sourcemaps/b.css

@@ -0,0 +1,3 @@
+.b {
+	font-weight: bold;
+}

test/sourcemaps/index.js

@@ -0,0 +1,24 @@
+var test = require("tape");
+var fs = require("fs");
+var collect = require("collect-stream");
+var plugin = require("../..");
+var gulp = require("gulp");
+var sourcemaps = require("gulp-sourcemaps");
+
+var options = {
+};
+
+test("Sourcemaps", function (t) {
+	// var result = fs.readFileSync("result.css", { encoding: "utf8" });
+	var stream = gulp.src("style*.css")
+		.pipe(sourcemaps.init())
+		.pipe(plugin(options))
+		.pipe(sourcemaps.write())
+		.pipe(gulp.dest("./~dst"))
+	collect(stream, function (err, vinyls) {
+		data = vinyls[0].contents.toString();
+		t.notEqual(data.indexOf('# sourceMappingURL'), -1);
+		t.end();
+	});
+
+});