imagescript 1.2.8 → 1.2.15

package/codecs/wasm/bundle/browser.js

@@ -0,0 +1 @@
+throw new Error('todo!');

package/codecs/wasm/index.js

@@ -0,0 +1 @@
+throw new Error('todo!');

package/codecs/wasm/index.mjs

@@ -0,0 +1 @@
+import lib from './index.js';

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "imagescript",
-  "version": "1.2.8",
+  "version": "1.2.15",
   "description": "zero-dependency javascript image manipulation",
   "main": "ImageScript.js",
+  "types": "ImageScript.d.ts",
   "scripts": {
     "test": "node ./tests/run.js",
     "coverage": "nyc --reporter=html npm test"
@@ -14,10 +15,22 @@
   "keywords": [
     "image",
     "image processing",
-    "image manipulation"
+    "image manipulation",
+    "png",
+    "jpeg",
+    "jpg",
+    "scale",
+    "resize",
+    "crop",
+    "webp",
+    "svg",
+    "bitmap",
+    "gif",
+    "picture",
+    "thumbnail"
   ],
-  "author": "matmen <matmen@dreadful.tech>",
-  "license": "GPL-3.0-or-later",
+  "author": "Mathis Mensing <mathis@matmen.dev>",
+  "license": "AGPL-3.0-or-later",
   "bugs": {
     "url": "https://github.com/matmen/ImageScript/issues"
   },

package/png/README.md

@@ -0,0 +1 @@
+TBD

package/png/src/{png.js → png.mjs}

@@ -1,6 +1,6 @@
-import { crc32 } from './crc.js';
-import { from_parts } from './mem.js';
-import { compress, decompress } from './zlib.js';
+import { crc32 } from './crc.mjs';
+import { from_parts } from './mem.mjs';
+import { compress, decompress } from './zlib.mjs';
 
 const __IHDR__ = new Uint8Array([73, 72, 68, 82]);
 const __IDAT__ = new Uint8Array([73, 68, 65, 84]);

package/tsconfig.json

@@ -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"]
+}

package/v2/framebuffer.js

@@ -1,57 +1,10 @@
-var __create = Object.create;
 var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __markAsModule = (target) => __defProp(target, "__esModule", { value: true });
-var __commonJS = (cb, mod) => function __require() {
-  return mod || (0, cb[Object.keys(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
-};
 var __export = (target, all) => {
   __markAsModule(target);
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
 };
-var __reExport = (target, module2, desc) => {
-  if (module2 && typeof module2 === "object" || typeof module2 === "function") {
-    for (let key of __getOwnPropNames(module2))
-      if (!__hasOwnProp.call(target, key) && key !== "default")
-        __defProp(target, key, { get: () => module2[key], enumerable: !(desc = __getOwnPropDesc(module2, key)) || desc.enumerable });
-  }
-  return target;
-};
-var __toModule = (module2) => {
-  return __reExport(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", module2 && module2.__esModule && "default" in module2 ? { get: () => module2.default, enumerable: true } : { value: module2, enumerable: true })), module2);
-};
-
-// v2/util/mem.js
-var require_mem = __commonJS({
-  "v2/util/mem.js"(exports, module2) {
-    function view3(buffer, shared = false) {
-      if (buffer instanceof ArrayBuffer)
-        return new Uint8Array(buffer);
-      if (shared && buffer instanceof SharedArrayBuffer)
-        return new Uint8Array(buffer);
-      if (ArrayBuffer.isView(buffer))
-        return new Uint8Array(buffer.buffer, buffer.byteOffset, buffer.byteLength);
-      throw new TypeError("The provided value is not of type '(ArrayBuffer or ArrayBufferView)'");
-    }
-    function from_parts2(buffers, shared = false) {
-      let length = 0;
-      let offset = 0;
-      buffers.forEach((buffer) => length += buffer.byteLength == null ? buffer.length : buffer.byteLength);
-      const u82 = new Uint8Array(shared ? new SharedArrayBuffer(length) : length);
-      buffers.forEach((buffer) => {
-        const ref = Array.isArray(buffer) ? buffer : view3(buffer, true);
-        u82.set(ref, offset);
-        offset += ref.length;
-      });
-      return u82;
-    }
-    module2.exports = { view: view3, from_parts: from_parts2 };
-  }
-});
 
 // v2/framebuffer.mjs
 __export(exports, {
@@ -340,8 +293,16 @@ var colors = new Map([
   ["yellowgreen", 2597139199]
 ]);
 
-// v2/framebuffer.mjs
-var import_mem2 = __toModule(require_mem());
+// v2/util/mem.js
+function view(buffer, shared = false) {
+  if (buffer instanceof ArrayBuffer)
+    return new Uint8Array(buffer);
+  if (shared && buffer instanceof SharedArrayBuffer)
+    return new Uint8Array(buffer);
+  if (ArrayBuffer.isView(buffer))
+    return new Uint8Array(buffer.buffer, buffer.byteOffset, buffer.byteLength);
+  throw new TypeError("The provided value is not of type '(ArrayBuffer or ArrayBufferView)'");
+}
 
 // v2/ops/flip.js
 var flip_exports = {};
@@ -773,9 +734,9 @@ function clamped(x2, y, width, height) {
   return 4 * (clamp3(0, x2, width - 1) + clamp3(0, y, height - 1) * width);
 }
 function hermite(A, B, C, D, t) {
-  const c = C / 2 + -A / 2;
-  const b = A + 2 * C - D / 2 - 5 * B / 2;
-  const a = D / 2 + -A / 2 + 3 * B / 2 - 3 * C / 2;
+  const c = C / 2 + A / -2;
+  const b = A + C * 2 - D / 2 - B * 2.5;
+  const a = D / 2 + A / -2 + B * 1.5 - C * 1.5;
   const t2 = t * t;
   return B + c * t + b * t2 + a * t * t2;
 }
@@ -998,50 +959,64 @@ function pawn(point0, point1, weight, ref, inn) {
 // v2/ops/overlay.js
 var overlay_exports = {};
 __export(overlay_exports, {
-  overlay: () => overlay,
+  blend: () => blend2,
   replace: () => replace
 });
 function replace(bg, fg, x2, y) {
-  const fwidth = fg.width | 0;
-  const bwidth = bg.width | 0;
-  const fheight = fg.height | 0;
-  const bheight = bg.height | 0;
-  let mw = Math.min(bwidth, fwidth) | 0;
-  let mh = Math.min(bheight, fheight) | 0;
   const b32 = bg.u32;
   const f32 = fg.u32;
-  for (let yy = y | 0; yy < mh; yy++) {
-    const yoffset = yy * bwidth;
-    const yyoffset = fwidth * (yy - y);
-    for (let xx = x2 | 0; xx < mw; xx++) {
-      b32[xx + yoffset] = f32[xx - x2 + yyoffset];
-    }
+  const fw = fg.width | 0;
+  const bw = bg.width | 0;
+  const fh = fg.height | 0;
+  const bh = bg.height | 0;
+  const ox = (x2 > 0 ? 0 : -x2) | 0;
+  const oy = (y > 0 ? 0 : -y) | 0;
+  const top = (y > 0 ? y : 0) | 0;
+  const left = (x2 > 0 ? x2 : 0) | 0;
+  const width = Math.min(bw, x2 + fw) - left | 0;
+  const height = Math.min(bh, y + fh) - top | 0;
+  if (0 >= width || 0 >= height)
+    return;
+  for (let yy = 0 | 0; yy < height; yy++) {
+    const yyoffset = ox + fw * (yy + oy);
+    const yoffset = left + bw * (yy + top);
+    b32.subarray(yoffset, width + yoffset).set(f32.subarray(yyoffset, width + yyoffset));
   }
 }
-function overlay(background, foreground, x2, y) {
-  x2 = x2 | 0;
-  y = y | 0;
-  const fwidth = foreground.width | 0;
-  const bwidth = background.width | 0;
-  const fheight = foreground.height | 0;
-  const bheight = background.height | 0;
-  const mw = Math.min(bwidth, fwidth) | 0;
-  const mh = Math.min(bheight, fheight) | 0;
-  const fview = foreground.view;
-  const bview = background.view;
-  for (let yy = y | 0; yy < mh; yy++) {
-    const yoffset = yy * bwidth;
-    const yyoffset = fwidth * (yy - y);
-    for (let xx = x2 | 0; xx < mw; xx++) {
-      const offset = 4 * (xx + yoffset);
-      const fg = fview.getUint32(4 * (xx - x2 + yyoffset), false);
-      const bg = bview.getUint32(offset, false);
-      if ((fg & 255) === 255)
-        bview.setUint32(offset, fg, false);
-      else if ((fg & 255) === 0)
-        bview.setUint32(offset, bg, false);
-      else
-        bview.setUint32(offset, blend(fg, bg), false);
+function blend2(bg, fg, x2, y) {
+  const b32 = bg.u32;
+  const f32 = fg.u32;
+  const fw = fg.width | 0;
+  const bw = bg.width | 0;
+  const fh = fg.height | 0;
+  const bh = bg.height | 0;
+  const ox = (x2 > 0 ? 0 : -x2) | 0;
+  const oy = (y > 0 ? 0 : -y) | 0;
+  const top = (y > 0 ? y : 0) | 0;
+  const left = (x2 > 0 ? x2 : 0) | 0;
+  const width = Math.min(bw, x2 + fw) - left | 0;
+  const height = Math.min(bh, y + fh) - top | 0;
+  if (0 >= width || 0 >= height)
+    return;
+  for (let yy = 0 | 0; yy < height; yy++) {
+    const yyoffset = ox + fw * (yy + oy);
+    const yoffset = left + bw * (yy + top);
+    for (let xx = 0 | 0; xx < width; xx++) {
+      const F = f32[xx + yyoffset];
+      const fa = F >> 24 & 255;
+      if (fa === 0)
+        continue;
+      else if (fa === 255)
+        b32[xx + yoffset] = F;
+      else {
+        const alpha = 1 + fa;
+        const inv_alpha = 256 - fa;
+        const B = b32[xx + yoffset];
+        const r = alpha * (F & 255) + inv_alpha * (B & 255) >> 8;
+        const g = alpha * (F >> 8 & 255) + inv_alpha * (B >> 8 & 255) >> 8;
+        const b = alpha * (F >> 16 & 255) + inv_alpha * (B >> 16 & 255) >> 8;
+        b32[xx + yoffset] = Math.max(fa, B >> 24 & 255) << 24 | (b & 255) << 16 | (g & 255) << 8 | r;
+      }
     }
   }
 }
@@ -1056,8 +1031,8 @@ __export(iterator_exports, {
 function* cords(framebuffer2) {
   const width = framebuffer2.width | 0;
   const height = framebuffer2.height | 0;
-  for (let y = 1 | 0; y <= height; y++) {
-    for (let x2 = 1 | 0; x2 <= width; x2++)
+  for (let y = 0 | 0; y < height; y++) {
+    for (let x2 = 0 | 0; x2 < width; x2++)
       yield [x2, y];
   }
 }
@@ -1066,8 +1041,8 @@ function* rgba(framebuffer2) {
   const u82 = framebuffer2.u8;
   const width = framebuffer2.width | 0;
   const height = framebuffer2.height | 0;
-  for (let y = 1 | 0; y <= height; y++) {
-    for (let x2 = 1 | 0; x2 <= width; x2++) {
+  for (let y = 0 | 0; y < height; y++) {
+    for (let x2 = 0 | 0; x2 < width; x2++) {
       yield [x2, y, u82.subarray(offset, offset += 4)];
     }
   }
@@ -1077,8 +1052,8 @@ function* u32(framebuffer2) {
   const view3 = framebuffer2.view;
   const width = framebuffer2.width | 0;
   const height = framebuffer2.height | 0;
-  for (let y = 1 | 0; y <= height; y++) {
-    for (let x2 = 1 | 0; x2 <= width; x2++) {
+  for (let y = 0 | 0; y < height; y++) {
+    for (let x2 = 0 | 0; x2 < width; x2++) {
       yield [x2, y, view3.getUint32(offset, false)];
       offset += 4;
     }
@@ -1361,7 +1336,7 @@ function crc32(buffer) {
 }
 
 // png/src/mem.js
-function view(buffer, shared = false) {
+function view2(buffer, shared = false) {
   if (buffer instanceof ArrayBuffer)
     return new Uint8Array(buffer);
   if (shared && buffer instanceof SharedArrayBuffer)
@@ -1376,7 +1351,7 @@ function from_parts(buffers, shared = false) {
   buffers.forEach((buffer) => length += buffer.byteLength == null ? buffer.length : buffer.byteLength);
   const u82 = new Uint8Array(shared ? new SharedArrayBuffer(length) : length);
   buffers.forEach((buffer) => {
-    const ref = Array.isArray(buffer) ? buffer : view(buffer, true);
+    const ref = Array.isArray(buffer) ? buffer : view2(buffer, true);
     u82.set(ref, offset);
     offset += ref.length;
   });
@@ -1411,12 +1386,13 @@ var _b = freb(fdeb, 0);
 var fd = _b[0];
 var revfd = _b[1];
 var rev = new u16(32768);
-for (var i = 0; i < 32768; ++i) {
+for (i = 0; i < 32768; ++i) {
   x = (i & 43690) >>> 1 | (i & 21845) << 1;
   x = (x & 52428) >>> 2 | (x & 13107) << 2;
   x = (x & 61680) >>> 4 | (x & 3855) << 4;
   rev[i] = ((x & 65280) >>> 8 | (x & 255) << 8) >>> 1;
 }
+var i;
 var x;
 var hMap = function(cd, mb, r) {
   var s = cd.length;
@@ -1453,17 +1429,22 @@ var hMap = function(cd, mb, r) {
   return co;
 };
 var flt = new u8(288);
-for (var i = 0; i < 144; ++i)
+for (i = 0; i < 144; ++i)
   flt[i] = 8;
-for (var i = 144; i < 256; ++i)
+var i;
+for (i = 144; i < 256; ++i)
   flt[i] = 9;
-for (var i = 256; i < 280; ++i)
+var i;
+for (i = 256; i < 280; ++i)
   flt[i] = 7;
-for (var i = 280; i < 288; ++i)
+var i;
+for (i = 280; i < 288; ++i)
   flt[i] = 8;
+var i;
 var fdt = new u8(32);
-for (var i = 0; i < 32; ++i)
+for (i = 0; i < 32; ++i)
   fdt[i] = 5;
+var i;
 var flm = hMap(flt, 9, 0);
 var flrm = hMap(flt, 9, 1);
 var fdm = hMap(fdt, 5, 0);
@@ -2214,7 +2195,7 @@ var framebuffer = class {
   constructor(width, height, buffer) {
     this.width = width | 0;
     this.height = height | 0;
-    this.u8 = buffer ? (0, import_mem2.view)(buffer) : new Uint8Array(4 * this.width * this.height);
+    this.u8 = buffer ? view(buffer) : new Uint8Array(4 * this.width * this.height);
     this.view = new DataView(this.u8.buffer, this.u8.byteOffset, this.u8.byteLength);
     this.u32 = new Uint32Array(this.u8.buffer, this.u8.byteOffset, this.u8.byteLength / 4);
     if (this.u8.length !== 4 * this.width * this.height)
@@ -2226,29 +2207,29 @@ var framebuffer = class {
   toString() {
     return `framebuffer<${this.width}x${this.height}>`;
   }
+  get(x2, y) {
+    return this.view.getUint32((x2 | 0) + (y | 0) * this.width, false);
+  }
   clone() {
     return new this.constructor(this.width, this.height, this.u8.slice());
   }
+  set(x2, y, color3) {
+    this.view.setUint32((x2 | 0) + (y | 0) * this.width, color3, false);
+  }
   toJSON() {
     return { width: this.width, height: this.height, buffer: Array.from(this.u8) };
   }
-  get(x2, y) {
-    return this.view.getUint32((x2 | 0) - 1 + ((y | 0) - 1) * this.width, false);
-  }
   scale(type, factor) {
     return this.resize(type, factor * this.width, factor * this.height);
   }
   overlay(frame, x2 = 0, y = 0) {
-    return overlay_exports.overlay(this, frame, x2 | 0, y | 0), this;
+    return overlay_exports.blend(this, frame, x2 | 0, y | 0), this;
   }
   replace(frame, x2 = 0, y = 0) {
     return overlay_exports.replace(this, frame, x2 | 0, y | 0), this;
   }
-  set(x2, y, color3) {
-    this.view.setUint32((x2 | 0) - 1 + ((y | 0) - 1) * this.width, color3, false);
-  }
   at(x2, y) {
-    const offset = 4 * ((x2 | 0) - 1 + ((y | 0) - 1) * this.width);
+    const offset = 4 * ((x2 | 0) + (y | 0) * this.width);
     return this.u8.subarray(offset, 4 + offset);
   }
   static from(framebuffer2) {
@@ -2294,7 +2275,7 @@ var framebuffer = class {
   }
   cut(type, arg0, arg1, arg2, arg3) {
     if (type === "circle")
-      return crop_exports.circle(arg0 || 0, this);
+      return crop_exports.circle(arg0 || 0, this.clone());
     else if (type === "box")
       return crop_exports.cut(arg0 | 0, arg1 | 0, arg2 | 0, arg3 | 0, this);
     else
@@ -2358,8 +2339,6 @@ var framebuffer = class {
       resize_exports.cubic(width, height, this);
     else if (type === "linear")
       resize_exports.linear(width, height, this);
-    else if (type === "liquid")
-      resize_exports.liquid(width, height, this);
     else if (type === "nearest")
       resize_exports.nearest(width, height, this);
     else

package/v2/framebuffer.mjs

@@ -1,7 +1,7 @@
-import Color from './ops/color.js';
-import { view } from './util/mem.js';
-import * as ops from './ops/index.js';
-import * as png from '../png/src/png.js';
+import Color from './ops/color.mjs';
+import { view } from './util/mem.mjs';
+import * as ops from './ops/index.mjs';
+import * as png from '../png/src/png.mjs';
 
 export { Color };
 
@@ -20,14 +20,14 @@ export default class framebuffer {
 
   [Symbol.iterator]() { return ops.iterator.cords(this); }
   toString() { return `framebuffer<${this.width}x${this.height}>`; }
+  get(x, y) { return this.view.getUint32((x | 0) + (y | 0) * this.width, false); }
   clone() { return new this.constructor(this.width, this.height, this.u8.slice()); }
+  set(x, y, color) { this.view.setUint32((x | 0) + (y | 0) * this.width, color, false); }
   toJSON() { return { width: this.width, height: this.height, buffer: Array.from(this.u8) } }
-  get(x, y) { return this.view.getUint32(((x | 0) - 1) + ((y | 0) - 1) * this.width, false); }
   scale(type, factor) { return this.resize(type, factor * this.width, factor * this.height); }
-  overlay(frame, x = 0, y = 0) { return (ops.overlay.overlay(this, frame, x | 0, y | 0), this); }
+  overlay(frame, x = 0, y = 0) { return (ops.overlay.blend(this, frame, x | 0, y | 0), this); }
   replace(frame, x = 0, y = 0) { return (ops.overlay.replace(this, frame, x | 0, y | 0), this); }
-  set(x, y, color) { this.view.setUint32(((x | 0) - 1) + ((y | 0) - 1) * this.width, color, false); }
-  at(x, y) { const offset = 4 * (((x | 0) - 1) + ((y | 0) - 1) * this.width); return this.u8.subarray(offset, 4 + offset); }
+  at(x, y) { const offset = 4 * ((x | 0) + (y | 0) * this.width); return this.u8.subarray(offset, 4 + offset); }
   static from(framebuffer) { return new this(framebuffer.width, framebuffer.height, framebuffer.u8 || framebuffer.buffer); }
   static decode(format, buffer) { if (format !== 'png') throw new RangeError('invalid image format'); else return framebuffer.from(png.decode(buffer)); }
 
@@ -62,7 +62,7 @@ export default class framebuffer {
   }
 
   cut(type, arg0, arg1, arg2, arg3) {
-    if (type === 'circle') return ops.crop.circle(arg0 || 0, this);
+    if (type === 'circle') return ops.crop.circle(arg0 || 0, this.clone());
     else if (type === 'box') return ops.crop.cut(arg0 | 0, arg1 | 0, arg2 | 0, arg3 | 0, this);
 
     else throw new RangeError('invalid cut type');
@@ -117,7 +117,6 @@ export default class framebuffer {
     if (width === this.width && height === this.height) return this;
     else if (type === 'cubic') ops.resize.cubic(width, height, this);
     else if (type === 'linear') ops.resize.linear(width, height, this);
-    else if (type === 'liquid') ops.resize.liquid(width, height, this);
     else if (type === 'nearest') ops.resize.nearest(width, height, this);
 
     else throw new RangeError('invalid resize type');