jprdonnelly/pyscript
1
0
Fork 0
mirror of https://github.com/pyscript/pyscript.git synced 2025-12-19 10:17:23 -05:00
Code Issues Projects Releases Wiki Activity

Apply prettier to css, html, js, md, ts, and yml (#1249)

Browse Source 
* Apply prettier to css, js, html, md, ts, and yml

As a followup I will add prettier to the .pre-commit config.
This patch is 100% generated by prettier.
I used a forked version of prettier that understands the
py-script tag.
See https://github.com/hoodmane/pyscript-prettier-precommit
for more info.

* Apply old pre-commit

* Revert some problems

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Revert some changes

* More changes

* Fix pre-commit

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
This commit is contained in:
Hood Chatham
2023-03-06 15:20:21 +01:00
committed by GitHub
parent 7ffe6a598e
commit 08f34f748b
108 changed files with 4571 additions and 3802 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/build-unstable.yml vendored
View File

@@ -28,7 +28,6 @@ jobs:
MINICONDA_PYTHON_VERSION: py38
MINICONDA_VERSION: 4.11.0
steps:
- name: Checkout
uses: actions/checkout@v3

1
.github/workflows/docs-release.yml vendored
View File

@@ -13,7 +13,6 @@ jobs:
env:
SPHINX_HTML_BASE_URL: https://docs.pyscript.net/
steps:
- name: Checkout
uses: actions/checkout@v3
with:

1
.github/workflows/docs-review.yml vendored
View File

@@ -26,7 +26,6 @@ jobs:
env:
SPHINX_HTML_BASE_URL: https://docs.pyscript.net/
steps:
- name: Checkout
uses: actions/checkout@v3
with:

1
.github/workflows/docs-unstable.yml vendored
View File

@@ -16,7 +16,6 @@ jobs:
env:
SPHINX_HTML_BASE_URL: https://docs.pyscript.net/
steps:
- name: Checkout
uses: actions/checkout@v3
with:

1
.github/workflows/prepare-release.yml vendored
View File

@@ -17,7 +17,6 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3

1
.github/workflows/sync-examples.yml vendored
View File

@@ -15,7 +15,6 @@ jobs:
working-directory: examples
steps:
# Deploy to S3
- name: Checkout
uses: actions/checkout@v3

39
CONTRIBUTING.md
View File

@@ -4,17 +4,17 @@ Thank you for wanting to contribute to the PyScript project!
## Table of contents
* [Code of Conduct](#code-of-conduct)
* [Contributing](#contributing)
* [Reporting bugs](#reporting-bugs)
* [Reporting security issues](#reporting-security-issues)
* [Asking questions](#asking-questions)
* [Setting up your local environment and developing](#setting-up-your-local-environment-and-developing)
* [Places to start](#places-to-start)
* [Setting up your local environment and developing](#setting-up-your-local-environment-and-developing)
* [License terms for contributions](#license-terms-for-contributions)
* [Becoming a maintainer](#becoming-a-maintainer)
* [Trademarks](#trademarks)
- [Code of Conduct](#code-of-conduct)
- [Contributing](#contributing)
- [Reporting bugs](#reporting-bugs)
- [Reporting security issues](#reporting-security-issues)
- [Asking questions](#asking-questions)
- [Setting up your local environment and developing](#setting-up-your-local-environment-and-developing)
- [Places to start](#places-to-start)
- [Setting up your local environment and developing](#setting-up-your-local-environment-and-developing)
- [License terms for contributions](#license-terms-for-contributions)
- [Becoming a maintainer](#becoming-a-maintainer)
- [Trademarks](#trademarks)
# Code of Conduct
@@ -28,10 +28,10 @@ Bugs are tracked on the [project issues page](https://github.com/pyscript/pyscri
## Creating useful issues
* Use a clear and descriptive title.
* Describe the specific steps that reproduce the problem with as many details as possible so that someone can verify the issue.
* Describe the behavior you observed, and the behavior you had expected.
* Include screenshots if they help make the issue clear.
- Use a clear and descriptive title.
- Describe the specific steps that reproduce the problem with as many details as possible so that someone can verify the issue.
- Describe the behavior you observed, and the behavior you had expected.
- Include screenshots if they help make the issue clear.
## Reporting security issues
@@ -45,10 +45,10 @@ If you have questions about the project, using PyScript, or anything else, pleas
If you would like to contribute to PyScript, but you aren't sure where to begin, here are some suggestions.
* **Read over the existing documentation.** Are there things missing, or could they be clearer? Make some changes/additions to those documents.
* **Review the open issues.** Are they clear? Can you reproduce them? You can add comments, clarifications, or additions to those issues. If you think you have an idea of how to address the issue, submit a fix!
* **Look over the open pull requests.** Do you have comments or suggestions for the proposed changes? Add them.
* **Check out the examples.** Is there a use case that would be good to have sample code for? Create an example for it.
- **Read over the existing documentation.** Are there things missing, or could they be clearer? Make some changes/additions to those documents.
- **Review the open issues.** Are they clear? Can you reproduce them? You can add comments, clarifications, or additions to those issues. If you think you have an idea of how to address the issue, submit a fix!
- **Look over the open pull requests.** Do you have comments or suggestions for the proposed changes? Add them.
- **Check out the examples.** Is there a use case that would be good to have sample code for? Create an example for it.
## Setting up your local environment and developing
@@ -69,5 +69,6 @@ Contributors are invited to be maintainers of the project by demonstrating good
The Project abides by the Organization's [trademark policy](https://github.com/pyscript/governance/blob/main/TRADEMARKS.md).
---
Part of MVG-0.1-beta.
Made with love by GitHub. Licensed under the [CC-BY 4.0 License](https://creativecommons.org/licenses/by-sa/4.0/).

1
GOVERNANCE.md
View File

@@ -41,5 +41,6 @@ Any names, trademarks, logos, or goodwill developed by and associated with the P
Amendments to this governance policy may be made by affirmative vote of 2/3 of all Maintainers, with approval by the Organization's Steering Committee.
---
Part of MVG-0.1-beta.
Made with love by GitHub. Licensed under the [CC-BY 4.0 License](https://creativecommons.org/licenses/by-sa/4.0/).

2
MAINTAINERS.md
View File

@@ -17,7 +17,7 @@ This document lists the Maintainers of the Project. Maintainers may be added onc
| Paul Everitt | --- |
| Fabio Rosado | --- |
______________________________________________________________________
---
Part of MVG-0.1-beta.
Made with love by GitHub. Licensed under the [CC-BY 4.0 License](https://creativecommons.org/licenses/by-sa/4.0/).

23
README.md
View File

@@ -11,21 +11,24 @@ To get started see the [getting started tutorial](docs/tutorials/getting-started
For examples see [here](examples).
### Longer Version
PyScript is a meta project that aims to combine multiple open technologies into a framework that allows users to create sophisticated browser applications with Python. It integrates seamlessly with the way the DOM works in the browser and allows users to add Python logic in a way that feels natural both to web and Python developers.
## Try PyScript
To try PyScript, import the appropriate pyscript files into the ```<head>``` tag of your html page with:
To try PyScript, import the appropriate pyscript files into the `<head>` tag of your html page with:
```html
<head>
<link rel="stylesheet" href="https://pyscript.net/latest/pyscript.css" />
<script defer src="https://pyscript.net/latest/pyscript.js"></script>
</head>
```
You can then use PyScript components in your html page. PyScript currently implements the following elements:
* `<py-script>`: can be used to define python code that is executable within the web page. The element itself is not rendered to the page and is only used to add logic
* `<py-repl>`: creates a REPL component that is rendered to the page as a code editor and allows users to write executable code
- `<py-script>`: can be used to define python code that is executable within the web page. The element itself is not rendered to the page and is only used to add logic
- `<py-repl>`: creates a REPL component that is rendered to the page as a code editor and allows users to write executable code
Check out the [the examples directory](examples) folder for more examples on how to use it, all you need to do is open them in Chrome.
@@ -37,16 +40,16 @@ Check out the [developing process](https://docs.pyscript.net/latest/development/
## Resources
* [Official docs](https://docs.pyscript.net)
* [Discussion board](https://community.anaconda.cloud/c/tech-topics/pyscript)
* [Home Page](https://pyscript.net/)
* [Blog Post](https://engineering.anaconda.com/2022/04/welcome-pyscript.html)
* [Discord Channel](https://discord.gg/BYB2kvyFwm)
- [Official docs](https://docs.pyscript.net)
- [Discussion board](https://community.anaconda.cloud/c/tech-topics/pyscript)
- [Home Page](https://pyscript.net/)
- [Blog Post](https://engineering.anaconda.com/2022/04/welcome-pyscript.html)
- [Discord Channel](https://discord.gg/BYB2kvyFwm)
## Notes
* This is an extremely experimental project, so expect things to break!
* PyScript has been only tested on Chrome at the moment.
- This is an extremely experimental project, so expect things to break!
- PyScript has been only tested on Chrome at the moment.
## Governance

3
TROUBLESHOOTING.md
View File

@@ -3,7 +3,8 @@
This page is meant for troubleshooting common problems with PyScript.
## Table of contents:
* [Make Setup](#make-setup)
- [Make Setup](#make-setup)
## Make setup

10
examples/altair.html
View File

@@ -1,19 +1,19 @@
<html>
<head>
<title>Altair</title>
<meta charset="utf-8">
<link rel="icon" type="image/x-icon" href="./favicon.png">
<meta charset="utf-8" />
<link rel="icon" type="image/x-icon" href="./favicon.png" />
<link rel="stylesheet" href="https://pyscript.net/latest/pyscript.css" />
<link rel="stylesheet" href="./assets/css/examples.css" />
<script defer src="https://pyscript.net/latest/pyscript.js"></script>
</head>
<body>
<nav class="navbar" style="background-color: #000000;">
<nav class="navbar" style="background-color: #000000">
<div class="app-header">
<a href="/">
<img src="./logo.png" class="logo">
<img src="./logo.png" class="logo" />
</a>
<a class="title" href="" style="color: #f0ab3c;">Altair</a>
<a class="title" href="" style="color: #f0ab3c">Altair</a>
</div>
</nav>
<section class="pyscript">

10
examples/antigravity.html
View File

@@ -1,19 +1,19 @@
<html>
<head>
<title>Antigravity</title>
<meta charset="utf-8">
<link rel="icon" type="image/x-icon" href="./favicon.png">
<meta charset="utf-8" />
<link rel="icon" type="image/x-icon" href="./favicon.png" />
<link rel="stylesheet" href="https://pyscript.net/latest/pyscript.css" />
<link rel="stylesheet" href="./assets/css/examples.css" />
<script defer src="https://pyscript.net/latest/pyscript.js"></script>
</head>
<body>
<nav class="navbar" style="background-color: #000000;">
<nav class="navbar" style="background-color: #000000">
<div class="app-header">
<a href="/">
<img src="./logo.png" class="logo">
<img src="./logo.png" class="logo" />
</a>
<a class="title" href="" style="color: #f0ab3c;">Antigravity</a>
<a class="title" href="" style="color: #f0ab3c">Antigravity</a>
</div>
</nav>
<py-tutor modules="antigravity.py">

5
examples/assets/css/examples.css
View File

@@ -42,14 +42,15 @@ body {
font-size: small;
}
.language-html, .language-python {
.language-html,
.language-python {
float: left;
}
#view-code-button {
writing-mode: tb-rl;
text-orientation: sideways-right;
background-color: #1D1D22;
background-color: #1d1d22;
color: white;
padding: 0.5rem;
border-radius: 5px;

10
examples/assets/css/index.css
View File

@@ -16,9 +16,12 @@
border-radius: 10px;
}
.card:hover, .card:hover a, .card:hover a:visited, .card:hover h2 {
.card:hover,
.card:hover a,
.card:hover a:visited,
.card:hover h2 {
background-color: var(--color-primary);
color: #1D1D22
color: #1d1d22;
}
.card a h2 {
@@ -46,7 +49,8 @@ a .card {
justify-content: space-between;
}
.card-content a, .card-content a:visited {
.card-content a,
.card-content a:visited {
color: var(--color-primary);
}

7
examples/assets/css/main.css
View File

@@ -2,12 +2,13 @@
@import "./variables.css";
@import "./reset.css";
body {
background: #2D2E35 url('https://assets.anaconda.com/production/Content/1650828148240.png?w=3240&auto=compress%2Cformat&fit=crop&dm=1650828161&s=c558dc55e0ed1f8419a892e842a5728f') repeat-x center bottom / 250px;
background: #2d2e35
url("https://assets.anaconda.com/production/Content/1650828148240.png?w=3240&auto=compress%2Cformat&fit=crop&dm=1650828161&s=c558dc55e0ed1f8419a892e842a5728f")
repeat-x center bottom / 250px;
background-attachment: fixed;
overflow-x: hidden;
color: var(--text-color)
color: var(--text-color);
}
.container {

4
examples/assets/css/variables.css
View File

@@ -1,6 +1,6 @@
:root {
--color-primary: #FDA703;
--color-secondary: #1D1D22;
--color-primary: #fda703;
--color-secondary: #1d1d22;
--text-color: white;
--card-shadow: 0px 5px 11px 0px rgb(0 0 0 / 15%);
}

2
examples/await/await0.html
View File

@@ -1,4 +1,4 @@
<!DOCTYPE html>
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8" />

8
examples/await/await1.html
View File

@@ -1,4 +1,4 @@
<!DOCTYPE html>
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8" />
@@ -9,7 +9,8 @@
</head>
<body>
<div>
Pyscript - FIRST ASYNC WITH INVOKED LOOP BLOCKING AWAIT AT SAME LEVEL AS LOOP Pyscript writing to console.log:
Pyscript - FIRST ASYNC WITH INVOKED LOOP BLOCKING AWAIT AT SAME LEVEL AS
LOOP Pyscript writing to console.log:
<py-script>
import js
import asyncio
@@ -23,7 +24,8 @@
</py-script>
</div>
<div>
Pyscript - SECOND ASYNC WITH INVOKED LOOP BLOCKING AWAIT AT SAME LEVEL AS LOOP Pyscript writing to console.log:
Pyscript - SECOND ASYNC WITH INVOKED LOOP BLOCKING AWAIT AT SAME LEVEL AS
LOOP Pyscript writing to console.log:
<py-script>
import js
import asyncio

8
examples/await/await2.html
View File

@@ -1,4 +1,4 @@
<!DOCTYPE html>
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8" />
@@ -9,7 +9,8 @@
</head>
<body>
<div>
Pyscript - FIRST ASYNC WITH INVOKED LOOP BLOCKING AWAIT AT SAME LEVEL AS LOOP Pyscript writing to console.log:
Pyscript - FIRST ASYNC WITH INVOKED LOOP BLOCKING AWAIT AT SAME LEVEL AS
LOOP Pyscript writing to console.log:
<py-script>
import js
import asyncio
@@ -23,7 +24,8 @@
</py-script>
</div>
<div>
Pyscript - SECOND ASYNC WITH TOP-LEVEL LOOP BLOCKING AWAIT AT SAME LEVEL AS LOOP Pyscript writing to console.log:
Pyscript - SECOND ASYNC WITH TOP-LEVEL LOOP BLOCKING AWAIT AT SAME LEVEL
AS LOOP Pyscript writing to console.log:
<py-script>
import js
import asyncio

8
examples/await/await3.html
View File

@@ -1,4 +1,4 @@
<!DOCTYPE html>
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8" />
@@ -9,7 +9,8 @@
</head>
<body>
<div>
Pyscript - FIRST ASYNC WITH NON-BLOCKING AWAIT AT ONE LEVEL LOWER THAN LOOP Pyscript writing to console.log:
Pyscript - FIRST ASYNC WITH NON-BLOCKING AWAIT AT ONE LEVEL LOWER THAN
LOOP Pyscript writing to console.log:
<py-script>
import js
import asyncio
@@ -23,7 +24,8 @@
</py-script>
</div>
<div>
Pyscript - SECOND ASYNC WITH NON-BLOCKING AWAIT AT ONE LEVEL LOWER THAN LOOP Pyscript writing to console.log:
Pyscript - SECOND ASYNC WITH NON-BLOCKING AWAIT AT ONE LEVEL LOWER THAN
LOOP Pyscript writing to console.log:
<py-script>
import js
import asyncio

8
examples/await/await4.html
View File

@@ -1,4 +1,4 @@
<!DOCTYPE html>
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8" />
@@ -9,7 +9,8 @@
</head>
<body>
<div>
Pyscript - FIRST ASYNC WITH TOP-LEVEL LOOP BLOCKING AWAIT AT SAME LEVEL AS LOOP Pyscript writing to console.log:
Pyscript - FIRST ASYNC WITH TOP-LEVEL LOOP BLOCKING AWAIT AT SAME LEVEL AS
LOOP Pyscript writing to console.log:
<py-script>
import js
import asyncio
@@ -20,7 +21,8 @@
</py-script>
</div>
<div>
Pyscript - SECOND ASYNC WITH TOP-LEVEL LOOP BLOCKING AWAIT AT SAME LEVEL AS LOOP Pyscript writing to console.log:
Pyscript - SECOND ASYNC WITH TOP-LEVEL LOOP BLOCKING AWAIT AT SAME LEVEL
AS LOOP Pyscript writing to console.log:
<py-script>
import js
import asyncio

2
examples/await/await5.html
View File

@@ -1,4 +1,4 @@
<!DOCTYPE html>
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8" />

38
examples/bokeh.html
View File

@@ -1,12 +1,28 @@
<html><head>
<html>
<head>
<title>Bokeh Example</title>
<meta charset="iso-8859-1">
<link rel="icon" type="image/x-icon" href="./favicon.png">
<script type="text/javascript" src="https://cdn.bokeh.org/bokeh/release/bokeh-3.0.3.min.js"></script>
<script type="text/javascript" src="https://cdn.bokeh.org/bokeh/release/bokeh-gl-3.0.3.min.js"></script>
<script type="text/javascript" src="https://cdn.bokeh.org/bokeh/release/bokeh-widgets-3.0.3.min.js"></script>
<script type="text/javascript" src="https://cdn.bokeh.org/bokeh/release/bokeh-tables-3.0.3.min.js"></script>
<script type="text/javascript" src="https://cdn.bokeh.org/bokeh/release/bokeh-mathjax-3.0.3.min.js"></script>
<meta charset="iso-8859-1" />
<link rel="icon" type="image/x-icon" href="./favicon.png" />
<script
type="text/javascript"
src="https://cdn.bokeh.org/bokeh/release/bokeh-3.0.3.min.js"
></script>
<script
type="text/javascript"
src="https://cdn.bokeh.org/bokeh/release/bokeh-gl-3.0.3.min.js"
></script>
<script
type="text/javascript"
src="https://cdn.bokeh.org/bokeh/release/bokeh-widgets-3.0.3.min.js"
></script>
<script
type="text/javascript"
src="https://cdn.bokeh.org/bokeh/release/bokeh-tables-3.0.3.min.js"
></script>
<script
type="text/javascript"
src="https://cdn.bokeh.org/bokeh/release/bokeh-mathjax-3.0.3.min.js"
></script>
<script type="text/javascript">
Bokeh.set_log_level("info");
@@ -17,12 +33,12 @@
<link rel="stylesheet" href="./assets/css/examples.css" />
</head>
<body>
<nav class="navbar" style="background-color: #000000;">
<nav class="navbar" style="background-color: #000000">
<div class="app-header">
<a href="/">
<img src="./logo.png" class="logo">
<img src="./logo.png" class="logo" />
</a>
<a class="title" href="" style="color: #f0ab3c;">Bokeh Example</a>
<a class="title" href="" style="color: #f0ab3c">Bokeh Example</a>
</div>
</nav>
<py-tutor>

38
examples/bokeh_interactive.html
View File

@@ -1,12 +1,28 @@
<html><head>
<html>
<head>
<title>Bokeh Example</title>
<meta charset="iso-8859-1">
<link rel="icon" type="image/x-icon" href="./favicon.png">
<script type="text/javascript" src="https://cdn.bokeh.org/bokeh/release/bokeh-2.4.3.js"></script>
<script type="text/javascript" src="https://cdn.bokeh.org/bokeh/release/bokeh-gl-2.4.3.min.js"></script>
<script type="text/javascript" src="https://cdn.bokeh.org/bokeh/release/bokeh-widgets-2.4.3.min.js"></script>
<script type="text/javascript" src="https://cdn.bokeh.org/bokeh/release/bokeh-tables-2.4.3.min.js"></script>
<script type="text/javascript" src="https://cdn.bokeh.org/bokeh/release/bokeh-mathjax-2.4.3.min.js"></script>
<meta charset="iso-8859-1" />
<link rel="icon" type="image/x-icon" href="./favicon.png" />
<script
type="text/javascript"
src="https://cdn.bokeh.org/bokeh/release/bokeh-2.4.3.js"
></script>
<script
type="text/javascript"
src="https://cdn.bokeh.org/bokeh/release/bokeh-gl-2.4.3.min.js"
></script>
<script
type="text/javascript"
src="https://cdn.bokeh.org/bokeh/release/bokeh-widgets-2.4.3.min.js"
></script>
<script
type="text/javascript"
src="https://cdn.bokeh.org/bokeh/release/bokeh-tables-2.4.3.min.js"
></script>
<script
type="text/javascript"
src="https://cdn.bokeh.org/bokeh/release/bokeh-mathjax-2.4.3.min.js"
></script>
<link rel="stylesheet" href="./assets/css/examples.css" />
<script type="text/javascript">
@@ -17,12 +33,12 @@
<script defer src="https://pyscript.net/latest/pyscript.js"></script>
</head>
<body>
<nav class="navbar" style="background-color: #000000;">
<nav class="navbar" style="background-color: #000000">
<div class="app-header">
<a href="/">
<img src="./logo.png" class="logo">
<img src="./logo.png" class="logo" />
</a>
<a class="title" href="" style="color: #f0ab3c;">Bokeh Example</a>
<a class="title" href="" style="color: #f0ab3c">Bokeh Example</a>
</div>
</nav>
<py-tutor>

60
examples/d3.html
View File

@@ -1,8 +1,8 @@
<html>
<head>
<title>d3: JavaScript & PyScript visualizations side-by-side</title>
<meta charset="utf-8">
<link rel="icon" type="image/x-icon" href="./favicon.png">
<meta charset="utf-8" />
<link rel="icon" type="image/x-icon" href="./favicon.png" />
<link rel="stylesheet" href="https://pyscript.net/latest/pyscript.css" />
<script defer src="https://pyscript.net/latest/pyscript.js"></script>
@@ -25,15 +25,16 @@
}
}
</style>
</head>
<body>
<nav class="navbar" style="background-color: #000000;">
<nav class="navbar" style="background-color: #000000">
<div class="app-header">
<a href="/">
<img src="./logo.png" class="logo">
<img src="./logo.png" class="logo" />
</a>
<a class="title" href="" style="color: #f0ab3c;">Simple d3 visualization</a>
<a class="title" href="" style="color: #f0ab3c"
>Simple d3 visualization</a
>
</div>
</nav>
@@ -48,7 +49,14 @@
</py-config>
</py-tutor>
<b>
Based on <i><a href="https://observablehq.com/@d3/learn-d3-shapes?collection=@d3/learn-d3>">Learn D3: Shapes</a></i> tutorial.
Based on
<i
><a
href="https://observablehq.com/@d3/learn-d3-shapes?collection=@d3/learn-d3>"
>Learn D3: Shapes</a
></i
>
tutorial.
</b>
<div style="display: flex; flex-direction: row">
<div>
@@ -68,7 +76,6 @@
</section>
<script type="module">
const fruits = [
{ name: "🍊", count: 21 },
{ name: "🍇", count: 13 },
@@ -78,46 +85,49 @@
{ name: "🍋", count: 2 },
{ name: "🍎", count: 1 },
{ name: "🍉", count: 1 },
]
];
const fn = (d) => d.count
const data = d3.pie().value(fn)(fruits)
const fn = (d) => d.count;
const data = d3.pie().value(fn)(fruits);
const arc = d3.arc()
const arc = d3
.arc()
.innerRadius(210)
.outerRadius(310)
.padRadius(300)
.padAngle(2 / 300)
.cornerRadius(8)
.cornerRadius(8);
const js = d3.select("#js")
js.select(".loading").remove()
const js = d3.select("#js");
js.select(".loading").remove();
const svg = js
.append("svg")
.attr("viewBox", "-320 -320 640 640")
.attr("width", "400")
.attr("height", "400")
.attr("height", "400");
for (const d of data) {
svg.append("path")
.style("fill", "steelblue")
.attr("d", arc(d))
svg.append("path").style("fill", "steelblue").attr("d", arc(d));
const text = svg.append("text")
const text = svg
.append("text")
.style("fill", "white")
.attr("transform", `translate(${arc.centroid(d).join(",")})`)
.attr("text-anchor", "middle")
.attr("text-anchor", "middle");
text.append("tspan")
text
.append("tspan")
.style("font-size", "24")
.attr("x", "0").text(d.data.name)
.attr("x", "0")
.text(d.data.name);
text.append("tspan")
text
.append("tspan")
.style("font-size", "18")
.attr("x", "0")
.attr("dy", "1.3em")
.text(d.value)
.text(d.value);
}
</script>
</body>

11
examples/folium.html
View File

@@ -1,19 +1,19 @@
<html>
<head>
<title>Folium</title>
<meta charset="utf-8">
<link rel="icon" type="image/x-icon" href="./favicon.png">
<meta charset="utf-8" />
<link rel="icon" type="image/x-icon" href="./favicon.png" />
<link rel="stylesheet" href="https://pyscript.net/latest/pyscript.css" />
<script defer src="https://pyscript.net/latest/pyscript.js"></script>
<link rel="stylesheet" href="./assets/css/examples.css" />
</head>
<body>
<nav class="navbar" style="background-color: #000000;">
<nav class="navbar" style="background-color: #000000">
<div class="app-header">
<a href="/">
<img src="./logo.png" class="logo">
<img src="./logo.png" class="logo" />
</a>
<a class="title" href="" style="color: #f0ab3c;">Folium</a>
<a class="title" href="" style="color: #f0ab3c">Folium</a>
</div>
</nav>
<section class="pyscript">
@@ -63,7 +63,6 @@ folium.LayerControl().add_to(m)
display(m, target="folium")
</py-script>
</py-tutor>
</section>
</body>

10
examples/hello_world.html
View File

@@ -1,4 +1,4 @@
<!DOCTYPE html>
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8" />
@@ -13,12 +13,12 @@
</head>
<body>
<nav class="navbar" style="background-color: #000000;">
<nav class="navbar" style="background-color: #000000">
<div class="app-header">
<a href="/">
<img src="./logo.png" class="logo">
<img src="./logo.png" class="logo" />
</a>
<a class="title" href="" style="color: #f0ab3c;">Hello World</a>
<a class="title" href="" style="color: #f0ab3c">Hello World</a>
</div>
</nav>
@@ -30,7 +30,7 @@
</py-config>
<section class="pyscript">
Hello world! <br>
Hello world! <br />
This is the current date and time, as computed by Python:
<py-script>
from datetime import datetime

91
examples/index.html
View File

@@ -1,4 +1,4 @@
<!DOCTYPE html>
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8" />
@@ -19,9 +19,7 @@
<a href="./hello_world.html" target="_blank">
<h2>Hello world</h2>
</a>
<p>
A static demo of the <code>&lt;py-script&gt;</code> tag
</p>
<p>A static demo of the <code>&lt;py-script&gt;</code> tag</p>
</div>
</div>
@@ -30,9 +28,7 @@
<a href="./simple_clock.html" target="_blank">
<h2>Simple clock</h2>
</a>
<p>
A dynamic demo of the <code>&lt;py-script&gt;</code> tag
</p>
<p>A dynamic demo of the <code>&lt;py-script&gt;</code> tag</p>
</div>
</div>
@@ -41,9 +37,7 @@
<a href="./repl.html" target="_blank">
<h2>REPL</h2>
</a>
<p>
A Python REPL (Read Eval Print Loop)
</p>
<p>A Python REPL (Read Eval Print Loop)</p>
</div>
</div>
@@ -53,7 +47,8 @@
<h2>REPL2</h2>
</a>
<p>
A Python REPL (Read Eval Print Loop) with slightly better formatting
A Python REPL (Read Eval Print Loop) with slightly better
formatting
</p>
</div>
</div>
@@ -63,9 +58,7 @@
<a href="./todo.html" target="_blank">
<h2>TODO App</h2>
</a>
<p>
Simple TODO App
</p>
<p>Simple TODO App</p>
</div>
</div>
@@ -74,9 +67,7 @@
<a href="./todo-pylist.html" target="_blank">
<h2>PyScript Native TODO App</h2>
</a>
<p>
Simple TODO App using <code>&lt;py-list&gt;</code>
</p>
<p>Simple TODO App using <code>&lt;py-list&gt;</code></p>
</div>
</div>
</div>
@@ -91,7 +82,9 @@
<h2>Matplotlib</h2>
</a>
<p>
Demonstrates rendering a <a href="https://matplotlib.org/" target="_blank">Matplotlib</a> figure as output of the py-script tag
Demonstrates rendering a
<a href="https://matplotlib.org/" target="_blank">Matplotlib</a>
figure as output of the py-script tag
</p>
</div>
</div>
@@ -99,12 +92,12 @@
<div class="card">
<div class="card-content">
<a href="./altair.html" target="_blank">
<h2>
Altair
</h2>
<h2>Altair</h2>
</a>
<p>
Demonstrates rendering a <a href="https://altair-viz.github.io/" target="_blank">Altair</a> plot as output of the py-script tag
Demonstrates rendering a
<a href="https://altair-viz.github.io/" target="_blank">Altair</a>
plot as output of the py-script tag
</p>
</div>
</div>
@@ -112,13 +105,15 @@
<div class="card">
<div class="card-content">
<a href="./folium.html" target="_blank">
<h2>
Folium
</h2>
<h2>Folium</h2>
</a>
<p>
Demonstrates rendering a
<a href="https://python-visualization.github.io/folium/" target="_blank">Folium</a>
<a
href="https://python-visualization.github.io/folium/"
target="_blank"
>Folium</a
>
map as output of the py-script tag
</p>
</div>
@@ -132,9 +127,7 @@
<div class="card">
<div class="card-content">
<a href="./d3.html" target="_blank">
<h2>
Simple d3 visualization
</h2>
<h2>Simple d3 visualization</h2>
</a>
<p>
Minimal <a href="https://d3js.org/" target="_blank">D3</a>
@@ -146,12 +139,15 @@
<div class="card">
<div class="card-content">
<a href="./webgl/raycaster/index.html" target="_blank">
<h2>
Webgl Icosahedron Example
</h2>
<h2>Webgl Icosahedron Example</h2>
</a>
<p>
Demo showing how a Simple <a href="https://developer.mozilla.org/en-US/docs/Web/API/WebGL_API" target="_blank">WebGL</a>
Demo showing how a Simple
<a
href="https://developer.mozilla.org/en-US/docs/Web/API/WebGL_API"
target="_blank"
>WebGL</a
>
scene would work in the <code>&lt;py-script&gt;</code> tag
</p>
</div>
@@ -165,9 +161,7 @@
<div class="card">
<div class="card-content">
<a href="./bokeh.html" target="_blank">
<h2>
Simple Static Bokeh Plot
</h2>
<h2>Simple Static Bokeh Plot</h2>
</a>
<p>
Minimal Bokeh demo demonstrating how to create a simple
@@ -187,8 +181,8 @@
<p>
Interactive demo using a
<a href="https://bokeh.org/" target="_blank">Bokeh</a>
slider widget to dynamically change a value in the page
WARNING: This examples takes a little longer to load. So be patient :)
slider widget to dynamically change a value in the page WARNING:
This examples takes a little longer to load. So be patient :)
</p>
</div>
</div>
@@ -203,7 +197,8 @@
<p>
Interactive KMeans Chart using
<a href="https://panel.holoviz.org/" target="_blank">Panel</a>
WARNING: This examples takes a little longer to load. So be patient :)
WARNING: This examples takes a little longer to load. So be
patient :)
</p>
</div>
</div>
@@ -218,7 +213,8 @@
<p>
Interactive Streaming Table and Bokeh plot using
<a href="https://panel.holoviz.org/" target="_blank">Panel</a>
WARNING: This examples takes a little longer to load. So be patient :)
WARNING: This examples takes a little longer to load. So be
patient :)
</p>
</div>
</div>
@@ -233,8 +229,8 @@
<p>
Simple demo showing
<a href="https://panel.holoviz.org/" target="_blank">Panel</a>
widgets interacting with parts of the page
WARNING: This examples takes a little longer to load. So be patient :)
widgets interacting with parts of the page WARNING: This examples
takes a little longer to load. So be patient :)
</p>
</div>
</div>
@@ -248,8 +244,10 @@
</a>
<p>
Interactive application exploring the NYC Taxi dataset using
<a href="https://panel.holoviz.org/" target="_blank">Panel</a> and <a href="https://deck.gl/" target="_blank">DeckGL</a>
WARNING: This examples takes a little longer to load. So be patient :)
<a href="https://panel.holoviz.org/" target="_blank">Panel</a> and
<a href="https://deck.gl/" target="_blank">DeckGL</a>
WARNING: This examples takes a little longer to load. So be
patient :)
</p>
</div>
</div>
@@ -264,7 +262,10 @@
<p>
Visualization of Mandelbrot and Julia sets with
<a href="https://numpy.org/" target="_blank">Numpy</a> and
<a href="https://developer.mozilla.org/en-US/docs/Web/API/Canvas_API" target="_blank">
<a
href="https://developer.mozilla.org/en-US/docs/Web/API/Canvas_API"
target="_blank"
>
HTML5 canvas
</a>
</p>

5
examples/mario/css/game.css
View File

@@ -1,4 +1,7 @@
html, body, ul, li {
html,
body,
ul,
li {
margin: 0;
border: 0;
padding: 0;

16
examples/mario/js/bcoin.js
View File

@@ -1,14 +1,13 @@
(function () {
if (typeof Mario === 'undefined')
window.Mario = {};
if (typeof Mario === "undefined") window.Mario = {};
var Bcoin = Mario.Bcoin = function(pos) {
var Bcoin = (Mario.Bcoin = function (pos) {
Mario.Entity.call(this, {
pos: pos,
sprite: level.bcoinSprite(),
hitbox: [0,0,16,16]
hitbox: [0, 0, 16, 16],
});
});
}
Mario.Util.inherits(Bcoin, Mario.Entity);
@@ -23,7 +22,7 @@
this.active = true;
this.vel = -12;
this.targetpos = this.pos[1] - 32;
}
};
Bcoin.prototype.update = function (dt) {
if (!this.active) return;
@@ -38,8 +37,7 @@
this.vel += this.acc;
this.pos[1] += this.vel;
this.sprite.update(dt);
}
Bcoin.prototype.checkCollisions = function() {;}
};
Bcoin.prototype.checkCollisions = function () {};
})();

24
examples/mario/js/block.js
View File

@@ -1,11 +1,10 @@
(function () {
if (typeof Mario === 'undefined')
window.Mario = {};
if (typeof Mario === "undefined") window.Mario = {};
//TODO: clean up the logic for sprite switching.
//TODO: There's a weird bug with the collision logic. Look into it.
var Block = Mario.Block = function(options) {
var Block = (Mario.Block = function (options) {
this.item = options.item;
this.usedSprite = options.usedSprite;
this.bounceSprite = options.bounceSprite;
@@ -14,20 +13,21 @@
Mario.Entity.call(this, {
pos: options.pos,
sprite: options.sprite,
hitbox: [0,0,16,16]
hitbox: [0, 0, 16, 16],
});
this.standing = true;
}
});
Mario.Util.inherits(Block, Mario.Floor);
Block.prototype.break = function () {
sounds.breakBlock.play();
(new Mario.Rubble()).spawn(this.pos);
var x = this.pos[0] / 16, y = this.pos[1] / 16;
new Mario.Rubble().spawn(this.pos);
var x = this.pos[0] / 16,
y = this.pos[1] / 16;
delete level.blocks[y][x];
}
};
Block.prototype.bonk = function (power) {
sounds.bump.play();
@@ -51,7 +51,7 @@
this.vel[1] = -2;
}
}
};
Block.prototype.update = function (dt, gameTime) {
if (!this.standing) {
@@ -68,7 +68,8 @@
}
} else {
if (this.sprite === this.usedSprite) {
var x = this.pos[0] / 16, y = this.pos[1] / 16;
var x = this.pos[0] / 16,
y = this.pos[1] / 16;
level.statics[y][x] = new Mario.Floor(this.pos, this.usedSprite);
delete level.blocks[y][x];
}
@@ -76,6 +77,5 @@
this.pos[1] += this.vel[1];
this.sprite.update(dt, gameTime);
}
};
})();

42
examples/mario/js/coin.js
View File

@@ -1,47 +1,59 @@
(function () {
if (typeof Mario === 'undefined')
window.Mario = {};
if (typeof Mario === "undefined") window.Mario = {};
var Coin = Mario.Coin = function(pos, sprite) {
var Coin = (Mario.Coin = function (pos, sprite) {
Mario.Entity.call(this, {
pos: pos,
sprite: sprite,
hitbox: [0,0,16,16]
hitbox: [0, 0, 16, 16],
});
this.idx = level.items.length;
});
this.idx = level.items.length
}
Mario.Util.inherits(Coin, Mario.Entity);
Coin.prototype.isPlayerCollided = function () {
//the first two elements of the hitbox array are an offset, so let's do this now.
var hpos1 = [this.pos[0] + this.hitbox[0], this.pos[1] + this.hitbox[1]];
var hpos2 = [player.pos[0] + player.hitbox[0], player.pos[1] + player.hitbox[1]];
var hpos2 = [
player.pos[0] + player.hitbox[0],
player.pos[1] + player.hitbox[1],
];
//if the hitboxes actually overlap
if (!(hpos1[0] > hpos2[0]+player.hitbox[2] || (hpos1[0]+this.hitbox[2] < hpos2[0]))) {
if (!(hpos1[1] > hpos2[1]+player.hitbox[3] || (hpos1[1]+this.hitbox[3] < hpos2[1]))) {
if (
!(
hpos1[0] > hpos2[0] + player.hitbox[2] ||
hpos1[0] + this.hitbox[2] < hpos2[0]
)
) {
if (
!(
hpos1[1] > hpos2[1] + player.hitbox[3] ||
hpos1[1] + this.hitbox[3] < hpos2[1]
)
) {
this.collect();
}
}
}
};
Coin.prototype.render = function (ctx, vX, vY) {
this.sprite.render(ctx, this.pos[0], this.pos[1], vX, vY);
}
};
//money is not affected by gravity, you see.
Coin.prototype.update = function (dt) {
this.sprite.update(dt);
}
};
Coin.prototype.checkCollisions = function () {
this.isPlayerCollided();
}
};
Coin.prototype.collect = function () {
sounds.coin.currentTime = 0.05;
sounds.coin.play();
player.coins += 1;
delete level.items[this.idx]
}
delete level.items[this.idx];
};
})();

18
examples/mario/js/entity.js
View File

@@ -1,8 +1,7 @@
(function () {
if (typeof Mario === 'undefined')
window.Mario = {};
if (typeof Mario === "undefined") window.Mario = {};
var Entity = Mario.Entity = function(options) {
var Entity = (Mario.Entity = function (options) {
this.vel = [0, 0];
this.acc = [0, 0];
this.standing = true;
@@ -10,11 +9,11 @@
this.sprite = options.sprite;
this.hitbox = options.hitbox;
this.left = false;
}
});
Entity.prototype.render = function (ctx, vX, vY) {
this.sprite.render(ctx, this.pos[0], this.pos[1], vX, vY)
}
this.sprite.render(ctx, this.pos[0], this.pos[1], vX, vY);
};
Entity.prototype.collideWall = function (wall) {
//the wall will always be a 16x16 block with hitbox = [0,0,16,16].
@@ -24,11 +23,12 @@
this.vel[0] = Math.max(0, this.vel[0]);
this.acc[0] = Math.max(0, this.acc[0]);
} else {
this.pos[0] = wall.pos[0] + wall.hitbox[0] - this.hitbox[2] - this.hitbox[0];
this.pos[0] =
wall.pos[0] + wall.hitbox[0] - this.hitbox[2] - this.hitbox[0];
this.vel[0] = Math.min(0, this.vel[0]);
this.acc[0] = Math.min(0, this.acc[0]);
}
}
};
Entity.prototype.bump = function() {;}
Entity.prototype.bump = function () {};
})();

48
examples/mario/js/fireball.js
View File

@@ -1,17 +1,22 @@
(function () {
if (typeof Mario === 'undefined')
window.Mario = {};
if (typeof Mario === "undefined") window.Mario = {};
var Fireball = Mario.Fireball = function(pos) {
var Fireball = (Mario.Fireball = function (pos) {
this.hit = 0;
this.standing = false;
Mario.Entity.call(this, {
pos: pos,
sprite: new Mario.Sprite('sprites/items.png', [96, 144], [8,8], 5, [0,1,2,3]),
hitbox: [0,0,8,8]
sprite: new Mario.Sprite(
"sprites/items.png",
[96, 144],
[8, 8],
5,
[0, 1, 2, 3],
),
hitbox: [0, 0, 8, 8],
});
});
}
Mario.Util.inherits(Fireball, Mario.Entity);
@@ -25,14 +30,14 @@
this.idx = 0;
fireballs[0] = this;
}
this.vel[0] = (left ? -5 : 5);
this.vel[0] = left ? -5 : 5;
this.standing = false;
this.vel[1] = 0;
}
};
Fireball.prototype.render = function (ctx, vX, vY) {
this.sprite.render(ctx, this.pos[0], this.pos[1], vX, vY);
}
};
Fireball.prototype.update = function (dt) {
if (this.hit == 1) {
@@ -67,11 +72,11 @@
this.hit = 1;
}
this.sprite.update(dt);
}
};
Fireball.prototype.collideWall = function () {
if (!this.hit) this.hit = 1;
}
};
Fireball.prototype.checkCollisions = function () {
if (this.hit) return;
@@ -100,13 +105,14 @@
var that = this;
level.enemies.forEach(function (enemy) {
if (enemy.flipping || enemy.pos[0] - vX > 336){ //stop checking once we get to far away dudes.
if (enemy.flipping || enemy.pos[0] - vX > 336) {
//stop checking once we get to far away dudes.
return;
} else {
that.isCollideWith(enemy);
}
});
}
};
Fireball.prototype.isCollideWith = function (ent) {
//the first two elements of the hitbox array are an offset, so let's do this now.
@@ -114,13 +120,23 @@
var hpos2 = [ent.pos[0] + ent.hitbox[0], ent.pos[1] + ent.hitbox[1]];
//if the hitboxes actually overlap
if (!(hpos1[0] > hpos2[0]+ent.hitbox[2] || (hpos1[0]+this.hitbox[2] < hpos2[0]))) {
if (!(hpos1[1] > hpos2[1]+ent.hitbox[3] || (hpos1[1]+this.hitbox[3] < hpos2[1]))) {
if (
!(
hpos1[0] > hpos2[0] + ent.hitbox[2] ||
hpos1[0] + this.hitbox[2] < hpos2[0]
)
) {
if (
!(
hpos1[1] > hpos2[1] + ent.hitbox[3] ||
hpos1[1] + this.hitbox[3] < hpos2[1]
)
) {
this.hit = 1;
ent.bump();
}
}
};
Fireball.prototype.bump = function() {;}
Fireball.prototype.bump = function () {};
})();

47
examples/mario/js/fireflower.js
View File

@@ -1,24 +1,23 @@
(function () {
if (typeof Mario === 'undefined')
window.Mario = {};
if (typeof Mario === "undefined") window.Mario = {};
var Fireflower = Mario.Fireflower = function(pos) {
var Fireflower = (Mario.Fireflower = function (pos) {
this.spawning = false;
this.waiting = 0;
Mario.Entity.call(this, {
pos: pos,
sprite: level.fireFlowerSprite,
hitbox: [0,0,16,16]
hitbox: [0, 0, 16, 16],
});
});
}
Mario.Util.inherits(Fireflower, Mario.Entity);
Fireflower.prototype.render = function (ctx, vX, vY) {
if (this.spawning > 1) return;
this.sprite.render(ctx, this.pos[0], this.pos[1], vX, vY);
}
};
Fireflower.prototype.spawn = function () {
sounds.itemAppear.play();
@@ -28,12 +27,12 @@
this.targetpos = [];
this.targetpos[0] = this.pos[0];
this.targetpos[1] = this.pos[1] - 16;
}
};
Fireflower.prototype.update = function (dt) {
if (this.spawning > 1) {
this.spawning -= 1;
if (this.spawning == 1) this.vel[1] = -.5;
if (this.spawning == 1) this.vel[1] = -0.5;
return;
}
if (this.spawning) {
@@ -48,27 +47,41 @@
this.pos[0] += this.vel[0];
this.pos[1] += this.vel[1];
this.sprite.update(dt);
}
};
Fireflower.prototype.checkCollisions = function () {
if (this.spawning) {return;}
this.isPlayerCollided();
if (this.spawning) {
return;
}
this.isPlayerCollided();
};
Fireflower.prototype.isPlayerCollided = function () {
//the first two elements of the hitbox array are an offset, so let's do this now.
var hpos1 = [this.pos[0] + this.hitbox[0], this.pos[1] + this.hitbox[1]];
var hpos2 = [player.pos[0] + player.hitbox[0], player.pos[1] + player.hitbox[1]];
var hpos2 = [
player.pos[0] + player.hitbox[0],
player.pos[1] + player.hitbox[1],
];
//if the hitboxes actually overlap
if (!(hpos1[0] > hpos2[0]+player.hitbox[2] || (hpos1[0]+this.hitbox[2] < hpos2[0]))) {
if (!(hpos1[1] > hpos2[1]+player.hitbox[3] || (hpos1[1]+this.hitbox[3] < hpos2[1]))) {
if (
!(
hpos1[0] > hpos2[0] + player.hitbox[2] ||
hpos1[0] + this.hitbox[2] < hpos2[0]
)
) {
if (
!(
hpos1[1] > hpos2[1] + player.hitbox[3] ||
hpos1[1] + this.hitbox[3] < hpos2[1]
)
) {
player.powerUp(this.idx);
}
}
}
};
//This should never be called, but just in case.
Fireflower.prototype.bump = function() {;}
Fireflower.prototype.bump = function () {};
})();

16
examples/mario/js/flag.js
View File

@@ -1,6 +1,5 @@
(function () {
if (typeof Mario === 'undefined')
window.Mario = {};
if (typeof Mario === "undefined") window.Mario = {};
Flag = Mario.Flag = function (pos) {
//afaik flags always have the same height and Y-position
@@ -8,10 +7,9 @@
this.hitbox = [0, 0, 0, 0];
this.vel = [0, 0];
this.acc = [0, 0];
}
};
Flag.prototype.collideWall = function() {;
}
Flag.prototype.collideWall = function () {};
Flag.prototype.update = function (dt) {
if (!this.done && this.pos[1] >= 170) {
@@ -21,11 +19,11 @@
this.done = true;
}
this.pos[1] += this.vel[1];
}
};
Flag.prototype.checkCollisions = function () {
this.isPlayerCollided();
}
};
Flag.prototype.isPlayerCollided = function () {
if (this.hit) return;
@@ -39,9 +37,9 @@
player.flag();
this.vel = [0, 2];
}
}
};
Flag.prototype.render = function () {
level.flagpoleSprites[2].render(ctx, this.pos[0] - 8, this.pos[1], vX, vY);
}
};
})();

49
examples/mario/js/floor.js
View File

@@ -1,41 +1,60 @@
(function () {
if (typeof Mario === 'undefined')
window.Mario = {};
var Floor = Mario.Floor = function(pos, sprite) {
if (typeof Mario === "undefined") window.Mario = {};
var Floor = (Mario.Floor = function (pos, sprite) {
Mario.Entity.call(this, {
pos: pos,
sprite: sprite,
hitbox: [0,0,16,16]
hitbox: [0, 0, 16, 16],
});
});
}
Mario.Util.inherits(Floor, Mario.Entity);
Floor.prototype.isCollideWith = function (ent) {
//the first two elements of the hitbox array are an offset, so let's do this now.
var hpos1 = [Math.floor(this.pos[0] + this.hitbox[0]), Math.floor(this.pos[1] + this.hitbox[1])];
var hpos2 = [Math.floor(ent.pos[0] + ent.hitbox[0]), Math.floor(ent.pos[1] + ent.hitbox[1])];
var hpos1 = [
Math.floor(this.pos[0] + this.hitbox[0]),
Math.floor(this.pos[1] + this.hitbox[1]),
];
var hpos2 = [
Math.floor(ent.pos[0] + ent.hitbox[0]),
Math.floor(ent.pos[1] + ent.hitbox[1]),
];
//if the hitboxes actually overlap
if (!(hpos1[0] > hpos2[0]+ent.hitbox[2] || (hpos1[0]+this.hitbox[2] < hpos2[0]))) {
if (!(hpos1[1] > hpos2[1]+ent.hitbox[3] || (hpos1[1]+this.hitbox[3] < hpos2[1]))) {
if (
!(
hpos1[0] > hpos2[0] + ent.hitbox[2] ||
hpos1[0] + this.hitbox[2] < hpos2[0]
)
) {
if (
!(
hpos1[1] > hpos2[1] + ent.hitbox[3] ||
hpos1[1] + this.hitbox[3] < hpos2[1]
)
) {
if (!this.standing) {
ent.bump();
} else {
//if the entity is over the block, it's basically floor
var center = hpos2[0] + ent.hitbox[2] / 2;
if (Math.abs(hpos2[1] + ent.hitbox[3] - hpos1[1]) <= ent.vel[1]) {
if (level.statics[(this.pos[1] / 16) - 1][this.pos[0] / 16]) {return};
if (level.statics[this.pos[1] / 16 - 1][this.pos[0] / 16]) {
return;
}
ent.vel[1] = 0;
ent.pos[1] = hpos1[1] - ent.hitbox[3] - ent.hitbox[1];
ent.standing = true;
if (ent instanceof Mario.Player) {
ent.jumping = 0;
}
} else if (Math.abs(hpos2[1] - hpos1[1] - this.hitbox[3]) > ent.vel[1] &&
center + 2 >= hpos1[0] && center - 2 <= hpos1[0] + this.hitbox[2]) {
} else if (
Math.abs(hpos2[1] - hpos1[1] - this.hitbox[3]) > ent.vel[1] &&
center + 2 >= hpos1[0] &&
center - 2 <= hpos1[0] + this.hitbox[2]
) {
//ent is under the block.
ent.vel[1] = 0;
ent.pos[1] = hpos1[1] + this.hitbox[3];
@@ -50,7 +69,7 @@
}
}
}
}
};
Floor.prototype.bonk = function() {;}
Floor.prototype.bonk = function () {};
})();

80
examples/mario/js/game.js
View File

@@ -1,17 +1,19 @@
var requestAnimFrame = (function () {
return window.requestAnimationFrame ||
return (
window.requestAnimationFrame ||
window.webkitRequestAnimationFrame ||
window.mozRequestAnimationFrame ||
window.oRequestAnimationFrame ||
window.msRequestAnimationFrame ||
function (callback) {
window.setTimeout(callback, 1000 / 60);
};
}
);
})();
//create the canvas
var canvas = document.createElement("canvas");
var ctx = canvas.getContext('2d');
var ctx = canvas.getContext("2d");
var updateables = [];
var fireballs = [];
var player = new Mario.Player([0, 0]);
@@ -34,12 +36,12 @@ var vX = 0,
//load our images
resources.load([
'sprites/player.png',
'sprites/enemy.png',
'sprites/tiles.png',
'sprites/playerl.png',
'sprites/items.png',
'sprites/enemyr.png',
"sprites/player.png",
"sprites/enemy.png",
"sprites/tiles.png",
"sprites/playerl.png",
"sprites/items.png",
"sprites/enemyr.png",
]);
resources.onReady(init);
@@ -51,24 +53,24 @@ var music;
var lastTime;
function init() {
music = {
overworld: new Audio('sounds/aboveground_bgm.ogg'),
underground: new Audio('sounds/underground_bgm.ogg'),
clear: new Audio('sounds/stage_clear.wav'),
death: new Audio('sounds/mariodie.wav')
overworld: new Audio("sounds/aboveground_bgm.ogg"),
underground: new Audio("sounds/underground_bgm.ogg"),
clear: new Audio("sounds/stage_clear.wav"),
death: new Audio("sounds/mariodie.wav"),
};
sounds = {
smallJump: new Audio('sounds/jump-small.wav'),
bigJump: new Audio('sounds/jump-super.wav'),
breakBlock: new Audio('sounds/breakblock.wav'),
bump: new Audio('sounds/bump.wav'),
coin: new Audio('sounds/coin.wav'),
fireball: new Audio('sounds/fireball.wav'),
flagpole: new Audio('sounds/flagpole.wav'),
kick: new Audio('sounds/kick.wav'),
pipe: new Audio('sounds/pipe.wav'),
itemAppear: new Audio('sounds/itemAppear.wav'),
powerup: new Audio('sounds/powerup.wav'),
stomp: new Audio('sounds/stomp.wav')
smallJump: new Audio("sounds/jump-small.wav"),
bigJump: new Audio("sounds/jump-super.wav"),
breakBlock: new Audio("sounds/breakblock.wav"),
bump: new Audio("sounds/bump.wav"),
coin: new Audio("sounds/coin.wav"),
fireball: new Audio("sounds/fireball.wav"),
flagpole: new Audio("sounds/flagpole.wav"),
kick: new Audio("sounds/kick.wav"),
pipe: new Audio("sounds/pipe.wav"),
itemAppear: new Audio("sounds/itemAppear.wav"),
powerup: new Audio("sounds/powerup.wav"),
stomp: new Audio("sounds/stomp.wav"),
};
Mario.oneone();
lastTime = Date.now();
@@ -101,28 +103,29 @@ function update(dt) {
function handleInput(dt) {
if (player.piping || player.dying || player.noInput) return; //don't accept input
if (input.isDown('RUN')){
if (input.isDown("RUN")) {
player.run();
} else {
player.noRun();
}
if (input.isDown('JUMP')) {
if (input.isDown("JUMP")) {
player.jump();
} else {
//we need this to handle the timing for how long you hold it
player.noJump();
}
if (input.isDown('DOWN')) {
if (input.isDown("DOWN")) {
player.crouch();
} else {
player.noCrouch();
}
if (input.isDown('LEFT')) { // 'd' or left arrow
if (input.isDown("LEFT")) {
// 'd' or left arrow
player.moveLeft();
}
else if (input.isDown('RIGHT')) { // 'k' or right arrow
} else if (input.isDown("RIGHT")) {
// 'k' or right arrow
player.moveRight();
} else {
player.noWalk();
@@ -138,13 +141,14 @@ function updateEntities(dt, gameTime) {
//This should stop the jump when he switches sides on the flag.
if (player.exiting) {
if (player.pos[0] > vX + 96)
vX = player.pos[0] - 96
if (player.pos[0] > vX + 96) vX = player.pos[0] - 96;
} else if (level.scrolling && player.pos[0] > vX + 80) {
vX = player.pos[0] - 80;
}
if (player.powering.length !== 0 || player.dying) { return; }
if (player.powering.length !== 0 || player.dying) {
return;
}
level.items.forEach(function (ent) {
ent.update(dt);
});
@@ -163,7 +167,9 @@ function updateEntities(dt, gameTime) {
//scan for collisions
function checkCollisions() {
if (player.powering.length !== 0 || player.dying) { return; }
if (player.powering.length !== 0 || player.dying) {
return;
}
player.checkCollisions();
//Apparently for each will just skip indices where things were deleted.
@@ -206,11 +212,9 @@ function render() {
renderEntity(enemy);
});
fireballs.forEach(function (fireball) {
renderEntity(fireball);
})
});
//then we draw every static object.
for (var i = 0; i < 15; i++) {

43
examples/mario/js/goomba.js
View File

@@ -1,26 +1,26 @@
(function () {
if (typeof Mario === 'undefined')
window.Mario = {};
if (typeof Mario === "undefined") window.Mario = {};
//TODO: On console the hitbox is smaller. Measure it and edit this.
var Goomba = Mario.Goomba = function(pos, sprite) {
var Goomba = (Mario.Goomba = function (pos, sprite) {
this.dying = false;
Mario.Entity.call(this, {
pos: pos,
sprite: sprite,
hitbox: [0,0,16,16]
hitbox: [0, 0, 16, 16],
});
this.vel[0] = -0.5;
this.idx = level.enemies.length;
};
});
Goomba.prototype.render = function (ctx, vX, vY) {
this.sprite.render(ctx, this.pos[0], this.pos[1], vX, vY);
};
Goomba.prototype.update = function (dt, vX) {
if (this.pos[0] - vX > 336) { //if we're too far away, do nothing.
if (this.pos[0] - vX > 336) {
//if we're too far away, do nothing.
return;
} else if (this.pos[0] - vX < -32) {
delete level.enemies[this.idx];
@@ -71,9 +71,11 @@
}
var that = this;
level.enemies.forEach(function (enemy) {
if (enemy === that) { //don't check collisions with ourselves.
if (enemy === that) {
//don't check collisions with ourselves.
return;
} else if (enemy.pos[0] - vX > 336){ //stop checking once we get to far away dudes.
} else if (enemy.pos[0] - vX > 336) {
//stop checking once we get to far away dudes.
return;
} else {
that.isCollideWith(enemy);
@@ -92,14 +94,27 @@
var hpos2 = [ent.pos[0] + ent.hitbox[0], ent.pos[1] + ent.hitbox[1]];
//if the hitboxes actually overlap
if (!(hpos1[0] > hpos2[0]+ent.hitbox[2] || (hpos1[0]+this.hitbox[2] < hpos2[0]))) {
if (!(hpos1[1] > hpos2[1]+ent.hitbox[3] || (hpos1[1]+this.hitbox[3] < hpos2[1]))) {
if (ent instanceof Mario.Player) { //if we hit the player
if (ent.vel[1] > 0) { //then the goomba dies
if (
!(
hpos1[0] > hpos2[0] + ent.hitbox[2] ||
hpos1[0] + this.hitbox[2] < hpos2[0]
)
) {
if (
!(
hpos1[1] > hpos2[1] + ent.hitbox[3] ||
hpos1[1] + this.hitbox[3] < hpos2[1]
)
) {
if (ent instanceof Mario.Player) {
//if we hit the player
if (ent.vel[1] > 0) {
//then the goomba dies
this.stomp();
} else if (ent.starTime) {
this.bump();
} else { //or the player gets hit
} else {
//or the player gets hit
ent.damage();
}
} else {
@@ -120,7 +135,7 @@
Goomba.prototype.bump = function () {
sounds.kick.play();
this.sprite.img = 'sprites/enemyr.png';
this.sprite.img = "sprites/enemyr.png";
this.flipping = true;
this.pos[1] -= 1;
this.vel[0] = 0;

39
examples/mario/js/input.js
View File

@@ -7,19 +7,26 @@
switch (code) {
case 32:
key = 'SPACE'; break;
key = "SPACE";
break;
case 37:
key = 'LEFT'; break;
key = "LEFT";
break;
case 38:
key = 'UP'; break;
key = "UP";
break;
case 39:
key = 'RIGHT'; break;
key = "RIGHT";
break;
case 40:
key = 'DOWN'; break;
key = "DOWN";
break;
case 88:
key = 'JUMP'; break;
key = "JUMP";
break;
case 90:
key = 'RUN'; break;
key = "RUN";
break;
default:
key = String.fromCharCode(code);
}
@@ -27,15 +34,15 @@
pressedKeys[key] = status;
}
document.addEventListener('keydown', function(e) {
document.addEventListener("keydown", function (e) {
setKey(e, true);
});
document.addEventListener('keyup', function(e) {
document.addEventListener("keyup", function (e) {
setKey(e, false);
});
window.addEventListener('blur', function() {
window.addEventListener("blur", function () {
pressedKeys = {};
});
@@ -44,11 +51,11 @@
return pressedKeys[key.toUpperCase()];
},
reset: function () {
pressedKeys['RUN'] = false;
pressedKeys['LEFT'] = false;
pressedKeys['RIGHT'] = false;
pressedKeys['DOWN'] = false;
pressedKeys['JUMP'] = false;
}
pressedKeys["RUN"] = false;
pressedKeys["LEFT"] = false;
pressedKeys["RIGHT"] = false;
pressedKeys["DOWN"] = false;
pressedKeys["JUMP"] = false;
},
};
})();

54
examples/mario/js/koopa.js
View File

@@ -1,8 +1,7 @@
(function () {
if (typeof Mario === 'undefined')
window.Mario = {};
if (typeof Mario === "undefined") window.Mario = {};
var Koopa = Mario.Koopa = function(pos, sprite, para) {
var Koopa = (Mario.Koopa = function (pos, sprite, para) {
this.dying = false;
this.shell = false;
@@ -14,11 +13,11 @@
Mario.Entity.call(this, {
pos: pos,
sprite: sprite,
hitbox: [2,8,12,24]
hitbox: [2, 8, 12, 24],
});
this.vel[0] = -0.5;
this.idx = level.enemies.length;
};
});
Koopa.prototype.render = function (ctx, vX, vY) {
this.sprite.render(ctx, this.pos[0], this.pos[1], vX, vY);
@@ -31,16 +30,17 @@
this.turn = false;
}
if (this.vel[0] != 0) {
this.left = (this.vel[0] < 0);
this.left = this.vel[0] < 0;
}
if (this.left) {
this.sprite.img = 'sprites/enemy.png';
this.sprite.img = "sprites/enemy.png";
} else {
this.sprite.img = 'sprites/enemyr.png';
this.sprite.img = "sprites/enemyr.png";
}
if (this.pos[0] - vX > 336) { //if we're too far away, do nothing.
if (this.pos[0] - vX > 336) {
//if we're too far away, do nothing.
return;
} else if (this.pos[0] - vX < -32) {
delete level.enemies[this.idx];
@@ -61,9 +61,9 @@
}
if (this.shell == 0) {
this.sprite = level.koopaSprite();
this.hitbox = [2,8,12,24]
this.hitbox = [2, 8, 12, 24];
if (this.left) {
this.sprite.img = 'sprites/enemyr.png';
this.sprite.img = "sprites/enemyr.png";
this.vel[0] = 0.5;
this.left = false;
} else {
@@ -122,9 +122,11 @@
}
var that = this;
level.enemies.forEach(function (enemy) {
if (enemy === that) { //don't check collisions with ourselves.
if (enemy === that) {
//don't check collisions with ourselves.
return;
} else if (enemy.pos[0] - vX > 336){ //stop checking once we get to far away dudes.
} else if (enemy.pos[0] - vX > 336) {
//stop checking once we get to far away dudes.
return;
} else {
that.isCollideWith(enemy);
@@ -143,8 +145,18 @@
var hpos2 = [ent.pos[0] + ent.hitbox[0], ent.pos[1] + ent.hitbox[1]];
//if the hitboxes actually overlap
if (!(hpos1[0] > hpos2[0]+ent.hitbox[2] || (hpos1[0]+this.hitbox[2] < hpos2[0]))) {
if (!(hpos1[1] > hpos2[1]+ent.hitbox[3] || (hpos1[1]+this.hitbox[3] < hpos2[1]))) {
if (
!(
hpos1[0] > hpos2[0] + ent.hitbox[2] ||
hpos1[0] + this.hitbox[2] < hpos2[0]
)
) {
if (
!(
hpos1[1] > hpos2[1] + ent.hitbox[3] ||
hpos1[1] + this.hitbox[3] < hpos2[1]
)
) {
if (ent instanceof Mario.Player) {
if (ent.vel[1] > 0) {
player.bounce = true;
@@ -152,7 +164,8 @@
if (this.shell) {
sounds.kick.play();
if (this.vel[0] === 0) {
if (ent.left) { //I'm pretty sure this isn't the real logic.
if (ent.left) {
//I'm pretty sure this isn't the real logic.
this.vel[0] = -4;
} else {
this.vel[0] = 4;
@@ -162,13 +175,15 @@
this.vel[0] = 0;
} else ent.damage();
}
} else if (ent.vel[1] > 0) { //then we get BOPPED.
} else if (ent.vel[1] > 0) {
//then we get BOPPED.
this.stomp();
} else { //or the player gets hit
} else {
//or the player gets hit
ent.damage();
}
} else {
if (this.shell && (ent instanceof Mario.Goomba)) {
if (this.shell && ent instanceof Mario.Goomba) {
ent.bump();
} else this.collideWall();
}
@@ -194,7 +209,6 @@
this.vel = [0, 0];
this.pos[1] += 16;
}
};
Koopa.prototype.bump = function () {

183
examples/mario/js/levels/11.js
View File

@@ -1,4 +1,4 @@
var oneone = Mario.oneone = function() {
var oneone = (Mario.oneone = function () {
//The things that need to be passed in are basically just dependent on what
//tileset we're in, so it makes more sense to just make one variable for that, so
//TODO: put as much of this in the Level object definition as possible.
@@ -9,62 +9,134 @@ var oneone = Mario.oneone = function() {
scrolling: true,
invincibility: [144, 192, 240],
exit: 204,
floorSprite: new Mario.Sprite('sprites/tiles.png', [0,0],[16,16],0),
cloudSprite: new Mario.Sprite('sprites/tiles.png', [0,320],[48,32],0),
wallSprite: new Mario.Sprite('sprites/tiles.png', [0, 16],[16,16],0),
brickSprite: new Mario.Sprite('sprites/tiles.png', [16, 0], [16,16], 0),
brickBounceSprite: new Mario.Sprite('sprites/tiles.png',[32,0],[16,16],0),
floorSprite: new Mario.Sprite("sprites/tiles.png", [0, 0], [16, 16], 0),
cloudSprite: new Mario.Sprite("sprites/tiles.png", [0, 320], [48, 32], 0),
wallSprite: new Mario.Sprite("sprites/tiles.png", [0, 16], [16, 16], 0),
brickSprite: new Mario.Sprite("sprites/tiles.png", [16, 0], [16, 16], 0),
brickBounceSprite: new Mario.Sprite(
"sprites/tiles.png",
[32, 0],
[16, 16],
0,
),
rubbleSprite: function () {
return new Mario.Sprite('sprites/items.png', [64,0], [8,8], 3, [0,1])
return new Mario.Sprite("sprites/items.png", [64, 0], [8, 8], 3, [0, 1]);
},
ublockSprite: new Mario.Sprite('sprites/tiles.png', [48, 0], [16,16],0),
superShroomSprite: new Mario.Sprite('sprites/items.png', [0,0], [16,16], 0),
fireFlowerSprite: new Mario.Sprite('sprites/items.png', [0,32], [16,16], 20, [0,1,2,3]),
starSprite: new Mario.Sprite('sprites/items.png', [0,48], [16,16], 20, [0,1,2,3]),
pipeLEndSprite: new Mario.Sprite('sprites/tiles.png', [0, 128], [16,16], 0),
pipeREndSprite: new Mario.Sprite('sprites/tiles.png', [16, 128], [16,16], 0),
pipeLMidSprite: new Mario.Sprite('sprites/tiles.png', [0, 144], [16,16], 0),
pipeRMidSprite: new Mario.Sprite('sprites/tiles.png', [16, 144], [16,16], 0),
ublockSprite: new Mario.Sprite("sprites/tiles.png", [48, 0], [16, 16], 0),
superShroomSprite: new Mario.Sprite(
"sprites/items.png",
[0, 0],
[16, 16],
0,
),
fireFlowerSprite: new Mario.Sprite(
"sprites/items.png",
[0, 32],
[16, 16],
20,
[0, 1, 2, 3],
),
starSprite: new Mario.Sprite(
"sprites/items.png",
[0, 48],
[16, 16],
20,
[0, 1, 2, 3],
),
pipeLEndSprite: new Mario.Sprite(
"sprites/tiles.png",
[0, 128],
[16, 16],
0,
),
pipeREndSprite: new Mario.Sprite(
"sprites/tiles.png",
[16, 128],
[16, 16],
0,
),
pipeLMidSprite: new Mario.Sprite(
"sprites/tiles.png",
[0, 144],
[16, 16],
0,
),
pipeRMidSprite: new Mario.Sprite(
"sprites/tiles.png",
[16, 144],
[16, 16],
0,
),
pipeUpMid: new Mario.Sprite('sprites/tiles.png', [0, 144], [32,16], 0),
pipeSideMid: new Mario.Sprite('sprites/tiles.png', [48, 128], [16,32], 0),
pipeLeft: new Mario.Sprite('sprites/tiles.png', [32, 128], [16,32], 0),
pipeTop: new Mario.Sprite('sprites/tiles.png', [0, 128], [32,16], 0),
qblockSprite: new Mario.Sprite('sprites/tiles.png', [384, 0], [16,16], 8, [0,0,0,0,1,2,1]),
pipeUpMid: new Mario.Sprite("sprites/tiles.png", [0, 144], [32, 16], 0),
pipeSideMid: new Mario.Sprite("sprites/tiles.png", [48, 128], [16, 32], 0),
pipeLeft: new Mario.Sprite("sprites/tiles.png", [32, 128], [16, 32], 0),
pipeTop: new Mario.Sprite("sprites/tiles.png", [0, 128], [32, 16], 0),
qblockSprite: new Mario.Sprite(
"sprites/tiles.png",
[384, 0],
[16, 16],
8,
[0, 0, 0, 0, 1, 2, 1],
),
bcoinSprite: function () {
return new Mario.Sprite('sprites/items.png', [0,112],[16,16], 20,[0,1,2,3]);
return new Mario.Sprite(
"sprites/items.png",
[0, 112],
[16, 16],
20,
[0, 1, 2, 3],
);
},
cloudSprites: [
new Mario.Sprite('sprites/tiles.png', [0,320],[16,32],0),
new Mario.Sprite('sprites/tiles.png', [16,320],[16,32],0),
new Mario.Sprite('sprites/tiles.png', [32,320],[16,32],0)
new Mario.Sprite("sprites/tiles.png", [0, 320], [16, 32], 0),
new Mario.Sprite("sprites/tiles.png", [16, 320], [16, 32], 0),
new Mario.Sprite("sprites/tiles.png", [32, 320], [16, 32], 0),
],
hillSprites: [
new Mario.Sprite('sprites/tiles.png', [128,128],[16,16],0),
new Mario.Sprite('sprites/tiles.png', [144,128],[16,16],0),
new Mario.Sprite('sprites/tiles.png', [160,128],[16,16],0),
new Mario.Sprite('sprites/tiles.png', [128,144],[16,16],0),
new Mario.Sprite('sprites/tiles.png', [144,144],[16,16],0),
new Mario.Sprite('sprites/tiles.png', [160,144],[16,16],0)
new Mario.Sprite("sprites/tiles.png", [128, 128], [16, 16], 0),
new Mario.Sprite("sprites/tiles.png", [144, 128], [16, 16], 0),
new Mario.Sprite("sprites/tiles.png", [160, 128], [16, 16], 0),
new Mario.Sprite("sprites/tiles.png", [128, 144], [16, 16], 0),
new Mario.Sprite("sprites/tiles.png", [144, 144], [16, 16], 0),
new Mario.Sprite("sprites/tiles.png", [160, 144], [16, 16], 0),
],
bushSprite: new Mario.Sprite('sprites/tiles.png', [176, 144], [48, 16], 0),
bushSprite: new Mario.Sprite("sprites/tiles.png", [176, 144], [48, 16], 0),
bushSprites: [
new Mario.Sprite('sprites/tiles.png', [176,144], [16,16],0),
new Mario.Sprite('sprites/tiles.png', [192,144], [16,16],0),
new Mario.Sprite('sprites/tiles.png', [208,144], [16,16],0)],
new Mario.Sprite("sprites/tiles.png", [176, 144], [16, 16], 0),
new Mario.Sprite("sprites/tiles.png", [192, 144], [16, 16], 0),
new Mario.Sprite("sprites/tiles.png", [208, 144], [16, 16], 0),
],
goombaSprite: function () {
return new Mario.Sprite('sprites/enemy.png', [0, 16], [16,16], 3, [0,1]);
return new Mario.Sprite(
"sprites/enemy.png",
[0, 16],
[16, 16],
3,
[0, 1],
);
},
koopaSprite: function () {
return new Mario.Sprite('sprites/enemy.png', [96,0], [16,32], 2, [0,1]);
return new Mario.Sprite(
"sprites/enemy.png",
[96, 0],
[16, 32],
2,
[0, 1],
);
},
flagPoleSprites: [
new Mario.Sprite('sprites/tiles.png', [256, 128], [16,16], 0),
new Mario.Sprite('sprites/tiles.png', [256, 144], [16,16], 0),
new Mario.Sprite('sprites/items.png', [128, 32], [16,16], 0)
]
new Mario.Sprite("sprites/tiles.png", [256, 128], [16, 16], 0),
new Mario.Sprite("sprites/tiles.png", [256, 144], [16, 16], 0),
new Mario.Sprite("sprites/items.png", [128, 32], [16, 16], 0),
],
});
ground = [[0,69],[71,86],[89,153],[155,212]];
ground = [
[0, 69],
[71, 86],
[89, 153],
[155, 212],
];
player.pos[0] = level.playerPos[0];
player.pos[1] = level.playerPos[1];
vX = 0;
@@ -75,22 +147,41 @@ var oneone = Mario.oneone = function() {
});
//build scenery
clouds = [[7,3],[19, 2],[56, 3],[67, 2],[87, 2],[103, 2],[152, 3],[163, 2],[200, 3]];
clouds = [
[7, 3],
[19, 2],
[56, 3],
[67, 2],
[87, 2],
[103, 2],
[152, 3],
[163, 2],
[200, 3],
];
clouds.forEach(function (cloud) {
level.putCloud(cloud[0], cloud[1]);
});
twoClouds = [[36,2],[132,2],[180,2]];
twoClouds = [
[36, 2],
[132, 2],
[180, 2],
];
twoClouds.forEach(function (cloud) {
level.putTwoCloud(cloud[0], cloud[1]);
});
threeClouds = [[27,3],[75,3],[123,3],[171,3]];
threeClouds = [
[27, 3],
[75, 3],
[123, 3],
[171, 3],
];
threeClouds.forEach(function (cloud) {
level.putThreeCloud(cloud[0], cloud[1]);
});
bHills = [0,48,96,144,192]
bHills = [0, 48, 96, 144, 192];
bHills.forEach(function (hill) {
level.putBigHill(hill, 12);
});
@@ -216,4 +307,4 @@ var oneone = Mario.oneone = function() {
music.underground.pause();
// music.overworld.currentTime = 0;
music.overworld.play();
};
});

106
examples/mario/js/levels/11tunnel.js
View File

@@ -1,35 +1,65 @@
var oneonetunnel = Mario.oneonetunnel = function() {
var oneonetunnel = (Mario.oneonetunnel = function () {
level = new Mario.Level({
playerPos: [40, 16],
loader: Mario.oneonetunnel,
background: "#000000",
scrolling: false,
coinSprite: function () {
return new Mario.Sprite('sprites/items.png', [0,96],[16,16], 6,[0,0,0,0,1,2,1]);
return new Mario.Sprite(
"sprites/items.png",
[0, 96],
[16, 16],
6,
[0, 0, 0, 0, 1, 2, 1],
);
},
floorSprite: new Mario.Sprite('sprites/tiles.png', [0,32],[16,16],0),
wallSprite: new Mario.Sprite('sprites/tiles.png', [32, 32],[16,16],0),
brickSprite: new Mario.Sprite('sprites/tiles.png', [16, 0], [16,16], 0),
brickBounceSprite: new Mario.Sprite('sprites/tiles.png',[32,0],[16,16],0),
ublockSprite: new Mario.Sprite('sprites/tiles.png', [48, 0], [16,16],0),
pipeLMidSprite: new Mario.Sprite('sprites/tiles.png', [0, 144], [16,16], 0),
pipeRMidSprite: new Mario.Sprite('sprites/tiles.png', [16, 144], [16,16], 0),
pipeLEndSprite: new Mario.Sprite('sprites/tiles.png', [0, 128], [16,16], 0),
pipeREndSprite: new Mario.Sprite('sprites/tiles.png', [16, 128], [16,16], 0),
pipeUpMid: new Mario.Sprite('sprites/tiles.png', [0, 144], [32,16], 0),
pipeSideMid: new Mario.Sprite('sprites/tiles.png', [48, 128], [16,32], 0),
pipeLeft: new Mario.Sprite('sprites/tiles.png', [32, 128], [16,32], 0),
pipeTop: new Mario.Sprite('sprites/tiles.png', [0, 128], [32,16], 0),
floorSprite: new Mario.Sprite("sprites/tiles.png", [0, 32], [16, 16], 0),
wallSprite: new Mario.Sprite("sprites/tiles.png", [32, 32], [16, 16], 0),
brickSprite: new Mario.Sprite("sprites/tiles.png", [16, 0], [16, 16], 0),
brickBounceSprite: new Mario.Sprite(
"sprites/tiles.png",
[32, 0],
[16, 16],
0,
),
ublockSprite: new Mario.Sprite("sprites/tiles.png", [48, 0], [16, 16], 0),
pipeLMidSprite: new Mario.Sprite(
"sprites/tiles.png",
[0, 144],
[16, 16],
0,
),
pipeRMidSprite: new Mario.Sprite(
"sprites/tiles.png",
[16, 144],
[16, 16],
0,
),
pipeLEndSprite: new Mario.Sprite(
"sprites/tiles.png",
[0, 128],
[16, 16],
0,
),
pipeREndSprite: new Mario.Sprite(
"sprites/tiles.png",
[16, 128],
[16, 16],
0,
),
pipeUpMid: new Mario.Sprite("sprites/tiles.png", [0, 144], [32, 16], 0),
pipeSideMid: new Mario.Sprite("sprites/tiles.png", [48, 128], [16, 32], 0),
pipeLeft: new Mario.Sprite("sprites/tiles.png", [32, 128], [16, 32], 0),
pipeTop: new Mario.Sprite("sprites/tiles.png", [0, 128], [32, 16], 0),
LPipeSprites: [
new Mario.Sprite('sprites/tiles.png', [32,128],[16,16],0),
new Mario.Sprite('sprites/tiles.png', [32,144],[16,16],0),
new Mario.Sprite('sprites/tiles.png', [48,128],[16,16],0),
new Mario.Sprite('sprites/tiles.png', [48,144],[16,16],0),
new Mario.Sprite('sprites/tiles.png', [64,128],[16,16],0),
new Mario.Sprite('sprites/tiles.png', [64,144],[16,16],0),
]
new Mario.Sprite("sprites/tiles.png", [32, 128], [16, 16], 0),
new Mario.Sprite("sprites/tiles.png", [32, 144], [16, 16], 0),
new Mario.Sprite("sprites/tiles.png", [48, 128], [16, 16], 0),
new Mario.Sprite("sprites/tiles.png", [48, 144], [16, 16], 0),
new Mario.Sprite("sprites/tiles.png", [64, 128], [16, 16], 0),
new Mario.Sprite("sprites/tiles.png", [64, 144], [16, 16], 0),
],
});
player.pos[0] = level.playerPos[0];
@@ -43,9 +73,27 @@ var oneonetunnel = Mario.oneonetunnel = function() {
level.putWall(loc, 3, 1);
});
coins = [[5,5], [6,5], [7,5], [8,5], [9,5],
[4,7], [5,7], [6,7], [7,7], [8,7], [9,7], [10,7],
[4,9], [5,9], [6,9], [7,9], [8,9], [9,9], [10,9]];
coins = [
[5, 5],
[6, 5],
[7, 5],
[8, 5],
[9, 5],
[4, 7],
[5, 7],
[6, 7],
[7, 7],
[8, 7],
[9, 7],
[10, 7],
[4, 9],
[5, 9],
[6, 9],
[7, 9],
[8, 9],
[9, 9],
[10, 9],
];
coins.forEach(function (pos) {
level.putCoin(pos[0], pos[1]);
});
@@ -53,8 +101,8 @@ var oneonetunnel = Mario.oneonetunnel = function() {
//level.putLeftPipe(13,11);
level.putRealPipe(13, 11, 3, "RIGHT", function () {
Mario.oneone.call();
player.pos = [2616, 177]
player.pipe("UP", function() {;});
player.pos = [2616, 177];
player.pipe("UP", function () {});
});
level.putPipe(15, 13, 13);
@@ -62,4 +110,4 @@ var oneonetunnel = Mario.oneonetunnel = function() {
music.overworld.pause();
music.underground.currentTime = 0;
music.underground.play();
};
});

159
examples/mario/js/levels/level.js
View File

@@ -1,5 +1,5 @@
(function () {
var Level = Mario.Level = function(options) {
var Level = (Mario.Level = function (options) {
this.playerPos = options.playerPos;
this.scrolling = options.scrolling;
this.loader = options.loader;
@@ -55,8 +55,7 @@
this.scenery[i] = [];
this.blocks[i] = [];
}
};
});
Level.prototype.putFloor = function (start, end) {
for (var i = start; i < end; i++) {
@@ -70,7 +69,9 @@
};
Level.prototype.putKoopa = function (x, y) {
this.enemies.push(new Mario.Koopa([16*x, 16*y], this.koopaSprite(), false));
this.enemies.push(
new Mario.Koopa([16 * x, 16 * y], this.koopaSprite(), false),
);
};
Level.prototype.putWall = function (x, y, height) {
@@ -83,30 +84,57 @@
Level.prototype.putPipe = function (x, y, height) {
for (var i = y - height; i < y; i++) {
if (i === y - height) {
this.statics[i][x] = new Mario.Floor([16*x, 16*i], this.pipeLEndSprite);
this.statics[i][x+1] = new Mario.Floor([16*x+16, 16*i], this.pipeREndSprite);
this.statics[i][x] = new Mario.Floor(
[16 * x, 16 * i],
this.pipeLEndSprite,
);
this.statics[i][x + 1] = new Mario.Floor(
[16 * x + 16, 16 * i],
this.pipeREndSprite,
);
} else {
this.statics[i][x] = new Mario.Floor([16*x, 16*i], this.pipeLMidSprite);
this.statics[i][x+1] = new Mario.Floor([16*x+16, 16*i], this.pipeRMidSprite);
this.statics[i][x] = new Mario.Floor(
[16 * x, 16 * i],
this.pipeLMidSprite,
);
this.statics[i][x + 1] = new Mario.Floor(
[16 * x + 16, 16 * i],
this.pipeRMidSprite,
);
}
}
};
//sometimes, pipes don't go straight up and down.
Level.prototype.putLeftPipe = function (x, y) {
this.statics[y][x] = new Mario.Floor([16*x, 16*y], this.LPipeSprites[0]);
this.statics[y+1][x] = new Mario.Floor([16*x,16*(y+1)], this.LPipeSprites[1]);
this.statics[y][x+1] = new Mario.Floor([16*(x+1),16*y], this.LPipeSprites[2]);
this.statics[y+1][x+1] = new Mario.Floor([16*(x+1),16*(y+1)], this.LPipeSprites[3]);
this.statics[y][x+2] = new Mario.Floor([16*(x+2),16*y], this.LPipeSprites[4]);
this.statics[y+1][x+2] = new Mario.Floor([16*(x+2),16*(y+1)], this.LPipeSprites[5]);
this.statics[y][x] = new Mario.Floor(
[16 * x, 16 * y],
this.LPipeSprites[0],
);
this.statics[y + 1][x] = new Mario.Floor(
[16 * x, 16 * (y + 1)],
this.LPipeSprites[1],
);
this.statics[y][x + 1] = new Mario.Floor(
[16 * (x + 1), 16 * y],
this.LPipeSprites[2],
);
this.statics[y + 1][x + 1] = new Mario.Floor(
[16 * (x + 1), 16 * (y + 1)],
this.LPipeSprites[3],
);
this.statics[y][x + 2] = new Mario.Floor(
[16 * (x + 2), 16 * y],
this.LPipeSprites[4],
);
this.statics[y + 1][x + 2] = new Mario.Floor(
[16 * (x + 2), 16 * (y + 1)],
this.LPipeSprites[5],
);
};
Level.prototype.putCoin = function (x, y) {
this.items.push(new Mario.Coin(
[x*16, y*16],
this.coinSprite()
));
this.items.push(new Mario.Coin([x * 16, y * 16], this.coinSprite()));
};
Level.prototype.putCloud = function (x, y) {
@@ -118,7 +146,7 @@
pos: [x * 16, y * 16],
item: item,
sprite: this.qblockSprite,
usedSprite: this.ublockSprite
usedSprite: this.ublockSprite,
});
};
@@ -129,20 +157,33 @@
sprite: this.brickSprite,
bounceSprite: this.brickBounceSprite,
usedSprite: this.ublockSprite,
breakable: !item
breakable: !item,
});
};
Level.prototype.putBigHill = function (x, y) {
var px = x*16, py = y*16;
var px = x * 16,
py = y * 16;
this.scenery[y][x] = new Mario.Prop([px, py], this.hillSprites[0]);
this.scenery[y][x + 1] = new Mario.Prop([px + 16, py], this.hillSprites[3]);
this.scenery[y-1][x+1] = new Mario.Prop([px+16, py-16], this.hillSprites[0]);
this.scenery[y - 1][x + 1] = new Mario.Prop(
[px + 16, py - 16],
this.hillSprites[0],
);
this.scenery[y][x + 2] = new Mario.Prop([px + 32, py], this.hillSprites[4]);
this.scenery[y-1][x+2] = new Mario.Prop([px+32, py-16], this.hillSprites[3]);
this.scenery[y-2][x+2] = new Mario.Prop([px+32, py-32], this.hillSprites[1]);
this.scenery[y - 1][x + 2] = new Mario.Prop(
[px + 32, py - 16],
this.hillSprites[3],
);
this.scenery[y - 2][x + 2] = new Mario.Prop(
[px + 32, py - 32],
this.hillSprites[1],
);
this.scenery[y][x + 3] = new Mario.Prop([px + 48, py], this.hillSprites[5]);
this.scenery[y-1][x+3] = new Mario.Prop([px+48, py-16], this.hillSprites[2]);
this.scenery[y - 1][x + 3] = new Mario.Prop(
[px + 48, py - 16],
this.hillSprites[2],
);
this.scenery[y][x + 4] = new Mario.Prop([px + 64, py], this.hillSprites[2]);
};
@@ -170,10 +211,14 @@
};
Level.prototype.putSmallHill = function (x, y) {
var px = x*16, py = y*16;
var px = x * 16,
py = y * 16;
this.scenery[y][x] = new Mario.Prop([px, py], this.hillSprites[0]);
this.scenery[y][x + 1] = new Mario.Prop([px + 16, py], this.hillSprites[3]);
this.scenery[y-1][x+1] = new Mario.Prop([px+16, py-16], this.hillSprites[1]);
this.scenery[y - 1][x + 1] = new Mario.Prop(
[px + 16, py - 16],
this.hillSprites[1],
);
this.scenery[y][x + 2] = new Mario.Prop([px + 32, py], this.hillSprites[2]);
};
@@ -181,38 +226,70 @@
px = x * 16;
py = y * 16;
this.scenery[y][x] = new Mario.Prop([px, py], this.cloudSprites[0]);
this.scenery[y][x+1] = new Mario.Prop([px+16, py], this.cloudSprites[1]);
this.scenery[y][x+2] = new Mario.Prop([px+32, py], this.cloudSprites[1]);
this.scenery[y][x+3] = new Mario.Prop([px+48, py], this.cloudSprites[2]);
this.scenery[y][x + 1] = new Mario.Prop(
[px + 16, py],
this.cloudSprites[1],
);
this.scenery[y][x + 2] = new Mario.Prop(
[px + 32, py],
this.cloudSprites[1],
);
this.scenery[y][x + 3] = new Mario.Prop(
[px + 48, py],
this.cloudSprites[2],
);
};
Level.prototype.putThreeCloud = function (x, y) {
px = x * 16;
py = y * 16;
this.scenery[y][x] = new Mario.Prop([px, py], this.cloudSprites[0]);
this.scenery[y][x+1] = new Mario.Prop([px+16, py], this.cloudSprites[1]);
this.scenery[y][x+2] = new Mario.Prop([px+32, py], this.cloudSprites[1]);
this.scenery[y][x+3] = new Mario.Prop([px+48, py], this.cloudSprites[1]);
this.scenery[y][x+4] = new Mario.Prop([px+64, py], this.cloudSprites[2]);
this.scenery[y][x + 1] = new Mario.Prop(
[px + 16, py],
this.cloudSprites[1],
);
this.scenery[y][x + 2] = new Mario.Prop(
[px + 32, py],
this.cloudSprites[1],
);
this.scenery[y][x + 3] = new Mario.Prop(
[px + 48, py],
this.cloudSprites[1],
);
this.scenery[y][x + 4] = new Mario.Prop(
[px + 64, py],
this.cloudSprites[2],
);
};
Level.prototype.putRealPipe = function(x, y, length, direction, destination) {
Level.prototype.putRealPipe = function (
x,
y,
length,
direction,
destination,
) {
px = x * 16;
py = y * 16;
this.pipes.push(new Mario.Pipe({
this.pipes.push(
new Mario.Pipe({
pos: [px, py],
length: length,
direction: direction,
destination: destination
}));
}
destination: destination,
}),
);
};
Level.prototype.putFlagpole = function (x) {
this.statics[12][x] = new Mario.Floor([16 * x, 192], this.wallSprite);
for (i = 3; i < 12; i++) {
this.scenery[i][x] = new Mario.Prop([16*x, 16*i], this.flagpoleSprites[1])
this.scenery[i][x] = new Mario.Prop(
[16 * x, 16 * i],
this.flagpoleSprites[1],
);
}
this.scenery[2][x] = new Mario.Prop([16 * x, 32], this.flagpoleSprites[0]);
this.items.push(new Mario.Flag(16 * x));
}
};
})();

47
examples/mario/js/mushroom.js
View File

@@ -1,29 +1,28 @@
(function () {
if (typeof Mario === 'undefined')
window.Mario = {};
if (typeof Mario === "undefined") window.Mario = {};
var Mushroom = Mario.Mushroom = function(pos) {
var Mushroom = (Mario.Mushroom = function (pos) {
this.spawning = false;
this.waiting = 0;
Mario.Entity.call(this, {
pos: pos,
sprite: level.superShroomSprite,
hitbox: [0,0,16,16]
hitbox: [0, 0, 16, 16],
});
});
}
Mario.Util.inherits(Mushroom, Mario.Entity);
Mushroom.prototype.render = function (ctx, vX, vY) {
if (this.spawning > 1) return;
this.sprite.render(ctx, this.pos[0], this.pos[1], vX, vY);
}
};
Mushroom.prototype.spawn = function () {
if (player.power > 0) {
//replace this with a fire flower
var ff = new Mario.Fireflower(this.pos)
var ff = new Mario.Fireflower(this.pos);
ff.spawn();
return;
}
@@ -34,12 +33,12 @@
this.targetpos = [];
this.targetpos[0] = this.pos[0];
this.targetpos[1] = this.pos[1] - 16;
}
};
Mushroom.prototype.update = function (dt) {
if (this.spawning > 1) {
this.spawning -= 1;
if (this.spawning == 1) this.vel[1] = -.5;
if (this.spawning == 1) this.vel[1] = -0.5;
return;
}
if (this.spawning) {
@@ -62,11 +61,11 @@
this.pos[1] += this.vel[1];
this.sprite.update(dt);
}
}
};
Mushroom.prototype.collideWall = function () {
this.vel[0] = -this.vel[0];
}
};
Mushroom.prototype.checkCollisions = function () {
if (this.spawning) {
@@ -95,24 +94,36 @@
}
this.isPlayerCollided();
}
};
//we have access to player everywhere, so let's just do this.
Mushroom.prototype.isPlayerCollided = function () {
//the first two elements of the hitbox array are an offset, so let's do this now.
var hpos1 = [this.pos[0] + this.hitbox[0], this.pos[1] + this.hitbox[1]];
var hpos2 = [player.pos[0] + player.hitbox[0], player.pos[1] + player.hitbox[1]];
var hpos2 = [
player.pos[0] + player.hitbox[0],
player.pos[1] + player.hitbox[1],
];
//if the hitboxes actually overlap
if (!(hpos1[0] > hpos2[0]+player.hitbox[2] || (hpos1[0]+this.hitbox[2] < hpos2[0]))) {
if (!(hpos1[1] > hpos2[1]+player.hitbox[3] || (hpos1[1]+this.hitbox[3] < hpos2[1]))) {
if (
!(
hpos1[0] > hpos2[0] + player.hitbox[2] ||
hpos1[0] + this.hitbox[2] < hpos2[0]
)
) {
if (
!(
hpos1[1] > hpos2[1] + player.hitbox[3] ||
hpos1[1] + this.hitbox[3] < hpos2[1]
)
) {
player.powerUp(this.idx);
}
}
}
};
Mushroom.prototype.bump = function () {
this.vel[1] = -2;
}
};
})();

140
examples/mario/js/pipe.js
View File

@@ -1,18 +1,16 @@
(function () {
if (typeof Mario === 'undefined')
window.Mario = {};
if (typeof Mario === "undefined") window.Mario = {};
//there are too many possible configurations of pipe to capture in a reasonable
//set of simple variables. Joints, etc. are just too much.
//To that end, the pipe class handles simple pipes, and we'll put together
//anything more complex with individual props. OK? OK.
Pipe = Mario.Pipe = function (options) {
this.pos = options.pos
this.pos = options.pos;
//NOTE: direction is the direction you move INTO the pipe.
this.direction = options.direction
this.destination = options.destination
this.direction = options.direction;
this.destination = options.destination;
this.length = options.length;
if (this.direction === "UP" || this.direction === "DOWN") {
@@ -24,7 +22,7 @@
this.midsection = level.pipeSideMid;
this.endsection = level.pipeLeft;
}
}
};
Pipe.prototype.checkPipe = function () {
if (this.destination === undefined || !input.isDown(this.direction)) return;
@@ -33,32 +31,44 @@
var x = Math.floor(player.pos[0]);
var y = Math.floor(player.pos[1]);
switch (this.direction) {
case 'RIGHT': if (x === this.pos[0]-16 &&
case "RIGHT":
if (
x === this.pos[0] - 16 &&
y >= this.pos[1] &&
y+h <= this.pos[1]+32) {
player.pipe(this.direction, this.destination)
y + h <= this.pos[1] + 32
) {
player.pipe(this.direction, this.destination);
}
break;
case 'LEFT': if (x === this.pos[0]+16*this.length &&
case "LEFT":
if (
x === this.pos[0] + 16 * this.length &&
y >= this.pos[1] &&
y+h <= this.pos[1]+32) {
player.pipe(this.direction, this.destination)
y + h <= this.pos[1] + 32
) {
player.pipe(this.direction, this.destination);
}
break;
case 'UP': if (y === this.pos[1] + 16*this.length &&
case "UP":
if (
y === this.pos[1] + 16 * this.length &&
x >= this.pos[0] &&
x+16 <= this.pos[0]+32) {
player.pipe(this.direction, this.destination)
x + 16 <= this.pos[0] + 32
) {
player.pipe(this.direction, this.destination);
}
break;
case 'DOWN': if (y+h === this.pos[1] &&
case "DOWN":
if (
y + h === this.pos[1] &&
x >= this.pos[0] &&
x+16 <= this.pos[0]+32) {
x + 16 <= this.pos[0] + 32
) {
player.pipe(this.direction, this.destination);
}
break;
}
}
};
//Note to self: next time, decide on a convention for which thing checks for collisions
//and stick to it. This is a pain.
@@ -73,25 +83,40 @@
});
fireballs.forEach(function (ent) {
that.isCollideWith(ent)
that.isCollideWith(ent);
});
if (!player.piping) this.isCollideWith(player);
}
};
Pipe.prototype.isCollideWith = function (ent) {
//long story short: because we scan every item, and and one 'rubble' item is four things with separate positions
//we'll crash without this line as soon as we destroy a block. OOPS.
if (ent.pos === undefined) return;
//the first two elements of the hitbox array are an offset, so let's do this now.
var hpos1 = [Math.floor(this.pos[0] + this.hitbox[0]), Math.floor(this.pos[1] + this.hitbox[1])];
var hpos2 = [Math.floor(ent.pos[0] + ent.hitbox[0]), Math.floor(ent.pos[1] + ent.hitbox[1])];
var hpos1 = [
Math.floor(this.pos[0] + this.hitbox[0]),
Math.floor(this.pos[1] + this.hitbox[1]),
];
var hpos2 = [
Math.floor(ent.pos[0] + ent.hitbox[0]),
Math.floor(ent.pos[1] + ent.hitbox[1]),
];
//if the hitboxes actually overlap
if (!(hpos1[0] > hpos2[0]+ent.hitbox[2] || (hpos1[0]+this.hitbox[2] < hpos2[0]))) {
if (!(hpos1[1] > hpos2[1]+ent.hitbox[3] || (hpos1[1]+this.hitbox[3] < hpos2[1]))) {
if (
!(
hpos1[0] > hpos2[0] + ent.hitbox[2] ||
hpos1[0] + this.hitbox[2] < hpos2[0]
)
) {
if (
!(
hpos1[1] > hpos2[1] + ent.hitbox[3] ||
hpos1[1] + this.hitbox[3] < hpos2[1]
)
) {
//if the entity is over the block, it's basically floor
var center = hpos2[0] + ent.hitbox[2] / 2;
if (Math.abs(hpos2[1] + ent.hitbox[3] - hpos1[1]) <= ent.vel[1]) {
@@ -101,8 +126,11 @@
if (ent instanceof Mario.Player) {
ent.jumping = 0;
}
} else if (Math.abs(hpos2[1] - hpos1[1] - this.hitbox[3]) > ent.vel[1] &&
center + 2 >= hpos1[0] && center - 2 <= hpos1[0] + this.hitbox[2]) {
} else if (
Math.abs(hpos2[1] - hpos1[1] - this.hitbox[3]) > ent.vel[1] &&
center + 2 >= hpos1[0] &&
center - 2 <= hpos1[0] + this.hitbox[2]
) {
//ent is under the block.
ent.vel[1] = 0;
ent.pos[1] = hpos1[1] + this.hitbox[3];
@@ -115,14 +143,14 @@
}
}
}
}
};
//we COULD try to write some shenanigans so that the check gets put into the
//collision code, but there won't ever be more than a handful of pipes in a level
//so the performance hit of scanning all of them is miniscule.
Pipe.prototype.update = function (dt) {
if (this.destination) this.checkPipe();
}
};
//http://stackoverflow.com/questions/11227809/why-is-processing-a-sorted-array-faster-than-an-unsorted-array
//I honestly have no idea if javascript does this, but I feel like it makes sense
@@ -134,27 +162,63 @@
case "DOWN":
this.endsection.render(ctx, this.pos[0], this.pos[1], vX, vY);
for (var i = 1; i < this.length; i++) {
this.midsection.render(ctx, this.pos[0], this.pos[1]+i*16, vX, vY)
this.midsection.render(
ctx,
this.pos[0],
this.pos[1] + i * 16,
vX,
vY,
);
}
break;
case "UP":
this.endsection.render(ctx, this.pos[0], this.pos[1]+16*(this.length-1), vX, vY)
this.endsection.render(
ctx,
this.pos[0],
this.pos[1] + 16 * (this.length - 1),
vX,
vY,
);
for (var i = 0; i < this.length - 1; i++) {
this.midsection.render(ctx, this.pos[0], this.pos[1]+i*16, vX, vY)
this.midsection.render(
ctx,
this.pos[0],
this.pos[1] + i * 16,
vX,
vY,
);
}
break;
case "RIGHT":
this.endsection.render(ctx, this.pos[0], this.pos[1], vX, vY)
this.endsection.render(ctx, this.pos[0], this.pos[1], vX, vY);
for (var i = 1; i < this.length; i++) {
this.midsection.render(ctx, this.pos[0]+16*i, this.pos[1], vX, vY)
this.midsection.render(
ctx,
this.pos[0] + 16 * i,
this.pos[1],
vX,
vY,
);
}
break;
case "LEFT":
this.endsection.render(ctx, this.pos[0]+16*(this.length-1), this.pos[1], vX, vY)
this.endsection.render(
ctx,
this.pos[0] + 16 * (this.length - 1),
this.pos[1],
vX,
vY,
);
for (var i = 0; i < this.legth - 1; i++) {
this.midsection.render(ctx, this.pos[0], this.pos[1]+i*16, vX, vY)
this.midsection.render(
ctx,
this.pos[0],
this.pos[1] + i * 16,
vX,
vY,
);
}
break;
}
}
};
})();

146
examples/mario/js/player.js
View File

@@ -1,8 +1,7 @@
(function () {
if (typeof Mario === 'undefined')
window.Mario = {};
if (typeof Mario === "undefined") window.Mario = {};
var Player = Mario.Player = function(pos) {
var Player = (Mario.Player = function (pos) {
//I know, I know, there are a lot of variables tracking Mario's state.
//Maybe these can be consolidated some way? We'll see once they're all in.
this.power = 0;
@@ -20,10 +19,10 @@
Mario.Entity.call(this, {
pos: pos,
sprite: new Mario.Sprite('sprites/player.png', [80,32],[16,16],0),
hitbox: [0,0,16,16]
sprite: new Mario.Sprite("sprites/player.png", [80, 32], [16, 16], 0),
hitbox: [0, 0, 16, 16],
});
});
};
Mario.Util.inherits(Player, Mario.Entity);
@@ -33,7 +32,7 @@
this.shoot();
}
this.runheld = true;
}
};
Player.prototype.shoot = function () {
if (this.fireballs >= 2) return; //Projectile limit!
@@ -41,13 +40,13 @@
var fb = new Mario.Fireball([this.pos[0] + 8, this.pos[1]]); //I hate you, Javascript.
fb.spawn(this.left);
this.shooting = 2;
}
};
Player.prototype.noRun = function () {
this.maxSpeed = 1.5;
this.moveAcc = 0.07;
this.runheld = false;
}
};
Player.prototype.moveRight = function () {
//we're on the ground
@@ -84,7 +83,6 @@
this.vel[0] = 0;
this.acc[0] = 0;
}
};
Player.prototype.crouch = function () {
@@ -94,11 +92,11 @@
}
if (this.standing) this.crouching = true;
}
};
Player.prototype.noCrouch = function () {
this.crouching = false;
}
};
Player.prototype.jump = function () {
if (this.vel[1] > 0) {
@@ -136,8 +134,7 @@
if (this.starTime) {
var index;
if (this.starTime > 60)
index = Math.floor(this.starTime / 2) % 3;
if (this.starTime > 60) index = Math.floor(this.starTime / 2) % 3;
else index = Math.floor(this.starTime / 8) % 3;
this.sprite.pos[1] = level.invincibility[index];
@@ -147,9 +144,15 @@
this.starTime -= 1;
if (this.starTime == 0) {
switch (this.power) {
case 0: this.sprite.pos[1] = 32; break;
case 1: this.sprite.pos[1] = 0; break;
case 2: this.sprite.pos[1] = 96; break;
case 0:
this.sprite.pos[1] = 32;
break;
case 1:
this.sprite.pos[1] = 0;
break;
case 2:
this.sprite.pos[1] = 96;
break;
}
}
}
@@ -173,7 +176,10 @@
} else {
this.sprite.speed = Math.abs(this.vel[0]) * 8;
}
} else if ((this.vel[0] > 0 && this.left) || (this.vel[0] < 0 && !this.left)){
} else if (
(this.vel[0] > 0 && this.left) ||
(this.vel[0] < 0 && !this.left)
) {
this.sprite.pos[0] = 144;
this.sprite.speed = 0;
}
@@ -196,9 +202,9 @@
//which way are we facing?
if (this.left) {
this.sprite.img = 'sprites/playerl.png';
this.sprite.img = "sprites/playerl.png";
} else {
this.sprite.img = 'sprites/player.png';
this.sprite.img = "sprites/player.png";
}
};
@@ -238,7 +244,7 @@
}
if (Math.abs(this.vel[0]) > this.maxSpeed) {
this.vel[0] -= 0.05 * this.vel[0] / Math.abs(this.vel[0]);
this.vel[0] -= (0.05 * this.vel[0]) / Math.abs(this.vel[0]);
this.acc[0] = 0;
}
@@ -252,9 +258,8 @@
level.loader.call();
input.reset();
}
}
else {
this.acc[1] = 0.25
} else {
this.acc[1] = 0.25;
if (this.pos[1] > 240) {
this.die();
}
@@ -262,7 +267,7 @@
if (this.piping) {
this.acc = [0, 0];
var pos = [Math.round(this.pos[0]), Math.round(this.pos[1])]
var pos = [Math.round(this.pos[0]), Math.round(this.pos[1])];
if (pos[0] === this.targetPos[0] && pos[1] === this.targetPos[1]) {
this.piping = false;
this.pipeLoc.call();
@@ -318,7 +323,9 @@
for (var i = 0; i < h; i++) {
if (baseY + i < 0 || baseY + i >= 15) continue;
for (var j = 0; j < w; j++) {
if (baseY < 0) { i++;}
if (baseY < 0) {
i++;
}
if (level.statics[baseY + i][baseX + j]) {
level.statics[baseY + i][baseX + j].isCollideWith(this);
}
@@ -331,23 +338,41 @@
Player.prototype.powerUp = function (idx) {
sounds.powerup.play();
this.powering = [0,5,2,5,1,5,2,5,1,5,2,5,3,5,1,5,2,5,3,5,1,5,4];
this.powering = [
0, 5, 2, 5, 1, 5, 2, 5, 1, 5, 2, 5, 3, 5, 1, 5, 2, 5, 3, 5, 1, 5, 4,
];
this.touchedItem = idx;
if (this.power === 0) {
this.sprite.pos[0] = 80;
var newy = this.sprite.pos[1] - 32;
this.powerSprites = [[80, newy+32], [80, newy+32], [320, newy], [80, newy], [128, newy]];
this.powerSizes = [[16,16],[16,16],[16,32],[16,32],[16,32]];
this.powerSprites = [
[80, newy + 32],
[80, newy + 32],
[320, newy],
[80, newy],
[128, newy],
];
this.powerSizes = [
[16, 16],
[16, 16],
[16, 32],
[16, 32],
[16, 32],
];
this.shift = [0, 16, -16, 0, -16];
this.power = 1;
this.hitbox = [0, 0, 16, 32];
} else if (this.power == 1) {
var curx = this.sprite.pos[0];
this.powerSprites = [[curx, 96], [curx, level.invincibility[0]],
[curx, level.invincibility[1]], [curx, level.invincibility[2]],
[curx, 96]];
this.powerSizes[[16,32],[16,32],[16,32],[16,32],[16,32]];
this.powerSprites = [
[curx, 96],
[curx, level.invincibility[0]],
[curx, level.invincibility[1]],
[curx, level.invincibility[2]],
[curx, 96],
];
this.powerSizes[([16, 32], [16, 32], [16, 32], [16, 32], [16, 32])];
this.shift = [0, 0, 0, 0, 0];
this.power = 2;
} else {
@@ -358,15 +383,29 @@
};
Player.prototype.damage = function () {
if (this.power === 0) { //if you're already small, you dead!
if (this.power === 0) {
//if you're already small, you dead!
this.die();
} else { //otherwise, you get turned into small mario
} else {
//otherwise, you get turned into small mario
sounds.pipe.play();
this.powering = [0,5,1,5,2,5,1,5,2,5,1,5,2,5,1,5,2,5,1,5,2,5,3];
this.powering = [
0, 5, 1, 5, 2, 5, 1, 5, 2, 5, 1, 5, 2, 5, 1, 5, 2, 5, 1, 5, 2, 5, 3,
];
this.shift = [0, 16, -16, 16];
this.sprite.pos = [160, 0];
this.powerSprites = [[160,0], [240, 32], [240, 0], [160, 32]];
this.powerSizes = [[16, 32], [16,16], [16,32], [16,16]];
this.powerSprites = [
[160, 0],
[240, 32],
[240, 0],
[160, 32],
];
this.powerSizes = [
[16, 32],
[16, 16],
[16, 32],
[16, 16],
];
this.invincibility = 120;
this.power = 0;
this.hitbox = [0, 0, 16, 16];
@@ -390,7 +429,8 @@
this.waiting = 0.5;
this.dying = 2;
if (this.pos[1] < 240) { //falling into a pit doesn't do the animation.
if (this.pos[1] < 240) {
//falling into a pit doesn't do the animation.
this.targetPos = [this.pos[0], this.pos[1] - 128];
this.vel = [0, -5];
} else {
@@ -402,7 +442,7 @@
Player.prototype.star = function (idx) {
delete level.items[idx];
this.starTime = 660;
}
};
Player.prototype.pipe = function (direction, destination) {
sounds.pipe.play();
@@ -411,29 +451,41 @@
switch (direction) {
case "LEFT":
this.vel = [-1, 0];
this.targetPos = [Math.round(this.pos[0]-16), Math.round(this.pos[1])]
this.targetPos = [
Math.round(this.pos[0] - 16),
Math.round(this.pos[1]),
];
break;
case "RIGHT":
this.vel = [1, 0];
this.targetPos = [Math.round(this.pos[0]+16), Math.round(this.pos[1])]
this.targetPos = [
Math.round(this.pos[0] + 16),
Math.round(this.pos[1]),
];
break;
case "DOWN":
this.vel = [0, 1];
this.targetPos = [Math.round(this.pos[0]), Math.round(this.pos[1]+this.hitbox[3])]
this.targetPos = [
Math.round(this.pos[0]),
Math.round(this.pos[1] + this.hitbox[3]),
];
break;
case "UP":
this.vel = [0, -1];
this.targetPos = [Math.round(this.pos[0]), Math.round(this.pos[1]-this.hitbox[3])]
this.targetPos = [
Math.round(this.pos[0]),
Math.round(this.pos[1] - this.hitbox[3]),
];
break;
}
}
};
Player.prototype.flag = function () {
this.noInput = true;
this.flagging = true;
this.vel = [0, 2];
this.acc = [0, 0];
}
};
Player.prototype.exit = function () {
this.pos[0] += 16;
@@ -442,5 +494,5 @@
this.setAnimation();
this.waiting = 1;
this.exiting = true;
}
};
})();

9
examples/mario/js/prop.js
View File

@@ -1,15 +1,14 @@
(function () {
if (typeof Mario === 'undefined')
window.Mario = {};
if (typeof Mario === "undefined") window.Mario = {};
//props do even less than entities, so they don't need to inherit really
var Prop = Mario.Prop = function(pos, sprite) {
var Prop = (Mario.Prop = function (pos, sprite) {
this.pos = pos;
this.sprite = sprite;
}
});
//but we will be using the same Render, more or less.
Prop.prototype.render = function (ctx, vX, vY) {
this.sprite.render(ctx, this.pos[0], this.pos[1], vX, vY);
}
};
})();

15
examples/mario/js/resources.js
View File

@@ -10,8 +10,7 @@
urlOrArr.forEach(function (url) {
_load(url);
});
}
else {
} else {
_load(urlOrArr);
}
}
@@ -19,14 +18,15 @@
function _load(url) {
if (resourceCache[url]) {
return resourceCache[url];
}
else {
} else {
var img = new Image();
img.onload = function () {
resourceCache[url] = img;
if (isReady()) {
readyCallbacks.forEach(function(func) { func(); });
readyCallbacks.forEach(function (func) {
func();
});
}
};
resourceCache[url] = false;
@@ -41,8 +41,7 @@
function isReady() {
var ready = true;
for (var k in resourceCache) {
if(resourceCache.hasOwnProperty(k) &&
!resourceCache[k]) {
if (resourceCache.hasOwnProperty(k) && !resourceCache[k]) {
ready = false;
}
}
@@ -57,6 +56,6 @@
load: load,
get: get,
onReady: onReady,
isReady: isReady
isReady: isReady,
};
})();

23
examples/mario/js/rubble.js
View File

@@ -1,13 +1,12 @@
(function () {
if (typeof Mario === 'undefined')
window.Mario = {};
if (typeof Mario === "undefined") window.Mario = {};
//TODO: make each rubble an entity, use that render and write in Entity.update
var Rubble = Mario.Rubble = function() {
var Rubble = (Mario.Rubble = function () {
this.sprites = [];
this.poss = [];
this.vels = [];
}
});
Rubble.prototype.spawn = function (pos) {
this.idx = level.items.length;
@@ -24,12 +23,12 @@
this.vels[1] = [1.25, -5];
this.vels[2] = [-1.25, -3];
this.vels[3] = [1.25, -3];
}
};
Rubble.prototype.update = function (dt) {
for (var i = 0; i < 4; i++) {
if (this.sprites[i] === undefined) continue;
this.vels[i][1] += .3;
this.vels[i][1] += 0.3;
this.poss[i][0] += this.vels[i][0];
this.poss[i][1] += this.vels[i][1];
this.sprites[i].update(dt);
@@ -37,19 +36,23 @@
delete this.sprites[i];
}
}
if (this.sprites.every(function (el) {return !el})) {
if (
this.sprites.every(function (el) {
return !el;
})
) {
delete level.items[this.idx];
}
}
};
//You might argue that things that can't collide are more like scenery
//but these move and need to be deleted, and i'd rather deal with the 1d array.
Rubble.prototype.checkCollisions = function() {;}
Rubble.prototype.checkCollisions = function () {};
Rubble.prototype.render = function () {
for (var i = 0; i < 4; i++) {
if (this.sprites[i] === undefined) continue;
this.sprites[i].render(ctx, this.poss[i][0], this.poss[i][1], vX, vY);
}
}
};
})();

25
examples/mario/js/sprite.js
View File

@@ -1,8 +1,7 @@
(function () {
if (typeof Mario === 'undefined')
window.Mario = {};
if (typeof Mario === "undefined") window.Mario = {};
var Sprite = Mario.Sprite = function(img, pos, size, speed, frames, once) {
var Sprite = (Mario.Sprite = function (img, pos, size, speed, frames, once) {
this.pos = pos;
this.size = size;
this.speed = speed;
@@ -10,17 +9,17 @@
this.img = img;
this.once = once;
this.frames = frames;
}
});
Sprite.prototype.update = function (dt, gameTime) {
if (gameTime && gameTime == this.lastUpdated) return;
this._index += this.speed * dt;
if (gameTime) this.lastUpdated = gameTime;
}
};
Sprite.prototype.setFrame = function (frame) {
this._index = frame;
}
};
Sprite.prototype.render = function (ctx, posx, posy, vX, vY) {
var frame;
@@ -42,6 +41,16 @@
var y = this.pos[1];
x += frame * this.size[0];
ctx.drawImage(resources.get(this.img), x + (1/3),y + (1/3), this.size[0] - (2/3), this.size[1] - (2/3), Math.round(posx - vX), Math.round(posy - vY), this.size[0],this.size[1]);
}
ctx.drawImage(
resources.get(this.img),
x + 1 / 3,
y + 1 / 3,
this.size[0] - 2 / 3,
this.size[1] - 2 / 3,
Math.round(posx - vX),
Math.round(posy - vY),
this.size[0],
this.size[1],
);
};
})();

45
examples/mario/js/star.js
View File

@@ -1,24 +1,23 @@
(function () {
if (typeof Mario === 'undefined')
window.Mario = {};
if (typeof Mario === "undefined") window.Mario = {};
var Star = Mario.Star = function(pos) {
var Star = (Mario.Star = function (pos) {
this.spawning = false;
this.waiting = 0;
Mario.Entity.call(this, {
pos: pos,
sprite: level.starSprite,
hitbox: [0,0,16,16]
hitbox: [0, 0, 16, 16],
});
});
}
Mario.Util.inherits(Star, Mario.Entity);
Star.prototype.render = function (ctx, vX, vY) {
if (this.spawning > 1) return;
this.sprite.render(ctx, this.pos[0], this.pos[1], vX, vY);
}
};
Star.prototype.spawn = function () {
this.idx = level.items.length;
@@ -27,12 +26,12 @@
this.targetpos = [];
this.targetpos[0] = this.pos[0];
this.targetpos[1] = this.pos[1] - 16;
}
};
Star.prototype.update = function (dt) {
if (this.spawning > 1) {
this.spawning -= 1;
if (this.spawning == 1) this.vel[1] = -.5;
if (this.spawning == 1) this.vel[1] = -0.5;
return;
}
if (this.spawning) {
@@ -60,11 +59,11 @@
this.pos[1] += this.vel[1];
this.sprite.update(dt);
}
}
};
Star.prototype.collideWall = function () {
this.vel[0] = -this.vel[0];
}
};
Star.prototype.checkCollisions = function () {
if (this.spawning) {
@@ -93,24 +92,36 @@
}
this.isPlayerCollided();
}
};
//we have access to player everywhere, so let's just do this.
Star.prototype.isPlayerCollided = function () {
//the first two elements of the hitbox array are an offset, so let's do this now.
var hpos1 = [this.pos[0] + this.hitbox[0], this.pos[1] + this.hitbox[1]];
var hpos2 = [player.pos[0] + player.hitbox[0], player.pos[1] + player.hitbox[1]];
var hpos2 = [
player.pos[0] + player.hitbox[0],
player.pos[1] + player.hitbox[1],
];
//if the hitboxes actually overlap
if (!(hpos1[0] > hpos2[0]+player.hitbox[2] || (hpos1[0]+this.hitbox[2] < hpos2[0]))) {
if (!(hpos1[1] > hpos2[1]+player.hitbox[3] || (hpos1[1]+this.hitbox[3] < hpos2[1]))) {
if (
!(
hpos1[0] > hpos2[0] + player.hitbox[2] ||
hpos1[0] + this.hitbox[2] < hpos2[0]
)
) {
if (
!(
hpos1[1] > hpos2[1] + player.hitbox[3] ||
hpos1[1] + this.hitbox[3] < hpos2[1]
)
) {
player.star(this.idx);
}
}
}
};
Star.prototype.bump = function () {
this.vel[1] = -2;
}
};
})();

10
examples/mario/js/util.js
View File

@@ -1,14 +1,14 @@
(function () {
if (typeof Mario === 'undefined') {
if (typeof Mario === "undefined") {
window.Mario = {};
}
var Util = Mario.Util = {};
var Util = (Mario.Util = {});
Util.inherits = function (subclass, superclass) {
function Surrogate() {};
function Surrogate() {}
Surrogate.prototype = superclass.prototype;
subclass.prototype = new Surrogate();
}
})()
};
})();

2
examples/markdown-plugin.html
View File

@@ -1,4 +1,4 @@
<!DOCTYPE html>
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8" />

10
examples/matplotlib.html
View File

@@ -1,19 +1,19 @@
<html>
<head>
<title>Matplotlib</title>
<meta charset="utf-8">
<link rel="icon" type="image/x-icon" href="./favicon.png">
<meta charset="utf-8" />
<link rel="icon" type="image/x-icon" href="./favicon.png" />
<link rel="stylesheet" href="https://pyscript.net/latest/pyscript.css" />
<script defer src="https://pyscript.net/latest/pyscript.js"></script>
<link rel="stylesheet" href="./assets/css/examples.css" />
</head>
<body>
<nav class="navbar" style="background-color: #000000;">
<nav class="navbar" style="background-color: #000000">
<div class="app-header">
<a href="/">
<img src="./logo.png" class="logo">
<img src="./logo.png" class="logo" />
</a>
<a class="title" href="" style="color: #f0ab3c;">Matplotlib</a>
<a class="title" href="" style="color: #f0ab3c">Matplotlib</a>
</div>
</nav>
<section class="pyscript">

9
examples/message_passing.html
View File

@@ -1,7 +1,6 @@
<html>
<head>
<link rel="icon" type="image/x-icon" href="./favicon.png">
<link rel="icon" type="image/x-icon" href="./favicon.png" />
<link rel="stylesheet" href="https://pyscript.net/latest/pyscript.css" />
<script defer src="https://pyscript.net/latest/pyscript.js"></script>
@@ -9,7 +8,6 @@
</head>
<body>
<py-tutor>
<py-config>
packages = [
@@ -53,7 +51,9 @@ message = np.array([1.0, 0.0, 0.0, 0.0])
print(f"message: {message}")
</py-script>
</pre>
<p>Try out message passing below by doing any one of the following steps:</p>
<p>
Try out message passing below by doing any one of the following steps:
</p>
<pre><code>message @ adj_mat</code></pre>
<pre><code>message @ adj_mat @ adj_mat</code></pre>
<pre><code>message @ adj_mat @ adj_mat @ adj_mat</code></pre>
@@ -62,5 +62,4 @@ print(f"message: {message}")
</div>
</py-tutor>
</body>
</html>

265
examples/micrograd_ai.html
View File

@@ -1,19 +1,31 @@
<!DOCTYPE html>
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8" />
<link rel="icon" type="image/x-icon" href="./favicon.png">
<link rel="icon" type="image/x-icon" href="./favicon.png" />
<title>micrograd</title>
<link rel="stylesheet" href="https://pyscript.net/latest/pyscript.css" />
<script defer src="https://pyscript.net/latest/pyscript.js"></script>
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet" crossorigin="anonymous">
<link
href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css"
rel="stylesheet"
crossorigin="anonymous"
/>
</head>
<body style="padding-top: 20px; padding-right: 20px; padding-bottom: 20px; padding-left: 20px">
<h1>Micrograd - A tiny Autograd engine (with a bite! :))</h1><br>
<body
style="
padding-top: 20px;
padding-right: 20px;
padding-bottom: 20px;
padding-left: 20px;
"
>
<h1>Micrograd - A tiny Autograd engine (with a bite! :))</h1>
<br />
<py-config>
packages = [
@@ -25,167 +37,150 @@
<div>
<p>
<a href="https://github.com/karpathy/micrograd">Micrograd</a> is a tiny Autograd engine created
by <a href="https://twitter.com/karpathy">Andrej Karpathy</a>. This app recreates the
<a href="https://github.com/karpathy/micrograd/blob/master/demo.ipynb">demo</a>
he prepared for this package using pyscript to train a basic model, written in Python, natively in
the browser. <br>
<a href="https://github.com/karpathy/micrograd">Micrograd</a> is a tiny
Autograd engine created by
<a href="https://twitter.com/karpathy">Andrej Karpathy</a>. This app
recreates the
<a href="https://github.com/karpathy/micrograd/blob/master/demo.ipynb"
>demo</a
>
he prepared for this package using pyscript to train a basic model,
written in Python, natively in the browser. <br />
</p>
</div>
<div>
<p>
You may run each Python REPL cell interactively by pressing (Shift + Enter) or (Ctrl + Enter).
You can also modify the code directly as you wish. If you want to run all the code at once,
not each cell individually, you may instead click the 'Run All' button. Training the model
takes between 1-2 min if you decide to 'Run All' at once. 'Run All' is your only option if
you are running this on a mobile device where you cannot press (Shift + Enter). After the
model is trained, a plot image should be displayed depicting the model's ability to
classify the data. <br>
You may run each Python REPL cell interactively by pressing (Shift +
Enter) or (Ctrl + Enter). You can also modify the code directly as you
wish. If you want to run all the code at once, not each cell
individually, you may instead click the 'Run All' button. Training the
model takes between 1-2 min if you decide to 'Run All' at once. 'Run
All' is your only option if you are running this on a mobile device
where you cannot press (Shift + Enter). After the model is trained, a
plot image should be displayed depicting the model's ability to classify
the data. <br />
</p>
<p>
Currently the <code>&gt;</code> symbol is being imported incorrectly as <code>&amp;gt;</code> into the REPL's.
In this app the <code>&gt;</code> symbol has been replaced with <code>().__gt__()</code> so you can run the code
without issue. Ex: instead of <code>a &gt; b</code>, you will see <code>(a).__gt__(b)</code> instead. <br>
Currently the <code>&gt;</code> symbol is being imported incorrectly as
<code>&amp;gt;</code> into the REPL's. In this app the
<code>&gt;</code> symbol has been replaced with
<code>().__gt__()</code> so you can run the code without issue. Ex:
instead of <code>a &gt; b</code>, you will see
<code>(a).__gt__(b)</code> instead. <br />
</p>
<py-script>import js; js.document.getElementById('python-status').innerHTML = 'Python is now ready. You may proceed.'</py-script>
<py-script>
import js; js.document.getElementById('python-status').innerHTML = 'Python is now ready. You may proceed.'
</py-script>
<div id="python-status">Python is currently starting. Please wait...</div>
<button id="run-all-button" class="btn btn-primary" type="submit" py-onClick="run_all_micrograd_demo()">Run All</button><br>
<button
id="run-all-button"
class="btn btn-primary"
type="submit"
py-onClick="run_all_micrograd_demo()"
>
Run All</button
><br />
<py-script src="/micrograd_ai.py"></py-script>
<div id="micrograd-run-all-print-div"></div><br>
<div id="micrograd-run-all-print-div"></div>
<br />
<div id="micrograd-run-all-fig1-div"></div>
<div id="micrograd-run-all-fig2-div"></div><br>
<div id="micrograd-run-all-fig2-div"></div>
<br />
</div>
<py-repl auto-generate="false">
import random
import numpy as np
import matplotlib.pyplot as plt
</py-repl><br>
import random import numpy as np import matplotlib.pyplot as plt </py-repl
><br />
<py-repl auto-generate="false">
from micrograd.engine import Value
from micrograd.nn import Neuron, Layer, MLP
</py-repl><br>
from micrograd.engine import Value from micrograd.nn import Neuron, Layer,
MLP </py-repl
><br />
<py-repl auto-generate="true">
np.random.seed(1337)
random.seed(1337)
</py-repl><br>
np.random.seed(1337) random.seed(1337) </py-repl
><br />
<py-repl auto-generate="true">
#An adaptation of sklearn's make_moons function https://scikit-learn.org/stable/modules/generated/sklearn.datasets.make_moons.html
def make_moons(n_samples=100, noise=None):
n_samples_out, n_samples_in = n_samples, n_samples
outer_circ_x = np.cos(np.linspace(0, np.pi, n_samples_out))
outer_circ_y = np.sin(np.linspace(0, np.pi, n_samples_out))
inner_circ_x = 1 - np.cos(np.linspace(0, np.pi, n_samples_in))
inner_circ_y = 1 - np.sin(np.linspace(0, np.pi, n_samples_in)) - 0.5
X = np.vstack([np.append(outer_circ_x, inner_circ_x), np.append(outer_circ_y, inner_circ_y)]).T
y = np.hstack([np.zeros(n_samples_out, dtype=np.intp), np.ones(n_samples_in, dtype=np.intp)])
if noise is not None: X += np.random.normal(loc=0.0, scale=noise, size=X.shape)
return X, y
X, y = make_moons(n_samples=100, noise=0.1)
</py-repl><br>
#An adaptation of sklearn's make_moons function
https://scikit-learn.org/stable/modules/generated/sklearn.datasets.make_moons.html
def make_moons(n_samples=100, noise=None): n_samples_out, n_samples_in =
n_samples, n_samples outer_circ_x = np.cos(np.linspace(0, np.pi,
n_samples_out)) outer_circ_y = np.sin(np.linspace(0, np.pi,
n_samples_out)) inner_circ_x = 1 - np.cos(np.linspace(0, np.pi,
n_samples_in)) inner_circ_y = 1 - np.sin(np.linspace(0, np.pi,
n_samples_in)) - 0.5 X = np.vstack([np.append(outer_circ_x, inner_circ_x),
np.append(outer_circ_y, inner_circ_y)]).T y =
np.hstack([np.zeros(n_samples_out, dtype=np.intp), np.ones(n_samples_in,
dtype=np.intp)]) if noise is not None: X += np.random.normal(loc=0.0,
scale=noise, size=X.shape) return X, y X, y = make_moons(n_samples=100,
noise=0.1) </py-repl
><br />
<py-repl auto-generate="true">
y = y*2 - 1 # make y be -1 or 1
# visualize in 2D
plt.figure(figsize=(5,5))
plt.scatter(X[:,0], X[:,1], c=y, s=20, cmap='jet')
plt
</py-repl><br>
y = y*2 - 1 # make y be -1 or 1 # visualize in 2D
plt.figure(figsize=(5,5)) plt.scatter(X[:,0], X[:,1], c=y, s=20,
cmap='jet') plt </py-repl
><br />
<py-repl auto-generate="true">
model = MLP(2, [16, 16, 1]) # 2-layer neural network
print(model)
print("number of parameters", len(model.parameters()))
</py-repl><br>
model = MLP(2, [16, 16, 1]) # 2-layer neural network print(model)
print("number of parameters", len(model.parameters())) </py-repl
><br />
<div>
Line 24 has been changed from: <br>
<code>accuracy = [(yi &gt; 0) == (scorei.data &gt; 0) for yi, scorei in zip(yb, scores)]</code><br>
to: <br>
<code>accuracy = [((yi).__gt__(0)) == ((scorei.data).__gt__(0)) for yi, scorei in zip(yb, scores)]</code><br>
Line 24 has been changed from: <br />
<code
>accuracy = [(yi &gt; 0) == (scorei.data &gt; 0) for yi, scorei in
zip(yb, scores)]</code
><br />
to: <br />
<code
>accuracy = [((yi).__gt__(0)) == ((scorei.data).__gt__(0)) for yi,
scorei in zip(yb, scores)]</code
><br />
</div>
<py-repl auto-generate="true">
# loss function
def loss(batch_size=None):
# inline DataLoader :)
if batch_size is None:
Xb, yb = X, y
else:
ri = np.random.permutation(X.shape[0])[:batch_size]
Xb, yb = X[ri], y[ri]
inputs = [list(map(Value, xrow)) for xrow in Xb]
# forward the model to get scores
scores = list(map(model, inputs))
# svm "max-margin" loss
# loss function def loss(batch_size=None): # inline DataLoader :) if
batch_size is None: Xb, yb = X, y else: ri =
np.random.permutation(X.shape[0])[:batch_size] Xb, yb = X[ri], y[ri]
inputs = [list(map(Value, xrow)) for xrow in Xb] # forward the model to
get scores scores = list(map(model, inputs)) # svm "max-margin" loss
losses = [(1 + -yi*scorei).relu() for yi, scorei in zip(yb, scores)]
data_loss = sum(losses) * (1.0 / len(losses))
# L2 regularization
alpha = 1e-4
reg_loss = alpha * sum((p*p for p in model.parameters()))
total_loss = data_loss + reg_loss
# also get accuracy
accuracy = [((yi).__gt__(0)) == ((scorei.data).__gt__(0)) for yi, scorei in zip(yb, scores)]
return total_loss, sum(accuracy) / len(accuracy)
total_loss, acc = loss()
print(total_loss, acc)
</py-repl><br>
data_loss = sum(losses) * (1.0 / len(losses)) # L2 regularization alpha =
1e-4 reg_loss = alpha * sum((p*p for p in model.parameters())) total_loss
= data_loss + reg_loss # also get accuracy accuracy = [((yi).__gt__(0)) ==
((scorei.data).__gt__(0)) for yi, scorei in zip(yb, scores)] return
total_loss, sum(accuracy) / len(accuracy) total_loss, acc = loss()
print(total_loss, acc) </py-repl
><br />
<py-repl auto-generate="true">
# optimization
for k in range(20): #was 100. Accuracy can be further improved w/ more epochs (to 100%).
# forward
total_loss, acc = loss()
# backward
model.zero_grad()
total_loss.backward()
# update (sgd)
learning_rate = 1.0 - 0.9*k/100
for p in model.parameters():
p.data -= learning_rate * p.grad
if k % 1 == 0:
print(f"step {k} loss {total_loss.data}, accuracy {acc*100}%")
</py-repl><br>
# optimization for k in range(20): #was 100. Accuracy can be further
improved w/ more epochs (to 100%). # forward total_loss, acc = loss() #
backward model.zero_grad() total_loss.backward() # update (sgd)
learning_rate = 1.0 - 0.9*k/100 for p in model.parameters(): p.data -=
learning_rate * p.grad if k % 1 == 0: print(f"step {k} loss
{total_loss.data}, accuracy {acc*100}%") </py-repl
><br />
<div>
<p>
Please wait for the training loop above to complete. It will not print out stats until it
has completely finished. This typically takes 1-2 min. <br><br>
Please wait for the training loop above to complete. It will not print
out stats until it has completely finished. This typically takes 1-2
min. <br /><br />
Line 9 has been changed from: <br>
<code>Z = np.array([s.data &gt; 0 for s in scores])</code><br>
to: <br>
<code>Z = np.array([(s.data).__gt__(0) for s in scores])</code><br>
Line 9 has been changed from: <br />
<code>Z = np.array([s.data &gt; 0 for s in scores])</code><br />
to: <br />
<code>Z = np.array([(s.data).__gt__(0) for s in scores])</code><br />
</p>
</div>
<py-repl auto-generate="true">
h = 0.25
x_min, x_max = X[:, 0].min() - 1, X[:, 0].max() + 1
y_min, y_max = X[:, 1].min() - 1, X[:, 1].max() + 1
xx, yy = np.meshgrid(np.arange(x_min, x_max, h),
np.arange(y_min, y_max, h))
Xmesh = np.c_[xx.ravel(), yy.ravel()]
inputs = [list(map(Value, xrow)) for xrow in Xmesh]
scores = list(map(model, inputs))
Z = np.array([(s.data).__gt__(0) for s in scores])
Z = Z.reshape(xx.shape)
fig = plt.figure()
plt.contourf(xx, yy, Z, cmap=plt.cm.Spectral, alpha=0.8)
h = 0.25 x_min, x_max = X[:, 0].min() - 1, X[:, 0].max() + 1 y_min, y_max
= X[:, 1].min() - 1, X[:, 1].max() + 1 xx, yy =
np.meshgrid(np.arange(x_min, x_max, h), np.arange(y_min, y_max, h)) Xmesh
= np.c_[xx.ravel(), yy.ravel()] inputs = [list(map(Value, xrow)) for xrow
in Xmesh] scores = list(map(model, inputs)) Z =
np.array([(s.data).__gt__(0) for s in scores]) Z = Z.reshape(xx.shape) fig
= plt.figure() plt.contourf(xx, yy, Z, cmap=plt.cm.Spectral, alpha=0.8)
plt.scatter(X[:, 0], X[:, 1], c=y, s=40, cmap=plt.cm.Spectral)
plt.xlim(xx.min(), xx.max())
plt.ylim(yy.min(), yy.max())
plt
</py-repl><br>
<py-repl auto-generate="true">
1+1
</py-repl><br>
plt.xlim(xx.min(), xx.max()) plt.ylim(yy.min(), yy.max()) plt </py-repl
><br />
<py-repl auto-generate="true"> 1+1 </py-repl><br />
</body>
</html>
<!-- Adapted by Mat Miller -->

76
examples/numpy_canvas_fractals.html
View File

@@ -1,8 +1,11 @@
<html>
<head>
<title>Visualization of Mandelbrot, Julia and Newton sets with NumPy and HTML5 canvas</title>
<meta charset="utf-8">
<link rel="icon" type="image/x-icon" href="./favicon.png">
<title>
Visualization of Mandelbrot, Julia and Newton sets with NumPy and HTML5
canvas
</title>
<meta charset="utf-8" />
<link rel="icon" type="image/x-icon" href="./favicon.png" />
<link rel="stylesheet" href="https://pyscript.net/latest/pyscript.css" />
<script defer src="https://pyscript.net/latest/pyscript.js"></script>
<link rel="stylesheet" href="./assets/css/examples.css" />
@@ -27,19 +30,22 @@
}
}
</style>
</head>
<body>
<nav class="navbar" style="background-color: #000000;">
<nav class="navbar" style="background-color: #000000">
<div class="app-header">
<a href="/">
<img src="./logo.png" class="logo">
<img src="./logo.png" class="logo" />
</a>
<a class="title" href="" style="color: #f0ab3c;">Fractals with NumPy and canvas</a>
<a class="title" href="" style="color: #f0ab3c"
>Fractals with NumPy and canvas</a
>
</div>
</nav>
<section class="pyscript">
<div style="display: flex; flex-direction: column; gap: 1em; width: 600px">
<div
style="display: flex; flex-direction: column; gap: 1em; width: 600px"
>
<div id="mandelbrot">
<div style="text-align: center">Mandelbrot set</div>
<div>
@@ -57,25 +63,63 @@
<div id="newton">
<div style="text-align: center">Newton set</div>
<fieldset style="display: flex; flex-direction: row; gap: 1em">
<div><span style="white-space: pre">p(z) = </span><input id="poly" type="text" value="z**3 - 2*z + 2"></div>
<div><span style="white-space: pre">a = </span><input id="coef" type="text" value="1" style="width: 40px"></div>
<div>
<span style="white-space: pre">p(z) = </span
><input id="poly" type="text" value="z**3 - 2*z + 2" />
</div>
<div>
<span style="white-space: pre">a = </span
><input id="coef" type="text" value="1" style="width: 40px" />
</div>
<div style="display: flex; flex-direction: row">
<span style="white-space: pre">x = [</span>
<input id="x0" type="text" value="-2.5" style="width: 80px; text-align: right">
<input
id="x0"
type="text"
value="-2.5"
style="width: 80px; text-align: right"
/>
<span style="white-space: pre">, </span>
<input id="x1" type="text" value="2.5" style="width: 80px; text-align: right">
<input
id="x1"
type="text"
value="2.5"
style="width: 80px; text-align: right"
/>
<span style="white-space: pre">]</span>
</div>
<div style="display: flex; flex-direction: row">
<span style="white-space: pre">y = [</span>
<input id="y0" type="text" value="-5.0" style="width: 80px; text-align: right">
<input
id="y0"
type="text"
value="-5.0"
style="width: 80px; text-align: right"
/>
<span style="white-space: pre">, </span>
<input id="y1" type="text" value="5.0" style="width: 80px; text-align: right">
<input
id="y1"
type="text"
value="5.0"
style="width: 80px; text-align: right"
/>
<span style="white-space: pre">]</span>
</div>
<div style="display: flex; flex-direction: row; gap: 1em">
<div style="white-space: pre"><input type="radio" id="conv" name="type" value="convergence" checked> convergence</div>
<div style="white-space: pre"><input type="radio" id="iter" name="type" value="iterations"> iterations</div>
<div style="white-space: pre">
<input
type="radio"
id="conv"
name="type"
value="convergence"
checked
/>
convergence
</div>
<div style="white-space: pre">
<input type="radio" id="iter" name="type" value="iterations" />
iterations
</div>
</div>
</fieldset>
<div>

26
examples/pandas.html
View File

@@ -1,4 +1,4 @@
<!DOCTYPE html>
<!doctype html>
<html>
<head>
<title id="header-title"></title>
@@ -12,12 +12,12 @@
</head>
<body>
<nav class="navbar" style="background-color: #000000;">
<nav class="navbar" style="background-color: #000000">
<div class="app-header">
<a href="/">
<img src="./logo.png" class="logo">
<img src="./logo.png" class="logo" />
</a>
<a class="title" id="page-title" href="" style="color: #f0ab3c;"></a>
<a class="title" id="page-title" href="" style="color: #f0ab3c"></a>
</div>
</nav>
@@ -26,20 +26,24 @@
<div id="pandas-source">
<h3>Data Source</h3>
<input type="text" id="txt-url" class="py-input" size="70">
<button type="submit" id="btn-load" class="py-button" py-click="loadFromURL()">Load CSV</button>
<input type="text" id="txt-url" class="py-input" size="70" />
<button
type="submit"
id="btn-load"
class="py-button"
py-click="loadFromURL()"
>
Load CSV
</button>
</div>
<div id="pandas-repl" hidden>
<h3>Python REPL</h3>
<py-repl id="pandas-repl-inner" output="pandas-output-inner">
# Hit SHIFT + ENTER to execute example code
# Get all closed airports in Great Britain
df2 = df.query("type == 'closed' & iso_country == 'GB'")
# Hit SHIFT + ENTER to execute example code # Get all closed airports in
Great Britain df2 = df.query("type == 'closed' & iso_country == 'GB'")
df2
</py-repl>
</div>
<div id="pandas-output" hidden>

30
examples/panel.html
View File

@@ -1,23 +1,35 @@
<html>
<head>
<title>Panel Example</title>
<meta charset="iso-8859-1">
<link rel="icon" type="image/x-icon" href="./favicon.png">
<script type="text/javascript" src="https://cdn.bokeh.org/bokeh/release/bokeh-2.4.3.js"></script>
<script type="text/javascript" src="https://cdn.bokeh.org/bokeh/release/bokeh-widgets-2.4.3.min.js"></script>
<script type="text/javascript" src="https://cdn.bokeh.org/bokeh/release/bokeh-tables-2.4.3.min.js"></script>
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/@holoviz/panel@0.14.1/dist/panel.min.js"></script>
<meta charset="iso-8859-1" />
<link rel="icon" type="image/x-icon" href="./favicon.png" />
<script
type="text/javascript"
src="https://cdn.bokeh.org/bokeh/release/bokeh-2.4.3.js"
></script>
<script
type="text/javascript"
src="https://cdn.bokeh.org/bokeh/release/bokeh-widgets-2.4.3.min.js"
></script>
<script
type="text/javascript"
src="https://cdn.bokeh.org/bokeh/release/bokeh-tables-2.4.3.min.js"
></script>
<script
type="text/javascript"
src="https://cdn.jsdelivr.net/npm/@holoviz/panel@0.14.1/dist/panel.min.js"
></script>
<link rel="stylesheet" href="https://pyscript.net/latest/pyscript.css" />
<script defer src="https://pyscript.net/latest/pyscript.js"></script>
<link rel="stylesheet" href="./assets/css/examples.css" />
</head>
<body>
<nav class="navbar" style="background-color: #000000;">
<nav class="navbar" style="background-color: #000000">
<div class="app-header">
<a href="/">
<img src="./logo.png" class="logo">
<img src="./logo.png" class="logo" />
</a>
<a class="title" href="" style="color: #f0ab3c;">Panel Example</a>
<a class="title" href="" style="color: #f0ab3c">Panel Example</a>
</div>
</nav>
<section class="pyscript">

111
examples/panel_deckgl.html
View File

@@ -1,34 +1,88 @@
<!DOCTYPE html>
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="default">
<meta name="theme-color" content="#0072b5">
<meta name="name" content="PyScript/Panel DeckGL Demo">
<meta charset="utf-8" />
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-status-bar-style" content="default" />
<meta name="theme-color" content="#0072b5" />
<meta name="name" content="PyScript/Panel DeckGL Demo" />
<title>PyScript/Panel DeckGL Demo</title>
<link rel="icon" type="image/x-icon" href="./favicon.png">
<link rel="icon" type="image/x-icon" href="./favicon.png" />
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.3/css/all.min.css" type="text/css" />
<link rel="stylesheet" href="https://unpkg.com/@holoviz/panel@0.13.1/dist/css/widgets.css" type="text/css" />
<link rel="stylesheet" href="https://unpkg.com/@holoviz/panel@0.13.1/dist/css/markdown.css" type="text/css" />
<link
rel="stylesheet"
href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.3/css/all.min.css"
type="text/css"
/>
<link
rel="stylesheet"
href="https://unpkg.com/@holoviz/panel@0.13.1/dist/css/widgets.css"
type="text/css"
/>
<link
rel="stylesheet"
href="https://unpkg.com/@holoviz/panel@0.13.1/dist/css/markdown.css"
type="text/css"
/>
<script type="text/javascript" src="https://unpkg.com/h3-js@3.7.2/dist/h3-js.umd.js"></script>
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/deck.gl@8.6.7/dist.min.js"></script>
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/@deck.gl/json@8.6.7/dist.min.js"></script>
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/@loaders.gl/csv@3.1.7/dist/dist.min.js"></script>
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/@loaders.gl/json@3.1.7/dist/dist.min.js"></script>
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/@loaders.gl/3d-tiles@3.1.7/dist/dist.min.js"></script>
<script type="text/javascript" src="https://api.mapbox.com/mapbox-gl-js/v2.6.1/mapbox-gl.js"></script>
<script type="text/javascript" src="https://cdn.bokeh.org/bokeh/release/bokeh-2.4.3.js"></script>
<script type="text/javascript" src="https://cdn.bokeh.org/bokeh/release/bokeh-widgets-2.4.3.min.js"></script>
<script type="text/javascript" src="https://cdn.bokeh.org/bokeh/release/bokeh-tables-2.4.3.min.js"></script>
<script type="text/javascript" src="https://unpkg.com/@holoviz/panel@0.13.1/dist/panel.js"></script>
<script
type="text/javascript"
src="https://unpkg.com/h3-js@3.7.2/dist/h3-js.umd.js"
></script>
<script
type="text/javascript"
src="https://cdn.jsdelivr.net/npm/deck.gl@8.6.7/dist.min.js"
></script>
<script
type="text/javascript"
src="https://cdn.jsdelivr.net/npm/@deck.gl/json@8.6.7/dist.min.js"
></script>
<script
type="text/javascript"
src="https://cdn.jsdelivr.net/npm/@loaders.gl/csv@3.1.7/dist/dist.min.js"
></script>
<script
type="text/javascript"
src="https://cdn.jsdelivr.net/npm/@loaders.gl/json@3.1.7/dist/dist.min.js"
></script>
<script
type="text/javascript"
src="https://cdn.jsdelivr.net/npm/@loaders.gl/3d-tiles@3.1.7/dist/dist.min.js"
></script>
<script
type="text/javascript"
src="https://api.mapbox.com/mapbox-gl-js/v2.6.1/mapbox-gl.js"
></script>
<script
type="text/javascript"
src="https://cdn.bokeh.org/bokeh/release/bokeh-2.4.3.js"
></script>
<script
type="text/javascript"
src="https://cdn.bokeh.org/bokeh/release/bokeh-widgets-2.4.3.min.js"
></script>
<script
type="text/javascript"
src="https://cdn.bokeh.org/bokeh/release/bokeh-tables-2.4.3.min.js"
></script>
<script
type="text/javascript"
src="https://unpkg.com/@holoviz/panel@0.13.1/dist/panel.js"
></script>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/css/bootstrap.min.css">
<link rel="stylesheet" href="https://unpkg.com/@holoviz/panel@0.13.1/dist/bundled/bootstraptemplate/bootstrap.css">
<link rel="stylesheet" href="https://unpkg.com/@holoviz/panel@0.13.1/dist/bundled/defaulttheme/default.css">
<link
rel="stylesheet"
href="https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/css/bootstrap.min.css"
/>
<link
rel="stylesheet"
href="https://unpkg.com/@holoviz/panel@0.13.1/dist/bundled/bootstraptemplate/bootstrap.css"
/>
<link
rel="stylesheet"
href="https://unpkg.com/@holoviz/panel@0.13.1/dist/bundled/defaulttheme/default.css"
/>
<script src="https://cdn.jsdelivr.net/npm/jquery@3.5.1/dist/jquery.slim.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/js/bootstrap.bundle.min.js"></script>
@@ -44,12 +98,14 @@
</head>
<body>
<nav class="navbar" style="background-color: #000000;">
<nav class="navbar" style="background-color: #000000">
<div class="app-header">
<a href="/">
<img src="./logo.png" class="logo">
<img src="./logo.png" class="logo" />
</a>
<a class="title" href="" style="color: #f0ab3c;">Panel DeckGL NYC Taxi Demo</a>
<a class="title" href="" style="color: #f0ab3c"
>Panel DeckGL NYC Taxi Demo</a
>
</div>
</nav>
<section class="pyscript">
@@ -221,6 +277,5 @@
</py-script>
</py-tutor>
</section>
</body>
</html>

109
examples/panel_kmeans.html
View File

@@ -1,34 +1,79 @@
<!DOCTYPE html>
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="default">
<meta name="theme-color" content="#000000">
<meta name="name" content="PyScript/Panel KMeans Demo">
<meta charset="utf-8" />
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-status-bar-style" content="default" />
<meta name="theme-color" content="#000000" />
<meta name="name" content="PyScript/Panel KMeans Demo" />
<title>Pyscript/Panel KMeans Demo</title>
<link rel="icon" type="image/x-icon" href="./favicon.png">
<link rel="icon" type="image/x-icon" href="./favicon.png" />
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.3/css/all.min.css" type="text/css" />
<link rel="stylesheet" href="https://unpkg.com/@holoviz/panel@0.13.1/dist/css/widgets.css" type="text/css" />
<link rel="stylesheet" href="https://unpkg.com/@holoviz/panel@0.13.1/dist/css/markdown.css" type="text/css" />
<link
rel="stylesheet"
href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.3/css/all.min.css"
type="text/css"
/>
<link
rel="stylesheet"
href="https://unpkg.com/@holoviz/panel@0.13.1/dist/css/widgets.css"
type="text/css"
/>
<link
rel="stylesheet"
href="https://unpkg.com/@holoviz/panel@0.13.1/dist/css/markdown.css"
type="text/css"
/>
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/vega@5"></script>
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/vega-lite@5"></script>
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/vega-embed@6"></script>
<script type="text/javascript" src="https://unpkg.com/tabulator-tables@4.9.3/dist/js/tabulator.js"></script>
<script type="text/javascript" src="https://cdn.bokeh.org/bokeh/release/bokeh-2.4.3.js"></script>
<script type="text/javascript" src="https://cdn.bokeh.org/bokeh/release/bokeh-widgets-2.4.3.min.js"></script>
<script type="text/javascript" src="https://cdn.bokeh.org/bokeh/release/bokeh-tables-2.4.3.min.js"></script>
<script type="text/javascript" src="https://unpkg.com/@holoviz/panel@0.13.1/dist/panel.min.js"></script>
<script
type="text/javascript"
src="https://cdn.jsdelivr.net/npm/vega@5"
></script>
<script
type="text/javascript"
src="https://cdn.jsdelivr.net/npm/vega-lite@5"
></script>
<script
type="text/javascript"
src="https://cdn.jsdelivr.net/npm/vega-embed@6"
></script>
<script
type="text/javascript"
src="https://unpkg.com/tabulator-tables@4.9.3/dist/js/tabulator.js"
></script>
<script
type="text/javascript"
src="https://cdn.bokeh.org/bokeh/release/bokeh-2.4.3.js"
></script>
<script
type="text/javascript"
src="https://cdn.bokeh.org/bokeh/release/bokeh-widgets-2.4.3.min.js"
></script>
<script
type="text/javascript"
src="https://cdn.bokeh.org/bokeh/release/bokeh-tables-2.4.3.min.js"
></script>
<script
type="text/javascript"
src="https://unpkg.com/@holoviz/panel@0.13.1/dist/panel.min.js"
></script>
<script type="text/javascript">
Bokeh.set_log_level("info");
</script>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/css/bootstrap.min.css">
<link rel="stylesheet" href="https://unpkg.com/@holoviz/panel@0.13.1/dist/bundled/bootstraptemplate/bootstrap.css">
<link rel="stylesheet" href="https://unpkg.com/@holoviz/panel@0.13.1/dist/bundled/defaulttheme/default.css">
<link
rel="stylesheet"
href="https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/css/bootstrap.min.css"
/>
<link
rel="stylesheet"
href="https://unpkg.com/@holoviz/panel@0.13.1/dist/bundled/bootstraptemplate/bootstrap.css"
/>
<link
rel="stylesheet"
href="https://unpkg.com/@holoviz/panel@0.13.1/dist/bundled/defaulttheme/default.css"
/>
<style>
#sidebar {
@@ -45,12 +90,14 @@
</head>
<body>
<nav class="navbar" style="background-color: #000000;">
<nav class="navbar" style="background-color: #000000">
<div class="app-header">
<a href="/">
<img src="./logo.png" class="logo">
<img src="./logo.png" class="logo" />
</a>
<a class="title" href="" style="color: #f0ab3c;">Panel KMeans Clustering Demo</a>
<a class="title" href="" style="color: #f0ab3c"
>Panel KMeans Clustering Demo</a
>
</div>
</nav>
<section class="pyscript">
@@ -163,11 +210,15 @@
</section>
<script>
$(document).ready(function () {
$('#sidebarCollapse').on('click', function () {
$('#sidebar').toggleClass('active')
$(this).toggleClass('active')
var interval = setInterval(function () { window.dispatchEvent(new Event('resize')); }, 10);
setTimeout(function () { clearInterval(interval) }, 210)
$("#sidebarCollapse").on("click", function () {
$("#sidebar").toggleClass("active");
$(this).toggleClass("active");
var interval = setInterval(function () {
window.dispatchEvent(new Event("resize"));
}, 10);
setTimeout(function () {
clearInterval(interval);
}, 210);
});
});
</script>

78
examples/panel_stream.html
View File

@@ -1,31 +1,67 @@
<!DOCTYPE html>
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="default">
<meta name="theme-color" content="#000000">
<meta name="name" content="PyScript/Panel Streaming Demo">
<meta charset="utf-8" />
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-status-bar-style" content="default" />
<meta name="theme-color" content="#000000" />
<meta name="name" content="PyScript/Panel Streaming Demo" />
<title>PyScript/Panel Streaming Demo</title>
<link rel="icon" type="image/x-icon" href="./favicon.ico">
<link rel="icon" type="image/x-icon" href="./favicon.ico" />
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.3/css/all.min.css" type="text/css" />
<link rel="stylesheet" href="https://unpkg.com/@holoviz/panel@0.13.1/dist/css/widgets.css" type="text/css" />
<link rel="stylesheet" href="https://unpkg.com/@holoviz/panel@0.13.1/dist/css/markdown.css" type="text/css" />
<link
rel="stylesheet"
href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.3/css/all.min.css"
type="text/css"
/>
<link
rel="stylesheet"
href="https://unpkg.com/@holoviz/panel@0.13.1/dist/css/widgets.css"
type="text/css"
/>
<link
rel="stylesheet"
href="https://unpkg.com/@holoviz/panel@0.13.1/dist/css/markdown.css"
type="text/css"
/>
<script type="text/javascript" src="https://unpkg.com/tabulator-tables@4.9.3/dist/js/tabulator.js"></script>
<script type="text/javascript" src="https://cdn.bokeh.org/bokeh/release/bokeh-2.4.3.js"></script>
<script type="text/javascript" src="https://cdn.bokeh.org/bokeh/release/bokeh-widgets-2.4.3.min.js"></script>
<script type="text/javascript" src="https://cdn.bokeh.org/bokeh/release/bokeh-tables-2.4.3.min.js"></script>
<script type="text/javascript" src="https://unpkg.com/@holoviz/panel@0.13.1/dist/panel.min.js"></script>
<script
type="text/javascript"
src="https://unpkg.com/tabulator-tables@4.9.3/dist/js/tabulator.js"
></script>
<script
type="text/javascript"
src="https://cdn.bokeh.org/bokeh/release/bokeh-2.4.3.js"
></script>
<script
type="text/javascript"
src="https://cdn.bokeh.org/bokeh/release/bokeh-widgets-2.4.3.min.js"
></script>
<script
type="text/javascript"
src="https://cdn.bokeh.org/bokeh/release/bokeh-tables-2.4.3.min.js"
></script>
<script
type="text/javascript"
src="https://unpkg.com/@holoviz/panel@0.13.1/dist/panel.min.js"
></script>
<script type="text/javascript">
Bokeh.set_log_level("info");
</script>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/css/bootstrap.min.css">
<link rel="stylesheet" href="https://unpkg.com/@holoviz/panel@0.13.1/dist/bundled/bootstraptemplate/bootstrap.css">
<link rel="stylesheet" href="https://unpkg.com/@holoviz/panel@0.13.1/dist/bundled/defaulttheme/default.css">
<link
rel="stylesheet"
href="https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/css/bootstrap.min.css"
/>
<link
rel="stylesheet"
href="https://unpkg.com/@holoviz/panel@0.13.1/dist/bundled/bootstraptemplate/bootstrap.css"
/>
<link
rel="stylesheet"
href="https://unpkg.com/@holoviz/panel@0.13.1/dist/bundled/defaulttheme/default.css"
/>
<script src="https://cdn.jsdelivr.net/npm/jquery@3.5.1/dist/jquery.slim.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/js/bootstrap.bundle.min.js"></script>
@@ -36,12 +72,12 @@
</head>
<body>
<nav class="navbar" style="background-color: #000000;">
<nav class="navbar" style="background-color: #000000">
<div class="app-header">
<a href="/">
<img src="./logo.png" class="logo">
<img src="./logo.png" class="logo" />
</a>
<a class="title" href="" style="color: #f0ab3c;">Panel Streaming Demo</a>
<a class="title" href="" style="color: #f0ab3c">Panel Streaming Demo</a>
</div>
</nav>
<section class="pyscript">

2
examples/repl.css
View File

@@ -1,5 +1,5 @@
#output > div {
font-family: 'monospace';
font-family: "monospace";
background-color: #e5e5e5;
border: 1px solid lightgray;
border-top: 0;

12
examples/repl.html
View File

@@ -1,4 +1,4 @@
<!DOCTYPE html>
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8" />
@@ -13,18 +13,18 @@
</head>
<body>
<nav class="navbar" style="background-color: #000000;">
<nav class="navbar" style="background-color: #000000">
<div class="app-header">
<a href="/">
<img src="./logo.png" class="logo">
<img src="./logo.png" class="logo" />
</a>
<a class="title" href="" style="color: #f0ab3c;">PyScript REPL</a>
<a class="title" href="" style="color: #f0ab3c">PyScript REPL</a>
</div>
</nav>
<section class="pyscript">
<h1><b>PyScript REPL</b></h1>
Tip: press Shift-ENTER to evaluate a cell
<br>
<br />
<py-tutor modules="antigravity.py">
<py-config>
plugins = [
@@ -33,7 +33,7 @@
[[fetch]]
files = ["./antigravity.py"]
</py-config>
<div style="margin-right: 3rem;">
<div style="margin-right: 3rem">
<py-repl id="my-repl" auto-generate="true"> </py-repl>
</div>
</py-tutor>

10
examples/repl2.html
View File

@@ -1,4 +1,4 @@
<!DOCTYPE html>
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8" />
@@ -14,12 +14,12 @@
</head>
<body>
<nav class="navbar" style="background-color: #000000;">
<nav class="navbar" style="background-color: #000000">
<div class="app-header">
<a href="/">
<img src="./logo.png" class="logo">
<img src="./logo.png" class="logo" />
</a>
<a class="title" href="" style="color: #f0ab3c;">Custom REPL</a>
<a class="title" href="" style="color: #f0ab3c">Custom REPL</a>
</div>
</nav>
<section class="pyscript">
@@ -37,7 +37,7 @@
[[fetch]]
files = ["./utils.py", "./antigravity.py"]
</py-config>
<div style="margin-right: 3rem;">
<div style="margin-right: 3rem">
<py-repl id="my-repl" auto-generate="true"> </py-repl>
<div id="output" class="p-4"></div>
</div>

93
examples/simple_bioinformatics_tool.html
View File

@@ -1,29 +1,42 @@
<!DOCTYPE html>
<!doctype html>
<html>
<head>
<meta charset='utf-8'>
<meta http-equiv='X-UA-Compatible' content='IE=edge'>
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<title>PyScript — Simple Bioinformatics Example</title>
<link rel="icon" type="image/x-icon" href="./favicon.png">
<meta name='viewport' content='width=device-width, initial-scale=1'>
<link rel='stylesheet' type='text/css' media='screen' href='https://cdn.jsdelivr.net/npm/bulma@0.9.3/css/bulma.min.css'>
<link rel="icon" type="image/png" href="https://user-images.githubusercontent.com/49681382/166738771-d0c26557-426c-4688-9641-8db5e6b08348.png" />
<link rel="icon" type="image/x-icon" href="./favicon.png" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<link
rel="stylesheet"
type="text/css"
media="screen"
href="https://cdn.jsdelivr.net/npm/bulma@0.9.3/css/bulma.min.css"
/>
<link
rel="icon"
type="image/png"
href="https://user-images.githubusercontent.com/49681382/166738771-d0c26557-426c-4688-9641-8db5e6b08348.png"
/>
<script defer src="https://pyscript.net/latest/pyscript.js"></script>
</head>
<body>
<!-- Header -->
<section class="hero is-primary is-small">
<div class="hero-body">
<p class="title is-3">PyScript — Simple Bioinformatics Example <span class="tag is-white">v.1</span></p>
<p class="title is-3">
PyScript — Simple Bioinformatics Example
<span class="tag is-white">v.1</span>
</p>
<p class="subtitle is-6">
Demonstrates the simple use of <a href="https://pyscript.net/" target="_blank"><code>PyScript</code></a>
Demonstrates the simple use of
<a href="https://pyscript.net/" target="_blank"
><code>PyScript</code></a
>
in <strong>Bioinformatics/Computational Biology</strong> fields!
</p>
</div>
</section>
<!-- Main Content -->
<div class="container is-white is-fluid" style="margin-top: 45px">
<p class="title is-3">🧬 DNA Sequence Tool</p>
@@ -32,7 +45,11 @@
<div class="field">
<label class="label">Input DNA Sequence</label>
<div class="control">
<textarea class="textarea" placeholder="GATTACA" id="dna_seq"></textarea>
<textarea
class="textarea"
placeholder="GATTACA"
id="dna_seq"
></textarea>
</div>
</div>
@@ -43,35 +60,62 @@
<div class="select is-fullwidth">
<select name="operation" id="operation">
<option value="Reverse">Compute the reverse counterpart</option>
<option value="Complement">Compute the complement counterpart</option>
<option value="ReverseComplement">Compute the reverse complement counterpart</option>
<option value="Complement">
Compute the complement counterpart
</option>
<option value="ReverseComplement">
Compute the reverse complement counterpart
</option>
</select>
</div>
</div>
<div class="control">
<button id="run" type="button" class="button is-primary" py-onClick="run()">Run!</button>
<button id="clear" type="button" class="button is-danger" py-onClick="clear()">Clear</button>
<button
id="run"
type="button"
class="button is-primary"
py-onClick="run()"
>
Run!
</button>
<button
id="clear"
type="button"
class="button is-danger"
py-onClick="clear()"
>
Clear
</button>
</div>
</div>
<hr>
<hr />
<!--- DNA Sequence Output -->
<label class="label">Output for the <code id="operation_name_output">given operation</code></label>
<label class="label"
>Output for the
<code id="operation_name_output">given operation</code></label
>
<div id="output"></div>
</div>
<br><br>
<br /><br />
<!-- Footer -->
<footer class="footer">
<div class="content has-text-centered">
<p>
Developed by <a href="mailto:furkanmtorun@gmail.com"><strong>Furkan M. Torun (@furkanmtorun)</strong></a>
<br>
Developed by
<a href="mailto:furkanmtorun@gmail.com"
><strong>Furkan M. Torun (@furkanmtorun)</strong></a
>
<br />
<a href="https://github.com/furkanmtorun">GitHub</a>
| <a href="https://scholar.google.com/citations?user=d5ZyOZ4AAAAJ">Google Scholar</a>
| <a href="https://twitter.com/furkanmtorun">Twitter</a>
| <a href="https://www.linkedin.com/in/furkanmtorun/">LinkedIn</a>
|
<a href="https://scholar.google.com/citations?user=d5ZyOZ4AAAAJ"
>Google Scholar</a
>
| <a href="https://twitter.com/furkanmtorun">Twitter</a> |
<a href="https://www.linkedin.com/in/furkanmtorun/">LinkedIn</a>
</p>
</div>
</footer>
@@ -124,6 +168,5 @@ def run(*args, **kwargs):
else:
output.write("Invalid DNA sequence entered")
</py-script>
</body>
</html>

8
examples/simple_clock.html
View File

@@ -1,4 +1,4 @@
<!DOCTYPE html>
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8" />
@@ -14,12 +14,12 @@
</head>
<body>
<nav class="navbar" style="background-color: #000000;">
<nav class="navbar" style="background-color: #000000">
<div class="app-header">
<a href="/">
<img src="./logo.png" class="logo">
<img src="./logo.png" class="logo" />
</a>
<a class="title" href="" style="color: #f0ab3c;">Simple Clock</a>
<a class="title" href="" style="color: #f0ab3c">Simple Clock</a>
</div>
</nav>
<section class="pyscript">

21
examples/todo-pylist.html
View File

@@ -1,4 +1,4 @@
<!DOCTYPE html>
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8" />
@@ -13,18 +13,24 @@
</head>
<body>
<nav class="navbar" style="background-color: #000000;">
<nav class="navbar" style="background-color: #000000">
<div class="app-header">
<a href="/">
<img src="./logo.png" class="logo">
<img src="./logo.png" class="logo" />
</a>
<a class="title" href="" style="color: #f0ab3c;">Pyscript Native TODO App</a>
<a class="title" href="" style="color: #f0ab3c"
>Pyscript Native TODO App</a
>
</div>
</nav>
<section class="pyscript">
<h1>To Do List</h1>
<py-tutor modules="utils.py;pylist.py">
<py-register-widget src="./pylist.py" name="py-list" klass="PyList"></py-register-widget>
<py-register-widget
src="./pylist.py"
name="py-list"
klass="PyList"
></py-register-widget>
<py-config>
plugins = [
@@ -62,11 +68,12 @@
"keypress",
handle_keypress
)
</py-script>
<div class="py-box">
<input id="new-task-content" />
<button py-click="add_task()" id="new-task-btn" class="py-button">Add Task!</button>
<button py-click="add_task()" id="new-task-btn" class="py-button">
Add Task!
</button>
</div>
<py-list id="myList"></py-list>

31
examples/todo.html
View File

@@ -1,4 +1,4 @@
<!DOCTYPE html>
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8" />
@@ -14,12 +14,12 @@
</head>
<body>
<nav class="navbar" style="background-color: #000000;">
<nav class="navbar" style="background-color: #000000">
<div class="app-header">
<a href="/">
<img src="./logo.png" class="logo">
<img src="./logo.png" class="logo" />
</a>
<a class="title" href="" style="color: #f0ab3c;">Todo App</a>
<a class="title" href="" style="color: #f0ab3c">Todo App</a>
</div>
</nav>
<section class="pyscript">
@@ -36,24 +36,35 @@
</py-tutor>
<main>
<section>
<div class="text-center w-full mb-8">
<h1 class="text-3xl font-bold text-gray-800 uppercase tracking-tight">To Do List</h1>
<h1
class="text-3xl font-bold text-gray-800 uppercase tracking-tight"
>
To Do List
</h1>
</div>
<div>
<input id="new-task-content" class="py-input" type="text">
<button id="new-task-btn" class="py-button" type="submit" py-click="add_task()">
<input id="new-task-content" class="py-input" type="text" />
<button
id="new-task-btn"
class="py-button"
type="submit"
py-click="add_task()"
>
Add task
</button>
</div>
<py-list id="myList"></py-list>
<div id="list-tasks-container" class="flex flex-col-reverse mt-4"></div>
<div
id="list-tasks-container"
class="flex flex-col-reverse mt-4"
></div>
<template id="task-template">
<section class="task py-li-element">
<label for="flex items-center p-2 ">
<input class="mr-2" type="checkbox">
<input class="mr-2" type="checkbox" />
<p class="m-0 inline"></p>
</label>
</section>

28
examples/toga/freedom.html
View File

@@ -1,8 +1,11 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta charset="utf-8" />
<meta
name="viewport"
content="width=device-width, initial-scale=1, shrink-to-fit=no"
/>
<title>Freedom Units</title>
<link rel="icon" type="image/png" href="/static/logo-32.png" />
@@ -10,23 +13,28 @@
<script defer src="https://pyscript.net/latest/pyscript.js"></script>
<link rel="stylesheet" href="https://pyscript.net/latest/pyscript.css" />
<link rel="stylesheet"
<link
rel="stylesheet"
href="https://cdn.jsdelivr.net/npm/bootstrap@4.6.2/dist/css/bootstrap.min.css"
integrity="sha384-xOolHFLEh07PJGoPkLv1IbcEPTNtaed2xpHsD9ESMhqIYd0nLMwNLD69Npy4HI+N"
crossorigin="anonymous">
crossorigin="anonymous"
/>
<link rel="stylesheet" href="/static/css/briefcase.css">
<link rel="stylesheet" href="/static/css/briefcase.css" />
</head>
<body>
<div id="app-placeholder"></div>
<script src="https://cdn.jsdelivr.net/npm/jquery@3.5.1/dist/jquery.slim.min.js"
<script
src="https://cdn.jsdelivr.net/npm/jquery@3.5.1/dist/jquery.slim.min.js"
integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj"
crossorigin="anonymous"></script>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.2/dist/js/bootstrap.bundle.min.js"
crossorigin="anonymous"
></script>
<script
src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.2/dist/js/bootstrap.bundle.min.js"
integrity="sha384-Fy6S3B9q64WdZWQUiU+q4/2Lc9npb8tCaSX9FK7E8HnRr0Jz8D6OP9dO5Vg3Q9ct"
crossorigin="anonymous"></script>
crossorigin="anonymous"
></script>
<py-config>
name = "Freedom Units"

2
examples/toga/static/css/briefcase.css
View File

@@ -1,4 +1,3 @@
/* Unset the overly generic pyscript .label style */
#app-placeholder .label {
margin-top: inherit;
@@ -9,7 +8,6 @@
color: inherit;
font-size: inherit;
margin-top: inherit;
}
/*******************************************************************

14
examples/webgl/raycaster/index.html
View File

@@ -1,11 +1,11 @@
<!DOCTYPE html>
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta charset="UTF-8" />
<title>Raycaster</title>
<link rel="icon" type="image/png" href="../favicon.png" />
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="./style.css">
<meta name="viewport" content="width=device-width, initial-scale=1" />
<link rel="stylesheet" href="./style.css" />
</head>
<body>
<div class="container-fluid fixed-top header disable-selection">
@@ -13,14 +13,13 @@
<div class="col"></div>
<div class="col-md-6">
<div class="row">
<div class="col">
</div>
<div class="col"></div>
</div>
</div>
<div class="col"></div>
</div>
</div>
<script src='https://cdnjs.cloudflare.com/ajax/libs/three.js/0.147.0/three.min.js'></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/three.js/0.147.0/three.min.js"></script>
<script defer src="https://pyscript.net/latest/pyscript.js"></script>
<link rel="stylesheet" href="https://pyscript.net/latest/pyscript.css" />
@@ -188,7 +187,6 @@ async def main():
await asyncio.sleep(0.02)
asyncio.ensure_future(main())
</py-script>
</body>
</html>

10
examples/webgl/raycaster/style.css
View File

@@ -12,7 +12,7 @@ canvas {
.header {
/*top:45%;*/
top: 45%;
color: #DDDDDD;
color: #dddddd;
}
.footer {
bottom: 3%;
@@ -25,7 +25,9 @@ canvas {
border-radius: 30px;
padding: 10px 30px;
}
a, a:hover, a:visited {
a,
a:hover,
a:visited {
color: red;
text-decoration: none;
}
@@ -37,7 +39,7 @@ a, a:hover, a:visited {
-webkit-touch-callout: none; /* Disable Android and iOS callouts*/
}
h1::after {
content: ' V 2.0';
content: " V 2.0";
font-size: 12px;
position: absolute;
top: 3px;
@@ -45,7 +47,7 @@ h1::after {
font-weight: 400;
}
h2::after {
content: '2';
content: "2";
font-size: 12px;
position: absolute;
top: 14px;

2
pyscriptjs/__mocks__/cssMock.js
View File

@@ -1 +1 @@
module.exports = "";
module.exports = '';

2
pyscriptjs/__mocks__/fileMock.js
View File

@@ -13,4 +13,4 @@
console.warn(`.py files that are not explicitly mocked in \
jest.config.js and /__mocks__/ are mocked as empty strings`);
module.exports = "";
module.exports = '';

2
pyscriptjs/jest.config.js
View File

@@ -17,7 +17,7 @@ module.exports = {
url: 'http://localhost',
},
moduleNameMapper: {
'^.*?pyscript\.py$': '<rootDir>/__mocks__/_pyscript.js',
'^.*?pyscript.py$': '<rootDir>/__mocks__/_pyscript.js',
'^[./a-zA-Z0-9$_-]+\\.py$': '<rootDir>/__mocks__/fileMock.js',
'\\.(css)$': '<rootDir>/__mocks__/cssMock.js',
},

20
pyscriptjs/public/index.html
View File

@@ -1,12 +1,11 @@
<!DOCTYPE html>
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="https://unpkg.com/mvp.css@1.12/mvp.css">
<link rel="stylesheet" href="pyscript.css">
<meta charset="UTF-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link rel="stylesheet" href="https://unpkg.com/mvp.css@1.12/mvp.css" />
<link rel="stylesheet" href="pyscript.css" />
<script defer src="pyscript.min.js"></script>
<title>PyScript</title>
</head>
@@ -28,7 +27,8 @@
</py-script>
<h2>Example</h2>
<pre style="padding:1em;border:1px solid #000000;">&lt;!DOCTYPE html&gt;
<pre style="padding: 1em; border: 1px solid #000000">
&lt;!DOCTYPE html&gt;
&lt;html lang=&quot;en&quot;&gt;
&lt;head&gt;
&lt;meta charset=&quot;utf-8&quot; /&gt;
@@ -47,8 +47,8 @@ now = datetime.now()
now.strftime(&quot;%m/%d/%Y, %H:%M:%S&quot;)
&lt;/py-script&gt;
&lt;/body&gt;
&lt;/html&gt;</pre>
&lt;/html&gt;</pre
>
</main>
</body>
</html>

51
pyscriptjs/rollup.config.js
View File

@@ -1,50 +1,50 @@
import commonjs from "@rollup/plugin-commonjs";
import resolve from "@rollup/plugin-node-resolve";
import { terser } from "rollup-plugin-terser";
import commonjs from '@rollup/plugin-commonjs';
import resolve from '@rollup/plugin-node-resolve';
import { terser } from 'rollup-plugin-terser';
import legacy from '@rollup/plugin-legacy';
import typescript from "@rollup/plugin-typescript";
import css from "rollup-plugin-css-only";
import serve from "rollup-plugin-serve";
import { string } from "rollup-plugin-string";
import copy from 'rollup-plugin-copy'
import typescript from '@rollup/plugin-typescript';
import css from 'rollup-plugin-css-only';
import serve from 'rollup-plugin-serve';
import { string } from 'rollup-plugin-string';
import copy from 'rollup-plugin-copy';
const production = !process.env.ROLLUP_WATCH || (process.env.NODE_ENV === "production");
const production = !process.env.ROLLUP_WATCH || process.env.NODE_ENV === 'production';
const copy_targets = {
targets: [
{ src: 'public/index.html', dest: 'build' },
{ src: 'src/plugins/*', dest: 'build/plugins' }
]
}
{ src: 'src/plugins/*', dest: 'build/plugins' },
],
};
if (!production) {
copy_targets.targets.push({ src: 'build/*', dest: 'examples/build' })
copy_targets.targets.push({ src: 'build/*', dest: 'examples/build' });
}
export default {
input: "src/main.ts",
input: 'src/main.ts',
output: [
{
file: "build/pyscript.js",
format: "iife",
file: 'build/pyscript.js',
format: 'iife',
sourcemap: true,
inlineDynamicImports: true,
name: "pyscript",
name: 'pyscript',
},
{
file: "build/pyscript.min.js",
format: "iife",
file: 'build/pyscript.min.js',
format: 'iife',
sourcemap: true,
inlineDynamicImports: true,
name: "pyscript",
name: 'pyscript',
plugins: [terser()],
},
],
plugins: [
css({ output: "pyscript.css" }),
css({ output: 'pyscript.css' }),
// Bundle all the Python files into the output file
string({
include: "./src/**/*.py",
include: './src/**/*.py',
}),
legacy({ 'src/toml.js': 'toml' }),
resolve({
@@ -58,10 +58,11 @@ export default {
// This will make sure that examples will always get the latest build folder
copy(copy_targets),
// production && terser(),
!production && serve({
!production &&
serve({
port: 8080,
contentBase: 'examples'}
)
contentBase: 'examples',
}),
],
watch: {
clearScreen: false,

12
pyscriptjs/src/components/pyscript.ts
View File

@@ -36,9 +36,14 @@ export function make_PyScript(interpreter: InterpreterClient, app: PyScriptApp)
app.plugins.beforePyScriptExec({ interpreter: interpreter, src: pySrc, pyScriptTag: this });
const result = (await pyExec(interpreter, pySrc, this)).result;
app.plugins.afterPyScriptExec({interpreter: interpreter, src: pySrc, pyScriptTag: this, result: result});
app.plugins.afterPyScriptExec({
interpreter: interpreter,
src: pySrc,
pyScriptTag: this,
result: result,
});
} finally {
releaseLock()
releaseLock();
}
}
@@ -199,8 +204,7 @@ function createElementsWithEventListeners(interpreter: InterpreterClient, pyAttr
void (async () => {
try {
await interpreter.run(handlerCode);
}
catch (err) {
} catch (err) {
displayPyException(err, el.parentElement);
}
})();

40
pyscriptjs/src/exceptions.ts
View File

@@ -12,50 +12,48 @@ The convention is:
*/
export enum ErrorCode {
GENERIC = "PY0000", // Use this only for development then change to a more specific error code
FETCH_ERROR = "PY0001",
FETCH_NAME_ERROR = "PY0002",
GENERIC = 'PY0000', // Use this only for development then change to a more specific error code
FETCH_ERROR = 'PY0001',
FETCH_NAME_ERROR = 'PY0002',
// Currently these are created depending on error code received from fetching
FETCH_UNAUTHORIZED_ERROR = "PY0401",
FETCH_FORBIDDEN_ERROR = "PY0403",
FETCH_NOT_FOUND_ERROR = "PY0404",
FETCH_SERVER_ERROR = "PY0500",
FETCH_UNAVAILABLE_ERROR = "PY0503",
BAD_CONFIG = "PY1000",
MICROPIP_INSTALL_ERROR = "PY1001",
BAD_PLUGIN_FILE_EXTENSION = "PY2000",
NO_DEFAULT_EXPORT = "PY2001",
TOP_LEVEL_AWAIT = "PY9000"
FETCH_UNAUTHORIZED_ERROR = 'PY0401',
FETCH_FORBIDDEN_ERROR = 'PY0403',
FETCH_NOT_FOUND_ERROR = 'PY0404',
FETCH_SERVER_ERROR = 'PY0500',
FETCH_UNAVAILABLE_ERROR = 'PY0503',
BAD_CONFIG = 'PY1000',
MICROPIP_INSTALL_ERROR = 'PY1001',
BAD_PLUGIN_FILE_EXTENSION = 'PY2000',
NO_DEFAULT_EXPORT = 'PY2001',
TOP_LEVEL_AWAIT = 'PY9000',
}
export class UserError extends Error {
messageType: MessageType;
errorCode: ErrorCode;
constructor(errorCode: ErrorCode, message: string, t: MessageType = "text") {
constructor(errorCode: ErrorCode, message: string, t: MessageType = 'text') {
super(message);
this.errorCode = errorCode;
this.name = "UserError";
this.name = 'UserError';
this.messageType = t;
this.message = `(${errorCode}): ${message}`;
}
}
export class FetchError extends UserError {
errorCode: ErrorCode;
constructor(errorCode: ErrorCode, message: string) {
super(errorCode, message)
this.name = "FetchError";
super(errorCode, message);
this.name = 'FetchError';
}
}
export class InstallError extends UserError {
errorCode: ErrorCode;
constructor(errorCode: ErrorCode, message: string) {
super(errorCode, message)
this.name = "InstallError";
super(errorCode, message);
this.name = 'InstallError';
}
}

1
pyscriptjs/src/interpreter_client.ts
View File

@@ -11,7 +11,6 @@ InterpreterClient class is responsible to request code execution
(among other things) from a `RemoteInterpreter`
*/
export class InterpreterClient extends Object {
_remote: RemoteInterpreter;
config: AppConfig;
/**

2
pyscriptjs/src/main.ts
View File

@@ -208,7 +208,7 @@ export class PyScriptApp {
logger.info('importing pyscript');
// Save and load pyscript.py from FS
interpreter._remote.interface.FS.mkdirTree("/home/pyodide/pyscript");
interpreter._remote.interface.FS.mkdirTree('/home/pyodide/pyscript');
interpreter._remote.interface.FS.writeFile('pyscript/__init__.py', pyscript);
//Refresh the module cache so Python consistently finds pyscript module
interpreter._remote.invalidate_module_path_cache();

13
pyscriptjs/src/plugin.ts
View File

@@ -48,7 +48,7 @@ export class Plugin {
* @param options.src {string} The Python source code to be evaluated
* @param options.pyScriptTag The <py-script> HTML tag that originated the evaluation
*/
beforePyScriptExec(options: {interpreter: InterpreterClient, src: string, pyScriptTag: PyScriptTag}) {}
beforePyScriptExec(options: { interpreter: InterpreterClient; src: string; pyScriptTag: PyScriptTag }) {}
/** The Python in a <py-script> has just been evaluated, but control
* has not been ceded back to the JavaScript event loop yet
@@ -58,7 +58,12 @@ export class Plugin {
* @param options.pyScriptTag The <py-script> HTML tag that originated the evaluation
* @param options.result The returned result of evaluating the Python (if any)
*/
afterPyScriptExec(options: {interpreter: InterpreterClient, src: string, pyScriptTag: PyScriptTag, result: any}) {}
afterPyScriptExec(options: {
interpreter: InterpreterClient;
src: string;
pyScriptTag: PyScriptTag;
result: any;
}) {}
/** Startup complete. The interpreter is initialized and ready, user
* scripts have been executed: the main initialization logic ends here and
@@ -122,13 +127,13 @@ export class PluginManager {
for (const p of this._pythonPlugins) p.afterStartup?.(interpreter);
}
beforePyScriptExec(options: {interpreter: InterpreterClient, src: string, pyScriptTag: PyScriptTag}) {
beforePyScriptExec(options: { interpreter: InterpreterClient; src: string; pyScriptTag: PyScriptTag }) {
for (const p of this._plugins) p.beforePyScriptExec?.(options);
for (const p of this._pythonPlugins) p.beforePyScriptExec?.callKwargs(options);
}
afterPyScriptExec(options: {interpreter: InterpreterClient, src: string, pyScriptTag: PyScriptTag, result: any}) {
afterPyScriptExec(options: { interpreter: InterpreterClient; src: string; pyScriptTag: PyScriptTag; result: any }) {
for (const p of this._plugins) p.afterPyScriptExec?.(options);
for (const p of this._pythonPlugins) p.afterPyScriptExec?.callKwargs(options);

18
pyscriptjs/src/plugins/fetch.ts
View File

@@ -1,5 +1,5 @@
import { joinPaths } from '../utils';
import { FetchConfig } from "../pyconfig";
import { FetchConfig } from '../pyconfig';
import { UserError, ErrorCode } from '../exceptions';
export function calculatePaths(fetch_cfg: FetchConfig[]) {
@@ -10,14 +10,9 @@ export function calculatePaths(fetch_cfg: FetchConfig[]) {
const to_folder = each_fetch_cfg.to_folder || '.';
const to_file = each_fetch_cfg.to_file;
const files = each_fetch_cfg.files;
if (files !== undefined)
{
if (to_file !== undefined)
{
throw new UserError(
ErrorCode.BAD_CONFIG,
`Cannot use 'to_file' and 'files' parameters together!`
);
if (files !== undefined) {
if (to_file !== undefined) {
throw new UserError(ErrorCode.BAD_CONFIG, `Cannot use 'to_file' and 'files' parameters together!`);
}
for (const each_f of files) {
const each_fetch_path = joinPaths([from, each_f]);
@@ -31,10 +26,9 @@ export function calculatePaths(fetch_cfg: FetchConfig[]) {
if (filename === '') {
throw new UserError(
ErrorCode.BAD_CONFIG,
`Couldn't determine the filename from the path ${from}, please supply 'to_file' parameter.`
`Couldn't determine the filename from the path ${from}, please supply 'to_file' parameter.`,
);
}
else {
} else {
paths.push(joinPaths([to_folder, filename]));
}
}

45
pyscriptjs/src/plugins/stdiodirector.ts
View File

@@ -1,7 +1,7 @@
import { Plugin } from "../plugin";
import { TargetedStdio, StdioMultiplexer } from "../stdio";
import { make_PyScript } from "../components/pyscript";
import { InterpreterClient } from "../interpreter_client";
import { Plugin } from '../plugin';
import { TargetedStdio, StdioMultiplexer } from '../stdio';
import { make_PyScript } from '../components/pyscript';
import { InterpreterClient } from '../interpreter_client';
type PyScriptTag = InstanceType<ReturnType<typeof make_PyScript>>;
@@ -17,8 +17,8 @@ export class StdioDirector extends Plugin {
_stdioMultiplexer: StdioMultiplexer;
constructor(stdio: StdioMultiplexer) {
super()
this._stdioMultiplexer = stdio
super();
this._stdioMultiplexer = stdio;
}
/** Prior to a <py-script> tag being evaluated, if that tag itself has
@@ -27,30 +27,35 @@ export class StdioDirector extends Plugin {
* with that ID for the duration of the evaluation.
*
*/
beforePyScriptExec(options: {interpreter: InterpreterClient, src: string, pyScriptTag: PyScriptTag}): void {
if (options.pyScriptTag.hasAttribute("output")){
const targeted_io = new TargetedStdio(options.pyScriptTag, "output", true, true)
options.pyScriptTag.stdout_manager = targeted_io
this._stdioMultiplexer.addListener(targeted_io)
beforePyScriptExec(options: { interpreter: InterpreterClient; src: string; pyScriptTag: PyScriptTag }): void {
if (options.pyScriptTag.hasAttribute('output')) {
const targeted_io = new TargetedStdio(options.pyScriptTag, 'output', true, true);
options.pyScriptTag.stdout_manager = targeted_io;
this._stdioMultiplexer.addListener(targeted_io);
}
if (options.pyScriptTag.hasAttribute("stderr")){
const targeted_io = new TargetedStdio(options.pyScriptTag, "stderr", false, true)
options.pyScriptTag.stderr_manager = targeted_io
this._stdioMultiplexer.addListener(targeted_io)
if (options.pyScriptTag.hasAttribute('stderr')) {
const targeted_io = new TargetedStdio(options.pyScriptTag, 'stderr', false, true);
options.pyScriptTag.stderr_manager = targeted_io;
this._stdioMultiplexer.addListener(targeted_io);
}
}
/** After a <py-script> tag is evaluated, if that tag has a 'stdout_manager'
* (presumably TargetedStdio, or some other future IO handler), it is removed.
*/
afterPyScriptExec(options: {interpreter: InterpreterClient, src: string, pyScriptTag: PyScriptTag, result: any}): void {
afterPyScriptExec(options: {
interpreter: InterpreterClient;
src: string;
pyScriptTag: PyScriptTag;
result: any;
}): void {
if (options.pyScriptTag.stdout_manager != null) {
this._stdioMultiplexer.removeListener(options.pyScriptTag.stdout_manager)
options.pyScriptTag.stdout_manager = null
this._stdioMultiplexer.removeListener(options.pyScriptTag.stdout_manager);
options.pyScriptTag.stdout_manager = null;
}
if (options.pyScriptTag.stderr_manager != null) {
this._stdioMultiplexer.removeListener(options.pyScriptTag.stderr_manager)
options.pyScriptTag.stderr_manager = null
this._stdioMultiplexer.removeListener(options.pyScriptTag.stderr_manager);
options.pyScriptTag.stderr_manager = null;
}
}
}

2
pyscriptjs/src/pyexec.ts
View File

@@ -22,7 +22,7 @@ export async function pyExec(interpreter: InterpreterClient, pysrc: string, outE
'\nSee https://docs.pyscript.net/latest/guides/asyncio.html for more information.',
);
}
return (await interpreter.run(pysrc));
return await interpreter.run(pysrc);
} catch (err) {
// XXX: currently we display exceptions in the same position as
// the output. But we probably need a better way to do that,

16
pyscriptjs/src/remote_interpreter.ts
View File

@@ -37,9 +37,7 @@ export class RemoteInterpreter extends Object {
// TODO: Remove this once `runtimes` is removed!
interpreter: InterpreterInterface;
constructor(
src = 'https://cdn.jsdelivr.net/pyodide/v0.22.1/full/pyodide.js'
) {
constructor(src = 'https://cdn.jsdelivr.net/pyodide/v0.22.1/full/pyodide.js') {
super();
this.src = src;
}
@@ -87,7 +85,7 @@ export class RemoteInterpreter extends Object {
await this.loadPackage('micropip');
}
logger.info('pyodide loaded and initialized');
await this.run('print("Python initialization complete")')
await this.run('print("Python initialization complete")');
}
/* eslint-disable */
@@ -134,10 +132,12 @@ export class RemoteInterpreter extends Object {
// for which the signature of `loadPackage` accepts the above params as args i.e.
// the call uses `logger.info.bind(logger), logger.info.bind(logger)`.
const pyodide_version = (await this.run("import sys; sys.modules['pyodide'].__version__")).result.toString();
if (pyodide_version.startsWith("0.22")) {
await this.interface.loadPackage(names, { messageCallback: logger.info.bind(logger), errorCallback: logger.info.bind(logger) });
}
else {
if (pyodide_version.startsWith('0.22')) {
await this.interface.loadPackage(names, {
messageCallback: logger.info.bind(logger),
errorCallback: logger.info.bind(logger),
});
} else {
await this.interface.loadPackage(names, logger.info.bind(logger), logger.info.bind(logger));
}
}

34
pyscriptjs/src/stdio.ts
View File

@@ -1,4 +1,4 @@
import { createSingularWarning, escape } from "./utils";
import { createSingularWarning, escape } from './utils';
export interface Stdio {
stdout_writeline: (msg: string) => void;
@@ -43,7 +43,6 @@ export class CaptureStdio implements Stdio {
*
*/
export class TargetedStdio implements Stdio {
source_element: HTMLElement;
source_attribute: string;
capture_stdout: boolean;
@@ -67,30 +66,31 @@ export class TargetedStdio implements Stdio{
* @param msg The output to be written
*/
writeline_by_attribute(msg: string) {
const target_id = this.source_element.getAttribute(this.source_attribute)
const target = document.getElementById(target_id)
if (target === null) { // No matching ID
createSingularWarning(`${this.source_attribute} = "${target_id}" does not match the id of any element on the page.`)
const target_id = this.source_element.getAttribute(this.source_attribute);
const target = document.getElementById(target_id);
if (target === null) {
// No matching ID
createSingularWarning(
`${this.source_attribute} = "${target_id}" does not match the id of any element on the page.`,
);
} else {
msg = escape(msg).replace('\n', '<br>');
if (!msg.endsWith('<br/>') && !msg.endsWith('<br>')) {
msg = msg + '<br>';
}
else {
msg = escape(msg).replace("\n", "<br>")
if (!msg.endsWith("<br/>") && !msg.endsWith("<br>")){
msg = msg + "<br>"
}
target.innerHTML += msg
target.innerHTML += msg;
}
}
stdout_writeline(msg: string) {
if (this.capture_stdout) {
this.writeline_by_attribute(msg)
this.writeline_by_attribute(msg);
}
}
stderr_writeline(msg: string) {
if (this.capture_stderr) {
this.writeline_by_attribute(msg)
this.writeline_by_attribute(msg);
}
}
}
@@ -109,9 +109,9 @@ export class StdioMultiplexer implements Stdio {
}
removeListener(obj: Stdio) {
const index = this._listeners.indexOf(obj)
const index = this._listeners.indexOf(obj);
if (index > -1) {
this._listeners.splice(index, 1)
this._listeners.splice(index, 1);
}
}

34
pyscriptjs/src/styles/pyscript_base.css
View File

@@ -1,34 +1,35 @@
/* py-config - not a component */
py-config {
display: none
display: none;
}
/* py-{el} - components not defined */
py-script:not(:defined) {
display: none
display: none;
}
py-repl:not(:defined) {
display: none
display: none;
}
py-title:not(:defined) {
display: none
display: none;
}
py-inputbox:not(:defined) {
display: none
display: none;
}
py-button:not(:defined) {
display: none
display: none;
}
py-box:not(:defined) {
display: none
display: none;
}
html {
font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue',
Arial, 'Noto Sans', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';
line-height: 1.5;
}
@@ -110,7 +111,7 @@ html {
/* Pop-up second layer end */
.alert-banner {
position: relative;
padding: .5rem 1.5rem .5rem .5rem;
padding: 0.5rem 1.5rem 0.5rem 0.5rem;
margin: 5px 0;
}
@@ -119,7 +120,7 @@ html {
}
.py-error {
background-color: #FFE9E8;
background-color: #ffe9e8;
border: solid;
border-color: #f0625f;
color: #9d041c;
@@ -137,13 +138,13 @@ html {
}
.alert-banner.py-warning > #alert-close-button {
color: #794700
color: #794700;
}
#alert-close-button {
position: absolute;
right: .5rem;
top: .5rem;
right: 0.5rem;
top: 0.5rem;
cursor: pointer;
background: transparent;
border: none;
@@ -168,10 +169,7 @@ border: none;
border-color: rgba(209, 213, 219, var(--tw-border-opacity));
border-width: 1px;
position: relative;
--tw-ring-inset: var(--tw-empty,
/*!*/
/*!*/
);
--tw-ring-inset: var(--tw-empty, /*!*/ /*!*/);
--tw-ring-offset-width: 0px;
--tw-ring-offset-color: #fff;
--tw-ring-color: rgba(59, 130, 246, 0.5);
@@ -183,7 +181,7 @@ border: none;
box-sizing: border-box;
border-width: 1px;
border-style: solid;
border-color: rgb(209, 213, 219)
border-color: rgb(209, 213, 219);
}
.editor-box:hover button {

4
pyscriptjs/src/utils.ts
View File

@@ -1,4 +1,4 @@
import { _createAlertBanner } from "./exceptions"
import { _createAlertBanner } from './exceptions';
export function addClasses(element: HTMLElement, classes: string[]) {
for (const entry of classes) {
@@ -129,7 +129,7 @@ export function createLock() {
async function acquireLock() {
const old_lock = _lock;
let releaseLock: () => void;
_lock = new Promise((resolve) => (releaseLock = resolve));
_lock = new Promise(resolve => (releaseLock = resolve));
await old_lock;
return releaseLock;
}

114
pyscriptjs/tests/unit/exceptions.test.ts
View File

@@ -1,121 +1,117 @@
import { expect, it, jest, describe, afterEach } from "@jest/globals"
import { _createAlertBanner, UserError, FetchError, ErrorCode } from "../../src/exceptions"
import { expect, it, jest, describe, afterEach } from '@jest/globals';
import { _createAlertBanner, UserError, FetchError, ErrorCode } from '../../src/exceptions';
describe("Test _createAlertBanner", () => {
describe('Test _createAlertBanner', () => {
afterEach(() => {
// Ensure we always have a clean body
document.body.innerHTML = `<div>Hello World</div>`;
})
});
it("error level shouldn't contain close button", async () => {
_createAlertBanner("Something went wrong!", "error");
_createAlertBanner('Something went wrong!', 'error');
const banner = document.getElementsByClassName("alert-banner");
const closeButton = document.getElementById("alert-close-button");
const banner = document.getElementsByClassName('alert-banner');
const closeButton = document.getElementById('alert-close-button');
expect(banner.length).toBe(1);
expect(banner[0].innerHTML).toBe("Something went wrong!");
expect(banner[0].innerHTML).toBe('Something went wrong!');
expect(closeButton).toBeNull();
})
});
it("warning level should contain close button", async () => {
_createAlertBanner("This is a warning", "warning");
it('warning level should contain close button', async () => {
_createAlertBanner('This is a warning', 'warning');
const banner = document.getElementsByClassName("alert-banner");
const closeButton = document.getElementById("alert-close-button");
const banner = document.getElementsByClassName('alert-banner');
const closeButton = document.getElementById('alert-close-button');
expect(banner.length).toBe(1);
expect(banner[0].innerHTML).toContain("This is a warning");
expect(banner[0].innerHTML).toContain('This is a warning');
expect(closeButton).not.toBeNull();
})
});
it("error level banner should log to console", async () => {
const logSpy = jest.spyOn(console, "error");
it('error level banner should log to console', async () => {
const logSpy = jest.spyOn(console, 'error');
_createAlertBanner("Something went wrong!");
_createAlertBanner('Something went wrong!');
expect(logSpy).toHaveBeenCalledWith("Something went wrong!");
expect(logSpy).toHaveBeenCalledWith('Something went wrong!');
});
})
it('warning level banner should log to console', async () => {
const logSpy = jest.spyOn(console, 'warn');
it("warning level banner should log to console", async () => {
const logSpy = jest.spyOn(console, "warn");
_createAlertBanner('This warning', 'warning');
_createAlertBanner("This warning", "warning");
expect(logSpy).toHaveBeenCalledWith('This warning');
});
expect(logSpy).toHaveBeenCalledWith("This warning");
})
it("close button should remove element from page", async () => {
let banner = document.getElementsByClassName("alert-banner");
it('close button should remove element from page', async () => {
let banner = document.getElementsByClassName('alert-banner');
expect(banner.length).toBe(0);
_createAlertBanner("Warning!", "warning");
_createAlertBanner('Warning!', 'warning');
// Just a sanity check
banner = document.getElementsByClassName("alert-banner");
banner = document.getElementsByClassName('alert-banner');
expect(banner.length).toBe(1);
const closeButton = document.getElementById("alert-close-button");
const closeButton = document.getElementById('alert-close-button');
if (closeButton) {
closeButton.click();
// Confirm that clicking the close button, removes the element
banner = document.getElementsByClassName("alert-banner");
banner = document.getElementsByClassName('alert-banner');
expect(banner.length).toBe(0);
} else {
fail("Unable to find close button on the page, but should exist");
fail('Unable to find close button on the page, but should exist');
}
})
});
it("toggling logging off on error alert shouldn't log to console", async () => {
const errorLogSpy = jest.spyOn(console, "error");
const errorLogSpy = jest.spyOn(console, 'error');
_createAlertBanner("Test error", "error", "text", false);
expect(errorLogSpy).not.toHaveBeenCalledWith("Test error");
})
_createAlertBanner('Test error', 'error', 'text', false);
expect(errorLogSpy).not.toHaveBeenCalledWith('Test error');
});
it("toggling logging off on warning alert shouldn't log to console", async () => {
const warnLogSpy = jest.spyOn(console, "warn");
_createAlertBanner("Test warning", "warning", "text", false);
expect(warnLogSpy).not.toHaveBeenCalledWith("Test warning");
})
const warnLogSpy = jest.spyOn(console, 'warn');
_createAlertBanner('Test warning', 'warning', 'text', false);
expect(warnLogSpy).not.toHaveBeenCalledWith('Test warning');
});
it('_createAlertbanner messageType text writes message to content', async () => {
let banner = document.getElementsByClassName("alert-banner");
let banner = document.getElementsByClassName('alert-banner');
expect(banner.length).toBe(0);
const message = '<p>Test message</p>'
const message = '<p>Test message</p>';
_createAlertBanner(message, 'error', 'text');
banner = document.getElementsByClassName("alert-banner");
banner = document.getElementsByClassName('alert-banner');
expect(banner.length).toBe(1);
expect(banner[0].innerHTML).toBe("&lt;p&gt;Test message&lt;/p&gt;");
expect(banner[0].innerHTML).toBe('&lt;p&gt;Test message&lt;/p&gt;');
expect(banner[0].textContent).toBe(message);
})
});
it('_createAlertbanner messageType html writes message to innerHTML', async () => {
let banner = document.getElementsByClassName("alert-banner");
let banner = document.getElementsByClassName('alert-banner');
expect(banner.length).toBe(0);
const message = '<p>Test message</p>';
_createAlertBanner(message, 'error', 'html');
banner = document.getElementsByClassName("alert-banner");
banner = document.getElementsByClassName('alert-banner');
expect(banner.length).toBe(1);
expect(banner[0].innerHTML).toBe(message);
expect(banner[0].textContent).toBe("Test message");
})
})
expect(banner[0].textContent).toBe('Test message');
});
});
describe("Test Exceptions", () => {
describe('Test Exceptions', () => {
it('UserError contains errorCode and shows in message', async () => {
const errorCode = ErrorCode.BAD_CONFIG;
const message = 'Test error';
const userError = new UserError(ErrorCode.BAD_CONFIG, message);
expect(userError.errorCode).toBe(errorCode);
expect(userError.message).toBe(`(${errorCode}): ${message}`);
})
});
it('FetchError contains errorCode and shows in message', async () => {
const errorCode = ErrorCode.FETCH_NOT_FOUND_ERROR;
@@ -123,5 +119,5 @@ describe("Test Exceptions", () => {
const fetchError = new FetchError(errorCode, message);
expect(fetchError.errorCode).toBe(errorCode);
expect(fetchError.message).toBe(`(${errorCode}): ${message}`);
})
})
});
});

90
pyscriptjs/tests/unit/fetch.test.ts
View File

@@ -1,99 +1,95 @@
import { describe, it, expect, jest } from '@jest/globals'
import { FetchError, ErrorCode } from "../../src/exceptions"
import { robustFetch } from "../../src/fetch"
import { describe, it, expect, jest } from '@jest/globals';
import { FetchError, ErrorCode } from '../../src/exceptions';
import { robustFetch } from '../../src/fetch';
import { Response } from 'node-fetch';
describe("robustFetch", () => {
describe('robustFetch', () => {
it('should return a response object', async () => {
global.fetch = jest.fn(() => Promise.resolve(new Response((status = '200'), 'Hello World')));
it("should return a response object", async () => {
global.fetch = jest.fn(() => (Promise.resolve(new Response(status="200", "Hello World"))));
const response = await robustFetch("https://pyscript.net");
const response = await robustFetch('https://pyscript.net');
expect(response).toBeInstanceOf(Response);
expect(response.status).toBe(200);
})
});
it('receiving a 404 when fetching should throw FetchError with the right errorCode', async () => {
global.fetch = jest.fn(() => (Promise.resolve(new Response("Not Found", {status: 404}))));
global.fetch = jest.fn(() => Promise.resolve(new Response('Not Found', { status: 404 })));
const url = "https://pyscript.net/non-existent-page"
const url = 'https://pyscript.net/non-existent-page';
const expectedError = new FetchError(
ErrorCode.FETCH_NOT_FOUND_ERROR,
`Fetching from URL ${url} failed with error 404 (Not Found). ` +
`Are your filename and path correct?`
)
`Fetching from URL ${url} failed with error 404 (Not Found). ` + `Are your filename and path correct?`,
);
expect(() => robustFetch(url)).rejects.toThrow(expectedError);
})
});
it('receiving a 401 when fetching should throw FetchError with the right errorCode', async () => {
global.fetch = jest.fn(() => (Promise.resolve(new Response("", {status: 401}))));
global.fetch = jest.fn(() => Promise.resolve(new Response('', { status: 401 })));
const url = "https://pyscript.net/protected-page"
const url = 'https://pyscript.net/protected-page';
const expectedError = new FetchError(
ErrorCode.FETCH_UNAUTHORIZED_ERROR,
`Fetching from URL ${url} failed with error 401 (Unauthorized). ` +
`Are your filename and path correct?`
)
`Fetching from URL ${url} failed with error 401 (Unauthorized). ` + `Are your filename and path correct?`,
);
expect(() => robustFetch(url)).rejects.toThrow(expectedError);
})
});
it('receiving a 403 when fetching should throw FetchError with the right errorCode', async () => {
global.fetch = jest.fn(() => (Promise.resolve(new Response("", {status: 403}))));
global.fetch = jest.fn(() => Promise.resolve(new Response('', { status: 403 })));
const url = "https://pyscript.net/secret-page"
const url = 'https://pyscript.net/secret-page';
const expectedError = new FetchError(
ErrorCode.FETCH_FORBIDDEN_ERROR,
`Fetching from URL ${url} failed with error 403 (Forbidden). ` +
`Are your filename and path correct?`
)
`Fetching from URL ${url} failed with error 403 (Forbidden). ` + `Are your filename and path correct?`,
);
expect(() => robustFetch(url)).rejects.toThrow(expectedError);
})
});
it('receiving a 500 when fetching should throw FetchError with the right errorCode', async () => {
global.fetch = jest.fn(() => (Promise.resolve(new Response("Not Found", {status: 500}))));
global.fetch = jest.fn(() => Promise.resolve(new Response('Not Found', { status: 500 })));
const url = "https://pyscript.net/protected-page"
const url = 'https://pyscript.net/protected-page';
const expectedError = new FetchError(
ErrorCode.FETCH_SERVER_ERROR,
`Fetching from URL ${url} failed with error 500 (Internal Server Error). ` +
`Are your filename and path correct?`
)
`Are your filename and path correct?`,
);
expect(() => robustFetch(url)).rejects.toThrow(expectedError);
})
});
it('receiving a 503 when fetching should throw FetchError with the right errorCode', async () => {
global.fetch = jest.fn(() => (Promise.resolve(new Response("Not Found", {status: 503}))));
global.fetch = jest.fn(() => Promise.resolve(new Response('Not Found', { status: 503 })));
const url = "https://pyscript.net/protected-page"
const url = 'https://pyscript.net/protected-page';
const expectedError = new FetchError(
ErrorCode.FETCH_UNAVAILABLE_ERROR,
`Fetching from URL ${url} failed with error 503 (Service Unavailable). ` +
`Are your filename and path correct?`
)
`Are your filename and path correct?`,
);
expect(() => robustFetch(url)).rejects.toThrow(expectedError);
})
});
it('handle TypeError when using a bad url', async () => {
global.fetch = jest.fn(() => (Promise.reject(new TypeError("Failed to fetch"))));
global.fetch = jest.fn(() => Promise.reject(new TypeError('Failed to fetch')));
const url = "https://pyscript.net/protected-page"
const url = 'https://pyscript.net/protected-page';
const expectedError = new FetchError(
ErrorCode.FETCH_ERROR,
`Fetching from URL ${url} failed with error 'Failed to fetch'. Are your filename and path correct?`
)
`Fetching from URL ${url} failed with error 'Failed to fetch'. Are your filename and path correct?`,
);
expect(() => robustFetch(url)).rejects.toThrow(expectedError);
})
});
it('handle failed to fetch when using local file', async () => {
global.fetch = jest.fn(() => (Promise.reject(new TypeError("Failed to fetch"))));
global.fetch = jest.fn(() => Promise.reject(new TypeError('Failed to fetch')));
const url = "./my-awesome-pyscript.py"
const url = './my-awesome-pyscript.py';
const expectedError = new FetchError(
ErrorCode.FETCH_ERROR,
@@ -103,9 +99,9 @@ describe("robustFetch", () => {
you must use a webserver to serve the additional files.
See <a style="text-decoration: underline;" href="https://github.com/pyscript/pyscript/issues/257#issuecomment-1119595062">this reference</a>
on starting a simple webserver with Python.
`
)
`,
);
expect(() => robustFetch(url)).rejects.toThrow(expectedError);
})
});
});

76
pyscriptjs/tests/unit/fetch_plugin.test.ts
View File

@@ -1,49 +1,55 @@
import { calculatePaths } from "../../src/plugins/fetch";
import { FetchConfig } from "../../src/pyconfig";
import { calculatePaths } from '../../src/plugins/fetch';
import { FetchConfig } from '../../src/pyconfig';
describe("CalculateFetchPaths", () => {
it("should calculate paths when only from is provided", () => {
const fetch_cfg: FetchConfig[] = [{from: "http://a.com/data.csv" }];
describe('CalculateFetchPaths', () => {
it('should calculate paths when only from is provided', () => {
const fetch_cfg: FetchConfig[] = [{ from: 'http://a.com/data.csv' }];
const [paths, fetchPaths] = calculatePaths(fetch_cfg);
expect(paths).toStrictEqual(["./data.csv"]);
expect(fetchPaths).toStrictEqual(["http://a.com/data.csv"]);
})
expect(paths).toStrictEqual(['./data.csv']);
expect(fetchPaths).toStrictEqual(['http://a.com/data.csv']);
});
it("should calculate paths when only files is provided", () => {
const fetch_cfg: FetchConfig[] = [{files: ["foo/__init__.py", "foo/mod.py"] }];
it('should calculate paths when only files is provided', () => {
const fetch_cfg: FetchConfig[] = [{ files: ['foo/__init__.py', 'foo/mod.py'] }];
const [paths, fetchPaths] = calculatePaths(fetch_cfg);
expect(paths).toStrictEqual(["./foo/__init__.py", "./foo/mod.py"]);
expect(fetchPaths).toStrictEqual(["foo/__init__.py", "foo/mod.py"]);
})
expect(paths).toStrictEqual(['./foo/__init__.py', './foo/mod.py']);
expect(fetchPaths).toStrictEqual(['foo/__init__.py', 'foo/mod.py']);
});
it("should calculate paths when files and to_folder is provided", () => {
const fetch_cfg: FetchConfig[] = [{files: ["foo/__init__.py", "foo/mod.py"], to_folder: "/my/lib/"}];
it('should calculate paths when files and to_folder is provided', () => {
const fetch_cfg: FetchConfig[] = [{ files: ['foo/__init__.py', 'foo/mod.py'], to_folder: '/my/lib/' }];
const [paths, fetchPaths] = calculatePaths(fetch_cfg);
expect(paths).toStrictEqual(["/my/lib/foo/__init__.py", "/my/lib/foo/mod.py"]);
expect(fetchPaths).toStrictEqual(["foo/__init__.py", "foo/mod.py"]);
})
expect(paths).toStrictEqual(['/my/lib/foo/__init__.py', '/my/lib/foo/mod.py']);
expect(fetchPaths).toStrictEqual(['foo/__init__.py', 'foo/mod.py']);
});
it("should calculate paths when from and files and to_folder is provided", () => {
const fetch_cfg: FetchConfig[] = [{from: "http://a.com/download/", files: ["foo/__init__.py", "foo/mod.py"], to_folder: "/my/lib/"}];
it('should calculate paths when from and files and to_folder is provided', () => {
const fetch_cfg: FetchConfig[] = [
{ from: 'http://a.com/download/', files: ['foo/__init__.py', 'foo/mod.py'], to_folder: '/my/lib/' },
];
const [paths, fetchPaths] = calculatePaths(fetch_cfg);
expect(paths).toStrictEqual(["/my/lib/foo/__init__.py", "/my/lib/foo/mod.py"]);
expect(fetchPaths).toStrictEqual(["http://a.com/download/foo/__init__.py", "http://a.com/download/foo/mod.py"]);
})
expect(paths).toStrictEqual(['/my/lib/foo/__init__.py', '/my/lib/foo/mod.py']);
expect(fetchPaths).toStrictEqual(['http://a.com/download/foo/__init__.py', 'http://a.com/download/foo/mod.py']);
});
it("should error out while calculating paths when filename cannot be determined from 'from'", () => {
const fetch_cfg: FetchConfig[] = [{from: "http://google.com/", to_folder: "/tmp"}];
expect(()=>calculatePaths(fetch_cfg)).toThrowError("Couldn't determine the filename from the path http://google.com/");
})
const fetch_cfg: FetchConfig[] = [{ from: 'http://google.com/', to_folder: '/tmp' }];
expect(() => calculatePaths(fetch_cfg)).toThrowError(
"Couldn't determine the filename from the path http://google.com/",
);
});
it("should calculate paths when to_file is explicitly supplied", () => {
const fetch_cfg: FetchConfig[] = [{from: "http://a.com/data.csv?version=1", to_file: "pkg/tmp/data.csv"}];
it('should calculate paths when to_file is explicitly supplied', () => {
const fetch_cfg: FetchConfig[] = [{ from: 'http://a.com/data.csv?version=1', to_file: 'pkg/tmp/data.csv' }];
const [paths, fetchPaths] = calculatePaths(fetch_cfg);
expect(paths).toStrictEqual(["./pkg/tmp/data.csv"]);
expect(fetchPaths).toStrictEqual(["http://a.com/data.csv?version=1"]);
})
expect(paths).toStrictEqual(['./pkg/tmp/data.csv']);
expect(fetchPaths).toStrictEqual(['http://a.com/data.csv?version=1']);
});
it("should error out when both to_file and files parameters are provided", () => {
const fetch_cfg: FetchConfig[] = [{from: "http://a.com/data.csv?version=1", to_file: "pkg/tmp/data.csv", files: ["a.py", "b.py"]}];
it('should error out when both to_file and files parameters are provided', () => {
const fetch_cfg: FetchConfig[] = [
{ from: 'http://a.com/data.csv?version=1', to_file: 'pkg/tmp/data.csv', files: ['a.py', 'b.py'] },
];
expect(() => calculatePaths(fetch_cfg)).toThrowError("Cannot use 'to_file' and 'files' parameters together!");
})
})
});
});

25
pyscriptjs/tests/unit/logger.test.ts
View File

@@ -15,20 +15,16 @@ describe('getLogger', () => {
console.info = jest.fn();
const logger = getLogger('prefix1');
logger.info('hello world')
expect(console.info).toHaveBeenCalledWith(
'[prefix1] hello world'
)
logger.info('hello world');
expect(console.info).toHaveBeenCalledWith('[prefix1] hello world');
});
it('logger.info handles multiple args', () => {
console.info = jest.fn();
const logger = getLogger('prefix2');
logger.info('hello', 'world', 1, 2, 3)
expect(console.info).toHaveBeenCalledWith(
'[prefix2] hello', 'world', 1, 2, 3
)
logger.info('hello', 'world', 1, 2, 3);
expect(console.info).toHaveBeenCalledWith('[prefix2] hello', 'world', 1, 2, 3);
});
it('logger.{debug,warn,error} also works', () => {
@@ -43,15 +39,8 @@ describe('getLogger', () => {
logger.error('this is an error');
expect(console.info).not.toHaveBeenCalled();
expect(console.debug).toHaveBeenCalledWith(
'[prefix3] this is a debug'
)
expect(console.warn).toHaveBeenCalledWith(
'[prefix3] this is a warning'
)
expect(console.error).toHaveBeenCalledWith(
'[prefix3] this is an error'
)
expect(console.debug).toHaveBeenCalledWith('[prefix3] this is a debug');
expect(console.warn).toHaveBeenCalledWith('[prefix3] this is a warning');
expect(console.error).toHaveBeenCalledWith('[prefix3] this is an error');
});
});

35
pyscriptjs/tests/unit/main.test.ts
View File

@@ -1,9 +1,8 @@
import { describe, it, beforeEach, expect } from "@jest/globals"
import { UserError, ErrorCode } from "../../src/exceptions"
import { PyScriptApp } from "../../src/main"
describe("Test withUserErrorHandler", () => {
import { describe, it, beforeEach, expect } from '@jest/globals';
import { UserError, ErrorCode } from '../../src/exceptions';
import { PyScriptApp } from '../../src/main';
describe('Test withUserErrorHandler', () => {
class MyApp extends PyScriptApp {
myRealMain: any;
@@ -24,46 +23,46 @@ describe("Test withUserErrorHandler", () => {
it("userError doesn't stop execution", () => {
function myRealMain() {
throw new UserError(ErrorCode.GENERIC, "Computer says no");
throw new UserError(ErrorCode.GENERIC, 'Computer says no');
}
const app = new MyApp(myRealMain);
app.main();
const banners = document.getElementsByClassName("alert-banner");
const banners = document.getElementsByClassName('alert-banner');
expect(banners.length).toBe(1);
expect(banners[0].innerHTML).toBe("(PY0000): Computer says no");
expect(banners[0].innerHTML).toBe('(PY0000): Computer says no');
});
it("userError escapes by default", () => {
it('userError escapes by default', () => {
function myRealMain() {
throw new UserError(ErrorCode.GENERIC, "hello <br>");
throw new UserError(ErrorCode.GENERIC, 'hello <br>');
}
const app = new MyApp(myRealMain);
app.main();
const banners = document.getElementsByClassName("alert-banner");
const banners = document.getElementsByClassName('alert-banner');
expect(banners.length).toBe(1);
expect(banners[0].innerHTML).toBe("(PY0000): hello &lt;br&gt;");
expect(banners[0].innerHTML).toBe('(PY0000): hello &lt;br&gt;');
});
it("userError messageType=html don't escape", () => {
function myRealMain() {
throw new UserError(ErrorCode.GENERIC, "hello <br>", "html");
throw new UserError(ErrorCode.GENERIC, 'hello <br>', 'html');
}
const app = new MyApp(myRealMain);
app.main();
const banners = document.getElementsByClassName("alert-banner");
const banners = document.getElementsByClassName('alert-banner');
expect(banners.length).toBe(1);
expect(banners[0].innerHTML).toBe("(PY0000): hello <br>");
expect(banners[0].innerHTML).toBe('(PY0000): hello <br>');
});
it("any other exception should stop execution and raise", () => {
it('any other exception should stop execution and raise', () => {
function myRealMain() {
throw new Error("Explosions!");
throw new Error('Explosions!');
}
const app = new MyApp(myRealMain);
expect(() => app.main()).toThrow(new Error("Explosions!"))
expect(() => app.main()).toThrow(new Error('Explosions!'));
});
});

2
pyscriptjs/tests/unit/pyodide.test.ts
View File

@@ -11,7 +11,7 @@ describe('RemoteInterpreter', () => {
let interpreter: InterpreterClient;
let stdio: CaptureStdio = new CaptureStdio();
beforeAll(async () => {
const config: AppConfig = {interpreters: [{src: "../pyscriptjs/node_modules/pyodide/pyodide.js"}]};
const config: AppConfig = { interpreters: [{ src: '../pyscriptjs/node_modules/pyodide/pyodide.js' }] };
interpreter = new InterpreterClient(config, stdio);
/**

86
pyscriptjs/tests/unit/stdio.test.ts
View File

@@ -4,31 +4,29 @@ import { type Stdio, CaptureStdio, StdioMultiplexer, TargetedStdio } from '../..
describe('CaptureStdio', () => {
it('captured streams are initialized to empty string', () => {
let stdio = new CaptureStdio();
expect(stdio.captured_stdout).toBe("");
expect(stdio.captured_stderr).toBe("");
expect(stdio.captured_stdout).toBe('');
expect(stdio.captured_stderr).toBe('');
});
it('stdout() and stderr() captures', () => {
let stdio = new CaptureStdio();
stdio.stdout_writeline("hello");
stdio.stdout_writeline("world");
stdio.stderr_writeline("this is an error");
expect(stdio.captured_stdout).toBe("hello\nworld\n");
expect(stdio.captured_stderr).toBe("this is an error\n");
stdio.stdout_writeline('hello');
stdio.stdout_writeline('world');
stdio.stderr_writeline('this is an error');
expect(stdio.captured_stdout).toBe('hello\nworld\n');
expect(stdio.captured_stderr).toBe('this is an error\n');
});
it('reset() works', () => {
let stdio = new CaptureStdio();
stdio.stdout_writeline("aaa");
stdio.stderr_writeline("bbb");
stdio.stdout_writeline('aaa');
stdio.stderr_writeline('bbb');
stdio.reset();
expect(stdio.captured_stdout).toBe("");
expect(stdio.captured_stderr).toBe("");
expect(stdio.captured_stdout).toBe('');
expect(stdio.captured_stderr).toBe('');
});
});
describe('StdioMultiplexer', () => {
let a: CaptureStdio;
let b: CaptureStdio;
@@ -44,10 +42,10 @@ describe('StdioMultiplexer', () => {
// no listeners, messages are ignored
multi.stdout_writeline('out 1');
multi.stderr_writeline('err 1');
expect(a.captured_stdout).toBe("");
expect(a.captured_stderr).toBe("");
expect(b.captured_stdout).toBe("");
expect(b.captured_stderr).toBe("");
expect(a.captured_stdout).toBe('');
expect(a.captured_stderr).toBe('');
expect(b.captured_stdout).toBe('');
expect(b.captured_stderr).toBe('');
});
it('redirects to multiple listeners', () => {
@@ -59,11 +57,11 @@ describe('StdioMultiplexer', () => {
multi.stdout_writeline('out 2');
multi.stderr_writeline('err 2');
expect(a.captured_stdout).toBe("out 1\nout 2\n");
expect(a.captured_stderr).toBe("err 1\nerr 2\n");
expect(a.captured_stdout).toBe('out 1\nout 2\n');
expect(a.captured_stderr).toBe('err 1\nerr 2\n');
expect(b.captured_stdout).toBe("out 2\n");
expect(b.captured_stderr).toBe("err 2\n");
expect(b.captured_stdout).toBe('out 2\n');
expect(b.captured_stderr).toBe('err 2\n');
});
});
@@ -75,32 +73,30 @@ describe('TargetedStdio', () => {
beforeEach(() => {
//DOM element to capture stdout and stderr
let target_div = document.getElementById("output-id");
let target_div = document.getElementById('output-id');
if (target_div === null) {
target_div = document.createElement('div');
target_div.id = "output-id";
target_div.id = 'output-id';
document.body.appendChild(target_div);
}
else {
target_div.innerHTML = "";
} else {
target_div.innerHTML = '';
}
//DOM element to capture stderr
let error_div = document.getElementById("error-id");
let error_div = document.getElementById('error-id');
if (error_div === null) {
error_div = document.createElement('div');
error_div.id = "error-id";
error_div.id = 'error-id';
document.body.appendChild(error_div);
}
else {
error_div.innerHTML = "";
} else {
error_div.innerHTML = '';
}
const tag = document.createElement('div');
tag.setAttribute("output", "output-id");
tag.setAttribute("stderr", "error-id");
tag.setAttribute('output', 'output-id');
tag.setAttribute('stderr', 'error-id');
capture = new CaptureStdio();
targeted = new TargetedStdio(tag, 'output', true, true);
@@ -113,28 +109,28 @@ describe('TargetedStdio', () => {
});
it('targeted id is set by constructor', () => {
expect(targeted.source_attribute).toBe("output");
expect(targeted.source_attribute).toBe('output');
});
it('targeted stdio/stderr also goes to multiplexer', () => {
multi.stdout_writeline("out 1");
multi.stderr_writeline("out 2");
expect(capture.captured_stdout).toBe("out 1\n");
expect(capture.captured_stderr).toBe("out 2\n");
expect(document.getElementById("output-id")?.innerHTML).toBe("out 1<br>out 2<br>");
expect(document.getElementById("error-id")?.innerHTML).toBe("out 2<br>");
multi.stdout_writeline('out 1');
multi.stderr_writeline('out 2');
expect(capture.captured_stdout).toBe('out 1\n');
expect(capture.captured_stderr).toBe('out 2\n');
expect(document.getElementById('output-id')?.innerHTML).toBe('out 1<br>out 2<br>');
expect(document.getElementById('error-id')?.innerHTML).toBe('out 2<br>');
});
it('Add and remove targeted listener', () => {
multi.stdout_writeline("out 1");
multi.stdout_writeline('out 1');
multi.removeListener(targeted);
multi.stdout_writeline("out 2");
multi.stdout_writeline('out 2');
multi.addListener(targeted);
multi.stdout_writeline("out 3");
multi.stdout_writeline('out 3');
//all three should be captured by multiplexer
expect(capture.captured_stdout).toBe("out 1\nout 2\nout 3\n");
expect(capture.captured_stdout).toBe('out 1\nout 2\nout 3\n');
//out 2 should not be present in the DOM element
expect(document.getElementById("output-id")?.innerHTML).toBe("out 1<br>out 3<br>");
expect(document.getElementById('output-id')?.innerHTML).toBe('out 1<br>out 3<br>');
});
});

89
pyscriptjs/tests/unit/utils.test.ts
View File

@@ -1,73 +1,78 @@
import { beforeEach, expect, describe, it } from "@jest/globals"
import { ensureUniqueId, joinPaths, createSingularWarning} from "../../src/utils"
describe("Utils", () => {
import { beforeEach, expect, describe, it } from '@jest/globals';
import { ensureUniqueId, joinPaths, createSingularWarning } from '../../src/utils';
describe('Utils', () => {
let element: HTMLElement;
beforeEach(() => {
element = document.createElement("div");
})
element = document.createElement('div');
});
it("ensureUniqueId sets unique id on element", async () => {
expect(element.id).toBe("")
it('ensureUniqueId sets unique id on element', async () => {
expect(element.id).toBe('');
ensureUniqueId(element)
ensureUniqueId(element);
expect(element.id).toBe("py-internal-0")
})
expect(element.id).toBe('py-internal-0');
});
it("ensureUniqueId sets unique id with increasing counter", async () => {
const secondElement = document.createElement("div")
it('ensureUniqueId sets unique id with increasing counter', async () => {
const secondElement = document.createElement('div');
expect(element.id).toBe("")
expect(secondElement.id).toBe("")
expect(element.id).toBe('');
expect(secondElement.id).toBe('');
ensureUniqueId(element)
ensureUniqueId(secondElement)
ensureUniqueId(element);
ensureUniqueId(secondElement);
// The counter will have been incremented on
// the previous test, make sure it keeps increasing
expect(element.id).toBe("py-internal-1")
expect(secondElement.id).toBe("py-internal-2")
})
})
expect(element.id).toBe('py-internal-1');
expect(secondElement.id).toBe('py-internal-2');
});
});
describe("JoinPaths", () => {
it("should remove trailing slashes from the beginning and the end", () => {
describe('JoinPaths', () => {
it('should remove trailing slashes from the beginning and the end', () => {
const paths: string[] = ['///abc/d/e///'];
const joinedPath = joinPaths(paths);
expect(joinedPath).toStrictEqual('/abc/d/e');
})
});
it("should not remove slashes from the middle to preserve protocols such as http", () => {
it('should not remove slashes from the middle to preserve protocols such as http', () => {
const paths: string[] = ['http://google.com', '///data.txt'];
const joinedPath = joinPaths(paths);
expect(joinedPath).toStrictEqual('http://google.com/data.txt');
})
});
it("should not join paths when they are empty strings", () => {
it('should not join paths when they are empty strings', () => {
const paths: string[] = ['', '///hhh/ll/pp///', '', 'kkk'];
const joinedPath = joinPaths(paths);
expect(joinedPath).toStrictEqual('hhh/ll/pp/kkk');
})
});
describe("createSingularBanner", () => {
it("should create one and new banner containing the sentinel text, and not duplicate it", () => {
describe('createSingularBanner', () => {
it('should create one and new banner containing the sentinel text, and not duplicate it', () => {
//One warning banner with the desired text should be created
createSingularWarning("A unique error message", "unique")
expect(document.getElementsByClassName("alert-banner")?.length).toEqual(1)
expect(document.getElementsByClassName("alert-banner")[0].textContent).toEqual(expect.stringContaining("A unique error message"))
createSingularWarning('A unique error message', 'unique');
expect(document.getElementsByClassName('alert-banner')?.length).toEqual(1);
expect(document.getElementsByClassName('alert-banner')[0].textContent).toEqual(
expect.stringContaining('A unique error message'),
);
//Should still only be one banner, since the second uses the existing sentinel value "unique"
createSingularWarning("This banner should not appear", "unique")
expect(document.getElementsByClassName("alert-banner")?.length).toEqual(1)
expect(document.getElementsByClassName("alert-banner")[0].textContent).toEqual(expect.stringContaining("A unique error message"))
createSingularWarning('This banner should not appear', 'unique');
expect(document.getElementsByClassName('alert-banner')?.length).toEqual(1);
expect(document.getElementsByClassName('alert-banner')[0].textContent).toEqual(
expect.stringContaining('A unique error message'),
);
//If the sentinel value is not provided, the entire msg is used as the sentinel
createSingularWarning("A unique error message", null)
expect(document.getElementsByClassName("alert-banner")?.length).toEqual(1)
expect(document.getElementsByClassName("alert-banner")[0].textContent).toEqual(expect.stringContaining("A unique error message"))
})
})
})
createSingularWarning('A unique error message', null);
expect(document.getElementsByClassName('alert-banner')?.length).toEqual(1);
expect(document.getElementsByClassName('alert-banner')[0].textContent).toEqual(
expect.stringContaining('A unique error message'),
);
});
});
});

Some files were not shown because too many files have changed in this diff Show More