@thi.ng/block-fs 0.6.1 → 0.6.3

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Change Log
 
-- **Last updated**: 2025-07-12T12:28:22Z
+- **Last updated**: 2025-07-12T23:11:04Z
 - **Generator**: [thi.ng/monopub](https://thi.ng/monopub)
 
 All notable changes to this project will be documented in this file.
@@ -11,6 +11,18 @@ 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.6.3](https://github.com/thi-ng/umbrella/tree/@thi.ng/block-fs@0.6.3) (2025-07-12)
+
+#### 🩹 Bug fixes
+
+- update block count calculation (CLI convert cmd) ([95cee85](https://github.com/thi-ng/umbrella/commit/95cee85))
+
+### [0.6.2](https://github.com/thi-ng/umbrella/tree/@thi.ng/block-fs@0.6.2) (2025-07-12)
+
+#### ♻️ Refactoring
+
+- minor updates CLI commands ([9a394b1](https://github.com/thi-ng/umbrella/commit/9a394b1))
+
 ### [0.6.1](https://github.com/thi-ng/umbrella/tree/@thi.ng/block-fs@0.6.1) (2025-07-12)
 
 #### 🩹 Bug fixes

package/cli/convert.js

@@ -7,6 +7,7 @@ import { Entry } from "../entry.js";
 import { BlockFS } from "../fs.js";
 import { MemoryBlockStorage } from "../storage/memory.js";
 import { ARG_BLOCKSIZE } from "./api.js";
+const { ceil, log2 } = Math;
 const CONVERT = {
   opts: {
     ...ARG_BLOCKSIZE,
@@ -31,37 +32,39 @@ const CONVERT = {
       hint: "EXT"
     })
   },
+  inputs: 1,
   desc: "Convert file tree into single BlockFS blob",
   fn: async (ctx) => {
+    const { opts, logger } = ctx;
     const collected = collectFiles(ctx);
     const numBlocks = align(
-      ctx.opts.numBlocks ?? computeBlockCount(collected, ctx.opts.blockSize, ctx.logger),
+      opts.numBlocks ?? computeBlockCount(collected, opts.blockSize, ctx.logger),
       8
     );
-    ctx.logger.info("number of files:", collected.files.length);
-    ctx.logger.info("number of directories:", collected.dirs.length);
-    ctx.logger.info("total file size:", collected.size);
-    ctx.logger.info("number of blocks:", numBlocks);
+    logger.info("number of files:", collected.files.length);
+    logger.info("number of directories:", collected.dirs.length);
+    logger.info("total file size:", collected.size);
+    logger.info("number of blocks:", numBlocks);
     const storage = new MemoryBlockStorage({
+      blockSize: opts.blockSize,
       numBlocks,
-      blockSize: ctx.opts.blockSize,
-      logger: ctx.logger
+      logger
     });
-    const bfs = new BlockFS(storage, { logger: ctx.logger });
+    const bfs = new BlockFS(storage, { logger });
     await bfs.init();
-    ctx.logger.info("root dir block:", bfs.rootDirBlockID);
-    ctx.logger.info("first data block:", bfs.dataStartBlockID);
-    ctx.logger.info("block data size:", bfs.blockDataSize);
+    logger.info("root dir block:", bfs.rootDirBlockID);
+    logger.info("first data block:", bfs.dataStartBlockID);
+    logger.info("block data size:", bfs.blockDataSize);
     for (let f of collected.files) {
-      const data = readBinary(f.src, ctx.logger);
-      ctx.logger.info("writing file:", f.dest, "size:", data.length);
+      const data = readBinary(f.src, logger);
+      logger.info("writing file:", f.dest, "size:", data.length);
       await bfs.writeFile(f.dest, data);
       const entry = await bfs.entryForPath(f.dest);
       entry.ctime = f.ctime;
       entry.mtime = f.mtime;
       await entry.save();
     }
-    writeFile(ctx.opts.out, storage.buffer, void 0, ctx.logger);
+    writeFile(opts.out, storage.buffer, void 0, logger);
   }
 };
 const pathsForFile = (f) => {
@@ -106,19 +109,20 @@ const computeBlockCount = (collected, blockSize, logger, numBlocks) => {
   const blockDataSizeBytes = requiredBytes(blockSize);
   const blockDataSize = blockSize - blockIDBytes - blockDataSizeBytes;
   const numEntries = collected.files.length + collected.dirs.length;
-  const numEntryBlocks = Math.ceil(numEntries * Entry.SIZE / blockDataSize);
+  const maxEntriesPerBlock = ~~(blockDataSize / Entry.SIZE);
+  const numEntryBlocks = ceil(numEntries / maxEntriesPerBlock);
   logger.info("num entries:", numEntries);
   logger.info("num entry blocks:", numEntryBlocks);
   blocks += numEntryBlocks;
   for (let f of collected.files) {
-    const size = Math.ceil(f.size / blockDataSize);
+    const size = ceil(f.size / blockDataSize);
     logger.debug("file:", f.src, "blocks:", size);
     blocks += size;
   }
   const blockIDBytes2 = requiredBytes(blocks);
   return blockIDBytes2 > blockIDBytes ? computeBlockCount(collected, blockSize, logger, blocks) : blocks;
 };
-const requiredBytes = (x) => align(Math.ceil(Math.log2(x)), 8) >> 3;
+const requiredBytes = (x) => align(ceil(log2(x)), 8) >> 3;
 export {
   CONVERT
 };

package/cli/list.js

@@ -26,19 +26,20 @@ const LIST = {
       desc: "Display file sizes"
     })
   },
+  inputs: 1,
   desc: "List file tree of a BlockFS blob",
-  fn: async (ctx) => {
-    if (ctx.opts.all) {
-      ctx.opts.withMtime = ctx.opts.withSize = true;
+  fn: async ({ inputs, opts, logger }) => {
+    if (opts.all) {
+      opts.withMtime = opts.withSize = true;
     }
-    const buffer = readBinary(ctx.inputs[0]);
+    const buffer = readBinary(inputs[0], logger);
     const storage = new MemoryBlockStorage({
-      numBlocks: buffer.length / ctx.opts.blockSize >>> 0,
-      blockSize: ctx.opts.blockSize,
-      logger: ctx.logger,
+      numBlocks: buffer.length / opts.blockSize >>> 0,
+      blockSize: opts.blockSize,
+      logger,
       buffer
     });
-    const bfs = new BlockFS(storage, { logger: ctx.logger });
+    const bfs = new BlockFS(storage, { logger });
     await bfs.init();
     const tree = [];
     for await (let entry of bfs.root.tree(compareByKey("name"))) {
@@ -59,17 +60,17 @@ const LIST = {
           break;
         }
       }
-      const row = ctx.opts.tree ? [
+      const row = opts.tree ? [
         [
           ...last.slice(0, depth).map((x) => INDENT[x]),
           PREFIX[last[depth]],
           entry.name
         ].join("")
       ] : [path];
-      if (ctx.opts.withSize) {
+      if (opts.withSize) {
         row.push(entry.isDirectory() ? "" : String(Number(entry.size)));
       }
-      if (ctx.opts.withMtime) {
+      if (opts.withMtime) {
         row.push(new Date(entry.mtime).toISOString());
       }
       rows.push(row);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thi.ng/block-fs",
-  "version": "0.6.1",
+  "version": "0.6.3",
   "description": "Customizable block-based storage, adapters & file system layer",
   "type": "module",
   "module": "./index.js",
@@ -43,7 +43,7 @@
   },
   "dependencies": {
     "@thi.ng/api": "^8.11.30",
-    "@thi.ng/args": "^2.7.2",
+    "@thi.ng/args": "^2.8.0",
     "@thi.ng/binary": "^3.4.53",
     "@thi.ng/bitfield": "^2.4.6",
     "@thi.ng/checks": "^3.7.10",
@@ -143,5 +143,5 @@
     "status": "alpha",
     "year": 2024
   },
-  "gitHead": "4d75e2d11a3d1a3c3769ca00338e32a820c69d2c\n"
+  "gitHead": "76111155b9b3b21bc59aa347fc1e7d36c0b0701e\n"
 }