q5 2.11.1 → 2.11.2

package/deno.json

@@ -1,6 +1,6 @@
 {
 	"name": "@q5/q5",
-	"version": "2.11.0",
+	"version": "2.11.2",
 	"license": "LGPL-3.0",
 	"description": "A sequel to p5.js that's optimized for interactive art",
 	"author": "quinton-ashley",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "q5",
-	"version": "2.11.1",
+	"version": "2.11.2",
 	"description": "A sequel to p5.js that's optimized for interactive art",
 	"author": "quinton-ashley",
 	"contributors": [
@@ -15,7 +15,7 @@
 		"min": "terser q5.js --compress ecma=2024 --mangle > q5.min.js",
 		"dist": "bun bundle && bun min",
 		"dist-p5play": "bun dist && cp q5.js ../../web/p5play-web/v3/q5.js && cp q5.min.js ../../web/p5play-web/v3/q5.min.js",
-		"tests": "deno test --unstable-node-globals -A",
+		"tests": "jest test",
 		"v": "npm version patch --force",
 		"V": "npm version minor --force",
 		"version": "git add -A",
@@ -38,6 +38,7 @@
 		"q5js"
 	],
 	"devDependencies": {
+		"jest-cli": "^29.7.0",
 		"jsdom": "^25.0.1",
 		"skia-canvas": "^1.0.2"
 	}

package/q5-server.js

@@ -3,54 +3,58 @@
  * @description Run q5 with node.js using node-canvas and jsdom
  */
 
+let depsLoaded = false;
+
 try {
 	global.SkiaCanvas ??= require('skia-canvas');
 	global.JSDOM ??= require('jsdom').JSDOM;
+	depsLoaded = true;
 } catch (e) {
 	require('./q5.js');
 	module.exports = Q5;
-	return;
 }
 
-global.window = new JSDOM('', { url: 'http://localhost' }).window;
+if (depsLoaded) {
+	global.window = new JSDOM('', { url: 'http://localhost' }).window;
 
-{
-	let props = Object.getOwnPropertyNames(window).concat(Object.getOwnPropertyNames(Object.getPrototypeOf(window)));
-	for (let prop of props) {
-		if (!global[prop]) {
-			Object.defineProperty(global, prop, Object.getOwnPropertyDescriptor(window, prop));
+	{
+		let props = Object.getOwnPropertyNames(window).concat(Object.getOwnPropertyNames(Object.getPrototypeOf(window)));
+		for (let prop of props) {
+			if (!global[prop]) {
+				Object.defineProperty(global, prop, Object.getOwnPropertyDescriptor(window, prop));
+			}
 		}
+		global.Event = window.Event;
 	}
-	global.Event = window.Event;
-}
 
-global.Image = window.Image = SkiaCanvas.Image;
-global.Window ??= SkiaCanvas.Window;
-
-require('./q5.js');
-
-Q5._createServerCanvas = function () {
-	let skiaCanvas = new SkiaCanvas.Canvas(...arguments);
-	let domCanvas = document.createElement('canvas');
-
-	skiaCanvas.save = skiaCanvas.saveAsSync;
-
-	return new Proxy(skiaCanvas, {
-		get: function (target, prop) {
-			let t = prop in target ? target : domCanvas;
-			let p = t[prop];
-			if (typeof p === 'function') return p.bind(t);
-			return p;
-		},
-		set: function (target, prop, value) {
-			if (prop in target) {
-				target[prop] = value;
-			} else {
-				domCanvas[prop] = value;
+	global.Image = window.Image = SkiaCanvas.Image;
+	global.Window ??= SkiaCanvas.Window;
+
+	require('./q5.js');
+
+	Q5._createServerCanvas = function () {
+		let skiaCanvas = new SkiaCanvas.Canvas(...arguments);
+		let domCanvas = document.createElement('canvas');
+
+		skiaCanvas.save = skiaCanvas.saveAsSync;
+
+		return new Proxy(skiaCanvas, {
+			get: function (target, prop) {
+				let t = prop in target ? target : domCanvas;
+				let p = t[prop];
+				if (typeof p === 'function') return p.bind(t);
+				return p;
+			},
+			set: function (target, prop, value) {
+				if (prop in target) {
+					target[prop] = value;
+				} else {
+					domCanvas[prop] = value;
+				}
+				return true;
 			}
-			return true;
-		}
-	});
-};
+		});
+	};
 
-module.exports = Q5;
+	module.exports = Q5;
+}