somdigi-qr-generator 1.0.7 → 1.0.9

package/package.json

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

package/src/core.js

@@ -2,131 +2,88 @@ const QRCode = require("qrcode");
 const sharp = require("sharp");
 
 class QRGenerator {
-  /**
-   * Generate QR Code (Buffer PNG)
-   * @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");
-    }
-
-    if (!options.type || options.type === "default") {
-      return QRCode.toBuffer(options.data, {
-        width: options.size ?? 512,
-        margin: 2
-      });
-    }
 
-    if (options.type === "rounded") {
-      return this.#generateRounded(options);
-    }
-
-    throw new Error("invalid type");
-  }
-
-  // ===============================
-  // ROUNDED QR CORE
-  // ===============================
-  static async #generateRounded({
+  static async generate({
     data,
-    size = 512,
-    gradient,
-    logo
+    size = 1024,
+    margin = 1,
+    dotRadius = 0.48,
+    gradient = null,
+    errorCorrectionLevel = "M"
   }) {
-    const qr = QRCode.create(data, {
-      errorCorrectionLevel: "H"
-    });
+    if (!data) throw new Error("data required");
 
+    const qr = QRCode.create(data, { errorCorrectionLevel });
     const cells = qr.modules;
     const count = cells.size;
 
-    const useGradient = Array.isArray(gradient) && gradient.length > 1;
-    const fill = useGradient ? "url(#g)" : "#000";
+    const viewSize = count + margin * 2;
+    const fill = gradient ? "url(#g)" : "#000";
 
-    // --- helpers ---
-    const isFinder = (x, y) =>
-      (x < 7 && y < 7) ||
-      (x >= count - 7 && y < 7) ||
-      (x < 7 && y >= count - 7);
-
-    const renderFinder = (x, y) => `
-      <g>
-        <circle cx="${x + 3.5}" cy="${y + 3.5}" r="3.5" fill="${fill}"/>
-        <circle cx="${x + 3.5}" cy="${y + 3.5}" r="2.3" fill="#fff"/>
-        <circle cx="${x + 3.5}" cy="${y + 3.5}" r="1.3" fill="${fill}"/>
-      </g>
-    `;
-
-    // --- dots ---
     const dots = [];
+
     for (let y = 0; y < count; y++) {
       for (let x = 0; x < count; x++) {
         if (!cells.get(x, y)) continue;
-        if (isFinder(x, y)) continue;
+        if (this.#isFinder(x, y, count)) continue;
 
         dots.push(
-          `<circle cx="${x + 0.5}" cy="${y + 0.5}" r="0.45" fill="${fill}"/>`
+          `<circle cx="${x + margin + 0.5}" cy="${y + margin + 0.5}" r="${dotRadius}" fill="${fill}" />`
         );
       }
     }
 
-    // --- finders ---
-    const finders = [
-      renderFinder(0, 0),
-      renderFinder(count - 7, 0),
-      renderFinder(0, count - 7)
-    ];
-
-    // --- gradient defs ---
-    const defs = useGradient
-      ? `
-      <defs>
-        <linearGradient id="g" x1="0%" y1="0%" x2="100%" y2="100%">
-          ${gradient
-            .map(
-              (c, i) =>
-                `<stop offset="${(i / (gradient.length - 1)) * 100}%" stop-color="${c}"/>`
-            )
-            .join("")}
-        </linearGradient>
-      </defs>`
-      : "";
-
-    // --- logo ---
-    const logoSvg = logo
-      ? `
-      <image 
-        href="${logo}"
-        x="35%" y="35%"
-        width="30%" height="30%"
-        preserveAspectRatio="xMidYMid meet"
-      />`
-      : "";
-
-    // --- final svg ---
     const svg = `
-<svg xmlns="http://www.w3.org/2000/svg"
-  width="${size}"
-  height="${size}"
-  viewBox="0 0 ${count} ${count}">
-  
-  <rect width="100%" height="100%" fill="#fff"/>
-  ${defs}
-  ${finders.join("")}
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 ${viewSize} ${viewSize}">
+  ${gradient ? this.#gradientDef(gradient) : ""}
+  <rect width="100%" height="100%" fill="white"/>
+
+  ${this.#finder(viewSize, margin, fill)}
+
   ${dots.join("")}
-  ${logoSvg}
-</svg>`;
+</svg>
+`;
 
     return sharp(Buffer.from(svg))
-      .png({ background: "#fff" })
+      .resize(size, size)
+      .png({ quality: 100 })
       .toBuffer();
   }
+
+  // =============================
+  // FINDER (SOLID + OUTLINE)
+  // =============================
+  static #finder(_, margin, fill) {
+    const p = [
+      { x: 0, y: 0 },
+      { x: 21, y: 0 },
+      { x: 0, y: 21 }
+    ];
+
+    return p.map(v => `
+      <rect x="${v.x + margin}" y="${v.y + margin}" width="7" height="7" rx="2" fill="${fill}"/>
+      <rect x="${v.x + margin + 1}" y="${v.y + margin + 1}" width="5" height="5" rx="1.5" fill="white"/>
+      <rect x="${v.x + margin + 2}" y="${v.y + margin + 2}" width="3" height="3" rx="1" fill="${fill}"/>
+    `).join("");
+  }
+
+  static #isFinder(x, y, size) {
+    return (
+      (x < 7 && y < 7) ||
+      (x >= size - 7 && y < 7) ||
+      (x < 7 && y >= size - 7)
+    );
+  }
+
+  static #gradientDef([from, to]) {
+    return `
+    <defs>
+      <linearGradient id="g" x1="0%" y1="0%" x2="100%" y2="100%">
+        <stop offset="0%" stop-color="${from}" />
+        <stop offset="100%" stop-color="${to}" />
+      </linearGradient>
+    </defs>`;
+  }
 }
 
 module.exports = QRGenerator;