@iconify/tools 4.0.0-dev.1 → 4.0.0

package/lib/index.cjs

@@ -39,8 +39,8 @@ const optimise_mask = require('./optimise/mask.cjs');
 const optimise_scale = require('./optimise/scale.cjs');
 const optimise_globalStyle = require('./optimise/global-style.cjs');
 const export_directory = require('./export/directory.cjs');
-const export_iconPackage = require('./export/icon-package.cjs');
 const export_jsonPackage = require('./export/json-package.cjs');
+const export_iconPackage = require('./export/icon-package.cjs');
 const misc_writeJson = require('./misc/write-json.cjs');
 const export_helpers_prepare = require('./export/helpers/prepare.cjs');
 const misc_scan = require('./misc/scan.cjs');
@@ -50,7 +50,9 @@ const download_helpers_untar = require('./download/helpers/untar.cjs');
 const misc_exec = require('./misc/exec.cjs');
 const misc_keyword = require('./misc/keyword.cjs');
 const misc_bumpVersion = require('./misc/bump-version.cjs');
+const download_api_config = require('./download/api/config.cjs');
 const download_api_index = require('./download/api/index.cjs');
+const download_api_queue = require('./download/api/queue.cjs');
 require('cheerio');
 require('@iconify/utils');
 require('./css/parse.cjs');
@@ -63,8 +65,6 @@ require('./css/parser/tree.cjs');
 require('./svg/data/attributes.cjs');
 require('./svg/data/tags.cjs');
 require('./svg/analyse/error.cjs');
-require('svgo');
-require('@iconify/utils/lib/svg/id');
 require('@iconify/utils/lib/icon/defaults');
 require('@iconify/utils/lib/svg/build');
 require('@iconify/utils/lib/icon-set/minify');
@@ -73,30 +73,29 @@ require('./icon-set/props.cjs');
 require('@iconify/utils/lib/misc/objects');
 require('./icon-set/match.cjs');
 require('./icon-set/modified.cjs');
-require('@iconify/utils/lib/colors');
-require('./colors/attribs.cjs');
 require('./import/figma/nodes.cjs');
 require('./import/figma/query.cjs');
 require('./download/api/cache.cjs');
 require('fs');
 require('crypto');
+require('svgo');
+require('@iconify/utils/lib/svg/id');
+require('@iconify/utils/lib/colors');
+require('axios');
 require('pathe');
-require('child_process');
-require('util');
-require('stream');
 require('fs/promises');
 require('extract-zip');
 require('tar');
 require('./download/gitlab/types.cjs');
+require('./colors/attribs.cjs');
 require('./export/helpers/custom-files.cjs');
+require('child_process');
 
 
 
 exports.SVG = svg_index.SVG;
 exports.parseSVG = svg_parse.parseSVG;
-exports.parseSVGSync = svg_parse.parseSVGSync;
 exports.parseSVGStyle = svg_parseStyle.parseSVGStyle;
-exports.parseSVGStyleSync = svg_parseStyle.parseSVGStyleSync;
 exports.analyseSVGStructure = svg_analyse.analyseSVGStructure;
 exports.cleanupSVG = svg_cleanup.cleanupSVG;
 exports.removeBadAttributes = svg_cleanup_attribs.removeBadAttributes;
@@ -127,9 +126,7 @@ exports.downloadPackage = download_index.downloadPackage;
 exports.downloadFile = download_api_download.downloadFile;
 exports.isEmptyColor = colors_parse.isEmptyColor;
 exports.parseColors = colors_parse.parseColors;
-exports.parseColorsSync = colors_parse.parseColorsSync;
 exports.validateColors = colors_validate.validateColors;
-exports.validateColorsSync = colors_validate.validateColorsSync;
 exports.detectIconSetPalette = colors_detect.detectIconSetPalette;
 exports.runSVGO = optimise_svgo.runSVGO;
 exports.removeFigmaClipPathFromSVG = optimise_figma.removeFigmaClipPathFromSVG;
@@ -139,8 +136,8 @@ exports.convertSVGToMask = optimise_mask.convertSVGToMask;
 exports.scaleSVG = optimise_scale.scaleSVG;
 exports.cleanupGlobalStyle = optimise_globalStyle.cleanupGlobalStyle;
 exports.exportToDirectory = export_directory.exportToDirectory;
-exports.exportIconPackage = export_iconPackage.exportIconPackage;
 exports.exportJSONPackage = export_jsonPackage.exportJSONPackage;
+exports.exportIconPackage = export_iconPackage.exportIconPackage;
 exports.writeJSONFile = misc_writeJson.writeJSONFile;
 exports.prepareDirectoryForExport = export_helpers_prepare.prepareDirectoryForExport;
 exports.scanDirectory = misc_scan.scanDirectory;
@@ -151,4 +148,8 @@ exports.untar = download_helpers_untar.untar;
 exports.execAsync = misc_exec.execAsync;
 exports.cleanupIconKeyword = misc_keyword.cleanupIconKeyword;
 exports.bumpVersion = misc_bumpVersion.bumpVersion;
+exports.axiosConfig = download_api_config.axiosConfig;
+exports.fetchCallbacks = download_api_config.fetchCallbacks;
 exports.sendAPIQuery = download_api_index.sendAPIQuery;
+exports.defaultQueueParams = download_api_queue.defaultQueueParams;
+exports.runConcurrentQueries = download_api_queue.runConcurrentQueries;

package/lib/index.d.cts

@@ -0,0 +1,78 @@
+export { SVG } from './svg/index.cjs';
+export { parseSVG } from './svg/parse.cjs';
+export { parseSVGStyle } from './svg/parse-style.cjs';
+export { analyseSVGStructure } from './svg/analyse.cjs';
+export { cleanupSVG } from './svg/cleanup.cjs';
+export { removeBadAttributes } from './svg/cleanup/attribs.cjs';
+export { checkBadTags } from './svg/cleanup/bad-tags.cjs';
+export { cleanupRootStyle } from './svg/cleanup/root-style.cjs';
+export { cleanupInlineStyle } from './svg/cleanup/inline-style.cjs';
+export { cleanupSVGRoot } from './svg/cleanup/root-svg.cjs';
+export { convertStyleToAttrs } from './svg/cleanup/svgo-style.cjs';
+export { IconSet, blankIconSet } from './icon-set/index.cjs';
+export { mergeIconSets } from './icon-set/merge.cjs';
+export { addTagsToIconSet } from './icon-set/tags.cjs';
+export { importFromFigma } from './import/figma/index.cjs';
+export { importDirectory, importDirectorySync } from './import/directory.cjs';
+export { downloadGitRepo } from './download/git/index.cjs';
+export { getGitRepoHash } from './download/git/hash.cjs';
+export { getGitRepoBranch } from './download/git/branch.cjs';
+export { resetGitRepoContents } from './download/git/reset.cjs';
+export { downloadGitHubRepo } from './download/github/index.cjs';
+export { getGitHubRepoHash } from './download/github/hash.cjs';
+export { downloadGitLabRepo } from './download/gitlab/index.cjs';
+export { getGitLabRepoHash } from './download/gitlab/hash.cjs';
+export { downloadNPMPackage } from './download/npm/index.cjs';
+export { getNPMVersion, getPackageVersion } from './download/npm/version.cjs';
+export { downloadPackage } from './download/index.cjs';
+export { downloadFile } from './download/api/download.cjs';
+export { isEmptyColor, parseColors } from './colors/parse.cjs';
+export { validateColors } from './colors/validate.cjs';
+export { detectIconSetPalette } from './colors/detect.cjs';
+export { runSVGO } from './optimise/svgo.cjs';
+export { removeFigmaClipPathFromSVG } from './optimise/figma.cjs';
+export { deOptimisePaths } from './optimise/flags.cjs';
+export { resetSVGOrigin } from './optimise/origin.cjs';
+export { convertSVGToMask } from './optimise/mask.cjs';
+export { scaleSVG } from './optimise/scale.cjs';
+export { cleanupGlobalStyle } from './optimise/global-style.cjs';
+export { exportToDirectory } from './export/directory.cjs';
+export { exportJSONPackage } from './export/json-package.cjs';
+export { exportIconPackage } from './export/icon-package.cjs';
+export { writeJSONFile } from './misc/write-json.cjs';
+export { prepareDirectoryForExport } from './export/helpers/prepare.cjs';
+export { scanDirectory, scanDirectorySync } from './misc/scan.cjs';
+export { compareDirectories } from './misc/compare-dirs.cjs';
+export { unzip } from './download/helpers/unzip.cjs';
+export { untar } from './download/helpers/untar.cjs';
+export { execAsync } from './misc/exec.cjs';
+export { cleanupIconKeyword } from './misc/keyword.cjs';
+export { bumpVersion } from './misc/bump-version.cjs';
+export { axiosConfig, fetchCallbacks } from './download/api/config.cjs';
+export { sendAPIQuery } from './download/api/index.cjs';
+export { defaultQueueParams, runConcurrentQueries } from './download/api/queue.cjs';
+import 'cheerio';
+import '@iconify/types';
+import '@iconify/utils/lib/customisations/defaults';
+import './misc/cheerio.cjs';
+import './css/parser/types.cjs';
+import './svg/analyse/types.cjs';
+import './icon-set/types.cjs';
+import '@iconify/utils/lib/icon-set/tree';
+import './download/types/modified.cjs';
+import './import/figma/types/options.cjs';
+import './import/figma/types/nodes.cjs';
+import './import/figma/types/api.cjs';
+import './import/figma/types/result.cjs';
+import './download/types/sources.cjs';
+import './download/github/types.cjs';
+import './download/gitlab/types.cjs';
+import './download/npm/types.cjs';
+import './download/api/types.cjs';
+import '@iconify/utils/lib/colors/types';
+import './colors/attribs.cjs';
+import 'svgo';
+import './export/helpers/custom-files.cjs';
+import 'fs';
+import 'child_process';
+import 'axios';

package/lib/index.d.mts

@@ -0,0 +1,78 @@
+export { SVG } from './svg/index.mjs';
+export { parseSVG } from './svg/parse.mjs';
+export { parseSVGStyle } from './svg/parse-style.mjs';
+export { analyseSVGStructure } from './svg/analyse.mjs';
+export { cleanupSVG } from './svg/cleanup.mjs';
+export { removeBadAttributes } from './svg/cleanup/attribs.mjs';
+export { checkBadTags } from './svg/cleanup/bad-tags.mjs';
+export { cleanupRootStyle } from './svg/cleanup/root-style.mjs';
+export { cleanupInlineStyle } from './svg/cleanup/inline-style.mjs';
+export { cleanupSVGRoot } from './svg/cleanup/root-svg.mjs';
+export { convertStyleToAttrs } from './svg/cleanup/svgo-style.mjs';
+export { IconSet, blankIconSet } from './icon-set/index.mjs';
+export { mergeIconSets } from './icon-set/merge.mjs';
+export { addTagsToIconSet } from './icon-set/tags.mjs';
+export { importFromFigma } from './import/figma/index.mjs';
+export { importDirectory, importDirectorySync } from './import/directory.mjs';
+export { downloadGitRepo } from './download/git/index.mjs';
+export { getGitRepoHash } from './download/git/hash.mjs';
+export { getGitRepoBranch } from './download/git/branch.mjs';
+export { resetGitRepoContents } from './download/git/reset.mjs';
+export { downloadGitHubRepo } from './download/github/index.mjs';
+export { getGitHubRepoHash } from './download/github/hash.mjs';
+export { downloadGitLabRepo } from './download/gitlab/index.mjs';
+export { getGitLabRepoHash } from './download/gitlab/hash.mjs';
+export { downloadNPMPackage } from './download/npm/index.mjs';
+export { getNPMVersion, getPackageVersion } from './download/npm/version.mjs';
+export { downloadPackage } from './download/index.mjs';
+export { downloadFile } from './download/api/download.mjs';
+export { isEmptyColor, parseColors } from './colors/parse.mjs';
+export { validateColors } from './colors/validate.mjs';
+export { detectIconSetPalette } from './colors/detect.mjs';
+export { runSVGO } from './optimise/svgo.mjs';
+export { removeFigmaClipPathFromSVG } from './optimise/figma.mjs';
+export { deOptimisePaths } from './optimise/flags.mjs';
+export { resetSVGOrigin } from './optimise/origin.mjs';
+export { convertSVGToMask } from './optimise/mask.mjs';
+export { scaleSVG } from './optimise/scale.mjs';
+export { cleanupGlobalStyle } from './optimise/global-style.mjs';
+export { exportToDirectory } from './export/directory.mjs';
+export { exportJSONPackage } from './export/json-package.mjs';
+export { exportIconPackage } from './export/icon-package.mjs';
+export { writeJSONFile } from './misc/write-json.mjs';
+export { prepareDirectoryForExport } from './export/helpers/prepare.mjs';
+export { scanDirectory, scanDirectorySync } from './misc/scan.mjs';
+export { compareDirectories } from './misc/compare-dirs.mjs';
+export { unzip } from './download/helpers/unzip.mjs';
+export { untar } from './download/helpers/untar.mjs';
+export { execAsync } from './misc/exec.mjs';
+export { cleanupIconKeyword } from './misc/keyword.mjs';
+export { bumpVersion } from './misc/bump-version.mjs';
+export { axiosConfig, fetchCallbacks } from './download/api/config.mjs';
+export { sendAPIQuery } from './download/api/index.mjs';
+export { defaultQueueParams, runConcurrentQueries } from './download/api/queue.mjs';
+import 'cheerio';
+import '@iconify/types';
+import '@iconify/utils/lib/customisations/defaults';
+import './misc/cheerio.mjs';
+import './css/parser/types.mjs';
+import './svg/analyse/types.mjs';
+import './icon-set/types.mjs';
+import '@iconify/utils/lib/icon-set/tree';
+import './download/types/modified.mjs';
+import './import/figma/types/options.mjs';
+import './import/figma/types/nodes.mjs';
+import './import/figma/types/api.mjs';
+import './import/figma/types/result.mjs';
+import './download/types/sources.mjs';
+import './download/github/types.mjs';
+import './download/gitlab/types.mjs';
+import './download/npm/types.mjs';
+import './download/api/types.mjs';
+import '@iconify/utils/lib/colors/types';
+import './colors/attribs.mjs';
+import 'svgo';
+import './export/helpers/custom-files.mjs';
+import 'fs';
+import 'child_process';
+import 'axios';

package/lib/index.d.ts

@@ -1,6 +1,6 @@
 export { SVG } from './svg/index.js';
-export { parseSVG, parseSVGSync } from './svg/parse.js';
-export { parseSVGStyle, parseSVGStyleSync } from './svg/parse-style.js';
+export { parseSVG } from './svg/parse.js';
+export { parseSVGStyle } from './svg/parse-style.js';
 export { analyseSVGStructure } from './svg/analyse.js';
 export { cleanupSVG } from './svg/cleanup.js';
 export { removeBadAttributes } from './svg/cleanup/attribs.js';
@@ -26,8 +26,8 @@ export { downloadNPMPackage } from './download/npm/index.js';
 export { getNPMVersion, getPackageVersion } from './download/npm/version.js';
 export { downloadPackage } from './download/index.js';
 export { downloadFile } from './download/api/download.js';
-export { isEmptyColor, parseColors, parseColorsSync } from './colors/parse.js';
-export { validateColors, validateColorsSync } from './colors/validate.js';
+export { isEmptyColor, parseColors } from './colors/parse.js';
+export { validateColors } from './colors/validate.js';
 export { detectIconSetPalette } from './colors/detect.js';
 export { runSVGO } from './optimise/svgo.js';
 export { removeFigmaClipPathFromSVG } from './optimise/figma.js';
@@ -37,8 +37,8 @@ export { convertSVGToMask } from './optimise/mask.js';
 export { scaleSVG } from './optimise/scale.js';
 export { cleanupGlobalStyle } from './optimise/global-style.js';
 export { exportToDirectory } from './export/directory.js';
-export { exportIconPackage } from './export/icon-package.js';
 export { exportJSONPackage } from './export/json-package.js';
+export { exportIconPackage } from './export/icon-package.js';
 export { writeJSONFile } from './misc/write-json.js';
 export { prepareDirectoryForExport } from './export/helpers/prepare.js';
 export { scanDirectory, scanDirectorySync } from './misc/scan.js';
@@ -48,7 +48,9 @@ export { untar } from './download/helpers/untar.js';
 export { execAsync } from './misc/exec.js';
 export { cleanupIconKeyword } from './misc/keyword.js';
 export { bumpVersion } from './misc/bump-version.js';
+export { axiosConfig, fetchCallbacks } from './download/api/config.js';
 export { sendAPIQuery } from './download/api/index.js';
+export { defaultQueueParams, runConcurrentQueries } from './download/api/queue.js';
 import 'cheerio';
 import '@iconify/types';
 import '@iconify/utils/lib/customisations/defaults';
@@ -73,3 +75,4 @@ import 'svgo';
 import './export/helpers/custom-files.js';
 import 'fs';
 import 'child_process';
+import 'axios';

package/lib/index.mjs

@@ -1,6 +1,6 @@
 export { SVG } from './svg/index.mjs';
-export { parseSVG, parseSVGSync } from './svg/parse.mjs';
-export { parseSVGStyle, parseSVGStyleSync } from './svg/parse-style.mjs';
+export { parseSVG } from './svg/parse.mjs';
+export { parseSVGStyle } from './svg/parse-style.mjs';
 export { analyseSVGStructure } from './svg/analyse.mjs';
 export { cleanupSVG } from './svg/cleanup.mjs';
 export { removeBadAttributes } from './svg/cleanup/attribs.mjs';
@@ -26,8 +26,8 @@ export { downloadNPMPackage } from './download/npm/index.mjs';
 export { getNPMVersion, getPackageVersion } from './download/npm/version.mjs';
 export { downloadPackage } from './download/index.mjs';
 export { downloadFile } from './download/api/download.mjs';
-export { isEmptyColor, parseColors, parseColorsSync } from './colors/parse.mjs';
-export { validateColors, validateColorsSync } from './colors/validate.mjs';
+export { isEmptyColor, parseColors } from './colors/parse.mjs';
+export { validateColors } from './colors/validate.mjs';
 export { detectIconSetPalette } from './colors/detect.mjs';
 export { runSVGO } from './optimise/svgo.mjs';
 export { removeFigmaClipPathFromSVG } from './optimise/figma.mjs';
@@ -37,8 +37,8 @@ export { convertSVGToMask } from './optimise/mask.mjs';
 export { scaleSVG } from './optimise/scale.mjs';
 export { cleanupGlobalStyle } from './optimise/global-style.mjs';
 export { exportToDirectory } from './export/directory.mjs';
-export { exportIconPackage } from './export/icon-package.mjs';
 export { exportJSONPackage } from './export/json-package.mjs';
+export { exportIconPackage } from './export/icon-package.mjs';
 export { writeJSONFile } from './misc/write-json.mjs';
 export { prepareDirectoryForExport } from './export/helpers/prepare.mjs';
 export { scanDirectory, scanDirectorySync } from './misc/scan.mjs';
@@ -48,7 +48,9 @@ export { untar } from './download/helpers/untar.mjs';
 export { execAsync } from './misc/exec.mjs';
 export { cleanupIconKeyword } from './misc/keyword.mjs';
 export { bumpVersion } from './misc/bump-version.mjs';
+export { axiosConfig, fetchCallbacks } from './download/api/config.mjs';
 export { sendAPIQuery } from './download/api/index.mjs';
+export { defaultQueueParams, runConcurrentQueries } from './download/api/queue.mjs';
 import 'cheerio';
 import '@iconify/utils';
 import './css/parse.mjs';
@@ -61,8 +63,6 @@ import './css/parser/tree.mjs';
 import './svg/data/attributes.mjs';
 import './svg/data/tags.mjs';
 import './svg/analyse/error.mjs';
-import 'svgo';
-import '@iconify/utils/lib/svg/id';
 import '@iconify/utils/lib/icon/defaults';
 import '@iconify/utils/lib/svg/build';
 import '@iconify/utils/lib/icon-set/minify';
@@ -71,19 +71,20 @@ import './icon-set/props.mjs';
 import '@iconify/utils/lib/misc/objects';
 import './icon-set/match.mjs';
 import './icon-set/modified.mjs';
-import '@iconify/utils/lib/colors';
-import './colors/attribs.mjs';
 import './import/figma/nodes.mjs';
 import './import/figma/query.mjs';
 import './download/api/cache.mjs';
 import 'fs';
 import 'crypto';
+import 'svgo';
+import '@iconify/utils/lib/svg/id';
+import '@iconify/utils/lib/colors';
+import 'axios';
 import 'pathe';
-import 'child_process';
-import 'util';
-import 'stream';
 import 'fs/promises';
 import 'extract-zip';
 import 'tar';
 import './download/gitlab/types.mjs';
+import './colors/attribs.mjs';
 import './export/helpers/custom-files.mjs';
+import 'child_process';

package/lib/misc/bump-version.d.cts

@@ -0,0 +1,6 @@
+/**
+ * Bump version number
+ */
+declare function bumpVersion(version: string): string;
+
+export { bumpVersion };

package/lib/misc/bump-version.d.mts

@@ -0,0 +1,6 @@
+/**
+ * Bump version number
+ */
+declare function bumpVersion(version: string): string;
+
+export { bumpVersion };

package/lib/misc/cheerio.d.cts

@@ -0,0 +1,9 @@
+import * as cheerio from 'cheerio';
+
+/**
+ * Shortcuts for Cheerio elements
+ */
+type CheerioElement = cheerio.Element;
+type WrappedCheerioElement = cheerio.Cheerio<cheerio.Element>;
+
+export type { CheerioElement, WrappedCheerioElement };

package/lib/misc/cheerio.d.mts

@@ -0,0 +1,9 @@
+import * as cheerio from 'cheerio';
+
+/**
+ * Shortcuts for Cheerio elements
+ */
+type CheerioElement = cheerio.Element;
+type WrappedCheerioElement = cheerio.Cheerio<cheerio.Element>;
+
+export type { CheerioElement, WrappedCheerioElement };

package/lib/misc/cheerio.d.ts

@@ -6,4 +6,4 @@ import * as cheerio from 'cheerio';
 type CheerioElement = cheerio.Element;
 type WrappedCheerioElement = cheerio.Cheerio<cheerio.Element>;
 
-export { CheerioElement, WrappedCheerioElement };
+export type { CheerioElement, WrappedCheerioElement };

package/lib/misc/compare-dirs.cjs

@@ -35,7 +35,7 @@ async function compareDirectories(dir1, dir2, options) {
   );
   for (let i = 0; i < files1.length; i++) {
     const file = files1[i];
-    if (files2.indexOf(file) === -1) {
+    if (!files2.includes(file)) {
       return false;
     }
     const ext = file.split(".").pop().toLowerCase();
@@ -54,8 +54,8 @@ async function compareDirectories(dir1, dir2, options) {
       continue;
     }
     if (ignoreNewLine) {
-      content1 = content1.replace(/\s+\n/g, "\n").trimRight();
-      content2 = content2.replace(/\s+\n/g, "\n").trimRight();
+      content1 = content1.replace(/\s+\n/g, "\n").trimEnd();
+      content2 = content2.replace(/\s+\n/g, "\n").trimEnd();
     }
     if (ignoreVersions && file.split("/").pop() === "package.json") {
       const data1 = JSON.parse(content1);

package/lib/misc/compare-dirs.d.cts

@@ -0,0 +1,11 @@
+interface CompareDirectoriesOptions {
+    ignoreNewLine?: boolean;
+    ignoreVersions?: boolean;
+    textExtensions?: string[];
+}
+/**
+ * Compare directories. Returns true if files are identical, false if different
+ */
+declare function compareDirectories(dir1: string, dir2: string, options?: CompareDirectoriesOptions): Promise<boolean>;
+
+export { type CompareDirectoriesOptions, compareDirectories };

package/lib/misc/compare-dirs.d.mts

@@ -0,0 +1,11 @@
+interface CompareDirectoriesOptions {
+    ignoreNewLine?: boolean;
+    ignoreVersions?: boolean;
+    textExtensions?: string[];
+}
+/**
+ * Compare directories. Returns true if files are identical, false if different
+ */
+declare function compareDirectories(dir1: string, dir2: string, options?: CompareDirectoriesOptions): Promise<boolean>;
+
+export { type CompareDirectoriesOptions, compareDirectories };

package/lib/misc/compare-dirs.d.ts

@@ -8,4 +8,4 @@ interface CompareDirectoriesOptions {
  */
 declare function compareDirectories(dir1: string, dir2: string, options?: CompareDirectoriesOptions): Promise<boolean>;
 
-export { CompareDirectoriesOptions, compareDirectories };
+export { type CompareDirectoriesOptions, compareDirectories };

package/lib/misc/compare-dirs.mjs

@@ -33,7 +33,7 @@ async function compareDirectories(dir1, dir2, options) {
   );
   for (let i = 0; i < files1.length; i++) {
     const file = files1[i];
-    if (files2.indexOf(file) === -1) {
+    if (!files2.includes(file)) {
       return false;
     }
     const ext = file.split(".").pop().toLowerCase();
@@ -52,8 +52,8 @@ async function compareDirectories(dir1, dir2, options) {
       continue;
     }
     if (ignoreNewLine) {
-      content1 = content1.replace(/\s+\n/g, "\n").trimRight();
-      content2 = content2.replace(/\s+\n/g, "\n").trimRight();
+      content1 = content1.replace(/\s+\n/g, "\n").trimEnd();
+      content2 = content2.replace(/\s+\n/g, "\n").trimEnd();
     }
     if (ignoreVersions && file.split("/").pop() === "package.json") {
       const data1 = JSON.parse(content1);

package/lib/misc/exec.d.cts

@@ -0,0 +1,12 @@
+import { ExecOptions } from 'child_process';
+
+interface ExecResult {
+    stdout: string;
+    stderr: string;
+}
+/**
+ * Exec as Promise
+ */
+declare function execAsync(cmd: string, options?: ExecOptions): Promise<ExecResult>;
+
+export { type ExecResult, execAsync };

package/lib/misc/exec.d.mts

@@ -0,0 +1,12 @@
+import { ExecOptions } from 'child_process';
+
+interface ExecResult {
+    stdout: string;
+    stderr: string;
+}
+/**
+ * Exec as Promise
+ */
+declare function execAsync(cmd: string, options?: ExecOptions): Promise<ExecResult>;
+
+export { type ExecResult, execAsync };

package/lib/misc/exec.d.ts

@@ -9,4 +9,4 @@ interface ExecResult {
  */
 declare function execAsync(cmd: string, options?: ExecOptions): Promise<ExecResult>;
 
-export { ExecResult, execAsync };
+export { type ExecResult, execAsync };

package/lib/misc/keyword.d.cts

@@ -0,0 +1,6 @@
+/**
+ * Clean up keyword
+ */
+declare function cleanupIconKeyword(keyword: string, convertCamelCase?: boolean): string;
+
+export { cleanupIconKeyword };

package/lib/misc/keyword.d.mts

@@ -0,0 +1,6 @@
+/**
+ * Clean up keyword
+ */
+declare function cleanupIconKeyword(keyword: string, convertCamelCase?: boolean): string;
+
+export { cleanupIconKeyword };

package/lib/misc/scan.d.cts

@@ -0,0 +1,33 @@
+import { Stats } from 'fs';
+
+/**
+ * Callback
+ *
+ * Extension starts with '.' (can be empty)
+ * File does not include extension
+ * Subdir ends with '/' (can be empty)
+ *
+ * Should return:
+ * - false, null or undefined to skip file
+ * - true to include file (subdir + file + extension)
+ * - string to include custom string (such as file without extension)
+ * - custom object to return custom object
+ */
+type ScanDirectoryCallbackFalseResult = boolean | null | undefined;
+type ScanDirectoryCallbackStringResult = ScanDirectoryCallbackFalseResult | string;
+type Callback<T> = (ext: string, file: string, subdir: string, path: string, stat: Stats) => T;
+type AsyncCallback<T> = Callback<T | Promise<T>>;
+type ScanDirectoryCallback = AsyncCallback<ScanDirectoryCallbackStringResult | unknown>;
+type ScanDirectorySyncCallback = Callback<ScanDirectoryCallbackStringResult | unknown>;
+/**
+ * Find all files in directory
+ */
+declare function scanDirectory(path: string, callback?: AsyncCallback<ScanDirectoryCallbackStringResult>, subdirs?: boolean): Promise<string[]>;
+declare function scanDirectory<T>(path: string, callback: AsyncCallback<T | ScanDirectoryCallbackFalseResult>, subdirs?: boolean): Promise<T[]>;
+/**
+ * Find all files in directory, synchronously
+ */
+declare function scanDirectorySync(path: string, callback?: Callback<ScanDirectoryCallbackStringResult>, subdirs?: boolean): string[];
+declare function scanDirectorySync<T>(path: string, callback: Callback<T | ScanDirectoryCallbackFalseResult>, subdirs?: boolean): T[];
+
+export { type ScanDirectoryCallback, type ScanDirectorySyncCallback, scanDirectory, scanDirectorySync };

package/lib/misc/scan.d.mts

@@ -0,0 +1,33 @@
+import { Stats } from 'fs';
+
+/**
+ * Callback
+ *
+ * Extension starts with '.' (can be empty)
+ * File does not include extension
+ * Subdir ends with '/' (can be empty)
+ *
+ * Should return:
+ * - false, null or undefined to skip file
+ * - true to include file (subdir + file + extension)
+ * - string to include custom string (such as file without extension)
+ * - custom object to return custom object
+ */
+type ScanDirectoryCallbackFalseResult = boolean | null | undefined;
+type ScanDirectoryCallbackStringResult = ScanDirectoryCallbackFalseResult | string;
+type Callback<T> = (ext: string, file: string, subdir: string, path: string, stat: Stats) => T;
+type AsyncCallback<T> = Callback<T | Promise<T>>;
+type ScanDirectoryCallback = AsyncCallback<ScanDirectoryCallbackStringResult | unknown>;
+type ScanDirectorySyncCallback = Callback<ScanDirectoryCallbackStringResult | unknown>;
+/**
+ * Find all files in directory
+ */
+declare function scanDirectory(path: string, callback?: AsyncCallback<ScanDirectoryCallbackStringResult>, subdirs?: boolean): Promise<string[]>;
+declare function scanDirectory<T>(path: string, callback: AsyncCallback<T | ScanDirectoryCallbackFalseResult>, subdirs?: boolean): Promise<T[]>;
+/**
+ * Find all files in directory, synchronously
+ */
+declare function scanDirectorySync(path: string, callback?: Callback<ScanDirectoryCallbackStringResult>, subdirs?: boolean): string[];
+declare function scanDirectorySync<T>(path: string, callback: Callback<T | ScanDirectoryCallbackFalseResult>, subdirs?: boolean): T[];
+
+export { type ScanDirectoryCallback, type ScanDirectorySyncCallback, scanDirectory, scanDirectorySync };

package/lib/misc/scan.d.ts

@@ -30,4 +30,4 @@ declare function scanDirectory<T>(path: string, callback: AsyncCallback<T | Scan
 declare function scanDirectorySync(path: string, callback?: Callback<ScanDirectoryCallbackStringResult>, subdirs?: boolean): string[];
 declare function scanDirectorySync<T>(path: string, callback: Callback<T | ScanDirectoryCallbackFalseResult>, subdirs?: boolean): T[];
 
-export { ScanDirectoryCallback, ScanDirectorySyncCallback, scanDirectory, scanDirectorySync };
+export { type ScanDirectoryCallback, type ScanDirectorySyncCallback, scanDirectory, scanDirectorySync };

package/lib/misc/write-json.d.cts

@@ -0,0 +1,6 @@
+/**
+ * Write JSON file
+ */
+declare function writeJSONFile(filename: string, data: unknown): Promise<void>;
+
+export { writeJSONFile };

package/lib/misc/write-json.d.mts

@@ -0,0 +1,6 @@
+/**
+ * Write JSON file
+ */
+declare function writeJSONFile(filename: string, data: unknown): Promise<void>;
+
+export { writeJSONFile };