@e-mc/image 0.11.7 → 0.12.0

package/README.md

@@ -1,7 +1,7 @@
 # @e-mc/image
 
-* NodeJS 16 LTS
-* ES2021
+* NodeJS 18
+* ES2022
 
 ## General Usage
 
@@ -9,7 +9,7 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.11.7/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.12.0/lib/index.d.ts)
 
 ```typescript
 import type { IHost, ModuleConstructor } from "./index";
@@ -34,18 +34,25 @@ interface IImage extends IClient<IHost, ImageModule> {
     parseRotate(value: string): RotateData | undefined;
     parseQuality(value: string): QualityData | undefined;
     parseOpacity(value: string): number;
+    parseWorker(command: string | CommandData, outputType?: string): CommandData | null;
     using?(data: IFileThread, command: string): Promise<unknown>;
     get outputAs(): string;
 }
 
 interface ImageConstructor extends ModuleConstructor {
-    /** @deprecated */
-    readonly REGEXP_SIZERANGE: RegExp;
+    readonly MIME_JPEG: string;
+    readonly MIME_PNG: string;
+    readonly MIME_WEBP: string;
+    readonly MIME_SVG: string;
+    readonly MIME_GIF: string;
+    readonly MIME_BMP: string;
+    readonly MIME_TIFF: string;
     transform(file: string, command: string, options: { tempFile: true }): Promise<string>;
     transform(file: string, command: string, options?: TransformOptions): Promise<Buffer | null>;
     clamp(value: unknown, min?: number, max?: number): number;
     isBinary(mime: unknown): mime is string;
     toABGR(buffer: Uint8Array | Buffer): Buffer;
+    asBuffer(data: Buffer | Uint8Array): Buffer;
     readonly prototype: IImage;
     new(module?: ImageModule, ...args: unknown[]): IImage;
 }
@@ -88,9 +95,9 @@ NOTE: Usage without a **Host** is conducted through static methods. The **using*
 
 ## References
 
-- https://www.unpkg.com/@e-mc/types@0.11.7/lib/asset.d.ts
-- https://www.unpkg.com/@e-mc/types@0.11.7/lib/image.d.ts
-- https://www.unpkg.com/@e-mc/types@0.11.7/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.0/lib/asset.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.0/lib/image.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.0/lib/settings.d.ts
 
 ## LICENSE
 

package/index.js

@@ -1,15 +1,12 @@
 "use strict";
-var _a, _b;
 const core_1 = require("@e-mc/core");
-const kCommand = Symbol('command');
-const kOutputAs = Symbol('outputAs');
+const kImage = Symbol.for('image:constructor');
 const REGEXP_CROP = /\(\s*([+-]?\d+)\s*,\s*([+-]?\d+)\s*\|\s*(\d+)\s*[xX]\s*(\d+)\s*\)/;
 const REGEXP_OPACITY = /\|\s*(\d*\.\d+)\s*\|/;
 const REGEXP_QUALITY = /\|\s*(\d+)?(?:\s*\[\s*(photo|picture|drawing|icon|text)\s*\])?(?:\s*\[\s*(\d+)\s*\])?(?:\s*m\[\s*(\d+)\s*\])?\s*\|/;
 const REGEXP_RESIZE = /\(\s*(\d+|auto)\s*x\s*(\d+|auto)(?:\s*\[\s*(bilinear|bicubic|hermite|bezier)\s*\])?(?:\s*\^\s*(contain|cover|scale)(?:\s*\[\s*(left|center|right)?(?:\s*\|?\s*(top|middle|bottom))?\s*\])?)?(?:\s*#\s*([a-f\d]{1,8}))?\s*\)/;
 const REGEXP_ROTATE = /\{((?:\s*-?\d+\s*,?)+)(?:\s*#\s*([a-f\d]{1,8}))?\s*\}/i;
 const REGEXP_METHOD = /!\s*([a-z$][\w$]*)(\()?/gi;
-const REGEXP_SIZERANGE = /(!\s*[\w$]+)?\(\s*(\d+)\s*(?:,\s*(\d+|\*)\s*)?\)/;
 function isEscaped(value, checkQuote) {
     if (!checkQuote || /["']/.test(value)) {
         let k = 0;
@@ -27,13 +24,27 @@ function isEscaped(value, checkQuote) {
 const isNumber = (ch) => ch >= '0' && ch <= '9';
 const parseHexDecimal = (value) => value ? +('0x' + value.toUpperCase().padEnd(8, 'F')) : NaN;
 class Image extends core_1.Client {
-    constructor() {
-        super(...arguments);
-        this[_a] = '';
-        this[_b] = '';
+    static [kImage] = true;
+    static get MIME_JPEG() {
+        return 'image/jpeg';
     }
-    static get REGEXP_SIZERANGE() {
-        return REGEXP_SIZERANGE;
+    static get MIME_PNG() {
+        return 'image/png';
+    }
+    static get MIME_WEBP() {
+        return 'image/webp';
+    }
+    static get MIME_SVG() {
+        return 'image/svg+xml';
+    }
+    static get MIME_GIF() {
+        return 'image/gif';
+    }
+    static get MIME_BMP() {
+        return 'image/bmp';
+    }
+    static get MIME_TIFF() {
+        return 'image/tiff';
     }
     static async transform(file, command, options) {
         return options?.tempFile ? '' : null;
@@ -51,7 +62,7 @@ class Image extends core_1.Client {
         return NaN;
     }
     static isBinary(mime) {
-        return typeof mime === 'string' && mime.startsWith('image/') && mime !== 'image/svg+xml';
+        return typeof mime === 'string' && mime.startsWith('image/') && mime !== this.MIME_SVG;
     }
     static toABGR(buffer) {
         for (let i = 0, length = buffer.length; i < length; i += 4) {
@@ -63,6 +74,18 @@ class Image extends core_1.Client {
         }
         return Buffer.from(buffer);
     }
+    static asBuffer(data) {
+        return data instanceof Uint8Array ? Buffer.from(data.buffer, data.byteOffset, data.byteLength) : data;
+    }
+    resizeData;
+    cropData;
+    rotateData;
+    qualityData;
+    methodData;
+    opacityValue;
+    outputType;
+    #command = '';
+    #outputAs = '';
     reset() {
         super.reset();
         if (Object.hasOwn(this, 'resizeData')) {
@@ -83,8 +106,8 @@ class Image extends core_1.Client {
         if (Object.hasOwn(this, 'opacityValue')) {
             this.opacityValue = NaN;
         }
-        this[kCommand] = '';
-        this[kOutputAs] = '';
+        this.#command = '';
+        this.#outputAs = '';
     }
     setCommand(value, outputAs = '') {
         if (typeof value === 'string') {
@@ -94,7 +117,7 @@ class Image extends core_1.Client {
             this.qualityData = this.parseQuality(value);
             this.methodData = this.parseMethod(value);
             this.opacityValue = this.parseOpacity(value);
-            this[kCommand] = value;
+            this.#command = value;
         }
         else {
             this.resizeData = value.resize;
@@ -103,15 +126,16 @@ class Image extends core_1.Client {
             this.qualityData = value.quality;
             this.methodData = value.method;
             this.opacityValue = value.opacity ?? NaN;
-            this[kCommand] = '';
+            this.#command = '';
         }
-        this[kOutputAs] = outputAs;
+        this.#outputAs = outputAs;
     }
     getCommand() {
-        return this[kCommand];
+        return this.#command;
     }
     parseCommand(value) {
         return {
+            value,
             resize: this.parseResize(value),
             crop: this.parseCrop(value),
             rotate: this.parseRotate(value),
@@ -337,9 +361,11 @@ class Image extends core_1.Client {
         REGEXP_METHOD.lastIndex = 0;
         return result.length > 0 ? result : null;
     }
+    parseWorker(command, outputType) {
+        return null;
+    }
     get outputAs() {
-        return this[kOutputAs];
+        return this.#outputAs;
     }
 }
-_a = kCommand, _b = kOutputAs;
 module.exports = Image;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/image",
-  "version": "0.11.7",
+  "version": "0.12.0",
   "description": "Image constructor for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -20,6 +20,6 @@
   "license": "BSD-3-Clause",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/core": "0.11.7"
+    "@e-mc/core": "0.12.0"
   }
 }

package/types/index.d.ts

@@ -1,10 +1,10 @@
 import type { Dimension, Point } from '@e-mc/types/lib/image';
 
-export interface ImageHandler<T, U, V, W = void> {
+export interface ImageHandler<T, U, V, W = void, X = void> {
     readonly handler: T;
     host: U | null;
     instance: V;
-    method(): void;
+    method(): X;
     resize(): void;
     crop(): void;
     opacity(): void;