@dicebear/converter 9.4.0 → 9.4.2

package/lib/node/core.js

@@ -39,8 +39,9 @@ async function toArrayBuffer(rawSvg, format, exif, options) {
 }
 async function toBuffer(rawSvg, format, exif, options) {
     const hasFonts = Array.isArray(options.fonts);
-    const { svg } = ensureSize(rawSvg, options.size);
+    const { svg, size } = ensureSize(rawSvg, options.size);
     let buffer = (await renderAsync(svg, {
+        fitTo: { mode: 'width', value: size },
         font: {
             loadSystemFonts: !hasFonts,
             fontFiles: hasFonts ? options.fonts : undefined,

package/lib/utils/svg.js

@@ -1,6 +1,17 @@
-import { XMLParser } from 'fast-xml-parser';
+import { XMLParser, XMLBuilder } from 'fast-xml-parser';
 const MAX_SIZE = 2048;
 const DEFAULT_SIZE = 512;
+const MAX_METADATA_LENGTH = 1024;
+const xmlRoundTripOptions = {
+    ignoreAttributes: false,
+    attributeNamePrefix: '@_',
+    preserveOrder: true,
+    commentPropName: '#comment',
+    allowBooleanAttributes: true,
+    processEntities: false,
+};
+const xmlRoundTripParser = new XMLParser(xmlRoundTripOptions);
+const xmlRoundTripBuilder = new XMLBuilder(xmlRoundTripOptions);
 function sanitizeSize(size) {
     if (!Number.isFinite(size) || size <= 0) {
         return DEFAULT_SIZE;
@@ -8,34 +19,34 @@ function sanitizeSize(size) {
     return Math.floor(Math.min(size, MAX_SIZE));
 }
 export function ensureSize(svg, size = DEFAULT_SIZE) {
+    var _a;
     size = sanitizeSize(size);
-    svg = svg.replace(/<svg([^>]*)/, (match, g1) => {
-        if (g1.match(/width="([^"]+)"/)) {
-            g1 = g1.replace(/width="([^"]+)"/, `width="${size}"`);
-        }
-        else {
-            g1 += ` width="${size}"`;
-        }
-        if (g1.match(/height="([^"]+)"/)) {
-            g1 = g1.replace(/height="([^"]+)"/, `height="${size}"`);
-        }
-        else {
-            g1 += ` height="${size}"`;
-        }
-        return `<svg${g1}`;
-    });
+    const parsed = xmlRoundTripParser.parse(svg);
+    const svgNode = parsed.find((node) => 'svg' in node);
+    if (svgNode) {
+        (_a = svgNode[':@']) !== null && _a !== void 0 ? _a : (svgNode[':@'] = {});
+        svgNode[':@']['@_width'] = String(size);
+        svgNode[':@']['@_height'] = String(size);
+    }
+    svg = xmlRoundTripBuilder.build(parsed);
     return { svg, size };
 }
+function sanitizeMetadataValue(value) {
+    if (typeof value !== 'string' || value.length === 0) {
+        return undefined;
+    }
+    return value.slice(0, MAX_METADATA_LENGTH);
+}
 export function getMetadata(svg) {
     var _a, _b;
     const parser = new XMLParser();
     const xml = parser.parse(svg);
     const rdfDescription = (_b = (_a = xml.svg.metadata) === null || _a === void 0 ? void 0 : _a['rdf:RDF']) === null || _b === void 0 ? void 0 : _b['rdf:Description'];
     return {
-        title: rdfDescription === null || rdfDescription === void 0 ? void 0 : rdfDescription['dc:title'],
-        source: rdfDescription === null || rdfDescription === void 0 ? void 0 : rdfDescription['dc:source'],
-        creator: rdfDescription === null || rdfDescription === void 0 ? void 0 : rdfDescription['dc:creator'],
-        license: rdfDescription === null || rdfDescription === void 0 ? void 0 : rdfDescription['dcterms:license'],
-        copyright: rdfDescription === null || rdfDescription === void 0 ? void 0 : rdfDescription['dc:rights'],
+        title: sanitizeMetadataValue(rdfDescription === null || rdfDescription === void 0 ? void 0 : rdfDescription['dc:title']),
+        source: sanitizeMetadataValue(rdfDescription === null || rdfDescription === void 0 ? void 0 : rdfDescription['dc:source']),
+        creator: sanitizeMetadataValue(rdfDescription === null || rdfDescription === void 0 ? void 0 : rdfDescription['dc:creator']),
+        license: sanitizeMetadataValue(rdfDescription === null || rdfDescription === void 0 ? void 0 : rdfDescription['dcterms:license']),
+        copyright: sanitizeMetadataValue(rdfDescription === null || rdfDescription === void 0 ? void 0 : rdfDescription['dc:rights']),
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dicebear/converter",
-  "version": "9.4.0",
+  "version": "9.4.2",
   "description": "SVG Converter for DiceBear",
   "keywords": [
     "dicebear"