feat: 🎸 improve mkdir method

streamich · Jun 20, 2023 · e6dd59e · e6dd59e
1 parent 06f7a37
commit e6dd59e
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 26 deletions.
diff --git a/src/fsa-to-node/FsaNodeFs.ts b/src/fsa-to-node/FsaNodeFs.ts
@@ -229,29 +229,25 @@ export class FsaNodeFs implements FsCallbackApi {
       .then(
         () => callback(null),
         error => {
-          if (!error || typeof error !== 'object') {
-            callback(createError('', 'mkdir'));
-            return;
-          }
-          switch (error.name) {
-            case 'NotFoundError': {
-              const err = createError('ENOTDIR', 'mkdir', folder.join('/'));
-              callback(err);
-            }
-            default: {
-              callback(createError('', 'mkdir'));
+          if (error && typeof error === 'object') {
+            switch (error.name) {
+              case 'NotFoundError': {
+                const err = createError('ENOENT', 'mkdir', folder.join('/'));
+                callback(err);
+                return;
+              }
+              case 'TypeMismatchError': {
+                const err = createError('ENOTDIR', 'mkdir', folder.join('/'));
+                callback(err);
+                return;
+              }
             }
           }
+          callback(error);
         },
       );
   };
 
-  mkdirp(path: misc.PathLike, callback: misc.TCallback<string>);
-  mkdirp(path: misc.PathLike, mode: misc.TMode, callback: misc.TCallback<string>);
-  mkdirp(path: misc.PathLike, a: misc.TCallback<string> | misc.TMode, b?: misc.TCallback<string>) {
-    throw new Error('Not implemented');
-  }
-
   mkdtemp(prefix: string, callback: misc.TCallback<void>): void;
   mkdtemp(prefix: string, options: opts.IOptions, callback: misc.TCallback<void>);
   mkdtemp(prefix: string, a: misc.TCallback<void> | opts.IOptions, b?: misc.TCallback<void>) {

diff --git a/src/fsa-to-node/__tests__/FsaNodeFs.test.ts b/src/fsa-to-node/__tests__/FsaNodeFs.test.ts
@@ -1,9 +1,9 @@
-import { IFsWithVolume, memfs } from '../..';
+import { IFsWithVolume, NestedDirectoryJSON, memfs } from '../..';
 import { nodeToFsa } from '../../node-to-fsa';
 import { FsaNodeFs } from '../FsaNodeFs';
 
-const setup = () => {
-  const mfs = memfs({ mountpoint: null }) as IFsWithVolume;
+const setup = (json: NestedDirectoryJSON | null = null) => {
+  const mfs = memfs({ mountpoint: json }) as IFsWithVolume;
   const dir = nodeToFsa(mfs, '/mountpoint', { mode: 'readwrite' });
   const fs = new FsaNodeFs(dir);
   return { fs, mfs, dir };
@@ -32,7 +32,7 @@ describe('.mkdir()', () => {
       );
       throw new Error('Expected error');
     } catch (error) {
-      expect(error.code).toBe('ENOTDIR');
+      expect(error.code).toBe('ENOENT');
     }
   });
 
@@ -52,4 +52,14 @@ describe('.mkdir()', () => {
     await fs.promises.mkdir('/test/subtest', { recursive: true });
     expect(mfs.statSync('/mountpoint/test/subtest').isDirectory()).toBe(true);
   });
+
+  test('cannot create a folder over a file', async () => {
+    const { fs } = setup({file: 'test'});
+    try {
+      await fs.promises.mkdir('/file/folder', { recursive: true });
+      throw new Error('Expected error');
+    } catch (error) {
+      expect(error.code).toBe('ENOTDIR');
+    }
+  });
 });
diff --git a/src/index.ts b/src/index.ts
@@ -8,13 +8,14 @@ import {
   IReadStream,
   IWriteStream,
   DirectoryJSON,
+  NestedDirectoryJSON,
 } from './volume';
 const { fsSyncMethods, fsAsyncMethods } = require('fs-monkey/lib/util/lists');
 import { constants } from './constants';
 import type { FsPromisesApi } from './node/types';
 const { F_OK, R_OK, W_OK, X_OK } = constants;
 
-export { DirectoryJSON };
+export { DirectoryJSON, NestedDirectoryJSON };
 export const Volume = _Volume;
 
 // Default volume.
@@ -63,8 +64,8 @@ export const fs: IFs = createFsFromVolume(vol);
  * @returns A `memfs` file system instance, which is a drop-in replacement for
  *          the `fs` module.
  */
-export const memfs = (json: DirectoryJSON = {}, cwd: string = '/'): IFs => {
-  const volume = Volume.fromJSON(json, cwd);
+export const memfs = (json: NestedDirectoryJSON = {}, cwd: string = '/'): IFs => {
+  const volume = Volume.fromNestedJSON(json, cwd);
   const fs = createFsFromVolume(volume);
   return fs;
 };

diff --git a/src/node/types/callback.ts b/src/node/types/callback.ts
@@ -92,8 +92,6 @@ export interface FsCallbackApi {
   );
   mkdir(path: misc.PathLike, mode: opts.IMkdirOptions & { recursive: true }, callback: misc.TCallback<string>);
   mkdir(path: misc.PathLike, mode: misc.TMode | opts.IMkdirOptions, callback: misc.TCallback<string>);
-  mkdirp(path: misc.PathLike, callback: misc.TCallback<string>);
-  mkdirp(path: misc.PathLike, mode: misc.TMode, callback: misc.TCallback<string>);
   mkdtemp(prefix: string, callback: misc.TCallback<void>): void;
   mkdtemp(prefix: string, options: opts.IOptions, callback: misc.TCallback<void>);
   rmdir(path: misc.PathLike, callback: misc.TCallback<void>);