@pdfme/schemas 6.2.4-dev.1 → 6.2.4-dev.3

package/dist/barcodes/constants.d.ts

@@ -2,3 +2,4 @@ export declare const BARCODE_TYPES: readonly ['qrcode', 'japanpost', 'ean13', 'e
 export declare const DEFAULT_BARCODE_BG_COLOR = "#ffffff";
 export declare const DEFAULT_BARCODE_COLOR = "#000000";
 export declare const DEFAULT_BARCODE_INCLUDETEXT = true;
+export declare const ASPECT_RATIO_LOCKED_BARCODE_TYPES: readonly ['qrcode', 'gs1datamatrix', 'pdf417'];

package/dist/barcodes/helper.d.ts

@@ -1,5 +1,5 @@
 import { Buffer } from 'buffer';
-import { BarcodeTypes } from './types.js';
+import { BarcodeSchema, BarcodeTypes } from './types.js';
 export declare const validateBarcodeInput: (type: BarcodeTypes, input: string) => boolean;
 /**
  * The bwip.js lib has a different name for nw7 type barcodes
@@ -25,16 +25,47 @@ export type BarcodeRenderRuntime = 'document-canvas' | 'offscreencanvas' | 'node
  * OffscreenCanvas without `toCanvas()` (Node bwip-js export) falls back to `toBuffer()`.
  */
 export declare const resolveBarcodeRenderRuntime: () => BarcodeRenderRuntime;
+export declare const isAspectRatioLockedBarcodeType: (type: string) => boolean;
+export declare const isSquareBarcodeType: (type: string) => boolean;
+/** Root `viewBox` width/height, then `width`/`height` attributes. `undefined` when neither parses. */
+export declare const getSvgViewBoxSize: (svg: string) => {
+    width: number;
+    height: number;
+} | undefined;
+/** Centered contain rect for a natural size; the full box when the natural size is unknown. */
+export declare const getBarcodeFitLayout: ({ boxWidth, boxHeight, naturalWidth, naturalHeight, }: {
+    boxWidth: number;
+    boxHeight: number;
+    naturalWidth?: number;
+    naturalHeight?: number;
+}) => {
+    width: number;
+    height: number;
+    offsetX: number;
+    offsetY: number;
+};
 type CreateBarCodeArg = {
     type: BarcodeTypes;
     input: string;
-    width: number;
-    height: number;
+    /** Per-axis size targets in mm. Omit both to render the natural symbol. */
+    width?: number;
+    height?: number;
     backgroundColor?: string;
     barColor?: string;
     textColor?: string;
     includetext?: boolean;
 };
 export declare const createBarCodeSvg: (arg: CreateBarCodeArg) => string;
+/** Natural (unscaled) symbol size from bwip-js, in SVG user units. */
+export declare const getNaturalBarcodeSize: (schema: BarcodeSchema, input: string) => {
+    width: number;
+    height: number;
+} | undefined;
+/**
+ * Natural width / height of a locked symbology; undefined for 1D types. Square types
+ * return 1 even for empty content. The Designer calls this on every width/height/content
+ * commit, so content-dependent ratios are memoized.
+ */
+export declare const getBarcodeAspectRatio: (schema: BarcodeSchema) => number | undefined;
 export declare const createBarCode: (arg: CreateBarCodeArg) => Promise<Buffer>;
 export {};

package/dist/index.js

@@ -2194,6 +2194,11 @@ var BARCODE_TYPES = [
 ];
 var DEFAULT_BARCODE_BG_COLOR = "#ffffff";
 var DEFAULT_BARCODE_COLOR = "#000000";
+var ASPECT_RATIO_LOCKED_BARCODE_TYPES = [
+	"qrcode",
+	"gs1datamatrix",
+	"pdf417"
+];
 //#endregion
 //#region src/barcodes/helper.ts
 var validateCheckDigit = (input, checkDigitPos) => {
@@ -2296,17 +2301,67 @@ var renderBarcodeToNodeBuffer = async (options) => {
 	if (typeof toBuffer !== "function") throw new Error("[@pdfme/schemas] bwip-js toBuffer() is not available in this environment.");
 	return toBuffer(options);
 };
+var aspectRatioLockedTypes = ASPECT_RATIO_LOCKED_BARCODE_TYPES;
+var isAspectRatioLockedBarcodeType = (type) => aspectRatioLockedTypes.includes(type);
+var SQUARE_BARCODE_TYPES = ["qrcode", "gs1datamatrix"];
+var isSquareBarcodeType = (type) => SQUARE_BARCODE_TYPES.includes(type);
+var SVG_VIEW_BOX_PATTERN = /viewBox="\s*(-?[\d.]+)\s+(-?[\d.]+)\s+(-?[\d.]+)\s+(-?[\d.]+)\s*"/;
+var positiveSize = (value) => {
+	const size = Number(value);
+	return Number.isFinite(size) && size > 0 ? size : void 0;
+};
+/** Root `viewBox` width/height, then `width`/`height` attributes. `undefined` when neither parses. */
+var getSvgViewBoxSize = (svg) => {
+	const viewBox = svg.match(SVG_VIEW_BOX_PATTERN);
+	if (viewBox) {
+		const width = positiveSize(viewBox[3]);
+		const height = positiveSize(viewBox[4]);
+		if (width !== void 0 && height !== void 0) return {
+			width,
+			height
+		};
+	}
+	const openTag = svg.match(/<svg\b[^>]*>/)?.[0];
+	if (!openTag) return void 0;
+	const width = positiveSize(openTag.match(/\bwidth="([^"]+)"/)?.[1]);
+	const height = positiveSize(openTag.match(/\bheight="([^"]+)"/)?.[1]);
+	if (width === void 0 || height === void 0) return void 0;
+	return {
+		width,
+		height
+	};
+};
+/** Centered contain rect for a natural size; the full box when the natural size is unknown. */
+var getBarcodeFitLayout = ({ boxWidth, boxHeight, naturalWidth, naturalHeight }) => {
+	const stretch = {
+		width: boxWidth,
+		height: boxHeight,
+		offsetX: 0,
+		offsetY: 0
+	};
+	if (naturalWidth === void 0 || naturalHeight === void 0 || naturalWidth <= 0 || naturalHeight <= 0) return stretch;
+	const ratio = naturalWidth / naturalHeight;
+	const widthLimited = boxWidth / boxHeight <= ratio;
+	const width = widthLimited ? boxWidth : boxHeight * ratio;
+	const height = widthLimited ? boxWidth / ratio : boxHeight;
+	return {
+		width,
+		height,
+		offsetX: (boxWidth - width) / 2,
+		offsetY: (boxHeight - height) / 2
+	};
+};
 var createBwipJsRenderOptions = (arg) => {
 	const { type, input, width, height, backgroundColor, barColor, textColor, includetext = true } = arg;
 	const bwipjsArg = {
 		bcid: barCodeType2Bcid(type),
 		text: input,
-		width,
-		height,
 		scale: 5,
 		includetext,
 		textxalign: "center"
 	};
+	if (width !== void 0) bwipjsArg.width = width;
+	if (height !== void 0) bwipjsArg.height = height;
 	if (backgroundColor) bwipjsArg.backgroundcolor = mapHexColorForBwipJsLib(backgroundColor);
 	if (barColor) bwipjsArg.barcolor = mapHexColorForBwipJsLib(barColor);
 	if (textColor) bwipjsArg.textcolor = mapHexColorForBwipJsLib(textColor);
@@ -2320,6 +2375,39 @@ var createBarCodeSvg = (arg) => {
 	if (/<image\b/i.test(svg)) throw new Error(`[@pdfme/schemas] bwip-js emitted an embedded image for ${arg.type}; vector barcode PDF rendering requires path-based SVG.`);
 	return svg;
 };
+/** Natural (unscaled) symbol size from bwip-js, in SVG user units. */
+var getNaturalBarcodeSize = (schema, input) => getSvgViewBoxSize(createBarCodeSvg({
+	...schema,
+	width: void 0,
+	height: void 0,
+	backgroundColor: void 0,
+	input
+}));
+var contentAspectRatioMemo = /* @__PURE__ */ new Map();
+var CONTENT_ASPECT_RATIO_MEMO_LIMIT = 200;
+/**
+* Natural width / height of a locked symbology; undefined for 1D types. Square types
+* return 1 even for empty content. The Designer calls this on every width/height/content
+* commit, so content-dependent ratios are memoized.
+*/
+var getBarcodeAspectRatio = (schema) => {
+	if (!isAspectRatioLockedBarcodeType(schema.type)) return void 0;
+	if (isSquareBarcodeType(schema.type)) return 1;
+	const input = schema.content ?? "";
+	if (!validateBarcodeInput(schema.type, input)) return void 0;
+	const key = `${schema.type}:${input}`;
+	if (contentAspectRatioMemo.has(key)) return contentAspectRatioMemo.get(key);
+	let ratio;
+	try {
+		const size = getNaturalBarcodeSize(schema, input);
+		ratio = size ? size.width / size.height : void 0;
+	} catch {
+		ratio = void 0;
+	}
+	if (contentAspectRatioMemo.size >= CONTENT_ASPECT_RATIO_MEMO_LIMIT) contentAspectRatioMemo.clear();
+	contentAspectRatioMemo.set(key, ratio);
+	return ratio;
+};
 var createBarCode = async (arg) => {
 	const bwipjsArg = createBwipJsRenderOptions(arg);
 	const runtime = resolveBarcodeRenderRuntime();
@@ -2329,8 +2417,20 @@ var createBarCode = async (arg) => {
 };
 //#endregion
 //#region src/barcodes/pdfRender.ts
-var getBarcodeCacheKey = (schema, value) => {
-	return `svg:${schema.type}:${schema.width}:${schema.height}:${schema.barColor}:${schema.textColor}:${schema.includetext}:${value}`;
+var getBarcodeCacheKey = (schema, size, value) => {
+	return `svg:${schema.type}:${size.width}:${size.height}:${schema.barColor}:${schema.textColor}:${schema.includetext}:${value}`;
+};
+var getNaturalSize = (schema, value, cache) => {
+	if (!isAspectRatioLockedBarcodeType(schema.type)) return void 0;
+	if (isSquareBarcodeType(schema.type)) return {
+		width: 1,
+		height: 1
+	};
+	const key = `svg-natural:${schema.type}:${value}`;
+	if (cache.has(key)) return cache.get(key);
+	const size = getNaturalBarcodeSize(schema, value);
+	cache.set(key, size);
+	return size;
 };
 var addSvgOpacity = (svg, opacity) => {
 	return opacity === void 0 ? svg : svg.replace(/<svg\b/, `<svg opacity="${opacity}"`);
@@ -2344,11 +2444,20 @@ var getSvgColorMapper = (colorType = "") => {
 var pdfRender$1 = async (arg) => {
 	const { value, schema, page, options, _cache } = arg;
 	if (!validateBarcodeInput(schema.type, value)) return;
-	const inputBarcodeCacheKey = getBarcodeCacheKey(schema, value);
+	const natural = getNaturalSize(schema, value, _cache);
+	const fitted = getBarcodeFitLayout({
+		boxWidth: schema.width,
+		boxHeight: schema.height,
+		naturalWidth: natural?.width,
+		naturalHeight: natural?.height
+	});
+	const inputBarcodeCacheKey = getBarcodeCacheKey(schema, fitted, value);
 	let svg = _cache.get(inputBarcodeCacheKey);
 	if (!svg) {
 		svg = createBarCodeSvg({
 			...schema,
+			width: fitted.width,
+			height: fitted.height,
 			backgroundColor: void 0,
 			type: schema.type,
 			input: value
@@ -2382,11 +2491,17 @@ var pdfRender$1 = async (arg) => {
 				opacity: applyAlphaToOpacity(opacity, alpha)
 			});
 		}
+		const layout = getBarcodeFitLayout({
+			boxWidth: width,
+			boxHeight: height,
+			naturalWidth: natural?.width,
+			naturalHeight: natural?.height
+		});
 		await page.drawSvg(addSvgOpacity(svg, opacity), {
-			x,
-			y: y + height,
-			width,
-			height,
+			x: x + layout.offsetX,
+			y: y + height - layout.offsetY,
+			width: layout.width,
+			height: layout.height,
 			mapColor: getSvgColorMapper(options.colorType)
 		});
 	} finally {
@@ -2550,7 +2665,7 @@ var barcodeDefaults = [
 		position,
 		...defaultColors,
 		width: 40,
-		height: 16,
+		height: 11.65,
 		rotate: 0,
 		opacity: 1
 	} }
@@ -2622,9 +2737,25 @@ var createBarcodeImage = async (schema, value) => {
 	return await blobToDataURL(new Blob([new Uint8Array(imageBuf)], { type: "image/png" }));
 };
 var createBarcodeImageElm = async (schema, value) => {
-	const barcodeDataURL = await createBarcodeImage(schema, value);
 	const img = document.createElement("img");
-	img.src = barcodeDataURL;
+	if (isAspectRatioLockedBarcodeType(schema.type)) {
+		const svg = createBarCodeSvg({
+			...schema,
+			width: void 0,
+			height: void 0,
+			backgroundColor: void 0,
+			input: value
+		});
+		img.src = `data:image/svg+xml;charset=utf-8,${encodeURIComponent(svg)}`;
+		const imgStyle = {
+			...fullSize,
+			objectFit: "contain",
+			borderRadius: 0
+		};
+		Object.assign(img.style, imgStyle);
+		return img;
+	}
+	img.src = await createBarcodeImage(schema, value);
 	const imgStyle = {
 		...fullSize,
 		borderRadius: 0
@@ -2695,7 +2826,8 @@ var barcodes = BARCODE_TYPES.reduce((acc, type) => Object.assign(acc, { [type]:
 	pdf: pdfRender$1,
 	ui: uiRender$1,
 	propPanel: getPropPanelByBarcodeType(type),
-	icon: createSvgStr(type == "qrcode" ? QrCode : Barcode)
+	icon: createSvgStr(type == "qrcode" ? QrCode : Barcode),
+	...isAspectRatioLockedBarcodeType(type) ? { getAspectRatio: getBarcodeAspectRatio } : {}
 } }), {});
 //#endregion
 //#region src/shapes/line.ts