fix(spf): finish post-rebase single-slot reconciliation

cjpillsbury · claude · cjpillsbury · commit fe05df00d7a9 · 2026-05-05T18:22:18.000-07:00
Followups after rebasing the discrete-signals work onto main, where the
squash-merge collapsed `presentationUrl` back into a single
`presentation` slot. The conflict-resolution pass restored most of the
slot semantics, but a few stale references slipped through where the
files weren't textual conflicts:

- Three behaviors (`setupMediaSource`, `trackPlaybackInitiated`,
  `resolvePresentation`) had `'presentationUrl'` listed in their
  `defineBehavior` `stateKeys` arrays — replaced with `'presentation'`
  to match the post-revert state shape (resolvePresentation also drops
  the now-redundant key).
- Test `makeState` factories typed the presentation signal as
  `signal&lt;Presentation | undefined&gt;(...)` even though the input is
  `MaybeResolvedPresentation` — switched to the lifecycle type and
  added imports where missing. Two files (`load-segments`,
  `sync-text-tracks`) only used the strict type in the import, so it
  was dropped.
- `resolve-presentation.test.ts` had three contradictory assertions
  left over from a mechanical conversion (asserting the slot is both
  `undefined` and equal to a specific URL) — narrowed to "URL is
  present, but no `id` yet" so the unresolved state is checked
  precisely.
- `expose-engine-inputs.test.ts` still wrote `presentationUrl` into
  the test fixture; switched to `presentation: { url }` and the new
  `signal&lt;MaybeResolvedPresentation | undefined&gt;` typing for the
  fixture state.

After this, `pnpm -F @videojs/spf build` and `pnpm -F @videojs/spf
test` are both clean — 49 test files, 759 tests passing, 12 skipped,
no type errors, no unhandled errors.

Co-Authored-By: Claude Opus 4.7 (1M context) &lt;noreply@anthropic.com&gt;
diff --git a/packages/spf/src/playback/behaviors/dom/setup-mediasource.ts b/packages/spf/src/playback/behaviors/dom/setup-mediasource.ts
@@ -88,7 +88,7 @@ function setupMediaSourceSetup({
 }
 
 export const setupMediaSource = defineBehavior({
-  stateKeys: ['presentationUrl', 'mediaSourceReadyState'],
+  stateKeys: ['presentation', 'mediaSourceReadyState'],
   contextKeys: ['mediaElement', 'mediaSource'],
   setup: setupMediaSourceSetup,
 });
diff --git a/packages/spf/src/playback/behaviors/dom/tests/end-of-stream.test.ts b/packages/spf/src/playback/behaviors/dom/tests/end-of-stream.test.ts
@@ -1,7 +1,7 @@
 import { describe, expect, it, vi } from 'vitest';
 import type { ContextSignals, StateSignals } from '../../../../core/composition/create-composition';
 import { signal } from '../../../../core/signals/primitives';
-import type { Presentation, Segment, VideoTrack } from '../../../../media/types';
+import type { MaybeResolvedPresentation, Presentation, Segment, VideoTrack } from '../../../../media/types';
 import { createSourceBufferActor, type SourceBufferActor } from '../../../actors/dom/source-buffer';
 import {
   canEndStream,
@@ -14,7 +14,7 @@ import {
 
 function makeState(initial: EndOfStreamState = {}): StateSignals<EndOfStreamState> {
   return {
-    presentation: signal<Presentation | undefined>(initial.presentation),
+    presentation: signal<MaybeResolvedPresentation | undefined>(initial.presentation),
     mediaSourceReadyState: signal<MediaSource['readyState'] | undefined>(initial.mediaSourceReadyState),
     selectedVideoTrackId: signal<string | undefined>(initial.selectedVideoTrackId),
     selectedAudioTrackId: signal<string | undefined>(initial.selectedAudioTrackId),
diff --git a/packages/spf/src/playback/behaviors/dom/tests/load-segments-track-switch.test.ts b/packages/spf/src/playback/behaviors/dom/tests/load-segments-track-switch.test.ts
@@ -2,7 +2,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import type { ContextSignals, StateSignals } from '../../../../core/composition/create-composition';
 import { signal } from '../../../../core/signals/primitives';
 import type { BandwidthState } from '../../../../media/abr/bandwidth-estimator';
-import type { Presentation, VideoSelectionSet } from '../../../../media/types';
+import type { MaybeResolvedPresentation, Presentation, VideoSelectionSet } from '../../../../media/types';
 import { createSourceBufferActor, type SourceBufferActor } from '../../../actors/dom/source-buffer';
 import type { SegmentLoadingContext, SegmentLoadingState } from '../load-segments';
 import { loadVideoSegments } from '../load-segments';
@@ -25,7 +25,7 @@ vi.mock('../../../../media/dom/mse/buffer-flusher', () => ({
 
 function makeState(initial: SegmentLoadingState = {}): StateSignals<SegmentLoadingState> {
   return {
-    presentation: signal<Presentation | undefined>(initial.presentation),
+    presentation: signal<MaybeResolvedPresentation | undefined>(initial.presentation),
     preload: signal<string | undefined>(initial.preload),
     bandwidthState: signal<BandwidthState | undefined>(initial.bandwidthState),
     currentTime: signal<number | undefined>(initial.currentTime),
diff --git a/packages/spf/src/playback/behaviors/dom/tests/load-segments.test.ts b/packages/spf/src/playback/behaviors/dom/tests/load-segments.test.ts
@@ -6,7 +6,7 @@ import { describe, expect, it, vi } from 'vitest';
 import type { ContextSignals, StateSignals } from '../../../../core/composition/create-composition';
 import { signal } from '../../../../core/signals/primitives';
 import type { BandwidthState } from '../../../../media/abr/bandwidth-estimator';
-import type { Presentation, Segment } from '../../../../media/types';
+import type { MaybeResolvedPresentation, Segment } from '../../../../media/types';
 import { createSourceBufferActor, type SourceBufferActor } from '../../../actors/dom/source-buffer';
 import {
   loadAudioSegments,
@@ -17,7 +17,7 @@ import {
 
 function makeState(initial: SegmentLoadingState = {}): StateSignals<SegmentLoadingState> {
   return {
-    presentation: signal<Presentation | undefined>(initial.presentation),
+    presentation: signal<MaybeResolvedPresentation | undefined>(initial.presentation),
     preload: signal<string | undefined>(initial.preload),
     bandwidthState: signal<BandwidthState | undefined>(initial.bandwidthState),
     currentTime: signal<number | undefined>(initial.currentTime),
diff --git a/packages/spf/src/playback/behaviors/dom/tests/load-text-track-cues.test.ts b/packages/spf/src/playback/behaviors/dom/tests/load-text-track-cues.test.ts
@@ -2,7 +2,14 @@ import { beforeEach, describe, expect, it, vi } from 'vitest';
 import type { ContextSignals, StateSignals } from '../../../../core/composition/create-composition';
 import { signal } from '../../../../core/signals/primitives';
 import { resolveVttSegment } from '../../../../media/dom/text/resolve-vtt-segment';
-import type { Cue, MediaElementWithTextTracks, Presentation, Segment, TextTrack } from '../../../../media/types';
+import type {
+  Cue,
+  MaybeResolvedPresentation,
+  MediaElementWithTextTracks,
+  Presentation,
+  Segment,
+  TextTrack,
+} from '../../../../media/types';
 import type { TextTrackSegmentLoaderActor } from '../../../actors/text-track-segment-loader';
 import type { TextTracksActor } from '../../../actors/text-tracks';
 import {
@@ -32,7 +39,7 @@ vi.mock('../../../../media/dom/text/resolve-vtt-segment', () => ({
 function makeState(initial: TextTrackCueLoadingState = {}): StateSignals<TextTrackCueLoadingState> {
   return {
     selectedTextTrackId: signal<string | undefined>(initial.selectedTextTrackId),
-    presentation: signal<Presentation | undefined>(initial.presentation),
+    presentation: signal<MaybeResolvedPresentation | undefined>(initial.presentation),
     currentTime: signal<number | undefined>(initial.currentTime),
   };
 }
diff --git a/packages/spf/src/playback/behaviors/dom/tests/setup-sourcebuffer.test.ts b/packages/spf/src/playback/behaviors/dom/tests/setup-sourcebuffer.test.ts
@@ -1,7 +1,7 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 import type { ContextSignals, StateSignals } from '../../../../core/composition/create-composition';
 import { signal } from '../../../../core/signals/primitives';
-import type { AudioTrack, Presentation, VideoTrack } from '../../../../media/types';
+import type { AudioTrack, MaybeResolvedPresentation, Presentation, VideoTrack } from '../../../../media/types';
 import type { SourceBufferActor } from '../../../actors/dom/source-buffer';
 import {
   buildMimeCodec,
@@ -139,7 +139,7 @@ describe('buildMimeCodec', () => {
 
 function makeState(initial: SourceBufferState = {}): StateSignals<SourceBufferState> {
   return {
-    presentation: signal<Presentation | undefined>(initial.presentation),
+    presentation: signal<MaybeResolvedPresentation | undefined>(initial.presentation),
     selectedVideoTrackId: signal<string | undefined>(initial.selectedVideoTrackId),
     selectedAudioTrackId: signal<string | undefined>(initial.selectedAudioTrackId),
     selectedTextTrackId: signal<string | undefined>(initial.selectedTextTrackId),
diff --git a/packages/spf/src/playback/behaviors/dom/tests/sync-text-tracks.test.ts b/packages/spf/src/playback/behaviors/dom/tests/sync-text-tracks.test.ts
@@ -1,7 +1,7 @@
 import { describe, expect, it } from 'vitest';
 import type { ContextSignals, StateSignals } from '../../../../core/composition/create-composition';
 import { signal } from '../../../../core/signals/primitives';
-import type { Presentation } from '../../../../media/types';
+import type { MaybeResolvedPresentation } from '../../../../media/types';
 import { syncTextTracks, type TextTrackSyncContext, type TextTrackSyncState } from '../sync-text-tracks';
 
 function makePresentation(tracks: Array<{ id: string; kind?: string; language?: string }>) {
@@ -35,7 +35,7 @@ function makePresentation(tracks: Array<{ id: string; kind?: string; language?:
 
 function makeState(initial: TextTrackSyncState = {}): StateSignals<TextTrackSyncState> {
   return {
-    presentation: signal<Presentation | undefined>(initial.presentation),
+    presentation: signal<MaybeResolvedPresentation | undefined>(initial.presentation),
     selectedTextTrackId: signal<string | undefined>(initial.selectedTextTrackId),
   };
 }
diff --git a/packages/spf/src/playback/behaviors/dom/tests/update-duration.test.ts b/packages/spf/src/playback/behaviors/dom/tests/update-duration.test.ts
@@ -1,7 +1,7 @@
 import { describe, expect, it, vi } from 'vitest';
 import type { ContextSignals, StateSignals } from '../../../../core/composition/create-composition';
 import { signal } from '../../../../core/signals/primitives';
-import type { Presentation } from '../../../../media/types';
+import type { MaybeResolvedPresentation, Presentation } from '../../../../media/types';
 import {
   canUpdateDuration,
   type DurationUpdateContext,
@@ -12,7 +12,7 @@ import {
 
 function makeState(initial: DurationUpdateState = {}): StateSignals<DurationUpdateState> {
   return {
-    presentation: signal<Presentation | undefined>(initial.presentation),
+    presentation: signal<MaybeResolvedPresentation | undefined>(initial.presentation),
     mediaSourceReadyState: signal<MediaSource['readyState'] | undefined>(initial.mediaSourceReadyState),
   };
 }
diff --git a/packages/spf/src/playback/behaviors/dom/track-playback-initiated.ts b/packages/spf/src/playback/behaviors/dom/track-playback-initiated.ts
@@ -110,7 +110,7 @@ function trackPlaybackInitiatedSetup({
 }
 
 export const trackPlaybackInitiated = defineBehavior({
-  stateKeys: ['playbackInitiated', 'presentationUrl'],
+  stateKeys: ['playbackInitiated', 'presentation'],
   contextKeys: ['mediaElement'],
   setup: trackPlaybackInitiatedSetup,
 });
diff --git a/packages/spf/src/playback/behaviors/resolve-presentation.ts b/packages/spf/src/playback/behaviors/resolve-presentation.ts
@@ -116,7 +116,7 @@ function resolvePresentationSetup({
 }
 
 export const resolvePresentation = defineBehavior({
-  stateKeys: ['presentationUrl', 'presentation', 'preload', 'playbackInitiated'],
+  stateKeys: ['presentation', 'preload', 'playbackInitiated'],
   contextKeys: [],
   setup: resolvePresentationSetup,
 });
diff --git a/packages/spf/src/playback/behaviors/tests/calculate-presentation-duration.test.ts b/packages/spf/src/playback/behaviors/tests/calculate-presentation-duration.test.ts
@@ -1,7 +1,7 @@
 import { describe, expect, it, vi } from 'vitest';
 import type { StateSignals } from '../../../core/composition/create-composition';
 import { signal } from '../../../core/signals/primitives';
-import type { AudioTrack, Presentation, VideoTrack } from '../../../media/types';
+import type { AudioTrack, MaybeResolvedPresentation, Presentation, VideoTrack } from '../../../media/types';
 import {
   calculatePresentationDuration,
   canCalculateDuration,
@@ -12,7 +12,7 @@ import {
 
 function makeState(initial: PresentationDurationState = {}): StateSignals<PresentationDurationState> {
   return {
-    presentation: signal<Presentation | undefined>(initial.presentation),
+    presentation: signal<MaybeResolvedPresentation | undefined>(initial.presentation),
     selectedVideoTrackId: signal<string | undefined>(initial.selectedVideoTrackId),
     selectedAudioTrackId: signal<string | undefined>(initial.selectedAudioTrackId),
   };
diff --git a/packages/spf/src/playback/behaviors/tests/quality-switching.test.ts b/packages/spf/src/playback/behaviors/tests/quality-switching.test.ts
@@ -2,7 +2,12 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import type { StateSignals } from '../../../core/composition/create-composition';
 import { signal } from '../../../core/signals/primitives';
 import type { BandwidthState } from '../../../media/abr/bandwidth-estimator';
-import type { PartiallyResolvedVideoTrack, Presentation, VideoSelectionSet } from '../../../media/types';
+import type {
+  MaybeResolvedPresentation,
+  PartiallyResolvedVideoTrack,
+  Presentation,
+  VideoSelectionSet,
+} from '../../../media/types';
 import {
   DEFAULT_SWITCHING_CONFIG,
   type QualitySwitchingConfig,
@@ -16,7 +21,7 @@ import {
 
 function makeState(initial: QualitySwitchingState = {}): StateSignals<QualitySwitchingState> {
   return {
-    presentation: signal<Presentation | undefined>(initial.presentation),
+    presentation: signal<MaybeResolvedPresentation | undefined>(initial.presentation),
     bandwidthState: signal<BandwidthState | undefined>(initial.bandwidthState),
     selectedVideoTrackId: signal<string | undefined>(initial.selectedVideoTrackId),
     abrDisabled: signal<boolean | undefined>(initial.abrDisabled),
diff --git a/packages/spf/src/playback/behaviors/tests/resolve-presentation.test.ts b/packages/spf/src/playback/behaviors/tests/resolve-presentation.test.ts
@@ -249,8 +249,9 @@ variant1.m3u8`)
       await new Promise((resolve) => setTimeout(resolve, 50));
 
       expect(fetchSpy).not.toHaveBeenCalled();
-      expect(state.presentation.get()).toBeUndefined();
+      // Presentation slot still holds the unresolved input (URL only, no `id`).
       expect(state.presentation.get()?.url).toBe('http://example.com/playlist.m3u8');
+      expect(state.presentation.get()).not.toHaveProperty('id');
 
       reactor.destroy();
     });
@@ -267,8 +268,9 @@ variant1.m3u8`)
       await new Promise((resolve) => setTimeout(resolve, 50));
 
       expect(fetchSpy).not.toHaveBeenCalled();
-      expect(state.presentation.get()).toBeUndefined();
+      // Presentation slot still holds the unresolved input (URL only, no `id`).
       expect(state.presentation.get()?.url).toBe('http://example.com/playlist.m3u8');
+      expect(state.presentation.get()).not.toHaveProperty('id');
 
       reactor.destroy();
     });
@@ -315,8 +317,9 @@ variant1.m3u8`)
       await new Promise((resolve) => setTimeout(resolve, 50));
 
       expect(fetchSpy).not.toHaveBeenCalled();
-      expect(state.presentation.get()).toBeUndefined();
+      // Presentation slot still holds the unresolved input (URL only, no `id`).
       expect(state.presentation.get()?.url).toBe('http://example.com/playlist.m3u8');
+      expect(state.presentation.get()).not.toHaveProperty('id');
 
       reactor.destroy();
     });
diff --git a/packages/spf/src/playback/behaviors/tests/resolve-track.test.ts b/packages/spf/src/playback/behaviors/tests/resolve-track.test.ts
@@ -17,7 +17,7 @@ afterEach(() => {
 
 function makeState(initial: ResolveTrackState = {}): StateSignals<ResolveTrackState> {
   return {
-    presentation: signal<Presentation | undefined>(initial.presentation),
+    presentation: signal<MaybeResolvedPresentation | undefined>(initial.presentation),
     selectedVideoTrackId: signal<string | undefined>(initial.selectedVideoTrackId),
     selectedAudioTrackId: signal<string | undefined>(initial.selectedAudioTrackId),
     selectedTextTrackId: signal<string | undefined>(initial.selectedTextTrackId),
diff --git a/packages/spf/src/playback/behaviors/tests/select-tracks.test.ts b/packages/spf/src/playback/behaviors/tests/select-tracks.test.ts
@@ -4,6 +4,7 @@ import { signal } from '../../../core/signals/primitives';
 import type { TrackSelectionState } from '../../../media/primitives/select-tracks';
 import type {
   AudioSelectionSet,
+  MaybeResolvedPresentation,
   PartiallyResolvedAudioTrack,
   PartiallyResolvedVideoTrack,
   Presentation,
@@ -14,7 +15,7 @@ import { selectAudioTrack, selectTextTrack, selectVideoTrack } from '../select-t
 
 function makeState(initial: TrackSelectionState = {}): StateSignals<TrackSelectionState> {
   return {
-    presentation: signal<Presentation | undefined>(initial.presentation),
+    presentation: signal<MaybeResolvedPresentation | undefined>(initial.presentation),
     selectedVideoTrackId: signal<string | undefined>(initial.selectedVideoTrackId),
     selectedAudioTrackId: signal<string | undefined>(initial.selectedAudioTrackId),
     selectedTextTrackId: signal<string | undefined>(initial.selectedTextTrackId),
diff --git a/packages/spf/src/playback/engines/hls/tests/expose-engine-inputs.test.ts b/packages/spf/src/playback/engines/hls/tests/expose-engine-inputs.test.ts
@@ -1,10 +1,11 @@
 import { describe, expect, it } from 'vitest';
 import { signal } from '../../../../core/signals/primitives';
+import type { MaybeResolvedPresentation } from '../../../../media/types';
 import { exposeEngineInputs, type SimpleHlsEngineInputs } from '../expose-engine-inputs';
 
 function makeDeps() {
   const state = {
-    presentationUrl: signal<string | undefined>(undefined),
+    presentation: signal<MaybeResolvedPresentation | undefined>(undefined),
     preload: signal<'auto' | 'metadata' | 'none' | undefined>(undefined),
     playbackInitiated: signal<boolean | undefined>(undefined),
     abrDisabled: signal<boolean | undefined>(undefined),
@@ -31,7 +32,7 @@ describe('exposeEngineInputs', () => {
     });
 
     expect(captured).toBeDefined();
-    expect(captured?.state.presentationUrl).toBe(state.presentationUrl);
+    expect(captured?.state.presentation).toBe(state.presentation);
     expect(captured?.state.preload).toBe(state.preload);
     expect(captured?.state.playbackInitiated).toBe(state.playbackInitiated);
     expect(captured?.state.abrDisabled).toBe(state.abrDisabled);
@@ -52,11 +53,11 @@ describe('exposeEngineInputs', () => {
       },
     });
 
-    captured?.state.presentationUrl.set('https://example.com/stream.m3u8');
+    captured?.state.presentation.set({ url: 'https://example.com/stream.m3u8' });
     captured?.state.preload.set('auto');
     captured?.state.playbackInitiated.set(true);
 
-    expect(state.presentationUrl.get()).toBe('https://example.com/stream.m3u8');
+    expect(state.presentation.get()?.url).toBe('https://example.com/stream.m3u8');
     expect(state.preload.get()).toBe('auto');
     expect(state.playbackInitiated.get()).toBe(true);
   });
@@ -69,7 +70,7 @@ describe('exposeEngineInputs', () => {
   });
 
   it('declares the input keys in stateKeys and contextKeys', () => {
-    expect(exposeEngineInputs.stateKeys).toEqual(['presentationUrl', 'preload', 'playbackInitiated', 'abrDisabled']);
+    expect(exposeEngineInputs.stateKeys).toEqual(['presentation', 'preload', 'playbackInitiated', 'abrDisabled']);
     expect(exposeEngineInputs.contextKeys).toEqual(['mediaElement']);
   });
 });

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ function setupMediaSourceSetup({`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`export const setupMediaSource = defineBehavior({`
`91`		`- stateKeys: ['presentationUrl', 'mediaSourceReadyState'],`
	`91`	`+ stateKeys: ['presentation', 'mediaSourceReadyState'],`
`92`	`92`	`contextKeys: ['mediaElement', 'mediaSource'],`
`93`	`93`	`setup: setupMediaSourceSetup,`
`94`	`94`	`});`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ function trackPlaybackInitiatedSetup({`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`export const trackPlaybackInitiated = defineBehavior({`
`113`		`- stateKeys: ['playbackInitiated', 'presentationUrl'],`
	`113`	`+ stateKeys: ['playbackInitiated', 'presentation'],`
`114`	`114`	`contextKeys: ['mediaElement'],`
`115`	`115`	`setup: trackPlaybackInitiatedSetup,`
`116`	`116`	`});`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ function resolvePresentationSetup({`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`export const resolvePresentation = defineBehavior({`
`119`		`- stateKeys: ['presentationUrl', 'presentation', 'preload', 'playbackInitiated'],`
	`119`	`+ stateKeys: ['presentation', 'preload', 'playbackInitiated'],`
`120`	`120`	`contextKeys: [],`
`121`	`121`	`setup: resolvePresentationSetup,`
`122`	`122`	`});`