Merge remote-tracking branch 'origin/master' into dev

# Conflicts:
#	package.json

Author: matmen

.github/ISSUE_TEMPLATE/bug_report.md

@@ -3,7 +3,6 @@ name: Bug report
 about: Create a report to help us improve
 title: "[BUG]"
 labels: bug
-assignees: matmen, evanwashere
 
 ---
 

.github/ISSUE_TEMPLATE/feature_request.md

@@ -3,7 +3,6 @@ name: Feature request
 about: Suggest an idea for this project
 title: "[FR]"
 labels: enhancement
-assignees: matmen
 
 ---
 

ImageScript.d.ts

@@ -0,0 +1,223 @@
+export class Image {
+  private __width__: number;
+  private __height__: number;
+  private __buffer__: ArrayBuffer;
+  private __view__: DataView;
+  private __u32__: Uint32Array;
+  bitmap: Uint8ClampedArray;
+
+  constructor(width: number, height: number);
+
+  private toString(): string;
+
+  get width(): number;
+
+  get height(): number;
+
+  * [Symbol.iterator](): void;
+
+  * iterateWithColors(): Generator<[x: number, y: number, color: number], void, unknown>;
+  
+  static rgbaToColor(r: number, g: number, b: number, a: number): number;
+
+  static rgbToColor(r: number, g: number, b: number): number;
+
+  static hslaToColor(h: number, s: number, l: number, a: number): number;
+
+  static hslToColor(h: number, s: number, l: number): number;
+
+  static rgbaToHSLA(r: number, g: number, b: number, a: number): number[];
+
+  static colorToRGBA(color: number): number[];
+
+  static colorToRGB(color: number): number[];
+
+  getPixelAt(x: number, y: number): number;
+
+  getRGBAAt(x: number, y: number): Uint8ClampedArray;
+
+  setPixelAt(x: number, y: number, pixelColor: number): Image;
+
+  private __set_pixel__(x: number, y: number, pixelColor: number): void;
+
+  private __check_boundaries__(x: number, y: number): void;
+
+  private static get __out_of_bounds__(): string;
+
+  fill(color: number | colorFunction): Image;
+
+  clone(): Image;
+
+  static get RESIZE_NEAREST_NEIGHBOR(): string;
+
+  static get RESIZE_AUTO(): number;
+
+  scale(factor: number, mode?: string): Image;
+
+  private __scale__(factor: number, mode?: string);
+
+  resize(width: number, height: number, mode?: string): Image;
+
+  contain(width: number, height: number, mode?: string): Image;
+
+  fit(width: number, height: number, mode?: string): Image;
+
+  cover(width: number, height: number, mode?: string): Image;
+
+  private __resize__(width: number, height: number, mode?: string): Image;
+
+  private __resize_nearest_neighbor__(width: number, height: number): Image;
+
+  crop(x: number, y: number, width: number, height: number): Image;
+
+  private __crop__(x: number, y: number, width: number, height: number): Image;
+
+  drawBox(x: number, y: number, width: number, height: number, color: number | colorFunction): Image;
+
+  private __fast_box__(x: number, y: number, width: number, height: number, color: number): Image;
+
+  drawCircle(x: number, y: number, radius: number, color: number | colorFunction): Image;
+
+  cropCircle(max?: boolean, feathering?: number): Image;
+
+  opacity(opacity: number, absolute?: boolean): Image;
+
+  red(saturation: number, absolute?: boolean): Image;
+
+  green(saturation: number, absolute?: boolean): Image;
+
+  blue(saturation: number, absolute?: boolean): Image;
+
+  private __set_channel_value__(value: number, absolute: boolean, offset: number): void;
+
+  lightness(value: number, absolute?: boolean): Image;
+
+  saturation(value: number, absolute?: boolean): Image;
+
+  composite(source: Image, x?: number, y?: number): Image;
+
+  invert(): Image;
+
+  invertValue(): Image;
+
+  invertSaturation(): Image;
+
+  invertHue(): Image;
+
+  hueShift(degrees: number): Image;
+
+  averageColor(): number;
+
+  dominantColor(ignoreBlack?: boolean, ignoreWhite?: boolean, bwThreshold?: number): number;
+
+  rotate(angle: number, resize?: boolean): Image;
+
+  private __apply__(image: Image | Frame): Image | Frame;
+
+  static gradient(colors: { [position: number]: number; }): ((position: number) => number);
+
+  roundCorners(radius?: number): Image;
+
+  private static __gradient__(startColor: number, endColor: number): number;
+
+  fisheye(radius?: number): Image;
+
+  async encode(compression?: number, metadata?: PNGMetadata): Promise<Uint8Array>;
+  async encode(metadata?: PNGMetadata): Promise<Uint8Array>;
+
+  async encodeJPEG(quality?: number): Promise<Uint8Array>;
+
+  async encodeWEBP(quality?: null | number): Promise<Uint8Array>;
+
+  static async encode(data: Buffer | Uint8Array): Promise<Image>
+
+  static get SVG_MODE_SCALE(): number;
+
+  static get SVG_MODE_WIDTH(): number;
+
+  static get SVG_MODE_HEIGHT(): number;
+
+  static async renderSVG(svg: string, size?: number, mode?: number): Promise<Image>;
+
+  static async renderText(font: Uint8Array, scale: number, text: string, color?: number, layout?: TextLayout): Promise<Image>;
+};
+
+export class Frame extends Image {
+  static get DISPOSAL_KEEP(): string;
+
+  static get DISPOSAL_PREVIOUS(): string;
+
+  static get DISPOSAL_BACKGROUND(): string
+
+  private static __convert_disposal_mode__(mode: string | number): any;
+
+  constructor(width: number, height: number, duration?: number, xOffset?: number, yOffset?: number, disposalMode?: typeof Frame.DISPOSAL_KEEP | string);
+
+  toString(): string;
+
+  static from(image: Image, duration?: number, xOffset?: number, yOffset?: number, disposalMode?: typeof Frame.DISPOSAL_KEEP | string): Frame;
+
+  resize(width: number, height: number, mode?: typeof Image.RESIZE_NEAREST_NEIGHBOR | string): Image;
+};
+
+export class GIF extends Array {
+  constructor(frames: Frame[], loopCount?: number);
+
+  get width(): number;
+
+  get height(): number;
+
+  toString(): string;
+
+  * [Symbol.iterator](): Generator<Frame, void, *>
+
+  slice(start: number, end: number): GIF;
+
+  get duration(): number;
+
+  async encode(quality?: number): Promise<Uint8Array>
+
+  static async decode(data: Buffer | Uint8Array, onlyExtractFirstFrame?: boolean): Promise<GIF>;
+
+  resize(width: number, height: number, mode?: typeof Image.RESIZE_NEAREST_NEIGHBOR | string): void;
+}
+
+export class TextLayout {
+  constructor(options?: {
+    maxWidth?: number,
+    maxHeight?: number,
+    wrapStyle?: string,
+    verticalAlign?: string,
+    horizontalAlign?: string,
+    wrapHardBreaks?: boolean
+  });
+};
+
+export class ImageType {
+  static getType(data: Buffer | Uint8Array): string | null;
+
+  static isPNG(view: DataView): boolean;
+
+  static isJPEG(view: DataView): boolean;
+
+  static isTIFF(view: DataView): boolean;
+
+  static isGIF(view: DataView): boolean;
+};
+
+export function decode(data: Uint8Array | Buffer, onlyExtractFirstFrame?: boolean): Promise<GIF | Image>;
+
+type colorFunction = (x: number, y: number) => number;
+
+type PNGMetadata = {
+  title?: string,
+  author?: string,
+  description?: string,
+  copyright?: string,
+  creationTime?: string | number | Date,
+  software?: string,
+  disclaimer?: string,
+  warning?: string,
+  source?: string,
+  comment?: string
+};

ImageScript.js

@@ -7,6 +7,7 @@ const { default: v2 } = require('./v2/framebuffer.js');
 // old
 const svglib = require('./wasm/node/svg.js');
 const giflib = require('./wasm/node/gif.js');
+const pnglib = require('./wasm/node/png.js');
 const fontlib = require('./wasm/node/font.js');
 const jpeglib = require('./wasm/node/jpeg.js');
 const tifflib = require('./wasm/node/tiff.js');
@@ -1082,9 +1083,9 @@ class Image {
         const view = new DataView(data.buffer, data.byteOffset, data.byteLength);
 
         if (ImageType.isPNG(view)) { // PNG
-            const {width, height, pixels} = await png.decode(data);
+            const {width, height, framebuffer} = (await pnglib.init()).decode(data);
             image = new Image(width, height);
-            image.bitmap.set(pixels);
+            image.bitmap.set(framebuffer);
         } else if (ImageType.isJPEG(view)) { // JPEG
             const framebuffer = (await jpeglib.init()).decode(data);
 

README.md

@@ -3,7 +3,7 @@
 [![Discord Server](https://img.shields.io/discord/691713541262147687.svg?label=Discord&logo=discord&logoColor=ffffff&color=7389D8&labelColor=6A7EC2&style=for-the-badge)](https://discord.gg/8hPrwAH)
 [![Documentation](https://img.shields.io/badge/Documentation-informational?style=for-the-badge)](https://imagescript.matmen.dev/)
 [![Github](https://img.shields.io/badge/Github-Repository-181717?logo=github&style=for-the-badge)](https://github.com/matmen/ImageScript)
-[![deno.land](https://shields.io/badge/deno.land-gray?logo=deno&style=for-the-badge)](https://deno.land/x/imagescript@1.2.9)
+[![deno.land](https://shields.io/badge/deno.land-gray?logo=deno&style=for-the-badge)](https://deno.land/x/imagescript)
 [![NPM](https://nodei.co/npm/imagescript.png)](https://www.npmjs.com/package/imagescript)
 
 ---

package.json

@@ -1,6 +1,6 @@
 {
   "name": "imagescript",
-  "version": "1.2.9",
+  "version": "1.2.15",
   "description": "zero-dependency javascript image manipulation",
   "main": "ImageScript.js",
   "types": "ImageScript.d.ts",
@@ -30,7 +30,7 @@
     "thumbnail"
   ],
   "author": "Mathis Mensing <mathis@matmen.dev>",
-  "license": "GPL-3.0-or-later",
+  "license": "AGPL-3.0-or-later",
   "bugs": {
     "url": "https://github.com/matmen/ImageScript/issues"
   },

tests/font.js

@@ -34,4 +34,15 @@ const panic = message => {
         const desired = await fs.readFile('./tests/targets/font-2.png');
         if (!desired.equals(Buffer.from(encoded))) panic('font 2 doesn\'t match');
     }
+
+    {
+        const font = await Image.renderText(await fs.readFile('./tests/fonts/opensans bold.ttf'), 128, 'Extra\n-Test\nnewline');
+        const encoded = await font.encode(1, {creationTime: 0, software: ''});
+
+        if (process.env.OVERWRITE_TEST)
+            await fs.writeFile('./tests/targets/font-3.png', encoded);
+
+        const desired = await fs.readFile('./tests/targets/font-3.png');
+        if (!desired.equals(Buffer.from(encoded))) panic('font 3 doesn\'t match');
+    }
 })();

tests/fonts/opensans bold.ttf

@@ -0,0 +1,21 @@
+{
+  "compilerOptions": {
+    "target": "es6",
+    "module": "commonjs",
+    "strict": true,
+    "noImplicitAny": true,
+    "strictNullChecks": true,
+    "noImplicitThis": true,
+    "alwaysStrict": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "noImplicitReturns": true,
+    "noFallthroughCasesInSwitch": true,
+    "moduleResolution": "node",
+    "allowJs": true,
+    "allowSyntheticDefaultImports": true,
+    "skipLibCheck": true,
+    "lib": ["es6"]
+  },
+  "files": ["ImageScript.d.ts"]
+}