emf-converter 1.6.0 → 2.0.0

package/README.md

@@ -44,22 +44,20 @@ const pngDataUrl = await convertEmfToDataUrl(emfBuffer);
 const wmfPng = await convertWmfToDataUrl(wmfBuffer);
 
 // Optional: limit output dimensions (aspect ratio preserved)
-const scaled = await convertEmfToDataUrl(emfBuffer, 1024, 768);
+const scaled = await convertEmfToDataUrl(emfBuffer, { maxWidth: 1024, maxHeight: 768 });
 ```
 
 Both functions return `Promise<string | null>` — `null` if the buffer is invalid or no Canvas API is available.
 
 ## API
 
-### `convertEmfToDataUrl(buffer, maxWidth?, maxHeight?, options?)` · `convertWmfToDataUrl(buffer, maxWidth?, maxHeight?, options?)`
+### `convertEmfToDataUrl(buffer, options?)` · `convertWmfToDataUrl(buffer, options?)`
 
-| Parameter   | Type                                  | Description                                          |
-| ----------- | ------------------------------------- | ---------------------------------------------------- |
-| `buffer`    | `ArrayBuffer`                         | Raw EMF/WMF file bytes                               |
-| `maxWidth`  | `number` (optional)                   | Maximum output width in pixels                       |
-| `maxHeight` | `number` (optional)                   | Maximum output height in pixels                      |
-| `options`   | `EmfConvertOptions \| number` (opt.)  | Options object, or a numeric `dpiScale` (legacy)    |
-| **Returns** | `Promise<string \| null>`             | PNG data URL or `null` on failure                   |
+| Parameter   | Type                          | Description                                          |
+| ----------- | ----------------------------- | ---------------------------------------------------- |
+| `buffer`    | `ArrayBuffer`                 | Raw EMF/WMF file bytes                               |
+| `options`   | `EmfConvertOptions` (optional)| Output size, DPI scale, record limits, font mapping |
+| **Returns** | `Promise<string \| null>`     | PNG data URL or `null` on failure                   |
 
 #### `EmfConvertOptions`
 
@@ -73,7 +71,7 @@ Both functions return `Promise<string | null>` — `null` if the buffer is inval
 | `fontFamilyMap`      | `Record<string, string>`   | —              | Maps Windows face names (case-insensitive) to fonts available locally, e.g. `{ calibri: 'Carlito' }` |
 
 ```ts
-const png = await convertEmfToDataUrl(buffer, undefined, undefined, {
+const png = await convertEmfToDataUrl(buffer, {
 	dpiScale: 2,
 	fontFamilyMap: { calibri: 'Carlito', 'ms shell dlg': 'Tahoma' },
 });

package/dist/index.d.mts

@@ -58,14 +58,12 @@ interface EmfConvertOptions {
  * - The logical bounds are zero-sized or negative.
  * - No canvas API is available (e.g. headless test environment).
  *
- * @param buffer    - The raw EMF file bytes.
- * @param maxWidth  - Optional cap on the output canvas width (pixels).
- * @param maxHeight - Optional cap on the output canvas height (pixels).
- * @param optionsOrDpiScale - Either an {@link EmfConvertOptions} object, or
- *   a numeric DPI scale (for backward compatibility). Default DPI scale is 2.
+ * @param buffer  - The raw EMF file bytes.
+ * @param options - Optional {@link EmfConvertOptions} controlling output size,
+ *   DPI scale, record limits, and font mapping.
  * @returns A `data:image/png;base64,…` string, or `null` on failure.
  */
-declare function convertEmfToDataUrl(buffer: ArrayBuffer, maxWidth?: number, maxHeight?: number, optionsOrDpiScale?: EmfConvertOptions | number, recursionDepth?: number): Promise<string | null>;
+declare function convertEmfToDataUrl(buffer: ArrayBuffer, options?: EmfConvertOptions, recursionDepth?: number): Promise<string | null>;
 /**
  * Converts a WMF (Windows Metafile) binary buffer to a PNG data-URL string.
  *
@@ -80,14 +78,12 @@ declare function convertEmfToDataUrl(buffer: ArrayBuffer, maxWidth?: number, max
  * - The header cannot be parsed or reports invalid dimensions.
  * - No canvas API is available.
  *
- * @param buffer    - The raw WMF file bytes.
- * @param maxWidth  - Optional cap on the output canvas width (pixels).
- * @param maxHeight - Optional cap on the output canvas height (pixels).
- * @param optionsOrDpiScale - Either an {@link EmfConvertOptions} object, or
- *   a numeric DPI scale. Default DPI scale is 2.
+ * @param buffer  - The raw WMF file bytes.
+ * @param options - Optional {@link EmfConvertOptions} controlling output size,
+ *   DPI scale, record limits, and font mapping.
  * @returns A `data:image/png;base64,…` string, or `null` on failure.
  */
-declare function convertWmfToDataUrl(buffer: ArrayBuffer, maxWidth?: number, maxHeight?: number, optionsOrDpiScale?: EmfConvertOptions | number, recursionDepth?: number): Promise<string | null>;
+declare function convertWmfToDataUrl(buffer: ArrayBuffer, options?: EmfConvertOptions, recursionDepth?: number): Promise<string | null>;
 
 /**
  * Canvas creation, styling, string reading, stock objects, and export helpers.

package/dist/index.d.ts

@@ -58,14 +58,12 @@ interface EmfConvertOptions {
  * - The logical bounds are zero-sized or negative.
  * - No canvas API is available (e.g. headless test environment).
  *
- * @param buffer    - The raw EMF file bytes.
- * @param maxWidth  - Optional cap on the output canvas width (pixels).
- * @param maxHeight - Optional cap on the output canvas height (pixels).
- * @param optionsOrDpiScale - Either an {@link EmfConvertOptions} object, or
- *   a numeric DPI scale (for backward compatibility). Default DPI scale is 2.
+ * @param buffer  - The raw EMF file bytes.
+ * @param options - Optional {@link EmfConvertOptions} controlling output size,
+ *   DPI scale, record limits, and font mapping.
  * @returns A `data:image/png;base64,…` string, or `null` on failure.
  */
-declare function convertEmfToDataUrl(buffer: ArrayBuffer, maxWidth?: number, maxHeight?: number, optionsOrDpiScale?: EmfConvertOptions | number, recursionDepth?: number): Promise<string | null>;
+declare function convertEmfToDataUrl(buffer: ArrayBuffer, options?: EmfConvertOptions, recursionDepth?: number): Promise<string | null>;
 /**
  * Converts a WMF (Windows Metafile) binary buffer to a PNG data-URL string.
  *
@@ -80,14 +78,12 @@ declare function convertEmfToDataUrl(buffer: ArrayBuffer, maxWidth?: number, max
  * - The header cannot be parsed or reports invalid dimensions.
  * - No canvas API is available.
  *
- * @param buffer    - The raw WMF file bytes.
- * @param maxWidth  - Optional cap on the output canvas width (pixels).
- * @param maxHeight - Optional cap on the output canvas height (pixels).
- * @param optionsOrDpiScale - Either an {@link EmfConvertOptions} object, or
- *   a numeric DPI scale. Default DPI scale is 2.
+ * @param buffer  - The raw WMF file bytes.
+ * @param options - Optional {@link EmfConvertOptions} controlling output size,
+ *   DPI scale, record limits, and font mapping.
  * @returns A `data:image/png;base64,…` string, or `null` on failure.
  */
-declare function convertWmfToDataUrl(buffer: ArrayBuffer, maxWidth?: number, maxHeight?: number, optionsOrDpiScale?: EmfConvertOptions | number, recursionDepth?: number): Promise<string | null>;
+declare function convertWmfToDataUrl(buffer: ArrayBuffer, options?: EmfConvertOptions, recursionDepth?: number): Promise<string | null>;
 
 /**
  * Canvas creation, styling, string reading, stock objects, and export helpers.

package/dist/index.js

@@ -1402,14 +1402,9 @@ function handleExtTextOutW(rCtx, offset, dataOff, recSize) {
       if (text.length > 0) {
         applyFont(ctx, state);
         ctx.fillStyle = state.textColor;
-        let alignBaseline = "alphabetic";
+        const vAlign = state.textAlign & 24;
+        const alignBaseline = vAlign === 24 ? "alphabetic" : vAlign === 8 ? "bottom" : "top";
         let alignHoriz = "left";
-        if (state.textAlign & 8) {
-          alignBaseline = "bottom";
-        }
-        if (state.textAlign & 24) {
-          alignBaseline = "alphabetic";
-        }
         if (state.textAlign & 6) {
           alignHoriz = "center";
         }
@@ -1437,17 +1432,29 @@ function handleExtTextOutW(rCtx, offset, dataOff, recSize) {
   }
   return true;
 }
+var ROP_PATCOPY = 15728673;
+var BS_NULL = 1;
 function handleBitBlt(rCtx, offset, dataOff, recSize) {
-  const { ctx, view } = rCtx;
+  const { ctx, view, state } = rCtx;
   if (recSize >= 96) {
     const dstX = view.getInt32(dataOff + 16, true);
     const dstY = view.getInt32(dataOff + 20, true);
     const dstW = view.getInt32(dataOff + 24, true);
     const dstH = view.getInt32(dataOff + 28, true);
+    const rop = view.getUint32(dataOff + 32, true);
     const offBmiSrc = view.getUint32(dataOff + 76, true);
     const cbBmiSrc = view.getUint32(dataOff + 80, true);
     const offBitsSrc = view.getUint32(dataOff + 84, true);
     const cbBitsSrc = view.getUint32(dataOff + 88, true);
+    if (offBmiSrc === 0 && rop === ROP_PATCOPY) {
+      const prevFill = ctx.fillStyle;
+      if (state.brushStyle !== BS_NULL) {
+        ctx.fillStyle = state.brushColor;
+        ctx.fillRect(gmx(rCtx, dstX), gmy(rCtx, dstY), gmw(rCtx, dstW), gmh(rCtx, dstH));
+      }
+      ctx.fillStyle = prevFill;
+      return true;
+    }
     if (offBmiSrc > 0 && cbBmiSrc > 0 && offBitsSrc > 0 && cbBitsSrc > 0) {
       const imageData = decodeDibToImageData(
         view,
@@ -4857,19 +4864,7 @@ async function processDeferredImages(ctx, deferredImages, recursionDepth = 0) {
           continue;
         }
         emfLog(`  Deferred image [${idx}]: recursively converting embedded metafile...`);
-        const metafileDataUrl = await convertEmfToDataUrl(
-          plainBuffer,
-          void 0,
-          void 0,
-          void 0,
-          recursionDepth + 1
-        ) ?? await convertWmfToDataUrl(
-          plainBuffer,
-          void 0,
-          void 0,
-          void 0,
-          recursionDepth + 1
-        );
+        const metafileDataUrl = await convertEmfToDataUrl(plainBuffer, void 0, recursionDepth + 1) ?? await convertWmfToDataUrl(plainBuffer, void 0, recursionDepth + 1);
         if (metafileDataUrl) {
           emfLog(
             `  Deferred image [${idx}]: metafile converted, dataUrl length=${metafileDataUrl.length}`
@@ -4914,14 +4909,14 @@ async function processDeferredImages(ctx, deferredImages, recursionDepth = 0) {
   }
   ctx.setTransform(1, 0, 0, 1, 0, 0);
 }
-async function convertEmfToDataUrl(buffer, maxWidth, maxHeight, optionsOrDpiScale, recursionDepth = 0) {
+async function convertEmfToDataUrl(buffer, options, recursionDepth = 0) {
   if (recursionDepth > MAX_METAFILE_RECURSION) {
     return null;
   }
-  const opts = typeof optionsOrDpiScale === "number" ? { dpiScale: optionsOrDpiScale } : optionsOrDpiScale ?? {};
+  const opts = options ?? {};
   const dpiScale = opts.dpiScale ?? DEFAULT_DPI_SCALE;
-  const effectiveMaxWidth = maxWidth ?? opts.maxWidth;
-  const effectiveMaxHeight = maxHeight ?? opts.maxHeight;
+  const effectiveMaxWidth = opts.maxWidth;
+  const effectiveMaxHeight = opts.maxHeight;
   const replayOptions = {
     maxRecords: opts.maxRecords,
     maxRecordsEmfPlus: opts.maxRecords,
@@ -4999,14 +4994,14 @@ async function convertEmfToDataUrl(buffer, maxWidth, maxHeight, optionsOrDpiScal
     return null;
   }
 }
-async function convertWmfToDataUrl(buffer, maxWidth, maxHeight, optionsOrDpiScale, recursionDepth = 0) {
+async function convertWmfToDataUrl(buffer, options, recursionDepth = 0) {
   if (recursionDepth > MAX_METAFILE_RECURSION) {
     return null;
   }
-  const opts = typeof optionsOrDpiScale === "number" ? { dpiScale: optionsOrDpiScale } : optionsOrDpiScale ?? {};
+  const opts = options ?? {};
   const dpiScale = opts.dpiScale ?? DEFAULT_DPI_SCALE;
-  const effectiveMaxWidth = maxWidth ?? opts.maxWidth;
-  const effectiveMaxHeight = maxHeight ?? opts.maxHeight;
+  const effectiveMaxWidth = opts.maxWidth;
+  const effectiveMaxHeight = opts.maxHeight;
   const replayOptions = {
     maxRecords: opts.maxRecords,
     fontFamilyMap: opts.fontFamilyMap

package/dist/index.mjs

@@ -1400,14 +1400,9 @@ function handleExtTextOutW(rCtx, offset, dataOff, recSize) {
       if (text.length > 0) {
         applyFont(ctx, state);
         ctx.fillStyle = state.textColor;
-        let alignBaseline = "alphabetic";
+        const vAlign = state.textAlign & 24;
+        const alignBaseline = vAlign === 24 ? "alphabetic" : vAlign === 8 ? "bottom" : "top";
         let alignHoriz = "left";
-        if (state.textAlign & 8) {
-          alignBaseline = "bottom";
-        }
-        if (state.textAlign & 24) {
-          alignBaseline = "alphabetic";
-        }
         if (state.textAlign & 6) {
           alignHoriz = "center";
         }
@@ -1435,17 +1430,29 @@ function handleExtTextOutW(rCtx, offset, dataOff, recSize) {
   }
   return true;
 }
+var ROP_PATCOPY = 15728673;
+var BS_NULL = 1;
 function handleBitBlt(rCtx, offset, dataOff, recSize) {
-  const { ctx, view } = rCtx;
+  const { ctx, view, state } = rCtx;
   if (recSize >= 96) {
     const dstX = view.getInt32(dataOff + 16, true);
     const dstY = view.getInt32(dataOff + 20, true);
     const dstW = view.getInt32(dataOff + 24, true);
     const dstH = view.getInt32(dataOff + 28, true);
+    const rop = view.getUint32(dataOff + 32, true);
     const offBmiSrc = view.getUint32(dataOff + 76, true);
     const cbBmiSrc = view.getUint32(dataOff + 80, true);
     const offBitsSrc = view.getUint32(dataOff + 84, true);
     const cbBitsSrc = view.getUint32(dataOff + 88, true);
+    if (offBmiSrc === 0 && rop === ROP_PATCOPY) {
+      const prevFill = ctx.fillStyle;
+      if (state.brushStyle !== BS_NULL) {
+        ctx.fillStyle = state.brushColor;
+        ctx.fillRect(gmx(rCtx, dstX), gmy(rCtx, dstY), gmw(rCtx, dstW), gmh(rCtx, dstH));
+      }
+      ctx.fillStyle = prevFill;
+      return true;
+    }
     if (offBmiSrc > 0 && cbBmiSrc > 0 && offBitsSrc > 0 && cbBitsSrc > 0) {
       const imageData = decodeDibToImageData(
         view,
@@ -4855,19 +4862,7 @@ async function processDeferredImages(ctx, deferredImages, recursionDepth = 0) {
           continue;
         }
         emfLog(`  Deferred image [${idx}]: recursively converting embedded metafile...`);
-        const metafileDataUrl = await convertEmfToDataUrl(
-          plainBuffer,
-          void 0,
-          void 0,
-          void 0,
-          recursionDepth + 1
-        ) ?? await convertWmfToDataUrl(
-          plainBuffer,
-          void 0,
-          void 0,
-          void 0,
-          recursionDepth + 1
-        );
+        const metafileDataUrl = await convertEmfToDataUrl(plainBuffer, void 0, recursionDepth + 1) ?? await convertWmfToDataUrl(plainBuffer, void 0, recursionDepth + 1);
         if (metafileDataUrl) {
           emfLog(
             `  Deferred image [${idx}]: metafile converted, dataUrl length=${metafileDataUrl.length}`
@@ -4912,14 +4907,14 @@ async function processDeferredImages(ctx, deferredImages, recursionDepth = 0) {
   }
   ctx.setTransform(1, 0, 0, 1, 0, 0);
 }
-async function convertEmfToDataUrl(buffer, maxWidth, maxHeight, optionsOrDpiScale, recursionDepth = 0) {
+async function convertEmfToDataUrl(buffer, options, recursionDepth = 0) {
   if (recursionDepth > MAX_METAFILE_RECURSION) {
     return null;
   }
-  const opts = typeof optionsOrDpiScale === "number" ? { dpiScale: optionsOrDpiScale } : optionsOrDpiScale ?? {};
+  const opts = options ?? {};
   const dpiScale = opts.dpiScale ?? DEFAULT_DPI_SCALE;
-  const effectiveMaxWidth = maxWidth ?? opts.maxWidth;
-  const effectiveMaxHeight = maxHeight ?? opts.maxHeight;
+  const effectiveMaxWidth = opts.maxWidth;
+  const effectiveMaxHeight = opts.maxHeight;
   const replayOptions = {
     maxRecords: opts.maxRecords,
     maxRecordsEmfPlus: opts.maxRecords,
@@ -4997,14 +4992,14 @@ async function convertEmfToDataUrl(buffer, maxWidth, maxHeight, optionsOrDpiScal
     return null;
   }
 }
-async function convertWmfToDataUrl(buffer, maxWidth, maxHeight, optionsOrDpiScale, recursionDepth = 0) {
+async function convertWmfToDataUrl(buffer, options, recursionDepth = 0) {
   if (recursionDepth > MAX_METAFILE_RECURSION) {
     return null;
   }
-  const opts = typeof optionsOrDpiScale === "number" ? { dpiScale: optionsOrDpiScale } : optionsOrDpiScale ?? {};
+  const opts = options ?? {};
   const dpiScale = opts.dpiScale ?? DEFAULT_DPI_SCALE;
-  const effectiveMaxWidth = maxWidth ?? opts.maxWidth;
-  const effectiveMaxHeight = maxHeight ?? opts.maxHeight;
+  const effectiveMaxWidth = opts.maxWidth;
+  const effectiveMaxHeight = opts.maxHeight;
   const replayOptions = {
     maxRecords: opts.maxRecords,
     fontFamilyMap: opts.fontFamilyMap

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "emf-converter",
-	"version": "1.6.0",
+	"version": "2.0.0",
 	"description": "Convert EMF/WMF metafile binaries to PNG data URLs using Canvas",
 	"keywords": [
 		"canvas",