Initialize multipassCounter with 0 at start.

Add test from PR #1182.

CHANGELOG.md

@@ -1,3 +1,6 @@
+### [ [>](https://github.com/svg/svgo/tree/v1.3.2) ] 1.3.2 / 30.10.2019
+* Fixed TypeError: Cannot set property 'multipassCount' of undefined
+
 ### [ [>](https://github.com/svg/svgo/tree/v1.3.1) ] 1.3.1 / 29.10.2019
 * Updated CSSO version to 4.0.2 fixing the issue with empty semicolons ";;" in styles (thanks to @strarsis and @lahmatiy).
 * `prefixIds` plugin now runs only once with `--multipass` option (by @strarsis).

README.md

@@ -197,6 +197,7 @@ Arguments:
 * as a Sketch plugin - [svgo-compressor](https://github.com/BohemianCoding/svgo-compressor)
 * as macOS app - [Image Shrinker](https://image-shrinker.com)
 * as a Rollup plugin - [rollup-plugin-svgo](https://github.com/porsager/rollup-plugin-svgo)
+* as a Figma plugin - [Advanced SVG Export](https://www.figma.com/c/plugin/782713260363070260/Advanced-SVG-Export)
 
 ## Backers
 

README.ru.md

@@ -197,6 +197,7 @@ $ [sudo] npm install -g svgo
 * как плагин для Sketch - [svgo-compressor](https://github.com/BohemianCoding/svgo-compressor)
 * в виде приложения macOS - [Image Shrinker](https://image-shrinker.com)
 * как плагин для Rollup - [rollup-plugin-svgo](https://github.com/porsager/rollup-plugin-svgo)
+* как плагин для Figma - [Advanced SVG Export](https://www.figma.com/c/plugin/782713260363070260/Advanced-SVG-Export)
 
 ## Лицензия и копирайты
 

lib/svgo.js

@@ -22,6 +22,9 @@ var SVGO = function(config) {
 };
 
 SVGO.prototype.optimize = function(svgstr, info) {
+    info = info || {};
+    info.multipassCount = 0;
+
     return new Promise((resolve, reject) => {
         if (this.config.error) {
             reject(this.config.error);
@@ -74,7 +77,7 @@ SVGO.prototype._optimizeOnce = function(svgstr, info, callback) {
 /**
  * The factory that creates a content item with the helper methods.
  *
- * @param {Object} data which passed to jsAPI constructor
+ * @param {Object} data which is passed to jsAPI constructor
  * @returns {JSAPI} content item
  */
 SVGO.prototype.createContentItem = function(data) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "svgo",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "Nodejs-based tool for optimizing SVG vector graphics files",
   "keywords": [
     "svgo",

plugins/cleanupIDs.js

@@ -58,15 +58,18 @@ exports.fn = function(data, params) {
 
             // quit if <style> or <script> present ('force' param prevents quitting)
             if (!params.force) {
-                if (item.isElem(styleOrScript)) {
+                var isNotEmpty = Boolean(item.content);
+                if (item.isElem(styleOrScript) && isNotEmpty) {
                     hasStyleOrScript = true;
                     continue;
                 }
+
                 // Don't remove IDs if the whole SVG consists only of defs.
-                if (item.isElem('defs') && item.parentNode.isElem('svg')) {
+                if (item.isElem('svg')) {
                     var hasDefsOnly = true;
-                    for (var j = i + 1; j < items.content.length; j++) {
-                        if (items.content[j].isElem()) {
+
+                    for (var j = 0; j < item.content.length; j++) {
+                        if (!item.content[j].isElem('defs')) {
                             hasDefsOnly = false;
                             break;
                         }

plugins/convertPathData.js

@@ -514,7 +514,7 @@ function filters(path, params) {
                 instruction == prev.instruction.toLowerCase() &&
                 (
                     (instruction != 'h' && instruction != 'v') ||
-                    (prev.data[0] >= 0) == (item.data[0] >= 0)
+                    (prev.data[0] >= 0) == (data[0] >= 0)
             )) {
                 prev.data[0] += data[0];
                 if (instruction != 'h' && instruction != 'v') {

plugins/prefixIds.js

@@ -113,6 +113,35 @@ var addPrefixToUrlAttr = function(attr) {
     attr.value = 'url(' + idPrefixed + ')';
 };
 
+// prefixes begin/end attribute value
+var addPrefixToBeginEndAttr = function(attr) {
+    if (!attrNotEmpty(attr)) {
+        return;
+    }
+
+    var parts = attr.value.split('; ').map(function(val) {
+        val = val.trim();
+
+        if (val.endsWith('.end') || val.endsWith('.start')) {
+            var idPostfix = val.split('.'),
+                id = idPostfix[0],
+                postfix = idPostfix[1];
+
+            var idPrefixed = prefixId(`#${id}`);
+
+            if (!idPrefixed) {
+                return val;
+            }
+
+            idPrefixed = idPrefixed.slice(1);
+            return `${idPrefixed}.${postfix}`;
+        } else {
+            return val;
+        }
+    });
+
+    attr.value = parts.join('; ');
+};
 
 /**
  * Prefixes identifiers
@@ -238,6 +267,8 @@ exports.fn = function(node, opts, extra) {
         addPrefixToUrlAttr(node.attrs[referencesProp]);
     }
 
+    addPrefixToBeginEndAttr(node.attrs.begin);
+    addPrefixToBeginEndAttr(node.attrs.end);
 
     return node;
 };

test/svgo/_index.js

@@ -41,6 +41,39 @@ describe('indentation', function() {
 
 });
 
+describe('invocation', function() {
+
+    it('should optimize without an info object', function(done) {
+
+        var filepath = PATH.resolve(__dirname, './test.svg'),
+            svgo;
+
+        FS.readFile(filepath, 'utf8', function(err, data) {
+            if (err) {
+                throw err;
+            }
+
+            var splitted = normalize(data).split(/\s*@@@\s*/),
+                orig     = splitted[0],
+                should   = splitted[1];
+
+            svgo = new SVGO({
+                full    : true,
+                plugins : [],
+                js2svg  : { pretty: true, indent: 2 }
+            });
+
+            svgo.optimize(orig, undefined).then(function(result) {
+                normalize(result.data).should.be.equal(should);
+                done();
+            });
+
+        });
+
+    });
+
+});
+
 function normalize(file) {
     return file.trim().replace(regEOL, '\n');
 }