@zenfs/core 2.3.0 → 2.3.2

package/dist/backends/single_buffer.d.ts

@@ -23,7 +23,6 @@ declare class MetadataEntry extends BufferView {
  * This is done since IDs are not guaranteed to be sequential.
  */
 export declare class MetadataBlock extends Int32Array<ArrayBufferLike> {
-    static readonly name = "MetadataBlock";
     readonly ['constructor']: typeof MetadataBlock;
     /**
      * The crc32c checksum for the metadata block.
@@ -55,7 +54,6 @@ export declare class MetadataBlock extends Int32Array<ArrayBufferLike> {
  * The super block structure for a single-buffer file system
  */
 export declare class SuperBlock extends BigUint64Array<ArrayBufferLike> {
-    static readonly name = "SuperBlock";
     readonly ['constructor']: typeof SuperBlock;
     constructor(...args: ConstructorParameters<typeof BigUint64Array<ArrayBufferLike>>);
     /**

package/dist/backends/single_buffer.js

@@ -177,7 +177,7 @@ const max_lock_attempts = 5;
  */
 let MetadataBlock = (() => {
     var _a, _b, _c, _d;
-    let _classDecorators = [struct(packed)];
+    let _classDecorators = [struct(packed, { name: 'MetadataBlock' })];
     let _classDescriptor;
     let _classExtraInitializers = [];
     let _classThis;
@@ -214,8 +214,8 @@ let MetadataBlock = (() => {
             __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
             MetadataBlock = _classThis = _classDescriptor.value;
             if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+            __runInitializers(_classThis, _classExtraInitializers);
         }
-        static name = 'MetadataBlock';
         #checksum_accessor_storage = __runInitializers(this, _checksum_initializers, void 0);
         /**
          * The crc32c checksum for the metadata block.
@@ -304,9 +304,6 @@ let MetadataBlock = (() => {
             super(...arguments);
             __runInitializers(this, _locked_extraInitializers);
         }
-        static {
-            __runInitializers(_classThis, _classExtraInitializers);
-        }
     };
     return MetadataBlock = _classThis;
 })();
@@ -322,7 +319,7 @@ const usedBytes = 2;
  */
 let SuperBlock = (() => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
-    let _classDecorators = [struct(packed)];
+    let _classDecorators = [struct(packed, { name: 'SuperBlock' })];
     let _classDescriptor;
     let _classExtraInitializers = [];
     let _classThis;
@@ -399,8 +396,8 @@ let SuperBlock = (() => {
             __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
             SuperBlock = _classThis = _classDescriptor.value;
             if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+            __runInitializers(_classThis, _classExtraInitializers);
         }
-        static name = 'SuperBlock';
         constructor(...args) {
             super(...args);
             __runInitializers(this, __padding_extraInitializers);
@@ -533,9 +530,6 @@ let SuperBlock = (() => {
             }
             return true;
         }
-        static {
-            __runInitializers(_classThis, _classExtraInitializers);
-        }
     };
     return SuperBlock = _classThis;
 })();

package/dist/internal/inode.d.ts

@@ -12,7 +12,6 @@ export declare const rootIno = 0;
  * @internal
  */
 export declare class Attributes extends BufferView {
-    static readonly name = "Attributes";
     accessor size: number;
     ['constructor']: typeof Attributes;
     get byteSize(): number;
@@ -107,7 +106,6 @@ export declare const userModifiableFlags = 229631;
  * @internal
  */
 export declare class Inode extends BufferView implements InodeLike {
-    static readonly name = "Inode";
     constructor(...args: ConstructorParameters<typeof BufferView> | [Readonly<Partial<InodeLike>>]);
     accessor data: number;
     /** For future use */

package/dist/internal/inode.js

@@ -120,7 +120,7 @@ let Attribute = (() => {
  */
 let Attributes = (() => {
     var _a;
-    let _classDecorators = [struct(packed)];
+    let _classDecorators = [struct(packed, { name: 'Attributes' })];
     let _classDescriptor;
     let _classExtraInitializers = [];
     let _classThis;
@@ -137,8 +137,8 @@ let Attributes = (() => {
             __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
             Attributes = _classThis = _classDescriptor.value;
             if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+            __runInitializers(_classThis, _classExtraInitializers);
         }
-        static name = 'Attributes';
         #size_accessor_storage = __runInitializers(this, _size_initializers, void 0);
         get size() { return this.#size_accessor_storage; }
         set size(value) { this.#size_accessor_storage = value; }
@@ -241,9 +241,6 @@ let Attributes = (() => {
             super(...arguments);
             __runInitializers(this, _size_extraInitializers);
         }
-        static {
-            __runInitializers(_classThis, _classExtraInitializers);
-        }
     };
     return Attributes = _classThis;
 })();
@@ -331,7 +328,7 @@ export const userModifiableFlags = 0x000380ff;
  */
 let Inode = (() => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
-    let _classDecorators = [struct(packed)];
+    let _classDecorators = [struct(packed, { name: 'Inode' })];
     let _classDescriptor;
     let _classExtraInitializers = [];
     let _classThis;
@@ -438,8 +435,8 @@ let Inode = (() => {
             __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
             Inode = _classThis = _classDescriptor.value;
             if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+            __runInitializers(_classThis, _classExtraInitializers);
         }
-        static name = 'Inode';
         constructor(...args) {
             let data = {};
             if (typeof args[0] === 'object' && args[0] !== null && !ArrayBuffer.isView(args[0])) {
@@ -589,9 +586,6 @@ let Inode = (() => {
                 this.ctimeMs = Date.now();
             return hasChanged;
         }
-        static {
-            __runInitializers(_classThis, _classExtraInitializers);
-        }
     };
     return Inode = _classThis;
 })();

package/dist/vfs/acl.d.ts

@@ -18,13 +18,11 @@ export declare const enum Tag {
     _None = 0
 }
 export declare class Entry extends BufferView {
-    static readonly name = "Entry";
     accessor tag: Tag;
     accessor perm: number;
     accessor id: number;
 }
 export declare class ACL extends BufferView {
-    static readonly name = "ACL";
     accessor version: number;
     entries: Entry[];
     constructor(...args: ConstructorParameters<typeof BufferView>);

package/dist/vfs/acl.js

@@ -67,7 +67,7 @@ export var Tag;
 })(Tag || (Tag = {}));
 let Entry = (() => {
     var _a, _b, _c;
-    let _classDecorators = [struct(packed)];
+    let _classDecorators = [struct(packed, { name: 'Entry' })];
     let _classDescriptor;
     let _classExtraInitializers = [];
     let _classThis;
@@ -94,8 +94,8 @@ let Entry = (() => {
             __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
             Entry = _classThis = _classDescriptor.value;
             if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+            __runInitializers(_classThis, _classExtraInitializers);
         }
-        static name = 'Entry';
         #tag_accessor_storage = __runInitializers(this, _tag_initializers, void 0);
         get tag() { return this.#tag_accessor_storage; }
         set tag(value) { this.#tag_accessor_storage = value; }
@@ -109,16 +109,13 @@ let Entry = (() => {
             super(...arguments);
             __runInitializers(this, _id_extraInitializers);
         }
-        static {
-            __runInitializers(_classThis, _classExtraInitializers);
-        }
     };
     return Entry = _classThis;
 })();
 export { Entry };
 let ACL = (() => {
     var _a;
-    let _classDecorators = [struct(packed)];
+    let _classDecorators = [struct(packed, { name: 'ACL' })];
     let _classDescriptor;
     let _classExtraInitializers = [];
     let _classThis;
@@ -135,8 +132,8 @@ let ACL = (() => {
             __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
             ACL = _classThis = _classDescriptor.value;
             if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+            __runInitializers(_classThis, _classExtraInitializers);
         }
-        static name = 'ACL';
         #version_accessor_storage = __runInitializers(this, _version_initializers, void 0);
         get version() { return this.#version_accessor_storage; }
         set version(value) { this.#version_accessor_storage = value; }
@@ -152,9 +149,6 @@ let ACL = (() => {
                 this.entries.push(new Entry(this.buffer, offset));
             }
         }
-        static {
-            __runInitializers(_classThis, _classExtraInitializers);
-        }
     };
     return ACL = _classThis;
 })();

package/dist/vfs/promises.d.ts

@@ -11,6 +11,7 @@ import type { FileContents, ReaddirOptions } from './types.js';
 import { Buffer } from 'buffer';
 import '../polyfills.js';
 import { Dir, Dirent } from './dir.js';
+import { SyncHandle } from './file.js';
 import { BigIntStats, Stats } from './stats.js';
 import { ReadStream, WriteStream } from './streams.js';
 export * as constants from './constants.js';
@@ -18,10 +19,6 @@ export declare class FileHandle implements promises.FileHandle {
     protected context: V_Context;
     readonly fd: number;
     protected _buffer?: Uint8Array;
-    /**
-     * Current position
-     */
-    protected _position: number;
     /**
      * Get the current file position.
      *
@@ -42,15 +39,16 @@ export declare class FileHandle implements promises.FileHandle {
      */
     protected closed: boolean;
     /** The path relative to the context's root */
-    readonly path: string;
+    get path(): string;
     /** The internal FS associated with the handle */
-    protected readonly fs: FileSystem;
+    protected get fs(): FileSystem;
     /** The path relative to the `FileSystem`'s root */
-    readonly internalPath: string;
+    get internalPath(): string;
     /** The flag the handle was opened with */
-    readonly flag: number;
+    get flag(): number;
     /** Stats for the handle */
-    readonly inode: InodeLike;
+    get inode(): InodeLike;
+    protected _sync: SyncHandle;
     constructor(context: V_Context, fd: number);
     private get _isSync();
     private _emitChange;

package/dist/vfs/promises.js

@@ -52,7 +52,7 @@ var __disposeResources = (this && this.__disposeResources) || (function (Suppres
 });
 import { Buffer } from 'buffer';
 import { Exception, rethrow, setUVMessage, UV } from 'kerium';
-import { decodeUTF8, pick } from 'utilium';
+import { decodeUTF8 } from 'utilium';
 import { defaultContext } from '../internal/contexts.js';
 import { hasAccess, InodeFlags, isBlockDevice, isCharacterDevice, isDirectory, isSymbolicLink } from '../internal/inode.js';
 import { dirname, join, matchesGlob, parse, resolve } from '../path.js';
@@ -73,10 +73,6 @@ export class FileHandle {
     context;
     fd;
     _buffer;
-    /**
-     * Current position
-     */
-    _position = 0;
     /**
      * Get the current file position.
      *
@@ -87,10 +83,10 @@ export class FileHandle {
      * @returns The current file position.
      */
     get position() {
-        return this.flag & constants.O_APPEND ? this.inode.size : this._position;
+        return this._sync.position;
     }
     set position(value) {
-        this._position = value;
+        this._sync.position = value;
     }
     /**
      * Whether the file has changes which have not been written to the FS
@@ -101,20 +97,30 @@ export class FileHandle {
      */
     closed = false;
     /** The path relative to the context's root */
-    path;
+    get path() {
+        return this._sync.path;
+    }
     /** The internal FS associated with the handle */
-    fs;
+    get fs() {
+        return this._sync.fs;
+    }
     /** The path relative to the `FileSystem`'s root */
-    internalPath;
+    get internalPath() {
+        return this._sync.internalPath;
+    }
     /** The flag the handle was opened with */
-    flag;
+    get flag() {
+        return this._sync.flag;
+    }
     /** Stats for the handle */
-    inode;
+    get inode() {
+        return this._sync.inode;
+    }
+    _sync;
     constructor(context, fd) {
         this.context = context;
         this.fd = fd;
-        const sync = fromFD(context, fd);
-        Object.assign(this, pick(sync, 'path', 'fs', 'internalPath', 'flag', 'inode'));
+        this._sync = fromFD(context, fd);
     }
     get _isSync() {
         return !!(this.flag & constants.O_SYNC || this.inode.flags & InodeFlags.Sync);
@@ -246,7 +252,7 @@ export class FileHandle {
         if (!isCharacterDevice(this.inode) && !isBlockDevice(this.inode) && end > this.inode.size) {
             end = position + Math.max(this.inode.size - position, 0);
         }
-        this._position = end;
+        this._sync.position = end;
         const uint8 = new Uint8Array(buffer.buffer, buffer.byteOffset, buffer.byteLength);
         await this.fs.read(this.internalPath, uint8.subarray(offset, offset + length), position, end);
         if (this._isSync)
@@ -348,7 +354,7 @@ export class FileHandle {
             this.inode.size = end;
         this.inode.mtimeMs = Date.now();
         this.inode.ctimeMs = Date.now();
-        this._position = position + slice.byteLength;
+        this._sync.position = position + slice.byteLength;
         await this.fs.write(this.internalPath, slice, position);
         if (this._isSync)
             await this.sync();

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zenfs/core",
-	"version": "2.3.0",
+	"version": "2.3.2",
 	"description": "A filesystem, anywhere",
 	"funding": {
 		"type": "individual",
@@ -71,7 +71,7 @@
 		"buffer": "^6.0.3",
 		"eventemitter3": "^5.0.1",
 		"kerium": "^1.3.4",
-		"memium": "^0.2.1",
+		"memium": "^0.2.3",
 		"readable-stream": "^4.5.2",
 		"utilium": "^2.3.3"
 	},

package/scripts/test.js

@@ -22,6 +22,7 @@ const { values: options, positionals } = parseArgs({
 		build: { short: 'b', type: 'boolean', default: false },
 		common: { short: 'c', type: 'boolean', default: false },
 		inspect: { short: 'I', type: 'boolean', default: false },
+		skip: { short: 's', type: 'string' },
 		'exit-on-fail': { short: 'e', type: 'boolean' },
 
 		// Coverage
@@ -39,13 +40,14 @@ if (options.help) {
 Paths: The setup files to run tests on
 
 Behavior:
-    -a, --auto          Automatically detect setup files
-    -b, --build         Run the npm build script prior to running tests
-    -c, --common        Also run tests not specific to any backend
-    -e, --exit-on-fail  If any tests suites fail, exit immediately
-    -t, --test <glob>   Which FS test suite(s) to run
-    -f, --force         Whether to use --test-force-exit
-    -I, --inspect       Use the inspector for debugging
+    -a, --auto            Automatically detect setup files
+    -b, --build           Run the npm build script prior to running tests
+    -c, --common          Also run tests not specific to any backend
+    -e, --exit-on-fail    If any tests suites fail, exit immediately
+    -t, --test <glob>     Which FS test suite(s) to run
+    -f, --force           Whether to use --test-force-exit
+    -I, --inspect         Use the inspector for debugging
+	-s, --skip <pattern>  Skip tests with names matching the given pattern.
 
 Output:
     -h, --help          Outputs this help message
@@ -213,7 +215,8 @@ for (const setupFile of positionals) {
 				options.inspect ? 'inspect' : '',
 				'--test --experimental-test-coverage',
 				options.force ? '--test-force-exit' : '',
-				testsGlob,
+				options.skip ? `--test-skip-pattern=${options.skip}` : '',
+				`'${testsGlob.replaceAll("'", "\\'")}'`,
 				process.env.CMD,
 			].join(' '),
 			{

package/tests/fs/read.test.ts

@@ -1,7 +1,9 @@
 import { Buffer } from 'buffer';
 import assert from 'node:assert/strict';
+import type { OpenMode, PathLike } from 'node:fs';
 import { suite, test } from 'node:test';
-import { fs } from '../common.js';
+import { promisify } from 'node:util';
+import { fs, type Callback } from '../common.js';
 
 const filepath = 'x.txt';
 const expected = 'xyz\n';
@@ -65,4 +67,25 @@ suite('read', () => {
 		assert.equal(buffer.subarray(10, buffer.length).toString(), expected);
 		assert.equal(bytesRead, expected.length);
 	});
+
+	test('read using callback API', async () => {
+		// @zenfs/core#239
+		const path = '/text.txt';
+
+		fs.writeFileSync(path, 'hello world');
+		const fd: number = (await promisify<PathLike, OpenMode, number | string>(fs.open)(path, 0, 0)) as any;
+
+		const read = promisify(fs.read);
+
+		const buf = Buffer.alloc(1024);
+		const n0 = await read(fd, buf, 0, 1024, undefined);
+		assert.equal(n0, 11);
+		assert.equal(buf.subarray(0, n0).toString('utf8'), 'hello world');
+
+		const n1 = await read(fd, buf, 0, 1024, undefined);
+		assert.equal(n1, 0);
+		assert.equal(buf.subarray(0, n1).toString('utf8'), '');
+
+		await promisify(fs.close)(fd);
+	});
 });