@dicebear/converter 5.1.3 → 5.1.5

package/lib/core.js

@@ -1,51 +1,46 @@
 import { getMimeType } from './utils/mime-type.js';
 import { ensureSize } from './utils/svg.js';
-const encoder = new TextEncoder();
-const decoder = new TextDecoder();
+import { getEncoder } from './utils/text.js';
 export const toFormat = function (svg, format, exif) {
     return {
-        toDataUri: async () => {
-            return toDataUri(await toArrayBuffer(svg, format, exif), format);
-        },
-        toFile: async (name) => {
-            return toFile(await toArrayBuffer(svg, format, exif), format, name);
-        },
-        toArrayBuffer: async () => {
-            return toArrayBuffer(svg, format, exif);
-        },
+        toDataUri: () => toDataUri(svg, format, exif),
+        toFile: (name) => toFile(name, svg, format, exif),
+        toArrayBuffer: () => toArrayBuffer(svg, format, exif),
     };
 };
-async function toDataUri(arrayBuffer, format) {
-    if (format === 'svg') {
-        return `data:${getMimeType('svg')};utf8,${encodeURIComponent(decoder.decode(arrayBuffer))}`;
+async function toDataUri(svg, format, exif) {
+    if ('svg' === format) {
+        return `data:${getMimeType(format)};utf8,${encodeURIComponent(svg)}`;
     }
-    else {
-        let binary = '';
-        const bytes = new Uint8Array(arrayBuffer);
-        const len = bytes.byteLength;
-        for (let i = 0; i < len; i++) {
-            binary += String.fromCharCode(bytes[i]);
-        }
-        return `data:${getMimeType(format)};base64,${window.btoa(binary)}`;
+    const canvas = await toCanvas(svg, format, exif);
+    return canvas.toDataURL(getMimeType(format));
+}
+async function toArrayBuffer(rawSvg, format, exif) {
+    if ('svg' === format) {
+        return getEncoder().encode(rawSvg);
     }
+    const canvas = await toCanvas(rawSvg, format, exif);
+    return await new Promise((resolve, reject) => {
+        canvas.toBlob((blob) => {
+            blob
+                ? resolve(blob.arrayBuffer())
+                : reject(new Error('Could not create blob'));
+        }, getMimeType(format));
+    });
 }
-async function toFile(arrayBuffer, format, name) {
+async function toFile(name, svg, format, exif) {
     const link = document.createElement('a');
-    link.href = await toDataUri(arrayBuffer, format);
+    link.href = await toDataUri(svg, format, exif);
     link.download = name;
     link.click();
     link.remove();
 }
-async function toArrayBuffer(rawSvg, format, exif) {
+async function toCanvas(rawSvg, format, exif) {
     if (exif) {
-        console.warn('The `exif` option is not supported in the browser version of `@dicebear/converter`.');
-        console.warn('Please use the node version of `@dicebear/converter` to generate images with exif data.');
-    }
-    if (format === 'svg') {
-        return encoder.encode(rawSvg);
+        console.warn('The `exif` option is not supported in the browser version of `@dicebear/converter`. \n' +
+            'Please use the node version of `@dicebear/converter` to generate images with exif data.');
     }
     let { svg, size } = ensureSize(rawSvg);
-    const svgArrayBuffer = encoder.encode(svg);
     const canvas = document.createElement('canvas');
     canvas.width = size;
     canvas.height = size;
@@ -60,15 +55,11 @@ async function toArrayBuffer(rawSvg, format, exif) {
     var img = document.createElement('img');
     img.width = size;
     img.height = size;
-    img.setAttribute('src', await toDataUri(svgArrayBuffer, 'svg'));
+    img.setAttribute('src', await toDataUri(svg, 'svg'));
     return new Promise((resolve, reject) => {
         img.onload = () => {
             context.drawImage(img, 0, 0, size, size);
-            canvas.toBlob((blob) => {
-                blob
-                    ? resolve(blob.arrayBuffer())
-                    : reject(new Error('Could not create blob'));
-            }, `image/${format}`);
+            resolve(canvas);
         };
         img.onerror = (e) => reject(e);
     });

package/lib/node/core.js

@@ -3,40 +3,35 @@ import { getMimeType } from '../utils/mime-type.js';
 import { ensureSize } from '../utils/svg.js';
 import * as tmp from 'tmp-promise';
 import { ensurePackage } from '../utils/package-helper.js';
-const encoder = new TextEncoder();
-const decoder = new TextDecoder();
+import { getEncoder } from '../utils/text.js';
 export const toFormat = function (svg, format, exif) {
     return {
-        toDataUri: async () => {
-            return toDataUri(await toArrayBuffer(svg, format, exif), format);
-        },
-        toFile: async (name) => {
-            return toFile(await toArrayBuffer(svg, format, exif), name);
-        },
-        toArrayBuffer: async () => {
-            return toArrayBuffer(svg, format, exif);
-        },
+        toDataUri: () => toDataUri(svg, format, exif),
+        toFile: (name) => toFile(name, svg, format, exif),
+        toArrayBuffer: () => toArrayBuffer(svg, format, exif),
     };
 };
-async function toDataUri(arrayBuffer, format) {
+async function toDataUri(svg, format, exif) {
     if (format === 'svg') {
-        return `data:${getMimeType(format)};utf8,${encodeURIComponent(decoder.decode(arrayBuffer))}`;
-    }
-    else {
-        const buffer = Buffer.from(arrayBuffer);
-        return `data:${getMimeType(format)};base64,${buffer.toString('base64')}`;
+        return `data:${getMimeType(format)};utf8,${encodeURIComponent(svg)}`;
     }
+    const buffer = await toBuffer(svg, format, exif);
+    return `data:${getMimeType(format)};base64,${buffer.toString('base64')}`;
 }
-async function toFile(arrayBuffer, name) {
-    return fs.writeFile(name, Buffer.from(arrayBuffer));
+async function toFile(name, svg, format, exif) {
+    if (format === 'svg') {
+        await fs.writeFile(name, svg);
+        return;
+    }
+    await fs.writeFile(name, await toBuffer(svg, format, exif));
 }
 async function toArrayBuffer(rawSvg, format, exif) {
     if (format === 'svg') {
-        if (exif) {
-            console.warn('Exif is ignored when converting to svg.');
-        }
-        return encoder.encode(rawSvg);
+        return getEncoder().encode(rawSvg);
     }
+    return (await toBuffer(rawSvg, format, exif)).buffer;
+}
+async function toBuffer(rawSvg, format, exif) {
     await ensurePackage('@resvg/resvg-js', '2.0.0');
     const { renderAsync } = await import('@resvg/resvg-js');
     const interRegular = new URL('../../fonts/inter/inter-regular.otf', import.meta.url);
@@ -49,7 +44,7 @@ async function toArrayBuffer(rawSvg, format, exif) {
             fontFiles: [interRegular.pathname, interBold.pathname],
         },
     })).asPng();
-    if (format === 'jpeg') {
+    if ('jpeg' === format) {
         await ensurePackage('sharp', '0.30.0');
         const sharp = (await import('sharp')).default;
         buffer = await sharp(buffer)
@@ -66,5 +61,5 @@ async function toArrayBuffer(rawSvg, format, exif) {
             buffer = await fs.readFile(path);
         });
     }
-    return buffer.buffer;
+    return buffer;
 }

package/lib/types.d.ts

@@ -2,7 +2,7 @@ export type ToFormat = (svg: string, format: Format, exif?: Exif) => Result;
 export interface Result {
     toDataUri(): Promise<string>;
     toFile(name: string): Promise<void>;
-    toArrayBuffer(): Promise<ArrayBuffer>;
+    toArrayBuffer(): Promise<ArrayBufferLike>;
 }
 export interface Exif {
     [key: string]: string;

package/lib/utils/mime-type.js

@@ -1,9 +1,11 @@
 export function getMimeType(format) {
     switch (format) {
+        case 'svg':
+            return 'image/svg+xml';
         case 'png':
         case 'jpeg':
             return `image/${format}`;
         default:
-            return 'image/svg+xml';
+            throw new Error(`Unsupported format: ${format}`);
     }
 }

package/lib/utils/text.d.ts

@@ -0,0 +1 @@
+export declare function getEncoder(): TextEncoder;

package/lib/utils/text.js

@@ -0,0 +1,7 @@
+let encoder;
+export function getEncoder() {
+    if (!encoder) {
+        encoder = new TextEncoder();
+    }
+    return encoder;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dicebear/converter",
-  "version": "5.1.3",
+  "version": "5.1.5",
   "description": "SVG Converter for DiceBear",
   "keywords": [
     "dicebear"
@@ -71,5 +71,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "3ea70708b220547b7e4f3db911abf9d30ef2d9ba"
+  "gitHead": "cd0ba272057aeb321db66e63a483d55557082344"
 }