spessasynth_core 4.0.3 → 4.0.5

package/dist/index.js

@@ -3340,8 +3340,8 @@ var BasicMIDI2 = class _BasicMIDI {
         switch (e.statusByte) {
           case midiMessageTypes.endOfTrack:
             if (i !== track.events.length - 1) {
-              i--;
               track.deleteEvent(i);
+              i--;
               SpessaSynthWarn("Unexpected EndOfTrack. Removing!");
             }
             break;
@@ -7064,7 +7064,6 @@ var BasicZone = class {
     const genValue = this.getGenerator(type, generatorLimits[type].def);
     this.setGenerator(type, value + genValue, validate);
   }
-  // noinspection JSUnusedGlobalSymbols
   /**
    * Sets a generator to a given value if preset, otherwise adds a new one.
    */
@@ -7242,12 +7241,14 @@ var BasicPresetZone = class extends BasicZone {
         "Instrument ID cannot be determined without the sound bank itself."
       );
     }
+    const instrumentID = bank.instruments.indexOf(this.instrument);
+    if (instrumentID < 0) {
+      throw new Error(
+        `${this.instrument.name} does not exist in ${bank.soundBankInfo.name}! Cannot write instrument generator.`
+      );
+    }
     gens.push(
-      new Generator(
-        generatorTypes.instrument,
-        bank.instruments.indexOf(this.instrument),
-        false
-      )
+      new Generator(generatorTypes.instrument, instrumentID, false)
     );
     return gens;
   }
@@ -7302,13 +7303,13 @@ var BasicInstrumentZone = class extends BasicZone {
   }
   getWriteGenerators(bank) {
     const gens = super.getWriteGenerators(bank);
-    gens.push(
-      new Generator(
-        generatorTypes.sampleID,
-        bank.samples.indexOf(this.sample),
-        false
-      )
-    );
+    const sampleID = bank.samples.indexOf(this.sample);
+    if (sampleID < 0) {
+      throw new Error(
+        `${this.sample.name} does not exist in ${bank.soundBankInfo.name}! Cannot write sampleID generator.`
+      );
+    }
+    gens.push(new Generator(generatorTypes.sampleID, sampleID, false));
     return gens;
   }
 };
@@ -12684,7 +12685,7 @@ var SoundFontSample = class extends BasicSample {
     } else {
       if (linked.linkedSample) {
         SpessaSynthInfo(
-          `%cInvalid linked sample for ${this.name}: Already linked to ${linked.linkedSample.name}`,
+          `%cInvalid linked sample for ${this.name}: ${linked.name} is already linked to ${linked.linkedSample.name}`,
           consoleColors.warn
         );
         this.unlinkSample();
@@ -16053,6 +16054,11 @@ var SoundFontPresetZone = class extends BasicPresetZone {
     } else {
       throw new Error("No instrument ID found in preset zone.");
     }
+    if (!instrument) {
+      throw new Error(
+        `Invalid instrument ID: ${instrumentID.generatorValue}, available instruments: ${instruments.length}`
+      );
+    }
     super(preset, instrument);
     this.addGenerators(...generators);
     this.addModulators(...modulators);
@@ -16146,6 +16152,11 @@ var SoundFontInstrumentZone = class extends BasicInstrumentZone {
     } else {
       throw new Error("No sample ID found in instrument zone.");
     }
+    if (!sample) {
+      throw new Error(
+        `Invalid sample ID: ${sampleID.generatorValue}, available samples: ${samples.length}`
+      );
+    }
     super(inst, sample);
     this.addGenerators(...generators);
     this.addModulators(...modulators);