@iconify/tools 2.0.0-dev.4 → 2.0.3

package/lib/export/helpers/types-version.mjs

@@ -1,5 +1,37 @@
+var __commonJS = (cb, mod) => function __require() {
+  return mod || (0, cb[Object.keys(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+};
+
+// ../../node_modules/@iconify/types/package.json
+var require_package = __commonJS({
+  "../../node_modules/@iconify/types/package.json"(exports, module) {
+    module.exports = {
+      name: "@iconify/types",
+      description: "Types for Iconify data",
+      version: "1.0.12",
+      author: "Vjacheslav Trushkin",
+      license: "(Apache-2.0 OR GPL-2.0)",
+      main: "./index.js",
+      types: "./types.ts",
+      scripts: {
+        test: "tsc --noEmit --strict --typeRoots '[]' types.ts"
+      },
+      bugs: "https://github.com/iconify/iconify/issues",
+      homepage: "https://github.com/iconify/iconify",
+      repository: {
+        type: "git",
+        url: "https://github.com/iconify/iconify.git",
+        directory: "packages/types"
+      },
+      devDependencies: {
+        typescript: "^4.4.3"
+      }
+    };
+  }
+});
+
 // src/export/helpers/types-version.ts
-import pkg from "@iconify/types/package.json";
+var pkg = require_package();
 function getTypesVersion() {
   return pkg.version;
 }

package/lib/import/figma/index.d.ts

@@ -1,7 +1,8 @@
 import type { DocumentNotModified } from '../../download/types/modified';
-import type { FigmaImportOptions } from './types/options';
+import type { FigmaImportOptions, FigmaIfModifiedSinceOption } from './types/options';
 import type { FigmaImportResult } from './types/result';
 /**
  * Import icon set from Figma
  */
-export declare function importFromFigma(options: FigmaImportOptions): Promise<FigmaImportResult | DocumentNotModified>;
+export declare function importFromFigma<T extends FigmaIfModifiedSinceOption & FigmaImportOptions>(options: T): Promise<FigmaImportResult | DocumentNotModified>;
+export declare function importFromFigma(options: FigmaImportOptions): Promise<FigmaImportResult>;

package/lib/import/figma/index.js

@@ -6,9 +6,6 @@ const svg_1 = require("../../svg");
 const cleanup_1 = require("../../svg/cleanup");
 const nodes_1 = require("./nodes");
 const query_1 = require("./query");
-/**
- * Import icon set from Figma
- */
 async function importFromFigma(options) {
     const cacheOptions = options.cacheDir
         ? {

package/lib/import/figma/query.d.ts

@@ -1,12 +1,13 @@
 import type { APICacheOptions } from '../../download/api/types';
 import type { DocumentNotModified } from '../../download/types/modified';
 import type { FigmaDocument } from './types/api';
-import type { FigmaFilesQueryOptions, FigmaImagesQueryOptions } from './types/options';
+import type { FigmaIfModifiedSinceOption, FigmaFilesQueryOptions, FigmaImagesQueryOptions } from './types/options';
 import type { FigmaNodesImportResult } from './types/result';
 /**
  * Get Figma files
  */
-export declare function figmaFilesQuery(options: FigmaFilesQueryOptions, cache?: APICacheOptions): Promise<FigmaDocument | DocumentNotModified>;
+export declare function figmaFilesQuery<T extends FigmaIfModifiedSinceOption & FigmaFilesQueryOptions>(options: T, cache?: APICacheOptions): Promise<FigmaDocument | DocumentNotModified>;
+export declare function figmaFilesQuery(options: FigmaFilesQueryOptions, cache?: APICacheOptions): Promise<FigmaDocument>;
 /**
  * Generate all images
  */

package/lib/import/figma/query.js

@@ -15,9 +15,6 @@ function identicalDates(actual, expected) {
     }
     return new Date(actual).toString() === new Date(expected).toString();
 }
-/**
- * Get Figma files
- */
 async function figmaFilesQuery(options, cache) {
     // Check token
     if (!options.token) {

package/lib/import/figma/types/options.d.ts

@@ -17,8 +17,10 @@ interface FigmaImportCommonOptions {
     file: string;
     version?: string;
 }
-export interface FigmaFilesQueryOptions extends FigmaImportCommonOptions {
-    ifModifiedSince?: string | Date | true;
+export interface FigmaIfModifiedSinceOption {
+    ifModifiedSince: string | Date | true;
+}
+export interface FigmaFilesQueryOptions extends FigmaImportCommonOptions, Partial<FigmaIfModifiedSinceOption> {
     ids?: string[];
     depth?: number;
 }

package/lib/index.d.ts

@@ -0,0 +1,37 @@
+export { SVG } from './svg/index';
+export { parseSVG } from './svg/parse';
+export { parseSVGStyle } from './svg/parse-style';
+export { cleanupSVG } from './svg/cleanup';
+export { removeBadAttributes } from './svg/cleanup/attribs';
+export { checkBadTags } from './svg/cleanup/bad-tags';
+export { cleanupInlineStyle } from './svg/cleanup/inline-style';
+export { cleanupSVGRoot } from './svg/cleanup/root-svg';
+export { convertStyleToAttrs } from './svg/cleanup/svgo-style';
+export { IconSet, blankIconSet } from './icon-set/index';
+export { mergeIconSets } from './icon-set/merge';
+export { importFromFigma } from './import/figma/index';
+export { importDirectory } from './import/directory';
+export { downloadGitRepo } from './download/git/index';
+export { getGitRepoHash } from './download/git/hash';
+export { downloadGitHubRepo } from './download/github/index';
+export { getGitHubRepoHash } from './download/github/hash';
+export { downloadNPMPackage } from './download/npm/index';
+export { getNPMVersion, getPackageVersion } from './download/npm/version';
+export { parseColors, isEmptyColor } from './colors/parse';
+export { validateColors } from './colors/validate';
+export { runSVGO } from './optimise/svgo';
+export { deOptimisePaths } from './optimise/flags';
+export { scaleSVG } from './optimise/scale';
+export { exportToDirectory } from './export/directory';
+export { exportIconPackage } from './export/icon-package';
+export { exportJSONPackage } from './export/json-package';
+export { writeJSONFile } from './misc/write-json';
+export { prepareDirectoryForExport } from './export/helpers/prepare';
+export { scanDirectory } from './misc/scan';
+export { compareDirectories } from './misc/compare-dirs';
+export { unzip } from './download/helpers/unzip';
+export { untar } from './download/helpers/untar';
+export { execAsync } from './misc/exec';
+export { cleanupIconKeyword } from './misc/keyword';
+export { bumpVersion } from './misc/bump-version';
+export { sendAPIQuery } from './download/api/index';

package/lib/index.js

@@ -0,0 +1,89 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.sendAPIQuery = exports.bumpVersion = exports.cleanupIconKeyword = exports.execAsync = exports.untar = exports.unzip = exports.compareDirectories = exports.scanDirectory = exports.prepareDirectoryForExport = exports.writeJSONFile = exports.exportJSONPackage = exports.exportIconPackage = exports.exportToDirectory = exports.scaleSVG = exports.deOptimisePaths = exports.runSVGO = exports.validateColors = exports.isEmptyColor = exports.parseColors = exports.getPackageVersion = exports.getNPMVersion = exports.downloadNPMPackage = exports.getGitHubRepoHash = exports.downloadGitHubRepo = exports.getGitRepoHash = exports.downloadGitRepo = exports.importDirectory = exports.importFromFigma = exports.mergeIconSets = exports.blankIconSet = exports.IconSet = exports.convertStyleToAttrs = exports.cleanupSVGRoot = exports.cleanupInlineStyle = exports.checkBadTags = exports.removeBadAttributes = exports.cleanupSVG = exports.parseSVGStyle = exports.parseSVG = exports.SVG = void 0;
+// SVG class and functions
+var index_1 = require("./svg/index");
+Object.defineProperty(exports, "SVG", { enumerable: true, get: function () { return index_1.SVG; } });
+var parse_1 = require("./svg/parse");
+Object.defineProperty(exports, "parseSVG", { enumerable: true, get: function () { return parse_1.parseSVG; } });
+var parse_style_1 = require("./svg/parse-style");
+Object.defineProperty(exports, "parseSVGStyle", { enumerable: true, get: function () { return parse_style_1.parseSVGStyle; } });
+// SVG cleanup
+var cleanup_1 = require("./svg/cleanup");
+Object.defineProperty(exports, "cleanupSVG", { enumerable: true, get: function () { return cleanup_1.cleanupSVG; } });
+var attribs_1 = require("./svg/cleanup/attribs");
+Object.defineProperty(exports, "removeBadAttributes", { enumerable: true, get: function () { return attribs_1.removeBadAttributes; } });
+var bad_tags_1 = require("./svg/cleanup/bad-tags");
+Object.defineProperty(exports, "checkBadTags", { enumerable: true, get: function () { return bad_tags_1.checkBadTags; } });
+var inline_style_1 = require("./svg/cleanup/inline-style");
+Object.defineProperty(exports, "cleanupInlineStyle", { enumerable: true, get: function () { return inline_style_1.cleanupInlineStyle; } });
+var root_svg_1 = require("./svg/cleanup/root-svg");
+Object.defineProperty(exports, "cleanupSVGRoot", { enumerable: true, get: function () { return root_svg_1.cleanupSVGRoot; } });
+var svgo_style_1 = require("./svg/cleanup/svgo-style");
+Object.defineProperty(exports, "convertStyleToAttrs", { enumerable: true, get: function () { return svgo_style_1.convertStyleToAttrs; } });
+// IconSet class
+var index_2 = require("./icon-set/index");
+Object.defineProperty(exports, "IconSet", { enumerable: true, get: function () { return index_2.IconSet; } });
+Object.defineProperty(exports, "blankIconSet", { enumerable: true, get: function () { return index_2.blankIconSet; } });
+var merge_1 = require("./icon-set/merge");
+Object.defineProperty(exports, "mergeIconSets", { enumerable: true, get: function () { return merge_1.mergeIconSets; } });
+// Import
+var index_3 = require("./import/figma/index");
+Object.defineProperty(exports, "importFromFigma", { enumerable: true, get: function () { return index_3.importFromFigma; } });
+var directory_1 = require("./import/directory");
+Object.defineProperty(exports, "importDirectory", { enumerable: true, get: function () { return directory_1.importDirectory; } });
+// Download (for import)
+var index_4 = require("./download/git/index");
+Object.defineProperty(exports, "downloadGitRepo", { enumerable: true, get: function () { return index_4.downloadGitRepo; } });
+var hash_1 = require("./download/git/hash");
+Object.defineProperty(exports, "getGitRepoHash", { enumerable: true, get: function () { return hash_1.getGitRepoHash; } });
+var index_5 = require("./download/github/index");
+Object.defineProperty(exports, "downloadGitHubRepo", { enumerable: true, get: function () { return index_5.downloadGitHubRepo; } });
+var hash_2 = require("./download/github/hash");
+Object.defineProperty(exports, "getGitHubRepoHash", { enumerable: true, get: function () { return hash_2.getGitHubRepoHash; } });
+var index_6 = require("./download/npm/index");
+Object.defineProperty(exports, "downloadNPMPackage", { enumerable: true, get: function () { return index_6.downloadNPMPackage; } });
+var version_1 = require("./download/npm/version");
+Object.defineProperty(exports, "getNPMVersion", { enumerable: true, get: function () { return version_1.getNPMVersion; } });
+Object.defineProperty(exports, "getPackageVersion", { enumerable: true, get: function () { return version_1.getPackageVersion; } });
+// Manipulation
+var parse_2 = require("./colors/parse");
+Object.defineProperty(exports, "parseColors", { enumerable: true, get: function () { return parse_2.parseColors; } });
+Object.defineProperty(exports, "isEmptyColor", { enumerable: true, get: function () { return parse_2.isEmptyColor; } });
+var validate_1 = require("./colors/validate");
+Object.defineProperty(exports, "validateColors", { enumerable: true, get: function () { return validate_1.validateColors; } });
+var svgo_1 = require("./optimise/svgo");
+Object.defineProperty(exports, "runSVGO", { enumerable: true, get: function () { return svgo_1.runSVGO; } });
+var flags_1 = require("./optimise/flags");
+Object.defineProperty(exports, "deOptimisePaths", { enumerable: true, get: function () { return flags_1.deOptimisePaths; } });
+var scale_1 = require("./optimise/scale");
+Object.defineProperty(exports, "scaleSVG", { enumerable: true, get: function () { return scale_1.scaleSVG; } });
+// Export
+var directory_2 = require("./export/directory");
+Object.defineProperty(exports, "exportToDirectory", { enumerable: true, get: function () { return directory_2.exportToDirectory; } });
+var icon_package_1 = require("./export/icon-package");
+Object.defineProperty(exports, "exportIconPackage", { enumerable: true, get: function () { return icon_package_1.exportIconPackage; } });
+var json_package_1 = require("./export/json-package");
+Object.defineProperty(exports, "exportJSONPackage", { enumerable: true, get: function () { return json_package_1.exportJSONPackage; } });
+// Misc: files, directories and archives
+var write_json_1 = require("./misc/write-json");
+Object.defineProperty(exports, "writeJSONFile", { enumerable: true, get: function () { return write_json_1.writeJSONFile; } });
+var prepare_1 = require("./export/helpers/prepare");
+Object.defineProperty(exports, "prepareDirectoryForExport", { enumerable: true, get: function () { return prepare_1.prepareDirectoryForExport; } });
+var scan_1 = require("./misc/scan");
+Object.defineProperty(exports, "scanDirectory", { enumerable: true, get: function () { return scan_1.scanDirectory; } });
+var compare_dirs_1 = require("./misc/compare-dirs");
+Object.defineProperty(exports, "compareDirectories", { enumerable: true, get: function () { return compare_dirs_1.compareDirectories; } });
+var unzip_1 = require("./download/helpers/unzip");
+Object.defineProperty(exports, "unzip", { enumerable: true, get: function () { return unzip_1.unzip; } });
+var untar_1 = require("./download/helpers/untar");
+Object.defineProperty(exports, "untar", { enumerable: true, get: function () { return untar_1.untar; } });
+// Misc: other
+var exec_1 = require("./misc/exec");
+Object.defineProperty(exports, "execAsync", { enumerable: true, get: function () { return exec_1.execAsync; } });
+var keyword_1 = require("./misc/keyword");
+Object.defineProperty(exports, "cleanupIconKeyword", { enumerable: true, get: function () { return keyword_1.cleanupIconKeyword; } });
+var bump_version_1 = require("./misc/bump-version");
+Object.defineProperty(exports, "bumpVersion", { enumerable: true, get: function () { return bump_version_1.bumpVersion; } });
+var index_7 = require("./download/api/index");
+Object.defineProperty(exports, "sendAPIQuery", { enumerable: true, get: function () { return index_7.sendAPIQuery; } });

package/lib/index.mjs

@@ -0,0 +1,80 @@
+// src/index.ts
+import { SVG } from "./svg/index.mjs";
+import { parseSVG } from "./svg/parse.mjs";
+import { parseSVGStyle } from "./svg/parse-style.mjs";
+import { cleanupSVG } from "./svg/cleanup.mjs";
+import { removeBadAttributes } from "./svg/cleanup/attribs.mjs";
+import { checkBadTags } from "./svg/cleanup/bad-tags.mjs";
+import { cleanupInlineStyle } from "./svg/cleanup/inline-style.mjs";
+import { cleanupSVGRoot } from "./svg/cleanup/root-svg.mjs";
+import { convertStyleToAttrs } from "./svg/cleanup/svgo-style.mjs";
+import { IconSet, blankIconSet } from "./icon-set/index.mjs";
+import { mergeIconSets } from "./icon-set/merge.mjs";
+import { importFromFigma } from "./import/figma/index.mjs";
+import { importDirectory } from "./import/directory.mjs";
+import { downloadGitRepo } from "./download/git/index.mjs";
+import { getGitRepoHash } from "./download/git/hash.mjs";
+import { downloadGitHubRepo } from "./download/github/index.mjs";
+import { getGitHubRepoHash } from "./download/github/hash.mjs";
+import { downloadNPMPackage } from "./download/npm/index.mjs";
+import { getNPMVersion, getPackageVersion } from "./download/npm/version.mjs";
+import { parseColors, isEmptyColor } from "./colors/parse.mjs";
+import { validateColors } from "./colors/validate.mjs";
+import { runSVGO } from "./optimise/svgo.mjs";
+import { deOptimisePaths } from "./optimise/flags.mjs";
+import { scaleSVG } from "./optimise/scale.mjs";
+import { exportToDirectory } from "./export/directory.mjs";
+import { exportIconPackage } from "./export/icon-package.mjs";
+import { exportJSONPackage } from "./export/json-package.mjs";
+import { writeJSONFile } from "./misc/write-json.mjs";
+import { prepareDirectoryForExport } from "./export/helpers/prepare.mjs";
+import { scanDirectory } from "./misc/scan.mjs";
+import { compareDirectories } from "./misc/compare-dirs.mjs";
+import { unzip } from "./download/helpers/unzip.mjs";
+import { untar } from "./download/helpers/untar.mjs";
+import { execAsync } from "./misc/exec.mjs";
+import { cleanupIconKeyword } from "./misc/keyword.mjs";
+import { bumpVersion } from "./misc/bump-version.mjs";
+import { sendAPIQuery } from "./download/api/index.mjs";
+export {
+  IconSet,
+  SVG,
+  blankIconSet,
+  bumpVersion,
+  checkBadTags,
+  cleanupIconKeyword,
+  cleanupInlineStyle,
+  cleanupSVG,
+  cleanupSVGRoot,
+  compareDirectories,
+  convertStyleToAttrs,
+  deOptimisePaths,
+  downloadGitHubRepo,
+  downloadGitRepo,
+  downloadNPMPackage,
+  execAsync,
+  exportIconPackage,
+  exportJSONPackage,
+  exportToDirectory,
+  getGitHubRepoHash,
+  getGitRepoHash,
+  getNPMVersion,
+  getPackageVersion,
+  importDirectory,
+  importFromFigma,
+  isEmptyColor,
+  mergeIconSets,
+  parseColors,
+  parseSVG,
+  parseSVGStyle,
+  prepareDirectoryForExport,
+  removeBadAttributes,
+  runSVGO,
+  scaleSVG,
+  scanDirectory,
+  sendAPIQuery,
+  untar,
+  unzip,
+  validateColors,
+  writeJSONFile
+};

package/lib/misc/bump-version.d.ts

@@ -0,0 +1,4 @@
+/**
+ * Bump version number
+ */
+export declare function bumpVersion(version: string): string;

package/lib/misc/bump-version.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.bumpVersion = void 0;
+/**
+ * Bump version number
+ */
+function bumpVersion(version) {
+    const versionParts = version.split('.');
+    const lastPart = versionParts.pop();
+    const num = parseInt(lastPart);
+    if (isNaN(num) || num + '' !== lastPart) {
+        versionParts.push(lastPart + '.1');
+    }
+    else {
+        versionParts.push(num + 1 + '');
+    }
+    return versionParts.join('.');
+}
+exports.bumpVersion = bumpVersion;

package/lib/misc/bump-version.mjs

@@ -0,0 +1,15 @@
+// src/misc/bump-version.ts
+function bumpVersion(version) {
+  const versionParts = version.split(".");
+  const lastPart = versionParts.pop();
+  const num = parseInt(lastPart);
+  if (isNaN(num) || num + "" !== lastPart) {
+    versionParts.push(lastPart + ".1");
+  } else {
+    versionParts.push(num + 1 + "");
+  }
+  return versionParts.join(".");
+}
+export {
+  bumpVersion
+};

package/lib/misc/compare-dirs.d.ts

@@ -0,0 +1,9 @@
+export interface CompareDirectoriesOptions {
+    ignoreNewLine?: boolean;
+    ignoreVersions?: boolean;
+    textExtensions?: string[];
+}
+/**
+ * Compare directories. Returns true if files are identical, false if different
+ */
+export declare function compareDirectories(dir1: string, dir2: string, options?: CompareDirectoriesOptions): Promise<boolean>;

package/lib/misc/compare-dirs.js

@@ -0,0 +1,84 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.compareDirectories = void 0;
+const fs_1 = require("fs");
+const prepare_1 = require("../export/helpers/prepare");
+const scan_1 = require("./scan");
+/**
+ * Extensions that are treated as text
+ */
+const textFileExtensions = [
+    'json',
+    'ts',
+    'js',
+    'mjs',
+    'cjs',
+    'jsx',
+    'tsx',
+    'vue',
+    'svelte',
+    'svg',
+    'txt',
+    'md',
+];
+/**
+ * Compare directories. Returns true if files are identical, false if different
+ */
+async function compareDirectories(dir1, dir2, options) {
+    dir1 = (0, prepare_1.normalizeDir)(dir1);
+    dir2 = (0, prepare_1.normalizeDir)(dir2);
+    // Get all files
+    const files1 = await (0, scan_1.scanDirectory)(dir1);
+    const files2 = await (0, scan_1.scanDirectory)(dir2);
+    if (files1.length !== files2.length) {
+        return false;
+    }
+    // Options
+    options = options || {};
+    const ignoreNewLine = options.ignoreNewLine !== false;
+    const ignoreVersions = options.ignoreVersions !== false;
+    const textExtensions = new Set((options.textExtensions || []).concat(textFileExtensions));
+    // Check all files
+    for (let i = 0; i < files1.length; i++) {
+        const file = files1[i];
+        if (files2.indexOf(file) === -1) {
+            return false;
+        }
+        const ext = file.split('.').pop().toLowerCase();
+        const isText = textExtensions.has(ext);
+        if (!isText) {
+            // Compare binary files
+            const content1 = await fs_1.promises.readFile(dir1 + '/' + file);
+            const content2 = await fs_1.promises.readFile(dir2 + '/' + file);
+            if (Buffer.compare(content1, content2) !== 0) {
+                return false;
+            }
+            continue;
+        }
+        // Text files
+        let content1 = await fs_1.promises.readFile(dir1 + '/' + file, 'utf8');
+        let content2 = await fs_1.promises.readFile(dir2 + '/' + file, 'utf8');
+        if (content1 === content2) {
+            continue;
+        }
+        if (ignoreNewLine) {
+            // Remove space before new line (\r\n -> \n), remove new line at the end
+            content1 = content1.replace(/\s+\n/g, '\n').trimRight();
+            content2 = content2.replace(/\s+\n/g, '\n').trimRight();
+        }
+        if (ignoreVersions && file.split('/').pop() === 'package.json') {
+            // Ignore versions in package.json
+            const data1 = JSON.parse(content1);
+            const data2 = JSON.parse(content2);
+            delete data1.version;
+            delete data2.version;
+            content1 = JSON.stringify(data1);
+            content2 = JSON.stringify(data2);
+        }
+        if (content1 !== content2) {
+            return false;
+        }
+    }
+    return true;
+}
+exports.compareDirectories = compareDirectories;

package/lib/misc/compare-dirs.mjs

@@ -0,0 +1,71 @@
+// src/misc/compare-dirs.ts
+import { promises as fs } from "fs";
+import { normalizeDir } from "../export/helpers/prepare.mjs";
+import { scanDirectory } from "./scan.mjs";
+var textFileExtensions = [
+  "json",
+  "ts",
+  "js",
+  "mjs",
+  "cjs",
+  "jsx",
+  "tsx",
+  "vue",
+  "svelte",
+  "svg",
+  "txt",
+  "md"
+];
+async function compareDirectories(dir1, dir2, options) {
+  dir1 = normalizeDir(dir1);
+  dir2 = normalizeDir(dir2);
+  const files1 = await scanDirectory(dir1);
+  const files2 = await scanDirectory(dir2);
+  if (files1.length !== files2.length) {
+    return false;
+  }
+  options = options || {};
+  const ignoreNewLine = options.ignoreNewLine !== false;
+  const ignoreVersions = options.ignoreVersions !== false;
+  const textExtensions = new Set((options.textExtensions || []).concat(textFileExtensions));
+  for (let i = 0; i < files1.length; i++) {
+    const file = files1[i];
+    if (files2.indexOf(file) === -1) {
+      return false;
+    }
+    const ext = file.split(".").pop().toLowerCase();
+    const isText = textExtensions.has(ext);
+    if (!isText) {
+      const content12 = await fs.readFile(dir1 + "/" + file);
+      const content22 = await fs.readFile(dir2 + "/" + file);
+      if (Buffer.compare(content12, content22) !== 0) {
+        return false;
+      }
+      continue;
+    }
+    let content1 = await fs.readFile(dir1 + "/" + file, "utf8");
+    let content2 = await fs.readFile(dir2 + "/" + file, "utf8");
+    if (content1 === content2) {
+      continue;
+    }
+    if (ignoreNewLine) {
+      content1 = content1.replace(/\s+\n/g, "\n").trimRight();
+      content2 = content2.replace(/\s+\n/g, "\n").trimRight();
+    }
+    if (ignoreVersions && file.split("/").pop() === "package.json") {
+      const data1 = JSON.parse(content1);
+      const data2 = JSON.parse(content2);
+      delete data1.version;
+      delete data2.version;
+      content1 = JSON.stringify(data1);
+      content2 = JSON.stringify(data2);
+    }
+    if (content1 !== content2) {
+      return false;
+    }
+  }
+  return true;
+}
+export {
+  compareDirectories
+};

package/lib/optimise/svgo.js

@@ -52,6 +52,8 @@ exports.shapeModifiyingSVGOPlugins = [
  * Run SVGO on icon
  */
 async function runSVGO(svg, options = {}) {
+    // Code
+    const code = svg.toString();
     // Options
     const multipass = options.multipass !== false;
     // Plugins list
@@ -60,7 +62,14 @@ async function runSVGO(svg, options = {}) {
         plugins = options.plugins;
     }
     else {
-        plugins = exports.defaultSVGOPlugins.concat(options.keepShapes ? [] : exports.shapeModifiyingSVGOPlugins, options.cleanupIDs !== false
+        // Check for animations: convertShapeToPath and removeHiddenElems plugins currently might ruin animations
+        let keepShapes = options.keepShapes;
+        if (keepShapes === void 0 &&
+            (code.indexOf('<animate') !== -1 || code.indexOf('<set') !== -1)) {
+            // Do not check animations: just assume they might break
+            keepShapes = true;
+        }
+        plugins = exports.defaultSVGOPlugins.concat(keepShapes ? [] : exports.shapeModifiyingSVGOPlugins, options.cleanupIDs !== false
             ? [
                 {
                     name: 'cleanupIDs',
@@ -79,10 +88,12 @@ async function runSVGO(svg, options = {}) {
         multipass,
     };
     // Load data (changing type because SVGO types do not include error ?????)
-    const result = (0, svgo_1.optimize)(svg.toString(), pluginOptions);
+    const result = (0, svgo_1.optimize)(code, pluginOptions);
     if (typeof result.error === 'string') {
         throw new Error(result.error);
     }
-    svg.load(result.data);
+    // Sometimes empty definitions are not removed: remove them
+    const content = result.data.replace(/<defs\/>/g, '');
+    svg.load(content);
 }
 exports.runSVGO = runSVGO;

package/lib/optimise/svgo.mjs

@@ -44,12 +44,17 @@ var shapeModifiyingSVGOPlugins = [
   "reusePaths"
 ];
 async function runSVGO(svg, options = {}) {
+  const code = svg.toString();
   const multipass = options.multipass !== false;
   let plugins;
   if (options.plugins) {
     plugins = options.plugins;
   } else {
-    plugins = defaultSVGOPlugins.concat(options.keepShapes ? [] : shapeModifiyingSVGOPlugins, options.cleanupIDs !== false ? [
+    let keepShapes = options.keepShapes;
+    if (keepShapes === void 0 && (code.indexOf("<animate") !== -1 || code.indexOf("<set") !== -1)) {
+      keepShapes = true;
+    }
+    plugins = defaultSVGOPlugins.concat(keepShapes ? [] : shapeModifiyingSVGOPlugins, options.cleanupIDs !== false ? [
       {
         name: "cleanupIDs",
         params: {
@@ -62,11 +67,12 @@ async function runSVGO(svg, options = {}) {
     plugins,
     multipass
   };
-  const result = optimize(svg.toString(), pluginOptions);
+  const result = optimize(code, pluginOptions);
   if (typeof result.error === "string") {
     throw new Error(result.error);
   }
-  svg.load(result.data);
+  const content = result.data.replace(/<defs\/>/g, "");
+  svg.load(content);
 }
 export {
   defaultSVGOPlugins,

package/lib/svg/cleanup/bad-tags.js

@@ -17,8 +17,6 @@ requiredParentTags.set(tags_1.filterTag, tags_1.filterChildTags);
 requiredParentTags.set(tags_1.defsTag, tags_1.tagsInsideDefs);
 // <stop> must be inside gradient
 requiredParentTags.set(tags_1.gradientTags, tags_1.gradientChildTags);
-// Animations must be inside shapes or filters
-requiredParentTags.set(tags_1.tagsBeforeAnimation, tags_1.animateTags);
 // <mpath> must be inside <animateMotion>
 requiredParentTags.set(new Set(['animateMotion']), tags_1.animateMotionChildTags);
 /**

package/lib/svg/cleanup/bad-tags.mjs

@@ -3,7 +3,6 @@ import { parseSVG } from "../parse.mjs";
 import {
   allValidTags,
   animateMotionChildTags,
-  animateTags,
   badTags,
   defsTag,
   feComponentTransferChildTag,
@@ -14,7 +13,6 @@ import {
   filterTag,
   gradientChildTags,
   gradientTags,
-  tagsBeforeAnimation,
   tagsInsideDefs,
   unsupportedTags
 } from "../data/tags.mjs";
@@ -25,7 +23,6 @@ requiredParentTags.set(feLightningTags, feLightningChildTags);
 requiredParentTags.set(filterTag, filterChildTags);
 requiredParentTags.set(defsTag, tagsInsideDefs);
 requiredParentTags.set(gradientTags, gradientChildTags);
-requiredParentTags.set(tagsBeforeAnimation, animateTags);
 requiredParentTags.set(new Set(["animateMotion"]), animateMotionChildTags);
 async function checkBadTags(svg) {
   await parseSVG(svg, (item) => {

package/lib/svg/data/tags.d.ts

@@ -79,10 +79,6 @@ export declare const feMergeChildTags: Set<string>;
  * Tags that can be used only inside <defs>
  */
 export declare const tagsInsideDefs: Set<string>;
-/**
- * Parent tags for animations
- */
-export declare const tagsBeforeAnimation: Set<string>;
 /**
  * All supported tags
  */