qreator 9.3.0 → 9.5.0

package/lib/browser/matrix.d.ts

@@ -1,9 +1,11 @@
-import { Data, EcLevel, Matrix } from "./typing/types";
+import { BitMatrix, Data, EcLevel, Matrix } from "./typing/types";
 export declare function init(version: number): Matrix;
 export declare function fillFinders(matrix: Matrix): void;
+export declare function zeroFillFinders(matrix: BitMatrix): void;
 export declare function fillAlignAndTiming(matrix: Matrix): void;
 export declare function fillStub(matrix: Matrix): void;
 export declare const fillReserved: (matrix: Matrix, ec_level: EcLevel, mask: number) => void;
 export declare const fillData: (matrix: Matrix, data: Data, mask: number) => void;
 export declare function calculatePenalty(matrix: Matrix): number;
-export declare function getMatrix(data: Data): number[][];
+export declare function getMatrix(data: Data): BitMatrix;
+export declare function clearMatrixCenter(matrix: BitMatrix, widthPct: number, heightPct: number): BitMatrix;

package/lib/browser/pdf.umd.js

@@ -25751,35 +25751,50 @@
 
     function init(version) {
         const N = (version << 2) + 0b10001;
-        const matrix = [];
-        let zeros = Array(N).fill(0);
-        for (let i = 0; i < N; i++) {
-            matrix[i] = [...zeros];
-        }
-        return matrix;
+        return Array(N).fill(null).map(() => Array(N).fill(0));
     }
     function fillFinders(matrix) {
         const N = matrix.length;
-        for (var i = -3; i <= 3; i++) {
+        for (let i = -3; i <= 3; i++) {
             for (let j = -3; j <= 3; j++) {
                 const max = Math.max(i, j);
                 const min = Math.min(i, j);
                 const pixel = (max == 2 && min >= -2) || (min == -2 && max <= 2)
-                    ? 0x80
-                    : 0x81;
+                    ? 128
+                    : 129;
                 matrix[3 + i][3 + j] = pixel;
                 matrix[3 + i][N - 4 + j] = pixel;
                 matrix[N - 4 + i][3 + j] = pixel;
             }
         }
-        for (var i = 0; i < 8; i++) {
+        for (let i = 0; i < 8; i++) {
+            matrix[7][i] =
+                matrix[i][7] =
+                    matrix[7][N - i - 1] =
+                        matrix[i][N - 8] =
+                            matrix[N - 8][i] =
+                                matrix[N - 1 - i][7] =
+                                    128;
+        }
+    }
+    function zeroFillFinders(matrix) {
+        const N = matrix.length;
+        const zeroPixel = 0;
+        for (let i = -3; i <= 3; i++) {
+            for (let j = -3; j <= 3; j++) {
+                matrix[3 + i][3 + j] = zeroPixel;
+                matrix[3 + i][N - 4 + j] = zeroPixel;
+                matrix[N - 4 + i][3 + j] = zeroPixel;
+            }
+        }
+        for (let i = 0; i < 8; i++) {
             matrix[7][i] =
                 matrix[i][7] =
                     matrix[7][N - i - 1] =
                         matrix[i][N - 8] =
                             matrix[N - 8][i] =
                                 matrix[N - 1 - i][7] =
-                                    0x80;
+                                    zeroPixel;
         }
     }
     function fillAlignAndTiming(matrix) {
@@ -26093,7 +26108,22 @@
         }
         fillData(matrix, data, bestMask);
         fillReserved(matrix, data.ec_level, bestMask);
-        return matrix.map((row) => row.map((cell) => cell & 1));
+        return matrix.map((row) => row.map((cell) => (cell & 1)));
+    }
+    function clearMatrixCenter(matrix, widthPct, heightPct) {
+        matrix = matrix.map((x) => x.slice());
+        const mW = matrix.length;
+        const cW = Math.ceil(((mW * widthPct) / 100 + (mW % 2)) / 2) * 2 - (mW % 2);
+        const mH = matrix[0]?.length ?? 0;
+        const cH = Math.ceil(((mH * heightPct) / 100 + (mH % 2)) / 2) * 2 - (mH % 2);
+        const clearStartX = Math.round((mW - cW) / 2);
+        const clearStartY = Math.round((mH - cH) / 2);
+        for (let x = clearStartX; x < clearStartX + cW; x += 1) {
+            for (let y = clearStartY; y < clearStartY + cH; y += 1) {
+                matrix[x][y] = 0;
+            }
+        }
+        return matrix;
     }
 
     const EC_LEVELS = ["L", "M", "Q", "H"];
@@ -26134,7 +26164,7 @@
         throw new Error("Too much data");
     }
     function fillTemplate(message, template) {
-        const blocks = new Uint8Array(template.data_len);
+        const blocks = new Uint8ClampedArray(template.data_len);
         let messageUpdated;
         if (template.version < 10) {
             messageUpdated = message.data1;
@@ -26691,7 +26721,7 @@
         const defaults = type === "png" ? BITMAP_OPTIONS : VECTOR_OPTIONS;
         return { ...defaults, ...inOptions };
     }
-    function getSVGPath(matrix, size, margin = 0, borderRadius = 0) {
+    function getDotsSVGPath(matrix, size, margin = 0, borderRadius = 0) {
         let rectangles = [];
         for (let x = 0; x < matrix.length; x++) {
             const column = matrix[x];
@@ -26705,7 +26735,7 @@
                     rectangle.push(`M ${leftX} ${topY + borderRadius}`);
                     rectangle.push(`L ${leftX} ${bottomY - borderRadius}`);
                     if (borderRadius > 0) {
-                        rectangle.push(`A ${borderRadius} ${borderRadius} 0 0 0 ${leftX + borderRadius} ${bottomY} `);
+                        rectangle.push(`A ${borderRadius} ${borderRadius} 0 0 0 ${leftX + borderRadius} ${bottomY}`);
                     }
                     rectangle.push(`L ${rightX - borderRadius} ${bottomY}`);
                     if (borderRadius > 0) {
@@ -26750,7 +26780,11 @@
     const textDec = new TextDecoder();
     async function getPDF(text, inOptions) {
         const options = getOptions(inOptions);
-        const matrix = QR(text, options.ec_level, options.parse_url);
+        let matrix = QR(text, options.ec_level, options.parse_url);
+        zeroFillFinders(matrix);
+        if (options.logo && options.logoWidth && options.logoHeight) {
+            matrix = clearMatrixCenter(matrix, options.logoWidth, options.logoHeight);
+        }
         return PDF({ matrix, ...options });
     }
     function colorToRGB(color) {
@@ -26758,29 +26792,27 @@
             const [red, green, blue] = colorString.get.rgb(color);
             return [red / 255, green / 255, blue / 255];
         }
-        return [
-            ((color >>> 24) % 256) / 255,
-            ((color >>> 16) % 256) / 255,
-            ((color >>> 8) % 256) / 255,
-        ];
+        return [((color >>> 24) % 256) / 255, ((color >>> 16) % 256) / 255, ((color >>> 8) % 256) / 255];
     }
     function getOpacity(color) {
         if (typeof color === "string") {
             return colorString.get.rgb(color)[3];
         }
-        return ((color % 256) / 255);
+        return (color % 256) / 255;
     }
     async function PDF({ matrix, margin, logo, logoWidth, logoHeight, color, bgColor, borderRadius, }) {
         const size = 9;
+        const marginPx = margin * size;
+        const matrixSizePx = matrix.length * size;
+        const imageSizePx = matrixSizePx + 2 * marginPx;
         const document = await PDFDocument.create();
-        const pageSize = (matrix.length + 2 * margin) * size;
-        const page = document.addPage([pageSize, pageSize]);
+        const page = document.addPage([imageSizePx, imageSizePx]);
         page.drawSquare({
-            size: pageSize,
+            size: imageSizePx,
             color: rgb(...colorToRGB(bgColor)),
         });
         page.moveTo(0, page.getHeight());
-        const path = getSVGPath(matrix, size, margin * size, borderRadius);
+        const path = getDotsSVGPath(matrix, size, marginPx, borderRadius);
         page.drawSvgPath(path, {
             color: rgb(...colorToRGB(color)),
             opacity: getOpacity(color),
@@ -26796,12 +26828,13 @@
             else {
                 logoData = await document.embedJpg(logo);
             }
+            const logoWidthPx = (logoWidth / 100) * matrixSizePx;
+            const logoHeightPx = (logoHeight / 100) * matrixSizePx;
             page.drawImage(logoData, {
-                x: page.getWidth() / 2 - (logoWidth / 100) * (page.getWidth() / 2),
-                y: page.getHeight() / 2 -
-                    (logoHeight / 100) * (page.getWidth() / 2),
-                width: (logoWidth / 100) * page.getWidth(),
-                height: (logoHeight / 100) * page.getHeight(),
+                x: (imageSizePx - logoWidthPx) / 2,
+                y: (imageSizePx - logoHeightPx) / 2,
+                width: logoWidthPx,
+                height: logoHeightPx,
             });
         }
         return document.save();