somdigi-qr-generator 1.0.4 → 1.0.6

package/package.json

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

package/src/core.js

@@ -2,93 +2,67 @@ const QRCode = require("qrcode");
 const sharp = require("sharp");
 
 class QRGenerator {
-  /**
-   * Generate QR Buffer
-   * @param {Object} options
-   * @param {string} options.data (required)
-   * @param {"default"|"rounded"} options.type
-   * @param {number} options.size
-   * @param {string[]} options.gradient
-   * @param {string} options.logo (url / base64)
-   */
-  static async generate(options) {
-    if (!options || !options.data) {
-      throw new Error("data is required");
-    }
-
-    // 🔵 DEFAULT QR (FASTEST)
-    if (!options.type || options.type === "default") {
-      return QRCode.toBuffer(options.data, {
-        width: options.size ?? 512,
-        margin: 2
-      });
-    }
+  static async generate({ data, type = "default", size = 512, gradient, logo }) {
+    if (!data) throw new Error("data required");
 
-    // 🔵 ROUNDED QR
-    if (options.type === "rounded") {
-      return this._rounded(options);
+    if (type === "default") {
+      return QRCode.toBuffer(data, { width: size, margin: 2 });
     }
 
-    throw new Error("invalid type");
+    return this._rounded({ data, size, gradient, logo });
   }
 
-  static async _rounded(options) {
-    const rawSVG = await QRCode.toString(options.data, {
-      type: "svg",
-      errorCorrectionLevel: "H",
-      margin: 1
+  static async _rounded({ data, size, gradient, logo }) {
+    const qr = QRCode.create(data, {
+      errorCorrectionLevel: "H"
     });
 
-    const viewBox = rawSVG.match(/viewBox="([^"]+)"/)[1];
-    const paths = rawSVG.match(/<path[^>]*>/g) || [];
+    const cells = qr.modules;
+    const count = cells.size;
+    const cellSize = 1;
 
-    const fill = options.gradient?.length
-      ? "url(#g)"
-      : "#000";
+    const dots = [];
+    for (let y = 0; y < count; y++) {
+      for (let x = 0; x < count; x++) {
+        if (!cells.get(x, y)) continue;
 
-    const defs = options.gradient?.length
+        dots.push(
+          `<circle cx="${x + 0.5}" cy="${y + 0.5}" r="0.45" fill="${gradient ? "url(#g)" : "#000"}"/>`
+        );
+      }
+    }
+
+    const defs = gradient
       ? `
       <defs>
         <linearGradient id="g" x1="0%" y1="0%" x2="100%" y2="100%">
-          ${options.gradient
+          ${gradient
             .map(
               (c, i) =>
-                `<stop offset="${(i / (options.gradient.length - 1)) * 100}%" stop-color="${c}" />`
+                `<stop offset="${(i / (gradient.length - 1)) * 100}%" stop-color="${c}"/>`
             )
             .join("")}
         </linearGradient>
       </defs>`
       : "";
 
-    const dots = paths
-      .map(p => {
-        const m = p.match(/M(\d+) (\d+)/);
-        if (!m) return "";
-        return `<circle cx="${+m[1] + 0.5}" cy="${+m[2] + 0.5}" r="0.45" fill="${fill}" />`;
-      })
-      .join("");
-
-    const logo = options.logo
-      ? `
-      <image 
-        href="${options.logo}"
-        x="35%" y="35%"
-        width="30%" height="30%"
-        preserveAspectRatio="xMidYMid meet"
-      />`
+    const logoSvg = logo
+      ? `<image href="${logo}" x="35%" y="35%" width="30%" height="30%" />`
       : "";
 
     const svg = `
 <svg xmlns="http://www.w3.org/2000/svg"
-  width="${options.size ?? 512}"
-  height="${options.size ?? 512}"
-  viewBox="${viewBox}">
+  width="${size}" height="${size}"
+  viewBox="0 0 ${count} ${count}">
+  <rect width="100%" height="100%" fill="#fff"/>
   ${defs}
-  ${dots}
-  ${logo}
+  ${dots.join("")}
+  ${logoSvg}
 </svg>`;
 
-    return sharp(Buffer.from(svg)).png().toBuffer();
+    return sharp(Buffer.from(svg))
+      .png({ background: "#fff" })
+      .toBuffer();
   }
 }