@moonbase-machines/files 0.5.0 → 0.5.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moonbase-machines/files",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "The formats the machines' files come in and go out as, in Node: PNG written and read, and zip read.",
   "type": "module",
   "license": "MIT",

package/png.js

@@ -2,7 +2,8 @@
 // [r, g, b, a] (with its alpha), or from RGBA bytes as a canvas or the machines' screens give them.
 //
 //   png(rows)                        a PNG's bytes from rows of [r, g, b] or [r, g, b, a]
-//   pngOfRGBA(rgba, width, height)   a PNG's bytes from RGBA bytes, four a pixel, row by row
+//   pngOfRGBA(rgba, width, height, { alpha })   a PNG's bytes from RGBA bytes, four a pixel, row by row; alpha
+//                                    false, written as RGB, its alpha left out (a picture with none to show)
 //   sheet(pictures, { across, gap, scale })   pictures (rows) on one sheet, `gap` gray dots between
 //   padded(pictures, fill)           pictures of different sizes padded to the largest, top left
 import { deflateSync } from 'node:zlib';
@@ -30,10 +31,10 @@ export function png(pixels) {
   return encode(raw, w, h, n);
 }
 
-export function pngOfRGBA(rgba, w, h) {
-  const raw = Buffer.alloc(h * (w * 4 + 1));
-  for (let y = 0; y < h; y++) raw.set(rgba.subarray(y * w * 4, (y + 1) * w * 4), y * (w * 4 + 1) + 1);
-  return encode(raw, w, h, 4);
+export function pngOfRGBA(rgba, w, h, { alpha = true } = {}) {
+  const n = alpha ? 4 : 3, raw = Buffer.alloc(h * (w * n + 1));
+  for (let y = 0; y < h; y++) for (let x = 0; x < w; x++) raw.set(rgba.subarray((y * w + x) * 4, (y * w + x) * 4 + n), y * (w * n + 1) + 1 + x * n);
+  return encode(raw, w, h, n);
 }
 
 // Pictures scaled by `scale`, with `gap` gray dots between them, `across` to a row.

package/test/files.test.js

@@ -22,6 +22,8 @@ test('a PNG of RGBA bytes reads back as the same picture as its rows', () => {
   const rgba = new Uint8Array([10, 20, 30, 255, 40, 50, 60, 255, 70, 80, 90, 255, 1, 2, 3, 255]);
   const p = readPng(pngOfRGBA(rgba, 2, 2));
   assert.deepEqual([p.at(0, 0), p.at(1, 0), p.at(0, 1), p.at(1, 1)], ['0a141e', '28323c', '46505a', '010203']);
+  const rows = [[[10, 20, 30], [40, 50, 60]], [[70, 80, 90], [1, 2, 3]]];
+  assert.deepEqual(pngOfRGBA(rgba, 2, 2, { alpha: false }), png(rows), 'without its alpha, the same bytes as the rows\' PNG');
 });
 
 test('a sheet lays pictures out with gray between, the smaller padded to the largest', () => {