@thi.ng/block-fs 0.6.0 → 0.6.2

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Change Log
 
-- **Last updated**: 2025-07-11T22:07:07Z
+- **Last updated**: 2025-07-12T13:21:04Z
 - **Generator**: [thi.ng/monopub](https://thi.ng/monopub)
 
 All notable changes to this project will be documented in this file.
@@ -11,6 +11,19 @@ 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.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
+
+- fix tree output in CLI list cmd, update deps ([8d33970](https://github.com/thi-ng/umbrella/commit/8d33970))
+  - update entry sorting for tree output to avoid order edge cases w/ prev approach
+
 ## [0.6.0](https://github.com/thi-ng/umbrella/tree/@thi.ng/block-fs@0.6.0) (2025-07-11)
 
 #### 🚀 Features

package/README.md

@@ -303,6 +303,7 @@ Package sizes (brotli'd, pre-treeshake): ESM: 4.33 KB
 - [@thi.ng/binary](https://github.com/thi-ng/umbrella/tree/develop/packages/binary)
 - [@thi.ng/bitfield](https://github.com/thi-ng/umbrella/tree/develop/packages/bitfield)
 - [@thi.ng/checks](https://github.com/thi-ng/umbrella/tree/develop/packages/checks)
+- [@thi.ng/compare](https://github.com/thi-ng/umbrella/tree/develop/packages/compare)
 - [@thi.ng/errors](https://github.com/thi-ng/umbrella/tree/develop/packages/errors)
 - [@thi.ng/file-io](https://github.com/thi-ng/umbrella/tree/develop/packages/file-io)
 - [@thi.ng/logger](https://github.com/thi-ng/umbrella/tree/develop/packages/logger)

package/cli/convert.js

@@ -31,37 +31,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) => {

package/cli/list.js

@@ -1,4 +1,5 @@
 import { flag } from "@thi.ng/args";
+import { compareByKey } from "@thi.ng/compare";
 import { readBinary } from "@thi.ng/file-io";
 import { BlockFS } from "../fs.js";
 import { MemoryBlockStorage } from "../storage/memory.js";
@@ -25,27 +26,27 @@ 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()) {
+    for await (let entry of bfs.root.tree(compareByKey("name"))) {
       const path = entry.path;
       const depth = path.split("/").length - 2;
       tree.push([path, depth, entry]);
     }
-    tree.sort(([a], [b]) => a < b ? -1 : a > b ? 1 : 0);
     const rows = [];
     const maxWidths = [0, 0, 0];
     const last = [];
@@ -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.0",
+  "version": "0.6.2",
   "description": "Customizable block-based storage, adapters & file system layer",
   "type": "module",
   "module": "./index.js",
@@ -43,10 +43,11 @@
   },
   "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",
+    "@thi.ng/compare": "^2.4.22",
     "@thi.ng/errors": "^2.5.36",
     "@thi.ng/file-io": "^2.2.1",
     "@thi.ng/logger": "^3.1.11",
@@ -142,5 +143,5 @@
     "status": "alpha",
     "year": 2024
   },
-  "gitHead": "186d38b07f4ba940a8127cbe2379a38036eff387\n"
+  "gitHead": "a157f18f16200faad01e15da553c9eea3fa37014\n"
 }