@grame/faustwasm 0.0.28 → 0.0.30

package/package.json

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

package/src/FaustDspGenerator.ts

@@ -1,7 +1,7 @@
 import { FaustMonoAudioWorkletNode, FaustPolyAudioWorkletNode } from "./FaustAudioWorkletNode";
 import getFaustAudioWorkletProcessor, { FaustData } from "./FaustAudioWorkletProcessor";
 import getFaustFFTAudioWorkletProcessor, { FaustFFTData, FaustFFTOptionsData } from "./FaustFFTAudioWorkletProcessor";
-import FaustDspInstance from "./FaustDspInstance";
+import { FaustDspInstance } from "./FaustDspInstance";
 import FaustWasmInstantiator from "./FaustWasmInstantiator";
 import { FaustMonoOfflineProcessor, FaustPolyOfflineProcessor, IFaustMonoOfflineProcessor, IFaustPolyOfflineProcessor } from "./FaustOfflineProcessor";
 import { FaustMonoScriptProcessorNode, FaustPolyScriptProcessorNode } from "./FaustScriptProcessorNode";
@@ -185,15 +185,15 @@ const faustData = ${JSON.stringify({
     poly: false
 } as FaustData)};
 // Implementation needed classes of functions
-const ${FaustDspInstance.name}_default = ${FaustDspInstance.toString()}
+const ${FaustDspInstance.name} = ${FaustDspInstance.toString()}
 const ${FaustBaseWebAudioDsp.name} = ${FaustBaseWebAudioDsp.toString()}
 const ${FaustMonoWebAudioDsp.name} = ${FaustMonoWebAudioDsp.toString()}
 const ${FaustWasmInstantiator.name} = ${FaustWasmInstantiator.toString()}
 // Put them in dependencies
 const dependencies = {
-    ${FaustBaseWebAudioDsp.name},
-    ${FaustMonoWebAudioDsp.name},
-    ${FaustWasmInstantiator.name}
+    FaustBaseWebAudioDsp: ${FaustBaseWebAudioDsp.name},
+    FaustMonoWebAudioDsp: ${FaustMonoWebAudioDsp.name},
+    FaustWasmInstantiator: ${FaustWasmInstantiator.name}
 };
 // Generate the actual AudioWorkletProcessor code
 (${getFaustAudioWorkletProcessor.toString()})(dependencies, faustData);
@@ -238,16 +238,16 @@ const faustData = ${JSON.stringify({
     fftOptions
 } as FaustFFTData)};
 // Implementation needed classes of functions
-const ${FaustDspInstance.name}_default = ${FaustDspInstance.toString()}
+const ${FaustDspInstance.name} = ${FaustDspInstance.toString()}
 const ${FaustBaseWebAudioDsp.name} = ${FaustBaseWebAudioDsp.toString()}
 const ${FaustMonoWebAudioDsp.name} = ${FaustMonoWebAudioDsp.toString()}
 const ${FaustWasmInstantiator.name} = ${FaustWasmInstantiator.toString()}
 const FFTUtils = ${fftUtils.toString()}
 // Put them in dependencies
 const dependencies = {
-    ${FaustBaseWebAudioDsp.name},
-    ${FaustMonoWebAudioDsp.name},
-    ${FaustWasmInstantiator.name},
+    FaustBaseWebAudioDsp: ${FaustBaseWebAudioDsp.name},
+    FaustMonoWebAudioDsp: ${FaustMonoWebAudioDsp.name},
+    FaustWasmInstantiator: ${FaustWasmInstantiator.name},
     FFTUtils
 };
 // Generate the actual AudioWorkletProcessor code
@@ -412,16 +412,16 @@ const faustData = ${JSON.stringify({
     effectMeta
 } as FaustData)};
 // Implementation needed classes of functions
-const ${FaustDspInstance.name}_default = ${FaustDspInstance.toString()}
+const ${FaustDspInstance.name} = ${FaustDspInstance.toString()}
 const ${FaustBaseWebAudioDsp.name} = ${FaustBaseWebAudioDsp.toString()}
 const ${FaustPolyWebAudioDsp.name} = ${FaustPolyWebAudioDsp.toString()}
 const ${FaustWebAudioDspVoice.name} = ${FaustWebAudioDspVoice.toString()}
 const ${FaustWasmInstantiator.name} = ${FaustWasmInstantiator.toString()}
 // Put them in dependencies
 const dependencies = {
-    ${FaustBaseWebAudioDsp.name},
-    ${FaustPolyWebAudioDsp.name},
-    ${FaustWasmInstantiator.name}
+    FaustBaseWebAudioDsp: ${FaustBaseWebAudioDsp.name},
+    FaustPolyWebAudioDsp: ${FaustPolyWebAudioDsp.name},
+    FaustWasmInstantiator: ${FaustWasmInstantiator.name}
 };
 // Generate the actual AudioWorkletProcessor code
 (${getFaustAudioWorkletProcessor.toString()})(dependencies, faustData);

package/src/FaustDspInstance.ts

@@ -120,7 +120,7 @@ export interface FaustPolyDspInstance {
     effectJSON?: string;
 }
 
-class FaustDspInstance implements IFaustDspInstance {
+export class FaustDspInstance implements IFaustDspInstance {
     private readonly fExports: IFaustDspInstance;
 
     constructor(exports: IFaustDspInstance) { this.fExports = exports; }
@@ -137,5 +137,3 @@ class FaustDspInstance implements IFaustDspInstance {
     instanceResetUserInterface($dsp: number) { this.fExports.instanceResetUserInterface($dsp); }
     setParamValue($dsp: number, index: number, value: number) { this.fExports.setParamValue($dsp, index, value); }
 }
-
-export default FaustDspInstance;

package/src/FaustWasmInstantiator.ts

@@ -1,4 +1,4 @@
-import FaustDspInstance, { FaustMonoDspInstance, FaustPolyDspInstance, IFaustDspInstance, IFaustMixerInstance } from "./FaustDspInstance";
+import { FaustDspInstance, FaustMonoDspInstance, FaustPolyDspInstance, IFaustDspInstance, IFaustMixerInstance } from "./FaustDspInstance";
 import type { FaustDspFactory, FaustDspMeta, LooseFaustDspFactory } from "./types";
 
 class FaustWasmInstantiator {

package/src/exports.ts

@@ -1,24 +1,24 @@
-export { default as instantiateFaustModuleFromFile } from "./instantiateFaustModuleFromFile";
-export { default as getFaustAudioWorkletProcessor } from "./FaustAudioWorkletProcessor";
-export { default as getFaustFFTAudioWorkletProcessor } from "./FaustFFTAudioWorkletProcessor";
-export { default as FaustCompiler } from "./FaustCompiler";
-export { default as FaustDspInstance } from "./FaustDspInstance";
-export { default as FaustWasmInstantiator } from "./FaustWasmInstantiator";
-export { default as FaustOfflineProcessor } from "./FaustOfflineProcessor";
-export { default as FaustSvgDiagrams } from "./FaustSvgDiagrams";
-export { default as LibFaust } from "./LibFaust";
-export { default as WavEncoder } from "./WavEncoder";
-export { default as WavDecoder } from "./WavDecoder";
-
-export * from "./FaustAudioWorkletNode";
-export * from "./FaustAudioWorkletProcessor";
-export * from "./FaustFFTAudioWorkletProcessor";
-export * from "./FaustCompiler";
-export * from "./FaustDspInstance";
-export * from "./FaustOfflineProcessor";
-export * from "./FaustScriptProcessorNode";
-export * from "./FaustWebAudioDsp";
-export * from "./FaustDspGenerator";
-export * from "./LibFaust";
-
-export * from "./types";
+export { default as instantiateFaustModuleFromFile } from "./instantiateFaustModuleFromFile";
+export { default as getFaustAudioWorkletProcessor } from "./FaustAudioWorkletProcessor";
+export { default as getFaustFFTAudioWorkletProcessor } from "./FaustFFTAudioWorkletProcessor";
+export { default as FaustCompiler } from "./FaustCompiler";
+export { FaustDspInstance } from "./FaustDspInstance";
+export { default as FaustWasmInstantiator } from "./FaustWasmInstantiator";
+export { default as FaustOfflineProcessor } from "./FaustOfflineProcessor";
+export { default as FaustSvgDiagrams } from "./FaustSvgDiagrams";
+export { default as LibFaust } from "./LibFaust";
+export { default as WavEncoder } from "./WavEncoder";
+export { default as WavDecoder } from "./WavDecoder";
+
+export * from "./FaustAudioWorkletNode";
+export * from "./FaustAudioWorkletProcessor";
+export * from "./FaustFFTAudioWorkletProcessor";
+export * from "./FaustCompiler";
+export * from "./FaustDspInstance";
+export * from "./FaustOfflineProcessor";
+export * from "./FaustScriptProcessorNode";
+export * from "./FaustWebAudioDsp";
+export * from "./FaustDspGenerator";
+export * from "./LibFaust";
+
+export * from "./types";

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

@@ -1723,7 +1723,6 @@ var FaustDspInstance = class {
     this.fExports.setParamValue($dsp, index, value);
   }
 };
-var FaustDspInstance_default = FaustDspInstance;
 
 // src/FaustWasmInstantiator.ts
 var FaustWasmInstantiator = class {
@@ -1813,7 +1812,7 @@ var FaustWasmInstantiator = class {
   }
   static createMonoDSPInstanceAux(instance, json) {
     const functions = instance.exports;
-    const api = new FaustDspInstance_default(functions);
+    const api = new FaustDspInstance(functions);
     const memory = instance.exports.memory;
     return { memory, api, json };
   }
@@ -1876,12 +1875,12 @@ var FaustWasmInstantiator = class {
     const memory = this.createMemoryAux(voices, voiceFactory, effectFactory);
     const voiceInstance = await WebAssembly.instantiate(voiceFactory.module, this.createWasmImport(memory));
     const voiceFunctions = voiceInstance.exports;
-    const voiceAPI = new FaustDspInstance_default(voiceFunctions);
+    const voiceAPI = new FaustDspInstance(voiceFunctions);
     const mixerAPI = this.createMixerAux(mixerModule, memory);
     if (effectFactory) {
       const effectInstance = await WebAssembly.instantiate(effectFactory.module, this.createWasmImport(memory));
       const effectFunctions = effectInstance.exports;
-      const effectAPI = new FaustDspInstance_default(effectFunctions);
+      const effectAPI = new FaustDspInstance(effectFunctions);
       return {
         memory,
         voices,
@@ -1905,12 +1904,12 @@ var FaustWasmInstantiator = class {
     const memory = this.createMemoryAux(voices, voiceFactory, effectFactory);
     const voiceInstance = new WebAssembly.Instance(voiceFactory.module, this.createWasmImport(memory));
     const voiceFunctions = voiceInstance.exports;
-    const voiceAPI = new FaustDspInstance_default(voiceFunctions);
+    const voiceAPI = new FaustDspInstance(voiceFunctions);
     const mixerAPI = this.createMixerAux(mixerModule, memory);
     if (effectFactory) {
       const effectInstance = new WebAssembly.Instance(effectFactory.module, this.createWasmImport(memory));
       const effectFunctions = effectInstance.exports;
-      const effectAPI = new FaustDspInstance_default(effectFunctions);
+      const effectAPI = new FaustDspInstance(effectFunctions);
       return {
         memory,
         voices,
@@ -3499,15 +3498,15 @@ const faustData = ${JSON.stringify({
             poly: false
           })};
 // Implementation needed classes of functions
-const ${FaustDspInstance_default.name}_default = ${FaustDspInstance_default.toString()}
+const ${FaustDspInstance.name} = ${FaustDspInstance.toString()}
 const ${FaustBaseWebAudioDsp.name} = ${FaustBaseWebAudioDsp.toString()}
 const ${FaustMonoWebAudioDsp.name} = ${FaustMonoWebAudioDsp.toString()}
 const ${FaustWasmInstantiator_default.name} = ${FaustWasmInstantiator_default.toString()}
 // Put them in dependencies
 const dependencies = {
-    ${FaustBaseWebAudioDsp.name},
-    ${FaustMonoWebAudioDsp.name},
-    ${FaustWasmInstantiator_default.name}
+    FaustBaseWebAudioDsp: ${FaustBaseWebAudioDsp.name},
+    FaustMonoWebAudioDsp: ${FaustMonoWebAudioDsp.name},
+    FaustWasmInstantiator: ${FaustWasmInstantiator_default.name}
 };
 // Generate the actual AudioWorkletProcessor code
 (${FaustAudioWorkletProcessor_default.toString()})(dependencies, faustData);
@@ -3542,16 +3541,16 @@ const faustData = ${JSON.stringify({
           fftOptions
         })};
 // Implementation needed classes of functions
-const ${FaustDspInstance_default.name}_default = ${FaustDspInstance_default.toString()}
+const ${FaustDspInstance.name} = ${FaustDspInstance.toString()}
 const ${FaustBaseWebAudioDsp.name} = ${FaustBaseWebAudioDsp.toString()}
 const ${FaustMonoWebAudioDsp.name} = ${FaustMonoWebAudioDsp.toString()}
 const ${FaustWasmInstantiator_default.name} = ${FaustWasmInstantiator_default.toString()}
 const FFTUtils = ${fftUtils.toString()}
 // Put them in dependencies
 const dependencies = {
-    ${FaustBaseWebAudioDsp.name},
-    ${FaustMonoWebAudioDsp.name},
-    ${FaustWasmInstantiator_default.name},
+    FaustBaseWebAudioDsp: ${FaustBaseWebAudioDsp.name},
+    FaustMonoWebAudioDsp: ${FaustMonoWebAudioDsp.name},
+    FaustWasmInstantiator: ${FaustWasmInstantiator_default.name},
     FFTUtils
 };
 // Generate the actual AudioWorkletProcessor code
@@ -3678,16 +3677,16 @@ const faustData = ${JSON.stringify({
             effectMeta
           })};
 // Implementation needed classes of functions
-const ${FaustDspInstance_default.name}_default = ${FaustDspInstance_default.toString()}
+const ${FaustDspInstance.name} = ${FaustDspInstance.toString()}
 const ${FaustBaseWebAudioDsp.name} = ${FaustBaseWebAudioDsp.toString()}
 const ${FaustPolyWebAudioDsp.name} = ${FaustPolyWebAudioDsp.toString()}
 const ${FaustWebAudioDspVoice.name} = ${FaustWebAudioDspVoice.toString()}
 const ${FaustWasmInstantiator_default.name} = ${FaustWasmInstantiator_default.toString()}
 // Put them in dependencies
 const dependencies = {
-    ${FaustBaseWebAudioDsp.name},
-    ${FaustPolyWebAudioDsp.name},
-    ${FaustWasmInstantiator_default.name}
+    FaustBaseWebAudioDsp: ${FaustBaseWebAudioDsp.name},
+    FaustPolyWebAudioDsp: ${FaustPolyWebAudioDsp.name},
+    FaustWasmInstantiator: ${FaustWasmInstantiator_default.name}
 };
 // Generate the actual AudioWorkletProcessor code
 (${FaustAudioWorkletProcessor_default.toString()})(dependencies, faustData);
@@ -3747,7 +3746,7 @@ export {
   FaustAudioWorkletNode,
   FaustBaseWebAudioDsp,
   FaustCompiler_default as FaustCompiler,
-  FaustDspInstance_default as FaustDspInstance,
+  FaustDspInstance,
   FaustMonoAudioWorkletNode,
   FaustMonoDspGenerator,
   FaustMonoOfflineProcessor,