update input type to support Uint8Array and Uint8ClampedArray

DanielJDufour · Aug 18, 2022 · 9b85408 · 9b85408
1 parent 134f0f8
commit 9b85408
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 3 deletions.
diff --git a/test.ts b/test.ts
@@ -9,7 +9,7 @@ import writeImage from "./write-image";
 test("jpg to png", async ({ eq }) => {
   const jpg = findAndRead("flower.jpg");
   const { height, width, pixels } = await readim({ data: jpg });
-  const result = writeImage({ data: pixels, debug: false, format: "png", height, width });
+  const result = writeImage({ data: pixels as Uint8Array, debug: false, format: "png", height, width });
   writeFileSync("jpg-to-png.ts.png", result.data as Buffer);
   eq(result.height, height);
   eq(result.width, width);
@@ -46,6 +46,40 @@ test("jpg to jpg", async ({ eq }) => {
   eq(Buffer.isBuffer(result.data), true);
 });
 
+test("Uint8Array[]", async ({ eq }) => {
+  const jpg = findAndRead("flower.jpg");
+  const { height, width, pixels } = await readim({ data: jpg });
+  const { data } = transform({
+    data: pixels,
+    from: "[r,c,b]",
+    to: "[b][r,c]",
+    sizes: { b: 4, r: height, c: width }
+  });
+  const typedData: Uint8Array[] = data.map(b => Uint8Array.from(b));
+  const result = writeImage({ data: typedData, debug: false, format: "png", height, width });
+  writeFileSync("jpg-to-png.u8[].png", result.data as Buffer);
+  eq(result.height, height);
+  eq(result.width, width);
+  eq(Buffer.isBuffer(result.data), true);
+});
+
+test("Uint8Array[][]", async ({ eq }) => {
+  const jpg = findAndRead("flower.jpg");
+  const { height, width, pixels } = await readim({ data: jpg });
+  const { data } = transform({
+    data: pixels,
+    from: "[r,c,b]",
+    to: "[b][r][c]",
+    sizes: { b: 4, r: height, c: width }
+  });
+  const typedData: Uint8Array[][] = data.map(b => b.map(r => Uint8Array.from(r)));
+  const result = writeImage({ data: typedData, debug: false, format: "png", height, width });
+  writeFileSync("jpg-to-png.u8[][].png", result.data as Buffer);
+  eq(result.height, height);
+  eq(result.width, width);
+  eq(Buffer.isBuffer(result.data), true);
+});
+
 test("JPEG", async ({ eq }) => {
   const result = writeImage({
     data: [

diff --git a/write-image.d.ts b/write-image.d.ts
@@ -6,7 +6,16 @@ export default function writeImage({
   width,
   quality
 }: {
-  data: number[] | number[][] | number[][][];
+  data:
+    | number[]
+    | number[][]
+    | number[][][]
+    | Uint8Array
+    | Uint8Array[]
+    | Uint8Array[][]
+    | Uint8ClampedArray
+    | Uint8ClampedArray[]
+    | Uint8ClampedArray[][];
   debug?: boolean;
   format: "jpeg" | "JPEG" | "jpg" | "JPG" | "png" | "PNG";
   height: number;

diff --git a/write-image.js b/write-image.js
@@ -1,4 +1,3 @@
-const { write } = require("fs");
 const jpeg = require("jpeg-js");
 const { PNG } = require("pngjs");
 const toImageData = require("to-image-data");