image-js 1.3.0 → 1.5.0

package/src/roi/getRois.ts

@@ -9,7 +9,6 @@ export const RoiKind = {
   WHITE: 'white',
   BW: 'bw',
 } as const;
-// eslint-disable-next-line @typescript-eslint/no-redeclare
 export type RoiKind = (typeof RoiKind)[keyof typeof RoiKind];
 
 export interface GetRoisOptions {

package/src/save/encode.ts

@@ -15,7 +15,6 @@ export const ImageFormat = {
   JPEG: 'jpeg',
   BMP: 'bmp',
 } as const;
-// eslint-disable-next-line @typescript-eslint/no-redeclare
 export type ImageFormat = (typeof ImageFormat)[keyof typeof ImageFormat];
 
 export interface EncodeOptionsPng {

package/src/utils/constants/colorModels.ts

@@ -5,7 +5,6 @@ export const ImageColorModel = {
   RGBA: 'RGBA',
   BINARY: 'BINARY',
 } as const;
-// eslint-disable-next-line @typescript-eslint/no-redeclare
 export type ImageColorModel =
   (typeof ImageColorModel)[keyof typeof ImageColorModel];
 

package/src/utils/cross_platform.ts

@@ -24,6 +24,7 @@ let CanvasCtorNode: typeof SkiaCanvas;
 
 /**
  * Returns a 2D canvas context for rendering on the browser or Node.js.
+ * On Node.js this requires the optional `skia-canvas` package to be installed.
  * @param width - Width of the canvas.
  * @param height - Height of the canvas.
  * @returns The initialised canvas context.
@@ -33,7 +34,16 @@ export function getCanvasContext(
   height: number,
 ): OffscreenCanvasRenderingContext2D | SkiaCanvasRenderingContext2D {
   if (isNode()) {
-    CanvasCtorNode ??= getRequireFn()('skia-canvas').Canvas;
+    if (!CanvasCtorNode) {
+      try {
+        CanvasCtorNode = getRequireFn()('skia-canvas').Canvas;
+      } catch (error) {
+        throw new Error(
+          'drawText on Node.js requires the optional "skia-canvas" package. Install it with: npm install skia-canvas',
+          { cause: error },
+        );
+      }
+    }
     return new CanvasCtorNode(width, height).getContext('2d');
   } else {
     CanvasCtorBrowser ??= globalThis.OffscreenCanvas;

package/src/utils/interpolateBorder.ts

@@ -11,7 +11,6 @@ export const BorderType = {
   WRAP: 'wrap',
   REFLECT_101: 'reflect101',
 } as const;
-// eslint-disable-next-line @typescript-eslint/no-redeclare
 export type BorderType = (typeof BorderType)[keyof typeof BorderType];
 
 /**
@@ -24,8 +23,11 @@ export type BorderType = (typeof BorderType)[keyof typeof BorderType];
  */
 export function getBorderInterpolation(
   type: BorderType,
-  value: number,
+  value: number | number[],
 ): BorderInterpolationFunction {
+  if (typeof value === 'number') {
+    value = new Array(4).fill(value);
+  }
   return match(type)
     .with('constant', () => getInterpolateConstant(value))
     .with('replicate', () => interpolateReplicate)
@@ -41,7 +43,7 @@ function checkRange(point: number, length: number): void {
   }
 }
 
-function getInterpolateConstant(value: number): BorderInterpolationFunction {
+function getInterpolateConstant(value: number[]): BorderInterpolationFunction {
   return function interpolateConstant(
     column: number,
     row: number,
@@ -51,7 +53,7 @@ function getInterpolateConstant(value: number): BorderInterpolationFunction {
     const newColumn = interpolateConstantPoint(column, image.width);
     const newRow = interpolateConstantPoint(row, image.height);
     if (newColumn === -1 || newRow === -1) {
-      return value;
+      return value[channel];
     }
     return image.getValue(newColumn, newRow, channel);
   };

package/src/utils/interpolatePixel.ts

@@ -13,7 +13,6 @@ export const InterpolationType = {
   BILINEAR: 'bilinear',
   BICUBIC: 'bicubic',
 } as const;
-// eslint-disable-next-line @typescript-eslint/no-redeclare
 export type InterpolationType =
   (typeof InterpolationType)[keyof typeof InterpolationType];
 
@@ -22,7 +21,7 @@ type InterpolationFunction = (
   column: number,
   row: number,
   channel: number,
-  intepolateBorder: BorderInterpolationFunction,
+  interpolateBorder: BorderInterpolationFunction,
   clamp: ClampFunction,
 ) => number;