@uxf/icons-generator 11.11.3 → 11.15.0

package/README.md

@@ -45,10 +45,9 @@ icons-gen --configFile=yourConfigFileName.js
 | typescript              | `boolean`                                 | `true`                                                                | No       | -                                |
 | configDirectory         | `string`                                  | `"/src/config/"`                                                      | No       | -                                |
 | generatedDirectory      | `string`                                  | `"/public/icons-generated/"`                                          | No       | -                                |
-| spriteFileName          | `string`                                  | `undefined`                                                           | No       | Specify custom sprite file name  |
+| spriteFileName          | `string`                                  | `_icon-sprite.svg`                                                    | No       | Specify custom sprite file name  |
 | typeName                | `string`                                  | `IconsSet`                                                            | No       | -                                |
-| moduleDefinition        | `ModuleDefinition`                        | `"{ moduleName: "icons", typeName: "IconsSet", format: "interface"}"` | No       | Custom module definition         |
-| customDefinitionContent | `string`                                  | `"_icon-sprite.svg"`                                                  | 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)   |

package/bin/icons-gen.js

@@ -0,0 +1,16 @@
+#!/usr/bin/env node
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+/* eslint-disable no-console */
+const cli_1 = __importDefault(require("../src/scripts/cli"));
+(0, cli_1.default)()
+    .then((exitCode) => {
+    process.exitCode = exitCode;
+})
+    .catch((e) => {
+    console.error(e);
+    process.exitCode = 1;
+});

package/bin/icons-gen.ts

@@ -0,0 +1,12 @@
+#!/usr/bin/env node
+/* eslint-disable no-console */
+import run from "../src/scripts/cli";
+
+run()
+    .then((exitCode) => {
+        process.exitCode = exitCode;
+    })
+    .catch((e) => {
+        console.error(e);
+        process.exitCode = 1;
+    });

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@uxf/icons-generator",
-  "version": "11.11.3",
+  "version": "11.15.0",
   "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",
     "typecheck": "tsc --noEmit --skipLibCheck"
   },
   "publishConfig": {
@@ -22,11 +23,13 @@
   "author": "",
   "license": "ISC",
   "bin": {
-    "icons-gen": "./src/scripts/gen.js",
-    "icons-check": "./src/scripts/check.js"
+    "icons-gen": "./bin/icons-gen.ts"
   },
   "bugs": {
     "url": "https://gitlab.com/uxf-npm/icons-generator/issues"
   },
-  "homepage": "https://gitlab.com/uxf-npm/icons-generator#readme"
+  "homepage": "https://gitlab.com/uxf-npm/icons-generator#readme",
+  "devDependencies": {
+    "@fortawesome/fontawesome-pro": "^6.5.2"
+  }
 }

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

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

package/src/adapters/fa-pro.js

@@ -1,8 +1,8 @@
 "use strict";
+var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFaProIcon = void 0;
 const fs_1 = require("fs");
-const _getConfig_1 = require("../utils/_getConfig");
 const removeComments = (str) => str.replace(/<!--([\s\S]*?)-->/g, "");
 const removeSvg = (str) => str.replace(/<svg[^>]*>/, "").replace(/<\/svg>/, "");
 const addFillAttribute = (str) => str.replace(/\/>/g, ' fill="currentColor"/>');
@@ -17,11 +17,11 @@ const parseDimensions = (str) => {
     }
     return { width, height };
 };
-const getFaProIcon = (adapterKey) => (iconName) => {
-    const config = (0, _getConfig_1._getConfig)();
-    if ((0, fs_1.existsSync)("./node_modules/@fortawesome/fontawesome-pro")) {
+const NODE_MODULES_PATH = (_a = process.env.NODE_MODULES_PATH) !== null && _a !== void 0 ? _a : "./node_modules";
+const getFaProIcon = (adapterKey) => (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/@fortawesome/fontawesome-pro/svgs/${namespace}/${icon}.svg`).toString();
+        let svg = (0, fs_1.readFileSync)(`${NODE_MODULES_PATH}/@fortawesome/fontawesome-pro/svgs/${namespace}/${icon}.svg`).toString();
         svg = removeComments(svg);
         const { width, height } = parseDimensions(svg);
         svg = removeSvg(svg);

package/src/scripts/cli.d.ts

@@ -0,0 +1,2 @@
+declare const _default: () => Promise<0 | undefined>;
+export default _default;

package/src/scripts/cli.js

@@ -0,0 +1,22 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const process_1 = require("process");
+const yargs_1 = __importDefault(require("yargs"));
+const _getConfig_1 = require("../utils/_getConfig");
+const index_1 = __importDefault(require("./index"));
+exports.default = async () => {
+    const cli = yargs_1.default
+        .command("$0", "UXF icons generator")
+        .option("c", { alias: "configFile", group: "Options", default: "icons.config.ts" })
+        .option("h", { alias: "help", group: "Options" })
+        .strict(false)
+        .exitProcess(false);
+    const { help, configFile } = await cli.parse(process_1.argv.slice(2));
+    if (help) {
+        return 0;
+    }
+    (0, index_1.default)((0, _getConfig_1._getConfig)(configFile));
+};

package/src/scripts/index.d.ts

@@ -0,0 +1,2 @@
+import { _IconsConfig } from "../types";
+export default function (config: _IconsConfig): void;

package/src/scripts/index.js

@@ -0,0 +1,23 @@
+"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");
+const _removeUnusedSeparateIconFiles_1 = require("../utils/_removeUnusedSeparateIconFiles");
+const _validateSourceData_1 = require("../utils/_validateSourceData");
+function default_1(config) {
+    (0, _validateSourceData_1._validateSourceData)(config);
+    console.log("Validated source data.");
+    (0, _generateSpriteFile_1._generateSpriteFile)(config);
+    console.log("Icon sprite file generated.");
+    (0, _generateDefinitionFile_1._generateDefinitionFile)(config);
+    console.log("Definition file generated.");
+    (0, _removeUnusedSeparateIconFiles_1._removeUnusedSeparateIconFiles)(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

@@ -20,7 +20,7 @@ type IconsByMode = {
 };
 export type AdapterType<T extends string> = {
     icons: T[];
-    getIcon: (iconName: T) => {
+    getIcon: (iconName: T, config: _IconsConfig<Record<any, any>>) => {
         width: number;
         height: number;
         path: string;
@@ -29,7 +29,7 @@ export type AdapterType<T extends string> = {
 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>> = {
+export type _IconsConfig<T extends Record<string, string> = Record<string, string>> = {
     configDirectory: string;
     configFile: string;
     customDefinitionContent?: string;
@@ -43,7 +43,7 @@ export type _IconsConfig<T extends Record<string, string>> = {
     spriteFileName: string;
     typeName: string;
     typescript: boolean;
-    adapters: AdaptersType<T>;
+    adapters?: AdaptersType<T>;
 } & IconsByMode;
 export type IconsConfig<T extends Record<string, string> = Record<string, string>> = {
     configDirectory?: string;

package/src/utils/_createDefinitionFileContent.d.ts

@@ -1,10 +1,2 @@
-import { AdaptersType, Mode, ModuleDefinition } from "../types";
-export declare function _createDefinitionFileContent({ source, typescript, mode, typeName, moduleDefinition, customContent, adapters, }: {
-    source: any;
-    typescript: boolean;
-    mode: Mode;
-    typeName: string;
-    moduleDefinition?: ModuleDefinition;
-    customContent?: string;
-    adapters: AdaptersType<any>;
-}): string;
+import { _IconsConfig } from "../types";
+export declare function _createDefinitionFileContent(config: _IconsConfig): string;

package/src/utils/_createDefinitionFileContent.js

@@ -2,60 +2,41 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports._createDefinitionFileContent = void 0;
 const _getIconFromAdapterName_1 = require("./_getIconFromAdapterName");
-function _createDefinitionFileContent({ source, typescript, mode, typeName, moduleDefinition, customContent, adapters, }) {
-    const allIconNames = [];
-    let size;
-    let newIcons = `// this file is generated automatically, do not change anything manually in the contents of this file\n\nexport const ICONS = {\n`;
-    Object.keys(source).map((name) => {
-        allIconNames.push(name);
-        switch (mode) {
-            case "simple":
-                newIcons += `    "${name}": { w: ${source[name].width}, h: ${source[name].height} },\n`;
-                break;
-            case "sizes":
-                size = source[name];
-                newIcons += `    "${name}": [${Object.keys(size).join(", ")}],\n`;
-                break;
-            default:
-                throw new Error("Unknown mode " + mode);
-        }
+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} },`);
     });
-    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-    if (adapters) {
-        Object.keys(adapters).map((adapterName) => {
-            const adapter = adapters[adapterName];
+    if (config.adapters) {
+        Object.entries((_a = config.adapters) !== null && _a !== void 0 ? _a : []).map(([adapterName, adapter]) => {
             adapter.icons.map((iconName) => {
-                allIconNames.push((0, _getIconFromAdapterName_1._getIconFromAdapterName)(adapterName, iconName));
-                const icon = adapter.getIcon(iconName);
-                newIcons += `    "${(0, _getIconFromAdapterName_1._getIconFromAdapterName)(adapterName, iconName)}": { w: ${icon.width}, h: ${icon.height} },\n`;
+                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} },`);
             });
         });
     }
-    newIcons += "}";
-    if (typescript) {
-        newIcons += ` as const;\n\nexport type ${typeName} = keyof typeof ICONS;\n`;
-        if (moduleDefinition) {
-            newIcons += `\ndeclare module "${moduleDefinition.moduleName}" {\n`;
-            switch (moduleDefinition.format) {
-                case "interface":
-                    newIcons += `    interface ${moduleDefinition.typeName} {\n`;
-                    allIconNames.map((name) => {
-                        newIcons += `        "${name}": true;\n`;
-                    });
-                    newIcons += `    }\n`;
-                    break;
-                case "type":
-                    newIcons += `    type ${moduleDefinition.typeName} = "${allIconNames.join('" | "')}";\n`;
-                    break;
-                default:
-                    throw new Error("Unknown mode " + mode);
-            }
-            newIcons += "}\n";
-        }
+    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)}";
+
+export const ICONS = {
+${iconDefinitions.join("\n")}
+} as const;
+
+export type ${config.typeName} = keyof typeof ICONS;
+
+declare module "@uxf/ui/icon/theme" {
+    interface IconsSet {
+${iconNames.map((iconName) => `        "${iconName}": true;`).join("\n")}
     }
-    if (customContent) {
-        newIcons += `\n${customContent}`;
-    }
-    return newIcons;
+}
+${config.customDefinitionContent ? `\n${config.customDefinitionContent}\n` : ""}`;
 }
 exports._createDefinitionFileContent = _createDefinitionFileContent;

package/src/utils/_createSpriteContent.d.ts

@@ -1,6 +1,2 @@
-import { AdaptersType, Mode } from "../types";
-export declare function _createSpriteContent({ source, mode, adapters, }: {
-    source: any;
-    mode: Mode;
-    adapters: AdaptersType<any>;
-}): string;
+import { _IconsConfig } from "../types";
+export declare function _createSpriteContent(config: _IconsConfig): string;

package/src/utils/_createSpriteContent.js

@@ -2,20 +2,20 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports._createSpriteContent = void 0;
 const _getIconFromAdapterName_1 = require("./_getIconFromAdapterName");
-function _createSpriteContent({ source, mode, adapters, }) {
+function _createSpriteContent(config) {
     let spriteTextContent = `<svg xmlns="http://www.w3.org/2000/svg">`;
-    switch (mode) {
+    switch (config.mode) {
         case "simple":
-            Object.keys(source).map((name) => {
-                const svg = source[name];
+            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>`;
             });
             break;
         case "sizes":
-            Object.keys(source).map((name) => {
-                const sizes = source[name];
+            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>`;
@@ -23,14 +23,14 @@ function _createSpriteContent({ source, mode, adapters, }) {
             });
             break;
         default:
-            throw new Error("Unknown mode " + mode);
+            throw new Error("Unknown mode ");
     }
-    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-    if (adapters) {
-        Object.keys(adapters).map((adapterName) => {
-            const adapter = adapters[adapterName];
-            adapter.icons.map((iconName) => {
-                const icon = adapter.getIcon(iconName);
+    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>`;

package/src/utils/_generateAdaptersFallbackFiles.d.ts

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

package/src/utils/_generateAdaptersFallbackFiles.js

@@ -3,18 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports._generateAdaptersFallbackFiles = void 0;
 const fs_1 = require("fs");
 const _createPath_1 = require("./_createPath");
-const _getConfig_1 = require("./_getConfig");
-function _generateAdaptersFallbackFiles({ configFile }) {
-    (0, _createPath_1._createPath)(configFile);
-    const config = (0, _getConfig_1._getConfig)();
-    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+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 = config.adapters[adapterKey];
-            adapter.icons.forEach((iconKey) => {
-                const iconData = adapter.getIcon(iconKey);
+            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";

package/src/utils/_generateDefinitionFile.d.ts

@@ -1,11 +1,2 @@
-import { AdaptersType, Mode, ModuleDefinition } from "../types";
-export declare function _generateDefinitionFile({ source, resultFile, typescript, mode, typeName, moduleDefinition, customContent, adapters, }: {
-    source: any;
-    resultFile: string;
-    typescript: boolean;
-    mode: Mode;
-    typeName: string;
-    moduleDefinition?: ModuleDefinition;
-    customContent?: string;
-    adapters: AdaptersType<any>;
-}): void;
+import { _IconsConfig } from "../types";
+export declare function _generateDefinitionFile(config: _IconsConfig): void;

package/src/utils/_generateDefinitionFile.js

@@ -4,17 +4,9 @@ exports._generateDefinitionFile = void 0;
 const fs_1 = require("fs");
 const _createDefinitionFileContent_1 = require("./_createDefinitionFileContent");
 const _createPath_1 = require("./_createPath");
-function _generateDefinitionFile({ source, resultFile, typescript, mode, typeName, moduleDefinition, customContent, adapters, }) {
-    const newIcons = (0, _createDefinitionFileContent_1._createDefinitionFileContent)({
-        source,
-        typescript,
-        mode,
-        typeName,
-        moduleDefinition,
-        customContent,
-        adapters,
-    });
-    (0, _createPath_1._createPath)(resultFile);
-    (0, fs_1.writeFileSync)(resultFile, newIcons);
+function _generateDefinitionFile(config) {
+    const newIcons = (0, _createDefinitionFileContent_1._createDefinitionFileContent)(config);
+    (0, _createPath_1._createPath)(config.definitionFile);
+    (0, fs_1.writeFileSync)(config.definitionFile, newIcons);
 }
 exports._generateDefinitionFile = _generateDefinitionFile;

package/src/utils/_generateSeparateIconFiles.d.ts

@@ -1,7 +1,2 @@
-import { AdaptersType, Mode } from "../types";
-export declare function _generateSeparateIconFiles({ source, directory, mode, adapters, }: {
-    source: any;
-    directory: string;
-    mode: Mode;
-    adapters: AdaptersType<any>;
-}): void;
+import { _IconsConfig } from "../types";
+export declare function _generateSeparateIconFiles(config: _IconsConfig): void;

package/src/utils/_generateSeparateIconFiles.js

@@ -5,41 +5,46 @@ const fs_1 = require("fs");
 const _createIconContent_1 = require("./_createIconContent");
 const _createPath_1 = require("./_createPath");
 const _getIconFromAdapterName_1 = require("./_getIconFromAdapterName");
-function _generateSeparateIconFiles({ source, directory, mode, adapters, }) {
-    (0, _createPath_1._createPath)(directory, false);
-    switch (mode) {
+function _generateSeparateIconFiles(config) {
+    (0, _createPath_1._createPath)(config.generatedDirectory, false);
+    switch (config.mode) {
         case "simple":
-            Object.keys(source).map((name) => {
-                const svg = source[name];
-                const content = (0, _createIconContent_1._createIconContent)({ width: svg.width, height: svg.height, content: svg.data });
-                (0, fs_1.writeFileSync)(directory + name + ".svg", content);
+            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);
             });
             break;
         case "sizes":
-            Object.keys(source).map((name) => {
-                const size = source[name];
+            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)(directory + name + "_" + s + ".svg", content);
+                    (0, fs_1.writeFileSync)(config.generatedDirectory + name + "_" + s + ".svg", content);
                 });
             });
             break;
         default:
-            throw new Error("Unknown mode " + mode);
+            throw new Error("Unknown mode ");
     }
-    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-    if (adapters) {
-        Object.keys(adapters).map((adapterName) => {
-            const adapter = adapters[adapterName];
-            adapter.icons.map((iconName) => {
-                const icon = adapter.getIcon(iconName);
+    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)(directory + (0, _getIconFromAdapterName_1._getIconFromAdapterName)(adapterName, iconName) + ".svg", content);
+                (0, fs_1.writeFileSync)(config.generatedDirectory + (0, _getIconFromAdapterName_1._getIconFromAdapterName)(adapterName, iconName) + ".svg", content);
             });
         });
     }

package/src/utils/_generateSpriteFile.d.ts

@@ -1,7 +1,2 @@
-import { AdaptersType, Mode } from "../types";
-export declare function _generateSpriteFile({ source, spriteFile, mode, adapters, }: {
-    source: any;
-    spriteFile: string;
-    mode: Mode;
-    adapters: AdaptersType<any>;
-}): void;
+import { _IconsConfig } from "../types";
+export declare function _generateSpriteFile(config: _IconsConfig): void;

package/src/utils/_generateSpriteFile.js

@@ -4,8 +4,8 @@ exports._generateSpriteFile = void 0;
 const fs_1 = require("fs");
 const _createPath_1 = require("./_createPath");
 const _createSpriteContent_1 = require("./_createSpriteContent");
-function _generateSpriteFile({ source, spriteFile, mode, adapters, }) {
-    (0, _createPath_1._createPath)(spriteFile);
-    (0, fs_1.writeFileSync)(spriteFile, (0, _createSpriteContent_1._createSpriteContent)({ source, mode, adapters }));
+function _generateSpriteFile(config) {
+    (0, _createPath_1._createPath)(config.configFile);
+    (0, fs_1.writeFileSync)(config.spriteFile, (0, _createSpriteContent_1._createSpriteContent)(config));
 }
 exports._generateSpriteFile = _generateSpriteFile;

package/src/utils/_getConfig.d.ts

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

package/src/utils/_getConfig.js

@@ -11,11 +11,9 @@ function _getModuleDefinition(data) {
         format: data.format || "interface",
     };
 }
-function _getConfig() {
-    var _a;
-    const confFile = (_a = process.argv.filter((c) => c.includes("--configFile="))[0]) === null || _a === void 0 ? void 0 : _a.split("=")[1];
+function _getConfig(confFile) {
     /* eslint-disable-next-line @typescript-eslint/no-var-requires */
-    const loadedConfig = require(process.cwd() + "/" + (confFile || "icons.config.ts"));
+    const loadedConfig = require(process.cwd() + "/" + confFile);
     const config = {
         configDirectory: loadedConfig.configDirectory || "/src/config/",
         icons: loadedConfig.icons || {},

package/src/utils/_removeUnusedSeparateIconFiles.d.ts

@@ -1,7 +1,2 @@
-import { AdaptersType, SimpleIcon, SizedIcon } from "../types";
-export declare function _removeUnusedSeparateIconFiles({ source, directory, spriteFileName, adapters, }: {
-    source: Record<string, SimpleIcon | SizedIcon>;
-    directory: string;
-    spriteFileName: string;
-    adapters: AdaptersType<any>;
-}): void;
+import { _IconsConfig } from "../types";
+export declare function _removeUnusedSeparateIconFiles(config: _IconsConfig): void;

package/src/utils/_removeUnusedSeparateIconFiles.js

@@ -4,22 +4,22 @@ exports._removeUnusedSeparateIconFiles = void 0;
 const fs_1 = require("fs");
 const _createPath_1 = require("./_createPath");
 const _getIconFromAdapterName_1 = require("./_getIconFromAdapterName");
-function _removeUnusedSeparateIconFiles({ source, directory, spriteFileName, adapters, }) {
-    (0, _createPath_1._createPath)(directory, false);
-    const dir = (0, fs_1.readdirSync)(directory, { withFileTypes: true });
-    const allIconNames = Object.keys(source);
-    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-    if (adapters) {
-        Object.keys(adapters).map((adapterName) => {
-            const adapter = adapters[adapterName];
-            adapter.icons.map((iconName) => {
+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 !== spriteFileName) {
-            (0, fs_1.unlinkSync)(directory + file.name);
+        if (file.isFile() && !allIconNames.includes(file.name) && file.name !== config.spriteFileName) {
+            (0, fs_1.unlinkSync)(config.generatedDirectory + file.name);
         }
     });
 }

package/src/utils/_validateSourceData.d.ts

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

package/src/utils/{check/_validateSourceData.js → _validateSourceData.js}

@@ -2,19 +2,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports._validateSourceData = void 0;
 const fast_xml_parser_1 = require("fast-xml-parser");
-function _validateSourceData({ source, mode }) {
-    switch (mode) {
+function _validateSourceData(config) {
+    switch (config.mode) {
         case "simple":
-            Object.keys(source).map((name) => {
-                const svg = source[name];
+            Object.keys(config.icons).map((name) => {
+                const svg = config.icons[name];
                 if (fast_xml_parser_1.XMLValidator.validate(`<svg>${svg.data}</svg>`) !== true) {
                     throw new Error(`Invalid SVG data for icon "${name}"`);
                 }
             });
             break;
         case "sizes":
-            Object.keys(source).map((name) => {
-                const sizes = source[name];
+            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) {
@@ -24,7 +24,7 @@ function _validateSourceData({ source, mode }) {
             });
             break;
         default:
-            throw new Error("Unknown mode " + mode);
+            throw new Error("Unknown mode ");
     }
 }
 exports._validateSourceData = _validateSourceData;

package/src/utils/get-md5-from-file.d.ts

@@ -0,0 +1 @@
+export declare function getMd5FromFile(filename: string): string;

package/src/utils/get-md5-from-file.js

@@ -0,0 +1,15 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getMd5FromFile = void 0;
+const crypto_1 = __importDefault(require("crypto"));
+const fs_1 = __importDefault(require("fs"));
+function getMd5FromFile(filename) {
+    const fileBuffer = fs_1.default.readFileSync(filename);
+    const hashSum = crypto_1.default.createHash("md5");
+    hashSum.update(fileBuffer);
+    return hashSum.digest("hex");
+}
+exports.getMd5FromFile = getMd5FromFile;

package/tests/icons.config.js

@@ -4,8 +4,8 @@ const fa_pro_1 = require("../src/adapters/fa-pro");
 const config = {
     mode: "simple",
     typescript: true,
-    configDirectory: "/tests/config/",
-    generatedDirectory: "/tests/icons-generated/",
+    configDirectory: "/tests/__snapshots/config/",
+    generatedDirectory: "/tests/__snapshots/public/",
     spriteFileName: "_icon-sprite.svg",
     typeName: "MySuperIconsType",
     adapters: {

package/src/scripts/check.js

@@ -1,20 +0,0 @@
-#!/usr/bin/env node
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const _getConfig_1 = require("../utils/_getConfig");
-const _check_1 = require("../utils/check/_check");
-const config = (0, _getConfig_1._getConfig)();
-let error = false;
-try {
-    (0, _check_1._check)(config);
-}
-catch (e) {
-    // eslint-disable-next-line no-console
-    console.error(e);
-    error = true;
-}
-if (!error) {
-    // eslint-disable-next-line no-console
-    console.log("Everything OK!");
-}
-process.exit(error ? 1 : 0);

package/src/scripts/gen.d.ts

@@ -1,2 +0,0 @@
-#!/usr/bin/env node
-export {};

package/src/scripts/gen.js

@@ -1,83 +0,0 @@
-#!/usr/bin/env node
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const _generateAdaptersFallbackFiles_1 = require("../utils/_generateAdaptersFallbackFiles");
-const _generateConfigFile_1 = require("../utils/_generateConfigFile");
-const _generateDefinitionFile_1 = require("../utils/_generateDefinitionFile");
-const _generateSeparateIconFiles_1 = require("../utils/_generateSeparateIconFiles");
-const _generateSpriteFile_1 = require("../utils/_generateSpriteFile");
-const _getConfig_1 = require("../utils/_getConfig");
-const _removeUnusedSeparateIconFiles_1 = require("../utils/_removeUnusedSeparateIconFiles");
-const _check_1 = require("../utils/check/_check");
-const _validateSourceData_1 = require("../utils/check/_validateSourceData");
-const config = (0, _getConfig_1._getConfig)();
-let error = false;
-let shouldUpdate = false;
-try {
-    (0, _validateSourceData_1._validateSourceData)({ source: config.icons, mode: config.mode });
-    try {
-        (0, _check_1._check)(config);
-    }
-    catch (e) {
-        shouldUpdate = true;
-    }
-    (0, _validateSourceData_1._validateSourceData)({ source: config.icons, mode: config.mode });
-    if (shouldUpdate) {
-        (0, _generateSpriteFile_1._generateSpriteFile)({
-            source: config.icons,
-            spriteFile: config.spriteFile,
-            mode: config.mode,
-            adapters: config.adapters,
-        });
-        // eslint-disable-next-line no-console
-        console.log("Icon sprite file generated.");
-        (0, _generateDefinitionFile_1._generateDefinitionFile)({
-            source: config.icons,
-            resultFile: config.definitionFile,
-            typescript: config.typescript,
-            mode: config.mode,
-            typeName: config.typeName,
-            moduleDefinition: config.moduleDefinition,
-            customContent: config.customDefinitionContent,
-            adapters: config.adapters,
-        });
-        // eslint-disable-next-line no-console
-        console.log("Definition file generated.");
-        (0, _removeUnusedSeparateIconFiles_1._removeUnusedSeparateIconFiles)({
-            source: config.icons,
-            directory: config.generatedDirectory,
-            spriteFileName: config.spriteFileName,
-            adapters: config.adapters,
-        });
-        (0, _generateSeparateIconFiles_1._generateSeparateIconFiles)({
-            source: config.icons,
-            directory: config.generatedDirectory,
-            mode: config.mode,
-            adapters: config.adapters,
-        });
-        // eslint-disable-next-line no-console
-        console.log("Separate icons generated.");
-        (0, _generateConfigFile_1._generateConfigFile)({
-            configFile: config.configFile,
-            spriteFileName: config.spriteFileName,
-            generatedRelativeDirectory: config.generatedRelativeDirectory,
-        });
-        // eslint-disable-next-line no-console
-        console.log("Config file generated.");
-        (0, _generateAdaptersFallbackFiles_1._generateAdaptersFallbackFiles)({
-            configFile: config.configFile,
-        });
-        // eslint-disable-next-line no-console
-        console.log("Fallback files for adapters was generated.");
-    }
-    else {
-        // eslint-disable-next-line no-console
-        console.log("No changes in config, no icons generated.");
-    }
-}
-catch (e) {
-    // eslint-disable-next-line no-console
-    console.error(e);
-    error = true;
-}
-process.exit(error ? 1 : 0);

package/src/utils/_compareSprites.d.ts

@@ -1,7 +0,0 @@
-import { AdaptersType, Mode } from "../types";
-export declare function _compareSprites({ source, spriteFile, mode, adapters, }: {
-    source: any;
-    spriteFile: string;
-    mode: Mode;
-    adapters: AdaptersType<any>;
-}): boolean;

package/src/utils/_compareSprites.js

@@ -1,11 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports._compareSprites = void 0;
-const fs_1 = require("fs");
-const _createSpriteContent_1 = require("./_createSpriteContent");
-function _compareSprites({ source, spriteFile, mode, adapters, }) {
-    const spriteTextContent = (0, _createSpriteContent_1._createSpriteContent)({ source, mode, adapters });
-    const oldSvgContent = (0, fs_1.existsSync)(spriteFile) ? (0, fs_1.readFileSync)(spriteFile).toString() : "";
-    return spriteTextContent === oldSvgContent;
-}
-exports._compareSprites = _compareSprites;

package/src/utils/_createConfigFileContent.d.ts

@@ -1,4 +0,0 @@
-export declare function _createConfigFileContent({ spriteFileName, generatedRelativeDirectory, }: {
-    spriteFileName: string;
-    generatedRelativeDirectory: string;
-}): string;

package/src/utils/_createConfigFileContent.js

@@ -1,8 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports._createConfigFileContent = void 0;
-function _createConfigFileContent({ spriteFileName, generatedRelativeDirectory, }) {
-    const iconsVersion = new Date().getTime();
-    return `export const ICONS_VERSION = "${iconsVersion}";\nexport const ICON_SPRITE = "${generatedRelativeDirectory.replace("/public", "")}${spriteFileName}";\n`;
-}
-exports._createConfigFileContent = _createConfigFileContent;

package/src/utils/_generateConfigFile.d.ts

@@ -1,5 +0,0 @@
-export declare function _generateConfigFile({ configFile, spriteFileName, generatedRelativeDirectory, }: {
-    configFile: string;
-    spriteFileName: string;
-    generatedRelativeDirectory: string;
-}): void;

package/src/utils/_generateConfigFile.js

@@ -1,14 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports._generateConfigFile = void 0;
-const fs_1 = require("fs");
-const _createConfigFileContent_1 = require("./_createConfigFileContent");
-const _createPath_1 = require("./_createPath");
-function _generateConfigFile({ configFile, spriteFileName, generatedRelativeDirectory, }) {
-    (0, _createPath_1._createPath)(configFile);
-    (0, fs_1.writeFileSync)(configFile, (0, _createConfigFileContent_1._createConfigFileContent)({
-        spriteFileName: spriteFileName,
-        generatedRelativeDirectory: generatedRelativeDirectory,
-    }));
-}
-exports._generateConfigFile = _generateConfigFile;

package/src/utils/check/_check.d.ts

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

package/src/utils/check/_check.js

@@ -1,34 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports._check = void 0;
-const _validateConfigFile_1 = require("./_validateConfigFile");
-const _validateDefinitions_1 = require("./_validateDefinitions");
-const _validateSeparateIcons_1 = require("./_validateSeparateIcons");
-const _validateSourceData_1 = require("./_validateSourceData");
-const _validateSprite_1 = require("./_validateSprite");
-function _check(config) {
-    (0, _validateSourceData_1._validateSourceData)({ source: config.icons, mode: config.mode });
-    (0, _validateSprite_1._validateSprite)({
-        source: config.icons,
-        spriteFile: config.spriteFile,
-        mode: config.mode,
-        adapters: config.adapters,
-    });
-    (0, _validateDefinitions_1._validateDefinitions)({
-        source: config.icons,
-        resultFile: config.definitionFile,
-        typescript: config.typescript,
-        mode: config.mode,
-        typeName: config.typeName,
-        moduleDefinition: config.moduleDefinition,
-        customContent: config.customDefinitionContent,
-        adapters: config.adapters,
-    });
-    (0, _validateSeparateIcons_1._validateSeparateIcons)({ source: config.icons, generatedDir: config.generatedDirectory, mode: config.mode });
-    (0, _validateConfigFile_1._validateConfigFile)({
-        configFile: config.configFile,
-        spriteFileName: config.spriteFileName,
-        generatedRelativeDirectory: config.generatedRelativeDirectory,
-    });
-}
-exports._check = _check;

package/src/utils/check/_validateConfigFile.d.ts

@@ -1,5 +0,0 @@
-export declare function _validateConfigFile({ spriteFileName, generatedRelativeDirectory, configFile, }: {
-    spriteFileName: string;
-    generatedRelativeDirectory: string;
-    configFile: string;
-}): void;

package/src/utils/check/_validateConfigFile.js

@@ -1,19 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports._validateConfigFile = void 0;
-const fs_1 = require("fs");
-const _createConfigFileContent_1 = require("../_createConfigFileContent");
-function normalize(content) {
-    return content.replace(/ICONS_VERSION = "[0-9]+"/g, "%%VERSION%%");
-}
-function _validateConfigFile({ spriteFileName, generatedRelativeDirectory, configFile, }) {
-    const newContent = (0, _createConfigFileContent_1._createConfigFileContent)({
-        spriteFileName,
-        generatedRelativeDirectory,
-    });
-    const oldContent = (0, fs_1.existsSync)(configFile) ? (0, fs_1.readFileSync)(configFile).toString() : "";
-    if (normalize(newContent) !== normalize(oldContent)) {
-        throw new Error("Config file doesn't contain all valid information");
-    }
-}
-exports._validateConfigFile = _validateConfigFile;

package/src/utils/check/_validateDefinitions.d.ts

@@ -1,11 +0,0 @@
-import { AdaptersType, Mode, ModuleDefinition } from "../../types";
-export declare function _validateDefinitions({ source, resultFile, typescript, mode, typeName, moduleDefinition, customContent, adapters, }: {
-    source: any;
-    resultFile: string;
-    typescript: boolean;
-    mode: Mode;
-    typeName: string;
-    moduleDefinition?: ModuleDefinition;
-    customContent?: string;
-    adapters: AdaptersType<any>;
-}): void;

package/src/utils/check/_validateDefinitions.js

@@ -1,21 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports._validateDefinitions = void 0;
-const fs_1 = require("fs");
-const _createDefinitionFileContent_1 = require("../_createDefinitionFileContent");
-function _validateDefinitions({ source, resultFile, typescript, mode, typeName, moduleDefinition, customContent, adapters, }) {
-    const newContent = (0, _createDefinitionFileContent_1._createDefinitionFileContent)({
-        source,
-        typescript,
-        mode,
-        typeName,
-        moduleDefinition,
-        customContent,
-        adapters,
-    });
-    const oldContent = (0, fs_1.existsSync)(resultFile) ? (0, fs_1.readFileSync)(resultFile).toString() : "";
-    if (newContent !== oldContent) {
-        throw new Error("Definition file doesn't contain all valid icons from config");
-    }
-}
-exports._validateDefinitions = _validateDefinitions;

package/src/utils/check/_validateSeparateIcons.d.ts

@@ -1,6 +0,0 @@
-import { Mode } from "../../types";
-export declare function _validateSeparateIcons({ source, generatedDir, mode, }: {
-    source: any;
-    generatedDir: string;
-    mode: Mode;
-}): void;

package/src/utils/check/_validateSeparateIcons.js

@@ -1,39 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports._validateSeparateIcons = void 0;
-const fs_1 = require("fs");
-const _createIconContent_1 = require("../_createIconContent");
-function _validateSeparateIcons({ source, generatedDir, mode, }) {
-    switch (mode) {
-        case "simple":
-            Object.keys(source).map((name) => {
-                const svg = source[name];
-                const content = (0, _createIconContent_1._createIconContent)({ width: svg.width, height: svg.height, content: svg.data });
-                const oldContent = (0, fs_1.existsSync)(generatedDir + name + ".svg")
-                    ? (0, fs_1.readFileSync)(generatedDir + name + ".svg").toString()
-                    : "";
-                if (content !== oldContent) {
-                    throw new Error(`SVG file for icon "${name}" has no valid content for current config`);
-                }
-            });
-            break;
-        case "sizes":
-            Object.keys(source).map((name) => {
-                const size = source[name];
-                Object.keys(size).map((s) => {
-                    const svg = size[s];
-                    const content = (0, _createIconContent_1._createIconContent)({ width: s, height: s, content: svg });
-                    const oldContent = (0, fs_1.existsSync)(generatedDir + name + "_" + s + ".svg")
-                        ? (0, fs_1.readFileSync)(generatedDir + name + "_" + s + ".svg").toString()
-                        : "";
-                    if (content !== oldContent) {
-                        throw new Error(`SVG file for icon "${name}" has no valid content for current config`);
-                    }
-                });
-            });
-            break;
-        default:
-            throw new Error("Unknown mode " + mode);
-    }
-}
-exports._validateSeparateIcons = _validateSeparateIcons;

package/src/utils/check/_validateSourceData.d.ts

@@ -1,5 +0,0 @@
-import { Mode } from "../../types";
-export declare function _validateSourceData({ source, mode }: {
-    source: any;
-    mode: Mode;
-}): void;

package/src/utils/check/_validateSprite.d.ts

@@ -1,7 +0,0 @@
-import { AdaptersType, Mode } from "../../types";
-export declare function _validateSprite({ source, spriteFile, mode, adapters, }: {
-    source: any;
-    spriteFile: string;
-    mode: Mode;
-    adapters: AdaptersType<any>;
-}): void;

package/src/utils/check/_validateSprite.js

@@ -1,10 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports._validateSprite = void 0;
-const _compareSprites_1 = require("../_compareSprites");
-function _validateSprite({ source, spriteFile, mode, adapters, }) {
-    if (!(0, _compareSprites_1._compareSprites)({ source, mode, spriteFile, adapters })) {
-        throw new Error("SVG file doesn't contain all valid icons from config");
-    }
-}
-exports._validateSprite = _validateSprite;