@grame/faustwasm 0.12.1 → 0.12.2

package/package.json

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

package/src/FaustDspGenerator.ts

@@ -12,7 +12,6 @@ import type { IFaustCompiler } from "./FaustCompiler";
 import type { FaustDspFactory, FaustUIDescriptor, FaustDspMeta, FFTUtils, LooseFaustDspFactory, AudioData } from "./types";
 import { FaustAudioWorkletCommunicator, FaustAudioWorkletProcessorCommunicator } from "./FaustAudioWorkletCommunicator";
 
-
 export interface GeneratorSupportingSoundfiles {
     /**
      * Attach a map of id - audio data, call after `compile()` before `createNode()`
@@ -241,6 +240,7 @@ export class FaustMonoDspGenerator implements IFaustMonoDspGenerator {
         if (!this.factory) throw new Error("Code is not compiled, please define the factory or call `await this.compile()` first.");
         const meta = JSON.parse(this.factory.json);
         const map = SoundfileReader.findSoundfilesFromMeta(meta);
+        if (!map) return [];
         return Object.keys(map);
     }
 
@@ -577,6 +577,7 @@ process = adaptorIns(dsp_code.process) : dsp_code.effect : adaptorOuts;
         if (!this.voiceFactory) throw new Error("Code is not compiled, please define the factory or call `await this.compile()` first.");
         const meta = JSON.parse(this.voiceFactory.json);
         const map = SoundfileReader.findSoundfilesFromMeta(meta);
+        if (!map) return [];
         if (!this.effectFactory) return Object.keys(map);
         const effectMeta = JSON.parse(this.effectFactory.json);
         const effectMap = SoundfileReader.findSoundfilesFromMeta(effectMeta);

package/src/FaustWebAudioDsp.ts

@@ -891,7 +891,7 @@ export class FaustBaseWebAudioDsp implements IFaustBaseWebAudioDsp {
         for (const soundfileId of soundfileIdList) {
             let chan = 0;
             let len = 0;
-            const audioData = soundfiles[soundfileId];
+            const audioData = soundfiles?.[soundfileId];
             if (audioData) {
                 chan = audioData.audioBuffer.length;
                 len = audioData.audioBuffer[0].length;
@@ -916,7 +916,7 @@ export class FaustBaseWebAudioDsp implements IFaustBaseWebAudioDsp {
         // Read all files
         for (let part = 0; part < soundfileIdList.length; part++) {
             const soundfileId = soundfileIdList[part];
-            const audioData = soundfiles[soundfileId];
+            const audioData = soundfiles?.[soundfileId];
             if (audioData) {
                 //soundfile.displayMemory("BEFORE copyToOut");
                 soundfile.copyToOut(part, maxChan, offset, audioData);

package/src/SoundfileReader.ts

@@ -94,12 +94,12 @@ class SoundfileReader {
      * @param audioCtx : the audio context
      */
     private static async loadSoundfile(filename: string, metaUrls: string[], soundfiles: LooseFaustDspFactory["soundfiles"], audioCtx: BaseAudioContext): Promise<void> {
-        if (soundfiles[filename]) return;
+        if (soundfiles?.[filename]) return;
         const urlsToCheck = [filename, ...[...metaUrls, ...this.fallbackPaths].map(path => new URL(filename, path.endsWith("/") ? path : `${path}/`).href)];
         const checkResults = await Promise.all(urlsToCheck.map(url => this.checkFileExists(url)));
         const successIndex = checkResults.findIndex(r => !!r);
         if (successIndex === -1) throw new Error(`Failed to load sound file ${filename}, all check failed.`);
-        soundfiles[filename] = await this.fetchSoundfile(urlsToCheck[successIndex], audioCtx);
+        soundfiles![filename] = await this.fetchSoundfile(urlsToCheck[successIndex], audioCtx);
     }
 
     /**
@@ -114,7 +114,7 @@ class SoundfileReader {
         const metaUrls = FaustBaseWebAudioDsp.extractUrlsFromMeta(dspMeta);
         const soundfiles = this.findSoundfilesFromMeta(dspMeta);
         for (const id in soundfiles) {
-            if (soundfilesIn[id]) {
+            if (soundfilesIn?.[id]) {
                 soundfiles[id] = soundfilesIn[id];
                 continue;
             }

package/src/types.ts

@@ -123,7 +123,7 @@ export interface LooseFaustDspFactory {
     /** a unique identifier */
     shaKey?: string;
     /** a map of transferable audio buffers for the `soundfile` function */
-    soundfiles: Record<string, (AudioData | null)>;
+    soundfiles?: Record<string, AudioData | null>;
 }
 
 export interface FaustDspMeta {

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

@@ -110,7 +110,7 @@ export interface LooseFaustDspFactory {
 	/** a unique identifier */
 	shaKey?: string;
 	/** a map of transferable audio buffers for the `soundfile` function */
-	soundfiles: Record<string, (AudioData$1 | null)>;
+	soundfiles?: Record<string, AudioData$1 | null>;
 }
 export interface FaustDspMeta {
 	name: string;

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

@@ -2277,7 +2277,7 @@ var FaustBaseWebAudioDsp = class _FaustBaseWebAudioDsp {
     for (const soundfileId of soundfileIdList) {
       let chan = 0;
       let len = 0;
-      const audioData = soundfiles[soundfileId];
+      const audioData = soundfiles == null ? void 0 : soundfiles[soundfileId];
       if (audioData) {
         chan = audioData.audioBuffer.length;
         len = audioData.audioBuffer[0].length;
@@ -2293,7 +2293,7 @@ var FaustBaseWebAudioDsp = class _FaustBaseWebAudioDsp {
     let offset = 0;
     for (let part = 0; part < soundfileIdList.length; part++) {
       const soundfileId = soundfileIdList[part];
-      const audioData = soundfiles[soundfileId];
+      const audioData = soundfiles == null ? void 0 : soundfiles[soundfileId];
       if (audioData) {
         soundfile.copyToOut(part, maxChan, offset, audioData);
         offset += audioData.audioBuffer[0].length;
@@ -3693,7 +3693,7 @@ var SoundfileReader = class {
    * @param audioCtx : the audio context
    */
   static async loadSoundfile(filename, metaUrls, soundfiles, audioCtx) {
-    if (soundfiles[filename]) return;
+    if (soundfiles == null ? void 0 : soundfiles[filename]) return;
     const urlsToCheck = [filename, ...[...metaUrls, ...this.fallbackPaths].map((path) => new URL(filename, path.endsWith("/") ? path : `${path}/`).href)];
     const checkResults = await Promise.all(urlsToCheck.map((url) => this.checkFileExists(url)));
     const successIndex = checkResults.findIndex((r) => !!r);
@@ -3712,7 +3712,7 @@ var SoundfileReader = class {
     const metaUrls = FaustBaseWebAudioDsp.extractUrlsFromMeta(dspMeta);
     const soundfiles = this.findSoundfilesFromMeta(dspMeta);
     for (const id in soundfiles) {
-      if (soundfilesIn[id]) {
+      if (soundfilesIn == null ? void 0 : soundfilesIn[id]) {
         soundfiles[id] = soundfilesIn[id];
         continue;
       }
@@ -4314,6 +4314,7 @@ var _FaustMonoDspGenerator = class _FaustMonoDspGenerator {
     if (!this.factory) throw new Error("Code is not compiled, please define the factory or call `await this.compile()` first.");
     const meta = JSON.parse(this.factory.json);
     const map = SoundfileReader_default.findSoundfilesFromMeta(meta);
+    if (!map) return [];
     return Object.keys(map);
   }
   async createNode(context, name = this.name, factory = this.factory, sp = false, bufferSize = 1024, processorName = (factory == null ? void 0 : factory.shaKey) || name, processorOptions = {}) {
@@ -4584,6 +4585,7 @@ process = adaptorIns(dsp_code.process) : dsp_code.effect : adaptorOuts;
     if (!this.voiceFactory) throw new Error("Code is not compiled, please define the factory or call `await this.compile()` first.");
     const meta = JSON.parse(this.voiceFactory.json);
     const map = SoundfileReader_default.findSoundfilesFromMeta(meta);
+    if (!map) return [];
     if (!this.effectFactory) return Object.keys(map);
     const effectMeta = JSON.parse(this.effectFactory.json);
     const effectMap = SoundfileReader_default.findSoundfilesFromMeta(effectMeta);