upy-fs-hex: Detect and throw error if constructor hex has files.

Author: microbit-carlos

src/__tests__/micropython-fs-hex.spec.ts

@@ -411,20 +411,20 @@ describe('Test importing files from hex.', () => {
     addIntelHexFileSpy.mockReset();
   });
 
-  const hexStrWithFiles = (): string => {
+  const createHexStrWithFiles = (): string => {
     const fullUpyFsMemMap = MemoryMap.fromHex(uPyHexFile);
     const filesMap = MemoryMap.fromHex(extraFilesHex);
     filesMap.forEach((value: Uint8Array, index: number) => {
       fullUpyFsMemMap.set(index, value);
     });
     return fullUpyFsMemMap.asHexString();
   };
+  const hexStrWithFiles: string = createHexStrWithFiles();
 
   it('Correctly read files from a hex.', () => {
-    const hexWithFiles = hexStrWithFiles();
     const micropythonFs = new MicropythonFsHex(uPyHexFile);
 
-    const fileList = micropythonFs.importFilesFromIntelHex(hexWithFiles);
+    const fileList = micropythonFs.importFilesFromIntelHex(hexStrWithFiles);
 
     Object.keys(extraFiles).forEach((filename) => {
       expect(fileList).toContain(filename);
@@ -433,53 +433,55 @@ describe('Test importing files from hex.', () => {
   });
 
   it('Disabled overwrite flag throws an error when file exists.', () => {
-    const hexWithFiles = hexStrWithFiles();
     const micropythonFs = new MicropythonFsHex(uPyHexFile);
     const originalFileContent = 'Original file content.';
     micropythonFs.write('a.py', originalFileContent);
 
     const failCase = () => {
-      micropythonFs.importFilesFromIntelHex(hexWithFiles, false);
+      micropythonFs.importFilesFromIntelHex(hexStrWithFiles, false);
     };
 
     expect(failCase).toThrow(Error);
     expect(micropythonFs.read('a.py')).toEqual(originalFileContent);
   });
 
   it('Enabled overwrite flag replaces the file.', () => {
-    const hexWithFiles = hexStrWithFiles();
     const micropythonFs = new MicropythonFsHex(uPyHexFile);
     const originalFileContent = 'Original file content.';
     micropythonFs.write('a.py', originalFileContent);
 
-    micropythonFs.importFilesFromIntelHex(hexWithFiles, true);
+    micropythonFs.importFilesFromIntelHex(hexStrWithFiles, true);
 
     expect(micropythonFs.read('a.py')).not.toEqual(originalFileContent);
     expect(micropythonFs.read('a.py')).toEqual(extraFiles['a.py']);
   });
 
   it('By default it throws an error if a filename already exists.', () => {
-    const hexWithFiles = hexStrWithFiles();
     const micropythonFs = new MicropythonFsHex(uPyHexFile);
     micropythonFs.write('a.py', 'some content');
 
     const failCase = () => {
-      micropythonFs.importFilesFromIntelHex(hexWithFiles);
+      micropythonFs.importFilesFromIntelHex(hexStrWithFiles);
     };
 
     expect(failCase).toThrow(Error);
   });
 
   it('When files are imported it still uses the constructor hex file.', () => {
-    const hexWithFiles = hexStrWithFiles();
     const micropythonFs = new MicropythonFsHex(uPyHexFile);
 
-    micropythonFs.importFilesFromIntelHex(hexWithFiles);
+    micropythonFs.importFilesFromIntelHex(hexStrWithFiles);
     const returnedIntelHex = micropythonFs.getIntelHex();
 
     expect(addIntelHexFileSpy.mock.calls.length).toEqual(3);
     expect(addIntelHexFileSpy.mock.calls[0][0]).toBe(uPyHexFile);
   });
+
+  it('Constructor hex file with files to import thorws an error.', () => {
+    const failCase = () => new MicropythonFsHex(hexStrWithFiles);
+
+    expect(failCase).toThrow(Error);
+  });
 });
 
 /*

src/micropython-fs-hex.ts

@@ -9,12 +9,20 @@ export class MicropythonFsHex implements FsInterface {
 
   /**
    * File System manager constructor.
+   * At the moment it needs a MicroPython hex string without a files included.
+   *
+   * TODO: If files are already in input hex file, deal with them somehow.
    *
    * @param intelHex - MicroPython Intel Hex string.
    */
   constructor(intelHex: string) {
     this._intelHex = intelHex;
-    // TODO: Read present file system in Intel Hex and populate files here
+    this.importFilesFromIntelHex(this._intelHex);
+    if (this.ls().length) {
+      throw new Error(
+        'There are files in the MicropythonFsHex constructor hex file input.'
+      );
+    }
   }
 
   /**