@iconify/tools 2.0.18 → 2.1.0-beta.3

package/lib/colors/parse.d.ts

@@ -2,8 +2,8 @@ import { Color } from '@iconify/utils/lib/colors/types';
 import { SVG } from '../svg/index.js';
 import { ColorAttributes } from './attribs.js';
 import { ElementsTreeItem, AnalyseSVGStructureResult, AnalyseSVGStructureOptions, ExtendedTagElement } from '../svg/analyse/types.js';
-import '@iconify/types';
-import '@iconify/utils/lib/customisations';
+import '../types-f0980297.js';
+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 '@iconify/types';
-import '@iconify/utils/lib/customisations';
+import '../types-f0980297.js';
+import '@iconify/utils/lib/customisations/defaults';
 import '@iconify/utils/lib/colors/types';
 import './attribs.js';
 import '../svg/analyse/types.js';

package/lib/download/git/branch.cjs

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 const misc_exec = require('../../misc/exec.cjs');
+require('path');
 require('child_process');
 
 async function getGitRepoBranch(options, checkout) {
@@ -11,9 +12,7 @@ async function getGitRepoBranch(options, checkout) {
   });
   const branch = result.stdout.trim();
   if (typeof checkout === "string" && branch !== checkout) {
-    await misc_exec.execAsync(`git checkout ${checkout}`, {
-      cwd: options.target
-    });
+    await misc_exec.execAsync(`git checkout ${checkout} "${options.target}"`);
     return await getGitRepoBranch(options);
   }
   return branch;

package/lib/download/git/branch.mjs

@@ -1,4 +1,5 @@
 import { execAsync } from '../../misc/exec.mjs';
+import 'path';
 import 'child_process';
 
 async function getGitRepoBranch(options, checkout) {
@@ -7,9 +8,7 @@ async function getGitRepoBranch(options, checkout) {
   });
   const branch = result.stdout.trim();
   if (typeof checkout === "string" && branch !== checkout) {
-    await execAsync(`git checkout ${checkout}`, {
-      cwd: options.target
-    });
+    await execAsync(`git checkout ${checkout} "${options.target}"`);
     return await getGitRepoBranch(options);
   }
   return branch;

package/lib/download/git/hash.cjs

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 const misc_exec = require('../../misc/exec.cjs');
+require('path');
 require('child_process');
 
 async function getGitRepoHash(options) {

package/lib/download/git/hash.mjs

@@ -1,4 +1,5 @@
 import { execAsync } from '../../misc/exec.mjs';
+import 'path';
 import 'child_process';
 
 async function getGitRepoHash(options) {

package/lib/download/git/index.cjs

@@ -9,20 +9,22 @@ const download_git_hash = require('./hash.cjs');
 const download_git_reset = require('./reset.cjs');
 require('fs');
 require('pathe');
+require('path');
 require('child_process');
 require('cheerio');
 require('@iconify/utils');
-require('@iconify/utils/lib/icon');
+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/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('node-fetch');
 require('crypto');
 require('../api/download.cjs');
@@ -31,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

@@ -5,20 +5,22 @@ import { getGitRepoHash } from './hash.mjs';
 import { resetGitRepoContents } from './reset.mjs';
 import 'fs';
 import 'pathe';
+import 'path';
 import 'child_process';
 import 'cheerio';
 import '@iconify/utils';
-import '@iconify/utils/lib/icon';
+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/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 'node-fetch';
 import 'crypto';
 import '../api/download.mjs';
@@ -27,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

@@ -4,13 +4,13 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 require('cheerio');
 require('@iconify/utils');
-require('@iconify/utils/lib/icon');
+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/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');
@@ -23,8 +23,9 @@ 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');
 require('child_process');
 require('util');
 require('stream');

package/lib/download/git/reset.mjs

@@ -1,12 +1,12 @@
 import 'cheerio';
 import '@iconify/utils';
-import '@iconify/utils/lib/icon';
+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/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';
@@ -19,8 +19,9 @@ 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';
 import 'child_process';
 import 'util';
 import 'stream';

package/lib/download/index.cjs

@@ -21,26 +21,27 @@ require('stream');
 require('./helpers/unzip.cjs');
 require('extract-zip');
 require('../misc/exec.cjs');
+require('path');
 require('child_process');
 require('./git/branch.cjs');
 require('./git/hash.cjs');
 require('./git/reset.cjs');
 require('cheerio');
 require('@iconify/utils');
-require('@iconify/utils/lib/icon');
+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/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('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

@@ -17,26 +17,27 @@ import 'stream';
 import './helpers/unzip.mjs';
 import 'extract-zip';
 import '../misc/exec.mjs';
+import 'path';
 import 'child_process';
 import './git/branch.mjs';
 import './git/hash.mjs';
 import './git/reset.mjs';
 import 'cheerio';
 import '@iconify/utils';
-import '@iconify/utils/lib/icon';
+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/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 'tar';
 import '@iconify/utils/lib/colors';
-import 'local-pkg';
 import './helpers/untar.mjs';
 import './npm/version.mjs';
 import './gitlab/hash.mjs';

package/lib/download/npm/index.cjs

@@ -13,6 +13,7 @@ require('util');
 require('stream');
 require('tar');
 require('../../misc/exec.cjs');
+require('path');
 require('child_process');
 
 async function downloadNPMPackage(options) {

package/lib/download/npm/index.mjs

@@ -9,6 +9,7 @@ import 'util';
 import 'stream';
 import 'tar';
 import '../../misc/exec.mjs';
+import 'path';
 import 'child_process';
 
 async function downloadNPMPackage(options) {

package/lib/download/npm/version.cjs

@@ -4,6 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 const fs = require('fs');
 const misc_exec = require('../../misc/exec.cjs');
+require('path');
 require('child_process');
 
 async function getNPMVersion(options) {

package/lib/download/npm/version.mjs

@@ -1,5 +1,6 @@
 import { promises } from 'fs';
 import { execAsync } from '../../misc/exec.mjs';
+import 'path';
 import 'child_process';
 
 async function getNPMVersion(options) {

package/lib/export/directory.d.ts

@@ -1,9 +1,10 @@
 import { IconSet } from '../icon-set/index.js';
 import { ExportTargetOptions } from './helpers/prepare.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/icon-set/tree';
 
 /**
  * Options

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

@@ -1,10 +1,11 @@
 import { IconSet } from '../icon-set/index.js';
 import { ExportTargetOptions } from './helpers/prepare.js';
 import { ExportOptionsWithCustomFiles } from './helpers/custom-files.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/icon-set/tree';
 
 /**
  * Options

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

@@ -3,13 +3,11 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 const fs = require('fs');
-const icon = require('@iconify/utils/lib/icon');
+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",
@@ -17,7 +15,7 @@ const exportTypes = {
   metadata: "IconifyMetaData",
   chars: "IconifyChars"
 };
-const iconsKeys = ["aliases"].concat(Object.keys(icon.iconDefaults));
+const iconsKeys = ["aliases", "lastModified"].concat(Object.keys(defaults.defaultIconDimensions));
 const metadataKeys = [
   "categories",
   "themes",
@@ -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

@@ -1,10 +1,11 @@
 import { IconSet } from '../icon-set/index.js';
 import { ExportTargetOptions } from './helpers/prepare.js';
 import { ExportOptionsWithCustomFiles } from './helpers/custom-files.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/icon-set/tree';
 
 /**
  * Options

package/lib/export/json-package.mjs

@@ -1,11 +1,9 @@
 import { promises } from 'fs';
-import { iconDefaults } from '@iconify/utils/lib/icon';
+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",
@@ -13,7 +11,7 @@ const exportTypes = {
   metadata: "IconifyMetaData",
   chars: "IconifyChars"
 };
-const iconsKeys = ["aliases"].concat(Object.keys(iconDefaults));
+const iconsKeys = ["aliases", "lastModified"].concat(Object.keys(defaultIconDimensions));
 const metadataKeys = [
   "categories",
   "themes",
@@ -72,7 +70,7 @@ async function exportJSONPackage(iconSet, options) {
     exports: packageJSONExports,
     iconSet: packageJSONIconSet,
     dependencies: dependencies || {
-      "@iconify/types": "^" + await getTypesVersion()
+      "@iconify/types": "*"
     }
   };
   const dtsContent = [];