@midscene/shared 0.11.1-beta-20250214012635.0 → 0.11.2

package/dist/browser/img.d.ts

@@ -67,11 +67,11 @@ declare function transformImgPathToBase64(inputPath: string): Promise<string>;
  * @returns A Promise that resolves to a base64-encoded string representing the resized image
  * @throws An error if the width or height cannot be determined from the metadata
  */
-declare function resizeImg(inputData: Buffer, newSize: {
+declare function resizeImg(inputData: Buffer, newSize?: {
     width: number;
     height: number;
 }): Promise<Buffer>;
-declare function resizeImgBase64(inputBase64: string, newSize: {
+declare function resizeImgBase64(inputData: string, newSize?: {
     width: number;
     height: number;
 }): Promise<string>;
@@ -87,7 +87,7 @@ declare function resizeImgBase64(inputBase64: string, newSize: {
  * @returns {Object} An object containing the new width and height.
  * @throws {Error} Throws an error if the width or height is not a positive number.
  */
-declare function zoomForGPT4o(originalWidth: number, originalHeight: number): {
+declare function calculateNewDimensions(originalWidth: number, originalHeight: number): {
     width: number;
     height: number;
 };
@@ -148,4 +148,4 @@ declare function savePositionImg(options: {
     outputPath: string;
 }): Promise<void>;
 
-export { base64Encoded, base64ToPngFormat, bufferFromBase64, compositeElementInfoImg, drawBoxOnImage, imageInfo, imageInfoOfBase64, processImageElementInfo, resizeImg, resizeImgBase64, saveBase64Image, savePositionImg, transformImgPathToBase64, trimImage, zoomForGPT4o };
+export { base64Encoded, base64ToPngFormat, bufferFromBase64, calculateNewDimensions, compositeElementInfoImg, drawBoxOnImage, imageInfo, imageInfoOfBase64, processImageElementInfo, resizeImg, resizeImgBase64, saveBase64Image, savePositionImg, transformImgPathToBase64, trimImage };

package/dist/browser/img.js

@@ -54,6 +54,7 @@ __export(img_exports, {
   base64Encoded: () => base64Encoded,
   base64ToPngFormat: () => base64ToPngFormat,
   bufferFromBase64: () => bufferFromBase64,
+  calculateNewDimensions: () => calculateNewDimensions,
   compositeElementInfoImg: () => compositeElementInfoImg,
   drawBoxOnImage: () => drawBoxOnImage,
   imageInfo: () => imageInfo,
@@ -64,8 +65,7 @@ __export(img_exports, {
   saveBase64Image: () => saveBase64Image,
   savePositionImg: () => savePositionImg,
   transformImgPathToBase64: () => transformImgPathToBase64,
-  trimImage: () => trimImage,
-  zoomForGPT4o: () => zoomForGPT4o
+  trimImage: () => trimImage
 });
 module.exports = __toCommonJS(img_exports);
 
@@ -138,7 +138,6 @@ function base64ToPngFormat(base64) {
 }
 
 // src/img/transform.ts
-var import_node_assert2 = __toESM(require("assert"));
 var import_node_buffer2 = require("buffer");
 function saveBase64Image(options) {
   return __async(this, null, function* () {
@@ -162,29 +161,27 @@ function resizeImg(inputData, newSize) {
   return __async(this, null, function* () {
     if (typeof inputData === "string")
       throw Error("inputData is base64, use resizeImgBase64 instead");
-    (0, import_node_assert2.default)(
-      newSize && newSize.width > 0 && newSize.height > 0,
-      "newSize must be positive"
-    );
     const Jimp = yield getJimp();
     const image = yield Jimp.read(inputData);
     const { width, height } = image.bitmap;
     if (!width || !height) {
       throw Error("Undefined width or height from the input image.");
     }
-    if (newSize.width === width && newSize.height === height) {
-      return inputData;
-    }
-    image.resize(newSize.width, newSize.height, Jimp.RESIZE_NEAREST_NEIGHBOR);
+    const finalNewSize = newSize || calculateNewDimensions(width, height);
+    image.resize(
+      finalNewSize.width,
+      finalNewSize.height,
+      Jimp.RESIZE_NEAREST_NEIGHBOR
+    );
     image.quality(90);
     const resizedBuffer = yield image.getBufferAsync(Jimp.MIME_JPEG);
     return resizedBuffer;
   });
 }
-function resizeImgBase64(inputBase64, newSize) {
+function resizeImgBase64(inputData, newSize) {
   return __async(this, null, function* () {
     const splitFlag = ";base64,";
-    const dataSplitted = inputBase64.split(splitFlag);
+    const dataSplitted = inputData.split(splitFlag);
     if (dataSplitted.length !== 2) {
       throw Error("Invalid base64 data");
     }
@@ -194,7 +191,7 @@ function resizeImgBase64(inputBase64, newSize) {
     return `${dataSplitted[0]}${splitFlag}${content}`;
   });
 }
-function zoomForGPT4o(originalWidth, originalHeight) {
+function calculateNewDimensions(originalWidth, originalHeight) {
   const maxWidth = 2048;
   const maxHeight = 768;
   let newWidth = originalWidth;
@@ -240,7 +237,7 @@ function trimImage(image) {
 }
 
 // src/img/box-select.ts
-var import_node_assert3 = __toESM(require("assert"));
+var import_node_assert2 = __toESM(require("assert"));
 var cachedFont = null;
 var createSvgOverlay = (elements, imageWidth, imageHeight) => __async(void 0, null, function* () {
   const Jimp = yield getJimp();
@@ -346,7 +343,7 @@ var createSvgOverlay = (elements, imageWidth, imageHeight) => __async(void 0, nu
   return image;
 });
 var compositeElementInfoImg = (options) => __async(void 0, null, function* () {
-  (0, import_node_assert3.default)(options.inputImgBase64, "inputImgBase64 is required");
+  (0, import_node_assert2.default)(options.inputImgBase64, "inputImgBase64 is required");
   let width = 0;
   let height = 0;
   let jimpImage;
@@ -396,7 +393,7 @@ var compositeElementInfoImg = (options) => __async(void 0, null, function* () {
 });
 var processImageElementInfo = (options) => __async(void 0, null, function* () {
   const base64Image = options.inputImgBase64.split(";base64,").pop();
-  (0, import_node_assert3.default)(base64Image, "base64Image is undefined");
+  (0, import_node_assert2.default)(base64Image, "base64Image is undefined");
   const [
     compositeElementInfoImgBase64,
     compositeElementInfoImgWithoutTextBase64

package/dist/es/img.d.ts

@@ -67,11 +67,11 @@ declare function transformImgPathToBase64(inputPath: string): Promise<string>;
  * @returns A Promise that resolves to a base64-encoded string representing the resized image
  * @throws An error if the width or height cannot be determined from the metadata
  */
-declare function resizeImg(inputData: Buffer, newSize: {
+declare function resizeImg(inputData: Buffer, newSize?: {
     width: number;
     height: number;
 }): Promise<Buffer>;
-declare function resizeImgBase64(inputBase64: string, newSize: {
+declare function resizeImgBase64(inputData: string, newSize?: {
     width: number;
     height: number;
 }): Promise<string>;
@@ -87,7 +87,7 @@ declare function resizeImgBase64(inputBase64: string, newSize: {
  * @returns {Object} An object containing the new width and height.
  * @throws {Error} Throws an error if the width or height is not a positive number.
  */
-declare function zoomForGPT4o(originalWidth: number, originalHeight: number): {
+declare function calculateNewDimensions(originalWidth: number, originalHeight: number): {
     width: number;
     height: number;
 };
@@ -148,4 +148,4 @@ declare function savePositionImg(options: {
     outputPath: string;
 }): Promise<void>;
 
-export { base64Encoded, base64ToPngFormat, bufferFromBase64, compositeElementInfoImg, drawBoxOnImage, imageInfo, imageInfoOfBase64, processImageElementInfo, resizeImg, resizeImgBase64, saveBase64Image, savePositionImg, transformImgPathToBase64, trimImage, zoomForGPT4o };
+export { base64Encoded, base64ToPngFormat, bufferFromBase64, calculateNewDimensions, compositeElementInfoImg, drawBoxOnImage, imageInfo, imageInfoOfBase64, processImageElementInfo, resizeImg, resizeImgBase64, saveBase64Image, savePositionImg, transformImgPathToBase64, trimImage };

package/dist/es/img.js

@@ -89,7 +89,6 @@ function base64ToPngFormat(base64) {
 }
 
 // src/img/transform.ts
-import assert2 from "assert";
 import { Buffer as Buffer3 } from "buffer";
 function saveBase64Image(options) {
   return __async(this, null, function* () {
@@ -113,29 +112,27 @@ function resizeImg(inputData, newSize) {
   return __async(this, null, function* () {
     if (typeof inputData === "string")
       throw Error("inputData is base64, use resizeImgBase64 instead");
-    assert2(
-      newSize && newSize.width > 0 && newSize.height > 0,
-      "newSize must be positive"
-    );
     const Jimp = yield getJimp();
     const image = yield Jimp.read(inputData);
     const { width, height } = image.bitmap;
     if (!width || !height) {
       throw Error("Undefined width or height from the input image.");
     }
-    if (newSize.width === width && newSize.height === height) {
-      return inputData;
-    }
-    image.resize(newSize.width, newSize.height, Jimp.RESIZE_NEAREST_NEIGHBOR);
+    const finalNewSize = newSize || calculateNewDimensions(width, height);
+    image.resize(
+      finalNewSize.width,
+      finalNewSize.height,
+      Jimp.RESIZE_NEAREST_NEIGHBOR
+    );
     image.quality(90);
     const resizedBuffer = yield image.getBufferAsync(Jimp.MIME_JPEG);
     return resizedBuffer;
   });
 }
-function resizeImgBase64(inputBase64, newSize) {
+function resizeImgBase64(inputData, newSize) {
   return __async(this, null, function* () {
     const splitFlag = ";base64,";
-    const dataSplitted = inputBase64.split(splitFlag);
+    const dataSplitted = inputData.split(splitFlag);
     if (dataSplitted.length !== 2) {
       throw Error("Invalid base64 data");
     }
@@ -145,7 +142,7 @@ function resizeImgBase64(inputBase64, newSize) {
     return `${dataSplitted[0]}${splitFlag}${content}`;
   });
 }
-function zoomForGPT4o(originalWidth, originalHeight) {
+function calculateNewDimensions(originalWidth, originalHeight) {
   const maxWidth = 2048;
   const maxHeight = 768;
   let newWidth = originalWidth;
@@ -191,7 +188,7 @@ function trimImage(image) {
 }
 
 // src/img/box-select.ts
-import assert3 from "assert";
+import assert2 from "assert";
 var cachedFont = null;
 var createSvgOverlay = (elements, imageWidth, imageHeight) => __async(void 0, null, function* () {
   const Jimp = yield getJimp();
@@ -297,7 +294,7 @@ var createSvgOverlay = (elements, imageWidth, imageHeight) => __async(void 0, nu
   return image;
 });
 var compositeElementInfoImg = (options) => __async(void 0, null, function* () {
-  assert3(options.inputImgBase64, "inputImgBase64 is required");
+  assert2(options.inputImgBase64, "inputImgBase64 is required");
   let width = 0;
   let height = 0;
   let jimpImage;
@@ -347,7 +344,7 @@ var compositeElementInfoImg = (options) => __async(void 0, null, function* () {
 });
 var processImageElementInfo = (options) => __async(void 0, null, function* () {
   const base64Image = options.inputImgBase64.split(";base64,").pop();
-  assert3(base64Image, "base64Image is undefined");
+  assert2(base64Image, "base64Image is undefined");
   const [
     compositeElementInfoImgBase64,
     compositeElementInfoImgWithoutTextBase64
@@ -412,6 +409,7 @@ export {
   base64Encoded,
   base64ToPngFormat,
   bufferFromBase64,
+  calculateNewDimensions,
   compositeElementInfoImg,
   drawBoxOnImage,
   imageInfo,
@@ -422,6 +420,5 @@ export {
   saveBase64Image,
   savePositionImg,
   transformImgPathToBase64,
-  trimImage,
-  zoomForGPT4o
+  trimImage
 };

package/dist/lib/img.d.ts

@@ -67,11 +67,11 @@ declare function transformImgPathToBase64(inputPath: string): Promise<string>;
  * @returns A Promise that resolves to a base64-encoded string representing the resized image
  * @throws An error if the width or height cannot be determined from the metadata
  */
-declare function resizeImg(inputData: Buffer, newSize: {
+declare function resizeImg(inputData: Buffer, newSize?: {
     width: number;
     height: number;
 }): Promise<Buffer>;
-declare function resizeImgBase64(inputBase64: string, newSize: {
+declare function resizeImgBase64(inputData: string, newSize?: {
     width: number;
     height: number;
 }): Promise<string>;
@@ -87,7 +87,7 @@ declare function resizeImgBase64(inputBase64: string, newSize: {
  * @returns {Object} An object containing the new width and height.
  * @throws {Error} Throws an error if the width or height is not a positive number.
  */
-declare function zoomForGPT4o(originalWidth: number, originalHeight: number): {
+declare function calculateNewDimensions(originalWidth: number, originalHeight: number): {
     width: number;
     height: number;
 };
@@ -148,4 +148,4 @@ declare function savePositionImg(options: {
     outputPath: string;
 }): Promise<void>;
 
-export { base64Encoded, base64ToPngFormat, bufferFromBase64, compositeElementInfoImg, drawBoxOnImage, imageInfo, imageInfoOfBase64, processImageElementInfo, resizeImg, resizeImgBase64, saveBase64Image, savePositionImg, transformImgPathToBase64, trimImage, zoomForGPT4o };
+export { base64Encoded, base64ToPngFormat, bufferFromBase64, calculateNewDimensions, compositeElementInfoImg, drawBoxOnImage, imageInfo, imageInfoOfBase64, processImageElementInfo, resizeImg, resizeImgBase64, saveBase64Image, savePositionImg, transformImgPathToBase64, trimImage };

package/dist/lib/img.js

@@ -54,6 +54,7 @@ __export(img_exports, {
   base64Encoded: () => base64Encoded,
   base64ToPngFormat: () => base64ToPngFormat,
   bufferFromBase64: () => bufferFromBase64,
+  calculateNewDimensions: () => calculateNewDimensions,
   compositeElementInfoImg: () => compositeElementInfoImg,
   drawBoxOnImage: () => drawBoxOnImage,
   imageInfo: () => imageInfo,
@@ -64,8 +65,7 @@ __export(img_exports, {
   saveBase64Image: () => saveBase64Image,
   savePositionImg: () => savePositionImg,
   transformImgPathToBase64: () => transformImgPathToBase64,
-  trimImage: () => trimImage,
-  zoomForGPT4o: () => zoomForGPT4o
+  trimImage: () => trimImage
 });
 module.exports = __toCommonJS(img_exports);
 
@@ -138,7 +138,6 @@ function base64ToPngFormat(base64) {
 }
 
 // src/img/transform.ts
-var import_node_assert2 = __toESM(require("assert"));
 var import_node_buffer2 = require("buffer");
 function saveBase64Image(options) {
   return __async(this, null, function* () {
@@ -162,29 +161,27 @@ function resizeImg(inputData, newSize) {
   return __async(this, null, function* () {
     if (typeof inputData === "string")
       throw Error("inputData is base64, use resizeImgBase64 instead");
-    (0, import_node_assert2.default)(
-      newSize && newSize.width > 0 && newSize.height > 0,
-      "newSize must be positive"
-    );
     const Jimp = yield getJimp();
     const image = yield Jimp.read(inputData);
     const { width, height } = image.bitmap;
     if (!width || !height) {
       throw Error("Undefined width or height from the input image.");
     }
-    if (newSize.width === width && newSize.height === height) {
-      return inputData;
-    }
-    image.resize(newSize.width, newSize.height, Jimp.RESIZE_NEAREST_NEIGHBOR);
+    const finalNewSize = newSize || calculateNewDimensions(width, height);
+    image.resize(
+      finalNewSize.width,
+      finalNewSize.height,
+      Jimp.RESIZE_NEAREST_NEIGHBOR
+    );
     image.quality(90);
     const resizedBuffer = yield image.getBufferAsync(Jimp.MIME_JPEG);
     return resizedBuffer;
   });
 }
-function resizeImgBase64(inputBase64, newSize) {
+function resizeImgBase64(inputData, newSize) {
   return __async(this, null, function* () {
     const splitFlag = ";base64,";
-    const dataSplitted = inputBase64.split(splitFlag);
+    const dataSplitted = inputData.split(splitFlag);
     if (dataSplitted.length !== 2) {
       throw Error("Invalid base64 data");
     }
@@ -194,7 +191,7 @@ function resizeImgBase64(inputBase64, newSize) {
     return `${dataSplitted[0]}${splitFlag}${content}`;
   });
 }
-function zoomForGPT4o(originalWidth, originalHeight) {
+function calculateNewDimensions(originalWidth, originalHeight) {
   const maxWidth = 2048;
   const maxHeight = 768;
   let newWidth = originalWidth;
@@ -240,7 +237,7 @@ function trimImage(image) {
 }
 
 // src/img/box-select.ts
-var import_node_assert3 = __toESM(require("assert"));
+var import_node_assert2 = __toESM(require("assert"));
 var cachedFont = null;
 var createSvgOverlay = (elements, imageWidth, imageHeight) => __async(void 0, null, function* () {
   const Jimp = yield getJimp();
@@ -346,7 +343,7 @@ var createSvgOverlay = (elements, imageWidth, imageHeight) => __async(void 0, nu
   return image;
 });
 var compositeElementInfoImg = (options) => __async(void 0, null, function* () {
-  (0, import_node_assert3.default)(options.inputImgBase64, "inputImgBase64 is required");
+  (0, import_node_assert2.default)(options.inputImgBase64, "inputImgBase64 is required");
   let width = 0;
   let height = 0;
   let jimpImage;
@@ -396,7 +393,7 @@ var compositeElementInfoImg = (options) => __async(void 0, null, function* () {
 });
 var processImageElementInfo = (options) => __async(void 0, null, function* () {
   const base64Image = options.inputImgBase64.split(";base64,").pop();
-  (0, import_node_assert3.default)(base64Image, "base64Image is undefined");
+  (0, import_node_assert2.default)(base64Image, "base64Image is undefined");
   const [
     compositeElementInfoImgBase64,
     compositeElementInfoImgWithoutTextBase64
@@ -462,6 +459,7 @@ function savePositionImg(options) {
   base64Encoded,
   base64ToPngFormat,
   bufferFromBase64,
+  calculateNewDimensions,
   compositeElementInfoImg,
   drawBoxOnImage,
   imageInfo,
@@ -472,6 +470,5 @@ function savePositionImg(options) {
   saveBase64Image,
   savePositionImg,
   transformImgPathToBase64,
-  trimImage,
-  zoomForGPT4o
+  trimImage
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midscene/shared",
-  "version": "0.11.1-beta-20250214012635.0",
+  "version": "0.11.2",
   "repository": "https://github.com/web-infra-dev/midscene",
   "homepage": "https://midscenejs.com/",
   "types": "./src/index.ts",
@@ -99,7 +99,7 @@
     "typescript": "~5.0.4",
     "@types/node": "^18.0.0",
     "rimraf": "~3.0.2",
-    "vitest": "^1.6.0",
+    "vitest": "3.0.5",
     "js-sha256": "0.11.0"
   },
   "sideEffects": [],

package/src/img/index.ts

@@ -7,10 +7,10 @@ export {
 } from './info';
 export {
   trimImage,
+  calculateNewDimensions,
   resizeImg,
   resizeImgBase64,
   transformImgPathToBase64,
-  zoomForGPT4o,
   saveBase64Image,
 } from './transform';
 export { processImageElementInfo, compositeElementInfoImg } from './box-select';

package/src/img/transform.ts

@@ -1,4 +1,3 @@
-import assert from 'node:assert';
 import { Buffer } from 'node:buffer';
 import getJimp from './get-jimp';
 
@@ -50,7 +49,7 @@ export async function transformImgPathToBase64(inputPath: string) {
  */
 export async function resizeImg(
   inputData: Buffer,
-  newSize: {
+  newSize?: {
     width: number;
     height: number;
   },
@@ -58,11 +57,6 @@ export async function resizeImg(
   if (typeof inputData === 'string')
     throw Error('inputData is base64, use resizeImgBase64 instead');
 
-  assert(
-    newSize && newSize.width > 0 && newSize.height > 0,
-    'newSize must be positive',
-  );
-
   const Jimp = await getJimp();
   const image = await Jimp.read(inputData);
   const { width, height } = image.bitmap;
@@ -71,11 +65,13 @@ export async function resizeImg(
     throw Error('Undefined width or height from the input image.');
   }
 
-  if (newSize.width === width && newSize.height === height) {
-    return inputData;
-  }
+  const finalNewSize = newSize || calculateNewDimensions(width, height);
 
-  image.resize(newSize.width, newSize.height, Jimp.RESIZE_NEAREST_NEIGHBOR);
+  image.resize(
+    finalNewSize.width,
+    finalNewSize.height,
+    Jimp.RESIZE_NEAREST_NEIGHBOR,
+  );
   image.quality(90);
   const resizedBuffer = await image.getBufferAsync(Jimp.MIME_JPEG);
 
@@ -83,14 +79,14 @@ export async function resizeImg(
 }
 
 export async function resizeImgBase64(
-  inputBase64: string,
-  newSize: {
+  inputData: string,
+  newSize?: {
     width: number;
     height: number;
   },
 ): Promise<string> {
   const splitFlag = ';base64,';
-  const dataSplitted = inputBase64.split(splitFlag);
+  const dataSplitted = inputData.split(splitFlag);
   if (dataSplitted.length !== 2) {
     throw Error('Invalid base64 data');
   }
@@ -113,7 +109,10 @@ export async function resizeImgBase64(
  * @returns {Object} An object containing the new width and height.
  * @throws {Error} Throws an error if the width or height is not a positive number.
  */
-export function zoomForGPT4o(originalWidth: number, originalHeight: number) {
+export function calculateNewDimensions(
+  originalWidth: number,
+  originalHeight: number,
+) {
   // In low mode, the image is scaled to 512x512 pixels and 85 tokens are used to represent the image.
   // In high mode, the model looks at low-resolution images and then creates detailed crop images, using 170 tokens for each 512x512 pixel tile. In practical applications, it is recommended to control the image size within 2048x768 pixels
   const maxWidth = 2048; // Maximum width