Update to TypeScript (5.8 -> 5.9)

robwalch · robwalch · commit d606fe97ff5b · 2025-10-28T17:31:52.000-07:00
Resolves #7603
diff --git a/api-extractor/report/hls.js.api.md b/api-extractor/report/hls.js.api.md
@@ -4837,7 +4837,7 @@ export interface Track extends BaseTrack {
     // (undocumented)
     buffer?: SourceBuffer;
     // (undocumented)
-    initSegment?: Uint8Array;
+    initSegment?: Uint8Array<ArrayBuffer>;
 }
 
 // Warning: (ae-missing-release-tag) "TrackLoadedData" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -88,8 +88,8 @@
     "@types/chart.js": "2.9.41",
     "@types/mocha": "10.0.10",
     "@types/sinon-chai": "3.2.12",
-    "@typescript-eslint/eslint-plugin": "8.38.0",
-    "@typescript-eslint/parser": "8.38.0",
+    "@typescript-eslint/eslint-plugin": "8.46.2",
+    "@typescript-eslint/parser": "8.46.2",
     "babel-loader": "10.0.0",
     "babel-plugin-transform-remove-console": "6.9.4",
     "chai": "4.5.0",
@@ -132,7 +132,7 @@
     "semver": "7.7.3",
     "sinon": "21.0.0",
     "sinon-chai": "3.7.0",
-    "typescript": "5.8.3",
+    "typescript": "5.9.3",
     "url-toolkit": "2.2.5",
     "wrangler": "4.38.0"
   }
diff --git a/src/controller/audio-stream-controller.ts b/src/controller/audio-stream-controller.ts
@@ -966,7 +966,7 @@ class AudioStreamController
       `Init audio buffer, container:${track.container}, codecs[level/parsed]=[${variantAudioCodecs}/${track.codec}]`,
     );
     // SourceBuffer will use track.levelCodec if defined
-    if (variantAudioCodecs && variantAudioCodecs.split(',').length === 1) {
+    if (variantAudioCodecs?.split(',').length === 1) {
       track.levelCodec = variantAudioCodecs;
     }
     this.hls.trigger(Events.BUFFER_CODECS, tracks as BufferCodecsData);
diff --git a/src/controller/audio-track-controller.ts b/src/controller/audio-track-controller.ts
@@ -89,7 +89,7 @@ class AudioTrackController extends BasePlaylistController {
     const { id, groupId, details } = data;
     const trackInActiveGroup = this.tracksInGroup[id];
 
-    if (!trackInActiveGroup || trackInActiveGroup.groupId !== groupId) {
+    if (trackInActiveGroup?.groupId !== groupId) {
       this.warn(
         `Audio track with id:${id} and group:${groupId} not found in active group ${trackInActiveGroup?.groupId}`,
       );
diff --git a/src/controller/base-stream-controller.ts b/src/controller/base-stream-controller.ts
@@ -1879,7 +1879,7 @@ export default class BaseStreamController
     }
     const frag = data.frag;
     // Handle frag error related to caller's filterType
-    if (!frag || frag.type !== filterType || !this.levels) {
+    if (!frag || !this.levels || frag.type !== filterType) {
       return;
     }
     if (this.fragContextChanged(frag)) {
diff --git a/src/controller/buffer-controller.ts b/src/controller/buffer-controller.ts
@@ -210,8 +210,8 @@ export default class BufferController extends Logger implements ComponentAPI {
     }
     const transferData = this.transferData;
     if (
-      !this.sourceBufferCount &&
       transferData &&
+      !this.sourceBufferCount &&
       transferData.mediaSource === mediaSource
     ) {
       Object.assign(tracks, transferData.tracks);
@@ -779,7 +779,7 @@ transfer tracks: ${stringify(transferredTracks, (key, value) => (key === 'initSe
     if (fragBuffering.start === 0) {
       fragBuffering.start = bufferAppendingStart;
     }
-    if (partBuffering && partBuffering.start === 0) {
+    if (partBuffering?.start === 0) {
       partBuffering.start = bufferAppendingStart;
     }
 
@@ -867,7 +867,7 @@ transfer tracks: ${stringify(transferredTracks, (key, value) => (key === 'initSe
         if (fragBuffering.first === 0) {
           fragBuffering.first = end;
         }
-        if (partBuffering && partBuffering.first === 0) {
+        if (partBuffering?.first === 0) {
           partBuffering.first = end;
         }
 
@@ -1086,7 +1086,7 @@ transfer tracks: ${stringify(transferredTracks, (key, value) => (key === 'initSe
         this.blockUntilOpen(() => {
           this.tracksEnded();
           const { mediaSource } = this;
-          if (!mediaSource || mediaSource.readyState !== 'open') {
+          if (mediaSource?.readyState !== 'open') {
             if (mediaSource) {
               this.log(
                 `Could not call mediaSource.endOfStream(). mediaSource.readyState: ${mediaSource.readyState}`,
@@ -1342,7 +1342,7 @@ transfer tracks: ${stringify(transferredTracks, (key, value) => (key === 'initSe
     end?: number;
   }) {
     const mediaSource = this.mediaSource;
-    if (!this.media || !mediaSource || mediaSource.readyState !== 'open') {
+    if (!mediaSource || !this.media || mediaSource.readyState !== 'open') {
       return;
     }
     if (mediaSource.duration !== duration) {
diff --git a/src/controller/fragment-finders.ts b/src/controller/fragment-finders.ts
@@ -113,8 +113,7 @@ function fragmentWithinFastStartSwitch(
   nextFragLookupTolerance: number,
 ): boolean {
   if (
-    fragPrevious &&
-    fragPrevious.start === 0 &&
+    fragPrevious?.start === 0 &&
     fragPrevious.level < fragNext.level &&
     (fragPrevious.endPTS || 0) > 0
   ) {
diff --git a/src/controller/interstitials-controller.ts b/src/controller/interstitials-controller.ts
@@ -2533,7 +2533,7 @@ Schedule: ${scheduleItems.map((seg) => segmentToString(seg))} pos: ${this.timeli
     const playingAsset = this.playingAsset;
     this.endedAsset = null;
     this.playingAsset = assetItem;
-    if (!playingAsset || playingAsset.identifier !== assetId) {
+    if (playingAsset?.identifier !== assetId) {
       if (playingAsset) {
         // Exiting another Interstitial asset
         this.clearAssetPlayer(
@@ -2725,11 +2725,10 @@ Schedule: ${scheduleItems.map((seg) => segmentToString(seg))} pos: ${this.timeli
     this.updateSchedule(true);
     if (interstitial.error) {
       this.primaryFallback(interstitial);
-    } else if (playingAsset && playingAsset.identifier === assetId) {
+    } else if (playingAsset?.identifier === assetId) {
       this.advanceAfterAssetEnded(interstitial, scheduleIndex, assetListIndex);
     } else if (
-      bufferingAsset &&
-      bufferingAsset.identifier === assetId &&
+      bufferingAsset?.identifier === assetId &&
       this.isInterstitial(this.bufferingItem)
     ) {
       this.advanceAssetBuffering(this.bufferingItem, bufferingAsset);
diff --git a/src/controller/stream-controller.ts b/src/controller/stream-controller.ts
@@ -1627,7 +1627,7 @@ export default class StreamController
         ) {
           this.fragPlaying = fragPlayingCurrent;
           this.hls.trigger(Events.FRAG_CHANGED, { frag: fragPlayingCurrent });
-          if (!fragPlaying || fragPlaying.level !== fragCurrentLevel) {
+          if (fragPlaying?.level !== fragCurrentLevel) {
             this.hls.trigger(Events.LEVEL_SWITCHED, {
               level: fragCurrentLevel,
             });
diff --git a/src/controller/subtitle-track-controller.ts b/src/controller/subtitle-track-controller.ts
@@ -204,7 +204,7 @@ class SubtitleTrackController extends BasePlaylistController {
     const { id, groupId, details } = data;
     const trackInActiveGroup = this.tracksInGroup[id];
 
-    if (!trackInActiveGroup || trackInActiveGroup.groupId !== groupId) {
+    if (trackInActiveGroup?.groupId !== groupId) {
       this.warn(
         `Subtitle track with id:${id} and group:${groupId} not found in active group ${trackInActiveGroup?.groupId}`,
       );
diff --git a/src/crypt/aes-crypto.ts b/src/crypt/aes-crypto.ts
@@ -2,10 +2,14 @@ import { DecrypterAesMode } from './decrypter-aes-mode';
 
 export default class AESCrypto {
   private subtle: SubtleCrypto;
-  private aesIV: Uint8Array;
+  private aesIV: Uint8Array<ArrayBuffer>;
   private aesMode: DecrypterAesMode;
 
-  constructor(subtle: SubtleCrypto, iv: Uint8Array, aesMode: DecrypterAesMode) {
+  constructor(
+    subtle: SubtleCrypto,
+    iv: Uint8Array<ArrayBuffer>,
+    aesMode: DecrypterAesMode,
+  ) {
     this.subtle = subtle;
     this.aesIV = iv;
     this.aesMode = aesMode;
diff --git a/src/demux/audio/aacdemuxer.ts b/src/demux/audio/aacdemuxer.ts
@@ -87,7 +87,7 @@ class AACDemuxer extends BaseAudioDemuxer {
       this.basePTS as number,
       this.frameIndex,
     );
-    if (frame && frame.missing === 0) {
+    if (frame?.missing === 0) {
       return frame;
     }
   }
diff --git a/src/demux/mp4demuxer.ts b/src/demux/mp4demuxer.ts
@@ -29,7 +29,7 @@ import type { IEmsgParsingData } from '../utils/mp4-tools';
 const emsgSchemePattern = /\/emsg[-/]ID3/i;
 
 class MP4Demuxer implements Demuxer {
-  private remainderData: Uint8Array | null = null;
+  private remainderData: Uint8Array<ArrayBuffer> | null = null;
   private timeOffset: number = 0;
   private config: HlsConfig;
   private videoTrack?: PassthroughTrack;
@@ -98,7 +98,10 @@ class MP4Demuxer implements Demuxer {
     return hasMoofData(data);
   }
 
-  public demux(data: Uint8Array, timeOffset: number): DemuxerResult {
+  public demux(
+    data: Uint8Array<ArrayBuffer>,
+    timeOffset: number,
+  ): DemuxerResult {
     this.timeOffset = timeOffset;
     // Load all data into the avc track. The CMAF remuxer will look for the data in the samples object; the rest of the fields do not matter
     let videoSamples = data;
diff --git a/src/demux/transmuxer.ts b/src/demux/transmuxer.ts
@@ -374,7 +374,7 @@ export default class Transmuxer {
     chunkMeta: ChunkMetadata,
   ): TransmuxerResult | Promise<TransmuxerResult> {
     let result: TransmuxerResult | Promise<TransmuxerResult>;
-    if (keyData && keyData.method === 'SAMPLE-AES') {
+    if (keyData?.method === 'SAMPLE-AES') {
       result = this.transmuxSampleAes(
         data,
         keyData,
diff --git a/src/loader/level-key.ts b/src/loader/level-key.ts
@@ -199,7 +199,7 @@ export class LevelKey implements DecryptData {
     }
 
     // Default behavior: get keyId from other KEY tag or URI lookup
-    if (!this.keyId || this.keyId.byteLength !== 16) {
+    if (this.keyId?.byteLength !== 16) {
       let keyId: Uint8Array<ArrayBuffer> | null | undefined;
       keyId = getKeyIdFromWidevineKey(levelKeys);
       if (!keyId) {
diff --git a/src/remux/mp4-generator.ts b/src/remux/mp4-generator.ts
@@ -416,7 +416,7 @@ class MP4 {
 
   static moov(tracks: MediaTrackType[]) {
     let i = tracks.length;
-    const boxes: Uint8Array[] = [];
+    const boxes: Uint8Array<ArrayBuffer>[] = [];
 
     while (i--) {
       boxes[i] = MP4.trak(tracks[i]);
diff --git a/src/types/demuxer.ts b/src/types/demuxer.ts
@@ -53,7 +53,7 @@ export interface DemuxedTrack {
 
 export interface PassthroughTrack extends DemuxedTrack {
   sampleDuration: number;
-  samples: Uint8Array;
+  samples: Uint8Array<ArrayBuffer>;
   timescale: number;
   duration: number;
   codec: string;
diff --git a/src/types/track.ts b/src/types/track.ts
@@ -8,5 +8,5 @@ export interface TrackSet {
 
 export interface Track extends BaseTrack {
   buffer?: SourceBuffer; // eslint-disable-line no-restricted-globals
-  initSegment?: Uint8Array;
+  initSegment?: Uint8Array<ArrayBuffer>;
 }
diff --git a/src/utils/level-helper.ts b/src/utils/level-helper.ts
@@ -556,10 +556,10 @@ export function getFragmentWithSN(
     return fragment;
   }
   fragment = details.fragmentHint;
-  if (fragment && fragment.sn === sn) {
+  if (fragment?.sn === sn) {
     return fragment;
   }
-  if (sn < details.startSN && fragCurrent && fragCurrent.sn === sn) {
+  if (fragCurrent && sn < details.startSN && fragCurrent.sn === sn) {
     return fragCurrent as MediaFragment;
   }
   return null;

Original file line number	Diff line number	Diff line change
`@@ -4837,7 +4837,7 @@ export interface Track extends BaseTrack {`
`4837`	`4837`	`// (undocumented)`
`4838`	`4838`	`buffer?: SourceBuffer;`
`4839`	`4839`	`// (undocumented)`
`4840`		`- initSegment?: Uint8Array;`
	`4840`	`+ initSegment?: Uint8Array<ArrayBuffer>;`
`4841`	`4841`	`}`
`4842`	`4842`
`4843`	`4843`	`// Warning: (ae-missing-release-tag) "TrackLoadedData" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)`
Original file line number	Diff line number	Diff line change
`@@ -966,7 +966,7 @@ class AudioStreamController`
`966`	`966`	`Init audio buffer, container:${track.container}, codecs[level/parsed]=[${variantAudioCodecs}/${track.codec}]`,
`967`	`967`	`);`
`968`	`968`	`// SourceBuffer will use track.levelCodec if defined`
`969`		`- if (variantAudioCodecs && variantAudioCodecs.split(',').length === 1) {`
	`969`	`+ if (variantAudioCodecs?.split(',').length === 1) {`
`970`	`970`	`track.levelCodec = variantAudioCodecs;`
`971`	`971`	`}`
`972`	`972`	`this.hls.trigger(Events.BUFFER_CODECS, tracks as BufferCodecsData);`
Original file line number	Diff line number	Diff line change
`@@ -1879,7 +1879,7 @@ export default class BaseStreamController`
`1879`	`1879`	`}`
`1880`	`1880`	`const frag = data.frag;`
`1881`	`1881`	`// Handle frag error related to caller's filterType`
`1882`		`- if (!frag \|\| frag.type !== filterType \|\| !this.levels) {`
	`1882`	`+ if (!frag \|\| !this.levels \|\| frag.type !== filterType) {`
`1883`	`1883`	`return;`
`1884`	`1884`	`}`
`1885`	`1885`	`if (this.fragContextChanged(frag)) {`