@uxf/icons-generator 11.21.1 → 11.24.2

package/README.md

@@ -13,7 +13,7 @@ yarn add -D @uxf/icons-generator
 ```
 
 ### Configuration
-Create a `icons.config.ts` file in your project's root:
+Create a `icons.config.js` file in your project's root:
 ```ts
 module.exports = {
     icons: {
@@ -39,22 +39,20 @@ icons-gen --configFile=yourConfigFileName.js
 
 ## Configuration Details
 
-| Key                     | Type                                      | Default                                                               | Required | Description                      |
-|-------------------------|-------------------------------------------|-----------------------------------------------------------------------|----------|----------------------------------|
-| mode                    | `"simple" \| "sizes"`                     | `"simple"`                                                            | No       | -                                |
-| typescript              | `boolean`                                 | `true`                                                                | No       | -                                |
-| configDirectory         | `string`                                  | `"/src/config/"`                                                      | No       | -                                |
-| generatedDirectory      | `string`                                  | `"/public/icons-generated/"`                                          | No       | -                                |
-| spriteFileName          | `string`                                  | `_icon-sprite.svg`                                                    | No       | Specify custom sprite file name  |
-| typeName                | `string`                                  | `IconsSet`                                                            | No       | -                                |
-| customDefinitionContent | `string`                                  | -                                                                     | No       | -                                |
-| icons                   | `Record<string, SimpleIcon \| SizedIcon>` | -                                                                     | Yes      | More details [here](#icon-types) |
-| adapters                | -                                         | -                                                                     | No       | More details [here](#adapters)   |
-| fallbackFilesDirectory  | -                                         | -                                                                     | No       | More details [here](#adapters)   |
+| Key                     | Type                                          | Default                                                               | Required | Description                      |
+|-------------------------|-----------------------------------------------|-----------------------------------------------------------------------|----------|----------------------------------|
+| typescript              | `boolean`                                     | `true`                                                                | No       | -                                |
+| configDirectory         | `string`                                      | `"/src/config/"`                                                      | No       | -                                |
+| generatedDirectory      | `string`                                      | `"/public/icons-generated/"`                                          | No       | -                                |
+| spriteFileName          | `string`                                      | `_icon-sprite.svg`                                                    | No       | Specify custom sprite file name  |
+| typeName                | `string`                                      | `IconsSet`                                                            | No       | -                                |
+| customDefinitionContent | `string`                                      | -                                                                     | No       | -                                |
+| icons                   | `Record<string, SimpleIcon \| SizedIcon \| IconFromAdapterFunction>` | -                                                                     | Yes      | More details [here](#icon-types) |
+| fallbackFilesDirectory  | -                                             | -                                                                     | No       | More details [here](#adapters)   |
 
 ## Icon Types
 
-### SimpleIcon (mode "simple")
+### SimpleIcon
 ```ts
 type SimpleIcon = {
     data: string;
@@ -71,7 +69,7 @@ test: {
 }
 ```
 
-### SizedIcon (mode "sizes")
+### SizedIcon
 ```ts
 type SizedIcon = Record<number, string>;
 ```
@@ -83,38 +81,7 @@ test: {
 }
 ```
 
-## Adapters
-Extend icon generation with adapters for external sources.
-
-### Adapter Structure
-An adapter in this context is a function designed to retrieve specific icon information, such as size and SVG path, based on the icon's name.
-
-#### Example
-```ts
-export const getIconFromMyCustomAdapter = (iconName: string) => {
-    const icon = findIconDefinition({ iconName });
-    return { width: icon.width, height: icon.height, path: icon.data };
-};
-```
-
-Integration into your icons configuration is straightforward:
-```ts
-import { getIconFromMyCustomAdapter } from "./my-custom-adapter";
-
-adapters: {
-    myAdapter: {
-        icons: ["user"],
-        getIcon: getIconFromMyCustomAdapter,
-    }
-}
-```
-
-For type safety, you can create a typed configuration. Use a generated type from your icon list as a generic for the icons configuration:
-```ts
-const iconConfig: IconsConfig<{ myAdapter: MyAdapterIconNames; }> = {};
-```
-
-## Predefined adapters
+## Predefined providers
 
 ### Font Awesome Pro Adapter
 #### Local Development Setup
@@ -127,6 +94,18 @@ npm config set "//npm.fontawesome.com/:_authToken" YOUR_TOKEN
 npm install --save-dev @fortawesome/fontawesome-pro
 ```
 
+#### Usage
+```js
+const { faPro } = require('@uxf/icons-generator/providers/fa-pro');
+
+icons: {
+    // for icons with default name (preferred)
+    ...faPro.adapter(["brands.linkedin"]),
+    // to define custom name for an icon
+    twitter: faPro.icon("brands.twitter"),
+}
+````
+
 #### Without Private Key
 If your project already contains generated icons, installing the Font Awesome Pro package is not necessary.
 The package automatically generates a 'fallback file' for the icons in use, ensuring functionality even without

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@uxf/icons-generator",
-  "version": "11.21.1",
+  "version": "11.24.2",
   "description": "",
   "main": "index.js",
   "scripts": {
     "build": "npm run-script clean && npm run-script compile",
     "clean": "rm -rf ./dist",
     "compile": "tsc -P tsconfig.json",
-    "test": "NODE_MODULES_PATH=../../node_modules ts-node ./bin/icons-gen.ts --configFile=tests/icons.config.ts",
+    "test": "NODE_MODULES_PATH=../../node_modules ts-node ./bin/icons-gen.ts --configFile=tests/icons.config.js",
     "typecheck": "tsc --noEmit --skipLibCheck"
   },
   "publishConfig": {

package/src/providers/fa-pro.d.ts

@@ -0,0 +1,3 @@
+import type { FaProIconName } from "../fa-pro-types";
+import { type IconProvider } from "../types";
+export declare const faPro: IconProvider<FaProIconName>;

package/src/{adapters → providers}/fa-pro.js

@@ -1,8 +1,11 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFaProIcon = void 0;
+exports.faPro = void 0;
 const fs_1 = require("fs");
+const _generateAdapterFallback_1 = require("../utils/_generateAdapterFallback");
+const _getIconNameForProvider_1 = require("../utils/_getIconNameForProvider");
+const KEY = "faPro";
 const removeComments = (str) => str.replace(/<!--([\s\S]*?)-->/g, "");
 const removeSvg = (str) => str.replace(/<svg[^>]*>/, "").replace(/<\/svg>/, "");
 const addFillAttribute = (str) => str.replace(/\/>/g, ' fill="currentColor"/>');
@@ -15,10 +18,10 @@ const parseDimensions = (str) => {
     if (!width || !height) {
         throw new Error("Can't parse width or height.");
     }
-    return { width, height };
+    return { width: Number(width), height: Number(height) };
 };
 const NODE_MODULES_PATH = (_a = process.env.NODE_MODULES_PATH) !== null && _a !== void 0 ? _a : "./node_modules";
-const getFaProIcon = (adapterKey) => (iconName, config) => {
+const getIcon = (iconName, config) => {
     if ((0, fs_1.existsSync)(NODE_MODULES_PATH + "/@fortawesome/fontawesome-pro")) {
         const [namespace, icon] = iconName.split(".");
         let svg = (0, fs_1.readFileSync)(`${NODE_MODULES_PATH}/@fortawesome/fontawesome-pro/svgs/${namespace}/${icon}.svg`).toString();
@@ -26,16 +29,26 @@ const getFaProIcon = (adapterKey) => (iconName, config) => {
         const { width, height } = parseDimensions(svg);
         svg = removeSvg(svg);
         svg = addFillAttribute(svg);
-        return { width, height, path: svg };
+        const iconDefinition = { width, height, path: svg };
+        (0, _generateAdapterFallback_1._generateAdapterFallback)(KEY, iconName, iconDefinition, config);
+        return iconDefinition;
     }
     try {
-        const fallbackPath = config.fallbackFilesDirectory + adapterKey + ".json";
+        const fallbackPath = config.fallbackFilesDirectory + KEY + ".json";
         const fileContent = (0, fs_1.readFileSync)(fallbackPath).toString();
         const icon = JSON.parse(fileContent)[iconName];
-        return { width: icon.width, height: icon.height, path: decodeURIComponent(icon.path) };
+        return { width: Number(icon.width), height: Number(icon.height), path: decodeURIComponent(icon.path) };
     }
     catch (e) {
-        throw new Error(`Can't find icon "${iconName}" in "${adapterKey}" fallback file.`);
+        throw new Error(`Can't find icon "${iconName}" in "${KEY}" fallback file.`);
     }
 };
-exports.getFaProIcon = getFaProIcon;
+const icon = (iconName) => (config) => getIcon(iconName, config);
+exports.faPro = {
+    icon(iconName) {
+        return (config) => getIcon(iconName, config);
+    },
+    adapter(icons) {
+        return Object.fromEntries(icons.map((iconName) => [(0, _getIconNameForProvider_1._getIconNameForProvider)(KEY, iconName), icon(iconName)]));
+    },
+};

package/src/scripts/index.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const _generateAdaptersFallbackFiles_1 = require("../utils/_generateAdaptersFallbackFiles");
 const _generateDefinitionFile_1 = require("../utils/_generateDefinitionFile");
 const _generateSeparateIconFiles_1 = require("../utils/_generateSeparateIconFiles");
 const _generateSpriteFile_1 = require("../utils/_generateSpriteFile");
@@ -17,7 +16,5 @@ function default_1(config) {
     console.log("Removed unused separate icon files.");
     (0, _generateSeparateIconFiles_1._generateSeparateIconFiles)(config);
     console.log("Separate icons generated.");
-    (0, _generateAdaptersFallbackFiles_1._generateAdaptersFallbackFiles)(config);
-    console.log("Fallback files for adapters was generated.");
 }
 exports.default = default_1;

package/src/types.d.ts

@@ -1,4 +1,3 @@
-export type Mode = "simple" | "sizes";
 export type ModuleDefinitionFormat = "type" | "interface";
 export type ModuleDefinition = {
     moduleName: string;
@@ -11,25 +10,19 @@ export type SimpleIcon = {
     width: number;
 };
 export type SizedIcon = Record<number, string>;
-type IconsByMode = {
-    icons: Record<string, SimpleIcon>;
-    mode: "simple";
-} | {
-    icons: Record<string, SizedIcon>;
-    mode: "sizes";
+export type IconFromProviderFunction = (config: _IconsConfig) => {
+    width: number;
+    height: number;
+    path: string;
 };
-export type AdapterType<T extends string> = {
-    icons: T[];
-    getIcon: (iconName: T, config: _IconsConfig<Record<any, any>>) => {
-        width: number;
-        height: number;
-        path: string;
-    };
+export type IconProvider<T extends string> = {
+    adapter: (icons: T[]) => Record<string, IconFromProviderFunction>;
+    icon: (iconName: T) => IconFromProviderFunction;
+};
+type IconsByMode = {
+    icons: Record<string, SimpleIcon | SizedIcon | IconFromProviderFunction>;
 };
-export type AdaptersType<T extends Record<string, string>> = Record<keyof T, {
-    [K in keyof T]: AdapterType<T[K]>;
-}[keyof T]>;
-export type _IconsConfig<T extends Record<string, string> = Record<string, string>> = {
+export type _IconsConfig = {
     configDirectory: string;
     configFile: string;
     customDefinitionContent?: string;
@@ -43,9 +36,8 @@ export type _IconsConfig<T extends Record<string, string> = Record<string, strin
     spriteFileName: string;
     typeName: string;
     typescript: boolean;
-    adapters?: AdaptersType<T>;
 } & IconsByMode;
-export type IconsConfig<T extends Record<string, string> = Record<string, string>> = {
+export type IconsConfig = {
     configDirectory?: string;
     customDefinitionContent?: string;
     moduleDefinition?: ModuleDefinition;
@@ -53,7 +45,6 @@ export type IconsConfig<T extends Record<string, string> = Record<string, string
     spriteFileName?: string;
     typeName?: string;
     typescript?: boolean;
-    adapters?: AdaptersType<T>;
 } & (IconsByMode | {
     icons?: never;
     mode?: never;

package/src/utils/_createDefinitionFileContent.js

@@ -1,27 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports._createDefinitionFileContent = void 0;
-const _getIconFromAdapterName_1 = require("./_getIconFromAdapterName");
+const _iconTypeResolver_1 = require("./_iconTypeResolver");
 const get_md5_from_file_1 = require("./get-md5-from-file");
 function _createDefinitionFileContent(config) {
-    var _a;
     const iconDefinitions = [];
     const iconNames = [];
     Object.keys(config.icons).map((name) => {
         iconNames.push(name);
-        iconDefinitions.push(config.mode === "sizes"
-            ? `    "${name}": [${Object.keys(config.icons[name]).join(", ")}],`
-            : `    "${name}": { w: ${config.icons[name].width}, h: ${config.icons[name].height} },`);
+        const icon = config.icons[name];
+        if (_iconTypeResolver_1._iconTypeResolver.isSimpleIcon(icon)) {
+            iconDefinitions.push(`    "${name}": { w: ${icon.width}, h: ${icon.height} },`);
+            return;
+        }
+        if (_iconTypeResolver_1._iconTypeResolver.isSizedIcon(icon)) {
+            iconDefinitions.push(`    "${name}": [${Object.keys(icon).join(", ")}],`);
+            return;
+        }
+        if (_iconTypeResolver_1._iconTypeResolver.isFromAdapter(icon)) {
+            const svg = icon(config);
+            iconDefinitions.push(`    "${name}": { w: ${svg.width}, h: ${svg.height} },`);
+            return;
+        }
+        throw new Error("Unknown icon format.");
     });
-    if (config.adapters) {
-        Object.entries((_a = config.adapters) !== null && _a !== void 0 ? _a : []).map(([adapterName, adapter]) => {
-            adapter.icons.map((iconName) => {
-                iconNames.push((0, _getIconFromAdapterName_1._getIconFromAdapterName)(adapterName, iconName));
-                const icon = adapter.getIcon(iconName, config);
-                iconDefinitions.push(`    "${(0, _getIconFromAdapterName_1._getIconFromAdapterName)(adapterName, iconName)}": { w: ${icon.width}, h: ${icon.height} },`);
-            });
-        });
-    }
     return `// this file is generated automatically, do not change anything manually in the contents of this file
 
 export const ICONS_VERSION = "${(0, get_md5_from_file_1.getMd5FromFile)(config.spriteFile)}";

package/src/utils/_createIconContent.d.ts

@@ -1,5 +1,5 @@
 export declare function _createIconContent({ width, height, content }: {
-    width: string;
-    height: string;
+    width: number;
+    height: number;
     content: string;
 }): string;

package/src/utils/_createSpriteContent.js

@@ -1,42 +1,31 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports._createSpriteContent = void 0;
-const _getIconFromAdapterName_1 = require("./_getIconFromAdapterName");
+const _iconTypeResolver_1 = require("./_iconTypeResolver");
 function _createSpriteContent(config) {
     let spriteTextContent = `<svg xmlns="http://www.w3.org/2000/svg">`;
-    switch (config.mode) {
-        case "simple":
-            Object.keys(config.icons).map((name) => {
-                const svg = config.icons[name];
-                spriteTextContent += `<symbol id="icon-sprite--${name}" viewBox="0 0 ${svg.width} ${svg.height}">`;
-                spriteTextContent += svg.data;
-                spriteTextContent += `</symbol>`;
+    Object.keys(config.icons).map((name) => {
+        const icon = config.icons[name];
+        if (_iconTypeResolver_1._iconTypeResolver.isSimpleIcon(icon)) {
+            spriteTextContent += `<symbol id="icon-sprite--${name}" viewBox="0 0 ${icon.width} ${icon.height}">`;
+            spriteTextContent += icon.data;
+            spriteTextContent += `</symbol>`;
+            return;
+        }
+        if (_iconTypeResolver_1._iconTypeResolver.isSizedIcon(icon)) {
+            Object.keys(icon).map((s) => {
+                const svg = icon[Number(s)];
+                spriteTextContent += `<symbol id="icon-sprite--${name}_${s}" viewBox="0 0 ${s} ${s}">${svg}</symbol>`;
             });
-            break;
-        case "sizes":
-            Object.keys(config.icons).map((name) => {
-                const sizes = config.icons[name];
-                return Object.keys(sizes).map((s) => {
-                    const svg = sizes[s];
-                    spriteTextContent += `<symbol id="icon-sprite--${name}_${s}" viewBox="0 0 ${s} ${s}">${svg}</symbol>`;
-                });
-            });
-            break;
-        default:
-            throw new Error("Unknown mode ");
-    }
-    if (config.adapters) {
-        Object.keys(config.adapters).map((adapterName) => {
-            var _a;
-            const adapter = (_a = config.adapters) === null || _a === void 0 ? void 0 : _a[adapterName];
-            adapter === null || adapter === void 0 ? void 0 : adapter.icons.map((iconName) => {
-                const icon = adapter.getIcon(iconName, config);
-                spriteTextContent += `<symbol id="icon-sprite--${(0, _getIconFromAdapterName_1._getIconFromAdapterName)(adapterName, iconName)}" viewBox="0 0 ${icon.width} ${icon.height}">`;
-                spriteTextContent += icon.path;
-                spriteTextContent += `</symbol>`;
-            });
-        });
-    }
+            return;
+        }
+        if (_iconTypeResolver_1._iconTypeResolver.isFromAdapter(icon)) {
+            const svg = icon(config);
+            spriteTextContent += `<symbol id="icon-sprite--${name}" viewBox="0 0 ${svg.width} ${svg.height}">${svg.path}</symbol>`;
+            return;
+        }
+        throw new Error("Unknown icon format.");
+    });
     spriteTextContent += `</svg>`;
     return spriteTextContent;
 }

package/src/utils/_generateAdapterFallback.d.ts

@@ -0,0 +1,6 @@
+import { _IconsConfig } from "../types";
+export declare function _generateAdapterFallback(key: string, iconName: string, iconDefinition: {
+    width: number;
+    height: number;
+    path: string;
+}, config: _IconsConfig): void;

package/src/utils/_generateAdapterFallback.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports._generateAdapterFallback = void 0;
+const fs_1 = require("fs");
+const _createPath_1 = require("./_createPath");
+function _generateAdapterFallback(key, iconName, iconDefinition, config) {
+    (0, _createPath_1._createPath)(config.configFile);
+    (0, _createPath_1._createPath)(config.fallbackFilesDirectory);
+    const filePath = config.fallbackFilesDirectory + key + ".json";
+    const currentContent = (0, fs_1.readFileSync)(filePath).toString();
+    const content = currentContent ? JSON.parse(currentContent) : {};
+    content[iconName] = iconDefinition;
+    (0, fs_1.writeFileSync)(filePath, JSON.stringify(content));
+}
+exports._generateAdapterFallback = _generateAdapterFallback;

package/src/utils/_generateSeparateIconFiles.js

@@ -4,49 +4,39 @@ exports._generateSeparateIconFiles = void 0;
 const fs_1 = require("fs");
 const _createIconContent_1 = require("./_createIconContent");
 const _createPath_1 = require("./_createPath");
-const _getIconFromAdapterName_1 = require("./_getIconFromAdapterName");
+const _iconTypeResolver_1 = require("./_iconTypeResolver");
 function _generateSeparateIconFiles(config) {
     (0, _createPath_1._createPath)(config.generatedDirectory, false);
-    switch (config.mode) {
-        case "simple":
-            Object.keys(config.icons).map((name) => {
-                const svg = config.icons[name];
-                // TODO po správném otypování tu neseděj typy ... :-)
-                const content = (0, _createIconContent_1._createIconContent)({
-                    width: svg.width,
-                    height: svg.height,
-                    content: svg.data,
-                });
-                (0, fs_1.writeFileSync)(config.generatedDirectory + name + ".svg", content);
+    Object.keys(config.icons).map((name) => {
+        const icon = config.icons[name];
+        if (_iconTypeResolver_1._iconTypeResolver.isSimpleIcon(icon)) {
+            const content = (0, _createIconContent_1._createIconContent)({
+                width: icon.width,
+                height: icon.height,
+                content: icon.data,
             });
-            break;
-        case "sizes":
-            Object.keys(config.icons).map((name) => {
-                const size = config.icons[name];
-                Object.keys(size).map((s) => {
-                    const svg = size[s];
-                    const content = (0, _createIconContent_1._createIconContent)({ width: s, height: s, content: svg });
-                    (0, fs_1.writeFileSync)(config.generatedDirectory + name + "_" + s + ".svg", content);
-                });
+            (0, fs_1.writeFileSync)(config.generatedDirectory + name + ".svg", content);
+            return;
+        }
+        if (_iconTypeResolver_1._iconTypeResolver.isSizedIcon(icon)) {
+            Object.keys(icon).map((s) => {
+                const svg = icon[Number(s)];
+                const content = (0, _createIconContent_1._createIconContent)({ width: Number(s), height: Number(s), content: svg });
+                (0, fs_1.writeFileSync)(config.generatedDirectory + name + "_" + s + ".svg", content);
             });
-            break;
-        default:
-            throw new Error("Unknown mode ");
-    }
-    if (config.adapters) {
-        Object.keys(config.adapters).map((adapterName) => {
-            var _a;
-            const adapter = (_a = config.adapters) === null || _a === void 0 ? void 0 : _a[adapterName];
-            adapter === null || adapter === void 0 ? void 0 : adapter.icons.map((iconName) => {
-                const icon = adapter.getIcon(iconName, config);
-                const content = (0, _createIconContent_1._createIconContent)({
-                    width: icon.width.toString(),
-                    height: icon.height.toString(),
-                    content: icon.path,
-                });
-                (0, fs_1.writeFileSync)(config.generatedDirectory + (0, _getIconFromAdapterName_1._getIconFromAdapterName)(adapterName, iconName) + ".svg", content);
+            return;
+        }
+        if (_iconTypeResolver_1._iconTypeResolver.isFromAdapter(icon)) {
+            const svg = icon(config);
+            const content = (0, _createIconContent_1._createIconContent)({
+                width: svg.width,
+                height: svg.height,
+                content: svg.path,
             });
-        });
-    }
+            (0, fs_1.writeFileSync)(config.generatedDirectory + name + ".svg", content);
+            return;
+        }
+        throw new Error("Unknown icon format.");
+    });
 }
 exports._generateSeparateIconFiles = _generateSeparateIconFiles;

package/src/utils/_getConfig.d.ts

@@ -1,2 +1,2 @@
 import { _IconsConfig } from "../types";
-export declare function _getConfig(confFile: string): _IconsConfig<Record<string, string>>;
+export declare function _getConfig(confFile: string): _IconsConfig;

package/src/utils/_getConfig.js

@@ -17,7 +17,6 @@ function _getConfig(confFile) {
     const config = {
         configDirectory: loadedConfig.configDirectory || "/src/config/",
         icons: loadedConfig.icons || {},
-        mode: loadedConfig.mode || "simple",
         spriteFileName: loadedConfig.spriteFileName || "_icon-sprite.svg",
         typeName: loadedConfig.typeName || "IconsSet",
         typescript: loadedConfig.typescript || true,

package/src/utils/_getIconNameForProvider.d.ts

@@ -0,0 +1 @@
+export declare const _getIconNameForProvider: (providerKey: string, iconName: string) => string;

package/src/utils/_getIconNameForProvider.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports._getIconNameForProvider = void 0;
+const _getIconNameForProvider = (providerKey, iconName) => `${providerKey}_${iconName}`;
+exports._getIconNameForProvider = _getIconNameForProvider;

package/src/utils/_iconTypeResolver.d.ts

@@ -0,0 +1,6 @@
+import type { IconFromProviderFunction, SimpleIcon, SizedIcon } from "../types";
+export declare const _iconTypeResolver: {
+    isSimpleIcon: (icon: any) => icon is SimpleIcon;
+    isSizedIcon: (icon: any) => icon is SizedIcon;
+    isFromAdapter: (icon: any) => icon is IconFromProviderFunction;
+};

package/src/utils/_iconTypeResolver.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports._iconTypeResolver = void 0;
+exports._iconTypeResolver = {
+    isSimpleIcon: (icon) => "data" in icon,
+    isSizedIcon: (icon) => icon.constructor === Object &&
+        Object.keys(icon).every((key) => !isNaN(Number(key)) && typeof icon[key] === "string"),
+    isFromAdapter: (icon) => typeof icon === "function",
+};

package/src/utils/_removeUnusedSeparateIconFiles.js

@@ -3,20 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports._removeUnusedSeparateIconFiles = void 0;
 const fs_1 = require("fs");
 const _createPath_1 = require("./_createPath");
-const _getIconFromAdapterName_1 = require("./_getIconFromAdapterName");
 function _removeUnusedSeparateIconFiles(config) {
     (0, _createPath_1._createPath)(config.generatedDirectory, false);
     const dir = (0, fs_1.readdirSync)(config.generatedDirectory, { withFileTypes: true });
     const allIconNames = Object.keys(config.icons);
-    if (config.adapters) {
-        Object.keys(config.adapters).map((adapterName) => {
-            var _a;
-            const adapter = (_a = config.adapters) === null || _a === void 0 ? void 0 : _a[adapterName];
-            adapter === null || adapter === void 0 ? void 0 : adapter.icons.map((iconName) => {
-                allIconNames.push((0, _getIconFromAdapterName_1._getIconFromAdapterName)(adapterName, iconName));
-            });
-        });
-    }
     dir.map((file) => {
         if (file.isFile() && !allIconNames.includes(file.name) && file.name !== config.spriteFileName) {
             (0, fs_1.unlinkSync)(config.generatedDirectory + file.name);

package/src/utils/_validateSourceData.js

@@ -2,29 +2,32 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports._validateSourceData = void 0;
 const fast_xml_parser_1 = require("fast-xml-parser");
+const _iconTypeResolver_1 = require("./_iconTypeResolver");
 function _validateSourceData(config) {
-    switch (config.mode) {
-        case "simple":
-            Object.keys(config.icons).map((name) => {
-                const svg = config.icons[name];
-                if (fast_xml_parser_1.XMLValidator.validate(`<svg>${svg.data}</svg>`) !== true) {
+    Object.keys(config.icons).map((name) => {
+        const icon = config.icons[name];
+        if (_iconTypeResolver_1._iconTypeResolver.isSimpleIcon(icon)) {
+            if (fast_xml_parser_1.XMLValidator.validate(`<svg>${icon.data}</svg>`) !== true) {
+                throw new Error(`Invalid SVG data for icon "${name}"`);
+            }
+            return;
+        }
+        if (_iconTypeResolver_1._iconTypeResolver.isSizedIcon(icon)) {
+            Object.keys(icon).map((s) => {
+                const svg = icon[Number(s)];
+                if (fast_xml_parser_1.XMLValidator.validate(`<svg>${svg}</svg>`) !== true) {
                     throw new Error(`Invalid SVG data for icon "${name}"`);
                 }
             });
-            break;
-        case "sizes":
-            Object.keys(config.icons).map((name) => {
-                const sizes = config.icons[name];
-                return Object.keys(sizes).map((s) => {
-                    const svg = sizes[s];
-                    if (fast_xml_parser_1.XMLValidator.validate(`<svg>${svg}</svg>`) !== true) {
-                        throw new Error(`Invalid SVG data for icon "${name}"`);
-                    }
-                });
-            });
-            break;
-        default:
-            throw new Error("Unknown mode ");
-    }
+            return;
+        }
+        if (_iconTypeResolver_1._iconTypeResolver.isFromAdapter(icon)) {
+            if (fast_xml_parser_1.XMLValidator.validate(`<svg>${icon(config).path}</svg>`) !== true) {
+                throw new Error(`Invalid SVG data for icon "${name}"`);
+            }
+            return;
+        }
+        throw new Error("Unknown icon format.");
+    });
 }
 exports._validateSourceData = _validateSourceData;

package/tests/icons.config.js

@@ -1,20 +1,15 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const fa_pro_1 = require("../src/adapters/fa-pro");
+const { faPro } = require("../src/providers/fa-pro");
+
+/** @type {import('@uxf/icons-generator/src/types').IconsConfig} */
 const config = {
-    mode: "simple",
     typescript: true,
     configDirectory: "/tests/__snapshots/config/",
     generatedDirectory: "/tests/__snapshots/public/",
     spriteFileName: "_icon-sprite.svg",
     typeName: "MySuperIconsType",
-    adapters: {
-        faPro: {
-            icons: ["regular.calendar-check", "brands.500px", "thin.percent"],
-            getIcon: (0, fa_pro_1.getFaProIcon)("faPro"),
-        },
-    },
     icons: {
+        ...faPro.adapter(["regular.calendar-check", "brands.500px", "thin.percent"]),
+        testOverride: faPro.icon("brands.linkedin"),
         flame: {
             width: 43,
             height: 48,
@@ -53,6 +48,11 @@ const config = {
                     </clipPath>
                 </defs>`,
         },
+        sized: {
+            24: `<path d="m23.916 6 1.125-1.123c3.14-3.06 7.49-4.454 11.765-3.742A13.397 13.397 0 0 1 48 14.353v.544c0 3.89-1.612 7.613-4.462 10.266L26.597 40.978A3.806 3.806 0 0 1 24 42a3.806 3.806 0 0 1-2.597-1.022L4.462 25.163A14.038 14.038 0 0 1 0 14.897v-.543a13.4 13.4 0 0 1 11.194-13.22c4.19-.71 8.625.682 11.681 3.743L23.915 6Zm0 4.247-3.16-3.253a10.413 10.413 0 0 0-9.065-2.9c-5.015.836-8.775 5.178-8.775 10.26v.543c0 3.066 1.354 5.981 3.592 8.072l16.939 15.816c.15.14.347.215.469.215.29 0 .487-.075.637-.215l16.94-15.816A11.059 11.059 0 0 0 45 14.897v-.543c0-5.082-3.675-9.424-8.69-10.26-3.394-.553-6.694.53-9.066 2.9l-3.328 3.253Z" fill="#fff" />`,
+            48: `<path d="m31.14 1.608-12 36.63c-.21.634-.893.916-1.523.771a1.235 1.235 0 0 1-.757-1.549l12-36.625a1.2 1.2 0 0 1 1.523-.772c.622.213.9.904.757 1.545Zm-18.345 9.068-9.789 8.86 9.789 8.851c.495.45.54 1.221.037 1.725-.375.503-1.2.55-1.627.099L.403 20.383C.147 20.215 0 19.887 0 19.535c0-.35.147-.679.403-.915l10.802-9.768c.428-.442 1.252-.396 1.627.107.503.435.458 1.274-.037 1.717Zm24-1.824 10.8 9.768c.255.236.405.564.405.847 0 .42-.15.748-.405.916l-10.8 9.828a1.185 1.185 0 0 1-1.695-.1 1.243 1.243 0 0 1 .105-1.724l9.788-8.92-9.788-8.79c-.495-.444-.54-1.283-.105-1.718.442-.503 1.2-.55 1.695-.107Z" fill="#fff" />`,
+        },
     },
 };
+
 module.exports = config;

package/src/adapters/fa-pro.d.ts

@@ -1,6 +0,0 @@
-import { _IconsConfig } from "../types";
-export declare const getFaProIcon: (adapterKey: string) => (iconName: string, config: _IconsConfig) => {
-    width: any;
-    height: any;
-    path: string;
-};

package/src/utils/_generateAdaptersFallbackFiles.d.ts

@@ -1,2 +0,0 @@
-import { _IconsConfig } from "../types";
-export declare function _generateAdaptersFallbackFiles(config: _IconsConfig<Record<string, string>>): void;

package/src/utils/_generateAdaptersFallbackFiles.js

@@ -1,25 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports._generateAdaptersFallbackFiles = void 0;
-const fs_1 = require("fs");
-const _createPath_1 = require("./_createPath");
-function _generateAdaptersFallbackFiles(config) {
-    (0, _createPath_1._createPath)(config.configFile);
-    if (config.adapters) {
-        const adaptersKeys = Object.keys(config.adapters);
-        adaptersKeys.forEach((adapterKey) => {
-            var _a;
-            let content = "{\n";
-            const adapter = (_a = config.adapters) === null || _a === void 0 ? void 0 : _a[adapterKey];
-            adapter === null || adapter === void 0 ? void 0 : adapter.icons.forEach((iconKey) => {
-                const iconData = adapter.getIcon(iconKey, config);
-                content += `    "${iconKey}": { "width": "${iconData.width}", "height": "${iconData.height}", "path": "${encodeURIComponent(iconData.path)}" },\n`;
-            });
-            content += "}\n";
-            content = content.split("").reverse().join("").replace(",", "").split("").reverse().join("");
-            (0, _createPath_1._createPath)(config.fallbackFilesDirectory);
-            (0, fs_1.writeFileSync)(config.fallbackFilesDirectory + adapterKey + ".json", content);
-        });
-    }
-}
-exports._generateAdaptersFallbackFiles = _generateAdaptersFallbackFiles;

package/src/utils/_getIconFromAdapterName.d.ts

@@ -1 +0,0 @@
-export declare const _getIconFromAdapterName: (adapterName: string, iconName: string) => string;

package/src/utils/_getIconFromAdapterName.js

@@ -1,5 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports._getIconFromAdapterName = void 0;
-const _getIconFromAdapterName = (adapterName, iconName) => `${adapterName}_${iconName}`;
-exports._getIconFromAdapterName = _getIconFromAdapterName;

package/tests/icons.config.d.ts

@@ -1 +0,0 @@
-export {};