somdigi-qr-generator 1.0.9 → 1.0.11

package/index.js

@@ -1,5 +1,7 @@
 const QRGenerator = require("./src/core");
+const ImageMerger = require("./src/image-merger");
 
 module.exports = {
-    QRGenerator
+    QRGenerator,
+    ImageMerger
 };

package/package.json

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

package/src/core.js

@@ -6,17 +6,19 @@ class QRGenerator {
   static async generate({
     data,
     size = 1024,
-    margin = 1,
-    dotRadius = 0.48,
+    margin = 2,
+    dotRadius = 0.45,
     gradient = null,
     errorCorrectionLevel = "M"
   }) {
     if (!data) throw new Error("data required");
 
+    // Generate QR matrix
     const qr = QRCode.create(data, { errorCorrectionLevel });
     const cells = qr.modules;
     const count = cells.size;
 
+    // REAL viewbox size (margin kiri + kanan)
     const viewSize = count + margin * 2;
     const fill = gradient ? "url(#g)" : "#000";
 
@@ -28,21 +30,24 @@ class QRGenerator {
         if (this.#isFinder(x, y, count)) continue;
 
         dots.push(
-          `<circle cx="${x + margin + 0.5}" cy="${y + margin + 0.5}" r="${dotRadius}" fill="${fill}" />`
+          `<circle cx="${x + margin + 0.5}"
+                   cy="${y + margin + 0.5}"
+                   r="${dotRadius}"
+                   fill="${fill}" />`
         );
       }
     }
 
     const svg = `
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 ${viewSize} ${viewSize}">
+<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)}
+  ${this.#finder(count, margin, fill)}
 
   ${dots.join("")}
-</svg>
-`;
+</svg>`;
 
     return sharp(Buffer.from(svg))
       .resize(size, size)
@@ -51,22 +56,28 @@ class QRGenerator {
   }
 
   // =============================
-  // FINDER (SOLID + OUTLINE)
+  // FINDER PATTERN (DINAMIS)
   // =============================
-  static #finder(_, margin, fill) {
-    const p = [
+  static #finder(size, margin, fill) {
+    const pos = [
       { x: 0, y: 0 },
-      { x: 21, y: 0 },
-      { x: 0, y: 21 }
+      { x: size - 7, y: 0 },
+      { x: 0, y: size - 7 }
     ];
 
-    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}"/>
+    return pos.map(p => `
+      <rect x="${p.x + margin}" y="${p.y + margin}"
+            width="7" height="7" rx="2" fill="${fill}"/>
+      <rect x="${p.x + margin + 1}" y="${p.y + margin + 1}"
+            width="5" height="5" rx="1.5" fill="white"/>
+      <rect x="${p.x + margin + 2}" y="${p.y + margin + 2}"
+            width="3" height="3" rx="1" fill="${fill}"/>
     `).join("");
   }
 
+  // =============================
+  // EXCLUDE FINDER AREA
+  // =============================
   static #isFinder(x, y, size) {
     return (
       (x < 7 && y < 7) ||
@@ -75,10 +86,15 @@ class QRGenerator {
     );
   }
 
+  // =============================
+  // GRADIENT SUPPORT
+  // =============================
   static #gradientDef([from, to]) {
     return `
     <defs>
-      <linearGradient id="g" x1="0%" y1="0%" x2="100%" y2="100%">
+      <linearGradient id="g"
+        x1="0%" y1="0%"
+        x2="100%" y2="100%">
         <stop offset="0%" stop-color="${from}" />
         <stop offset="100%" stop-color="${to}" />
       </linearGradient>

package/src/image-merger.js

@@ -0,0 +1,59 @@
+const sharp = require("sharp");
+
+class ImageMerger {
+
+  /**
+   * Merge QR image into frame image
+   * @param {Object} options
+   * @param {string|Buffer} options.qr       Path / Buffer QR image
+   * @param {string|Buffer} options.frame    Path / Buffer frame image
+   * @param {number} [options.qrScale=0.75]  QR size relative to frame (0.5 - 0.9)
+   * @param {number} [options.offsetX=0]     Move QR horizontally
+   * @param {number} [options.offsetY=0]     Move QR vertically
+   * @returns {Promise<Buffer>}
+   */
+  static async merge({
+    qr,
+    frame,
+    qrScale = 0.75,
+    offsetX = 0,
+    offsetY = 0
+  }) {
+    if (!qr || !frame) {
+      throw new Error("qr and frame are required");
+    }
+
+    // Load frame
+    const frameImage = sharp(frame);
+    const frameMeta = await frameImage.metadata();
+
+    // Calculate QR size
+    const qrSize = Math.floor(
+      Math.min(frameMeta.width, frameMeta.height) * qrScale
+    );
+
+    // Resize QR
+    const qrBuffer = await sharp(qr)
+      .resize(qrSize, qrSize)
+      .png()
+      .toBuffer();
+
+    // Center position
+    const left = Math.floor((frameMeta.width - qrSize) / 2 + offsetX);
+    const top = Math.floor((frameMeta.height - qrSize) / 2 + offsetY);
+
+    // Composite
+    return frameImage
+      .composite([
+        {
+          input: qrBuffer,
+          left,
+          top
+        }
+      ])
+      .png({ quality: 100 })
+      .toBuffer();
+  }
+}
+
+module.exports = ImageMerger;