@thi.ng/imago 0.7.6 → 0.7.8

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Change Log
 
-- **Last updated**: 2024-04-23T07:02:18Z
+- **Last updated**: 2024-06-21T19:34:38Z
 - **Generator**: [thi.ng/monopub](https://thi.ng/monopub)
 
 All notable changes to this project will be documented in this file.
@@ -9,6 +9,12 @@ See [Conventional Commits](https://conventionalcommits.org/) for commit guidelin
 **Note:** Unlisted _patch_ versions only involve non-code or otherwise excluded changes
 and/or version bumps of transitive dependencies.
 
+### [0.7.8](https://github.com/thi-ng/umbrella/tree/@thi.ng/imago@0.7.8) (2024-06-21)
+
+#### ♻️ Refactoring
+
+- enforce uniform naming convention of internal functions ([56992b2](https://github.com/thi-ng/umbrella/commit/56992b2))
+
 ### [0.7.3](https://github.com/thi-ng/umbrella/tree/@thi.ng/imago@0.7.3) (2024-04-20)
 
 #### ♻️ Refactoring

package/README.md

@@ -7,7 +7,7 @@
 [![Mastodon Follow](https://img.shields.io/mastodon/follow/109331703950160316?domain=https%3A%2F%2Fmastodon.thi.ng&style=social)](https://mastodon.thi.ng/@toxi)
 
 > [!NOTE]
-> This is one of 192 standalone projects, maintained as part
+> This is one of 193 standalone projects, maintained as part
 > of the [@thi.ng/umbrella](https://github.com/thi-ng/umbrella/) monorepo
 > and anti-framework.
 >
@@ -357,7 +357,7 @@ For Node.js REPL:
 const imago = await import("@thi.ng/imago");
 ```
 
-Package sizes (brotli'd, pre-treeshake): ESM: 4.93 KB
+Package sizes (brotli'd, pre-treeshake): ESM: 4.92 KB
 
 ## Dependencies
 

package/api.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import type { Fn, Fn3, IObjectOf, Keys, Range1_4, TypedArray } from "@thi.ng/api";
 import type { ILogger } from "@thi.ng/logger";
 import type { AvifOptions, Blend, Exif, ExtendWith, FitEnum, GifOptions, Jp2Options, JpegOptions, JxlOptions, KernelEnum, Metadata, OverlayOptions, PngOptions, Sharp, TiffOptions, TileOptions, WebpOptions } from "sharp";

package/layers/image.js

@@ -13,16 +13,13 @@ const imageLayerImpl = async (layer, _, ctx) => {
     unit,
     ...opts
   } = layer;
-  if (!(path || buffer))
-    illegalArgs("missing image source");
+  if (!(path || buffer)) illegalArgs("missing image source");
   const input = sharp(path || buffer);
   const meta = await input.metadata();
   let imgSize = [meta.width, meta.height];
-  if (size)
-    imgSize = computeSize(size, imgSize, ref, unit);
+  if (size) imgSize = computeSize(size, imgSize, ref, unit);
   const $pos = positionOrGravity(imgSize, ctx.size, layer);
-  if (!size)
-    return { input: path, ...$pos, ...opts };
+  if (!size) return { input: path, ...$pos, ...opts };
   ensureSize(meta);
   const { data, info } = await input.resize(imgSize[0], imgSize[1], { fit: "fill" }).raw().toBuffer({ resolveWithObject: true });
   return {

package/layers/svg.js

@@ -13,10 +13,8 @@ const svgLayerImpl = async (layer, _, ctx) => {
     unit,
     ...opts
   } = layer;
-  if (path)
-    body = readText(path, ctx.logger);
-  if (!body)
-    illegalArgs("missing SVG doc");
+  if (path) body = readText(path, ctx.logger);
+  if (!body) illegalArgs("missing SVG doc");
   const w = +(/width="(\d+)"/.exec(body)?.[1] || 0);
   const h = +(/height="(\d+)"/.exec(body)?.[1] || 0);
   return {

package/layers/text.js

@@ -28,8 +28,7 @@ const textLayerImpl = async (layer, _, ctx) => {
   const y = isN ? padding : isS ? h - padding : h / 2;
   const align = isW ? "start" : isE ? "end" : "middle";
   const valign = isN ? 0.75 : isS ? 0 : 0.25;
-  if (path)
-    body = readText(path, ctx.logger);
+  if (path) body = readText(path, ctx.logger);
   const $body = isFunction(body) ? body(ctx) : body;
   const svg = [
     `<svg xmlns="${XML_SVG}" width="${w}" height="${h}" viewBox="0 0 ${w} ${h}">`,

package/ops/dither.js

@@ -50,8 +50,7 @@ const ditherProc = async (spec, input, ctx) => {
       channels: rgb ? [Lane.RED, Lane.GREEN, Lane.BLUE] : void 0
     });
   }
-  if (!rgb)
-    img = img.as(ABGR8888);
+  if (!rgb) img = img.as(ABGR8888);
   return [
     sharp(new Uint8Array(img.data.buffer), {
       raw: {

package/ops/output.js

@@ -9,13 +9,12 @@ const outputProc = async (spec, input, ctx) => {
   const outDir = resolve(ctx.opts.outDir || ".");
   let output = input.clone();
   if (opts.blurhash) {
-    await outputBlurHash(opts, output, ctx);
+    await __outputBlurHash(opts, output, ctx);
     return [input, false];
   }
-  if (!opts.path)
-    illegalArgs("output path missing");
+  if (!opts.path) illegalArgs("output path missing");
   if (opts.raw) {
-    await outputRaw(opts, output, ctx, outDir);
+    await __outputRaw(opts, output, ctx, outDir);
     return [input, false];
   }
   if (ctx.meta.exif && ctx.opts.keepEXIF) {
@@ -34,43 +33,33 @@ const outputProc = async (spec, input, ctx) => {
   let format = /\.(\w+)$/.exec(opts.path)?.[1];
   switch (format) {
     case "avif":
-      if (opts.avif)
-        output = output.avif(opts.avif);
+      if (opts.avif) output = output.avif(opts.avif);
       break;
     case "gif":
-      if (opts.gif)
-        output = output.gif(opts.gif);
+      if (opts.gif) output = output.gif(opts.gif);
       break;
     case "jpg":
     case "jpeg":
-      if (opts.jpeg)
-        output = output.jpeg(opts.jpeg);
+      if (opts.jpeg) output = output.jpeg(opts.jpeg);
       break;
     case "jp2":
-      if (opts.jp2)
-        output = output.jp2(opts.jp2);
+      if (opts.jp2) output = output.jp2(opts.jp2);
       break;
     case "jxl":
-      if (opts.jxl)
-        output = output.jxl(opts.jxl);
+      if (opts.jxl) output = output.jxl(opts.jxl);
       break;
     case "png":
-      if (opts.png)
-        output = output.png(opts.png);
+      if (opts.png) output = output.png(opts.png);
       break;
     case "tiff":
-      if (opts.tiff)
-        output = output.tiff(opts.tiff);
+      if (opts.tiff) output = output.tiff(opts.tiff);
       break;
     case "webp":
-      if (opts.webp)
-        output = output.webp(opts.webp);
+      if (opts.webp) output = output.webp(opts.webp);
       break;
   }
-  if (opts.tile)
-    output = output.tile(opts.tile);
-  if (format)
-    output = output.toFormat(format);
+  if (opts.tile) output = output.tile(opts.tile);
+  if (format) output = output.toFormat(format);
   const result = await output.toBuffer();
   const path = join(
     outDir,
@@ -80,10 +69,9 @@ const outputProc = async (spec, input, ctx) => {
   ctx.outputs[opts.id] = path;
   return [input, false];
 };
-const outputRaw = async (opts, output, ctx, outDir) => {
+const __outputRaw = async (opts, output, ctx, outDir) => {
   const { alpha = false, meta = false } = isPlainObject(opts.raw) ? opts.raw : {};
-  if (alpha)
-    output = output.ensureAlpha();
+  if (alpha) output = output.ensureAlpha();
   const { data, info } = await output.raw().toBuffer({ resolveWithObject: true });
   const path = join(outDir, formatPath(opts.path, ctx, opts, data));
   writeFile(path, data, null, ctx.logger);
@@ -98,7 +86,7 @@ const outputRaw = async (opts, output, ctx, outDir) => {
     );
   }
 };
-const outputBlurHash = async (opts, output, ctx) => {
+const __outputBlurHash = async (opts, output, ctx) => {
   const { data, info } = await output.ensureAlpha().raw().toBuffer({ resolveWithObject: true });
   const detail = opts.blurhash === true ? 4 : opts.blurhash;
   const [dx, dy] = isNumber(detail) ? [detail, detail] : detail;

package/ops/rotate.js

@@ -1,10 +1,8 @@
 import { coerceColor } from "../units.js";
 const rotateProc = async (spec, input, _) => {
   const { angle, bg, flipX, flipY } = spec;
-  if (flipX)
-    input = input.flop();
-  if (flipY)
-    input = input.flip();
+  if (flipX) input = input.flop();
+  if (flipY) input = input.flip();
   return [
     input.rotate(angle, { background: coerceColor(bg || "#0000") }),
     true

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thi.ng/imago",
-  "version": "0.7.6",
+  "version": "0.7.8",
   "description": "JSON & API-based declarative and extensible image processing trees/pipelines",
   "type": "module",
   "module": "./index.js",
@@ -10,7 +10,7 @@
     "type": "git",
     "url": "https://github.com/thi-ng/umbrella.git"
   },
-  "homepage": "https://github.com/thi-ng/umbrella/tree/develop/packages/imago#readme",
+  "homepage": "https://thi.ng/imago",
   "funding": [
     {
       "type": "github",
@@ -36,26 +36,26 @@
     "tool:tangle": "../../node_modules/.bin/tangle src/**/*.ts"
   },
   "dependencies": {
-    "@thi.ng/api": "^8.11.1",
-    "@thi.ng/associative": "^6.3.59",
-    "@thi.ng/blurhash": "^0.1.23",
-    "@thi.ng/checks": "^3.6.3",
-    "@thi.ng/date": "^2.7.17",
-    "@thi.ng/defmulti": "^3.0.38",
-    "@thi.ng/errors": "^2.5.6",
-    "@thi.ng/file-io": "^2.1.1",
-    "@thi.ng/logger": "^3.0.11",
-    "@thi.ng/pixel": "^6.1.31",
-    "@thi.ng/pixel-dither": "^1.1.129",
-    "@thi.ng/prefixes": "^2.3.18",
-    "sharp": "^0.33.3"
+    "@thi.ng/api": "^8.11.3",
+    "@thi.ng/associative": "^6.3.61",
+    "@thi.ng/blurhash": "^0.1.25",
+    "@thi.ng/checks": "^3.6.5",
+    "@thi.ng/date": "^2.7.19",
+    "@thi.ng/defmulti": "^3.0.40",
+    "@thi.ng/errors": "^2.5.8",
+    "@thi.ng/file-io": "^2.1.3",
+    "@thi.ng/logger": "^3.0.13",
+    "@thi.ng/pixel": "^6.1.33",
+    "@thi.ng/pixel-dither": "^1.1.131",
+    "@thi.ng/prefixes": "^2.3.20",
+    "sharp": "^0.33.4"
   },
   "devDependencies": {
-    "@microsoft/api-extractor": "^7.43.0",
-    "@thi.ng/vectors": "^7.10.30",
-    "esbuild": "^0.20.2",
-    "typedoc": "^0.25.12",
-    "typescript": "^5.4.3"
+    "@microsoft/api-extractor": "^7.47.0",
+    "@thi.ng/vectors": "^7.11.0",
+    "esbuild": "^0.21.5",
+    "typedoc": "^0.25.13",
+    "typescript": "^5.5.2"
   },
   "keywords": [
     "avif",
@@ -185,5 +185,5 @@
     "status": "alpha",
     "year": 2024
   },
-  "gitHead": "0bec55821066c18eb977a7eabd42c0bb2b096d98\n"
+  "gitHead": "154c95cf9d6bab32174498ec3b5b5d87e42be7f9\n"
 }

package/path.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import type { TypedArray } from "@thi.ng/api";
 import type { ImgProcCtx, OutputSpec } from "./api.js";
 /**

package/proc.js

@@ -63,8 +63,7 @@ const processImage = async (src, specs, opts = {}, parentCtx) => {
     }
     return { img, meta, env: ctx.env, outputs: ctx.outputs };
   } finally {
-    if (ctx.iccFile)
-      deleteFile(ctx.iccFile, ctx.logger);
+    if (ctx.iccFile) deleteFile(ctx.iccFile, ctx.logger);
   }
 };
 const processor = defmulti(

package/units.d.ts

@@ -6,7 +6,7 @@ export declare const coerceColor: (col: Color) => string | {
     r: number;
     g: number;
     b: number;
-    alpha?: number | undefined;
+    alpha?: number;
 };
 /**
  *
@@ -19,11 +19,11 @@ export declare const coerceColor: (col: Color) => string | {
  * @param opts
  */
 export declare const positionOrGravity: ([w, h]: Dim, parentSize: Dim, { pos, gravity, origin, ref, unit, }: {
-    pos?: Position | undefined;
-    gravity?: Gravity | undefined;
-    origin?: Gravity | undefined;
-    ref?: SizeRef | undefined;
-    unit?: SizeUnit | undefined;
+    pos?: Position;
+    gravity?: Gravity;
+    origin?: Gravity;
+    ref?: SizeRef;
+    unit?: SizeUnit;
 }) => {
     gravity: string;
     left?: undefined;

package/units.js

@@ -13,8 +13,7 @@ const positionOrGravity = ([w, h], parentSize, {
   ref,
   unit = "px"
 }) => {
-  if (!pos)
-    return gravity ? { gravity: GRAVITY_MAP[gravity] } : void 0;
+  if (!pos) return gravity ? { gravity: GRAVITY_MAP[gravity] } : void 0;
   const [parentW, parentH] = parentSize;
   let { l, r, t, b } = pos;
   [l, r, t, b] = computeMargins(
@@ -98,8 +97,7 @@ const computeSizeWithAspect = (size, [w, h], aspect, unit = "px", clamp = true)
   }
   if (clamp) {
     size = Math.min(size, max);
-    if (size / aspect > min)
-      size = min * aspect;
+    if (size / aspect > min) size = min * aspect;
   }
   res = origAspect > 1 ? [size, size / aspect] : [size / aspect, size];
   res[0] = round(res[0]);