@cyberalien/svg-utils 1.2.5 → 1.2.7

package/lib/classname/const.js

@@ -1,4 +1,3 @@
 const defaultClassProp = "class";
 const classProps = [defaultClassProp];
-
-export { classProps, defaultClassProp };
+export { classProps, defaultClassProp };

package/lib/classname/toggle.js

@@ -1,5 +1,4 @@
 import { defaultClassProp } from "./const.js";
-
 /**
 * Split class name by spaces
 */
@@ -25,5 +24,4 @@ function toggleClassName(attribs, className, add, prop = defaultClassProp) {
 	}
 	attribs[prop] = Array.from(list).sort().join(" ");
 }
-
-export { splitClassName, toggleClassName };
+export { splitClassName, toggleClassName };

package/lib/components/export/dependencies.js

@@ -14,5 +14,4 @@ function createDependenciesForPackage(dependencies, customVersions) {
 		return result;
 	}
 }
-
-export { addComponentDependencies, createDependenciesForPackage };
+export { addComponentDependencies, createDependenciesForPackage };

package/lib/components/export/exports.js

@@ -14,5 +14,4 @@ function createExportsForMainFiles(data, options = {}) {
 	}
 	return result;
 }
-
-export { createExportsForMainFiles };
+export { createExportsForMainFiles };

package/lib/components/export/file.js

@@ -1,5 +1,4 @@
 import { getGeneratedComponentFilename } from "./filename.js";
-
 /**
 * Add icon and filename to generated component
 */
@@ -13,5 +12,4 @@ function convertGeneratedComponentToFile(icon, item, options) {
 		...item
 	};
 }
-
-export { convertGeneratedComponentToFile };
+export { convertGeneratedComponentToFile };

package/lib/components/export/filename.js

@@ -11,5 +11,4 @@ function getGeneratedComponentFilename(icon, componentExtension, options) {
 	const { prefixDirsForComponents } = options;
 	return (prefixDirsForComponents ? `${typeof prefixDirsForComponents === "string" ? prefixDirsForComponents : prefix}/` : "") + (options.doubleDirsForComponents ? `${name.slice(0, 1).toLowerCase()}/` : "") + name + componentExtension;
 }
-
-export { getGeneratedComponentFilename };
+export { getGeneratedComponentFilename };

package/lib/components/export/fs.js

@@ -1,5 +1,4 @@
 import { mkdir, writeFile } from "node:fs/promises";
-
 /**
 * Save exported files to filesystem
 */
@@ -16,5 +15,4 @@ async function saveExportedFilesToFS(files, dir) {
 	}
 	return saved;
 }
-
-export { saveExportedFilesToFS };
+export { saveExportedFilesToFS };

package/lib/components/export/merge.js

@@ -1,5 +1,4 @@
 import { stringifyStylesheet } from "../../css/stylesheet.js";
-
 /**
 * Merge exported component files into single array
 */
@@ -25,5 +24,4 @@ function mergeExportedComponentFiles(items, files) {
 	}
 	return files;
 }
-
-export { mergeExportedComponentFiles };
+export { mergeExportedComponentFiles };

package/lib/components/helpers/code/lines.js

@@ -5,5 +5,4 @@ function stringifyFactoryIconCodeLines(lines, padding = 0) {
 	const pad = "  ".repeat(padding);
 	return lines.map((line) => pad + line).join("\n");
 }
-
-export { stringifyFactoryIconCodeLines };
+export { stringifyFactoryIconCodeLines };

package/lib/components/helpers/content/ratio.js

@@ -5,5 +5,4 @@ function getViewBoxRatio(viewBox) {
 	const ratio = viewBox.width / viewBox.height;
 	return (Math.ceil(ratio * 100) / 100).toFixed(2).replace(/\.?0+$/, "");
 }
-
-export { getViewBoxRatio };
+export { getViewBoxRatio };

package/lib/components/helpers/content/size.js

@@ -1,5 +1,4 @@
 import { calculateSize } from "../../../svg/props/size.js";
-
 /**
 * Get size values for component
 */
@@ -18,5 +17,4 @@ function getComponentSizeValues(options, viewBox) {
 		height: square ? width : calculateSize(width, viewBox.height / viewBox.width)
 	};
 }
-
-export { getComponentSizeValues };
+export { getComponentSizeValues };

package/lib/components/helpers/content/stringify.js

@@ -1,5 +1,4 @@
 import { stringifyStylesheet } from "../../../css/stylesheet.js";
-
 /**
 * Convert icon content to a string literal
 */
@@ -7,5 +6,4 @@ function stringifyFactoryIconContent(icon, embedCSS) {
 	const style = embedCSS ? stringifyStylesheet(embedCSS) : "";
 	return "`" + (style ? `<style>${style}</style>${icon.content}` : icon.content).replace(/`/g, "\\`") + "`";
 }
-
-export { stringifyFactoryIconContent };
+export { stringifyFactoryIconContent };

package/lib/components/helpers/css/generate.js

@@ -1,7 +1,6 @@
 import { createEmptyStylesheet, stringifyStylesheet } from "../../../css/stylesheet.js";
 import { getGeneratedCSSFilename } from "../filenames/css.js";
 import { renderStatefulSVGCSSIconStyle } from "../../../svg-css/icon/css.js";
-
 /**
 * Generate CSS files for component
 *
@@ -65,5 +64,4 @@ function generateCSSFilesForComponent(content, imports, assets, options) {
 	}
 	return returnCSS ? commonStylesheet : void 0;
 }
-
-export { generateCSSFilesForComponent };
+export { generateCSSFilesForComponent };

package/lib/components/helpers/filenames/asset.js

@@ -13,5 +13,4 @@ function getGeneratedAssetFilename(filename, rootPath) {
 		filename: `${basePath ? basePath + "/" : ""}${filename}`
 	};
 }
-
-export { defaultHelpersDirectory, getGeneratedAssetFilename };
+export { defaultHelpersDirectory, getGeneratedAssetFilename };

package/lib/components/helpers/filenames/css.js

@@ -1,5 +1,4 @@
 import { getGeneratedAssetFilename } from "./asset.js";
-
 /**
 * Generate CSS filename based on options
 */
@@ -7,5 +6,4 @@ function getGeneratedCSSFilename(name, options) {
 	const { cssPath, doubleDirsForCSS } = options;
 	return getGeneratedAssetFilename(`${doubleDirsForCSS ? `${name.slice(0, 1).toLowerCase()}/${name}` : name}.css`, cssPath);
 }
-
-export { getGeneratedCSSFilename };
+export { getGeneratedCSSFilename };

package/lib/components/helpers/filenames/path.js

@@ -13,5 +13,4 @@ function getFactoryRelativeRootPath(options, pathPrefix) {
 		filename: pathPrefix ?? ""
 	};
 }
-
-export { getFactoryRelativeRootPath };
+export { getFactoryRelativeRootPath };

package/lib/components/helpers/filenames/types.js

@@ -1,7 +1,6 @@
 import { getUniqueHash } from "../../../helpers/hash/unique.js";
 import { getGeneratedAssetFilename } from "./asset.js";
 import { getGeneratedComponentFilename } from "../../export/filename.js";
-
 /**
 * Generate component types filename based on options
 */
@@ -18,5 +17,4 @@ function getGeneratedComponentTypesFilename(icon, content, options) {
 		import: `./${filename.split("/").pop()}`
 	};
 }
-
-export { getGeneratedComponentTypesFilename };
+export { getGeneratedComponentTypesFilename };

package/lib/components/helpers/functions/custom.js

@@ -1,17 +1,15 @@
-import { defaultHelpersDirectory, getGeneratedAssetFilename } from "../filenames/asset.js";
+import { getGeneratedAssetFilename } from "../filenames/asset.js";
 import { camelToKebab } from "../../../helpers/misc/strings.js";
-
 /**
 * Adds a custom function to assets
 */
 function addCustomFunctionAsset(imports, assets, options, data) {
 	const { functionName, content, exportNames } = data;
-	const filename = getGeneratedAssetFilename(`${options.helpersDirectory ?? defaultHelpersDirectory}/${data.jsName ?? camelToKebab(functionName)}.js`, options.rootPath);
+	const filename = getGeneratedAssetFilename(`${options.helpersDirectory ?? "helpers"}/${data.jsName ?? camelToKebab(functionName)}.js`, options.rootPath);
 	assets.push({
 		...filename,
 		content
 	});
 	imports.named[filename.import] = exportNames ?? new Set([functionName]);
 }
-
-export { addCustomFunctionAsset };
+export { addCustomFunctionAsset };

package/lib/components/helpers/functions/fallback.js

@@ -1,7 +1,6 @@
 import { createUniqueHashContext } from "../../../helpers/hash/context.js";
 import { getUniqueHash } from "../../../helpers/hash/unique.js";
-import { defaultHelpersDirectory, getGeneratedAssetFilename } from "../filenames/asset.js";
-
+import { getGeneratedAssetFilename } from "../filenames/asset.js";
 const sharedFunctionName = "getIconFallback";
 const hashedFunctionName = "getFallback";
 const functionContent = `
@@ -32,7 +31,7 @@ function addFallbackFunctionAsset(imports, assets, options, defaultValues) {
 		css: true,
 		length: 10
 	});
-	const assetDirectory = options.helpersDirectory ?? defaultHelpersDirectory;
+	const assetDirectory = options.helpersDirectory ?? "helpers";
 	const sharedFilename = getGeneratedAssetFilename(`${assetDirectory}/fallback.js`, options.rootPath);
 	assets.push({
 		...sharedFilename,
@@ -49,5 +48,4 @@ export const ${hashedFunctionName} = ${sharedFunctionName}.bind(null, ${JSON.str
 	imports.named[hashedFilename.import] = new Set([hashedFunctionName]);
 	return hashedFunctionName;
 }
-
-export { addFallbackFunctionAsset };
+export { addFallbackFunctionAsset };

package/lib/components/helpers/functions/innerhtml.js

@@ -1,5 +1,4 @@
 import { addCustomFunctionAsset } from "./custom.js";
-
 const functionName = "cleanupHTML";
 /**
 * Adds cleanUpInnerHTML() function to assets
@@ -31,5 +30,4 @@ export function ${functionName}(html) {
 	});
 	return functionName;
 }
-
-export { addInnerHTMLFunctionAsset };
+export { addInnerHTMLFunctionAsset };

package/lib/components/helpers/functions/size.js

@@ -1,5 +1,4 @@
-import { defaultHelpersDirectory, getGeneratedAssetFilename } from "../filenames/asset.js";
-
+import { getGeneratedAssetFilename } from "../filenames/asset.js";
 const functionName = "getSizeProps";
 const functionContent = `
 const unitsSplit = /(-?[0-9.]*[0-9]+[0-9.]*)/g;
@@ -67,7 +66,7 @@ export { ${functionName} };
 * Adds getSizeProps() function to assets
 */
 function addSizeFunctionAsset(imports, assets, options) {
-	const filename = getGeneratedAssetFilename(`${options.helpersDirectory ?? defaultHelpersDirectory}/size.js`, options.rootPath);
+	const filename = getGeneratedAssetFilename(`${options.helpersDirectory ?? "helpers"}/size.js`, options.rootPath);
 	assets.push({
 		...filename,
 		content: functionContent
@@ -75,5 +74,4 @@ function addSizeFunctionAsset(imports, assets, options) {
 	imports.named[filename.import] = new Set([functionName]);
 	return functionName;
 }
-
-export { addSizeFunctionAsset };
+export { addSizeFunctionAsset };

package/lib/components/helpers/imports/add.js

@@ -14,5 +14,4 @@ function addNamedImport(data, source, names) {
 function addTypeImport(data, source, types) {
 	addToSet(data.types[source] ??= /* @__PURE__ */ new Set(), types);
 }
-
-export { addNamedImport, addTypeImport };
+export { addNamedImport, addTypeImport };

package/lib/components/helpers/imports/create.js

@@ -10,5 +10,4 @@ function createFactoryImports() {
 		css: /* @__PURE__ */ new Set()
 	};
 }
-
-export { createFactoryImports };
+export { createFactoryImports };

package/lib/components/helpers/imports/stringify.js

@@ -41,5 +41,4 @@ function stringifyFactoryImports(imports, includeTypes = true) {
 	if (lines.length) lines.push("");
 	return lines.join("\n");
 }
-
-export { stringifyFactoryImports };
+export { stringifyFactoryImports };

package/lib/components/helpers/imports/types.js

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

package/lib/components/helpers/props/object.js

@@ -1,10 +1,8 @@
 import { stringifyFactoryProps } from "./stringify.js";
-
 /**
 * Stringify properties for component as JS object
 */
 function stringifyFactoryPropsAsJSON(props, separator = "\n	") {
 	return stringifyFactoryProps(props, "\"{prop}\": {value},", "\"{prop}\": \"{value}\",", separator);
 }
-
-export { stringifyFactoryPropsAsJSON };
+export { stringifyFactoryPropsAsJSON };

package/lib/components/helpers/props/stringify.js

@@ -17,5 +17,4 @@ function stringifyFactoryProps(props, dynamicTemplate, staticTemplate = factoryP
 	}
 	return result.join(separator);
 }
-
-export { factoryPropTemplate, stringifyFactoryProps };
+export { factoryPropTemplate, stringifyFactoryProps };

package/lib/components/helpers/props/ts.js

@@ -23,5 +23,4 @@ function stringifyFactoryPropTypes(props) {
 function getUsedFactoryProps(props) {
 	return parse(props, (key) => key);
 }
-
-export { getUsedFactoryProps, stringifyFactoryPropTypes };
+export { getUsedFactoryProps, stringifyFactoryPropTypes };

package/lib/components/helpers/props/types.js

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

package/lib/components/helpers/ts/jsx.js

@@ -1,11 +1,9 @@
-import { addComponentTypes } from "./wrapper.js";
-
+import { addComponentTypes, omitComponentSVGProps } from "./wrapper.js";
 const iconPropsTemplate = `interface IconProps {
 /* PROPS */
 }`;
 const exportTemplate = `export { type IconProps };
 export default Component;`;
-const omitProps = `'viewBox' | 'width' | 'height' | 'xmlns'`;
 /**
 * Add JSX component types
 */
@@ -18,7 +16,7 @@ function addJSXComponentTypes(data, options, assets, props) {
 ${iconPropsTemplate}
 
 const Component: ForwardRefExoticComponent<
-    Omit<SVGProps<SVGSVGElement>, ${omitProps}> & IconProps
+    Omit<SVGProps<SVGSVGElement>, ${omitComponentSVGProps}> & IconProps
 >;
 
 ${exportTemplate}
@@ -28,12 +26,11 @@ ${exportTemplate}
 
 ${iconPropsTemplate}
 
-const Component: (props: Omit<JSX.SVGAttributes<SVGSVGElement>, ${omitProps}> & IconProps) => JSX.Element;
+const Component: (props: Omit<JSX.SVGAttributes<SVGSVGElement>, ${omitComponentSVGProps}> & IconProps) => JSX.Element;
 
 ${exportTemplate}
 `;
 	}
 	return addComponentTypes(template, data, options, assets, props);
 }
-
-export { addJSXComponentTypes };
+export { addJSXComponentTypes };

package/lib/components/helpers/ts/solid.d.ts

@@ -0,0 +1,9 @@
+import { GeneratedAssetFile } from "../../types/component.js";
+import { FactoryIconData } from "../../types/data.js";
+import { ComponentFactoryOptions } from "../../types/options.js";
+import { FactoryComponentProps } from "../props/types.js";
+/**
+ * Add Solid component types
+ */
+declare const addSolidComponentTypes: (data: FactoryIconData, options: ComponentFactoryOptions, assets: GeneratedAssetFile[], props: FactoryComponentProps) => string;
+export { addSolidComponentTypes };

package/lib/components/helpers/ts/solid.js

@@ -0,0 +1,18 @@
+import { addComponentTypes, omitComponentSVGProps } from "./wrapper.js";
+/**
+* Add Solid component types
+*/
+const addSolidComponentTypes = addComponentTypes.bind(null, `import { JSX } from 'solid-js';
+
+interface IconProps {
+/* PROPS */
+}
+
+declare const Component: (
+	props: Omit<JSX.SvgSVGAttributes<SVGSVGElement>, ${omitComponentSVGProps}> & IconProps
+) => JSX.Element;
+
+export { type IconProps };
+export default Component;
+`);
+export { addSolidComponentTypes };

package/lib/components/helpers/ts/svelte.js

@@ -1,5 +1,4 @@
 import { addComponentTypes } from "./wrapper.js";
-
 /**
 * Add Svelte component types
 */
@@ -15,5 +14,4 @@ declare class Component extends SvelteComponent<Omit<SvelteHTMLElements['svg'],
 export { type IconProps };
 export default Component;
 `);
-
-export { addSvelteComponentTypes };
+export { addSvelteComponentTypes };

package/lib/components/helpers/ts/vue.js

@@ -1,5 +1,4 @@
 import { addComponentTypes } from "./wrapper.js";
-
 /**
 * Add Vue component types
 */
@@ -14,5 +13,4 @@ declare const Component: DefineSetupFnComponent<IconProps, {}, {}, IconProps & {
 export { type IconProps };
 export default Component;
 `);
-
-export { addVueComponentTypes };
+export { addVueComponentTypes };

package/lib/components/helpers/ts/wrapper.d.ts

@@ -2,8 +2,12 @@ import { GeneratedAssetFile } from "../../types/component.js";
 import { FactoryIconData } from "../../types/data.js";
 import { ComponentFactoryOptions } from "../../types/options.js";
 import { FactoryComponentProps } from "../props/types.js";
+/**
+ * Properties to omit
+ */
+declare const omitComponentSVGProps = "'viewBox' | 'width' | 'height' | 'xmlns'";
 /**
  * Add component types
  */
 declare function addComponentTypes(template: string, data: FactoryIconData, options: ComponentFactoryOptions, assets: GeneratedAssetFile[], props: FactoryComponentProps): string;
-export { addComponentTypes };
+export { addComponentTypes, omitComponentSVGProps };

package/lib/components/helpers/ts/wrapper.js

@@ -1,6 +1,9 @@
 import { stringifyFactoryPropTypes } from "../props/ts.js";
 import { getGeneratedComponentTypesFilename } from "../filenames/types.js";
-
+/**
+* Properties to omit
+*/
+const omitComponentSVGProps = `'viewBox' | 'width' | 'height' | 'xmlns'`;
 /**
 * Add component types
 */
@@ -14,5 +17,4 @@ function addComponentTypes(template, data, options, assets, props) {
 	});
 	return filename.filename;
 }
-
-export { addComponentTypes };
+export { addComponentTypes, omitComponentSVGProps };

package/lib/components/jsx.d.ts

@@ -8,7 +8,7 @@ interface Options extends ComponentFactoryOptions {
   ts?: boolean;
 }
 /**
- * Create functional Vue component code
+ * Create React component code
  */
 declare function createJSXComponent(data: FactoryIconData, options: Options): FactoryGeneratedComponent;
 export { createJSXComponent };

package/lib/components/jsx.js

@@ -14,9 +14,8 @@ import { addJSXComponentTypes } from "./helpers/ts/jsx.js";
 import { addCustomFunctionAsset } from "./helpers/functions/custom.js";
 import { addFallbackFunctionAsset } from "./helpers/functions/fallback.js";
 import { addInnerHTMLFunctionAsset } from "./helpers/functions/innerhtml.js";
-
 /**
-* Create functional Vue component code
+* Create React component code
 */
 function createJSXComponent(data, options) {
 	const icon = data.icon;
@@ -178,8 +177,7 @@ function createJSXComponent(data, options) {
 	const propTypes = stringifyFactoryPropTypes(props);
 	const typesCode = useTS ? `interface Props {\n${propTypes}\n};\n\n` : propTypes ? `/** @type {{${propTypes.replace(/\s*\n\s*/g, " ").trim()}}} */\n` : "";
 	const usedProps = getUsedFactoryProps(props);
-	const propsDestricturing = usedProps.length ? `{${[...usedProps, "...props"].join(", ")}}` : "props";
-	const componentFunction = `${typesCode}function Component${useTS ? `<Props>` : ""}(${propsDestricturing}) {
+	const componentFunction = `${typesCode}function Component(${usedProps.length ? `{${[...usedProps, "...props"].join(", ")}}` : "props"}${useTS ? `: Props` : ""}) {
 \t${componentInternalCode.join("\n	")}
 }
 `;
@@ -193,5 +191,4 @@ function createJSXComponent(data, options) {
 		dependencies: dependencies.size ? dependencies : void 0
 	};
 }
-
-export { createJSXComponent };
+export { createJSXComponent };

package/lib/components/prepare/iconify.js

@@ -1,7 +1,6 @@
 import { convertSVGContentToCSSRules } from "../../svg-css/content.js";
 import { getGeneratedAssetFilename } from "../helpers/filenames/asset.js";
-import { normaliseIconifyIcon } from "../../iconify/icon/nornalise.js";
-
+import { normaliseIconifyIcon } from "../../iconify/icon/normalise.js";
 /**
 * Convert IconifyIcon data to FactoryIconData
 */
@@ -36,5 +35,4 @@ function getIconifyIconsetMetadataAsset(iconSet, rootPath) {
 	});
 	return assets;
 }
-
-export { convertIconifyIconToFactoryContent, getIconifyIconsetMetadataAsset };
+export { convertIconifyIconToFactoryContent, getIconifyIconsetMetadataAsset };

package/lib/components/prepare/options.js

@@ -1,6 +1,5 @@
 import { getGeneratedAssetFilename } from "../helpers/filenames/asset.js";
 import { getFactoryRelativeRootPath } from "../helpers/filenames/path.js";
-
 /**
 * Generate file system options
 */
@@ -21,5 +20,4 @@ function componentFactoryFileSystemOptions(base, pathPrefix) {
 		sharedTypes: base.sharedTypes ?? false
 	};
 }
-
-export { componentFactoryFileSystemOptions };
+export { componentFactoryFileSystemOptions };

package/lib/components/prepare/states.js

@@ -2,7 +2,6 @@ import { getStateValue } from "../../svg-css/states/value.js";
 import { createStatefulIconSelectorsContext } from "../../svg-css/states/selector/parse.js";
 import { parseIconFallbackTemplate } from "../../svg-css/states/fallback/parse.js";
 import { parseViewBox } from "../../svg/viewbox/parse.js";
-
 /**
 * Check states for stateful icon
 */
@@ -69,5 +68,4 @@ function prepareComponentFactoryStatefulIcon(icon, options) {
 		statefulData
 	};
 }
-
-export { prepareComponentFactoryStatefulIcon };
+export { prepareComponentFactoryStatefulIcon };

package/lib/components/raw.js

@@ -7,7 +7,6 @@ import { generateCSSFilesForComponent } from "./helpers/css/generate.js";
 import { factoryPropTemplate, stringifyFactoryProps } from "./helpers/props/stringify.js";
 import { stringifyFactoryImports } from "./helpers/imports/stringify.js";
 import { getGeneratedComponentTypesFilename } from "./helpers/filenames/types.js";
-
 /**
 * Create raw component code
 */
@@ -43,5 +42,4 @@ function createRawComponent(data, options) {
 		style: isEmbeddedCSS ? void 0 : style
 	};
 }
-
-export { createRawComponent };
+export { createRawComponent };

package/lib/components/solid.d.ts

@@ -0,0 +1,11 @@
+import { FactoryGeneratedComponent } from "./types/component.js";
+import { FactoryIconData } from "./types/data.js";
+import { ComponentFactoryOptions } from "./types/options.js";
+interface Options extends ComponentFactoryOptions {
+  ts?: boolean;
+}
+/**
+ * Create Solid component code
+ */
+declare function createSolidComponent(data: FactoryIconData, options: Options): FactoryGeneratedComponent;
+export { createSolidComponent };