@thi.ng/pixel-io-netpbm 2.1.129 → 2.1.131

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.
 
+### [2.1.131](https://github.com/thi-ng/umbrella/tree/@thi.ng/pixel-io-netpbm@2.1.131) (2024-06-21)
+
+#### ♻️ Refactoring
+
+- enforce uniform naming convention of internal functions ([56992b2](https://github.com/thi-ng/umbrella/commit/56992b2))
+
 ### [2.1.127](https://github.com/thi-ng/umbrella/tree/@thi.ng/pixel-io-netpbm@2.1.127) (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.
 >

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thi.ng/pixel-io-netpbm",
-  "version": "2.1.129",
+  "version": "2.1.131",
   "description": "Multi-format NetPBM reader & writer support for @thi.ng/pixel",
   "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/pixel-io-netpbm#readme",
+  "homepage": "https://thi.ng/pixel-io-netpbm",
   "funding": [
     {
       "type": "github",
@@ -36,15 +36,15 @@
     "tool:tangle": "../../node_modules/.bin/tangle src/**/*.ts"
   },
   "dependencies": {
-    "@thi.ng/api": "^8.11.1",
-    "@thi.ng/errors": "^2.5.6",
-    "@thi.ng/pixel": "^6.1.31"
+    "@thi.ng/api": "^8.11.3",
+    "@thi.ng/errors": "^2.5.8",
+    "@thi.ng/pixel": "^6.1.33"
   },
   "devDependencies": {
-    "@microsoft/api-extractor": "^7.43.0",
-    "esbuild": "^0.20.2",
-    "typedoc": "^0.25.12",
-    "typescript": "^5.4.3"
+    "@microsoft/api-extractor": "^7.47.0",
+    "esbuild": "^0.21.5",
+    "typedoc": "^0.25.13",
+    "typescript": "^5.5.2"
   },
   "keywords": [
     "1bit",
@@ -87,5 +87,5 @@
     "parent": "@thi.ng/pixel",
     "year": 2021
   },
-  "gitHead": "aed3421c21044c005fbcb7cc37965ccf85a870d2\n"
+  "gitHead": "154c95cf9d6bab32174498ec3b5b5d87e42be7f9\n"
 }

package/read.js

@@ -4,9 +4,9 @@ import { GRAY16 } from "@thi.ng/pixel/format/gray16";
 import { GRAY8 } from "@thi.ng/pixel/format/gray8";
 import { RGB888 } from "@thi.ng/pixel/format/rgb888";
 import { intBuffer } from "@thi.ng/pixel/int";
-const isLinebreak = (c) => c === 10;
-const isWS = (c) => c === 32 || c >= 9 && c <= 13;
-const readUntil = (src, i, end = isLinebreak) => {
+const __isLinebreak = (c) => c === 10;
+const __isWS = (c) => c === 32 || c >= 9 && c <= 13;
+const __readUntil = (src, i, end = __isLinebreak) => {
   let res = "";
   for (; i < src.length; i++) {
     let c = src[i];
@@ -18,9 +18,9 @@ const readUntil = (src, i, end = isLinebreak) => {
   }
   return [res, i];
 };
-const readComments = (src, acc, i) => {
+const __readComments = (src, acc, i) => {
   while (src[i] === 35) {
-    const [comment, j] = readUntil(src, i);
+    const [comment, j] = __readUntil(src, i);
     assert(j !== i, `EOF reached`);
     acc.push(comment.substring(1).trim());
     i = j;
@@ -33,16 +33,16 @@ const parseHeader = (src) => {
   let norm;
   let max;
   const comments = [];
-  let i = readComments(src, comments, 0);
-  [type, i] = readUntil(src, i);
-  i = readComments(src, comments, i);
-  [sw, i] = readUntil(src, i, isWS);
-  [sh, i] = readUntil(src, i, isWS);
+  let i = __readComments(src, comments, 0);
+  [type, i] = __readUntil(src, i);
+  i = __readComments(src, comments, i);
+  [sw, i] = __readUntil(src, i, __isWS);
+  [sh, i] = __readUntil(src, i, __isWS);
   const width = parseInt(sw);
   const height = parseInt(sh);
   assert(width > 0 && height > 0, `invalid NetPBM header`);
   if (type === "P5" || type === "P6") {
-    [norm, i] = readUntil(src, i);
+    [norm, i] = __readUntil(src, i);
     max = parseInt(norm);
   }
   return {
@@ -74,8 +74,7 @@ const readPBM = (src, i, width, height) => {
   for (let y = 0, j = 0; y < height; y++) {
     for (let x = 0; x < width; x++, j++) {
       data[j] = src[i] & 1 << (~x & 7) ? 0 : 255;
-      if ((x & 7) === 7 || x === w1)
-        i++;
+      if ((x & 7) === 7 || x === w1) i++;
     }
   }
   return buf;

package/write.js

@@ -1,22 +1,21 @@
 import { GRAY16 } from "@thi.ng/pixel/format/gray16";
-const formatComments = (comments = ["generated by @thi.ng/pixel-io-netpbm"]) => comments.map((x) => `# ${x}`).join("\n");
-const initHeader = (magic, limits, size, buf, comments) => {
+const __formatComments = (comments = ["generated by @thi.ng/pixel-io-netpbm"]) => comments.map((x) => `# ${x}`).join("\n");
+const __luminance = (c) => ((c >>> 16 & 255) * 29 + (c >>> 8 & 255) * 150 + (c & 255) * 76) / 255;
+const __initHeader = (magic, limits, size, buf, comments) => {
   const { width, height } = buf;
   let header = magic + "\n";
-  const comm = formatComments(comments);
-  if (comm.length)
-    header += comm + "\n";
+  const comm = __formatComments(comments);
+  if (comm.length) header += comm + "\n";
   header += `${width} ${height}
 `;
-  if (limits > 0)
-    header += limits + "\n";
+  if (limits > 0) header += limits + "\n";
   const dest = new Uint8Array(size + header.length);
   dest.set([...header].map((x) => x.charCodeAt(0)));
   return { dest, start: header.length, abgr: buf.format.toABGR };
 };
 const asPBM = (buf, comments) => {
   const { data, width, height } = buf;
-  const { dest, start, abgr } = initHeader(
+  const { dest, start, abgr } = __initHeader(
     "P4",
     0,
     Math.ceil(width / 8) * height,
@@ -27,7 +26,7 @@ const asPBM = (buf, comments) => {
   for (let y = 0, i = start, j = 0; y < height; y++) {
     for (let x = 0, b = 0; x <= w1; x++, j++) {
       const xx = ~x & 7;
-      if (luminance(abgr(data[j])) < 128) {
+      if (__luminance(abgr(data[j])) < 128) {
         b |= 1 << xx;
       }
       if (xx === 0 || x === w1) {
@@ -40,7 +39,7 @@ const asPBM = (buf, comments) => {
 };
 const asPGM = (buf, comments) => {
   const { data, width, height } = buf;
-  const { dest, start, abgr } = initHeader(
+  const { dest, start, abgr } = __initHeader(
     "P5",
     255,
     width * height,
@@ -48,15 +47,14 @@ const asPGM = (buf, comments) => {
     comments
   );
   for (let i = start, j = 0; j < data.length; i++, j++) {
-    dest[i] = luminance(abgr(data[j]));
+    dest[i] = __luminance(abgr(data[j]));
   }
   return dest;
 };
 const asPGM16 = (buf, comments) => {
-  if (buf.format !== GRAY16)
-    buf = buf.as(GRAY16);
+  if (buf.format !== GRAY16) buf = buf.as(GRAY16);
   const { data, width, height } = buf;
-  const { dest, start } = initHeader(
+  const { dest, start } = __initHeader(
     "P5",
     65535,
     width * height * 2,
@@ -71,7 +69,7 @@ const asPGM16 = (buf, comments) => {
 };
 const asPPM = (buf, comments) => {
   const { data, width, height } = buf;
-  const { dest, start, abgr } = initHeader(
+  const { dest, start, abgr } = __initHeader(
     "P6",
     255,
     width * 3 * height,
@@ -86,7 +84,6 @@ const asPPM = (buf, comments) => {
   }
   return dest;
 };
-const luminance = (c) => ((c >>> 16 & 255) * 29 + (c >>> 8 & 255) * 150 + (c & 255) * 76) / 255;
 export {
   asPBM,
   asPGM,