skip FES checks on internal calls

track call depth with _isUserCall flag, add _internal() for post-await sections

fixes #7817

Author: avinxshKD

src/core/friendly_errors/param_validator.js

@@ -573,14 +573,35 @@ function validateParams(p5, fn, lifecycles) {
 
   fn._validate = validate; // TEMP: For unit tests
 
+  // Suppress FES param checking for the duration of a callback.
+  // Use this to wrap internal p5 calls that happen after an await.
+  // NOTE: shares the same _isUserCall flag logic as the decorator below.
+  fn._internal = function(callback) {
+    const wasInternalCall = this._isUserCall;
+    this._isUserCall = true;
+    try {
+      return callback();
+    } finally {
+      this._isUserCall = wasInternalCall;
+    }
+  };
+
+  // Skip FES validation for nested (internal) calls.
+  // NOTE: shares the same _isUserCall flag logic as _internal() above.
   p5.decorateHelper(
     /^(?!_).+$/,
     function(target, { name }){
       return function(...args){
-        if (!p5.disableFriendlyErrors && !p5.disableParameterValidator) {
-          validate(name, args);
+        const wasInternalCall = this._isUserCall;
+        this._isUserCall = true;
+        try {
+          if (!wasInternalCall && !p5.disableFriendlyErrors && !p5.disableParameterValidator) {
+            validate(name, args);
+          }
+          return target.apply(this, args);
+        } finally {
+          this._isUserCall = wasInternalCall;
         }
-        return target.apply(this, args);
       };
     }
   );

src/webgl/material.js

@@ -524,11 +524,11 @@ function material(p5, fn) {
       // Test if we've loaded GLSL or not by checking for the existence of `void main`
       let loadedShader;
       if (/void\s+main/.exec(fragString)) {
-        loadedShader = this.createFilterShader(fragString, true);
+        loadedShader = this._internal(() => this.createFilterShader(fragString, true));
       } else {
-        loadedShader = withGlobalStrands(this, () =>
+        loadedShader = this._internal(() => withGlobalStrands(this, () =>
           this.baseFilterShader().modify(new Function(fragString)),
-        );
+        ));
       }
 
       if (successCallback) {
@@ -1597,7 +1597,7 @@ function material(p5, fn) {
   fn.loadMaterialShader = async function (url, onSuccess, onFail) {
     try {
       const cb = await urlToStrandsCallback(url);
-      let shader = withGlobalStrands(this, () => this.buildMaterialShader(cb));
+      let shader = this._internal(() => withGlobalStrands(this, () => this.buildMaterialShader(cb)));
       if (onSuccess) {
         shader = onSuccess(shader) || shader;
       }
@@ -1814,9 +1814,9 @@ function material(p5, fn) {
   fn.loadNormalShader = async function (url, onSuccess, onFail) {
     try {
       const cb = await urlToStrandsCallback(url);
-      let shader = this.withGlobalStrands(this, () =>
+      let shader = this._internal(() => this.withGlobalStrands(this, () =>
         this.buildNormalShader(cb),
-      );
+      ));
       if (onSuccess) {
         shader = onSuccess(shader) || shader;
       }
@@ -1978,7 +1978,7 @@ function material(p5, fn) {
   fn.loadColorShader = async function (url, onSuccess, onFail) {
     try {
       const cb = await urlToStrandsCallback(url);
-      let shader = withGlobalStrands(this, () => this.buildColorShader(cb));
+      let shader = this._internal(() => withGlobalStrands(this, () => this.buildColorShader(cb)));
       if (onSuccess) {
         shader = onSuccess(shader) || shader;
       }
@@ -2237,7 +2237,7 @@ function material(p5, fn) {
   fn.loadStrokeShader = async function (url, onSuccess, onFail) {
     try {
       const cb = await urlToStrandsCallback(url);
-      let shader = withGlobalStrands(this, () => this.buildStrokeShader(cb));
+      let shader = this._internal(() => withGlobalStrands(this, () => this.buildStrokeShader(cb)));
       if (onSuccess) {
         shader = onSuccess(shader) || shader;
       }