@liquid-js/qr-code-styling 1.8.0 → 1.9.1

package/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2019 Denys Kozak
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2019 Denys Kozak
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/lib/index.d.ts

@@ -2,9 +2,4 @@ import { ErrorCorrectionPercents } from "./constants/errorCorrectionPercents";
 import { QRCodeStyling } from "./core/QRCodeStyling";
 import * as browserUtils from "./tools/browserUtils";
 export * from "./types";
-export { ErrorCorrectionPercents, QRCodeStyling };
-declare const _default: {
-    QRCodeStyling: typeof QRCodeStyling;
-    browserUtils: typeof browserUtils;
-};
-export default _default;
+export { ErrorCorrectionPercents, QRCodeStyling, browserUtils };

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

@@ -610,10 +610,14 @@ class QRDot {
     }
 }
 
-function calculateImageSize({ originalHeight, originalWidth, maxHiddenDots, maxHiddenAxisDots, dotSize }) {
+function calculateImageSize({ originalHeight, originalWidth, maxHiddenDots, maxHiddenAxisDots, dotSize, margin }) {
     const hideDots = { x: 0, y: 0 };
     const imageSize = { x: 0, y: 0 };
-    if (originalHeight <= 0 || originalWidth <= 0 || maxHiddenDots <= 0 || dotSize <= 0) {
+    if (originalHeight <= 0 ||
+        originalWidth <= 0 ||
+        maxHiddenDots <= 0 ||
+        dotSize <= 0 ||
+        4 * margin ** 2 > maxHiddenDots) {
         return {
             height: 0,
             width: 0,
@@ -621,41 +625,56 @@ function calculateImageSize({ originalHeight, originalWidth, maxHiddenDots, maxH
             hideXDots: 0
         };
     }
-    const k = originalHeight / originalWidth;
-    //Getting the maximum possible axis hidden dots
-    hideDots.x = Math.floor(Math.sqrt(maxHiddenDots / k));
-    //The count of hidden dot's can't be less than 1
-    if (hideDots.x <= 0)
-        hideDots.x = 1;
-    //Check the limit of the maximum allowed axis hidden dots
-    if (maxHiddenAxisDots && maxHiddenAxisDots < hideDots.x)
-        hideDots.x = maxHiddenAxisDots;
-    //The count of dots should be odd
-    if (hideDots.x % 2 === 0)
-        hideDots.x--;
-    imageSize.x = hideDots.x * dotSize;
-    //Calculate opposite axis hidden dots based on axis value.
-    //The value will be odd.
-    //We use ceil to prevent dots covering by the image.
-    hideDots.y = 1 + 2 * Math.ceil((hideDots.x * k - 1) / 2);
-    imageSize.y = Math.round(imageSize.x * k);
-    //If the result dots count is bigger than max - then decrease size and calculate again
-    if (hideDots.y * hideDots.x > maxHiddenDots || (maxHiddenAxisDots && maxHiddenAxisDots < hideDots.y)) {
-        if (maxHiddenAxisDots && maxHiddenAxisDots < hideDots.y) {
-            hideDots.y = maxHiddenAxisDots;
-            if (hideDots.y % 2 === 0)
-                hideDots.x--;
-        }
-        else {
-            hideDots.y -= 2;
-        }
-        imageSize.y = hideDots.y * dotSize;
-        hideDots.x = 1 + 2 * Math.ceil((hideDots.y / k - 1) / 2);
-        imageSize.x = Math.round(imageSize.y / k);
+    //If set, ensure maxHiddenAxisDots is odd and at least 1
+    if (maxHiddenAxisDots && maxHiddenAxisDots % 2 == 0)
+        maxHiddenAxisDots = Math.max(1, maxHiddenAxisDots - 1);
+    //Determine the bigger and smaller image dimension
+    const dimMax = Math.max(originalWidth, originalHeight);
+    const dimMin = Math.min(originalWidth, originalHeight);
+    //Find max image size along the bigger dimension
+    let lower = 0, upper = (maxHiddenAxisDots || maxHiddenDots) - 2 * margin;
+    do {
+        const size = lower + (upper - lower) / 2;
+        let dotsMax = Math.max(1, Math.ceil(size + 2 * margin));
+        if (dotsMax % 2 == 0)
+            dotsMax++;
+        let dotsMin = Math.max(1, Math.ceil((size * dimMin) / dimMax + 2 * margin));
+        if (dotsMin % 2 == 0)
+            dotsMin++;
+        if (dotsMax * dotsMin > maxHiddenDots)
+            upper = size;
+        else
+            lower = size;
+    } while (Math.abs(lower - upper) > 0.001);
+    //Calculate how many dots the given size corresponds to
+    const size = lower;
+    let hideMax = Math.max(1, Math.ceil(size + 2 * margin));
+    if (hideMax % 2 == 0)
+        hideMax++;
+    let hideMin = Math.max(1, Math.ceil((size * dimMin) / dimMax + 2 * margin));
+    if (hideMin % 2 == 0)
+        hideMin++;
+    //Set hidden dots along bigger and smaller dimension to the right axis
+    if (originalWidth > originalHeight) {
+        hideDots.x = hideMax;
+        hideDots.y = hideMin;
+    }
+    else {
+        hideDots.x = hideMin;
+        hideDots.y = hideMax;
+    }
+    //Fit image to the hidden dots
+    const maxW = (hideDots.x - 2 * margin) * dotSize;
+    const maxH = (hideDots.y - 2 * margin) * dotSize;
+    imageSize.x = maxW;
+    imageSize.y = (maxW * originalHeight) / originalWidth;
+    if (imageSize.y > maxH) {
+        imageSize.y = maxH;
+        imageSize.x = (maxH * originalWidth) / originalHeight;
     }
     return {
-        height: imageSize.y,
-        width: imageSize.x,
+        height: Math.round(imageSize.y + 2 * margin * dotSize),
+        width: Math.round(imageSize.x + 2 * margin * dotSize),
         hideYDots: hideDots.y,
         hideXDots: hideDots.x
     };
@@ -774,7 +793,8 @@ class QRSVG {
                 originalHeight: size.height,
                 maxHiddenDots,
                 maxHiddenAxisDots: count - 14,
-                dotSize
+                dotSize,
+                margin: imageOptions.margin
             });
         }
         this.drawBackground();
@@ -796,7 +816,7 @@ class QRSVG {
             return true;
         });
         this.drawCorners();
-        if (this._options.image) {
+        if (this._options.image && drawImageSize.width > 0 && drawImageSize.height > 0) {
             await this.drawImage({ width: drawImageSize.width, height: drawImageSize.height, count, dotSize });
         }
     }