fix: resolve conversations

Author: EscapedGibbon

package.json

@@ -43,7 +43,7 @@
   },
   "homepage": "https://github.com/image-js/image-js#readme",
   "dependencies": {
-    "@jsonjoy.com/base64": "^1.1.2",
+
     "bresenham-zingl": "^0.2.0",
     "colord": "^2.9.3",
     "fast-bmp": "^2.0.1",
@@ -94,6 +94,7 @@
     "rimraf": "^6.0.1",
     "tailwindcss": "^3.4.17",
     "typescript": "~5.7.3",
+    "uint8-base64": "^0.1.1",
     "vite": "^6.0.8",
     "vitest": "^2.1.8"
   }

src/save/__tests__/__snapshots__/encodeBase64.test.ts.snap renamed to src/save/__tests__/__snapshots__/encodeDataURL.test.ts.snap

@@ -1,6 +1,5 @@
-import { createRgbaImage } from '../../../test/testUtils.js';
 import { encode } from '../encode.js';
-import { encodeBase64 } from '../encodeBase64.js';
+import { encodeDataURL } from '../encodeDataURL.js';
 
 test('basic image (png)', () => {
   const image = testUtils.createGreyImage([
@@ -10,7 +9,7 @@ test('basic image (png)', () => {
     [0, 255, 255, 255, 0],
     [255, 0, 255, 0, 255],
   ]);
-  const base64Url = encodeBase64(image, 'png');
+  const base64Url = encodeDataURL(image);
 
   expect(base64Url).toBe(
     'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAAAAACoBHk5AAAAFklEQVR4XmNggID///+DSCCEskHM/wCAnQr2TY5mOAAAAABJRU5ErkJggg==',
@@ -26,59 +25,22 @@ test('basic image 2 (jpeg)', () => {
     [255, 255, 255, 255, 255],
   ]);
   const format = 'jpeg';
-  const base64 = encodeBase64(image, format);
+  const base64 = encodeDataURL(image, { format });
   const base64Data = Buffer.from(encode(image, { format })).toString('base64');
   expect(typeof base64).toBe('string');
   expect(base64Data).toMatchSnapshot();
 });
 
 test('legacy image-js test', () => {
-  const image = createRgbaImage([
-    [
-      255,
-      0,
-      0,
-      255, // red
-      0,
-      255,
-      0,
-      255, // green
-      0,
-      0,
-      255,
-      255, // blue
-    ],
-    [
-      255,
-      255,
-      0,
-      255, // yellow
-      255,
-      0,
-      255,
-      255, // magenta
-      0,
-      255,
-      255,
-      255, // cyan
-    ],
-    [
-      0,
-      0,
-      0,
-      255, // black
-      255,
-      255,
-      255,
-      255, // white
-      127,
-      127,
-      127,
-      255, //grey
-    ],
-  ]);
+  const image = testUtils.createRgbaImage(
+    ` 
+        255 0 0 / 255 | 0  255  0 / 255 | 0 0 255 / 255 
+        255 255 0 / 255   | 255 0 255 / 255 | 0 255 255 / 255
+        0 0 0 / 255 | 255 255 255 / 255 | 127 127 127 / 255 
+     `,
+  );
   const format = 'jpeg';
-  const url = encodeBase64(image, format);
+  const url = encodeDataURL(image, { format });
   const base64Data = Buffer.from(encode(image, { format })).toString('base64');
   expect(typeof url).toBe('string');
   expect(base64Data).toBe(url.slice(url.indexOf(',') + 1));

src/save/__tests__/encodeBase64.test.ts renamed to src/save/__tests__/encodeDataURL.test.ts

@@ -29,7 +29,7 @@ export interface EncodeOptionsJpeg {
 export interface EncodeOptionsBmp {
   format: 'bmp';
 }
-const defaultPng: EncodeOptionsPng = { format: 'png' };
+export const defaultPng: EncodeOptionsPng = { format: 'png' };
 
 /**
  * Encodes the image to the specified format

src/save/encode.ts

@@ -0,0 +1,25 @@
+import { encode as uint8encode } from 'uint8-base64';
+
+import type { Image } from '../Image.js';
+
+import type {
+  EncodeOptionsBmp,
+  EncodeOptionsJpeg,
+  EncodeOptionsPng,
+} from './encode.js';
+import { encode, defaultPng } from './encode.js';
+/**
+ * Converts image into Data URL string.
+ * @param image - Image to get base64 encoding from.
+ * @param options - Encoding options.
+ * @returns base64 string.
+ */
+export function encodeDataURL(
+  image: Image,
+  options: EncodeOptionsBmp | EncodeOptionsPng | EncodeOptionsJpeg = defaultPng,
+) {
+  const buffer = encode(image, options);
+  const base64 = uint8encode(buffer);
+  const base64Data = new TextDecoder().decode(base64);
+  return `data:image/${options.format};base64,${base64Data}`;
+}

src/save/encodeBase64.ts

@@ -3,4 +3,4 @@ export * from './encodePng.js';
 export * from './encodeJpeg.js';
 export * from './write.js';
 export * from './writeCanvas.js';
-export * from './encodeBase64.js';
+export * from './encodeDataURL.js';