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

Jump to bottom

Update dependency svgo to v2 #162

Merged
merged 6 commits into from Jul 7, 2021
Merged

Update dependency svgo to v2 #162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ead2543
Update dependency svgo to v2
renovate-bot May 6, 2021
24428ae
Merge branch 'master' into renovate/svgo-2.x
jameswilddev Jul 7, 2021
d5d4801
Update to support new SVGO.
jameswilddev Jul 7, 2021
5b20f06
Merge branch 'master' into renovate/svgo-2.x
jameswilddev Jul 7, 2021
2b1d1be
Fix breakage due to internal SVGO changes.
jameswilddev Jul 7, 2021
582b022
Merge branch 'master' into renovate/svgo-2.x
jameswilddev Jul 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
42 changes: 12 additions & 30 deletions @shanzhai/convert-svg-document-to-def-step/index.ts
View file
Open in desktop
Expand Up @@ -6,24 +6,13 @@ const JS2SVG = require("svgo/lib/svgo/js2svg");

import { Input, Output, ActionStep } from "@shanzhai/interfaces";

type AnySvgElement = SvgElementWithTextContent | SvgElementWithArrayContent;

type SvgElement<TContent> = {
content: TContent;

type ParsedSvg = {
children: ReadonlyArray<ParsedSvg>;
readonly attrs: {
id: string;
[key: string]: string;
};
};

type SvgElementWithTextContent = SvgElement<string>;

type SvgElementWithArrayContent = SvgElement<AnySvgElement[]>;

type SvgElementWithArrayOfArraysContent = SvgElement<
SvgElementWithArrayContent[]
>;

export class ConvertSvgDocumentToDefStep extends ActionStep {
constructor(
public readonly svgDocument: Input<string>,
Expand All @@ -35,35 +24,28 @@ export class ConvertSvgDocumentToDefStep extends ActionStep {
async execute(): Promise<void> {
const svgDocument = await this.svgDocument.get();

const root = await new Promise<AnySvgElement>((resolve) =>
svg2js(svgDocument, resolve)
);
const root = svg2js(svgDocument) as ParsedSvg;

const children = (root as SvgElementWithArrayOfArraysContent).content[0]
.content;
const children = root.children[0].children;

if (children === undefined) {
if (children.length === 0) {
throw new Error(`Empty SVG documents cannot be converted into defs.`);
}

if (children.length === 1) {
// Remove the wrapping <svg> (there's already a single root).
root.content = children;
root.children = children;
} else {
// Replace the wrapping <svg> with a <g>.
const groupSource = await new Promise<SvgElementWithArrayOfArraysContent>(
(resolve) => svg2js(`<svg><g></g></svg>`, resolve)
);
root.content = groupSource.content[0].content;
groupSource.content[0].content[0].content = children;
const groupSource = svg2js(`<svg><g></g></svg>`) as ParsedSvg;
root.children = groupSource.children[0].children;
groupSource.children[0].children[0].children = children;
}

// Inject a blank ID. This should be safely replaceable later down
// the line, as we've already filtered out IDs using SVGO.
const idSource = await new Promise<SvgElementWithArrayContent>((resolve) =>
svg2js(`<svg id="" />`, resolve)
);
root.content[0].attrs.id = idSource.content[0].attrs.id;
const idSource = svg2js(`<svg id="" />`) as ParsedSvg;
root.children[0].attrs.id = idSource.children[0].attrs.id;

const generated = new JS2SVG(root).data;
await this.svgDef.set(generated);
Expand Down