@iconify/tools 2.0.16 → 2.1.0-beta.1

package/lib/import/directory.d.ts

@@ -1,13 +1,15 @@
 import { IconSet } from '../icon-set/index.js';
-import '@iconify/types';
-import '@iconify/utils/lib/customisations';
+import '../types-f0980297.js';
+import '@iconify/utils/lib/customisations/defaults';
 import '../icon-set/types.js';
 import '../svg/index.js';
+import '@iconify/utils/lib/customisations';
+import '@iconify/utils/lib/icon-set/tree';
 
 /**
  * Entry for file
  */
-interface ImportDirectpryFileEntry {
+interface ImportDirectoryFileEntry {
     path: string;
     subdir: string;
     file: string;
@@ -23,7 +25,7 @@ interface ImportDirectpryFileEntry {
  * Callback can be asynchronous
  */
 declare type ImportDirectoryKeywordCallbackResult = string | undefined;
-declare type ImportDirectoryKeywordCallback = (file: ImportDirectpryFileEntry, defaultKeyword: string, iconSet: IconSet) => ImportDirectoryKeywordCallbackResult | Promise<ImportDirectoryKeywordCallbackResult>;
+declare type ImportDirectoryKeywordCallback = (file: ImportDirectoryFileEntry, defaultKeyword: string, iconSet: IconSet) => ImportDirectoryKeywordCallbackResult | Promise<ImportDirectoryKeywordCallbackResult>;
 /**
  * Options
  */
@@ -38,4 +40,4 @@ interface ImportDirectoryOptions {
  */
 declare function importDirectory(path: string, options?: ImportDirectoryOptions): Promise<IconSet>;
 
-export { ImportDirectoryKeywordCallback, ImportDirectpryFileEntry, importDirectory };
+export { ImportDirectoryFileEntry, ImportDirectoryKeywordCallback, importDirectory };

package/lib/import/directory.mjs

@@ -4,14 +4,15 @@ import { cleanupIconKeyword } from '../misc/keyword.mjs';
 import { scanDirectory } from '../misc/scan.mjs';
 import { SVG } from '../svg/index.mjs';
 import { cleanupSVG } from '../svg/cleanup.mjs';
-import '@iconify/utils/lib/icon';
+import '@iconify/utils/lib/icon/defaults';
 import '@iconify/utils/lib/svg/build';
-import '@iconify/utils/lib/customisations';
+import '@iconify/utils/lib/customisations/defaults';
 import '@iconify/utils/lib/icon-set/minify';
 import '@iconify/utils/lib/icon-set/convert-info';
 import '../icon-set/props.mjs';
-import 'cheerio';
+import '@iconify/utils/lib/misc/objects';
 import '@iconify/utils';
+import 'cheerio';
 import '../svg/cleanup/attribs.mjs';
 import '../svg/data/attributes.mjs';
 import '../svg/data/tags.mjs';

package/lib/import/figma/index.cjs

@@ -7,14 +7,15 @@ const svg_index = require('../../svg/index.cjs');
 const svg_cleanup = require('../../svg/cleanup.cjs');
 const import_figma_nodes = require('./nodes.cjs');
 const import_figma_query = require('./query.cjs');
-require('@iconify/utils/lib/icon');
+require('@iconify/utils/lib/icon/defaults');
 require('@iconify/utils/lib/svg/build');
-require('@iconify/utils/lib/customisations');
+require('@iconify/utils/lib/customisations/defaults');
 require('@iconify/utils/lib/icon-set/minify');
 require('@iconify/utils/lib/icon-set/convert-info');
 require('../../icon-set/props.cjs');
-require('cheerio');
+require('@iconify/utils/lib/misc/objects');
 require('@iconify/utils');
+require('cheerio');
 require('../../svg/cleanup/attribs.cjs');
 require('../../svg/data/attributes.cjs');
 require('../../svg/data/tags.cjs');

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

@@ -2,10 +2,12 @@ import { DocumentNotModified } from '../../download/types/modified.js';
 import { FigmaIfModifiedSinceOption, FigmaImportOptions } from './types/options.js';
 import { FigmaImportResult } from './types/result.js';
 import '../../icon-set/index.js';
-import '@iconify/types';
-import '@iconify/utils/lib/customisations';
+import '../../types-f0980297.js';
+import '@iconify/utils/lib/customisations/defaults';
 import '../../icon-set/types.js';
 import '../../svg/index.js';
+import '@iconify/utils/lib/customisations';
+import '@iconify/utils/lib/icon-set/tree';
 import './types/nodes.js';
 import './types/api.js';
 

package/lib/import/figma/index.mjs

@@ -3,14 +3,15 @@ import { SVG } from '../../svg/index.mjs';
 import { cleanupSVG } from '../../svg/cleanup.mjs';
 import { getFigmaIconNodes } from './nodes.mjs';
 import { figmaFilesQuery, figmaImagesQuery, figmaDownloadImages } from './query.mjs';
-import '@iconify/utils/lib/icon';
+import '@iconify/utils/lib/icon/defaults';
 import '@iconify/utils/lib/svg/build';
-import '@iconify/utils/lib/customisations';
+import '@iconify/utils/lib/customisations/defaults';
 import '@iconify/utils/lib/icon-set/minify';
 import '@iconify/utils/lib/icon-set/convert-info';
 import '../../icon-set/props.mjs';
-import 'cheerio';
+import '@iconify/utils/lib/misc/objects';
 import '@iconify/utils';
+import 'cheerio';
 import '../../svg/cleanup/attribs.mjs';
 import '../../svg/data/attributes.mjs';
 import '../../svg/data/tags.mjs';

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

@@ -2,10 +2,12 @@ import { FigmaDocument } from './types/api.js';
 import { FigmaGetIconNodesOptions } from './types/options.js';
 import { FigmaNodesImportResult } from './types/result.js';
 import '../../icon-set/index.js';
-import '@iconify/types';
-import '@iconify/utils/lib/customisations';
+import '../../types-f0980297.js';
+import '@iconify/utils/lib/customisations/defaults';
 import '../../icon-set/types.js';
 import '../../svg/index.js';
+import '@iconify/utils/lib/customisations';
+import '@iconify/utils/lib/icon-set/tree';
 import './types/nodes.js';
 
 /**

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

@@ -4,10 +4,12 @@ import { FigmaDocument } from './types/api.js';
 import { FigmaIfModifiedSinceOption, FigmaFilesQueryOptions, FigmaImagesQueryOptions } from './types/options.js';
 import { FigmaNodesImportResult } from './types/result.js';
 import '../../icon-set/index.js';
-import '@iconify/types';
-import '@iconify/utils/lib/customisations';
+import '../../types-f0980297.js';
+import '@iconify/utils/lib/customisations/defaults';
 import '../../icon-set/types.js';
 import '../../svg/index.js';
+import '@iconify/utils/lib/customisations';
+import '@iconify/utils/lib/icon-set/tree';
 import './types/nodes.js';
 
 /**

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

@@ -1,10 +1,12 @@
 import { IconFigmaNode, FigmaDocument } from './api.js';
 import { FigmaNodesImportResult, FigmaIconNode } from './result.js';
 import '../../../icon-set/index.js';
-import '@iconify/types';
-import '@iconify/utils/lib/customisations';
+import '../../../types-f0980297.js';
+import '@iconify/utils/lib/customisations/defaults';
 import '../../../icon-set/types.js';
 import '../../../svg/index.js';
+import '@iconify/utils/lib/customisations';
+import '@iconify/utils/lib/icon-set/tree';
 
 declare type FigmaImportParentNodeType = 'CANVAS' | 'FRAME' | 'GROUP';
 declare type FigmaImportIconNodeType = IconFigmaNode['type'];

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

@@ -1,10 +1,12 @@
 import { IconSet } from '../../../icon-set/index.js';
 import { FigmaImportParentNodeFilter, FigmaImportNodeFilter } from './nodes.js';
 import { FigmaIconNode } from './result.js';
-import '@iconify/types';
-import '@iconify/utils/lib/customisations';
+import '../../../types-f0980297.js';
+import '@iconify/utils/lib/customisations/defaults';
 import '../../../icon-set/types.js';
 import '../../../svg/index.js';
+import '@iconify/utils/lib/customisations';
+import '@iconify/utils/lib/icon-set/tree';
 import './api.js';
 
 /**

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

@@ -1,8 +1,10 @@
 import { IconSet } from '../../../icon-set/index.js';
-import '@iconify/types';
-import '@iconify/utils/lib/customisations';
+import '../../../types-f0980297.js';
+import '@iconify/utils/lib/customisations/defaults';
 import '../../../icon-set/types.js';
 import '../../../svg/index.js';
+import '@iconify/utils/lib/customisations';
+import '@iconify/utils/lib/icon-set/tree';
 
 /**
  * Result for found icons

package/lib/index.cjs

@@ -49,7 +49,7 @@ const misc_bumpVersion = require('./misc/bump-version.cjs');
 const download_api_index = require('./download/api/index.cjs');
 require('cheerio');
 require('@iconify/utils');
-require('@iconify/utils/lib/icon');
+require('@iconify/utils/lib/icon/defaults');
 require('./css/parse.cjs');
 require('./css/parser/tokens.cjs');
 require('./css/parser/error.cjs');
@@ -62,11 +62,13 @@ require('./svg/data/tags.cjs');
 require('./svg/analyse/error.cjs');
 require('svgo');
 require('@iconify/utils/lib/svg/build');
-require('@iconify/utils/lib/customisations');
+require('@iconify/utils/lib/customisations/defaults');
 require('@iconify/utils/lib/icon-set/minify');
 require('@iconify/utils/lib/icon-set/convert-info');
 require('./icon-set/props.cjs');
+require('@iconify/utils/lib/misc/objects');
 require('./icon-set/match.cjs');
+require('./icon-set/modified.cjs');
 require('./import/figma/nodes.cjs');
 require('./import/figma/query.cjs');
 require('./download/api/cache.cjs');
@@ -74,6 +76,7 @@ require('fs');
 require('crypto');
 require('node-fetch');
 require('pathe');
+require('path');
 require('child_process');
 require('util');
 require('stream');

package/lib/index.d.ts

@@ -43,11 +43,13 @@ export { execAsync } from './misc/exec.js';
 export { cleanupIconKeyword } from './misc/keyword.js';
 export { bumpVersion } from './misc/bump-version.js';
 export { sendAPIQuery } from './download/api/index.js';
-import '@iconify/types';
+import './types-f0980297.js';
 import '@iconify/utils/lib/customisations';
 import './css/parser/types.js';
 import './svg/analyse/types.js';
+import '@iconify/utils/lib/customisations/defaults';
 import './icon-set/types.js';
+import '@iconify/utils/lib/icon-set/tree';
 import './download/types/modified.js';
 import './import/figma/types/options.js';
 import './import/figma/types/nodes.js';

package/lib/index.mjs

@@ -45,7 +45,7 @@ export { bumpVersion } from './misc/bump-version.mjs';
 export { sendAPIQuery } from './download/api/index.mjs';
 import 'cheerio';
 import '@iconify/utils';
-import '@iconify/utils/lib/icon';
+import '@iconify/utils/lib/icon/defaults';
 import './css/parse.mjs';
 import './css/parser/tokens.mjs';
 import './css/parser/error.mjs';
@@ -58,11 +58,13 @@ import './svg/data/tags.mjs';
 import './svg/analyse/error.mjs';
 import 'svgo';
 import '@iconify/utils/lib/svg/build';
-import '@iconify/utils/lib/customisations';
+import '@iconify/utils/lib/customisations/defaults';
 import '@iconify/utils/lib/icon-set/minify';
 import '@iconify/utils/lib/icon-set/convert-info';
 import './icon-set/props.mjs';
+import '@iconify/utils/lib/misc/objects';
 import './icon-set/match.mjs';
+import './icon-set/modified.mjs';
 import './import/figma/nodes.mjs';
 import './import/figma/query.mjs';
 import './download/api/cache.mjs';
@@ -70,6 +72,7 @@ import 'fs';
 import 'crypto';
 import 'node-fetch';
 import 'pathe';
+import 'path';
 import 'child_process';
 import 'util';
 import 'stream';

package/lib/misc/exec.cjs

@@ -2,14 +2,19 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+const path = require('path');
 const child_process = require('child_process');
 
 function execAsync(cmd, options) {
   return new Promise((fulfill, reject) => {
-    child_process.exec(cmd, {
+    const fullOptions = {
       ...options,
       encoding: "utf8"
-    }, (error, stdout, stderr) => {
+    };
+    if (fullOptions.cwd) {
+      fullOptions.cwd = path.resolve(fullOptions.cwd);
+    }
+    child_process.exec(cmd, fullOptions, (error, stdout, stderr) => {
       if (error) {
         reject(error);
       } else {

package/lib/misc/exec.mjs

@@ -1,11 +1,16 @@
+import { resolve } from 'path';
 import { exec } from 'child_process';
 
 function execAsync(cmd, options) {
   return new Promise((fulfill, reject) => {
-    exec(cmd, {
+    const fullOptions = {
       ...options,
       encoding: "utf8"
-    }, (error, stdout, stderr) => {
+    };
+    if (fullOptions.cwd) {
+      fullOptions.cwd = resolve(fullOptions.cwd);
+    }
+    exec(cmd, fullOptions, (error, stdout, stderr) => {
       if (error) {
         reject(error);
       } else {

package/lib/optimise/flags.d.ts

@@ -1,5 +1,5 @@
 import { SVG } from '../svg/index.js';
-import '@iconify/types';
+import '../types-f0980297.js';
 import '@iconify/utils/lib/customisations';
 
 /**

package/lib/optimise/global-style.d.ts

@@ -1,5 +1,5 @@
 import { SVG } from '../svg/index.js';
-import '@iconify/types';
+import '../types-f0980297.js';
 import '@iconify/utils/lib/customisations';
 
 /**

package/lib/optimise/scale.d.ts

@@ -1,5 +1,5 @@
 import { SVG } from '../svg/index.js';
-import '@iconify/types';
+import '../types-f0980297.js';
 import '@iconify/utils/lib/customisations';
 
 /**

package/lib/optimise/svgo.cjs

@@ -4,48 +4,58 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 const svgo = require('svgo');
 
-const defaultSVGOPlugins = [
-  "cleanupAttrs",
-  "mergeStyles",
-  "inlineStyles",
-  "removeComments",
-  "removeUselessDefs",
-  "removeEditorsNSData",
-  "removeEmptyAttrs",
-  "removeEmptyContainers",
-  "convertStyleToAttrs",
-  "convertColors",
-  "convertTransform",
-  "removeUnknownsAndDefaults",
-  "removeNonInheritableGroupAttrs",
-  "removeUselessStrokeAndFill",
-  "removeUnusedNS",
-  "cleanupNumericValues",
-  "cleanupListOfValues",
-  "moveElemsAttrsToGroup",
-  "moveGroupAttrsToElems",
-  "collapseGroups",
-  "sortDefsChildren",
-  "sortAttrs"
-];
-const shapeModifiyingSVGOPlugins = [
-  "removeHiddenElems",
-  "convertShapeToPath",
-  "convertEllipseToCircle",
-  {
-    name: "convertPathData",
-    params: {
-      noSpaceAfterFlags: true
-    }
-  },
-  {
-    name: "mergePaths",
-    params: {
-      noSpaceAfterFlags: true
-    }
-  },
-  "reusePaths"
-];
+function getSVGOPlugins(options) {
+  return [
+    "cleanupAttrs",
+    "mergeStyles",
+    "inlineStyles",
+    "removeComments",
+    "removeUselessDefs",
+    "removeEditorsNSData",
+    "removeEmptyAttrs",
+    "removeEmptyContainers",
+    "convertStyleToAttrs",
+    "convertColors",
+    "convertTransform",
+    "removeUnknownsAndDefaults",
+    "removeNonInheritableGroupAttrs",
+    "removeUnusedNS",
+    "cleanupNumericValues",
+    "cleanupListOfValues",
+    "moveElemsAttrsToGroup",
+    "moveGroupAttrsToElems",
+    "collapseGroups",
+    "sortDefsChildren",
+    "sortAttrs",
+    ...options.animated ? [] : ["removeUselessStrokeAndFill"],
+    ...options.animated || options.keepShapes ? [] : [
+      "removeHiddenElems",
+      "convertShapeToPath",
+      "convertEllipseToCircle",
+      {
+        name: "convertPathData",
+        params: {
+          noSpaceAfterFlags: true
+        }
+      },
+      {
+        name: "mergePaths",
+        params: {
+          noSpaceAfterFlags: true
+        }
+      },
+      "reusePaths"
+    ],
+    ...options.cleanupIDs !== false ? [
+      {
+        name: "cleanupIDs",
+        params: {
+          prefix: typeof options.cleanupIDs === "string" ? options.cleanupIDs : "svgID"
+        }
+      }
+    ] : []
+  ];
+}
 async function runSVGO(svg, options = {}) {
   const code = svg.toString();
   const multipass = options.multipass !== false;
@@ -53,18 +63,11 @@ async function runSVGO(svg, options = {}) {
   if (options.plugins) {
     plugins = options.plugins;
   } else {
-    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: {
-          prefix: typeof options.cleanupIDs === "string" ? options.cleanupIDs : "svgID"
-        }
-      }
-    ] : []);
+    const animated = code.indexOf("<animate") !== -1 || code.indexOf("<set") !== -1;
+    plugins = getSVGOPlugins({
+      ...options,
+      animated
+    });
   }
   const pluginOptions = {
     plugins,
@@ -78,6 +81,5 @@ async function runSVGO(svg, options = {}) {
   svg.load(content);
 }
 
-exports.defaultSVGOPlugins = defaultSVGOPlugins;
+exports.getSVGOPlugins = getSVGOPlugins;
 exports.runSVGO = runSVGO;
-exports.shapeModifiyingSVGOPlugins = shapeModifiyingSVGOPlugins;

package/lib/optimise/svgo.d.ts

@@ -1,13 +1,19 @@
 import { Plugin } from 'svgo';
 import { SVG } from '../svg/index.js';
-import '@iconify/types';
+import '../types-f0980297.js';
 import '@iconify/utils/lib/customisations';
 
-declare const defaultSVGOPlugins: Plugin[];
+interface CleanupIDsOption {
+    cleanupIDs?: string | false;
+}
+interface GetSVGOPluingOptions extends CleanupIDsOption {
+    animated?: boolean;
+    keepShapes?: boolean;
+}
 /**
- * Plugins that modify shapes. Added to plugins list, unless 'keepShapes' option is enabled
+ * Get list of plugins
  */
-declare const shapeModifiyingSVGOPlugins: Plugin[];
+declare function getSVGOPlugins(options: GetSVGOPluingOptions): Plugin[];
 /**
  * Options
  */
@@ -17,10 +23,9 @@ interface SVGOCommonOptions {
 interface SVGOOptionsWithPlugin extends SVGOCommonOptions {
     plugins: Plugin[];
 }
-interface SVGOptionsWithoutPlugin extends SVGOCommonOptions {
+interface SVGOptionsWithoutPlugin extends SVGOCommonOptions, CleanupIDsOption {
     plugins?: undefined;
     keepShapes?: boolean;
-    cleanupIDs?: string | false;
 }
 declare type SVGOOptions = SVGOOptionsWithPlugin | SVGOptionsWithoutPlugin;
 /**
@@ -28,4 +33,4 @@ declare type SVGOOptions = SVGOOptionsWithPlugin | SVGOptionsWithoutPlugin;
  */
 declare function runSVGO(svg: SVG, options?: SVGOOptions): Promise<void>;
 
-export { defaultSVGOPlugins, runSVGO, shapeModifiyingSVGOPlugins };
+export { getSVGOPlugins, runSVGO };

package/lib/optimise/svgo.mjs

@@ -1,47 +1,57 @@
 import { optimize } from 'svgo';
 
-const defaultSVGOPlugins = [
-  "cleanupAttrs",
-  "mergeStyles",
-  "inlineStyles",
-  "removeComments",
-  "removeUselessDefs",
-  "removeEditorsNSData",
-  "removeEmptyAttrs",
-  "removeEmptyContainers",
-  "convertStyleToAttrs",
-  "convertColors",
-  "convertTransform",
-  "removeUnknownsAndDefaults",
-  "removeNonInheritableGroupAttrs",
-  "removeUselessStrokeAndFill",
-  "removeUnusedNS",
-  "cleanupNumericValues",
-  "cleanupListOfValues",
-  "moveElemsAttrsToGroup",
-  "moveGroupAttrsToElems",
-  "collapseGroups",
-  "sortDefsChildren",
-  "sortAttrs"
-];
-const shapeModifiyingSVGOPlugins = [
-  "removeHiddenElems",
-  "convertShapeToPath",
-  "convertEllipseToCircle",
-  {
-    name: "convertPathData",
-    params: {
-      noSpaceAfterFlags: true
-    }
-  },
-  {
-    name: "mergePaths",
-    params: {
-      noSpaceAfterFlags: true
-    }
-  },
-  "reusePaths"
-];
+function getSVGOPlugins(options) {
+  return [
+    "cleanupAttrs",
+    "mergeStyles",
+    "inlineStyles",
+    "removeComments",
+    "removeUselessDefs",
+    "removeEditorsNSData",
+    "removeEmptyAttrs",
+    "removeEmptyContainers",
+    "convertStyleToAttrs",
+    "convertColors",
+    "convertTransform",
+    "removeUnknownsAndDefaults",
+    "removeNonInheritableGroupAttrs",
+    "removeUnusedNS",
+    "cleanupNumericValues",
+    "cleanupListOfValues",
+    "moveElemsAttrsToGroup",
+    "moveGroupAttrsToElems",
+    "collapseGroups",
+    "sortDefsChildren",
+    "sortAttrs",
+    ...options.animated ? [] : ["removeUselessStrokeAndFill"],
+    ...options.animated || options.keepShapes ? [] : [
+      "removeHiddenElems",
+      "convertShapeToPath",
+      "convertEllipseToCircle",
+      {
+        name: "convertPathData",
+        params: {
+          noSpaceAfterFlags: true
+        }
+      },
+      {
+        name: "mergePaths",
+        params: {
+          noSpaceAfterFlags: true
+        }
+      },
+      "reusePaths"
+    ],
+    ...options.cleanupIDs !== false ? [
+      {
+        name: "cleanupIDs",
+        params: {
+          prefix: typeof options.cleanupIDs === "string" ? options.cleanupIDs : "svgID"
+        }
+      }
+    ] : []
+  ];
+}
 async function runSVGO(svg, options = {}) {
   const code = svg.toString();
   const multipass = options.multipass !== false;
@@ -49,18 +59,11 @@ async function runSVGO(svg, options = {}) {
   if (options.plugins) {
     plugins = options.plugins;
   } else {
-    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: {
-          prefix: typeof options.cleanupIDs === "string" ? options.cleanupIDs : "svgID"
-        }
-      }
-    ] : []);
+    const animated = code.indexOf("<animate") !== -1 || code.indexOf("<set") !== -1;
+    plugins = getSVGOPlugins({
+      ...options,
+      animated
+    });
   }
   const pluginOptions = {
     plugins,
@@ -74,4 +77,4 @@ async function runSVGO(svg, options = {}) {
   svg.load(content);
 }
 
-export { defaultSVGOPlugins, runSVGO, shapeModifiyingSVGOPlugins };
+export { getSVGOPlugins, runSVGO };

package/lib/svg/analyse.d.ts

@@ -1,6 +1,6 @@
 import { SVG } from './index.js';
 import { AnalyseSVGStructureOptions, AnalyseSVGStructureResult } from './analyse/types.js';
-import '@iconify/types';
+import '../types-f0980297.js';
 import '@iconify/utils/lib/customisations';
 
 /**