Added protected properties before second bindGlobal loop, exclude protected properties from being bound.

HughJacks · HughJacks · commit 0b8ff6cb7df7 · 2025-04-20T14:11:13.000-04:00
diff --git a/src/core/friendly_errors/fes_core.js b/src/core/friendly_errors/fes_core.js
@@ -348,7 +348,7 @@ function fesCore(p5, fn){
         // actual name with correct capitalization doesnt exist in context,
         // and if the user-defined symbol is of the type function
         if (
-          fxns[lowercase] &&
+          fxns.hasOwnProperty(lowercase) &&
           !context[fxns[lowercase]] &&
           typeof context[prop] === 'function'
         ) {
diff --git a/src/core/main.js b/src/core/main.js
@@ -137,10 +137,11 @@ class p5 {
         bindGlobal(p);
       }
 
+      const protectedProperties = ['constructor', 'length', 'print'];
       // Attach its properties to the window
       for (const p in this) {
         if (this.hasOwnProperty(p)) {
-          if(p[0] === '_') continue;
+          if(p[0] === '_' || protectedProperties.includes(p)) continue;
           bindGlobal(p);
         }
       }
diff --git a/test.html b/test.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <script src="/lib/p5.js"></script>
+</head>
+<body>
+    <script>
+        new p5();
+    </script>
+</body>
+</html> 
diff --git a/test2.html b/test2.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <script src="lib/p5.js"></script>
+</head>
+<body>
+    <script>
+        // Instance mode test
+        new p5((p) => {
+            p.setup = function() {
+                p.createCanvas(400, 400);
+                console.log("Instance mode setup called");
+            }
+
+            // Intentionally miscapitalized function to test error detection
+            p.mousePressed = function() {
+                console.log("correct capitalization");
+            }
+
+            p.MousePressed = function() {
+                console.log("wrong capitalization");
+            }
+
+            // Test constructor-related behavior
+            p.Constructor = function() {
+                console.log("shouldn't trigger error");
+            }
+        });
+    </script>
+</body>
+</html>

Original file line number	Diff line number	Diff line change
`@@ -137,10 +137,11 @@ class p5 {`
`137`	`137`	`bindGlobal(p);`
`138`	`138`	`}`
`139`	`139`
	`140`	`+ const protectedProperties = ['constructor', 'length', 'print'];`
`140`	`141`	`// Attach its properties to the window`
`141`	`142`	`for (const p in this) {`
`142`	`143`	`if (this.hasOwnProperty(p)) {`
`143`		`- if(p[0] === '_') continue;`
	`144`	`+ if(p[0] === '_' \|\| protectedProperties.includes(p)) continue;`
`144`	`145`	`bindGlobal(p);`
`145`	`146`	`}`
`146`	`147`	`}`