q5 4.5.3 → 4.6.0

package/README.md

@@ -17,13 +17,13 @@ circle(0, 0, 80);
 
 ## Documentation
 
-The [q5 learn pages](https://q5js.org/learn) are organized into sections with interactive mini-examples.
+The [q5 learn pages](https://q5js.org/learn) have interactive mini-examples.
 
 See the [wiki](https://github.com/q5js/q5.js/wiki) for extended documentation.
 
 ## Support q5 💙
 
-q5 is open source and anyone can use it for free under the terms of the LGPL. 🎉
+q5 is open source. Anyone can use it for free under the terms of the LGPL. 🎉
 
 We need your support though! If you enjoy using q5, please donate via [GitHub Sponsors](https://github.com/sponsors/quinton-ashley), [ko-fi](https://ko-fi.com/q5play), or [Patreon](https://www.patreon.com/q5play).
 
@@ -47,7 +47,9 @@ p5.js is licensed under the LGPLv2, small sections of p5' code directly copied i
 
 q5 was inspired by the incredible work of [Ben Fry](https://benfry.com) and [Casey Reas](https://x.com/REAS) on Java [Processing](https://processingfoundation.org/) from 2001 to 2023, [Lauren McCarthy](http://lauren-mccarthy.com)'s work on [p5.js](https://p5js.org) from 2013 to 2019, and all contributors to these projects.
 
-## Code Excerpt Sources
+Huge thanks to all the [q5 contributors](https://github.com/q5js/q5.js/graphs/contributors)!
+
+@evanalulu, @Tezumie, @keturn, @ormaq, @bertubi, @RedWilly, @Dukemz, @LingDong-
 
 WebGPU MSDF text rendering:
 https://webgpu.github.io/webgpu-samples/?sample=textRenderingMsdf

package/deno.json

@@ -1,6 +1,6 @@
 {
 	"name": "@q5/q5",
-	"version": "4.5.3",
+	"version": "4.6.0",
 	"license": "LGPL-3.0-only",
 	"description": "Beginner friendly graphics powered by WebGPU, optimized for interactive art!",
 	"author": "quinton-ashley",

package/package.json

@@ -1,15 +1,8 @@
 {
 	"name": "q5",
-	"version": "4.5.3",
+	"version": "4.6.0",
 	"description": "Beginner friendly graphics powered by WebGPU, optimized for interactive art!",
 	"author": "quinton-ashley",
-	"contributors": [
-		"evanalulu",
-		"Tezumie",
-		"ormaq",
-		"Dukemz",
-		"LingDong-"
-	],
 	"license": "LGPL-3.0-only",
 	"homepage": "https://q5js.org/home",
 	"types": "q5.d.ts",

package/q5.js

@@ -2,7 +2,7 @@
  * q5.js
  * @version 4.5
  * @author quinton-ashley
- * @contributors evanalulu, Tezumie, ormaq, Dukemz, LingDong-
+ * @contributors evanalulu, Tezumie, keturn, ormaq, bertubi, RedWilly, Dukemz, LingDong-
  * @license LGPL-3.0
  * @class Q5
  */
@@ -393,6 +393,7 @@ Q5._esm = this === undefined;
 
 Q5._instanceCount = 0;
 Q5.instances = [];
+Q5.errorTolerant = false;
 Q5._friendlyError = (msg, func) => {
 	if (!Q5.disableFriendlyErrors) console.error(func + ': ' + msg);
 };
@@ -9591,43 +9592,32 @@ const runPython = async function () {
 	}
 
 	const useWebGPU = !code.slice(0, code.indexOf('\n')).includes('C2D'),
-		q5py = useWebGPU ? await Q5.WebGPU() : new Q5();
+		q = useWebGPU ? await Q5.WebGPU() : new Q5();
 
 	// `window.Canvas` returns a promise that resolves when Q5 is ready
 	// but `q5py.Canvas` returns the renderer synchronously
 	// so to make Brython happy with `await Canvas()` we need to make it async
-	const Canvas = q5py.Canvas;
-	q5py.Canvas = async (...a) => Canvas(...a);
+	const Canvas = q.Canvas;
+	q.Canvas = async (...a) => Canvas(...a);
 
-	code = code.replaceAll('\n', '\n\t');
+	// add a tab before each line of code to nest it inside the __run function
+	// but not within triple-quoted strings
+	code = code
+		.split(/(\"\"\"[\s\S]*?\"\"\"|\'\'\'[\s\S]*?\'\'\')/g)
+		.map((part, i) => (i % 2 === 0 ? part.replaceAll('\n', '\n\t') : part))
+		.join('');
 
 	code = `
-async def __run():
+async def __run(q):
 	${code}
 
-	_q5_state_vars = ["mouseX", "mouseY", "pmouseX", "pmouseY", "width", "height", "frameCount", "deltaTime", "mouseIsPressed", "mouseButton", "keyIsPressed", "key", "keyCode", "touches", "movedX", "movedY"]
-
-	def _sync_and_call(fn):
-		def _wrapper(*args):
-			try:
-				for var in _q5_state_vars:
-					if hasattr(q5py, var):
-						ns[var] = getattr(q5py, var)
-				return fn(*args)
-			except Exception as e:
-				window._pyErr(_err())
-				raise e
-		return _wrapper
-
-	for fn_name in ["update", "draw", "mousePressed", "mouseReleased", "mouseMoved", "mouseDragged", "mouseClicked", "doubleClicked", "mouseWheel", "keyPressed", "keyReleased", "keyTyped", "touchStarted", "touchMoved", "touchEnded", "windowResized"]:
-		if fn_name in locals():
-			setattr(window, fn_name, _sync_and_call(locals()[fn_name]))
+	_wrap_fns(q, locals(), ns)
 `;
 
 	window._pyErr = (err, lineNum) => {
 		if (typeof err === 'string' && err.includes('Traceback')) {
 			let lines = err.split('\n');
-			for (let i = 0; i < lines.length; i++) {
+			for (let i = lines.length - 1; i > 0; i--) {
 				const match = lines[i].match(/File "<string>", line (\d+)/);
 				if (match) {
 					lineNum = parseInt(match[1]);
@@ -9639,6 +9629,9 @@ async def __run():
 						for (let j = 0; j < Math.min(2, lines.length); j++) {
 							lines[j] = lines[j].slice(indent.length);
 						}
+					} else {
+						let line = code.split('\n')[lineNum - 1].trim();
+						lines.unshift(line, '');
 					}
 					err = lines.join('\n');
 					break;
@@ -9646,7 +9639,9 @@ async def __run():
 			}
 		}
 
-		let file = scripts[0].src.split('/').at(-1);
+		let file = scripts[0].src || scripts[0]['data-filename'] || 'sketch.py';
+		file = file.split('/').at(-1);
+
 		lineNum -= 2; // adjust for the wrapper code lines
 		if (Q5.friendlyError) Q5.friendlyError(file, lineNum, err);
 		else console.error(`Error in ${file} on line ${lineNum}:\n\n${err}`);
@@ -9663,41 +9658,72 @@ from browser import window, aio
 import traceback
 import io
 
+_state_vars = ["frameCount", "deltaTime", "width", "height", "halfWidth", "halfHeight", "windowWidth", "windowHeight", "mouseX", "mouseY", "pmouseX", "pmouseY", "movedX", "movedY", "mouseIsPressed", "mouseButton", "keyIsPressed", "key", "keyCode", "touches", "recording"]
+
+_usr_fns = ["update", "draw", "postProcess", "mousePressed", "mouseReleased", "mouseMoved", "mouseDragged", "mouseClicked", "doubleClicked", "mouseWheel", "keyPressed", "keyReleased", "keyTyped", "touchStarted", "touchMoved", "touchEnded", "windowResized"]
+
 def _err():
 	f = io.StringIO()
 	traceback.print_exc(file=f)
 	return f.getvalue()
 
-async def _run_py(q5py, code):
+def _sync_state(q, ns):
+	for var in _state_vars:
+		if hasattr(q, var):
+			ns[var] = getattr(q, var)
+
+def _sync_and_call(q, fn, ns):
+	def _wrapper(*args):
+		try:
+			_sync_state(q, ns)
+			return fn(*args)
+		except Exception as e:
+			window._pyErr(_err(), None, q)
+			if not window.Q5.errorTolerant: q.noLoop()
+	return _wrapper
+
+def _wrap_fns(q, locs, ns):
+	for fn_name in _usr_fns:
+		if fn_name in locs:
+			setattr(q, fn_name, _sync_and_call(q, locs[fn_name], ns))
+
+async def _run_py(q, code):
 	ns = globals().copy()
 	ns['ns'] = ns
-	ns['q5py'] = q5py
+	ns['Q5'] = window.Q5
 
-	for attr in dir(q5py):
+	for attr in dir(q):
 		if not attr.startswith('_'):
 			try:
-				ns[attr] = getattr(q5py, attr)
+				ns[attr] = getattr(q, attr)
 			except Exception:
 				pass
 
+	_orig_Canvas = ns['Canvas']
+	async def _canvas_wrapper(*args):
+		result = await _orig_Canvas(*args)
+		_sync_state(q, ns)
+		return result
+	ns['Canvas'] = ns['createCanvas'] = _canvas_wrapper
+
 	try:
 		exec(code, ns)
 	except SyntaxError as e:
-		return window._pyErr(_err(), e.lineno)
+		return window._pyErr(_err(), e.lineno, q)
 	except Exception as e:
-		return window._pyErr(_err())
-	
+		return window._pyErr(_err(), 0, q)
+
 	try:
-		await ns["__run"]()
+		await ns["__run"](q)
 	except Exception as e:
-		window._pyErr(_err())
+		window._pyErr(_err(), 0, q)
 
 window._runPy = _run_py
 `);
 
 	console.log = log;
 
-	await window._runPy(q5py, code);
+	await window._runPy(q, code);
 };
 
 if (typeof document == 'object') {