Option recursive

Author: unlight

gulp-cssimport.js

@@ -14,7 +14,8 @@ var Chunk = require("./chunk");
 var defaults = {
 	extensions: null,
 	filter: null,
-	matchPattern: null
+	matchPattern: null,
+	limit: 5000
 };
 Object.defineProperty(defaults, "directory", {
 	enumerable: true,
@@ -32,8 +33,14 @@ module.exports = function cssImport(options) {
 			return x.trim();
 		});
 	}
-
+	
+	var stream;
+	var cssCount = 0;
+	
 	function fileContents(data, encoding, callback) {
+		if (!stream) {
+			stream = this;
+		}
 		var chunk = Chunk.create(data, { directory: options.directory });
 		//console.log("chunk.isVinyl", chunk.isVinyl);
 		// https://github.com/kevva/import-regex/
@@ -61,6 +68,11 @@ module.exports = function cssImport(options) {
 			fileArray[index] = format("importing file %j", pathObject);
 			lastPos = importRe.lastIndex;
 			// Start resolving.
+			// console.log("Start resolving", cssCount++, pathObject);
+			if (++cssCount > options.limit) {
+				stream.emit("error", new Error("Exceed limit. Recursive include?"));
+				return;
+			}
 			count++;
 			resolvePath(pathObject, onResolvePath);
 		}
@@ -98,13 +110,12 @@ module.exports = function cssImport(options) {
 			if (fileArray.length > 0) {
 				contents = fileArray.join("");
 			}
-			// todo: 1. options for max recursive
 			if (!state.done) {
 				//console.log("chunk.isVinyl", chunk.isVinyl);
 				var nextChunk;
 				if (chunk.isVinyl) {
 					chunk.vinyl.contents = new Buffer(contents);
-					chunk.vinyl.base = state.directory; 
+					chunk.vinyl.base = state.directory;
 					nextChunk = chunk.vinyl;
 				} else {
 					nextChunk = Chunk.create({

readme.md

@@ -45,6 +45,10 @@ Urls are matched by default. If you do not want include them, use `filter` optio
 #### matchOptions
 Object, [minimatch](https://www.npmjs.com/package/minimatch) options for `matchPattern`.
 
+#### limit
+Number, default 5000.  
+Defence from infinite recursive import.
+
 #### extensions  
 Deprecated, use `matchPattern` instead.  
 String or Array, default: null (process all).

test/gulp-recursive/design/a.css

@@ -0,0 +1,2 @@
+/* a.css */
+@import "b.css";

test/gulp-recursive/design/b.css

@@ -0,0 +1,2 @@
+/* b.css */
+@import "c.css";

test/gulp-recursive/design/c.css

@@ -0,0 +1,2 @@
+/* c.css */
+@import "a.css";

test/gulp-recursive/design/style.css

@@ -0,0 +1 @@
+@import url("./a.css");

test/gulp-recursive/index.js

@@ -0,0 +1,23 @@
+/// <reference path="../../typings/node/node.d.ts" />
+/// <reference path="../../typings/tape/tape.d.ts" />
+var test = require("tape");
+var fs = require("fs");
+var collect = require("collect-stream");
+var plugin = require("../..");
+var gulp = require("gulp");
+
+var options = {
+	limit: 100
+};
+
+test("Recursive", function (t) {
+	var stream;
+	t.plan(1);
+	var p = plugin(options);
+	stream = gulp.src("design/style.css")
+		.pipe(p)
+		.pipe(gulp.dest("/dev/null"));
+	p.on("error", function (err) {
+		t.ok(err.message.indexOf("Recursive include") != -1, "Emit error");
+	});
+});

test/index.js

@@ -10,6 +10,7 @@ var tests = [
 	"options-extensions-only",
 	"options-filter",
 	"complete",
+	"gulp-recursive",
 	"gulp-complete"
 ];
 emitter.on("run", function(index) {