@grame/faustwasm 0.13.2 → 0.13.4

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@grame/faustwasm",
-    "version": "0.13.2",
+    "version": "0.13.4",
     "description": "WebAssembly version of Faust Compiler",
     "main": "dist/cjs/index.js",
     "types": "dist/esm/index.d.ts",

package/src/FaustDspGenerator.ts

@@ -741,7 +741,13 @@ process = adaptorIns(dsp_code.process) : dsp_code.effect : adaptorOuts;
                 }
             }
         } catch (e) {
-            console.warn(e);
+            // Hack to detect 'undefined effect' symbol error, when no effect is defined in the polyphonic code.
+            // The error message is not printed to avoid confusing the user.
+            const errorMessage =
+                e instanceof Error ? e.message : String(e ?? 'unknown error');
+            if (!errorMessage.includes('undefined symbol : effect')) {
+                console.warn(e);
+            }
             this.voiceFactory = await compiler.createPolyDSPFactory(
                 name,
                 dspCodeAux,
@@ -1123,53 +1129,32 @@ export class FaustDspGenerator implements IFaustDspGenerator {
     ): Promise<IFaustMonoWebAudioNode | IFaustPolyWebAudioNode | null> {
         const getCompiler = async () => {
             if (!FaustDspGenerator.compilerPromise) {
-                const isNode =
-                    typeof document === 'undefined' && typeof window === 'undefined';
-                if (isNode) {
-                    // Resolve assets as filesystem paths in Node (no file:// prefix for fs.readFile)
-                    const { fileURLToPath } = await import('url');
-                    const jsPath = fileURLToPath(
-                        new URL(
-                            '../../libfaust-wasm/libfaust-wasm.js',
-                            import.meta.url
-                        )
-                    );
-                    const dataPath = jsPath.replace(/c?js$/, 'data');
-                    const wasmPath = jsPath.replace(/c?js$/, 'wasm');
-                    FaustDspGenerator.compilerPromise =
-                        instantiateFaustModuleFromFile(
-                            jsPath,
-                            dataPath,
-                            wasmPath
-                        ).then((module) => new FaustCompiler(new LibFaust(module)));
-                } else {
-                    // Resolve libfaust-wasm assets relative to current script/page location (works in browser and bundlers).
-                    // Falling back to document/baseURI keeps things working when import.meta.url is unavailable (es2019 target).
-                    const baseURL =
-                        (typeof document !== 'undefined'
-                            ? ('src' in (document.currentScript || {})
-                                  ? (document.currentScript as HTMLScriptElement)
-                                        .src
-                                  : document.baseURI)
-                            : undefined) ||
-                        (typeof window !== 'undefined'
-                            ? window.location.href
-                            : undefined);
-                    if (!baseURL)
-                        throw new Error('Cannot resolve libfaust-wasm location.');
-                    const jsURL = new URL(
-                        '../libfaust-wasm/libfaust-wasm.js',
-                        baseURL
-                        ).href;
-                    const dataURL = jsURL.replace(/c?js$/, 'data');
-                    const wasmURL = jsURL.replace(/c?js$/, 'wasm');
-                    FaustDspGenerator.compilerPromise =
-                        instantiateFaustModuleFromFile(
-                            jsURL,
-                            dataURL,
-                            wasmURL
-                        ).then((module) => new FaustCompiler(new LibFaust(module)));
-                }
+                // Resolve libfaust-wasm assets relative to current script/page location (works in browser and bundlers).
+                // Falling back to document/baseURI keeps things working when import.meta.url is unavailable (es2019 target).
+                const baseURL =
+                    (typeof document !== 'undefined'
+                        ? ('src' in (document.currentScript || {})
+                              ? (document.currentScript as HTMLScriptElement)
+                                    .src
+                              : document.baseURI)
+                        : undefined) ||
+                    (typeof window !== 'undefined'
+                        ? window.location.href
+                        : undefined);
+                if (!baseURL)
+                    throw new Error('Cannot resolve libfaust-wasm location.');
+                const jsURL = new URL(
+                    '../libfaust-wasm/libfaust-wasm.js',
+                    baseURL
+                    ).href;
+                const dataURL = jsURL.replace(/c?js$/, 'data');
+                const wasmURL = jsURL.replace(/c?js$/, 'wasm');
+                FaustDspGenerator.compilerPromise =
+                    instantiateFaustModuleFromFile(
+                        jsURL,
+                        dataURL,
+                        wasmURL
+                    ).then((module) => new FaustCompiler(new LibFaust(module)));
             }
             return FaustDspGenerator.compilerPromise;
         };

package/test/faustlive-wasm/faustwasm/index.js

@@ -5192,7 +5192,6 @@ var FaustPolyScriptProcessorNode = class extends FaustScriptProcessorNode {
 };
 
 // src/FaustDspGenerator.ts
-var import_meta = {};
 var _FaustMonoDspGenerator = class _FaustMonoDspGenerator {
   constructor() {
     this.factory = null;
@@ -5549,7 +5548,10 @@ process = adaptorIns(dsp_code.process) : dsp_code.effect : adaptorOuts;
         }
       }
     } catch (e) {
-      console.warn(e);
+      const errorMessage = e instanceof Error ? e.message : String(e != null ? e : "unknown error");
+      if (!errorMessage.includes("undefined symbol : effect")) {
+        console.warn(e);
+      }
       this.voiceFactory = await compiler.createPolyDSPFactory(
         name,
         dspCodeAux,
@@ -5841,38 +5843,20 @@ var _FaustDspGenerator = class _FaustDspGenerator {
   async createFaustNode(context, name, code, sp, bufferSize) {
     const getCompiler = async () => {
       if (!_FaustDspGenerator.compilerPromise) {
-        const isNode = typeof document === "undefined" && typeof window === "undefined";
-        if (isNode) {
-          const baseURL = (typeof __dirname !== "undefined" ? `file://${__dirname}/` : void 0) || (typeof import_meta !== "undefined" && typeof import_meta.url === "string" ? import_meta.url : void 0);
-          if (!baseURL)
-            throw new Error("Cannot resolve libfaust-wasm location.");
-          const jsURL = new URL(
-            "../libfaust-wasm/libfaust-wasm.js",
-            baseURL
-          ).href;
-          const dataURL = jsURL.replace(/c?js$/, "data");
-          const wasmURL = jsURL.replace(/c?js$/, "wasm");
-          _FaustDspGenerator.compilerPromise = instantiateFaustModuleFromFile_default(
-            jsURL,
-            dataURL,
-            wasmURL
-          ).then((module) => new FaustCompiler_default(new LibFaust_default(module)));
-        } else {
-          const baseURL = (typeof document !== "undefined" ? "src" in (document.currentScript || {}) ? document.currentScript.src : document.baseURI : void 0) || (typeof window !== "undefined" ? window.location.href : void 0);
-          if (!baseURL)
-            throw new Error("Cannot resolve libfaust-wasm location.");
-          const jsURL = new URL(
-            "../libfaust-wasm/libfaust-wasm.js",
-            baseURL
-          ).href;
-          const dataURL = jsURL.replace(/c?js$/, "data");
-          const wasmURL = jsURL.replace(/c?js$/, "wasm");
-          _FaustDspGenerator.compilerPromise = instantiateFaustModuleFromFile_default(
-            jsURL,
-            dataURL,
-            wasmURL
-          ).then((module) => new FaustCompiler_default(new LibFaust_default(module)));
-        }
+        const baseURL = (typeof document !== "undefined" ? "src" in (document.currentScript || {}) ? document.currentScript.src : document.baseURI : void 0) || (typeof window !== "undefined" ? window.location.href : void 0);
+        if (!baseURL)
+          throw new Error("Cannot resolve libfaust-wasm location.");
+        const jsURL = new URL(
+          "../libfaust-wasm/libfaust-wasm.js",
+          baseURL
+        ).href;
+        const dataURL = jsURL.replace(/c?js$/, "data");
+        const wasmURL = jsURL.replace(/c?js$/, "wasm");
+        _FaustDspGenerator.compilerPromise = instantiateFaustModuleFromFile_default(
+          jsURL,
+          dataURL,
+          wasmURL
+        ).then((module) => new FaustCompiler_default(new LibFaust_default(module)));
       }
       return _FaustDspGenerator.compilerPromise;
     };