@zenfs/core 0.5.3 → 0.5.5

package/dist/backends/SyncStore.js

@@ -134,10 +134,10 @@ export class SyncStoreFS extends Sync(FileSystem) {
         // Remove oldPath from parent's directory listing.
         oldDirNode = this.findINode(tx, oldParent), oldDirList = this.getDirListing(tx, oldDirNode, oldParent);
         if (!oldDirNode.toStats().hasAccess(W_OK, cred)) {
-            throw ApiError.EACCES(oldPath);
+            throw ApiError.With('EACCES', oldPath, 'renameSync');
         }
         if (!oldDirList[oldName]) {
-            throw ApiError.ENOENT(oldPath);
+            throw ApiError.With('ENOENT', oldPath, 'renameSync');
         }
         const ino = oldDirList[oldName];
         delete oldDirList[oldName];
@@ -175,7 +175,7 @@ export class SyncStoreFS extends Sync(FileSystem) {
             }
             else {
                 // If it's a directory, throw a permissions error.
-                throw ApiError.EPERM(newPath);
+                throw ApiError.With('EPERM', newPath, 'renameSync');
             }
         }
         newDirList[newName] = ino;
@@ -194,7 +194,7 @@ export class SyncStoreFS extends Sync(FileSystem) {
         // Get the inode to the item, convert it into a Stats object.
         const stats = this.findINode(this.store.beginTransaction(), p).toStats();
         if (!stats.hasAccess(R_OK, cred)) {
-            throw ApiError.EACCES(p);
+            throw ApiError.With('EACCES', p, 'statSync');
         }
         return stats;
     }
@@ -205,10 +205,10 @@ export class SyncStoreFS extends Sync(FileSystem) {
     openFileSync(p, flag, cred) {
         const tx = this.store.beginTransaction(), node = this.findINode(tx, p), data = tx.get(node.ino);
         if (!node.toStats().hasAccess(flagToMode(flag), cred)) {
-            throw ApiError.EACCES(p);
+            throw ApiError.With('EACCES', p, 'openFileSync');
         }
         if (data === null) {
-            throw ApiError.ENOENT(p);
+            throw ApiError.With('ENOENT', p, 'openFileSync');
         }
         return new SyncStoreFile(this, p, flag, node.toStats(), data);
     }
@@ -218,7 +218,7 @@ export class SyncStoreFS extends Sync(FileSystem) {
     rmdirSync(p, cred) {
         // Check first if directory is empty.
         if (this.readdirSync(p, cred).length > 0) {
-            throw ApiError.ENOTEMPTY(p);
+            throw ApiError.With('ENOTEMPTY', p, 'rmdirSync');
         }
         else {
             this.removeEntry(p, true, cred);
@@ -231,7 +231,7 @@ export class SyncStoreFS extends Sync(FileSystem) {
         const tx = this.store.beginTransaction();
         const node = this.findINode(tx, p);
         if (!node.toStats().hasAccess(R_OK, cred)) {
-            throw ApiError.EACCES(p);
+            throw ApiError.With('EACCES', p, 'readdirSync');
         }
         return Object.keys(this.getDirListing(tx, node, p));
     }
@@ -258,16 +258,16 @@ export class SyncStoreFS extends Sync(FileSystem) {
     linkSync(existing, newpath, cred) {
         const tx = this.store.beginTransaction(), existingDir = dirname(existing), existingDirNode = this.findINode(tx, existingDir);
         if (!existingDirNode.toStats().hasAccess(R_OK, cred)) {
-            throw ApiError.EACCES(existingDir);
+            throw ApiError.With('EACCES', existingDir, 'linkSync');
         }
         const newDir = dirname(newpath), newDirNode = this.findINode(tx, newDir), newListing = this.getDirListing(tx, newDirNode, newDir);
         if (!newDirNode.toStats().hasAccess(W_OK, cred)) {
-            throw ApiError.EACCES(newDir);
+            throw ApiError.With('EACCES', newDir, 'linkSync');
         }
         const ino = this._findINode(tx, existingDir, basename(existing));
         const node = this.getINode(tx, ino, existing);
         if (!node.toStats().hasAccess(W_OK, cred)) {
-            throw ApiError.EACCES(newpath);
+            throw ApiError.With('EACCES', newpath, 'linkSync');
         }
         node.nlink++;
         newListing[basename(newpath)] = ino;
@@ -314,7 +314,7 @@ export class SyncStoreFS extends Sync(FileSystem) {
             const ino = this._findINode(tx, dirname(parent), basename(parent), visited);
             const dir = this.getDirListing(tx, this.getINode(tx, ino, parent + sep + filename), parent);
             if (!(filename in dir)) {
-                throw ApiError.ENOENT(resolve(parent, filename));
+                throw ApiError.With('ENOENT', resolve(parent, filename), '_findINode');
             }
             return dir[filename];
         }
@@ -322,7 +322,7 @@ export class SyncStoreFS extends Sync(FileSystem) {
             // Find the item in the root node.
             const dir = this.getDirListing(tx, this.getINode(tx, rootIno, parent), parent);
             if (!(filename in dir)) {
-                throw ApiError.ENOENT(resolve(parent, filename));
+                throw ApiError.With('ENOENT', resolve(parent, filename), '_findINode');
             }
             return dir[filename];
         }
@@ -348,7 +348,7 @@ export class SyncStoreFS extends Sync(FileSystem) {
     getINode(tx, id, p) {
         const data = tx.get(id);
         if (!data) {
-            throw ApiError.ENOENT(p);
+            throw ApiError.With('ENOENT', p, 'getINode');
         }
         const inode = new Inode(data.buffer);
         return inode;
@@ -358,11 +358,11 @@ export class SyncStoreFS extends Sync(FileSystem) {
      */
     getDirListing(tx, inode, p) {
         if (!inode.toStats().isDirectory()) {
-            throw ApiError.ENOTDIR(p);
+            throw ApiError.With('ENOTDIR', p, 'getDirListing');
         }
         const data = tx.get(inode.ino);
         if (!data) {
-            throw ApiError.ENOENT(p);
+            throw ApiError.With('ENOENT', p, 'getDirListing');
         }
         return decodeDirListing(data);
     }
@@ -371,18 +371,13 @@ export class SyncStoreFS extends Sync(FileSystem) {
      * the exceedingly unlikely chance that we try to reuse a random GUID.
      * @return The GUID that the data was stored under.
      */
-    addNewNode(tx, data) {
-        const retries = 0;
-        let ino;
-        while (retries < 5) {
-            try {
-                ino = randomIno();
-                tx.put(ino, data, false);
-                return ino;
-            }
-            catch (e) {
-                // Ignore and reroll.
+    addNewNode(tx, data, _maxAttempts = 5) {
+        for (let i = 0; i < _maxAttempts; i++) {
+            const ino = randomIno();
+            if (!tx.put(ino, data, false)) {
+                continue;
             }
+            return ino;
         }
         throw new ApiError(ErrorCode.EIO, 'Unable to commit data to key-value store.');
     }
@@ -399,18 +394,18 @@ export class SyncStoreFS extends Sync(FileSystem) {
         const tx = this.store.beginTransaction(), parentDir = dirname(p), fname = basename(p), parentNode = this.findINode(tx, parentDir), dirListing = this.getDirListing(tx, parentNode, parentDir);
         //Check that the creater has correct access
         if (!parentNode.toStats().hasAccess(W_OK, cred)) {
-            throw ApiError.EACCES(p);
+            throw ApiError.With('EACCES', p, 'commitNewFile');
         }
         /* Invariant: The root always exists.
         If we don't check this prior to taking steps below,
         we will create a file with name '' in root should p == '/'.
         */
         if (p === '/') {
-            throw ApiError.EEXIST(p);
+            throw ApiError.With('EEXIST', p, 'commitNewFile');
         }
         // Check if file already exists.
         if (dirListing[fname]) {
-            throw ApiError.EEXIST(p);
+            throw ApiError.With('EEXIST', p, 'commitNewFile');
         }
         const fileNode = new Inode();
         try {
@@ -440,20 +435,20 @@ export class SyncStoreFS extends Sync(FileSystem) {
     removeEntry(p, isDir, cred) {
         const tx = this.store.beginTransaction(), parent = dirname(p), parentNode = this.findINode(tx, parent), parentListing = this.getDirListing(tx, parentNode, parent), fileName = basename(p), fileIno = parentListing[fileName];
         if (!fileIno) {
-            throw ApiError.ENOENT(p);
+            throw ApiError.With('ENOENT', p, 'removeEntry');
         }
         // Get file inode.
         const fileNode = this.getINode(tx, fileIno, p);
         if (!fileNode.toStats().hasAccess(W_OK, cred)) {
-            throw ApiError.EACCES(p);
+            throw ApiError.With('EACCES', p, 'removeEntry');
         }
         // Remove from directory listing of parent.
         delete parentListing[fileName];
         if (!isDir && fileNode.toStats().isDirectory()) {
-            throw ApiError.EISDIR(p);
+            throw ApiError.With('EISDIR', p, 'removeEntry');
         }
         if (isDir && !fileNode.toStats().isDirectory()) {
-            throw ApiError.ENOTDIR(p);
+            throw ApiError.With('ENOTDIR', p, 'removeEntry');
         }
         try {
             // Update directory listing.

package/dist/backends/backend.d.ts

@@ -73,8 +73,8 @@ export declare function createBackend<B extends Backend>(backend: B, options?: o
  *
  * The option object for each file system corresponds to that file system's option object passed to its `Create()` method.
  */
-export interface BackendConfig {
-    backend: Backend;
+export interface BackendConfig<FS extends FileSystem = FileSystem, OC extends BackendOptionsConfig = BackendOptionsConfig> {
+    backend: Backend<FS, OC>;
     [key: string]: unknown;
 }
 /**
@@ -85,5 +85,5 @@ export declare function isBackendConfig(arg: unknown): arg is BackendConfig;
  * Retrieve a file system with the given configuration.
  * @param config A BackendConfig object.
  */
-export declare function resolveBackend(options: BackendConfig, _depth?: number): Promise<FileSystem>;
+export declare function resolveBackend<FS extends FileSystem>(options: BackendConfig<FS>, _depth?: number): Promise<FS>;
 export {};