fix: improve note handling and remove TypeScript ignores in SongStatsGenerator

- Added checks to skip undefined notes in the SongStatsGenerator to prevent errors.
- Removed unnecessary TypeScript ignore comments for better code clarity.
- Updated build order in build.ts to ensure @nbw/sounds is built after @nbw/database.

Author: tomast1337

bun.lock

@@ -191,6 +191,7 @@
       "name": "@nbw/song",
       "dependencies": {
         "@encode42/nbs.js": "^5.0.2",
+        "@nbw/config": "workspace:*",
         "@nbw/database": "workspace:*",
         "@timohausmann/quadtree-ts": "^2.2.2",
         "jszip": "^3.10.1",

packages/song/src/stats.ts

@@ -111,6 +111,9 @@ export class SongStatsGenerator {
         const note = layer.notes[tickStr];
         const tick = parseInt(tickStr);
 
+        // Skip if note is undefined
+        if (!note) continue;
+
         if (tick > tickCount) {
           tickCount = tick;
         }
@@ -120,7 +123,6 @@ export class SongStatsGenerator {
           layerCount = layerId;
         }
 
-        // @ts-ignore //TODO: fix this
         const effectivePitch = note.key + note.pitch / 100;
 
         // Differences between Note Block Studio and this implementation:
@@ -148,8 +150,9 @@ export class SongStatsGenerator {
         // the default Minecraft sounds are enough to play the song (i.e. you can play it using only
         // a custom sounds.json in a resource pack).
 
-        // @ts-ignore //TODO: fix this
-        const instrumentKey = this.song.instruments.loaded[note.instrument].key; // F#4 = 45
+        const instrument = this.song.instruments.loaded[note.instrument]!;
+        if (!instrument) continue;
+        const instrumentKey = instrument.key; // F#4 = 45
         const minRange = 45 - (instrumentKey - 45) - 12; // F#3 = 33
         const maxRange = 45 - (instrumentKey - 45) + 12; // F#5 = 57
 
@@ -158,15 +161,13 @@ export class SongStatsGenerator {
 
         // Don't consider tempo changers as detuned notes or custom instruments
         const isTempoChanger = tempoChangerInstruments.includes(
-          // @ts-ignore //TODO: fix this
           note.instrument,
         );
 
-        // @ts-ignore //TODO: fix this
         const hasDetune = note.pitch % 100 !== 0;
 
         const usesCustomInstrument =
-          note.instrument >= this.song.instruments.firstCustomIndex; // @ts-ignore //TODO: fix this
+          note.instrument >= this.song.instruments.firstCustomIndex;
 
         if (!isTempoChanger) {
           if (isOutOfRange) outOfRangeNoteCount++;
@@ -176,7 +177,6 @@ export class SongStatsGenerator {
             incompatibleNoteCount++;
         }
 
-        // @ts-ignore //TODO: fix this
         instrumentNoteCounts[note.instrument]++;
         noteCount++;
       }
@@ -227,15 +227,17 @@ export class SongStatsGenerator {
           const note = layer.notes[tickStr];
           const tick = parseInt(tickStr);
 
-          // @ts-ignore //TODO: fix this          // Not a tempo changer
+          // Skip if note is undefined
+          if (!note) continue;
+
+          // Not a tempo changer
           if (!tempoChangerInstruments.includes(note.instrument)) continue;
 
           // The tempo change isn't effective if there's another tempo changer in the same tick,
           // so we iterate layers bottom to top and skip the block if a tempo changer has already
           // been found in this tick
           if (tick in tempoSegments) continue;
 
-          // @ts-ignore //TODO: fix this
           const tempo = Math.abs(note.pitch) / 15; // note pitch = BPM = (t/s) * 15
           tempoSegments[tick] = tempo;
         }
@@ -273,10 +275,11 @@ export class SongStatsGenerator {
       const currTick = tempoChangeTicks[i];
       const nextTick = tempoChangeTicks[i + 1];
 
-      // @ts-ignore //TODO: fix this
+      if (currTick === undefined || nextTick === undefined) continue;
+
       const currTempo = tempoSegments[currTick];
+      if (currTempo === undefined) continue;
 
-      // @ts-ignore //TODO: fix this
       const segmentDurationTicks = nextTick - currTick;
       const timePerTick = 1 / currTempo;
 

scripts/build.ts

@@ -4,9 +4,9 @@ import { $ } from 'bun';
 // the sub array is for packages that can be built in parallel
 const packages: (string | string[])[] = [
   '@nbw/config',
-  '@nbw/sounds',
-  '@nbw/database', // Build database first to ensure types are available
+  '@nbw/database',
   '@nbw/song',
+  '@nbw/sounds',
   '@nbw/thumbnail',
 ];