@iconify/tools 2.2.6 → 3.0.0-beta.1

package/lib/download/git/reset.cjs

@@ -13,7 +13,6 @@ require('@iconify/utils/lib/icon-set/minify');
 require('@iconify/utils/lib/icon-set/convert-info');
 require('../../icon-set/props.cjs');
 require('@iconify/utils/lib/colors');
-require('node-fetch');
 require('fs');
 require('crypto');
 require('pathe');
@@ -26,6 +25,7 @@ require('@iconify/utils/lib/misc/objects');
 require('child_process');
 require('util');
 require('stream');
+require('fs/promises');
 
 async function resetGitRepoContents(target) {
   await misc_exec.execAsync("git add -A", {

package/lib/download/git/reset.mjs

@@ -11,7 +11,6 @@ import '@iconify/utils/lib/icon-set/minify';
 import '@iconify/utils/lib/icon-set/convert-info';
 import '../../icon-set/props.mjs';
 import '@iconify/utils/lib/colors';
-import 'node-fetch';
 import 'fs';
 import 'crypto';
 import 'pathe';
@@ -24,6 +23,7 @@ import '@iconify/utils/lib/misc/objects';
 import 'child_process';
 import 'util';
 import 'stream';
+import 'fs/promises';
 
 async function resetGitRepoContents(target) {
   await execAsync("git add -A", {

package/lib/download/github/hash.cjs

@@ -1,7 +1,6 @@
 'use strict';
 
 const download_api_index = require('../api/index.cjs');
-require('node-fetch');
 require('../api/cache.cjs');
 require('fs');
 require('crypto');

package/lib/download/github/hash.mjs

@@ -1,5 +1,4 @@
 import { sendAPIQuery } from '../api/index.mjs';
-import 'node-fetch';
 import '../api/cache.mjs';
 import 'fs';
 import 'crypto';

package/lib/download/github/index.cjs

@@ -7,12 +7,12 @@ const download_api_download = require('../api/download.cjs');
 const download_helpers_unzip = require('../helpers/unzip.cjs');
 require('pathe');
 require('../api/index.cjs');
-require('node-fetch');
 require('../api/cache.cjs');
 require('crypto');
 require('../../misc/scan.cjs');
 require('util');
 require('stream');
+require('fs/promises');
 require('extract-zip');
 
 async function findMatchingDirs(rootDir, hash) {

package/lib/download/github/index.mjs

@@ -5,12 +5,12 @@ import { downloadFile } from '../api/download.mjs';
 import { unzip } from '../helpers/unzip.mjs';
 import 'pathe';
 import '../api/index.mjs';
-import 'node-fetch';
 import '../api/cache.mjs';
 import 'crypto';
 import '../../misc/scan.mjs';
 import 'util';
 import 'stream';
+import 'fs/promises';
 import 'extract-zip';
 
 async function findMatchingDirs(rootDir, hash) {

package/lib/download/gitlab/hash.cjs

@@ -2,7 +2,6 @@
 
 const download_api_index = require('../api/index.cjs');
 const download_gitlab_types = require('./types.cjs');
-require('node-fetch');
 require('../api/cache.cjs');
 require('fs');
 require('crypto');

package/lib/download/gitlab/hash.mjs

@@ -1,6 +1,5 @@
 import { sendAPIQuery } from '../api/index.mjs';
 import { defaultGitLabBaseURI } from './types.mjs';
-import 'node-fetch';
 import '../api/cache.mjs';
 import 'fs';
 import 'crypto';

package/lib/download/gitlab/index.cjs

@@ -8,12 +8,12 @@ const download_api_download = require('../api/download.cjs');
 const download_helpers_unzip = require('../helpers/unzip.cjs');
 require('pathe');
 require('../api/index.cjs');
-require('node-fetch');
 require('../api/cache.cjs');
 require('crypto');
 require('../../misc/scan.cjs');
 require('util');
 require('stream');
+require('fs/promises');
 require('extract-zip');
 
 async function findMatchingDirs(rootDir, hash) {

package/lib/download/gitlab/index.mjs

@@ -6,12 +6,12 @@ import { downloadFile } from '../api/download.mjs';
 import { unzip } from '../helpers/unzip.mjs';
 import 'pathe';
 import '../api/index.mjs';
-import 'node-fetch';
 import '../api/cache.mjs';
 import 'crypto';
 import '../../misc/scan.mjs';
 import 'util';
 import 'stream';
+import 'fs/promises';
 import 'extract-zip';
 
 async function findMatchingDirs(rootDir, hash) {

package/lib/download/helpers/unzip.cjs

@@ -3,9 +3,13 @@
 const extract = require('extract-zip');
 const fs = require('fs');
 
+function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
+
+const extract__default = /*#__PURE__*/_interopDefaultCompat(extract);
+
 async function unzip(source, path) {
   const dir = await fs.promises.realpath(path);
-  await extract(source, {
+  await extract__default(source, {
     dir
   });
 }

package/lib/download/index.cjs

@@ -9,13 +9,13 @@ require('../export/helpers/prepare.cjs');
 require('pathe');
 require('./github/hash.cjs');
 require('./api/index.cjs');
-require('node-fetch');
 require('./api/cache.cjs');
 require('crypto');
 require('../misc/scan.cjs');
 require('./api/download.cjs');
 require('util');
 require('stream');
+require('fs/promises');
 require('./helpers/unzip.cjs');
 require('extract-zip');
 require('../misc/exec.cjs');

package/lib/download/index.mjs

@@ -7,13 +7,13 @@ import '../export/helpers/prepare.mjs';
 import 'pathe';
 import './github/hash.mjs';
 import './api/index.mjs';
-import 'node-fetch';
 import './api/cache.mjs';
 import 'crypto';
 import '../misc/scan.mjs';
 import './api/download.mjs';
 import 'util';
 import 'stream';
+import 'fs/promises';
 import './helpers/unzip.mjs';
 import 'extract-zip';
 import '../misc/exec.mjs';

package/lib/download/npm/index.cjs

@@ -6,9 +6,9 @@ const download_api_download = require('../api/download.cjs');
 const download_helpers_untar = require('../helpers/untar.cjs');
 const download_npm_version = require('./version.cjs');
 require('pathe');
-require('node-fetch');
 require('util');
 require('stream');
+require('fs/promises');
 require('tar');
 require('../../misc/exec.cjs');
 require('child_process');

package/lib/download/npm/index.mjs

@@ -4,9 +4,9 @@ import { downloadFile } from '../api/download.mjs';
 import { untar } from '../helpers/untar.mjs';
 import { getNPMVersion, getPackageVersion } from './version.mjs';
 import 'pathe';
-import 'node-fetch';
 import 'util';
 import 'stream';
+import 'fs/promises';
 import 'tar';
 import '../../misc/exec.mjs';
 import 'child_process';

package/lib/icon-set/index.cjs

@@ -172,6 +172,24 @@ class IconSet {
       }
     }
   }
+  /**
+   * Synchronous version of forEach function to loop through all entries.
+   *
+   * Callback should return false to stop loop.
+   */
+  forEachSync(callback, types = ["icon", "variation", "alias"]) {
+    const names = this.list(types);
+    for (let i = 0; i < names.length; i++) {
+      const name = names[i];
+      const item = this.entries[name];
+      if (item) {
+        const result = callback(name, item.type);
+        if (result === false) {
+          return;
+        }
+      }
+    }
+  }
   /**
    * Get parent icons tree
    *

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

@@ -1,6 +1,6 @@
 import { IconifyInfo, IconifyJSON } from '@iconify/types';
 import { IconifyIconCustomisations } from '@iconify/utils/lib/customisations/defaults';
-import { IconSetIconEntry, IconCategory, IconSetIconType, IconSetAsyncForEachCallback, ResolvedIconifyIcon, CommonIconProps, CheckThemeResult } from './types.js';
+import { IconSetIconEntry, IconCategory, IconSetIconType, IconSetAsyncForEachCallback, IconSetSyncForEachCallback, ResolvedIconifyIcon, CommonIconProps, CheckThemeResult } from './types.js';
 import { SVG } from '../svg/index.js';
 import { ParentIconsTree } from '@iconify/utils/lib/icon-set/tree';
 
@@ -48,6 +48,12 @@ declare class IconSet {
      * Callback should return false to stop loop.
      */
     forEach(callback: IconSetAsyncForEachCallback, types?: IconSetIconType[]): Promise<void>;
+    /**
+     * Synchronous version of forEach function to loop through all entries.
+     *
+     * Callback should return false to stop loop.
+     */
+    forEachSync(callback: IconSetSyncForEachCallback, types?: IconSetIconType[]): void;
     /**
      * Get parent icons tree
      *

package/lib/icon-set/index.mjs

@@ -170,6 +170,24 @@ class IconSet {
       }
     }
   }
+  /**
+   * Synchronous version of forEach function to loop through all entries.
+   *
+   * Callback should return false to stop loop.
+   */
+  forEachSync(callback, types = ["icon", "variation", "alias"]) {
+    const names = this.list(types);
+    for (let i = 0; i < names.length; i++) {
+      const name = names[i];
+      const item = this.entries[name];
+      if (item) {
+        const result = callback(name, item.type);
+        if (result === false) {
+          return;
+        }
+      }
+    }
+  }
   /**
    * Get parent icons tree
    *

package/lib/icon-set/tags.cjs

@@ -28,7 +28,7 @@ const sizeTags = {
   gridPrefix: "Grid: ",
   heightPrefix: "Height: "
 };
-async function addTagsToIconSet(iconSet, customTags) {
+function addTagsToIconSet(iconSet, customTags) {
   const info = iconSet.info;
   const tags = [];
   const iconNames = Object.keys(iconSet.entries).filter((key) => {
@@ -44,7 +44,7 @@ async function addTagsToIconSet(iconSet, customTags) {
   if (iconNames.length) {
     let hasPalette = info?.palette;
     if (hasPalette === void 0) {
-      hasPalette = await colors_detect.detectIconSetPalette(iconSet);
+      hasPalette = colors_detect.detectIconSetPalette(iconSet);
     }
     if (hasPalette === true) {
       tags.push(paletteTags.palette);

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

@@ -17,6 +17,6 @@ declare const sizeTags: {
 /**
  * Add tags to icon set
  */
-declare function addTagsToIconSet(iconSet: IconSet, customTags?: string[]): Promise<string[]>;
+declare function addTagsToIconSet(iconSet: IconSet, customTags?: string[]): string[];
 
 export { addTagsToIconSet, paletteTags, sizeTags };

package/lib/icon-set/tags.mjs

@@ -26,7 +26,7 @@ const sizeTags = {
   gridPrefix: "Grid: ",
   heightPrefix: "Height: "
 };
-async function addTagsToIconSet(iconSet, customTags) {
+function addTagsToIconSet(iconSet, customTags) {
   const info = iconSet.info;
   const tags = [];
   const iconNames = Object.keys(iconSet.entries).filter((key) => {
@@ -42,7 +42,7 @@ async function addTagsToIconSet(iconSet, customTags) {
   if (iconNames.length) {
     let hasPalette = info?.palette;
     if (hasPalette === void 0) {
-      hasPalette = await detectIconSetPalette(iconSet);
+      hasPalette = detectIconSetPalette(iconSet);
     }
     if (hasPalette === true) {
       tags.push(paletteTags.palette);

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

@@ -64,11 +64,12 @@ interface CheckThemeResult {
     invalid: string[];
 }
 /**
- * Callback for asyncForEach function
+ * Callback for forEach functions
  *
  * Return false to stop loop
  */
-type IconSetAsyncForEachCallbackResult = void | false;
-type IconSetAsyncForEachCallback = (name: string, type: IconSetIconEntry['type']) => Promise<IconSetAsyncForEachCallbackResult> | IconSetAsyncForEachCallbackResult;
+type IconSetForEachCallbackResult = void | false;
+type IconSetAsyncForEachCallback = (name: string, type: IconSetIconEntry['type']) => Promise<IconSetForEachCallbackResult> | IconSetForEachCallbackResult;
+type IconSetSyncForEachCallback = (name: string, type: IconSetIconEntry['type']) => IconSetForEachCallbackResult;
 
-export { CheckThemeResult, CommonIconProps, ExtraIconProps, IconCategory, IconParentData, IconSetAsyncForEachCallback, IconSetIcon, IconSetIconAlias, IconSetIconEntry, IconSetIconType, IconSetIconVariation, IconWithCategories, IconWithChars, IconWithPropsData, ResolvedIconifyIcon };
+export { CheckThemeResult, CommonIconProps, ExtraIconProps, IconCategory, IconParentData, IconSetAsyncForEachCallback, IconSetIcon, IconSetIconAlias, IconSetIconEntry, IconSetIconType, IconSetIconVariation, IconSetSyncForEachCallback, IconWithCategories, IconWithChars, IconWithPropsData, ResolvedIconifyIcon };

package/lib/import/directory.cjs

@@ -35,45 +35,118 @@ require('../optimise/svgo.cjs');
 require('svgo');
 require('@iconify/utils/lib/svg/id');
 
-async function importDirectory(path, options = {}) {
-  const files = await misc_scan.scanDirectory(path, (ext, file, subdir, path2) => {
-    if (ext.toLowerCase() === ".svg") {
+function importDir(iconSet, options, getKeyword, files, readFile, done) {
+  let i = 0;
+  const next = () => {
+    if (i >= files.length) {
+      return done(iconSet);
+    }
+    const file = files[i];
+    i++;
+    const defaultKeyword = misc_keyword.cleanupIconKeyword(file.file);
+    getKeyword([file, defaultKeyword, iconSet], (keyword) => {
+      if (typeof keyword !== "string" || !keyword.length) {
+        return next();
+      }
+      readFile(
+        file.path + file.subdir + file.file + file.ext,
+        (content) => {
+          try {
+            const svg = new svg_index.SVG(content);
+            svg_cleanup.cleanupSVG(svg);
+            iconSet.fromSVG(keyword, svg);
+          } catch (err) {
+            if (options.ignoreImportErrors !== false) {
+              throw err;
+            }
+          }
+          next();
+        }
+      );
+    });
+  };
+  next();
+}
+function isValidFile(item) {
+  return item.ext.toLowerCase() === ".svg";
+}
+function importDirectory(path, options = {}) {
+  return new Promise((fulfill, reject) => {
+    misc_scan.scanDirectory(path, (ext, file, subdir, path2) => {
       const result = {
         file,
         ext,
         subdir,
         path: path2
       };
-      return result;
-    }
-    return false;
+      return isValidFile(result) ? result : false;
+    }).then((files) => {
+      const iconSet = iconSet_index.blankIconSet(options.prefix || "");
+      try {
+        importDir(
+          iconSet,
+          options,
+          (params, done) => {
+            if (options.keyword) {
+              const result = options.keyword(...params);
+              if (result instanceof Promise) {
+                result.then(done).catch(reject);
+              } else {
+                done(result);
+              }
+            } else {
+              done(params[1]);
+            }
+          },
+          files,
+          (filename, done) => {
+            fs.promises.readFile(filename, "utf8").then(done).catch(reject);
+          },
+          fulfill
+        );
+      } catch (err) {
+        reject(err);
+      }
+    }).catch(reject);
+  });
+}
+function importDirectorySync(path, options = {}) {
+  const files = misc_scan.scanDirectorySync(path, (ext, file, subdir, path2) => {
+    const result = {
+      file,
+      ext,
+      subdir,
+      path: path2
+    };
+    return isValidFile(result) ? result : false;
   });
   const iconSet = iconSet_index.blankIconSet(options.prefix || "");
-  for (let i = 0; i < files.length; i++) {
-    const file = files[i];
-    const defaultKeyword = misc_keyword.cleanupIconKeyword(file.file);
-    let keyword = options.keyword ? options.keyword(file, defaultKeyword, iconSet) : defaultKeyword;
-    if (keyword instanceof Promise) {
-      keyword = await keyword;
-    }
-    if (typeof keyword !== "string" || !keyword.length) {
-      continue;
-    }
-    try {
-      const content = await fs.promises.readFile(
-        file.path + file.subdir + file.file + file.ext,
-        "utf8"
-      );
-      const svg = new svg_index.SVG(content);
-      await svg_cleanup.cleanupSVG(svg);
-      iconSet.fromSVG(keyword, svg);
-    } catch (err) {
-      if (options.ignoreImportErrors !== false) {
-        throw err;
+  let isSync = true;
+  importDir(
+    iconSet,
+    options,
+    (params, done) => {
+      if (options.keyword) {
+        done(options.keyword(...params));
+      } else {
+        done(params[1]);
+      }
+    },
+    files,
+    (filename, done) => {
+      done(fs.readFileSync(filename, "utf8"));
+    },
+    () => {
+      if (!isSync) {
+        throw new Error(
+          "importDirectorySync supposed to be synchronous"
+        );
       }
     }
-  }
+  );
+  isSync = false;
   return iconSet;
 }
 
 exports.importDirectory = importDirectory;
+exports.importDirectorySync = importDirectorySync;

package/lib/import/directory.d.ts

@@ -24,19 +24,26 @@ interface ImportDirectoryFileEntry {
  * Callback can be asynchronous
  */
 type ImportDirectoryKeywordCallbackResult = string | undefined;
-type ImportDirectoryKeywordCallback = (file: ImportDirectoryFileEntry, defaultKeyword: string, iconSet: IconSet) => ImportDirectoryKeywordCallbackResult | Promise<ImportDirectoryKeywordCallbackResult>;
+type Callback<T> = (file: ImportDirectoryFileEntry, defaultKeyword: string, iconSet: IconSet) => T;
+type AsyncCallback<T> = Callback<T | Promise<T>>;
+type ImportDirectoryKeywordCallback = AsyncCallback<ImportDirectoryKeywordCallbackResult>;
+type ImportDirectoryKeywordSyncCallback = Callback<ImportDirectoryKeywordCallbackResult>;
 /**
  * Options
  */
-interface ImportDirectoryOptions {
+interface ImportDirectoryOptions<K> {
     prefix?: string;
     includeSubDirs?: boolean;
-    keyword?: ImportDirectoryKeywordCallback;
+    keyword?: K;
     ignoreImportErrors?: boolean;
 }
 /**
  * Import all icons from directory
  */
-declare function importDirectory(path: string, options?: ImportDirectoryOptions): Promise<IconSet>;
+declare function importDirectory(path: string, options?: ImportDirectoryOptions<ImportDirectoryKeywordCallback>): Promise<IconSet>;
+/**
+ * Import all icons from directory synchronously
+ */
+declare function importDirectorySync(path: string, options?: ImportDirectoryOptions<ImportDirectoryKeywordSyncCallback>): IconSet;
 
-export { ImportDirectoryFileEntry, ImportDirectoryKeywordCallback, importDirectory };
+export { ImportDirectoryFileEntry, ImportDirectoryKeywordCallback, ImportDirectoryKeywordSyncCallback, importDirectory, importDirectorySync };