@iconify/tools 2.1.0-beta.1 → 2.1.0-beta.4

package/lib/colors/parse.d.ts

@@ -3,7 +3,7 @@ import { SVG } from '../svg/index.js';
 import { ColorAttributes } from './attribs.js';
 import { ElementsTreeItem, AnalyseSVGStructureResult, AnalyseSVGStructureOptions, ExtendedTagElement } from '../svg/analyse/types.js';
 import '../types-f0980297.js';
-import '@iconify/utils/lib/customisations';
+import '@iconify/utils/lib/customisations/defaults';
 
 /**
  * Result

package/lib/colors/validate.d.ts

@@ -1,7 +1,7 @@
 import { SVG } from '../svg/index.js';
 import { ParseColorsOptions, FindColorsResult } from './parse.js';
 import '../types-f0980297.js';
-import '@iconify/utils/lib/customisations';
+import '@iconify/utils/lib/customisations/defaults';
 import '@iconify/utils/lib/colors/types';
 import './attribs.js';
 import '../svg/analyse/types.js';

package/lib/download/git/index.cjs

@@ -33,7 +33,6 @@ require('stream');
 require('extract-zip');
 require('tar');
 require('@iconify/utils/lib/colors');
-require('local-pkg');
 
 async function downloadGitRepo(options) {
   const { remote, branch } = options;

package/lib/download/git/index.mjs

@@ -29,7 +29,6 @@ import 'stream';
 import 'extract-zip';
 import 'tar';
 import '@iconify/utils/lib/colors';
-import 'local-pkg';
 
 async function downloadGitRepo(options) {
   const { remote, branch } = options;

package/lib/download/git/reset.cjs

@@ -23,7 +23,6 @@ require('../api/download.cjs');
 require('extract-zip');
 require('tar');
 require('@iconify/utils/lib/colors');
-require('local-pkg');
 require('../../svg/parse.cjs');
 require('@iconify/utils/lib/misc/objects');
 require('path');

package/lib/download/git/reset.mjs

@@ -19,7 +19,6 @@ import '../api/download.mjs';
 import 'extract-zip';
 import 'tar';
 import '@iconify/utils/lib/colors';
-import 'local-pkg';
 import '../../svg/parse.mjs';
 import '@iconify/utils/lib/misc/objects';
 import 'path';

package/lib/download/index.cjs

@@ -42,7 +42,6 @@ require('../icon-set/props.cjs');
 require('@iconify/utils/lib/misc/objects');
 require('tar');
 require('@iconify/utils/lib/colors');
-require('local-pkg');
 require('./helpers/untar.cjs');
 require('./npm/version.cjs');
 require('./gitlab/hash.cjs');

package/lib/download/index.mjs

@@ -38,7 +38,6 @@ import '../icon-set/props.mjs';
 import '@iconify/utils/lib/misc/objects';
 import 'tar';
 import '@iconify/utils/lib/colors';
-import 'local-pkg';
 import './helpers/untar.mjs';
 import './npm/version.mjs';
 import './gitlab/hash.mjs';

package/lib/export/directory.d.ts

@@ -4,7 +4,6 @@ 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';
 
 /**

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

@@ -2,21 +2,11 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-const localPkg = require('local-pkg');
-const fs = require('fs');
+require('local-pkg');
+require('fs');
 
-let cache;
-async function getVersion() {
-  const packageName = "@iconify/types/package.json";
-  const filename = localPkg.resolveModule(packageName);
-  if (!filename) {
-    throw new Error(`Cannot resolve ${packageName}`);
-  }
-  const content = JSON.parse(await fs.promises.readFile(filename, "utf8"));
-  return cache = content.version;
-}
 async function getTypesVersion() {
-  return cache || await getVersion();
+  throw new Error(`getTypesVersion() is deprecated, use wildcard to make packages work with all versions`);
 }
 
 exports.getTypesVersion = getTypesVersion;

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

@@ -1,18 +1,8 @@
-import { resolveModule } from 'local-pkg';
-import { promises } from 'fs';
+import 'local-pkg';
+import 'fs';
 
-let cache;
-async function getVersion() {
-  const packageName = "@iconify/types/package.json";
-  const filename = resolveModule(packageName);
-  if (!filename) {
-    throw new Error(`Cannot resolve ${packageName}`);
-  }
-  const content = JSON.parse(await promises.readFile(filename, "utf8"));
-  return cache = content.version;
-}
 async function getTypesVersion() {
-  return cache || await getVersion();
+  throw new Error(`getTypesVersion() is deprecated, use wildcard to make packages work with all versions`);
 }
 
 export { getTypesVersion };

package/lib/export/icon-package.cjs

@@ -5,10 +5,8 @@ Object.defineProperty(exports, '__esModule', { value: true });
 const fs = require('fs');
 const export_helpers_prepare = require('./helpers/prepare.cjs');
 const misc_writeJson = require('../misc/write-json.cjs');
-const export_helpers_typesVersion = require('./helpers/types-version.cjs');
 const export_helpers_customFiles = require('./helpers/custom-files.cjs');
 require('pathe');
-require('local-pkg');
 
 const defaultTypesContent = `import type { IconifyIcon } from '@iconify/types';
 declare const data: IconifyIcon;
@@ -48,7 +46,7 @@ async function exportIconPackage(iconSet, options) {
     iconSetInfo: info,
     ...customPackageProps,
     dependencies: dependencies || {
-      "@iconify/types": "^" + await export_helpers_typesVersion.getTypesVersion()
+      "@iconify/types": "*"
     }
   };
   await misc_writeJson.writeJSONFile(dir + "/package.json", packageJSON);

package/lib/export/icon-package.d.ts

@@ -5,7 +5,6 @@ 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';
 
 /**

package/lib/export/icon-package.mjs

@@ -1,10 +1,8 @@
 import { promises } from 'fs';
 import { prepareDirectoryForExport } from './helpers/prepare.mjs';
 import { writeJSONFile } from '../misc/write-json.mjs';
-import { getTypesVersion } from './helpers/types-version.mjs';
 import { exportCustomFiles } from './helpers/custom-files.mjs';
 import 'pathe';
-import 'local-pkg';
 
 const defaultTypesContent = `import type { IconifyIcon } from '@iconify/types';
 declare const data: IconifyIcon;
@@ -44,7 +42,7 @@ async function exportIconPackage(iconSet, options) {
     iconSetInfo: info,
     ...customPackageProps,
     dependencies: dependencies || {
-      "@iconify/types": "^" + await getTypesVersion()
+      "@iconify/types": "*"
     }
   };
   await writeJSONFile(dir + "/package.json", packageJSON);

package/lib/export/json-package.cjs

@@ -6,10 +6,8 @@ const fs = require('fs');
 const defaults = require('@iconify/utils/lib/icon/defaults');
 const export_helpers_prepare = require('./helpers/prepare.cjs');
 const misc_writeJson = require('../misc/write-json.cjs');
-const export_helpers_typesVersion = require('./helpers/types-version.cjs');
 const export_helpers_customFiles = require('./helpers/custom-files.cjs');
 require('pathe');
-require('local-pkg');
 
 const exportTypes = {
   icons: "IconifyJSON",
@@ -76,7 +74,7 @@ async function exportJSONPackage(iconSet, options) {
     exports: packageJSONExports,
     iconSet: packageJSONIconSet,
     dependencies: dependencies || {
-      "@iconify/types": "^" + await export_helpers_typesVersion.getTypesVersion()
+      "@iconify/types": "*"
     }
   };
   const dtsContent = [];

package/lib/export/json-package.d.ts

@@ -5,7 +5,6 @@ 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';
 
 /**

package/lib/export/json-package.mjs

@@ -2,10 +2,8 @@ import { promises } from 'fs';
 import { defaultIconDimensions } from '@iconify/utils/lib/icon/defaults';
 import { prepareDirectoryForExport } from './helpers/prepare.mjs';
 import { writeJSONFile } from '../misc/write-json.mjs';
-import { getTypesVersion } from './helpers/types-version.mjs';
 import { exportCustomFiles } from './helpers/custom-files.mjs';
 import 'pathe';
-import 'local-pkg';
 
 const exportTypes = {
   icons: "IconifyJSON",
@@ -72,7 +70,7 @@ async function exportJSONPackage(iconSet, options) {
     exports: packageJSONExports,
     iconSet: packageJSONIconSet,
     dependencies: dependencies || {
-      "@iconify/types": "^" + await getTypesVersion()
+      "@iconify/types": "*"
     }
   };
   const dtsContent = [];

package/lib/icon-set/index.cjs

@@ -219,7 +219,7 @@ class IconSet {
   export(validate = true) {
     const icons = /* @__PURE__ */ Object.create(null);
     const aliases = /* @__PURE__ */ Object.create(null);
-    const tree = validate ? this.getTree() : {};
+    const tree = validate ? this.getTree() : /* @__PURE__ */ Object.create(null);
     const names = Object.keys(this.entries);
     names.sort((a, b) => a.localeCompare(b));
     names.forEach((name) => {

package/lib/icon-set/index.d.ts

@@ -3,7 +3,6 @@ import { IconifyIconCustomisations } from '@iconify/utils/lib/customisations/def
 import { IconSetIconEntry, IconCategory, IconSetIconType, IconSetAsyncForEachCallback, ResolvedIconifyIcon, CommonIconProps, CheckThemeResult } from './types.js';
 import { SVG } from '../svg/index.js';
 import { ParentIconsTree } from '@iconify/utils/lib/icon-set/tree';
-import '@iconify/utils/lib/customisations';
 
 /**
  * Sort theme keys: long keys first

package/lib/icon-set/index.mjs

@@ -215,7 +215,7 @@ class IconSet {
   export(validate = true) {
     const icons = /* @__PURE__ */ Object.create(null);
     const aliases = /* @__PURE__ */ Object.create(null);
-    const tree = validate ? this.getTree() : {};
+    const tree = validate ? this.getTree() : /* @__PURE__ */ Object.create(null);
     const names = Object.keys(this.entries);
     names.sort((a, b) => a.localeCompare(b));
     names.forEach((name) => {

package/lib/icon-set/match.d.ts

@@ -4,7 +4,6 @@ import '../types-f0980297.js';
 import '@iconify/utils/lib/customisations/defaults';
 import './types.js';
 import '../svg/index.js';
-import '@iconify/utils/lib/customisations';
 import '@iconify/utils/lib/icon-set/tree';
 
 /**

package/lib/icon-set/merge.cjs

@@ -79,10 +79,10 @@ function mergeIconSets(oldIcons, newIcons) {
   for (const name in oldEntries) {
     add(name);
   }
-  const lastModified1 = oldIcons.lastModified;
-  const lastModified2 = newIcons.lastModified;
-  if ((lastModified1 || lastModified2) && !iconSet_modified.hasIconDataBeenModified(oldIcons, newIcons)) {
-    mergedIcons.updateLastModified(lastModified2 ? lastModified1 ? Math.min(lastModified1, lastModified2) : lastModified2 : lastModified1);
+  if (oldIcons.lastModified && !iconSet_modified.hasIconDataBeenModified(oldIcons, mergedIcons)) {
+    mergedIcons.updateLastModified(oldIcons.lastModified);
+  } else if (newIcons.lastModified && !iconSet_modified.hasIconDataBeenModified(newIcons, mergedIcons)) {
+    mergedIcons.updateLastModified(newIcons.lastModified);
   }
   return mergedIcons;
 }

package/lib/icon-set/merge.d.ts

@@ -3,7 +3,6 @@ import '../types-f0980297.js';
 import '@iconify/utils/lib/customisations/defaults';
 import './types.js';
 import '../svg/index.js';
-import '@iconify/utils/lib/customisations';
 import '@iconify/utils/lib/icon-set/tree';
 
 /**

package/lib/icon-set/merge.mjs

@@ -75,10 +75,10 @@ function mergeIconSets(oldIcons, newIcons) {
   for (const name in oldEntries) {
     add(name);
   }
-  const lastModified1 = oldIcons.lastModified;
-  const lastModified2 = newIcons.lastModified;
-  if ((lastModified1 || lastModified2) && !hasIconDataBeenModified(oldIcons, newIcons)) {
-    mergedIcons.updateLastModified(lastModified2 ? lastModified1 ? Math.min(lastModified1, lastModified2) : lastModified2 : lastModified1);
+  if (oldIcons.lastModified && !hasIconDataBeenModified(oldIcons, mergedIcons)) {
+    mergedIcons.updateLastModified(oldIcons.lastModified);
+  } else if (newIcons.lastModified && !hasIconDataBeenModified(newIcons, mergedIcons)) {
+    mergedIcons.updateLastModified(newIcons.lastModified);
   }
   return mergedIcons;
 }

package/lib/icon-set/modified.d.ts

@@ -3,7 +3,6 @@ import '../types-f0980297.js';
 import '@iconify/utils/lib/customisations/defaults';
 import './types.js';
 import '../svg/index.js';
-import '@iconify/utils/lib/customisations';
 import '@iconify/utils/lib/icon-set/tree';
 
 /**

package/lib/import/directory.d.ts

@@ -3,7 +3,6 @@ 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';
 
 /**

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

@@ -6,7 +6,6 @@ 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/nodes.d.ts

@@ -6,7 +6,6 @@ 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

@@ -8,7 +8,6 @@ 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

@@ -5,7 +5,6 @@ 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';

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

@@ -5,7 +5,6 @@ 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

@@ -3,7 +3,6 @@ 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';
 
 /**

package/lib/index.cjs

@@ -83,10 +83,8 @@ require('stream');
 require('extract-zip');
 require('tar');
 require('@iconify/utils/lib/colors');
-require('local-pkg');
 require('./download/gitlab/types.cjs');
 require('./colors/attribs.cjs');
-require('./export/helpers/types-version.cjs');
 require('./export/helpers/custom-files.cjs');
 
 

package/lib/index.d.ts

@@ -44,10 +44,10 @@ export { cleanupIconKeyword } from './misc/keyword.js';
 export { bumpVersion } from './misc/bump-version.js';
 export { sendAPIQuery } from './download/api/index.js';
 import './types-f0980297.js';
-import '@iconify/utils/lib/customisations';
+import '@iconify/utils/lib/customisations/defaults';
+import './misc/cheerio.js';
 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';

package/lib/index.mjs

@@ -79,8 +79,6 @@ import 'stream';
 import 'extract-zip';
 import 'tar';
 import '@iconify/utils/lib/colors';
-import 'local-pkg';
 import './download/gitlab/types.mjs';
 import './colors/attribs.mjs';
-import './export/helpers/types-version.mjs';
 import './export/helpers/custom-files.mjs';

package/lib/misc/bump-version.cjs

@@ -6,10 +6,10 @@ function bumpVersion(version) {
   const versionParts = version.split(".");
   const lastPart = versionParts.pop();
   const num = parseInt(lastPart);
-  if (isNaN(num) || num + "" !== lastPart) {
+  if (isNaN(num) || num.toString() !== lastPart) {
     versionParts.push(lastPart + ".1");
   } else {
-    versionParts.push(num + 1 + "");
+    versionParts.push((num + 1).toString());
   }
   return versionParts.join(".");
 }

package/lib/misc/bump-version.mjs

@@ -2,10 +2,10 @@ function bumpVersion(version) {
   const versionParts = version.split(".");
   const lastPart = versionParts.pop();
   const num = parseInt(lastPart);
-  if (isNaN(num) || num + "" !== lastPart) {
+  if (isNaN(num) || num.toString() !== lastPart) {
     versionParts.push(lastPart + ".1");
   } else {
-    versionParts.push(num + 1 + "");
+    versionParts.push((num + 1).toString());
   }
   return versionParts.join(".");
 }

package/lib/misc/cheerio.cjs

@@ -0,0 +1,2 @@
+'use strict';
+

package/lib/misc/cheerio.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Shortcuts for Cheerio elements
+ */
+declare type CheerioElement = cheerio.TagElement;
+declare type WrappedCheerioElement = cheerio.Cheerio;
+
+export { CheerioElement, WrappedCheerioElement };

package/lib/misc/cheerio.mjs

@@ -0,0 +1 @@
+

package/lib/optimise/flags.cjs

@@ -62,11 +62,11 @@ function cleanPath(path) {
     if (currentNumber !== "" && currentCommandType) {
       let value = Number(currentNumber);
       if (isNaN(value)) {
-        throw new Error('Invalid number "' + currentNumber + '" at ' + i);
+        throw new Error(`Invalid number "${currentNumber}" at ${i}`);
       }
       if (currentCommandType === ARC) {
         if (currentArgs.length < 2 && value <= 0) {
-          throw new Error('Expected positive number, got "' + value + '" at ' + i);
+          throw new Error(`Expected positive number, got "${value}" at ${i}`);
         }
         while (true) {
           if (currentArgs.length < 3 || currentArgs.length > 4) {
@@ -80,14 +80,14 @@ function cleanPath(path) {
           const newValue = Number(newNumber);
           if (slice === "0" || slice === "1") {
             if (isNaN(newValue)) {
-              throw new Error('Invalid number "' + currentNumber + '" at ' + i);
+              throw new Error(`Invalid number "${currentNumber}" at ${i}`);
             }
             currentArgs.push(slice);
             currentNumber = newNumber;
             value = newValue;
             continue;
           }
-          throw new Error('Expected a flag, got "' + currentNumber + '" at ' + i);
+          throw new Error(`Expected a flag, got "${currentNumber}" at ${i}`);
         }
       }
       currentArgs.push(currentNumber);
@@ -137,10 +137,10 @@ function cleanPath(path) {
       continue;
     }
     if (currentArgs.length > 0) {
-      throw new Error("Unexpected command at " + i);
+      throw new Error(`Unexpected command at ${i}`);
     }
     if (!canParseCommandOrComma) {
-      throw new Error("Command cannot follow comma at " + i);
+      throw new Error(`Command cannot follow comma at ${i}`);
     }
     canParseCommandOrComma = false;
     currentCommand = char;
@@ -192,7 +192,7 @@ function cleanPath(path) {
         currentCommandType = ARC;
         break;
       default:
-        throw new Error('Unexpected character "' + char + '" at ' + i);
+        throw new Error(`Unexpected character "${char}" at ${i}`);
     }
   }
   parseNumber();
@@ -201,7 +201,7 @@ function cleanPath(path) {
       throw new Error("Empty path");
     }
     if (currentArgs.length !== argCount[currentCommandType]) {
-      throw new Error("Unexpected end of path at " + i);
+      throw new Error(`Unexpected end of path at ${i}`);
     }
     finishCommand();
   }

package/lib/optimise/flags.d.ts

@@ -1,6 +1,6 @@
 import { SVG } from '../svg/index.js';
 import '../types-f0980297.js';
-import '@iconify/utils/lib/customisations';
+import '@iconify/utils/lib/customisations/defaults';
 
 /**
  * De-optimise paths. Compressed paths are still not supported by some software.

package/lib/optimise/flags.mjs

@@ -58,11 +58,11 @@ function cleanPath(path) {
     if (currentNumber !== "" && currentCommandType) {
       let value = Number(currentNumber);
       if (isNaN(value)) {
-        throw new Error('Invalid number "' + currentNumber + '" at ' + i);
+        throw new Error(`Invalid number "${currentNumber}" at ${i}`);
       }
       if (currentCommandType === ARC) {
         if (currentArgs.length < 2 && value <= 0) {
-          throw new Error('Expected positive number, got "' + value + '" at ' + i);
+          throw new Error(`Expected positive number, got "${value}" at ${i}`);
         }
         while (true) {
           if (currentArgs.length < 3 || currentArgs.length > 4) {
@@ -76,14 +76,14 @@ function cleanPath(path) {
           const newValue = Number(newNumber);
           if (slice === "0" || slice === "1") {
             if (isNaN(newValue)) {
-              throw new Error('Invalid number "' + currentNumber + '" at ' + i);
+              throw new Error(`Invalid number "${currentNumber}" at ${i}`);
             }
             currentArgs.push(slice);
             currentNumber = newNumber;
             value = newValue;
             continue;
           }
-          throw new Error('Expected a flag, got "' + currentNumber + '" at ' + i);
+          throw new Error(`Expected a flag, got "${currentNumber}" at ${i}`);
         }
       }
       currentArgs.push(currentNumber);
@@ -133,10 +133,10 @@ function cleanPath(path) {
       continue;
     }
     if (currentArgs.length > 0) {
-      throw new Error("Unexpected command at " + i);
+      throw new Error(`Unexpected command at ${i}`);
     }
     if (!canParseCommandOrComma) {
-      throw new Error("Command cannot follow comma at " + i);
+      throw new Error(`Command cannot follow comma at ${i}`);
     }
     canParseCommandOrComma = false;
     currentCommand = char;
@@ -188,7 +188,7 @@ function cleanPath(path) {
         currentCommandType = ARC;
         break;
       default:
-        throw new Error('Unexpected character "' + char + '" at ' + i);
+        throw new Error(`Unexpected character "${char}" at ${i}`);
     }
   }
   parseNumber();
@@ -197,7 +197,7 @@ function cleanPath(path) {
       throw new Error("Empty path");
     }
     if (currentArgs.length !== argCount[currentCommandType]) {
-      throw new Error("Unexpected end of path at " + i);
+      throw new Error(`Unexpected end of path at ${i}`);
     }
     finishCommand();
   }

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

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

package/lib/optimise/scale.cjs

@@ -5,15 +5,15 @@ Object.defineProperty(exports, '__esModule', { value: true });
 const optimise_svgo = require('./svgo.cjs');
 require('svgo');
 
-async function scaleSVG(svg, scale) {
+function scaleSVG(svg, scale) {
   const viewBox = svg.viewBox;
   const width = viewBox.width * scale;
   const height = viewBox.height * scale;
   const left = viewBox.left * scale;
   const top = viewBox.top * scale;
-  const content = '<svg width="' + width + '" height="' + height + '" viewBox="' + left + " " + top + " " + width + " " + height + '"><g transform="scale(' + scale + ')">' + svg.getBody() + "</g></svg>";
+  const content = `<svg width="${width}" height="${height}" viewBox="${left} ${top} ${width} ${height}"><g transform="scale(${scale})">${svg.getBody()}</g></svg>`;
   svg.load(content);
-  await optimise_svgo.runSVGO(svg, {
+  optimise_svgo.runSVGO(svg, {
     plugins: [
       "collapseGroups",
       "convertTransform",

package/lib/optimise/scale.d.ts

@@ -1,10 +1,10 @@
 import { SVG } from '../svg/index.js';
 import '../types-f0980297.js';
-import '@iconify/utils/lib/customisations';
+import '@iconify/utils/lib/customisations/defaults';
 
 /**
  * Scale icon
  */
-declare function scaleSVG(svg: SVG, scale: number): Promise<void>;
+declare function scaleSVG(svg: SVG, scale: number): void;
 
 export { scaleSVG };

package/lib/optimise/scale.mjs

@@ -1,15 +1,15 @@
 import { runSVGO } from './svgo.mjs';
 import 'svgo';
 
-async function scaleSVG(svg, scale) {
+function scaleSVG(svg, scale) {
   const viewBox = svg.viewBox;
   const width = viewBox.width * scale;
   const height = viewBox.height * scale;
   const left = viewBox.left * scale;
   const top = viewBox.top * scale;
-  const content = '<svg width="' + width + '" height="' + height + '" viewBox="' + left + " " + top + " " + width + " " + height + '"><g transform="scale(' + scale + ')">' + svg.getBody() + "</g></svg>";
+  const content = `<svg width="${width}" height="${height}" viewBox="${left} ${top} ${width} ${height}"><g transform="scale(${scale})">${svg.getBody()}</g></svg>`;
   svg.load(content);
-  await runSVGO(svg, {
+  runSVGO(svg, {
     plugins: [
       "collapseGroups",
       "convertTransform",

package/lib/optimise/svgo.cjs

@@ -56,7 +56,7 @@ function getSVGOPlugins(options) {
     ] : []
   ];
 }
-async function runSVGO(svg, options = {}) {
+function runSVGO(svg, options = {}) {
   const code = svg.toString();
   const multipass = options.multipass !== false;
   let plugins;

package/lib/optimise/svgo.d.ts

@@ -1,7 +1,7 @@
 import { Plugin } from 'svgo';
 import { SVG } from '../svg/index.js';
 import '../types-f0980297.js';
-import '@iconify/utils/lib/customisations';
+import '@iconify/utils/lib/customisations/defaults';
 
 interface CleanupIDsOption {
     cleanupIDs?: string | false;
@@ -31,6 +31,6 @@ declare type SVGOOptions = SVGOOptionsWithPlugin | SVGOptionsWithoutPlugin;
 /**
  * Run SVGO on icon
  */
-declare function runSVGO(svg: SVG, options?: SVGOOptions): Promise<void>;
+declare function runSVGO(svg: SVG, options?: SVGOOptions): void;
 
 export { getSVGOPlugins, runSVGO };

package/lib/optimise/svgo.mjs

@@ -52,7 +52,7 @@ function getSVGOPlugins(options) {
     ] : []
   ];
 }
-async function runSVGO(svg, options = {}) {
+function runSVGO(svg, options = {}) {
   const code = svg.toString();
   const multipass = options.multipass !== false;
   let plugins;

package/lib/svg/analyse.d.ts

@@ -1,7 +1,7 @@
 import { SVG } from './index.js';
 import { AnalyseSVGStructureOptions, AnalyseSVGStructureResult } from './analyse/types.js';
 import '../types-f0980297.js';
-import '@iconify/utils/lib/customisations';
+import '@iconify/utils/lib/customisations/defaults';
 
 /**
  * Find all IDs, links, which elements use palette, which items aren't used

package/lib/svg/cleanup/attribs.d.ts

@@ -1,6 +1,6 @@
 import { SVG } from '../index.js';
 import '../../types-f0980297.js';
-import '@iconify/utils/lib/customisations';
+import '@iconify/utils/lib/customisations/defaults';
 
 /**
  * Remove useless attributes

package/lib/svg/cleanup/bad-tags.d.ts

@@ -1,6 +1,6 @@
 import { SVG } from '../index.js';
 import '../../types-f0980297.js';
-import '@iconify/utils/lib/customisations';
+import '@iconify/utils/lib/customisations/defaults';
 
 /**
  * Test for bag tags

package/lib/svg/cleanup/inline-style.d.ts

@@ -1,6 +1,6 @@
 import { SVG } from '../index.js';
 import '../../types-f0980297.js';
-import '@iconify/utils/lib/customisations';
+import '@iconify/utils/lib/customisations/defaults';
 
 /**
  * Expand inline style

package/lib/svg/cleanup/root-svg.d.ts

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

package/lib/svg/cleanup/svgo-style.cjs

@@ -29,7 +29,7 @@ async function convertStyleToAttrs(svg) {
   if (!hasStyle) {
     return;
   }
-  await optimise_svgo.runSVGO(svg, {
+  optimise_svgo.runSVGO(svg, {
     plugins: ["convertStyleToAttrs", "inlineStyles"],
     multipass: true
   });

package/lib/svg/cleanup/svgo-style.d.ts

@@ -1,6 +1,6 @@
 import { SVG } from '../index.js';
 import '../../types-f0980297.js';
-import '@iconify/utils/lib/customisations';
+import '@iconify/utils/lib/customisations/defaults';
 
 /**
  * Expand inline style

package/lib/svg/cleanup/svgo-style.mjs

@@ -25,7 +25,7 @@ async function convertStyleToAttrs(svg) {
   if (!hasStyle) {
     return;
   }
-  await runSVGO(svg, {
+  runSVGO(svg, {
     plugins: ["convertStyleToAttrs", "inlineStyles"],
     multipass: true
   });

package/lib/svg/cleanup.d.ts

@@ -1,6 +1,6 @@
 import { SVG } from './index.js';
 import '../types-f0980297.js';
-import '@iconify/utils/lib/customisations';
+import '@iconify/utils/lib/customisations/defaults';
 
 /**
  * Clean up SVG before parsing/optimising it

package/lib/svg/index.cjs

@@ -31,21 +31,18 @@ class SVG {
         const value = data.attributes[key];
         svgAttributes += " " + key + '="' + value + '"';
       }
-      if (customisations.inline) {
-        svgAttributes += ' style="vertical-align: -0.125em;"';
-      }
       return "<svg" + svgAttributes + ">" + data.body + "</svg>";
     }
     const $root = this.$svg(":root");
     const box = this.viewBox;
     if ($root.attr("viewBox") === void 0) {
-      $root.attr("viewBox", box.left + " " + box.top + " " + box.width + " " + box.height);
+      $root.attr("viewBox", `${box.left} ${box.top} ${box.width} ${box.height}`);
     }
     if ($root.attr("width") === void 0) {
-      $root.attr("width", box.width + "");
+      $root.attr("width", box.width.toString());
     }
     if ($root.attr("height") === void 0) {
-      $root.attr("height", box.height + "");
+      $root.attr("height", box.height.toString());
     }
     return this.$svg.html();
   }

package/lib/svg/index.d.ts

@@ -1,7 +1,7 @@
 import { I as IconifyIcon } from '../types-f0980297.js';
 export { I as IconifyIcon } from '../types-f0980297.js';
-import { IconifyIconCustomisations } from '@iconify/utils/lib/customisations';
-export { IconifyIconCustomisations } from '@iconify/utils/lib/customisations';
+import { IconifyIconCustomisations } from '@iconify/utils/lib/customisations/defaults';
+export { IconifyIconCustomisations } from '@iconify/utils/lib/customisations/defaults';
 
 interface ViewBox {
     left: number;

package/lib/svg/index.mjs

@@ -23,21 +23,18 @@ class SVG {
         const value = data.attributes[key];
         svgAttributes += " " + key + '="' + value + '"';
       }
-      if (customisations.inline) {
-        svgAttributes += ' style="vertical-align: -0.125em;"';
-      }
       return "<svg" + svgAttributes + ">" + data.body + "</svg>";
     }
     const $root = this.$svg(":root");
     const box = this.viewBox;
     if ($root.attr("viewBox") === void 0) {
-      $root.attr("viewBox", box.left + " " + box.top + " " + box.width + " " + box.height);
+      $root.attr("viewBox", `${box.left} ${box.top} ${box.width} ${box.height}`);
     }
     if ($root.attr("width") === void 0) {
-      $root.attr("width", box.width + "");
+      $root.attr("width", box.width.toString());
     }
     if ($root.attr("height") === void 0) {
-      $root.attr("height", box.height + "");
+      $root.attr("height", box.height.toString());
     }
     return this.$svg.html();
   }

package/lib/svg/parse-style.d.ts

@@ -2,7 +2,8 @@ import { SVG } from './index.js';
 import { CSSRuleToken, CSSToken } from '../css/parser/types.js';
 import { ParseSVGCallbackItem } from './parse.js';
 import '../types-f0980297.js';
-import '@iconify/utils/lib/customisations';
+import '@iconify/utils/lib/customisations/defaults';
+import '../misc/cheerio.js';
 
 /**
  * Item in callback

package/lib/svg/parse.d.ts

@@ -1,12 +1,8 @@
+import { CheerioElement, WrappedCheerioElement } from '../misc/cheerio.js';
 import { SVG } from './index.js';
 import '../types-f0980297.js';
-import '@iconify/utils/lib/customisations';
+import '@iconify/utils/lib/customisations/defaults';
 
-/**
- * Shortcuts for Cheerio elements
- */
-declare type CheerioElement = cheerio.TagElement;
-declare type WrappedCheerioElement = cheerio.Cheerio;
 /**
  * Item in callback
  */
@@ -31,4 +27,4 @@ declare type ParseSVGCallback = (item: ParseSVGCallbackItem) => void | Promise<v
  */
 declare function parseSVG(svg: SVG, callback: ParseSVGCallback): Promise<void>;
 
-export { CheerioElement, ParseSVGCallback, ParseSVGCallbackItem, WrappedCheerioElement, parseSVG };
+export { ParseSVGCallback, ParseSVGCallbackItem, parseSVG };

package/package.json

@@ -3,7 +3,7 @@
 	"type": "module",
 	"description": "Collection of functions for cleaning up and parsing SVG for Iconify project",
 	"author": "Vjacheslav Trushkin",
-	"version": "2.1.0-beta.1",
+	"version": "2.1.0-beta.4",
 	"license": "MIT",
 	"bugs": "https://github.com/iconify/tools/issues",
 	"homepage": "https://github.com/iconify/tools",
@@ -300,6 +300,10 @@
 			"require": "./lib/misc/bump-version.cjs",
 			"import": "./lib/misc/bump-version.mjs"
 		},
+		"./lib/misc/cheerio": {
+			"require": "./lib/misc/cheerio.cjs",
+			"import": "./lib/misc/cheerio.mjs"
+		},
 		"./lib/misc/compare-dirs": {
 			"require": "./lib/misc/compare-dirs.cjs",
 			"import": "./lib/misc/compare-dirs.mjs"