Merge pull request svg#258 from dfilatov/master

GreLI · GreLI · commit 0c58277c3a9d · 2014-11-01T00:32:12.000+03:00
Add ability to enable multipass
diff --git a/lib/svgo.js b/lib/svgo.js
@@ -33,9 +33,18 @@ SVGO.prototype.optimize = function(svgstr, callback) {
             return;
         }
 
-        svgjs = PLUGINS(svgjs, config.plugins);
-
-        callback(JS2SVG(svgjs, config.js2svg));
+        var svg = { data : null },
+            maxIterationCount = config.multipass ? 10 : 1,
+            counter = 0,
+            prevResult;
+
+        do {
+            prevResult = svg;
+            svgjs = PLUGINS(svgjs, config.plugins);
+            svg = JS2SVG(svgjs, config.js2svg);
+        } while(++counter < maxIterationCount && prevResult.data !== svg.data);
+
+        callback(svg);
 
     });
 
diff --git a/lib/svgo/coa.js b/lib/svgo/coa.js
@@ -85,6 +85,11 @@ module.exports = require('coa').Cmd()
             return val || this.reject('Option --datauri must have one of the following values: base64, enc or unenc');
         })
         .end()
+    .opt()
+        .name('multipass').title('Enable multipass')
+        .long('multipass')
+        .flag()
+        .end()
     .opt()
         .name('pretty').title('Make SVG pretty printed')
         .long('pretty')
@@ -136,6 +141,14 @@ module.exports = require('coa').Cmd()
             config = changePluginsState(opts.enable, true, config);
         }
 
+        // --multipass
+        if (opts.multipass) {
+
+            config = config || {};
+            config.multipass = true;
+
+        }
+
         // --pretty
         if (opts.pretty) {
 
diff --git a/lib/svgo/config.js b/lib/svgo/config.js
@@ -25,6 +25,8 @@ module.exports = function(config) {
             defaults.plugins = optimizePluginsArray(defaults.plugins);
         }
 
+        defaults.multipass = config.multipass;
+
     } else {
 
         defaults = EXTEND({}, yaml.safeLoad(fs.readFileSync(__dirname + '/../../.svgo.yml', 'utf8')));
@@ -33,6 +35,7 @@ module.exports = function(config) {
 
         if (config) {
             defaults = extendConfig(defaults, config);
+            defaults.multipass = config.multipass;
         }
 
         defaults.plugins = optimizePluginsArray(defaults.plugins);

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,8 @@ module.exports = function(config) {`
`25`	`25`	`defaults.plugins = optimizePluginsArray(defaults.plugins);`
`26`	`26`	`}`
`27`	`27`
	`28`	`+ defaults.multipass = config.multipass;`
	`29`	`+`
`28`	`30`	`} else {`
`29`	`31`
`30`	`32`	`defaults = EXTEND({}, yaml.safeLoad(fs.readFileSync(__dirname + '/../../.svgo.yml', 'utf8')));`
`@@ -33,6 +35,7 @@ module.exports = function(config) {`
`33`	`35`
`34`	`36`	`if (config) {`
`35`	`37`	`defaults = extendConfig(defaults, config);`
	`38`	`+ defaults.multipass = config.multipass;`
`36`	`39`	`}`
`37`	`40`
`38`	`41`	`defaults.plugins = optimizePluginsArray(defaults.plugins);`