@grame/faustwasm 0.0.30 → 0.0.33

package/package.json

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

package/src/FaustDspGenerator.ts

@@ -7,7 +7,7 @@ import { FaustMonoOfflineProcessor, FaustPolyOfflineProcessor, IFaustMonoOffline
 import { FaustMonoScriptProcessorNode, FaustPolyScriptProcessorNode } from "./FaustScriptProcessorNode";
 import { FaustBaseWebAudioDsp, FaustMonoWebAudioDsp, FaustPolyWebAudioDsp, FaustWebAudioDspVoice, IFaustMonoWebAudioNode, IFaustPolyWebAudioNode } from "./FaustWebAudioDsp";
 import type { IFaustCompiler } from "./FaustCompiler";
-import type { FaustDspFactory, FaustDspMeta, FFTUtils, LooseFaustDspFactory } from "./types";
+import type { FaustDspFactory, FaustUIDescriptor, FaustDspMeta, FFTUtils, LooseFaustDspFactory } from "./types";
 
 export interface IFaustMonoDspGenerator {
     /**
@@ -44,7 +44,7 @@ export interface IFaustMonoDspGenerator {
         bufferSize?: number,
         processorName?: string
     ): Promise<IFaustMonoWebAudioNode | null>;
-    
+
     /**
      * Create a monophonic WebAudio node (either ScriptProcessorNode or AudioWorkletNode).
      *
@@ -64,7 +64,7 @@ export interface IFaustMonoDspGenerator {
         fftOptions?: Partial<FaustFFTOptionsData>,
         processorName?: string
     ): Promise<FaustMonoAudioWorkletNode | null>;
-    
+
     /**
      * Create a monophonic Offline processor.
      *
@@ -74,6 +74,27 @@ export interface IFaustMonoDspGenerator {
      * @returns the compiled processor or 'null' if failure
      */
     createOfflineProcessor(sampleRate: number, bufferSize: number, factory?: LooseFaustDspFactory, meta?: FaustDspMeta): Promise<IFaustMonoOfflineProcessor | null>;
+
+    /**
+     * Get DSP JSON description with its UI and metadata as object.
+     *
+     * @return the DSP JSON description as object
+     */
+    getMeta(): FaustDspMeta;
+
+    /**
+     * Get DSP JSON description with its UI and metadata.
+     *
+     * @return the DSP JSON description
+     */
+    getJSON(): string;
+
+    /**
+     * Get DSP UI description.
+     *
+     * @return the DSP UI description
+     */
+    getUI(): FaustUIDescriptor;
 }
 
 export interface IFaustPolyDspGenerator {
@@ -131,8 +152,29 @@ export interface IFaustPolyDspGenerator {
         voices: number,
         voiceFactory?: LooseFaustDspFactory,
         mixerModule?: WebAssembly.Module,
-        effectFactory?: LooseFaustDspFactory | null 
+        effectFactory?: LooseFaustDspFactory | null
     ): Promise<IFaustPolyOfflineProcessor | null>;
+
+    /**
+     * Get DSP JSON description with its UI and metadata as object.
+     *
+     * @return the DSP JSON description as object
+     */
+    getMeta(): FaustDspMeta;
+
+    /**
+     * Get DSP JSON description with its UI and metadata.
+     *
+     * @return the DSP JSON description
+     */
+    getJSON(): string;
+
+    /**
+     * Get DSP UI description.
+     *
+     * @return the DSP UI description
+     */
+    getUI(): FaustUIDescriptor;
 }
 
 export class FaustMonoDspGenerator implements IFaustMonoDspGenerator {
@@ -179,11 +221,11 @@ export class FaustMonoDspGenerator implements IFaustMonoDspGenerator {
                     const processorCode = `
 // DSP name and JSON string for DSP are generated
 const faustData = ${JSON.stringify({
-    processorName,
-    dspName: name,
-    dspMeta: meta,
-    poly: false
-} as FaustData)};
+                        processorName,
+                        dspName: name,
+                        dspMeta: meta,
+                        poly: false
+                    } as FaustData)};
 // Implementation needed classes of functions
 const ${FaustDspInstance.name} = ${FaustDspInstance.toString()}
 const ${FaustBaseWebAudioDsp.name} = ${FaustBaseWebAudioDsp.toString()}
@@ -232,11 +274,11 @@ const dependencies = {
                 const processorCode = `
 // DSP name and JSON string for DSP are generated
 const faustData = ${JSON.stringify({
-    processorName,
-    dspName: name,
-    dspMeta: meta,
-    fftOptions
-} as FaustFFTData)};
+                    processorName,
+                    dspName: name,
+                    dspMeta: meta,
+                    fftOptions
+                } as FaustFFTData)};
 // Implementation needed classes of functions
 const ${FaustDspInstance.name} = ${FaustDspInstance.toString()}
 const ${FaustBaseWebAudioDsp.name} = ${FaustBaseWebAudioDsp.toString()}
@@ -300,22 +342,22 @@ const dependencies = {
         }
         // const sampleSize = meta.compile_options.match("-double") ? 8 : 4;
         // Dynamically create AudioWorkletProcessor if code not yet created
-            try {
-                // DSP name and JSON string for DSP are generated
-                const faustData = {
-                    processorName,
-                    dspName: name,
-                    dspMeta: meta,
-                    poly: false
-                } as FaustData;
-                // Generate the actual AudioWorkletProcessor code
-                const Processor = getFaustAudioWorkletProcessor(dependencies, faustData);
-                return Processor;
-            } catch (e) {
-                // console.error(`=> exception raised while running createMonoNode: ${e}`);
-                // console.error(`=> check that your page is served using https.${e}`);
-                throw e;
-            }
+        try {
+            // DSP name and JSON string for DSP are generated
+            const faustData = {
+                processorName,
+                dspName: name,
+                dspMeta: meta,
+                poly: false
+            } as FaustData;
+            // Generate the actual AudioWorkletProcessor code
+            const Processor = getFaustAudioWorkletProcessor(dependencies, faustData);
+            return Processor;
+        } catch (e) {
+            // console.error(`=> exception raised while running createMonoNode: ${e}`);
+            // console.error(`=> check that your page is served using https.${e}`);
+            throw e;
+        }
     }
     async createOfflineProcessor(
         sampleRate: number,
@@ -330,6 +372,10 @@ const dependencies = {
         const monoDsp = new FaustMonoWebAudioDsp(instance, sampleRate, sampleSize, bufferSize);
         return new FaustMonoOfflineProcessor(monoDsp, bufferSize);
     }
+
+    getMeta() { return JSON.parse(this.factory!.json); }
+    getJSON() { return JSON.stringify(this.getMeta()); }
+    getUI() { return this.getMeta(); }
 }
 
 export class FaustPolyDspGenerator implements IFaustPolyDspGenerator {
@@ -405,12 +451,12 @@ process = adaptor(dsp_code.process, dsp_code.effect) : dsp_code.effect;`
                     const processorCode = `
 // DSP name and JSON string for DSP are generated
 const faustData = ${JSON.stringify({
-    processorName,
-    dspName: name,
-    dspMeta: voiceMeta,
-    poly: true,
-    effectMeta
-} as FaustData)};
+                        processorName,
+                        dspName: name,
+                        dspMeta: voiceMeta,
+                        poly: true,
+                        effectMeta
+                    } as FaustData)};
 // Implementation needed classes of functions
 const ${FaustDspInstance.name} = ${FaustDspInstance.toString()}
 const ${FaustBaseWebAudioDsp.name} = ${FaustBaseWebAudioDsp.toString()}
@@ -495,4 +541,33 @@ const dependencies = {
         const polyDsp = new FaustPolyWebAudioDsp(instance, sampleRate, sampleSize, bufferSize);
         return new FaustPolyOfflineProcessor(polyDsp, bufferSize);
     }
+
+    getMeta() {
+        const o = (this.voiceFactory) ? JSON.parse(this.voiceFactory.json) : null;
+        const e = (this.effectFactory) ? JSON.parse(this.effectFactory.json) : null;
+        const r = { ...o };
+        if (e) {
+            r.ui = [{
+                type: "tgroup", label: "Sequencer", items: [
+                    { type: "vgroup", label: "Instrument", items: o.ui },
+                    { type: "vgroup", label: "Effect", items: e.ui }
+                ]
+            }];
+        } else {
+            r.ui = [{
+                type: "tgroup", label: "Polyphonic", items: [
+                    { type: "vgroup", label: "Voices", items: o.ui }
+                ]
+            }];
+        }
+        return r as FaustDspMeta;
+    }
+
+    getJSON() {
+        return JSON.stringify(this.getMeta());
+    }
+
+    getUI() {
+        return this.getMeta().ui;
+    }
 }

package/src/FaustWasmInstantiator.ts

@@ -16,7 +16,7 @@ class FaustWasmInstantiator {
                 _fmodf: (x: number, y: number) => x % y,
                 _logf: Math.log, _log10f: Math.log10, _max_f: Math.max, _min_f: Math.min,
                 _remainderf: (x: number, y: number) => x - Math.round(x / y) * y,
-                _powf: Math.pow, _roundf: Math.fround, _sinf: Math.sin, _sqrtf: Math.sqrt, _tanf: Math.tan,
+                _powf: Math.pow, _roundf: Math.round, _sinf: Math.sin, _sqrtf: Math.sqrt, _tanf: Math.tan,
                 _acoshf: Math.acosh, _asinhf: Math.asinh, _atanhf: Math.atanh,
                 _coshf: Math.cosh, _sinhf: Math.sinh, _tanhf: Math.tanh,
                 _isnanf: Number.isNaN, _isinff: (x: number) => !isFinite(x),
@@ -28,7 +28,7 @@ class FaustWasmInstantiator {
                 _fmod: (x: number, y: number) => x % y,
                 _log: Math.log, _log10: Math.log10, _max_: Math.max, _min_: Math.min,
                 _remainder: (x: number, y: number) => x - Math.round(x / y) * y,
-                _pow: Math.pow, _round: Math.fround, _sin: Math.sin, _sqrt: Math.sqrt, _tan: Math.tan,
+                _pow: Math.pow, _round: Math.round, _sin: Math.sin, _sqrt: Math.sqrt, _tan: Math.tan,
                 _acosh: Math.acosh, _asinh: Math.asinh, _atanh: Math.atanh,
                 _cosh: Math.cosh, _sinh: Math.sinh, _tanh: Math.tanh,
                 _isnan: Number.isNaN, _isinf: (x: number) => !isFinite(x),

package/test/faustlive-wasm/faustwasm/index.d.ts

@@ -1174,6 +1174,24 @@ export interface IFaustMonoDspGenerator {
 	 * @returns the compiled processor or 'null' if failure
 	 */
 	createOfflineProcessor(sampleRate: number, bufferSize: number, factory?: LooseFaustDspFactory, meta?: FaustDspMeta): Promise<IFaustMonoOfflineProcessor | null>;
+	/**
+	 * Get DSP JSON description with its UI and metadata as object.
+	 *
+	 * @return the DSP JSON description as object
+	 */
+	getMeta(): FaustDspMeta;
+	/**
+	 * Get DSP JSON description with its UI and metadata.
+	 *
+	 * @return the DSP JSON description
+	 */
+	getJSON(): string;
+	/**
+	 * Get DSP UI description.
+	 *
+	 * @return the DSP UI description
+	 */
+	getUI(): FaustUIDescriptor;
 }
 export interface IFaustPolyDspGenerator {
 	/**
@@ -1215,6 +1233,24 @@ export interface IFaustPolyDspGenerator {
 	 * @returns the compiled processor or 'null' if failure
 	 */
 	createOfflineProcessor(sampleRate: number, bufferSize: number, voices: number, voiceFactory?: LooseFaustDspFactory, mixerModule?: WebAssembly.Module, effectFactory?: LooseFaustDspFactory | null): Promise<IFaustPolyOfflineProcessor | null>;
+	/**
+	 * Get DSP JSON description with its UI and metadata as object.
+	 *
+	 * @return the DSP JSON description as object
+	 */
+	getMeta(): FaustDspMeta;
+	/**
+	 * Get DSP JSON description with its UI and metadata.
+	 *
+	 * @return the DSP JSON description
+	 */
+	getJSON(): string;
+	/**
+	 * Get DSP UI description.
+	 *
+	 * @return the DSP UI description
+	 */
+	getUI(): FaustUIDescriptor;
 }
 export declare class FaustMonoDspGenerator implements IFaustMonoDspGenerator {
 	private static gWorkletProcessors;
@@ -1230,6 +1266,9 @@ export declare class FaustMonoDspGenerator implements IFaustMonoDspGenerator {
 		parameterDescriptors: AudioParamDescriptor[];
 	}>;
 	createOfflineProcessor(sampleRate: number, bufferSize: number, factory?: LooseFaustDspFactory): Promise<FaustMonoOfflineProcessor>;
+	getMeta(): any;
+	getJSON(): string;
+	getUI(): any;
 }
 export declare class FaustPolyDspGenerator implements IFaustPolyDspGenerator {
 	private static gWorkletProcessors;
@@ -1247,6 +1286,9 @@ export declare class FaustPolyDspGenerator implements IFaustPolyDspGenerator {
 		parameterDescriptors: AudioParamDescriptor[];
 	}>;
 	createOfflineProcessor(sampleRate: number, bufferSize: number, voices: number, voiceFactory?: LooseFaustDspFactory, mixerModule?: WebAssembly.Module, effectFactory?: LooseFaustDspFactory | null): Promise<FaustPolyOfflineProcessor>;
+	getMeta(): FaustDspMeta;
+	getJSON(): string;
+	getUI(): FaustUIDescriptor;
 }
 
 export {};

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

@@ -1748,7 +1748,7 @@ var FaustWasmInstantiator = class {
         _min_f: Math.min,
         _remainderf: (x, y) => x - Math.round(x / y) * y,
         _powf: Math.pow,
-        _roundf: Math.fround,
+        _roundf: Math.round,
         _sinf: Math.sin,
         _sqrtf: Math.sqrt,
         _tanf: Math.tan,
@@ -1776,7 +1776,7 @@ var FaustWasmInstantiator = class {
         _min_: Math.min,
         _remainder: (x, y) => x - Math.round(x / y) * y,
         _pow: Math.pow,
-        _round: Math.fround,
+        _round: Math.round,
         _sin: Math.sin,
         _sqrt: Math.sqrt,
         _tan: Math.tan,
@@ -3619,6 +3619,15 @@ const dependencies = {
     const monoDsp = new FaustMonoWebAudioDsp(instance, sampleRate, sampleSize, bufferSize);
     return new FaustMonoOfflineProcessor(monoDsp, bufferSize);
   }
+  getMeta() {
+    return JSON.parse(this.factory.json);
+  }
+  getJSON() {
+    return JSON.stringify(this.getMeta());
+  }
+  getUI() {
+    return this.getMeta();
+  }
 };
 var FaustMonoDspGenerator = _FaustMonoDspGenerator;
 FaustMonoDspGenerator.gWorkletProcessors = /* @__PURE__ */ new Map();
@@ -3739,6 +3748,36 @@ const dependencies = {
     const polyDsp = new FaustPolyWebAudioDsp(instance, sampleRate, sampleSize, bufferSize);
     return new FaustPolyOfflineProcessor(polyDsp, bufferSize);
   }
+  getMeta() {
+    const o = this.voiceFactory ? JSON.parse(this.voiceFactory.json) : null;
+    const e = this.effectFactory ? JSON.parse(this.effectFactory.json) : null;
+    const r = { ...o };
+    if (e) {
+      r.ui = [{
+        type: "tgroup",
+        label: "Sequencer",
+        items: [
+          { type: "vgroup", label: "Instrument", items: o.ui },
+          { type: "vgroup", label: "Effect", items: e.ui }
+        ]
+      }];
+    } else {
+      r.ui = [{
+        type: "tgroup",
+        label: "Polyphonic",
+        items: [
+          { type: "vgroup", label: "Voices", items: o.ui }
+        ]
+      }];
+    }
+    return r;
+  }
+  getJSON() {
+    return JSON.stringify(this.getMeta());
+  }
+  getUI() {
+    return this.getMeta().ui;
+  }
 };
 var FaustPolyDspGenerator = _FaustPolyDspGenerator;
 FaustPolyDspGenerator.gWorkletProcessors = /* @__PURE__ */ new Map();