fix: Merge pull request #194 from tancredi/remove-duplicate-svg-glyphs

Remove duplicate glyphs in SVG output
tancredi · May 15, 2021 · fd54837 · fd54837
2 parents 6595000 + 0a48309
commit fd54837
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 12 deletions.
diff --git a/src/generators/asset-types/__tests__/__snapshots__/svg.ts.snap b/src/generators/asset-types/__tests__/__snapshots__/svg.ts.snap
@@ -0,0 +1,5 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`\`SVG\` font generator passes correctly format options to \`SVGIcons2SVGFontStream\` 1`] = `"processed->content->/root/foo.svg|{\\"name\\":\\"foo\\",\\"unicode\\":[\\"\\\\u0001\\"]}$processed->content->/root/bar.svg|{\\"name\\":\\"bar\\",\\"unicode\\":[\\"\\\\u0001\\"]}$"`;
+
+exports[`\`SVG\` font generator resolves with the result of the completed \`SVGIcons2SVGFontStream\` 1`] = `"processed->content->/root/foo.svg|{\\"name\\":\\"foo\\",\\"unicode\\":[\\"\\\\u0001\\"]}$processed->content->/root/bar.svg|{\\"name\\":\\"bar\\",\\"unicode\\":[\\"\\\\u0001\\"]}$"`;
diff --git a/src/generators/asset-types/__tests__/svg.ts b/src/generators/asset-types/__tests__/svg.ts
@@ -1,4 +1,4 @@
-import _SVGIcons2SVGFontStream from 'svgicons2svgfont';
+import * as _SVGIcons2SVGFontStream from 'svgicons2svgfont';
 import { FontAssetType } from '../../../types/misc';
 import { FontGeneratorOptions } from '../../../types/generator';
 import svgGen from '../svg';
@@ -21,7 +21,12 @@ jest.mock('svgicons2svgfont', () => {
     public content = '';
 
     public write(chunk: any) {
-      this.events.emit('data', Buffer.from(`processed->${chunk.content}$`));
+      this.events.emit(
+        'data',
+        Buffer.from(
+          `processed->${chunk.content}|${JSON.stringify(chunk.metadata)}$`
+        )
+      );
       return this;
     }
 
@@ -71,15 +76,15 @@ describe('`SVG` font generator', () => {
       __mock: 'options__'
     });
 
-    expect(result).toBe(
-      'processed->content->/root/foo.svg$processed->content->/root/bar.svg$'
-    );
+    expect(result).toMatchSnapshot();
   });
 
   test('passes correctly format options to `SVGIcons2SVGFontStream`', async () => {
     const log = () => null;
     const formatOptions = { descent: 5, fontHeight: 6, log };
-    await svgGen.generate(mockOptions(formatOptions), null);
+    const result = await svgGen.generate(mockOptions(formatOptions), null);
+
+    expect(result).toMatchSnapshot();
 
     expect(SVGIcons2SVGFontStream).toHaveBeenCalledTimes(1);
     expect(SVGIcons2SVGFontStream).toHaveBeenCalledWith({

diff --git a/src/generators/asset-types/svg.ts b/src/generators/asset-types/svg.ts
@@ -31,13 +31,8 @@ const generator: FontGenerator<void> = {
       for (const { id, absolutePath } of Object.values(assets)) {
         const glyph: GglyphStream = createReadStream(absolutePath);
         const unicode = String.fromCharCode(codepoints[id]);
-        let ligature = '';
 
-        for (let i = 0; i < id.length; i++) {
-          ligature += String.fromCharCode(id.charCodeAt(i));
-        }
-
-        glyph.metadata = { name: id, unicode: [unicode, ligature] };
+        glyph.metadata = { name: id, unicode: [unicode] };
 
         fontStream.write(glyph);
       }