Merge pull request #91 from pyscript/better-micropython-stdio

Better MicroPython stdio for REPL

Author: WebReflection

docs/index.js

@@ -17,4 +17,25 @@ export const stdio = (init) => {
         },
     };
 };
+
+const decoder = new TextDecoder();
+export const buffered = (callback, EOL = 10) => {
+    const buffer = [];
+    return (maybeUI8) => {
+        if (maybeUI8 instanceof Uint8Array) {
+            for (const c of maybeUI8) {
+                if (c === EOL)
+                    callback(decoder.decode(new Uint8Array(buffer.splice(0))));
+                else
+                    buffer.push(c);
+            }
+        }
+        // if io.stderr(error) is passed instead
+        // or any io.stdout("thing") this should
+        // still work as expected
+        else {
+            callback(maybeUI8);
+        }
+    };
+};
 /* c8 ignore stop */

docs/index.js.map

@@ -1,7 +1,7 @@
 // import fetch from '@webreflection/fetch';
 import { fetchFiles, fetchJSModules, fetchPaths, writeFile } from './_utils.js';
 import { getFormat, registerJSModule, run, runAsync, runEvent } from './_python.js';
-import { stdio } from './_io.js';
+import { stdio, buffered } from './_io.js';
 import mip from '../python/mip.js';
 import zip from '../zip.js';
 
@@ -14,9 +14,12 @@ export default {
     module: (version = '1.22.0-272') =>
         `https://cdn.jsdelivr.net/npm/@micropython/micropython-webassembly-pyscript@${version}/micropython.mjs`,
     async engine({ loadMicroPython }, config, url) {
-        const { stderr, stdout, get } = stdio();
+        const { stderr, stdout, get } = stdio({
+            stderr: buffered(console.error),
+            stdout: buffered(console.log),
+        });
         url = url.replace(/\.m?js$/, '.wasm');
-        const interpreter = await get(loadMicroPython({ stderr, stdout, url }));
+        const interpreter = await get(loadMicroPython({ linebuffer: false, stderr, stdout, url }));
         if (config.files) await fetchFiles(this, interpreter, config.files);
         if (config.fetch) await fetchPaths(this, interpreter, config.fetch);
         if (config.js_modules) await fetchJSModules(config.js_modules);

docs/zip-BVYJ4_a2.js

@@ -42,13 +42,13 @@
         "@playwright/test": "^1.42.1",
         "@rollup/plugin-node-resolve": "^15.2.3",
         "@rollup/plugin-terser": "^0.4.4",
-        "@zip.js/zip.js": "^2.7.40",
+        "@zip.js/zip.js": "^2.7.41",
         "ascjs": "^6.0.3",
         "c8": "^9.1.0",
         "chokidar": "^3.6.0",
         "eslint": "^8.57.0",
         "linkedom": "^0.16.11",
-        "rollup": "^4.13.1",
+        "rollup": "^4.14.0",
         "static-handler": "^0.4.3",
         "typescript": "^5.4.3"
     },
@@ -89,6 +89,6 @@
         "to-json-callback": "^0.1.1"
     },
     "worker": {
-        "blob": "sha256-sLy5/Xw+ZYT89h91afdza9NKwCEChCfAYUlvUl76emA="
+        "blob": "sha256-16iVq8sMsDeuh75NeaBghJiiiri1XHV0F442mkx5LF0="
     }
 }