somdigi-qr-generator 1.0.6 → 1.0.7

package/package.json

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

package/src/core.js

@@ -2,37 +2,89 @@ const QRCode = require("qrcode");
 const sharp = require("sharp");
 
 class QRGenerator {
-  static async generate({ data, type = "default", size = 512, gradient, logo }) {
-    if (!data) throw new Error("data required");
+  /**
+   * 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 (type === "default") {
-      return QRCode.toBuffer(data, { width: size, margin: 2 });
+    if (options.type === "rounded") {
+      return this.#generateRounded(options);
     }
 
-    return this._rounded({ data, size, gradient, logo });
+    throw new Error("invalid type");
   }
 
-  static async _rounded({ data, size, gradient, logo }) {
+  // ===============================
+  // ROUNDED QR CORE
+  // ===============================
+  static async #generateRounded({
+    data,
+    size = 512,
+    gradient,
+    logo
+  }) {
     const qr = QRCode.create(data, {
       errorCorrectionLevel: "H"
     });
 
     const cells = qr.modules;
     const count = cells.size;
-    const cellSize = 1;
 
+    const useGradient = Array.isArray(gradient) && gradient.length > 1;
+    const fill = useGradient ? "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;
 
         dots.push(
-          `<circle cx="${x + 0.5}" cy="${y + 0.5}" r="0.45" fill="${gradient ? "url(#g)" : "#000"}"/>`
+          `<circle cx="${x + 0.5}" cy="${y + 0.5}" r="0.45" fill="${fill}"/>`
         );
       }
     }
 
-    const defs = gradient
+    // --- 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%">
@@ -46,16 +98,27 @@ class QRGenerator {
       </defs>`
       : "";
 
+    // --- logo ---
     const logoSvg = logo
-      ? `<image href="${logo}" x="35%" y="35%" width="30%" height="30%" />`
+      ? `
+      <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}"
+  width="${size}"
+  height="${size}"
   viewBox="0 0 ${count} ${count}">
+  
   <rect width="100%" height="100%" fill="#fff"/>
   ${defs}
+  ${finders.join("")}
   ${dots.join("")}
   ${logoSvg}
 </svg>`;