@zenfs/core 2.6.4 → 2.6.5

package/dist/backends/cow.js

@@ -116,11 +116,19 @@ export class CopyOnWriteFS extends FileSystem {
     _nextIno = 1;
     /** Moves the public inode numbers for a rename, including a directory's descendants */
     renameInos(oldPath, newPath) {
-        for (const [path, ino] of [...this.inos]) {
+        const changes = [];
+        for (const [path, ino] of this.inos) {
             if (path != oldPath && !path.startsWith(oldPath + '/'))
                 continue;
-            this.inos.delete(path);
-            this.inos.set(newPath + path.slice(oldPath.length), ino);
+            changes.push({
+                path,
+                add: newPath + path.slice(oldPath.length),
+                ino,
+            });
+        }
+        for (const change of changes) {
+            this.inos.delete(change.path);
+            this.inos.set(change.add, change.ino);
         }
     }
     /** Replaces the layer's inode number with the public one for `path` */

package/dist/internal/file_index.d.ts

@@ -17,6 +17,7 @@ export declare const version = 1;
  * @internal
  */
 export declare class Index extends Map<string, Inode> {
+    #private;
     maxSize: number;
     /**
      * Converts the index to JSON
@@ -26,6 +27,7 @@ export declare class Index extends Map<string, Inode> {
      * Converts the index to a string
      */
     toString(): string;
+    clear(): void;
     /**
      * Get the size in bytes of the index (including the size reported for each entry)
      */

package/dist/internal/file_index.js

@@ -21,7 +21,8 @@ export class Index extends Map {
         return {
             version,
             maxSize: this.maxSize,
-            entries: Object.fromEntries([...this].map(([k, v]) => [k, v.toJSON()])),
+            // @todo use `Iterator.map` #296
+            entries: Object.fromEntries(Array.from(this).map(([k, v]) => [k, v.toJSON()])),
         };
     }
     /**
@@ -30,6 +31,10 @@ export class Index extends Map {
     toString() {
         return JSON.stringify(this.toJSON());
     }
+    clear() {
+        super.clear();
+        this.#lastAlloc = 0;
+    }
     /**
      * Get the size in bytes of the index (including the size reported for each entry)
      */
@@ -74,12 +79,15 @@ export class Index extends Map {
         }
         return entries;
     }
+    #lastAlloc = 0;
     /**
      * Get the next available ID in the index
      * @internal
      */
     _alloc() {
-        return Math.max(...[...this.values()].flatMap(i => [i.ino, i.data])) + 1;
+        // @todo use `Iterator.flatMap` #296
+        this.#lastAlloc ||= Array.from(this.values()).reduce((max, inode) => Math.max(max, inode.ino, inode.data), 0);
+        return ++this.#lastAlloc;
     }
     /**
      * Gets a list of entries for each directory in the index.

package/dist/polyfills.js

@@ -43,7 +43,10 @@ Uint8Array.fromBase64 ??=
 Uint8Array.prototype.toHex ??=
     (warn('Using a polyfill of Uint8Array.prototype.toHex'),
         function toHex() {
-            return [...this].map(b => b.toString(16).padStart(2, '0')).join('');
+            // @todo use `Iterator.map` #296
+            return Array.from(this)
+                .map(b => b.toString(16).padStart(2, '0'))
+                .join('');
         });
 Uint8Array.fromHex ??=
     (warn('Using a polyfill of Uint8Array.fromHex'),

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zenfs/core",
-	"version": "2.6.4",
+	"version": "2.6.5",
 	"description": "A filesystem, anywhere",
 	"funding": {
 		"type": "individual",
@@ -90,12 +90,8 @@
 		"eslint": "^10.1.0",
 		"globals": "^17.3.0",
 		"prettier": "^3.2.5",
-		"tsx": "^4.19.1",
 		"typedoc": "^0.28.18",
 		"typescript": "^6.0.0",
 		"typescript-eslint": "^8.58.0"
-	},
-	"allowScripts": {
-		"esbuild": true
 	}
 }

package/tests/backend/single-buffer.test.ts

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later
-import assert from 'node:assert';
+import assert from 'node:assert/strict';
 import { randomBytes } from 'node:crypto';
 import { suite, test } from 'node:test';
 import { Worker } from 'worker_threads';

package/tests/backend/single-buffer.worker.js

@@ -1,4 +1,4 @@
-import assert from 'node:assert';
+import assert from 'node:assert/strict';
 import { writeFileSync as _write } from 'node:fs';
 import { parentPort, workerData } from 'node:worker_threads';
 import { configureSingle, fs, SingleBuffer } from '../../dist/index.js';

package/tests/common/file_index.test.ts

@@ -0,0 +1,51 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
+import { Index, Inode } from '@zenfs/core';
+import assert from 'node:assert/strict';
+import { suite, test } from 'node:test';
+
+/** Build an index with `n` file entries, using IDs 2..2n+1 */
+function buildIndex(n: number): Index {
+	const index = new Index();
+	index.set('/', new Inode({ ino: 0, data: 1, mode: 0o40755, nlink: 1 }));
+	for (let i = 0; i < n; i++) {
+		index.set(`/f${i}`, new Inode({ ino: 2 * i + 2, data: 2 * i + 3, mode: 0o100644, nlink: 1 }));
+	}
+	return index;
+}
+
+/** Calls `fn` with `depth` extra frames on the stack */
+function atDepth<T>(depth: number, fn: () => T): T {
+	return depth > 0 ? atDepth(depth - 1, fn) : fn();
+}
+
+suite('Index', () => {
+	test('_alloc returns an unused ID', () => {
+		const index = buildIndex(10);
+		assert.equal(index._alloc(), 22);
+	});
+
+	test('_alloc does not re-use IDs', () => {
+		const index = buildIndex(10);
+		const ids = new Set<number>();
+
+		for (let i = 0; i < 100; i++) {
+			const id = index._alloc();
+			assert.equal(index.getByID(id), undefined, `\`_alloc\` returned in-use ID ${id}`);
+			assert(!ids.has(id), `\`_alloc\` returned duplicate ID ${id}`);
+			ids.add(id);
+		}
+	});
+
+	test('_alloc works with a large index #312', () => {
+		const index = buildIndex(100_000);
+		assert.equal(index._alloc(), 200_002);
+	});
+
+	test('_alloc works with a large index and a deep stack #312', () => {
+		const index = buildIndex(60_000);
+		assert.equal(
+			atDepth(1000, () => index._alloc()),
+			120_002
+		);
+	});
+});

package/tests/common/inode.test.ts

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later
 import { Inode } from '@zenfs/core';
-import assert from 'node:assert';
+import assert from 'node:assert/strict';
 import { suite, test } from 'node:test';
 
 suite('Inode manipulation', () => {