@iconify/tools 2.1.0-beta.2 → 2.1.0-beta.5

package/lib/download/git/index.cjs

@@ -13,14 +13,13 @@ require('path');
 require('child_process');
 require('cheerio');
 require('@iconify/utils');
-require('@iconify/utils/lib/icon/defaults');
 require('../../svg/data/attributes.cjs');
 require('../../svg/data/tags.cjs');
 require('../../svg/cleanup/bad-tags.cjs');
 require('../../svg/parse.cjs');
 require('svgo');
+require('@iconify/utils/lib/icon/defaults');
 require('@iconify/utils/lib/svg/build');
-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');
@@ -33,7 +32,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

@@ -9,14 +9,13 @@ import 'path';
 import 'child_process';
 import 'cheerio';
 import '@iconify/utils';
-import '@iconify/utils/lib/icon/defaults';
 import '../../svg/data/attributes.mjs';
 import '../../svg/data/tags.mjs';
 import '../../svg/cleanup/bad-tags.mjs';
 import '../../svg/parse.mjs';
 import 'svgo';
+import '@iconify/utils/lib/icon/defaults';
 import '@iconify/utils/lib/svg/build';
-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';
@@ -29,7 +28,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

@@ -4,13 +4,12 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 require('cheerio');
 require('@iconify/utils');
-require('@iconify/utils/lib/icon/defaults');
 require('../../svg/data/attributes.cjs');
 require('../../svg/data/tags.cjs');
 require('../../svg/cleanup/bad-tags.cjs');
 require('svgo');
+require('@iconify/utils/lib/icon/defaults');
 require('@iconify/utils/lib/svg/build');
-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');
@@ -23,7 +22,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

@@ -1,12 +1,11 @@
 import 'cheerio';
 import '@iconify/utils';
-import '@iconify/utils/lib/icon/defaults';
 import '../../svg/data/attributes.mjs';
 import '../../svg/data/tags.mjs';
 import '../../svg/cleanup/bad-tags.mjs';
 import 'svgo';
+import '@iconify/utils/lib/icon/defaults';
 import '@iconify/utils/lib/svg/build';
-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';
@@ -19,7 +18,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

@@ -28,21 +28,19 @@ require('./git/hash.cjs');
 require('./git/reset.cjs');
 require('cheerio');
 require('@iconify/utils');
-require('@iconify/utils/lib/icon/defaults');
 require('../svg/data/attributes.cjs');
 require('../svg/data/tags.cjs');
 require('../svg/cleanup/bad-tags.cjs');
 require('../svg/parse.cjs');
 require('svgo');
+require('@iconify/utils/lib/icon/defaults');
 require('@iconify/utils/lib/svg/build');
-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('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

@@ -24,21 +24,19 @@ import './git/hash.mjs';
 import './git/reset.mjs';
 import 'cheerio';
 import '@iconify/utils';
-import '@iconify/utils/lib/icon/defaults';
 import '../svg/data/attributes.mjs';
 import '../svg/data/tags.mjs';
 import '../svg/cleanup/bad-tags.mjs';
 import '../svg/parse.mjs';
 import 'svgo';
+import '@iconify/utils/lib/icon/defaults';
 import '@iconify/utils/lib/svg/build';
-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 'tar';
 import '@iconify/utils/lib/colors';
-import 'local-pkg';
 import './helpers/untar.mjs';
 import './npm/version.mjs';
 import './gitlab/hash.mjs';

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.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.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

@@ -4,7 +4,6 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 const defaults = require('@iconify/utils/lib/icon/defaults');
 const build = require('@iconify/utils/lib/svg/build');
-const defaults$1 = require('@iconify/utils/lib/customisations/defaults');
 const minify = require('@iconify/utils/lib/icon-set/minify');
 const convertInfo = require('@iconify/utils/lib/icon-set/convert-info');
 const iconSet_props = require('./props.cjs');
@@ -201,14 +200,11 @@ class IconSet {
     width: "auto",
     height: "auto"
   }) {
-    const item = this.resolve(name, true);
+    const item = this.resolve(name);
     if (!item) {
       return null;
     }
-    const result = build.iconToSVG(item, {
-      ...defaults$1.defaultIconCustomisations,
-      ...customisations
-    });
+    const result = build.iconToSVG(item, customisations);
     const attributes = Object.keys(result.attributes).map((key) => ` ${key}="${result.attributes[key]}"`).join("");
     return `<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"${attributes}>${result.body}</svg>`;
   }

package/lib/icon-set/index.mjs

@@ -1,6 +1,5 @@
 import { defaultIconDimensions, defaultIconProps } from '@iconify/utils/lib/icon/defaults';
 import { iconToSVG } from '@iconify/utils/lib/svg/build';
-import { defaultIconCustomisations } from '@iconify/utils/lib/customisations/defaults';
 import { minifyIconSet } from '@iconify/utils/lib/icon-set/minify';
 import { convertIconSetInfo } from '@iconify/utils/lib/icon-set/convert-info';
 import { filterProps, defaultCommonProps } from './props.mjs';
@@ -197,14 +196,11 @@ class IconSet {
     width: "auto",
     height: "auto"
   }) {
-    const item = this.resolve(name, true);
+    const item = this.resolve(name);
     if (!item) {
       return null;
     }
-    const result = iconToSVG(item, {
-      ...defaultIconCustomisations,
-      ...customisations
-    });
+    const result = iconToSVG(item, customisations);
     const attributes = Object.keys(result.attributes).map((key) => ` ${key}="${result.attributes[key]}"`).join("");
     return `<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"${attributes}>${result.body}</svg>`;
   }

package/lib/icon-set/merge.cjs

@@ -7,7 +7,6 @@ const iconSet_match = require('./match.cjs');
 const iconSet_modified = require('./modified.cjs');
 require('@iconify/utils/lib/icon/defaults');
 require('@iconify/utils/lib/svg/build');
-require('@iconify/utils/lib/customisations/defaults');
 require('@iconify/utils/lib/icon-set/minify');
 require('@iconify/utils/lib/icon-set/convert-info');
 require('./props.cjs');
@@ -79,10 +78,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.mjs

@@ -3,7 +3,6 @@ import { findMatchingIcon } from './match.mjs';
 import { hasIconDataBeenModified } from './modified.mjs';
 import '@iconify/utils/lib/icon/defaults';
 import '@iconify/utils/lib/svg/build';
-import '@iconify/utils/lib/customisations/defaults';
 import '@iconify/utils/lib/icon-set/minify';
 import '@iconify/utils/lib/icon-set/convert-info';
 import './props.mjs';
@@ -75,10 +74,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/import/directory.cjs

@@ -10,7 +10,6 @@ const svg_index = require('../svg/index.cjs');
 const svg_cleanup = require('../svg/cleanup.cjs');
 require('@iconify/utils/lib/icon/defaults');
 require('@iconify/utils/lib/svg/build');
-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');

package/lib/import/directory.mjs

@@ -6,7 +6,6 @@ import { SVG } from '../svg/index.mjs';
 import { cleanupSVG } from '../svg/cleanup.mjs';
 import '@iconify/utils/lib/icon/defaults';
 import '@iconify/utils/lib/svg/build';
-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';

package/lib/import/figma/index.cjs

@@ -9,7 +9,6 @@ const import_figma_nodes = require('./nodes.cjs');
 const import_figma_query = require('./query.cjs');
 require('@iconify/utils/lib/icon/defaults');
 require('@iconify/utils/lib/svg/build');
-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');

package/lib/import/figma/index.mjs

@@ -5,7 +5,6 @@ import { getFigmaIconNodes } from './nodes.mjs';
 import { figmaFilesQuery, figmaImagesQuery, figmaDownloadImages } from './query.mjs';
 import '@iconify/utils/lib/icon/defaults';
 import '@iconify/utils/lib/svg/build';
-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';

package/lib/index.cjs

@@ -49,7 +49,6 @@ 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/defaults');
 require('./css/parse.cjs');
 require('./css/parser/tokens.cjs');
 require('./css/parser/error.cjs');
@@ -61,8 +60,8 @@ require('./svg/data/attributes.cjs');
 require('./svg/data/tags.cjs');
 require('./svg/analyse/error.cjs');
 require('svgo');
+require('@iconify/utils/lib/icon/defaults');
 require('@iconify/utils/lib/svg/build');
-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');
@@ -83,10 +82,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.mjs

@@ -45,7 +45,6 @@ export { bumpVersion } from './misc/bump-version.mjs';
 export { sendAPIQuery } from './download/api/index.mjs';
 import 'cheerio';
 import '@iconify/utils';
-import '@iconify/utils/lib/icon/defaults';
 import './css/parse.mjs';
 import './css/parser/tokens.mjs';
 import './css/parser/error.mjs';
@@ -57,8 +56,8 @@ import './svg/data/attributes.mjs';
 import './svg/data/tags.mjs';
 import './svg/analyse/error.mjs';
 import 'svgo';
+import '@iconify/utils/lib/icon/defaults';
 import '@iconify/utils/lib/svg/build';
-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';
@@ -79,8 +78,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/svg/index.cjs

@@ -4,7 +4,6 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 const cheerio = require('cheerio');
 const utils = require('@iconify/utils');
-const defaults = require('@iconify/utils/lib/icon/defaults');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e["default"] : e; }
 
@@ -16,13 +15,7 @@ class SVG {
   }
   toString(customisations) {
     if (customisations) {
-      const data = utils.iconToSVG({
-        ...defaults.defaultIconProps,
-        ...this.getIcon()
-      }, {
-        ...utils.defaultIconCustomisations,
-        ...customisations
-      });
+      const data = utils.iconToSVG(this.getIcon(), customisations);
       let svgAttributes = ' xmlns="http://www.w3.org/2000/svg"';
       if (data.body.indexOf("xlink:") !== -1) {
         svgAttributes += ' xmlns:xlink="http://www.w3.org/1999/xlink"';

package/lib/svg/index.mjs

@@ -1,6 +1,5 @@
 import cheerio from 'cheerio';
-import { iconToSVG, defaultIconCustomisations, trimSVG } from '@iconify/utils';
-import { defaultIconProps } from '@iconify/utils/lib/icon/defaults';
+import { iconToSVG, trimSVG } from '@iconify/utils';
 
 class SVG {
   constructor(content) {
@@ -8,13 +7,7 @@ class SVG {
   }
   toString(customisations) {
     if (customisations) {
-      const data = iconToSVG({
-        ...defaultIconProps,
-        ...this.getIcon()
-      }, {
-        ...defaultIconCustomisations,
-        ...customisations
-      });
+      const data = iconToSVG(this.getIcon(), customisations);
       let svgAttributes = ' xmlns="http://www.w3.org/2000/svg"';
       if (data.body.indexOf("xlink:") !== -1) {
         svgAttributes += ' xmlns:xlink="http://www.w3.org/1999/xlink"';

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.2",
+	"version": "2.1.0-beta.5",
 	"license": "MIT",
 	"bugs": "https://github.com/iconify/tools/issues",
 	"homepage": "https://github.com/iconify/tools",
@@ -25,7 +25,7 @@
 		"test": "npm run test:jest-cjs && npm run test:jest-esm && npm run test:jasmine"
 	},
 	"dependencies": {
-		"@iconify/utils": "^2.0.0-beta.3",
+		"@iconify/utils": "^2.0.0-beta.4",
 		"@types/cheerio": "^0.22.30",
 		"@types/node-fetch": "^2.5.12",
 		"@types/svgo": "^2.6.0",