@liquid-js/qr-code-styling 4.0.8 → 4.1.0

package/lib/figures/dot.d.ts

@@ -14,6 +14,7 @@ export declare class QRDot {
     private basicCornerRounded;
     private basicCornerExtraRounded;
     private basicCornersRounded;
+    private basicWave;
     private drawDot;
     private drawRandomDot;
     private drawSquare;
@@ -26,4 +27,5 @@ export declare class QRDot {
     private drawExtraRounded;
     private drawClassy;
     private drawClassyRounded;
+    private drawWave;
 }

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

@@ -45,7 +45,7 @@ function sanitizeGradient(gradient_newGradient) {
 DotType.extraRounded = "extra-rounded", DotType.verticalLine = "vertical-line", 
 DotType.horizontalLine = "horizontal-line", DotType.classy = "classy", DotType.classyRounded = "classy-rounded", 
 DotType.square = "square", DotType.smallSquare = "small-square", DotType.tinySquare = "tiny-square", 
-DotType.diamond = "diamond", (CornerDotType = CornerDotType ||= {}).dot = "dot", 
+DotType.diamond = "diamond", DotType.wave = "wave", (CornerDotType = CornerDotType ||= {}).dot = "dot", 
 CornerDotType.square = "square", CornerDotType.heart = "heart", CornerDotType.extraRounded = "extra-rounded", 
 CornerDotType.classy = "classy", CornerDotType.outpoint = "outpoint", CornerDotType.inpoint = "inpoint", 
 (CornerSquareType = CornerSquareType ||= {}).dot = "dot", CornerSquareType.square = "square", 
@@ -507,6 +507,10 @@ class QRDot {
             drawFunction = this.drawTinySquare;
             break;
 
+          case DotType.wave:
+            drawFunction = this.drawWave;
+            break;
+
           default:
             drawFunction = this.drawSquare;
         }
@@ -577,6 +581,16 @@ class QRDot {
             }
         });
     }
+    basicWave(args) {
+        let {size, x, y} = args, a1 = 5 * Math.PI / 180, a2 = 65 * Math.PI / 180, c23x = size * (.95 - .65 * Math.cos(a1)), c23y = size * (1 - .65 * Math.sin(a1)), c31x = -size * Math.cos(a2) / 2, c31y = -size * Math.sin(a2) / 2;
+        this.rotateFigure({
+            ...args,
+            draw: () => {
+                this._element = this.document.createElementNS("http://www.w3.org/2000/svg", "path"), 
+                this._element.setAttribute("d", svgPath`M ${x} ${y} c 0 ${.65 * size} ${c23x} ${c23y} ${.95 * size} ${size} c ${c31x} ${c31y} ${size * (1 - .95)} ${-size / 2} ${size * (1 - .95)} ${-size} z`);
+            }
+        });
+    }
     drawDot({x, y, size}) {
         this.basicDot({
             x,
@@ -779,6 +793,33 @@ class QRDot {
             rotation: -Math.PI / 2
         });
     }
+    drawWave({x, y, size, getNeighbor: bottomNeighbor}) {
+        let leftNeighbor = bottomNeighbor ? +bottomNeighbor(-1, 0) : 0, rightNeighbor = bottomNeighbor ? +bottomNeighbor(1, 0) : 0;
+        var rotation = bottomNeighbor ? +bottomNeighbor(0, -1) : 0, neighborsCount = leftNeighbor + rightNeighbor + rotation + (bottomNeighbor = bottomNeighbor ? +bottomNeighbor(0, 1) : 0);
+        0 === neighborsCount ? this.basicDot({
+            x,
+            y,
+            size,
+            rotation: 0
+        }) : neighborsCount > 2 || leftNeighbor && rightNeighbor || rotation && bottomNeighbor ? this.basicSquare({
+            x,
+            y,
+            size,
+            rotation: 0
+        }) : 2 === neighborsCount ? (neighborsCount = 0, leftNeighbor && rotation ? neighborsCount = Math.PI / 2 : rotation && rightNeighbor ? neighborsCount = Math.PI : rightNeighbor && bottomNeighbor && (neighborsCount = -Math.PI / 2), 
+        this.basicCornerExtraRounded({
+            x,
+            y,
+            size,
+            rotation: neighborsCount
+        })) : 1 === neighborsCount && (rotation = 0, rightNeighbor ? rotation = Math.PI / 2 : bottomNeighbor ? rotation = Math.PI : leftNeighbor && (rotation = -Math.PI / 2), 
+        this.basicWave({
+            x,
+            y,
+            size,
+            rotation
+        }));
+    }
 }
 
 let browserImageTools = {
@@ -833,7 +874,9 @@ function parseColor(base) {
     };
 }
 
-let squareMask = [ [ 1, 1, 1, 1, 1, 1, 1 ], [ 1, 0, 0, 0, 0, 0, 1 ], [ 1, 0, 0, 0, 0, 0, 1 ], [ 1, 0, 0, 0, 0, 0, 1 ], [ 1, 0, 0, 0, 0, 0, 1 ], [ 1, 0, 0, 0, 0, 0, 1 ], [ 1, 1, 1, 1, 1, 1, 1 ] ], dotMask = [ [ 0, 0, 0, 0, 0, 0, 0 ], [ 0, 0, 0, 0, 0, 0, 0 ], [ 0, 0, 1, 1, 1, 0, 0 ], [ 0, 0, 1, 1, 1, 0, 0 ], [ 0, 0, 1, 1, 1, 0, 0 ], [ 0, 0, 0, 0, 0, 0, 0 ], [ 0, 0, 0, 0, 0, 0, 0 ] ];
+let squareMask = [ [ 1, 1, 1, 1, 1, 1, 1 ], [ 1, 0, 0, 0, 0, 0, 1 ], [ 1, 0, 0, 0, 0, 0, 1 ], [ 1, 0, 0, 0, 0, 0, 1 ], [ 1, 0, 0, 0, 0, 0, 1 ], [ 1, 0, 0, 0, 0, 0, 1 ], [ 1, 1, 1, 1, 1, 1, 1 ] ], cornerSquareTypes = new Set(Object.values(CornerSquareType));
+
+let dotMask = [ [ 0, 0, 0, 0, 0, 0, 0 ], [ 0, 0, 0, 0, 0, 0, 0 ], [ 0, 0, 1, 1, 1, 0, 0 ], [ 0, 0, 1, 1, 1, 0, 0 ], [ 0, 0, 1, 1, 1, 0, 0 ], [ 0, 0, 0, 0, 0, 0, 0 ], [ 0, 0, 0, 0, 0, 0, 0 ] ], cornerDotTypes = new Set(Object.values(CornerDotType));
 
 class QRSVG {
     options;
@@ -1037,7 +1080,7 @@ class QRSVG {
             let x = xBeginning + column_cornersDot * dotSize * (count - 7), y = yBeginning + row * dotSize * (count - 7);
             var cornersDotMaskGroup_cornersSquareMask = this.dotsMask;
             let cornersSquareMaskGroup = this.dotsMaskGroup;
-            var cornersDotMask_cornersSquare_dot = this.dotsMask;
+            var val, cornersDotMask_cornersSquare_dot = this.dotsMask;
             if (cornersDotMaskGroup_cornersSquareMask = this.dotsMaskGroup, (options.cornersSquareOptions?.gradient || options.cornersSquareOptions?.color) && ([cornersDotMaskGroup_cornersSquareMask, cornersSquareMaskGroup] = this.createMask(`mask-corners-square-color-${column_cornersDot}-${row}`), 
             this.defs.appendChild(cornersDotMaskGroup_cornersSquareMask), cornersDotMask_cornersSquare_dot = cornersDotMaskGroup_cornersSquareMask, 
             cornersDotMaskGroup_cornersSquareMask = cornersSquareMaskGroup, this.createColor({
@@ -1049,14 +1092,14 @@ class QRSVG {
                 height: cornersSquareSize,
                 width: cornersSquareSize,
                 name: `corners-square-color-${column_cornersDot}-${row}`
-            })), options.cornersSquareOptions?.type) (cornersDotMask_cornersSquare_dot = new QRCornerSquare(options.cornersSquareOptions.type, this.document)).draw({
+            })), val = options.cornersSquareOptions?.type, val && cornerSquareTypes.has(val)) (cornersDotMask_cornersSquare_dot = new QRCornerSquare(options.cornersSquareOptions.type, this.document)).draw({
                 x,
                 y,
                 size: cornersSquareSize,
                 rotation: dot
             }), cornersDotMask_cornersSquare_dot.element && cornersSquareMaskGroup && cornersSquareMaskGroup.appendChild(cornersDotMask_cornersSquare_dot.element), 
             cornersDotMask_cornersSquare_dot.fill && this.lightDotsMaskGroup && this.lightDotsMaskGroup.appendChild(cornersDotMask_cornersSquare_dot.fill); else {
-                cornersDotMask_cornersSquare_dot = new QRDot(options.dotsOptions.type, this.document);
+                cornersDotMask_cornersSquare_dot = new QRDot(options.cornersSquareOptions?.type || options.dotsOptions.type, this.document);
                 for (let i = 0; i < squareMask.length; i++) for (let j = 0; j < squareMask[i].length; j++) squareMask[i]?.[j] ? (cornersDotMask_cornersSquare_dot.draw({
                     x: x + i * dotSize,
                     y: y + j * dotSize,
@@ -1085,13 +1128,15 @@ class QRSVG {
                 height: cornersDotSize,
                 width: cornersDotSize,
                 name: `corners-dot-color-${column_cornersDot}-${row}`
-            })), options.cornersDotOptions?.type) (column_cornersDot = new QRCornerDot(options.cornersDotOptions.type, this.document)).draw({
+            })), function(val) {
+                return !(!val || !cornerDotTypes.has(val));
+            }(options.cornersDotOptions?.type)) (column_cornersDot = new QRCornerDot(options.cornersDotOptions.type, this.document)).draw({
                 x: x + 2 * dotSize,
                 y: y + 2 * dotSize,
                 size: cornersDotSize,
                 rotation: dot
             }), column_cornersDot.element && cornersDotMaskGroup_cornersSquareMask && cornersDotMaskGroup_cornersSquareMask.appendChild(column_cornersDot.element); else {
-                dot = new QRDot(options.dotsOptions.type, this.document);
+                dot = new QRDot(options.cornersDotOptions?.type || options.dotsOptions.type, this.document);
                 for (let i = 0; i < dotMask.length; i++) for (let j = 0; j < dotMask[i].length; j++) dotMask[i]?.[j] && (dot.draw({
                     x: x + i * dotSize,
                     y: y + j * dotSize,