Some non-breaking changes and minor tidy to the (still broken) test suite.

ntoll · ntoll · commit 9148fcc2ca0d · 2022-11-11T15:23:19.000Z
diff --git a/pyscript.js b/pyscript.js
@@ -508,6 +508,26 @@ const main = function() {
         }
     }
 
+    /**************************************************************************
+    Utility functions for MicroPyScript.
+    **************************************************************************/
+
+    function toJSON(node) {
+        /*
+        Takes a node in the DOM and serialises it into JSON.
+        */
+    }
+
+    function toDOM(obj) {
+        /*
+        Takes a JSON object and returns a node to mutate into the DOM.
+        */
+    } 
+
+    /**************************************************************************
+    Variables and functions needed for the life-cycle of MicroPyScript.
+    **************************************************************************/
+
     // Default configuration settings for MicroPyScript. These may be overridden
     // by the app.loadConfig function.
     // The "files" object should look like this:
@@ -674,8 +694,10 @@ const main = function() {
         // setup.
         Promise.all(pendingDownloads).then((values) => {
             filesLoaded = true;
-            if (values) {
-                logger(`All files downloaded, copying to filesystem. 📥`);
+            if (values.length > 0) {
+                logger(`${values.length} file[s] downloaded, copying to filesystem. 📥`);
+            } else {
+                logger(`No files to download, nothing to do on filesystem. 📥`);
             }
             const pyFilesLoaded = new CustomEvent("py-files-loaded");
             document.dispatchEvent(pyFilesLoaded);
@@ -687,8 +709,8 @@ const main = function() {
         /*
         Save the file's content to the path on the interpreter's local filesystem.
         */
-        logger(`Saving file "${e.detail.path}" to file system. 💾`);
         interpreter.addFile(e.detail.path, e.detail.content);
+        logger(`Saved file "${e.detail.path}" to file system. 💾`);
     }
 
     function loadInterpreter() {
@@ -805,13 +827,8 @@ const main = function() {
 
     // Finally, return a function to start MicroPyScript.
     return function() {
-        document.addEventListener("py-configured", onPyConfigured);
-        document.addEventListener("py-interpreter-loaded", onInterpreterLoaded);
-        document.addEventListener("py-file-fetched", onFileFetched);
-        document.addEventListener("py-interpreter-ready", onInterpreterReady);
-        document.addEventListener("py-finished-setup", onFinished);
-        // An object to represent the MicroPyScript platform in the browser. What
-        // is eventually returned from the main() function.
+        // An object to represent the MicroPyScript platform in the browser.
+        // What is eventually returned from the main() function.
         const pyScript = {
             get config() {
                 return config;
@@ -837,6 +854,11 @@ const main = function() {
                 }
             },
             start: function() {
+                document.addEventListener("py-configured", onPyConfigured);
+                document.addEventListener("py-interpreter-loaded", onInterpreterLoaded);
+                document.addEventListener("py-file-fetched", onFileFetched);
+                document.addEventListener("py-interpreter-ready", onInterpreterReady);
+                document.addEventListener("py-finished-setup", onFinished);
                 loadConfig();
             }
         };
diff --git a/spec/pyscriptSpec.js b/spec/pyscriptSpec.js
@@ -38,7 +38,7 @@ describe("In the PyScript project,", function() {
             result = e.detail;
         };
         document.addEventListener("py-configured", checkEvent);
-        pyscript.loadConfig();
+        pyscript.start();
         expect(result.runtime).toEqual("micropython");
         expect(result.mp_memory).toEqual(65536);
     });
@@ -49,7 +49,7 @@ describe("In the PyScript project,", function() {
             result = e.detail;
         };
         document.addEventListener("py-configured", checkEvent);
-        pyscript.loadConfig();
+        pyscript.start();
         expect(result).toBeDefined()
     });
 
@@ -64,15 +64,15 @@ describe("In the PyScript project,", function() {
     it("registerPlugin should configure the passed-in plugins, startPlugins should start them", function() {
         let configureFlag = false;
         let startFlag = false;
-        class TestPlugin extends Plugin {
-            configure(config) {
+        const TestPlugin = {
+            configure: function(config) {
                 configureFlag = true;
-            }
-            start(config) {
+            },
+            start: function(config) {
                 startFlag = true;
             }
         }
-        pyscript.registerPlugin(new TestPlugin());
+        pyscript.registerPlugin(TestPlugin);
         expect(configureFlag).toEqual(true);
         pyscript.startPlugins();
         expect(startFlag).toEqual(true);
