jprdonnelly/pyscript
1
0
Fork 0
mirror of https://github.com/pyscript/pyscript.git synced 2026-02-27 20:02:17 -05:00
Code Issues Projects Releases Wiki Activity

[next] Ditch handy shortcuts for good (#1537)

Browse Source
This commit is contained in:
Andrea Giammarchi
2023-06-15 17:08:28 +02:00
committed by GitHub
parent 6284c02032
commit 6df5905b2b
33 changed files with 101 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pyscript.core/test/async.html
View File

@@ -8,7 +8,7 @@
<script type="module" src="../min.js"></script>
</head>
<body>
<script type="py" async>
<script type="pyodide" async>
from js import document, fetch
response = await fetch("async.html")

8
pyscript.core/test/env.html
View File

@@ -8,26 +8,26 @@
<script type="module" src="../min.js"></script>
</head>
<body>
<script type="mpy">
<script type="micropython">
import sys
import js
version = sys.version
js.document.currentScript.target.textContent = version
</script>
<hr />
<script type="mpy">
<script type="micropython">
import js
js.document.currentScript.target.textContent = version
</script>
<hr />
<script type="py">
<script type="pyodide">
import sys
import js
version = sys.version
js.document.currentScript.target.textContent = version
</script>
<hr />
<script type="py" target="last-script-target">
<script type="pyodide" target="last-script-target">
import js
js.document.currentScript.target.textContent = version
</script>

2
pyscript.core/test/fetch.html
View File

@@ -7,7 +7,7 @@
<script type="module" src="../min.js"></script>
</head>
<body>
<script type="mpy" config="./fetch.toml">
<script type="micropython" config="./fetch.toml">
import js
import a, b
js.console.log(a.x)

2
pyscript.core/test/index.html
View File

@@ -8,7 +8,7 @@
<script type="module" src="../min.js"></script>
</head>
<body>
<script type="py">
<script type="pyodide">
import sys
import js
js.document.currentScript.target.textContent = sys.version

32
pyscript.core/test/index.js
View File

@@ -69,31 +69,31 @@ const { registerPlugin } = require("../cjs");
// all tests
for (const test of [
async function versionedRuntime() {
document.head.innerHTML = `<script type="py" version="0.23.2">${content}</script>`;
document.head.innerHTML = `<script type="pyodide" version="0.23.2">${content}</script>`;
await tick();
assert(pyodide.content, content);
assert(pyodide.target.tagName, "PY-SCRIPT");
assert(pyodide.target.tagName, "PYODIDE-SCRIPT");
},
async function basicExpectations() {
document.head.innerHTML = `<script type="py">${content}</script>`;
document.head.innerHTML = `<script type="pyodide">${content}</script>`;
await tick();
assert(pyodide.content, content);
assert(pyodide.target.tagName, "PY-SCRIPT");
assert(pyodide.target.tagName, "PYODIDE-SCRIPT");
},
async function foreignRuntime() {
document.head.innerHTML = `<script type="py" version="http://pyodide">${content}</script>`;
document.head.innerHTML = `<script type="pyodide" version="http://pyodide">${content}</script>`;
await tick();
assert(pyodide.content, content);
assert(pyodide.target.tagName, "PY-SCRIPT");
assert(pyodide.target.tagName, "PYODIDE-SCRIPT");
},
async function basicMicroPython() {
document.head.innerHTML = `<script type="mpy">${content}</script>`;
document.head.innerHTML = `<script type="micropython">${content}</script>`;
await tick();
assert(micropython.content, content);
assert(micropython.target.tagName, "MPY-SCRIPT");
assert(micropython.target.tagName, "MICROPYTHON-SCRIPT");
const script = document.head.firstElementChild;
document.body.appendChild(script);
await tick();
@@ -107,7 +107,7 @@ const { registerPlugin } = require("../cjs");
);
shadowRoot.innerHTML = `
<my-plugin></my-plugin>
<script src="./whatever" env="unique" type="py" target="my-plugin"></script>
<script src="./whatever" env="unique" type="pyodide" target="my-plugin"></script>
`.trim();
await tick();
assert(pyodide.content, "OK");
@@ -118,7 +118,7 @@ const { registerPlugin } = require("../cjs");
setTarget(div);
shadowRoot.innerHTML = `
<my-plugin></my-plugin>
<script type="py"></script>
<script type="pyodide"></script>
`.trim();
await tick();
assert(pyodide.target, div);
@@ -128,7 +128,7 @@ const { registerPlugin } = require("../cjs");
setTarget("my-plugin");
shadowRoot.innerHTML = `
<my-plugin></my-plugin>
<script type="py"></script>
<script type="pyodide"></script>
`.trim();
await tick();
assert(pyodide.target.tagName, "MY-PLUGIN");
@@ -137,7 +137,7 @@ const { registerPlugin } = require("../cjs");
async function jsonConfig() {
const packages = {};
patchFetch(() => Promise.resolve({ json: () => ({ packages }) }));
shadowRoot.innerHTML = `<script config="./whatever.json" type="py"></script>`;
shadowRoot.innerHTML = `<script config="./whatever.json" type="pyodide"></script>`;
await tick();
assert(pyodide.packages, packages);
},
@@ -149,7 +149,7 @@ const { registerPlugin } = require("../cjs");
patchFetch(() =>
Promise.resolve({ text: () => Promise.resolve(jsonPackages) }),
);
shadowRoot.innerHTML = `<script config="./whatever.toml" type="py"></script>`;
shadowRoot.innerHTML = `<script config="./whatever.toml" type="pyodide"></script>`;
// there are more promises in here let's increase the tick delay to avoid flaky tests
await tick(20);
assert(
@@ -173,7 +173,7 @@ const { registerPlugin } = require("../cjs");
}),
);
shadowRoot.innerHTML = `
<script type="py" config="./fetch.toml">
<script type="pyodide" config="./fetch.toml">
import js
import a, b
js.console.log(a.x)
@@ -184,9 +184,9 @@ const { registerPlugin } = require("../cjs");
},
async function testDefaultRuntime() {
const py = await pyscript.env.py;
const pyodide = await pyscript.env.pyodide;
const keys = Object.keys(loadPyodide()).join(",");
assert(Object.keys(py).join(","), keys);
assert(Object.keys(pyodide).join(","), keys);
const unique = await pyscript.env.unique;
assert(Object.keys(unique).join(","), keys);

6
pyscript.core/test/isolated.html
View File

@@ -7,16 +7,16 @@
<script type="module" src="../min.js"></script>
</head>
<body>
<script type="py">
<script type="pyodide">
# define a "global" variable and print it
shared_env = 1
print(shared_env)
</script>
<script type="py">
<script type="pyodide">
# just print the "global" variable from same env
print(shared_env)
</script>
<script type="py" env="another-one">
<script type="pyodide" env="another-one">
# see the error
print(shared_env)
</script>

6
pyscript.core/test/many.html
View File

@@ -9,13 +9,13 @@
<script type="module" src="../min.js"></script>
</head>
<body>
<script type="py" version="0.23.2">
<script type="pyodide" version="0.23.2">
import sys
import js
js.document.currentScript.target.textContent = sys.version
</script>
<script type="mpy" src="three.py"></script>
<script type="py" config="./config.json">
<script type="micropython" src="three.py"></script>
<script type="pyodide" config="./config.json">
import matplotlib.pyplot as plt
import matplotlib.tri as tri
import numpy as np

2
pyscript.core/test/matplot.html
View File

@@ -9,7 +9,7 @@
<script type="module" src="../min.js"></script>
</head>
<body>
<script type="py" config="./config.toml">
<script type="pyodide" config="./config.toml">
import matplotlib.pyplot as plt
import matplotlib.tri as tri
import numpy as np

2
pyscript.core/test/matplot.json.html
View File

@@ -9,7 +9,7 @@
<script type="module" src="../min.js"></script>
</head>
<body>
<script type="py" config="./config.json">
<script type="pyodide" config="./config.json">
import matplotlib.pyplot as plt
import matplotlib.tri as tri
import numpy as np

4
pyscript.core/test/matplot.worker.html
View File

@@ -9,7 +9,7 @@
<script type="module" src="../min.js"></script>
</head>
<body>
<script type="mpy">
<script type="micropython">
from js import XWorker
def show_image(event):
@@ -19,7 +19,7 @@
img.src = event.data
document.body.appendChild(img)
w = XWorker('./matplot.py', **{'type': 'py', 'config': './config.toml'})
w = XWorker('./matplot.py', **{'type': 'pyodide', 'config': './config.toml'})
w.onmessage = show_image
</script>
</body>

2
pyscript.core/test/micropython.html
View File

@@ -9,7 +9,7 @@
<script type="module" src="../min.js"></script>
</head>
<body>
<script type="mpy">
<script type="micropython">
import sys
import js
js.document.currentScript.target.textContent = sys.version

2
pyscript.core/test/no-sw.html
View File

@@ -9,7 +9,7 @@
<script type="module" src="../min.js"></script>
</head>
<body>
<script type="py">
<script type="pyodide">
import sys
import js
js.document.currentScript.target.textContent = sys.version

16
pyscript.core/test/order.html
View File

@@ -17,15 +17,21 @@
<script type="module" src="../esm/index.js"></script>
</head>
<body>
<script type="mpy" src="http://localhost:7357/print-a.py"></script>
<script type="mpy">
<script
type="micropython"
src="http://localhost:7357/print-a.py"
></script>
<script type="micropython">
print('B')
</script>
<script type="mpy" src="http://localhost:7357/print-a.py"></script>
<script type="mpy">
<script
type="micropython"
src="http://localhost:7357/print-a.py"
></script>
<script type="micropython">
print('C')
</script>
<script type="mpy">
<script type="micropython">
print('D')
</script>
<pre>

2
pyscript.core/test/plugins/index.html
View File

@@ -15,7 +15,7 @@
<script type="module">
import { registerPlugin } from "@pyscript/core";
registerPlugin("mpy-script", {
type: "micropython", // or just 'mpy'
type: "micropython",
async onRuntimeReady(micropython, element) {
console.log(micropython);
// Somehow this doesn't work in MicroPython

2
pyscript.core/test/plugins/lua.html
View File

@@ -15,7 +15,7 @@
<script type="module">
import { registerPlugin } from "@pyscript/core";
registerPlugin("lua-script", {
type: "wasmoon", // or just 'lua'
type: "wasmoon",
async onRuntimeReady(wasmoon, element) {
// Somehow this doesn't work in Wasmoon
wasmoon.io.stdout = (message) => {

2
pyscript.core/test/plugins/py-script.js
View File

@@ -19,7 +19,7 @@ const sharedPyodide = new Promise((resolve) => {
const config = pyConfig?.getAttribute("src") || pyConfig?.textContent;
registerPlugin("py-script", {
config,
type: "pyodide", // or just 'py'
type: "pyodide",
codeBeforeRunWorker: `print('codeBeforeRunWorker')`,
codeAfterRunWorker: `print('codeAfterRunWorker')`,
onBeforeRun(pyodide, node) {

14
pyscript.core/test/py-events.html
View File

@@ -9,28 +9,28 @@
<script type="module" src="../min.js"></script>
</head>
<body>
<script type="py">
<script type="pyodide">
def print_version(event):
import sys
print(event.type)
print(sys.version)
</script>
<button
py-pointerdown="print_version(event)"
py-click="print_version(event)"
pyodide-pointerdown="print_version(event)"
pyodide-click="print_version(event)"
>
python version
pyodide version
</button>
<script type="mpy">
<script type="micropython">
def print_version(event):
import sys
print(event.type)
print(sys.version)
</script>
<button
mpy-pointerdown="print_version(event)"
mpy-click="print_version(event)"
micropython-pointerdown="print_version(event)"
micropython-click="print_version(event)"
>
micropython version
</button>

2
pyscript.core/test/remote.html
View File

@@ -10,7 +10,7 @@
</head>
<body>
<script
type="mpy"
type="micropython"
version="http://localhost:8080/micropython/micropython.mjs"
>
import sys

6
pyscript.core/test/ruby.html
View File

@@ -17,12 +17,14 @@
<script type="module" src="../esm/index.js"></script>
</head>
<body>
<script type="rb">
<script type="ruby-wasm-wasi">
def print_version(event)
puts event[:type]
print "ruby #{ RUBY_VERSION }p#{ RUBY_PATCHLEVEL }"
end
</script>
<button rb-click="print_version(event)">ruby version</button>
<button ruby-wasm-wasi-click="print_version(event)">
ruby-wasm-wasi version
</button>
</body>
</html>

2
pyscript.core/test/shadow-dom.html
View File

@@ -19,7 +19,7 @@
const sd = super().attachShadow({ mode: "closed" });
sd.appendChild(
Object.assign(document.createElement("script"), {
type: "mpy",
type: "micropython",
textContent: `
import sys
import js

2
pyscript.core/test/table.html
View File

@@ -20,7 +20,7 @@
<table cellspacing="2" cellpadding="2">
<tr>
<td>check edge cases</td>
<script type="mpy">
<script type="micropython">
import sys
import js

12
pyscript.core/test/test.html
View File

@@ -17,7 +17,7 @@
<script type="module" src="../esm/index.js"></script>
</head>
<body>
<script type="py">
<script type="pyodide">
def print_version():
import sys
print(sys.version)
@@ -25,15 +25,15 @@
</script>
<button py-click="print_version()">python version</button>
<script type="mpy">
<script type="micropython">
def print_version():
import sys
print(sys.version)
print("bad.", file=sys.stderr)
</script>
<button mpy-click="print_version()">micropython version</button>
<button micropython-click="print_version()">micropython version</button>
<script type="lua">
<script type="wasmoon">
function print_version()
print(_VERSION)
printErr(123)
@@ -41,11 +41,11 @@
</script>
<button lua-click="print_version()">lua version</button>
<script type="rb">
<script type="ruby-wasm-wasi">
def print_version()
print "ruby #{ RUBY_VERSION }p#{ RUBY_PATCHLEVEL }"
end
</script>
<button rb-click="print_version()">ruby version</button>
<button ruby-wasm-wasi-click="print_version()">ruby version</button>
</body>
</html>

4
pyscript.core/test/wasmoon.html
View File

@@ -17,7 +17,7 @@
<script type="module" src="../esm/index.js"></script>
</head>
<body>
<script type="lua" config="./fetch.toml">
<script type="wasmoon" config="./fetch.toml">
local function read_file(path)
local file = io.open(path, "rb")
if not file then return nil end
@@ -32,6 +32,6 @@
print(read_file('/a.py'))
end
</script>
<button lua-click="print_version(event)">lua version</button>
<button wasmoon-click="print_version(event)">wasmoon version</button>
</body>
</html>

12
pyscript.core/test/worker/index.html
View File

@@ -21,7 +21,7 @@
<script type="module">
import { XWorker } from "@pyscript/core";
const w = new XWorker("./worker.py", { type: "mpy" });
const w = new XWorker("./worker.py", { type: "micropython" });
w.postMessage("JavaScript: Hello MicroPython 👋");
w.onmessage = (event) => {
console.log(event.data);
@@ -29,7 +29,7 @@
</script>
<!-- XWorker - MicroPython to MicroPython -->
<script type="mpy">
<script type="micropython">
from js import XWorker
def handle_message(event):
@@ -41,25 +41,25 @@
</script>
<!-- XWorker - MicroPython to Pyodide -->
<script type="mpy">
<script type="micropython">
from js import XWorker
def handle_message(event):
print(event.data)
w = XWorker('./worker.py', **{'type': 'py', 'async': True, 'config': '../fetch.toml'})
w = XWorker('./worker.py', **{'type': 'pyodide', 'async': True, 'config': '../fetch.toml'})
w.postMessage('MicroPython: Hello Pyodide 👋')
w.onmessage = handle_message
</script>
<!-- XWorker - MicroPython to Lua -->
<script type="mpy">
<script type="micropython">
from js import XWorker
def handle_message(event):
print(event.data)
w = XWorker('./worker.lua', type='lua')
w = XWorker('./worker.lua', type='wasmoon')
w.postMessage('MicroPython: Hello Lua 👋')
w.onmessage = handle_message
</script>

10
pyscript.core/test/worker/input.html
View File

@@ -19,7 +19,7 @@
</script>
</head>
<body>
<script type="mpy">
<script type="micropython">
from js import XWorker, Promise, document
deferred = Promise.withResolvers()
@@ -37,10 +37,14 @@
inputs[1].disabled = False
return deferred.promise
w = XWorker('./input.lua', type='lua')
w = XWorker('./input.lua', type='wasmoon')
w.sync.input = handle_input
</script>
<input type="text" placeholder="loading ..." required disabled />
<input type="submit" mpy-click="handle_result(event)" disabled />
<input
type="submit"
micropython-click="handle_result(event)"
disabled
/>
</body>
</html>