@liquid-js/qr-code-styling 1.10.3 → 1.10.5

package/lib/qr-code-styling-node.js

@@ -612,6 +612,56 @@ class QRDot {
     }
 }
 
+const browserImageTools = {
+    toDataURL(url) {
+        return new Promise((resolve, reject) => {
+            if (typeof url == "string") {
+                const xhr = new XMLHttpRequest();
+                xhr.onload = function () {
+                    const reader = new FileReader();
+                    reader.onloadend = function () {
+                        resolve(reader.result);
+                    };
+                    reader.readAsDataURL(xhr.response);
+                };
+                xhr.onerror = xhr.onabort = xhr.ontimeout = reject;
+                xhr.open("GET", url);
+                xhr.responseType = "blob";
+                xhr.send();
+            }
+            else {
+                const reader = new FileReader();
+                reader.onloadend = function () {
+                    resolve(reader.result);
+                };
+                reader.readAsDataURL(url);
+            }
+        });
+    },
+    getSize(options) {
+        return new Promise((resolve, reject) => {
+            if (!options.image) {
+                return reject("Image is not defined");
+            }
+            const image = new Image();
+            if (typeof options.imageOptions.crossOrigin === "string") {
+                image.crossOrigin = options.imageOptions.crossOrigin;
+            }
+            image.onload = () => {
+                resolve({ width: image.width, height: image.height });
+            };
+            image.onerror = image.onabort = reject;
+            if (typeof options.image == "string")
+                image.src = options.image;
+            else
+                browserImageTools
+                    .toDataURL(options.image)
+                    .then((url) => (image.src = url))
+                    .catch(reject);
+        });
+    }
+};
+
 function calculateImageSize({ originalHeight, originalWidth, maxHiddenDots, maxHiddenAxisDots, dotSize, margin }) {
     const hideDots = { x: 0, y: 0 };
     const imageSize = { x: 0, y: 0 };
@@ -682,56 +732,6 @@ function calculateImageSize({ originalHeight, originalWidth, maxHiddenDots, maxH
     };
 }
 
-const browserImageTools = {
-    toDataURL(url) {
-        return new Promise((resolve, reject) => {
-            if (typeof url == "string") {
-                const xhr = new XMLHttpRequest();
-                xhr.onload = function () {
-                    const reader = new FileReader();
-                    reader.onloadend = function () {
-                        resolve(reader.result);
-                    };
-                    reader.readAsDataURL(xhr.response);
-                };
-                xhr.onerror = xhr.onabort = xhr.ontimeout = reject;
-                xhr.open("GET", url);
-                xhr.responseType = "blob";
-                xhr.send();
-            }
-            else {
-                const reader = new FileReader();
-                reader.onloadend = function () {
-                    resolve(reader.result);
-                };
-                reader.readAsDataURL(url);
-            }
-        });
-    },
-    getSize(options) {
-        return new Promise((resolve, reject) => {
-            if (!options.image) {
-                return reject("Image is not defined");
-            }
-            const image = new Image();
-            if (typeof options.imageOptions.crossOrigin === "string") {
-                image.crossOrigin = options.imageOptions.crossOrigin;
-            }
-            image.onload = () => {
-                resolve({ width: image.width, height: image.height });
-            };
-            image.onerror = image.onabort = reject;
-            if (typeof options.image == "string")
-                image.src = options.image;
-            else
-                browserImageTools
-                    .toDataURL(options.image)
-                    .then((url) => (image.src = url))
-                    .catch(reject);
-        });
-    }
-};
-
 const squareMask = [
     [1, 1, 1, 1, 1, 1, 1],
     [1, 0, 0, 0, 0, 0, 1],
@@ -750,48 +750,15 @@ const dotMask = [
     [0, 0, 0, 0, 0, 0, 0],
     [0, 0, 0, 0, 0, 0, 0]
 ];
-const dataCount = {
-    "1": 104,
-    "2": 176,
-    "3": 272,
-    "4": 384,
-    "5": 496,
-    "6": 608,
-    "7": 704,
-    "8": 880,
-    "9": 1056,
-    "10": 1232,
-    "11": 1440,
-    "12": 1648,
-    "13": 1952,
-    "14": 2088,
-    "15": 2360,
-    "16": 2600,
-    "17": 2936,
-    "18": 3176,
-    "19": 3560,
-    "20": 3880,
-    "21": 4096,
-    "22": 4544,
-    "23": 4912,
-    "24": 5312,
-    "25": 5744,
-    "26": 6032,
-    "27": 6464,
-    "28": 6968,
-    "29": 7288,
-    "30": 7880,
-    "31": 8264,
-    "32": 8920,
-    "33": 9368,
-    "34": 9848,
-    "35": 10288,
-    "36": 10832,
-    "37": 11408,
-    "38": 12016,
-    "39": 12656,
-    "40": 13328
-};
+const alignmentCount = [
+    [35, 46],
+    [28, 33],
+    [21, 22],
+    [14, 13],
+    [7, 6],
+    [2, 1],
+    [1, 0]
+];
 class QRSVG {
     //TODO don't pass all options to this class
     constructor(options) {
@@ -816,7 +783,7 @@ class QRSVG {
     }
     async drawQR(qr) {
         const count = qr.getModuleCount();
-        const typeNumber = ((count - 17) / 4).toFixed(0);
+        const typeNumber = parseInt(((count - 17) / 4).toFixed(0), 10);
         const dotSize = this._options.dotsOptions.size;
         let drawImageSize = {
             hideXDots: 0,
@@ -830,7 +797,9 @@ class QRSVG {
             const size = await this._imageTools.getSize(this._options);
             const { imageOptions, qrOptions } = this._options;
             const coverLevel = imageOptions.imageSize * ErrorCorrectionPercents[qrOptions.errorCorrectionLevel];
-            const maxHiddenDots = Math.floor(coverLevel * dataCount[typeNumber]);
+            const alignment = alignmentCount.find((v) => v[0] <= typeNumber) || [0, 0];
+            const maxHiddenDots = Math.floor(coverLevel * (count * count - 3 * 8 * 8 - 2 * (count - 16) - alignment[1] * 25));
+            console.log(alignment, typeNumber, maxHiddenDots);
             drawImageSize = calculateImageSize({
                 originalWidth: size.width,
                 originalHeight: size.height,