@weapp-vite/qr 1.1.1 → 1.1.3

package/README.md

@@ -16,7 +16,7 @@ process.stdout.write(renderTerminalQrCode(content, { small: true }))
 ```ts
 import { createQrCodeMatrix } from '@weapp-vite/qr'
 
-const matrix = createQrCodeMatrix('https://vite.icebreaker.top/')
+const matrix = createQrCodeMatrix('https://vite.weapp.dev/')
 ```
 
 ### 解码

package/dist/index.d.mts

@@ -1,22 +1,21 @@
 import { Buffer } from "node:buffer";
-
 //#region src/codeType.d.ts
 /** QRCodeType 的类型定义。 */
 type QRCodeType = 'qr' | 'mini-program-code' | 'unknown';
 /** detectCodeTypeFromBuffer 的方法封装。 */
-declare function detectCodeTypeFromBuffer(buffer: Buffer): Promise<"qr" | "mini-program-code" | "unknown">;
+export declare function detectCodeTypeFromBuffer(buffer: Buffer): Promise<"qr" | "mini-program-code" | "unknown">;
 /** detectCodeTypeFromBase64 的方法封装。 */
-declare function detectCodeTypeFromBase64(content: string): Promise<"qr" | "mini-program-code" | "unknown">;
+export declare function detectCodeTypeFromBase64(content: string): Promise<"qr" | "mini-program-code" | "unknown">;
 /** detectCodeTypeFromFile 的方法封装。 */
-declare function detectCodeTypeFromFile(filePath: string): Promise<"qr" | "mini-program-code" | "unknown">;
+export declare function detectCodeTypeFromFile(filePath: string): Promise<"qr" | "mini-program-code" | "unknown">;
 //#endregion
 //#region src/decode.d.ts
 /** decodeQrCodeFromBuffer 的方法封装。 */
-declare function decodeQrCodeFromBuffer(buffer: Buffer): Promise<string>;
+export declare function decodeQrCodeFromBuffer(buffer: Buffer): Promise<string>;
 /** decodeQrCodeFromBase64 的方法封装。 */
-declare function decodeQrCodeFromBase64(content: string): Promise<string>;
+export declare function decodeQrCodeFromBase64(content: string): Promise<string>;
 /** decodeQrCodeFromFile 的方法封装。 */
-declare function decodeQrCodeFromFile(filePath: string): Promise<string>;
+export declare function decodeQrCodeFromFile(filePath: string): Promise<string>;
 //#endregion
 //#region src/types.d.ts
 /**
@@ -31,7 +30,7 @@ type QRCodeMatrix = boolean[][];
 //#endregion
 //#region src/encode.d.ts
 /** createQrCodeMatrix 的方法封装。 */
-declare function createQrCodeMatrix(input: string): QRCodeMatrix;
+export declare function createQrCodeMatrix(input: string): QRCodeMatrix;
 //#endregion
 //#region src/miniProgramCode.d.ts
 interface MiniProgramCodePoint {
@@ -55,7 +54,7 @@ interface MiniProgramCodeDetectionResult {
   logoBounds?: MiniProgramCodeBounds;
 }
 /** detectMiniProgramCodeFromBuffer 的方法封装。 */
-declare function detectMiniProgramCodeFromBuffer(buffer: Buffer): Promise<{
+export declare function detectMiniProgramCodeFromBuffer(buffer: Buffer): Promise<{
   kind: "wechat-mini-program-code";
   width: number;
   height: number;
@@ -75,7 +74,7 @@ declare function detectMiniProgramCodeFromBuffer(buffer: Buffer): Promise<{
   } | undefined;
 } | null>;
 /** detectMiniProgramCodeFromBase64 的方法封装。 */
-declare function detectMiniProgramCodeFromBase64(content: string): Promise<{
+export declare function detectMiniProgramCodeFromBase64(content: string): Promise<{
   kind: "wechat-mini-program-code";
   width: number;
   height: number;
@@ -95,7 +94,7 @@ declare function detectMiniProgramCodeFromBase64(content: string): Promise<{
   } | undefined;
 } | null>;
 /** detectMiniProgramCodeFromFile 的方法封装。 */
-declare function detectMiniProgramCodeFromFile(filePath: string): Promise<{
+export declare function detectMiniProgramCodeFromFile(filePath: string): Promise<{
   kind: "wechat-mini-program-code";
   width: number;
   height: number;
@@ -135,12 +134,12 @@ type QRCodeReaderConstructor = new () => QRCodeReaderInstance;
 //#endregion
 //#region src/reader/decode.d.ts
 /** decodeWithQrReader 的方法封装。 */
-declare function decodeWithQrReader(input: QRCodeReaderInput): Promise<QRCodeReaderResult>;
+export declare function decodeWithQrReader(input: QRCodeReaderInput): Promise<QRCodeReaderResult>;
 //#endregion
 //#region src/render.d.ts
 /** renderTerminalQrCodeFromMatrix 的方法封装。 */
-declare function renderTerminalQrCodeFromMatrix(matrix: QRCodeMatrix, options?: QRCodeRenderOptions): string;
+export declare function renderTerminalQrCodeFromMatrix(matrix: QRCodeMatrix, options?: QRCodeRenderOptions): string;
 /** renderTerminalQrCode 的方法封装。 */
-declare function renderTerminalQrCode(input: string, options?: QRCodeRenderOptions): string;
+export declare function renderTerminalQrCode(input: string, options?: QRCodeRenderOptions): string;
 //#endregion
-export { type MiniProgramCodeDetectionResult, type QRCodeMatrix, type QRCodeReaderConstructor, type QRCodeReaderInput, type QRCodeReaderInstance, type QRCodeReaderResult, type QRCodeRenderOptions, type QRCodeType, createQrCodeMatrix, decodeQrCodeFromBase64, decodeQrCodeFromBuffer, decodeQrCodeFromFile, decodeWithQrReader, detectCodeTypeFromBase64, detectCodeTypeFromBuffer, detectCodeTypeFromFile, detectMiniProgramCodeFromBase64, detectMiniProgramCodeFromBuffer, detectMiniProgramCodeFromFile, renderTerminalQrCode, renderTerminalQrCodeFromMatrix };
+export type { MiniProgramCodeDetectionResult, QRCodeMatrix, QRCodeReaderConstructor, QRCodeReaderInput, QRCodeReaderInstance, QRCodeReaderResult, QRCodeRenderOptions, QRCodeType };

package/dist/index.mjs

@@ -702,18 +702,19 @@ var AlignmentPatternFinder = class {
 			while (j < maxJ && !this.image.data[j + this.image.width * i]) j++;
 			let currentState = 0;
 			while (j < maxJ) {
-				if (this.image.data[j + i * this.image.width]) if (currentState === 1) stateCount[currentState]++;
-				else if (currentState === 2) {
-					if (this.foundPatternCross(stateCount)) {
-						const confirmed = this.handlePossibleCenter(stateCount, i, j);
-						if (confirmed != null) return confirmed;
-					}
-					stateCount[0] = stateCount[2];
-					stateCount[1] = 1;
-					stateCount[2] = 0;
-					currentState = 1;
-				} else stateCount[++currentState]++;
-				else {
+				if (this.image.data[j + i * this.image.width]) {
+					if (currentState === 1) stateCount[currentState]++;
+					else if (currentState === 2) {
+						if (this.foundPatternCross(stateCount)) {
+							const confirmed = this.handlePossibleCenter(stateCount, i, j);
+							if (confirmed != null) return confirmed;
+						}
+						stateCount[0] = stateCount[2];
+						stateCount[1] = 1;
+						stateCount[2] = 0;
+						currentState = 1;
+					} else stateCount[++currentState]++;
+				} else {
 					if (currentState === 1) currentState++;
 					stateCount[currentState]++;
 				}
@@ -734,7 +735,6 @@ var AlignmentPatternFinder = class {
 * @file 二维码解析内部模块：findpat。
 */
 const MIN_SKIP = 3;
-const MAX_MODULES = 57;
 const INTEGER_MATH_SHIFT = 8;
 const CENTER_QUORUM = 2;
 function orderBestPatterns(patterns) {
@@ -1005,10 +1005,12 @@ var FinderPatternFinder = class {
 		let firstConfirmedCenter = null;
 		for (let i = 0; i < this.possibleCenters.length; i++) {
 			const center = this.possibleCenters[i];
-			if (center.count >= CENTER_QUORUM) if (firstConfirmedCenter == null) firstConfirmedCenter = center;
-			else {
-				this.hasSkipped = true;
-				return Math.floor((Math.abs(firstConfirmedCenter.X - center.X) - Math.abs(firstConfirmedCenter.Y - center.Y)) / 2);
+			if (center.count >= CENTER_QUORUM) {
+				if (firstConfirmedCenter == null) firstConfirmedCenter = center;
+				else {
+					this.hasSkipped = true;
+					return Math.floor((Math.abs(firstConfirmedCenter.X - center.X) - Math.abs(firstConfirmedCenter.Y - center.Y)) / 2);
+				}
 			}
 		}
 		return 0;
@@ -1037,7 +1039,7 @@ var FinderPatternFinder = class {
 		this.image = image;
 		const maxI = image.height;
 		const maxJ = image.width;
-		let iSkip = Math.floor(3 * maxI / (4 * MAX_MODULES));
+		let iSkip = Math.floor(3 * maxI / 228);
 		if (iSkip < MIN_SKIP || tryHarder) iSkip = MIN_SKIP;
 		let done = false;
 		const stateCount = [
@@ -1057,39 +1059,41 @@ var FinderPatternFinder = class {
 			for (let j = 0; j < maxJ; j++) if (image.data[j + i * image.width]) {
 				if ((currentState & 1) === 1) currentState++;
 				stateCount[currentState]++;
-			} else if ((currentState & 1) === 0) if (currentState === 4) if (this.foundPatternCross(stateCount)) {
-				if (this.handlePossibleCenter(stateCount, i, j)) {
-					iSkip = 2;
-					if (this.hasSkipped) done = this.haveMultiplyConfirmedCenters();
-					else {
-						const rowSkip = this.findRowSkip();
-						if (rowSkip > stateCount[2]) {
-							i += rowSkip - stateCount[2] - iSkip;
-							j = maxJ - 1;
+			} else if ((currentState & 1) === 0) {
+				if (currentState === 4) {
+					if (this.foundPatternCross(stateCount)) {
+						if (this.handlePossibleCenter(stateCount, i, j)) {
+							iSkip = 2;
+							if (this.hasSkipped) done = this.haveMultiplyConfirmedCenters();
+							else {
+								const rowSkip = this.findRowSkip();
+								if (rowSkip > stateCount[2]) {
+									i += rowSkip - stateCount[2] - iSkip;
+									j = maxJ - 1;
+								}
+							}
+						} else {
+							do
+								j++;
+							while (j < maxJ && !image.data[j + i * image.width]);
+							j--;
 						}
+						currentState = 0;
+						stateCount[0] = 0;
+						stateCount[1] = 0;
+						stateCount[2] = 0;
+						stateCount[3] = 0;
+						stateCount[4] = 0;
+					} else {
+						stateCount[0] = stateCount[2];
+						stateCount[1] = stateCount[3];
+						stateCount[2] = stateCount[4];
+						stateCount[3] = 1;
+						stateCount[4] = 0;
+						currentState = 3;
 					}
-				} else {
-					do
-						j++;
-					while (j < maxJ && !image.data[j + i * image.width]);
-					j--;
-				}
-				currentState = 0;
-				stateCount[0] = 0;
-				stateCount[1] = 0;
-				stateCount[2] = 0;
-				stateCount[3] = 0;
-				stateCount[4] = 0;
-			} else {
-				stateCount[0] = stateCount[2];
-				stateCount[1] = stateCount[3];
-				stateCount[2] = stateCount[4];
-				stateCount[3] = 1;
-				stateCount[4] = 0;
-				currentState = 3;
-			}
-			else stateCount[++currentState]++;
-			else stateCount[currentState]++;
+				} else stateCount[++currentState]++;
+			} else stateCount[currentState]++;
 			if (this.foundPatternCross(stateCount)) {
 				if (this.handlePossibleCenter(stateCount, i, maxJ)) {
 					iSkip = stateCount[0];
@@ -2050,9 +2054,7 @@ var QRCodeDataBlockReader = class {
 				case MODE_8BIT_BYTE:
 					output.push(this.get8bitByteArray(dataLength));
 					break;
-				case MODE_KANJI:
-					output.push(this.getKanjiString(dataLength));
-					break;
+				case MODE_KANJI: output.push(this.getKanjiString(dataLength));
 			}
 		} while (true);
 		return output;

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@weapp-vite/qr",
   "type": "module",
-  "version": "1.1.1",
+  "version": "1.1.3",
   "description": "weapp-vite 生态二维码编码、解码与终端渲染工具包",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
-  "homepage": "https://github.com/weapp-vite/weapp-vite",
+  "homepage": "https://github.com/weapp-vite/weapp-vite#readme",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/weapp-vite/weapp-vite.git",
@@ -16,11 +16,16 @@
   },
   "keywords": [
     "weapp-vite",
+    "weapp",
+    "wechat",
+    "mini-program",
+    "miniprogram",
     "qr",
     "qrcode",
     "terminal",
     "decode",
-    "encode"
+    "encode",
+    "vite"
   ],
   "sideEffects": false,
   "exports": {
@@ -41,7 +46,7 @@
     "node": "^20.19.0 || >=22.12.0"
   },
   "dependencies": {
-    "sharp": "^0.35.1"
+    "sharp": "^0.35.4"
   },
   "publishConfig": {
     "access": "public",
@@ -50,6 +55,7 @@
   "scripts": {
     "dev": "tsdown -w --sourcemap",
     "build": "tsdown",
+    "fixtures:generate": "node --import tsx scripts/generate-fixtures.ts",
     "test": "vitest run --config ./vitest.config.ts",
     "test:dev": "vitest --config ./vitest.config.ts",
     "test:types": "tsd",