@grame/faustwasm 0.13.0 → 0.13.1

package/package.json

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

package/src/FaustDspGenerator.ts

@@ -1123,32 +1123,60 @@ export class FaustDspGenerator implements IFaustDspGenerator {
     ): Promise<IFaustMonoWebAudioNode | IFaustPolyWebAudioNode | null> {
         const getCompiler = async () => {
             if (!FaustDspGenerator.compilerPromise) {
-                // 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
+                const isNode =
+                    typeof document === 'undefined' && typeof window === 'undefined';
+                if (isNode) {
+                    // Resolve assets relative to this file when running in Node.
+                    const baseURL =
+                        (typeof __dirname !== 'undefined'
+                            ? `file://${__dirname}/`
+                            : undefined) ||
+                        (typeof import.meta !== 'undefined' &&
+                        typeof import.meta.url === 'string'
+                            ? import.meta.url
+                            : 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)));
+                    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)));
+                } 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)));
+                }
             }
             return FaustDspGenerator.compilerPromise;
         };

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

@@ -5192,6 +5192,7 @@ var FaustPolyScriptProcessorNode = class extends FaustScriptProcessorNode {
 };
 
 // src/FaustDspGenerator.ts
+var import_meta = {};
 var _FaustMonoDspGenerator = class _FaustMonoDspGenerator {
   constructor() {
     this.factory = null;
@@ -5840,20 +5841,38 @@ var _FaustDspGenerator = class _FaustDspGenerator {
   async createFaustNode(context, name, code, sp, bufferSize) {
     const getCompiler = async () => {
       if (!_FaustDspGenerator.compilerPromise) {
-        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 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)));
+        }
       }
       return _FaustDspGenerator.compilerPromise;
     };