Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor @comet/admin-icons generator to accept a broader variation of SVGs #1732

Merged
merged 2 commits into from
Feb 22, 2024
Merged

Refactor @comet/admin-icons generator to accept a broader variation of SVGs #1732

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
681b0c1
fix: refactored icon generator to accept a broader variation of svgs
Feb 21, 2024
aeff72f
refactor: integrated deletion of fill tag into XMLParser
Feb 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 23 additions & 11 deletions packages/admin/admin-icons/generate-icons.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Presets, SingleBar } from "cli-progress";
import { ESLint } from "eslint";
import { XMLParser } from "fast-xml-parser";
import { XMLBuilder, XMLParser } from "fast-xml-parser";
import { existsSync, mkdirSync, readdirSync, readFileSync, rmSync, writeFileSync } from "fs";
import { pascalCase, pascalCaseTransformMerge } from "pascal-case";
import * as path from "path";
Expand Down Expand Up @@ -48,9 +48,12 @@ const main = async () => {
bar.increment(1, {
title: `Generate icons ${icon.name}`,
});
const pathData = getPathData(icon);
const svgData = getSVGData(icon);

return writeComponent(icon, pathData);
const builder = new XMLBuilder({ ignoreAttributes: false });
const svgString = builder.build(svgData);

return writeComponent(icon, svgString);
}),
);
bar.stop();
Expand All @@ -60,15 +63,24 @@ const main = async () => {

const getComponentName = (fileName: string) => pascalCase(fileName.split(".")[0], { transform: pascalCaseTransformMerge });

const getPathData = (icon: Icon) => {
const getSVGData = (icon: Icon) => {
const fileContents = readFileSync(icon.path);
const parsedXml = new XMLParser({ ignoreAttributes: false, attributeNamePrefix: "" }).parse(fileContents.toString());
const parsedXml = new XMLParser({ ignoreAttributes: false }).parse(fileContents.toString());

if (parsedXml?.svg?.path?.d === undefined) {
throw new Error(`The file ${icon.name} must contain a <path> element with a d attribute`);
}
removeFillAttributes(parsedXml.svg);
return parsedXml.svg;
};

return parsedXml.svg.path.d;
const removeFillAttributes = (obj: any) => {
if (typeof obj === "object") {
Object.keys(obj).forEach((key) => {
if (key === "@_fill") {
delete obj[key];
} else if (typeof obj[key] === "object") {
removeFillAttributes(obj[key]);
}
});
}
};

const getFormattedText = async (text: string) => {
Expand All @@ -81,7 +93,7 @@ const getFormattedText = async (text: string) => {
return results[0].output;
};

const writeComponent = async (icon: Icon, pathData: string) => {
const writeComponent = async (icon: Icon, svgString: string) => {
const component = await getFormattedText(`
import { SvgIcon, SvgIconProps } from "@mui/material";
import * as React from "react";
Expand All @@ -96,7 +108,7 @@ const writeComponent = async (icon: Icon, pathData: string) => {
export const ${icon.componentName} = React.forwardRef<SVGSVGElement, SvgIconProps>((props, ref) => {
return (
<SvgIcon {...props} ref={ref} viewBox="0 0 16 16">
<path d="${pathData}" />
${svgString}
</SvgIcon>
);
});
Expand Down
Loading