somdigi-qr-generator 1.0.1 → 1.0.3

package/index.js

@@ -1,5 +1,5 @@
-const generateQR = require("./src/core");
+const generateQr = require("./src/core");
 
 module.exports = {
-    generateQR
+    generateQr
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "somdigi-qr-generator",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

package/src/core.js

@@ -4,54 +4,53 @@ const fs = require("fs/promises");
 const path = require("path");
 
 const {
+  extractPaths,
   buildGradient,
-  squareToDot,
+  pathsToDots,
   insertLogo
 } = require("./svg-helper");
 
-class FastDotQR {
+class generateQr {
   static async toSVG(text, options = {}) {
-    if (!text) throw new Error("text required");
-
     const rawSVG = await QRCode.toString(text, {
       type: "svg",
       errorCorrectionLevel: "H",
       margin: options.margin ?? 1
     });
 
+    const sizeMatch = rawSVG.match(/viewBox="([^"]+)"/);
+    const viewBox = sizeMatch ? sizeMatch[1] : "0 0 100 100";
+
+    const paths = extractPaths(rawSVG);
+
     const gradientId = "qrGradient";
-    const gradient =
-      options.gradient?.length > 1
-        ? buildGradient(gradientId, options.gradient)
-        : "";
-
-    const fill =
-      options.gradient?.length > 1
-        ? `url(#${gradientId})`
-        : options.color ?? "#000";
-
-    let content = squareToDot(
-      rawSVG,
+    const useGradient = options.gradient?.length > 1;
+
+    const fill = useGradient
+      ? `url(#${gradientId})`
+      : options.color ?? "#000";
+
+    const defs = useGradient
+      ? buildGradient(gradientId, options.gradient)
+      : "";
+
+    const dots = pathsToDots(
+      paths,
       options.radius ?? 1.4,
       fill
     );
 
-    if (options.logo) {
-      content = insertLogo(
-        content,
-        options.logo,
-        options.logoSize ?? 0.25
-      );
-    }
+    const logo = options.logo
+      ? insertLogo(options.logo, options.logoSize ?? 0.25)
+      : "";
 
-    return rawSVG
-      .replace("</svg>", "")
-      .replace(
-        "<svg",
-        `<svg xmlns="http://www.w3.org/2000/svg">`
-      )
-      .replace(">", `>${gradient}`)
-      .replace("</svg>", `${content}</svg>`);
+    // 🔒 SVG FINAL — VALID 100%
+    return `
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="${viewBox}">
+  ${defs}
+  ${dots}
+  ${logo}
+</svg>`;
   }
 
   static async toPNG(text, options = {}) {
@@ -66,15 +65,13 @@ class FastDotQR {
     const fullPath = path.join(dir, filename);
 
     if (filename.endsWith(".svg")) {
-      const svg = await this.toSVG(text, options);
-      await fs.writeFile(fullPath, svg);
+      await fs.writeFile(fullPath, await this.toSVG(text, options));
     } else {
-      const buffer = await this.toPNG(text, options);
-      await fs.writeFile(fullPath, buffer);
+      await fs.writeFile(fullPath, await this.toPNG(text, options));
     }
 
     return fullPath;
   }
 }
 
-module.exports = FastDotQR;
+module.exports = generateQr;

package/src/svg-helper.js

@@ -1,50 +1,49 @@
+function extractPaths(svg) {
+  return svg.match(/<path[^>]*>/g) || [];
+}
+
 function buildGradient(id, colors) {
   return `
-    <defs>
-      <linearGradient id="${id}" x1="0%" y1="0%" x2="100%" y2="100%">
-        ${colors
-          .map(
-            (c, i) =>
-              `<stop offset="${(i / (colors.length - 1)) * 100}%" stop-color="${c}" />`
-          )
-          .join("")}
-      </linearGradient>
-    </defs>
-  `;
+  <defs>
+    <linearGradient id="${id}" x1="0%" y1="0%" x2="100%" y2="100%">
+      ${colors
+        .map(
+          (c, i) =>
+            `<stop offset="${(i / (colors.length - 1)) * 100}%" stop-color="${c}" />`
+        )
+        .join("")}
+    </linearGradient>
+  </defs>`;
 }
 
-function squareToDot(svg, radius, fill) {
-  return svg
-    .replace(/<path[^>]*>/g, match => {
-      const m = match.match(/M(\d+) (\d+)/);
+function pathsToDots(paths, radius, fill) {
+  return paths
+    .map(p => {
+      const m = p.match(/M(\d+) (\d+)/);
       if (!m) return "";
       const x = Number(m[1]) + radius;
       const y = Number(m[2]) + radius;
       return `<circle cx="${x}" cy="${y}" r="${radius}" fill="${fill}" />`;
     })
-    .replace(/<svg[^>]*>/, s => s.replace(">", ` fill="none">`))
-    .replace(/<\/svg>/, "");
+    .join("");
 }
 
-function insertLogo(svg, logo, sizePercent = 0.25) {
-  const size = `${sizePercent * 100}%`;
-
+function insertLogo(logo, size = 0.25) {
+  const percent = size * 100;
   return `
-    ${svg}
-    <image 
-      href="${logo}" 
-      x="50%" 
-      y="50%"
-      width="${size}"
-      height="${size}"
-      transform="translate(-${sizePercent * 50}%, -${sizePercent * 50}%)"
-      preserveAspectRatio="xMidYMid meet"
-    />
-  `;
+  <image
+    href="${logo}"
+    x="${50 - percent / 2}%"
+    y="${50 - percent / 2}%"
+    width="${percent}%"
+    height="${percent}%"
+    preserveAspectRatio="xMidYMid meet"
+  />`;
 }
 
 module.exports = {
+  extractPaths,
   buildGradient,
-  squareToDot,
+  pathsToDots,
   insertLogo
 };