refactor: 💡 make memfs() return a collection of things

streamich · Jun 25, 2023 · 2ce01b7 · 2ce01b7
1 parent 93f909b
commit 2ce01b7
Show file tree

Hide file tree

Showing 15 changed files with 107 additions and 107 deletions.
diff --git a/demo/git/index.ts b/demo/git/index.ts
@@ -4,7 +4,7 @@ import git from 'isomorphic-git';
 import {memfs} from '../../src';
 
 const main = async () => {
-  const fs = memfs();
+  const {fs} = memfs();
 
   fs.mkdirSync('/repo');
   console.log('New folder:', (<any>fs).__vol.toJSON());

diff --git a/src/__tests__/volume/readFile.test.ts b/src/__tests__/volume/readFile.test.ts
@@ -3,13 +3,13 @@ import { memfs } from '../..';
 
 describe('.readFile()', () => {
   it('can read a file', async () => {
-    const fs = memfs({ '/dir/test.txt': '01234567' });
+    const { fs } = memfs({ '/dir/test.txt': '01234567' });
     const data = await fs.promises.readFile('/dir/test.txt', { encoding: 'utf8' });
     expect(data).toBe('01234567');
   });
 
   it('throws if file does not exist', async () => {
-    const fs = memfs({ '/dir/test.txt': '01234567' });
+    const { fs } = memfs({ '/dir/test.txt': '01234567' });
     const [, err] = await of(fs.promises.readFile('/dir/test-NOT-FOUND.txt', { encoding: 'utf8' }));
     expect(err).toBeInstanceOf(Error);
     expect((<any>err).code).toBe('ENOENT');

diff --git a/src/__tests__/volume/writeSync.test.ts b/src/__tests__/volume/writeSync.test.ts
@@ -19,7 +19,7 @@ describe('.writeSync(fd, buffer, offset, length, position)', () => {
   });
 
   it('can write at offset', () => {
-    const fs = memfs({ foo: '123' });
+    const { fs } = memfs({ foo: '123' });
     const fd = fs.openSync('/foo', 'a+');
     expect(fs.readFileSync('/foo', 'utf8')).toBe('123');
     fs.writeSync(fd, 'x', 1);

diff --git a/src/crud-to-cas/__tests__/CrudCas.test.ts b/src/crud-to-cas/__tests__/CrudCas.test.ts
@@ -8,7 +8,7 @@ import { NodeCrud } from '../../node-to-crud/NodeCrud';
 
 onlyOnNode20('CrudCas on FsaCrud', () => {
   const setup = () => {
-    const fs = memfs();
+    const { fs } = memfs();
     const fsa = new NodeFileSystemDirectoryHandle(fs, '/', { mode: 'readwrite' });
     const crud = new FsaCrud(fsa);
     const cas = new CrudCas(crud, { hash });
@@ -19,7 +19,7 @@ onlyOnNode20('CrudCas on FsaCrud', () => {
 
 onlyOnNode20('CrudCas on NodeCrud at root', () => {
   const setup = () => {
-    const fs = memfs();
+    const { fs } = memfs();
     const crud = new NodeCrud({ fs: fs.promises, dir: '/' });
     const cas = new CrudCas(crud, { hash });
     return { fs, crud, cas, snapshot: () => (<any>fs).__vol.toJSON() };
@@ -29,7 +29,7 @@ onlyOnNode20('CrudCas on NodeCrud at root', () => {
 
 onlyOnNode20('CrudCas on NodeCrud at in sub-folder', () => {
   const setup = () => {
-    const fs = memfs({ '/a/b/c': null });
+    const { fs } = memfs({ '/a/b/c': null });
     const crud = new NodeCrud({ fs: fs.promises, dir: '/a/b/c' });
     const cas = new CrudCas(crud, { hash });
     return { fs, crud, cas, snapshot: () => (<any>fs).__vol.toJSON() };

diff --git a/src/crud/__tests__/matryoshka.test.ts b/src/crud/__tests__/matryoshka.test.ts
@@ -9,15 +9,15 @@ import { FsaCrud } from '../../fsa-to-crud';
 onlyOnNode20('CRUD matryoshka', () => {
   describe('crud(memfs)', () => {
     testCrudfs(() => {
-      const fs = memfs();
+      const { fs } = memfs();
       const crud = new NodeCrud({ fs: fs.promises, dir: '/' });
       return { crud, snapshot: () => (<any>fs).__vol.toJSON() };
     });
   });
 
   describe('crud(fsa(memfs))', () => {
     testCrudfs(() => {
-      const fs = memfs();
+      const { fs } = memfs();
       const fsa = new NodeFileSystemDirectoryHandle(fs, '/', { mode: 'readwrite' });
       const crud = new FsaCrud(fsa);
       return { crud, snapshot: () => (<any>fs).__vol.toJSON() };
@@ -26,7 +26,7 @@ onlyOnNode20('CRUD matryoshka', () => {
 
   describe('crud(fs(fsa(memfs)))', () => {
     testCrudfs(() => {
-      const fs = memfs();
+      const { fs } = memfs();
       const fsa = new NodeFileSystemDirectoryHandle(fs, '/', { mode: 'readwrite' });
       const fs2 = new FsaNodeFs(fsa);
       const crud = new NodeCrud({ fs: fs2.promises, dir: '/' });
@@ -36,7 +36,7 @@ onlyOnNode20('CRUD matryoshka', () => {
 
   describe('crud(fsa(fs(fsa(memfs))))', () => {
     testCrudfs(() => {
-      const fs = memfs();
+      const { fs } = memfs();
       const fsa = new NodeFileSystemDirectoryHandle(fs, '/', { mode: 'readwrite' });
       const fs2 = new FsaNodeFs(fsa);
       const fsa2 = new NodeFileSystemDirectoryHandle(fs2, '/', { mode: 'readwrite' });
@@ -47,7 +47,7 @@ onlyOnNode20('CRUD matryoshka', () => {
 
   describe('crud(fs(fsa(fs(fsa(memfs)))))', () => {
     testCrudfs(() => {
-      const fs = memfs();
+      const { fs } = memfs();
       const fsa = new NodeFileSystemDirectoryHandle(fs, '/', { mode: 'readwrite' });
       const fs2 = new FsaNodeFs(fsa);
       const fsa2 = new NodeFileSystemDirectoryHandle(fs2, '/', { mode: 'readwrite' });
@@ -59,7 +59,7 @@ onlyOnNode20('CRUD matryoshka', () => {
 
   describe('crud(fsa(fs(fsa(fs(fsa(memfs))))))', () => {
     testCrudfs(() => {
-      const fs = memfs();
+      const { fs } = memfs();
       const fsa = new NodeFileSystemDirectoryHandle(fs, '/', { mode: 'readwrite' });
       const fs2 = new FsaNodeFs(fsa);
       const fsa2 = new NodeFileSystemDirectoryHandle(fs2, '/', { mode: 'readwrite' });

diff --git a/src/fsa-to-crud/__tests__/FsaCrud.test.ts b/src/fsa-to-crud/__tests__/FsaCrud.test.ts
@@ -5,7 +5,7 @@ import { FsaCrud } from '../FsaCrud';
 import { testCrudfs } from '../../crud/__tests__/testCrudfs';
 
 const setup = () => {
-  const fs = memfs();
+  const { fs } = memfs();
   const fsa = new NodeFileSystemDirectoryHandle(fs, '/', { mode: 'readwrite' });
   const crud = new FsaCrud(fsa);
   return { fs, fsa, crud, snapshot: () => (<any>fs).__vol.toJSON() };