@grame/faust-web-component 0.2.4 → 0.2.5

package/package.json

@@ -1,9 +1,16 @@
 {
     "name": "@grame/faust-web-component",
     "description": "Web component embedding the Faust Compiler",
-    "version": "0.2.4",
+    "version": "0.2.5",
     "module": "dist/faust-web-component.js",
-    "files": ["src/", "public/", "index.html", "tsconfig.json", "vite.config.js", "dist/faust-web-component.js"],
+    "files": [
+        "src/",
+        "public/",
+        "index.html",
+        "tsconfig.json",
+        "vite.config.js",
+        "dist/faust-web-component.js"
+    ],
     "type": "module",
     "scripts": {
         "dev": "vite",
@@ -35,7 +42,7 @@
         "@fortawesome/fontawesome-svg-core": "^6.4.2",
         "@fortawesome/free-solid-svg-icons": "^6.4.2",
         "@grame/faustwasm": "^0.0.34",
-        "@shren/faust-ui": "^1.1.2",
+        "@shren/faust-ui": "^1.1.4",
         "codemirror": "^6.0.1",
         "split.js": "^1.6.5"
     }

package/src/common.ts

@@ -11,8 +11,10 @@ for (const icon of [faPlay, faStop, faUpRightFromSquare, faSquareCaretLeft, faAn
 
 export let compiler: FaustCompiler
 export let svgDiagrams: FaustSvgDiagrams
-export const mono_generator = new FaustMonoDspGenerator() // TODO: Support polyphony
-export const poly_generator = new FaustPolyDspGenerator() // TODO: Support polyphony
+export const default_generator = new FaustMonoDspGenerator() // TODO: Support polyphony
+// export const poly_generator = new FaustPolyDspGenerator() // TODO: Support polyphony
+export const get_mono_generator = () => new FaustMonoDspGenerator()
+export const get_poly_generator = () => new FaustPolyDspGenerator()
 
 async function loadFaust() {
     // Setup Faust

package/src/faust-editor.ts

@@ -1,9 +1,9 @@
 import { icon } from "@fortawesome/fontawesome-svg-core"
-import { IFaustMonoWebAudioNode } from "@grame/faustwasm"
+import { FaustMonoDspGenerator, FaustPolyDspGenerator, IFaustMonoWebAudioNode } from "@grame/faustwasm"
 import { FaustUI } from "@shren/faust-ui"
 import faustCSS from "@shren/faust-ui/dist/esm/index.css?inline"
 import Split from "split.js"
-import { faustPromise, audioCtx, compiler, svgDiagrams, mono_generator, poly_generator, getInputDevices, deviceUpdateCallbacks, accessMIDIDevice, midiInputCallback, extractMidiAndNvoices } from "./common"
+import { faustPromise, audioCtx, compiler, svgDiagrams, default_generator, get_mono_generator, get_poly_generator, getInputDevices, deviceUpdateCallbacks, accessMIDIDevice, midiInputCallback, extractMidiAndNvoices } from "./common"
 import { createEditor, setError, clearError } from "./editor"
 import { Scope } from "./scope"
 import faustSvg from "./faustText.svg"
@@ -279,14 +279,14 @@ export default class FaustEditor extends HTMLElement {
             let generator = null
             try {
                 // Compile Faust code to access JSON metadata
-                await mono_generator.compile(compiler, "main", code, "")
-                const json = mono_generator.getMeta()
+                await default_generator.compile(compiler, "main", code, "")
+                const json = default_generator.getMeta()
                 let { midi, nvoices } = extractMidiAndNvoices(json);
                 gmidi = midi;
                 gnvoices = nvoices;
 
                 // Build the generator
-                generator = nvoices > 0 ? poly_generator : mono_generator;
+                generator = nvoices > 0 ? get_poly_generator() : get_mono_generator();
                 await generator.compile(compiler, "main", code, "");
 
             } catch (e: any) {
@@ -299,9 +299,9 @@ export default class FaustEditor extends HTMLElement {
             // Create an audio node from compiled Faust
             if (node !== undefined) node.disconnect()
             if (gnvoices > 0) {
-                node = (await poly_generator.createNode(audioCtx, gnvoices))!
+                node = (await (generator as FaustPolyDspGenerator).createNode(audioCtx, gnvoices))!
             } else {
-                node = (await mono_generator.createNode(audioCtx))!
+                node = (await (generator as FaustMonoDspGenerator).createNode(audioCtx))!
             }
             if (node.numberOfInputs > 0) {
                 audioInputSelector.disabled = false

package/src/faust-widget.ts

@@ -1,10 +1,10 @@
 import { icon } from "@fortawesome/fontawesome-svg-core"
 import faustCSS from "@shren/faust-ui/dist/esm/index.css?inline"
 import faustSvg from "./faustText.svg"
-import { IFaustMonoWebAudioNode } from "@grame/faustwasm"
+import { FaustMonoDspGenerator, FaustPolyDspGenerator, IFaustMonoWebAudioNode } from "@grame/faustwasm"
 import { IFaustPolyWebAudioNode } from "@grame/faustwasm"
 import { FaustUI } from "@shren/faust-ui"
-import { faustPromise, audioCtx, mono_generator, poly_generator, compiler, getInputDevices, deviceUpdateCallbacks, accessMIDIDevice, midiInputCallback, extractMidiAndNvoices } from "./common"
+import { faustPromise, audioCtx, get_mono_generator, get_poly_generator, compiler, getInputDevices, deviceUpdateCallbacks, accessMIDIDevice, midiInputCallback, extractMidiAndNvoices, default_generator } from "./common"
 
 const template = document.createElement("template")
 template.innerHTML = `
@@ -116,18 +116,19 @@ export default class FaustWidget extends HTMLElement {
         let node: IFaustMonoWebAudioNode | IFaustPolyWebAudioNode
         let input: MediaStreamAudioSourceNode | undefined
         let faustUI: FaustUI
+        let generator: FaustMonoDspGenerator | FaustPolyDspGenerator
 
         const setup = async () => {
             await faustPromise
             // Compile Faust code to access JSON metadata
-            await mono_generator.compile(compiler, "main", code, "")
-            const json = mono_generator.getMeta()
+            await default_generator.compile(compiler, "main", code, "")
+            const json = default_generator.getMeta()
             let { midi, nvoices } = extractMidiAndNvoices(json);
             gmidi = midi;
             gnvoices = nvoices;
 
             // Build the generator and generate UI
-            const generator = nvoices > 0 ? poly_generator : mono_generator;
+            generator = nvoices > 0 ? get_poly_generator() : get_mono_generator();
             await generator.compile(compiler, "main", code, "");
             const ui = generator.getUI();
 
@@ -145,9 +146,9 @@ export default class FaustWidget extends HTMLElement {
             // Create an audio node from compiled Faust
             if (node === undefined) {
                 if (gnvoices > 0) {
-                    node = (await poly_generator.createNode(audioCtx, gnvoices))!
+                    node = (await (generator as FaustPolyDspGenerator).createNode(audioCtx, gnvoices))!
                 } else {
-                    node = (await mono_generator.createNode(audioCtx))!
+                    node = (await (generator as FaustMonoDspGenerator).createNode(audioCtx))!
                 }
             }
 

package/vite.config.js

@@ -9,5 +9,6 @@ export default defineConfig({
             formats: ["iife"],
             fileName: () => "faust-web-component.js",
         },
+        sourcemap: true,
     },
 })

package/dist/index.html

@@ -1,26 +0,0 @@
-<p><em>Here's an embedded editor!</em></p>
-
-<faust-editor>
-<!--
-import("stdfaust.lib");
-ctFreq = hslider("cutoffFrequency",500,50,10000,0.01);
-q = hslider("q",5,1,30,0.1);
-gain = hslider("gain",1,0,1,0.01);
-process = no.noise : fi.resonlp(ctFreq,q,gain);
--->
-</faust-editor>
-
-<p><em>And here's a simple DSP widget!</em></p>
-
-<faust-widget>
-<!--
-import("stdfaust.lib");
-
-declare options "[midi:on][nvoices:12]";
-
-process = pm.clarinet_ui_MIDI <: _,_;
--->
-</faust-widget>
-
-<script src="https://cdn.jsdelivr.net/npm/@grame/faust-web-component@0.2.3/dist/faust-web-component.js"></script>
-