@cyberalien/svg-utils 1.0.4 → 1.0.6

package/lib/components/helpers/filenames/asset.d.ts

@@ -1,4 +1,5 @@
 import { GeneratedAssetPath } from "../../types/options.js";
+declare const defaultHelpersDirectory = "helpers";
 /**
  * Generate asset filename based on options
  *
@@ -7,4 +8,4 @@ import { GeneratedAssetPath } from "../../types/options.js";
  * @returns Asset path
  */
 declare function getGeneratedAssetFilename(filename: string, rootPath: GeneratedAssetPath): GeneratedAssetPath;
-export { getGeneratedAssetFilename };
+export { defaultHelpersDirectory, getGeneratedAssetFilename };

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

@@ -1,3 +1,4 @@
+const defaultHelpersDirectory = "helpers";
 /**
 * Generate asset filename based on options
 *
@@ -13,4 +14,4 @@ function getGeneratedAssetFilename(filename, rootPath) {
 	};
 }
 
-export { getGeneratedAssetFilename };
+export { defaultHelpersDirectory, getGeneratedAssetFilename };

package/lib/components/helpers/filenames/path.d.ts

@@ -5,5 +5,5 @@ import { ComponentFactoryFileSystemOptions, GeneratedAssetPath } from "../../typ
  * @param options Factory options
  * @returns Asset path
  */
-declare function getFactoryRelativeRootPath(options: Pick<ComponentFactoryFileSystemOptions, 'doubleDirsForComponents' | 'prefixDirsForComponents'>): GeneratedAssetPath;
+declare function getFactoryRelativeRootPath(options: Pick<ComponentFactoryFileSystemOptions, 'doubleDirsForComponents' | 'prefixDirsForComponents'>, pathPrefix?: string): GeneratedAssetPath;
 export { getFactoryRelativeRootPath };

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

@@ -4,13 +4,13 @@
 * @param options Factory options
 * @returns Asset path
 */
-function getFactoryRelativeRootPath(options) {
+function getFactoryRelativeRootPath(options, pathPrefix) {
 	const { prefixDirsForComponents } = options;
 	const prefixDir = prefixDirsForComponents ? typeof prefixDirsForComponents === "string" ? prefixDirsForComponents : "prefix" : "";
 	const parentCount = (prefixDir ? prefixDir.split("/").length : 0) + (options.doubleDirsForComponents ? 1 : 0);
 	return {
 		import: parentCount ? "../".repeat(parentCount - 1) + ".." : ".",
-		filename: ""
+		filename: pathPrefix ?? ""
 	};
 }
 

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

@@ -11,8 +11,9 @@ function getGeneratedComponentTypesFilename(icon, content, options) {
 		length: 8
 	})}.d.ts`, options.rootPath);
 	const filename = getGeneratedComponentFilename(icon, ".d.ts", options);
+	const rootPath = options.rootPath.filename;
 	return {
-		filename,
+		filename: `${rootPath ? rootPath + "/" : ""}${filename}`,
 		import: `./${filename.split("/").pop()}`
 	};
 }

package/lib/components/helpers/functions/size.d.ts

@@ -4,5 +4,5 @@ import { FactoryComponentImports } from "../imports/types.js";
 /**
  * Adds getSizeProps() function to assets
  */
-declare function addSizeFunctionAsset(imports: FactoryComponentImports, assets: GeneratedAssetFile[], options: Pick<ComponentFactoryOptions, 'rootPath'>): string;
+declare function addSizeFunctionAsset(imports: FactoryComponentImports, assets: GeneratedAssetFile[], options: Pick<ComponentFactoryOptions, 'rootPath' | 'helpersDirectory'>): string;
 export { addSizeFunctionAsset };

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

@@ -1,4 +1,4 @@
-import { getGeneratedAssetFilename } from "../filenames/asset.js";
+import { defaultHelpersDirectory, getGeneratedAssetFilename } from "../filenames/asset.js";
 
 const functionName = "getSizeProps";
 const functionContent = `
@@ -9,7 +9,7 @@ const precision = 100;
 
 function calculateSize(size, ratio) {
     if (ratio === 1) {
-        return value;
+        return size;
     }
 
     const oldParts = size.split(unitsSplit);
@@ -67,7 +67,7 @@ export { ${functionName} };
 * Adds getSizeProps() function to assets
 */
 function addSizeFunctionAsset(imports, assets, options) {
-	const filename = getGeneratedAssetFilename("helpers/size.js", options.rootPath);
+	const filename = getGeneratedAssetFilename(`${options.helpersDirectory ?? defaultHelpersDirectory}/size.js`, options.rootPath);
 	imports.named[filename.import] = new Set([functionName]);
 	assets.push({
 		...filename,

package/lib/components/prepare/options.d.ts

@@ -2,5 +2,5 @@ import { ComponentFactoryFileSystemOptions } from "../types/options.js";
 /**
  * Generate file system options
  */
-declare function componentFactoryFileSystemOptions(base: Partial<ComponentFactoryFileSystemOptions>): ComponentFactoryFileSystemOptions;
+declare function componentFactoryFileSystemOptions(base: Partial<ComponentFactoryFileSystemOptions>, pathPrefix?: string): ComponentFactoryFileSystemOptions;
 export { componentFactoryFileSystemOptions };

package/lib/components/prepare/options.js

@@ -4,14 +4,14 @@ import { getFactoryRelativeRootPath } from "../helpers/filenames/path.js";
 /**
 * Generate file system options
 */
-function componentFactoryFileSystemOptions(base) {
+function componentFactoryFileSystemOptions(base, pathPrefix) {
 	const doubleDirsForCSS = base.doubleDirsForCSS ?? true;
 	const prefixDirsForComponents = base.prefixDirsForComponents ?? false;
 	const doubleDirsForComponents = base.doubleDirsForComponents ?? true;
 	const rootPath = base.rootPath ?? getFactoryRelativeRootPath({
 		doubleDirsForComponents,
 		prefixDirsForComponents
-	});
+	}, pathPrefix);
 	return {
 		doubleDirsForCSS,
 		prefixDirsForComponents,

package/lib/components/types/options.d.ts

@@ -15,6 +15,7 @@ interface ComponentFactoryFileSystemOptions {
   doubleDirsForComponents: boolean;
   rootPath: GeneratedAssetPath;
   cssPath: GeneratedAssetPath;
+  helpersDirectory?: string;
   sharedTypes?: boolean;
 }
 /**

package/lib/components/vue.js

@@ -82,7 +82,7 @@ function createVueComponent(data, options) {
 	const usedProps = getUsedFactoryProps(props);
 	if (usedProps.length) {
 		const tsCode = useTS ? `<{\n${stringifyFactoryPropTypes(props)}\n}>` : "";
-		componentCode.unshift(`const props = defineProps${tsCode}(${JSON.stringify(usedProps)});\n`);
+		componentCode.unshift(`const props = defineProps${tsCode}(${tsCode ? "" : JSON.stringify(usedProps)});\n`);
 	}
 	const template = `<template><${hasFallback ? "Icon" : "svg"} ${stringifyFactoryProps(props, ":{prop}=\"{value}\"")} /></template>`;
 	let content = `<script setup${useTS ? " lang=\"ts\"" : ""}>

package/package.json

@@ -3,7 +3,7 @@
   "type": "module",
   "description": "Common functions for working with SVG used by various packages.",
   "author": "Vjacheslav Trushkin",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "license": "MIT",
   "bugs": "https://github.com/cyberalien/svg-utils/issues",
   "homepage": "https://cyberalien.dev/",