react-native-audio-browser 0.2.0-next.11 → 0.2.0-next.12

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (333) hide show
  1. package/README.md +4 -4
  2. package/android/src/main/java/com/audiobrowser/AudioBrowser.kt +110 -25
  3. package/android/src/main/java/com/audiobrowser/browser/BrowserManager.kt +254 -188
  4. package/android/src/main/java/com/audiobrowser/browser/BrowserUrlResolution.kt +23 -3
  5. package/android/src/main/java/com/audiobrowser/browser/JsonModels.kt +77 -58
  6. package/android/src/main/java/com/audiobrowser/browser/SectionScope.kt +68 -26
  7. package/android/src/main/java/com/audiobrowser/browser/StyleResolver.kt +49 -0
  8. package/android/src/main/java/com/audiobrowser/extension/ResolvedTrackExt.kt +9 -7
  9. package/android/src/main/java/com/audiobrowser/extension/TappedTrack.kt +20 -0
  10. package/android/src/main/java/com/audiobrowser/extension/TrackIdentity.kt +15 -0
  11. package/android/src/main/java/com/audiobrowser/player/MediaSessionCallback.kt +120 -67
  12. package/android/src/main/java/com/audiobrowser/player/NowPlayingUpdater.kt +21 -24
  13. package/android/src/main/java/com/audiobrowser/player/PlaybackStateStore.kt +93 -73
  14. package/android/src/main/java/com/audiobrowser/player/Player.kt +48 -30
  15. package/android/src/main/java/com/audiobrowser/player/PlayerCapabilitiesExt.kt +2 -15
  16. package/android/src/main/java/com/audiobrowser/util/BrowserPathHelper.kt +44 -40
  17. package/android/src/main/java/com/audiobrowser/util/MediaExtrasBuilder.kt +28 -23
  18. package/android/src/main/java/com/audiobrowser/util/StyleWire.kt +35 -0
  19. package/android/src/main/java/com/audiobrowser/util/TrackFactory.kt +45 -53
  20. package/android/src/test/java/com/audiobrowser/TestFixtures.kt +26 -39
  21. package/android/src/test/java/com/audiobrowser/browser/BrowserManagerFavoritesTest.kt +153 -0
  22. package/android/src/test/java/com/audiobrowser/browser/BrowserManagerTest.kt +228 -50
  23. package/android/src/test/java/com/audiobrowser/browser/BrowserUrlResolutionTest.kt +38 -0
  24. package/android/src/test/java/com/audiobrowser/browser/JsonArtworkTest.kt +1 -1
  25. package/android/src/test/java/com/audiobrowser/browser/JsonStyleTest.kt +91 -0
  26. package/android/src/test/java/com/audiobrowser/browser/SectionScopeTest.kt +128 -53
  27. package/android/src/test/java/com/audiobrowser/browser/StyleResolverTest.kt +87 -0
  28. package/android/src/test/java/com/audiobrowser/extension/TappedTrackTest.kt +43 -0
  29. package/android/src/test/java/com/audiobrowser/extension/TrackIdentityTest.kt +41 -0
  30. package/android/src/test/java/com/audiobrowser/player/CapabilityControlsTest.kt +1 -2
  31. package/android/src/test/java/com/audiobrowser/player/NowPlayingUpdaterTest.kt +42 -2
  32. package/android/src/test/java/com/audiobrowser/player/PlaybackStateStoreTrackJsonTest.kt +55 -0
  33. package/android/src/test/java/com/audiobrowser/util/BrowserPathHelperTest.kt +41 -16
  34. package/android/src/test/java/com/audiobrowser/util/MediaExtrasBuilderTest.kt +161 -0
  35. package/android/src/test/java/com/audiobrowser/util/TrackFactoryMediaIdTest.kt +7 -7
  36. package/ios/Browser/BrowserConfig.swift +102 -5
  37. package/ios/Browser/BrowserManager+URLResolution.swift +18 -14
  38. package/ios/Browser/BrowserManager.swift +131 -143
  39. package/ios/Browser/BrowserPathHelper.swift +44 -44
  40. package/ios/Browser/JsonModels.swift +187 -106
  41. package/ios/Browser/SearchDrillIn.swift +6 -6
  42. package/ios/Browser/SectionPresentation.swift +34 -0
  43. package/ios/Browser/SectionScope.swift +58 -24
  44. package/ios/Browser/StyleResolver.swift +47 -0
  45. package/ios/Browser/TabBarEntries.swift +2 -2
  46. package/ios/Browser/TrackIdTemplate.swift +37 -0
  47. package/ios/CarPlay/CarPlayArtworkResolver.swift +8 -7
  48. package/ios/CarPlay/CarPlayController.swift +105 -67
  49. package/ios/CarPlay/CarPlayImageLoader.swift +38 -18
  50. package/ios/CarPlay/CarPlayListItemFactory.swift +217 -84
  51. package/ios/CarPlay/CarPlayNowPlayingManager.swift +15 -12
  52. package/ios/Extension/Capability+RemoteCommand.swift +1 -1
  53. package/ios/Extension/PlayerCapabilities+Favorite.swift +1 -15
  54. package/ios/Extension/ResolvedTrack+Copying.swift +11 -15
  55. package/ios/Extension/Section+Copying.swift +31 -0
  56. package/ios/Extension/Track+Copying.swift +6 -12
  57. package/ios/Extension/Track+Identity.swift +18 -0
  58. package/ios/HybridAudioBrowser.swift +113 -35
  59. package/ios/Model/NitroTypeStubs.swift +46 -21
  60. package/ios/Model/PlayerUpdateOptions.swift +7 -0
  61. package/ios/Player/NowPlayingUpdater.swift +1 -1
  62. package/ios/Player/PlaybackCoordinator.swift +2 -2
  63. package/ios/Player/RetryManager.swift +4 -3
  64. package/ios/Tests/BrowserPathHelperTests.swift +50 -20
  65. package/ios/Tests/CarPlayArtworkResolverTests.swift +24 -41
  66. package/ios/Tests/JsonModelsTests.swift +75 -1
  67. package/ios/Tests/PlaybackStateStoreTests.swift +4 -3
  68. package/ios/Tests/ResolvedTrackCopyingTests.swift +37 -35
  69. package/ios/Tests/SearchDrillInTests.swift +16 -16
  70. package/ios/Tests/SectionPresentationTests.swift +61 -0
  71. package/ios/Tests/SectionScopeTests.swift +87 -55
  72. package/ios/Tests/StyleResolverTests.swift +67 -0
  73. package/ios/Tests/TabBarEntriesTests.swift +18 -18
  74. package/ios/Tests/TrackIdTemplateTests.swift +67 -0
  75. package/ios/Tests/TrackIdentityTests.swift +20 -0
  76. package/ios/Tests/TrackSelectorTests.swift +168 -33
  77. package/ios/TrackSelector.swift +45 -30
  78. package/ios/Util/ArtworkImageFetcher.swift +16 -1
  79. package/lib/commonjs/AudioBrowser.js +11 -0
  80. package/lib/commonjs/AudioBrowser.js.map +1 -1
  81. package/lib/commonjs/features/browser-config.js +11 -8
  82. package/lib/commonjs/features/browser-config.js.map +1 -1
  83. package/lib/commonjs/features/browser.js +2 -2
  84. package/lib/commonjs/features/favorites.js +13 -10
  85. package/lib/commonjs/features/favorites.js.map +1 -1
  86. package/lib/commonjs/features/playback/controls.js +4 -2
  87. package/lib/commonjs/features/playback/controls.js.map +1 -1
  88. package/lib/commonjs/features/playback/state.js +2 -3
  89. package/lib/commonjs/features/playback/state.js.map +1 -1
  90. package/lib/commonjs/features/player/options.js.map +1 -1
  91. package/lib/commonjs/features/player/setup.js +3 -1
  92. package/lib/commonjs/features/player/setup.js.map +1 -1
  93. package/lib/commonjs/features/player/validateOptions.js +2 -0
  94. package/lib/commonjs/features/player/validateOptions.js.map +1 -1
  95. package/lib/commonjs/features/queue/activeTrack.js +14 -3
  96. package/lib/commonjs/features/queue/activeTrack.js.map +1 -1
  97. package/lib/commonjs/features/queue/queue.js +11 -4
  98. package/lib/commonjs/features/queue/queue.js.map +1 -1
  99. package/lib/commonjs/utils/LazyNativeEmitter.js +21 -10
  100. package/lib/commonjs/utils/LazyNativeEmitter.js.map +1 -1
  101. package/lib/commonjs/utils/NativeUpdatedValue.js +31 -13
  102. package/lib/commonjs/utils/NativeUpdatedValue.js.map +1 -1
  103. package/lib/commonjs/utils/getTrackIdentity.js +24 -0
  104. package/lib/commonjs/utils/getTrackIdentity.js.map +1 -0
  105. package/lib/commonjs/utils/useNativeValueRefreshedBy.js +33 -0
  106. package/lib/commonjs/utils/useNativeValueRefreshedBy.js.map +1 -0
  107. package/lib/commonjs/web/NativeAudioBrowser.js +32 -24
  108. package/lib/commonjs/web/NativeAudioBrowser.js.map +1 -1
  109. package/lib/commonjs/web/browser/BrowserManager.js +144 -87
  110. package/lib/commonjs/web/browser/BrowserManager.js.map +1 -1
  111. package/lib/commonjs/web/browser/FavoriteManager.js +30 -21
  112. package/lib/commonjs/web/browser/FavoriteManager.js.map +1 -1
  113. package/lib/commonjs/web/browser/assertBrowsePageShape.js +2 -2
  114. package/lib/commonjs/web/browser/assertBrowsePageShape.js.map +1 -1
  115. package/lib/commonjs/web/browser/classifyTrackNavigation.js +9 -9
  116. package/lib/commonjs/web/browser/classifyTrackNavigation.js.map +1 -1
  117. package/lib/commonjs/web/browser/sections.js +89 -0
  118. package/lib/commonjs/web/browser/sections.js.map +1 -0
  119. package/lib/commonjs/web/player/NowPlayingManager.js +4 -3
  120. package/lib/commonjs/web/player/NowPlayingManager.js.map +1 -1
  121. package/lib/commonjs/web/util/BrowserPathHelper.js +56 -11
  122. package/lib/commonjs/web/util/BrowserPathHelper.js.map +1 -1
  123. package/lib/module/AudioBrowser.js +1 -0
  124. package/lib/module/AudioBrowser.js.map +1 -1
  125. package/lib/module/features/browser-config.js +11 -8
  126. package/lib/module/features/browser-config.js.map +1 -1
  127. package/lib/module/features/browser.js +2 -2
  128. package/lib/module/features/favorites.js +13 -10
  129. package/lib/module/features/favorites.js.map +1 -1
  130. package/lib/module/features/playback/controls.js +4 -2
  131. package/lib/module/features/playback/controls.js.map +1 -1
  132. package/lib/module/features/playback/state.js +2 -3
  133. package/lib/module/features/playback/state.js.map +1 -1
  134. package/lib/module/features/player/options.js.map +1 -1
  135. package/lib/module/features/player/setup.js +3 -1
  136. package/lib/module/features/player/setup.js.map +1 -1
  137. package/lib/module/features/player/validateOptions.js +2 -0
  138. package/lib/module/features/player/validateOptions.js.map +1 -1
  139. package/lib/module/features/queue/activeTrack.js +14 -3
  140. package/lib/module/features/queue/activeTrack.js.map +1 -1
  141. package/lib/module/features/queue/queue.js +11 -4
  142. package/lib/module/features/queue/queue.js.map +1 -1
  143. package/lib/module/utils/LazyNativeEmitter.js +21 -10
  144. package/lib/module/utils/LazyNativeEmitter.js.map +1 -1
  145. package/lib/module/utils/NativeUpdatedValue.js +31 -13
  146. package/lib/module/utils/NativeUpdatedValue.js.map +1 -1
  147. package/lib/module/utils/getTrackIdentity.js +20 -0
  148. package/lib/module/utils/getTrackIdentity.js.map +1 -0
  149. package/lib/module/utils/useNativeValueRefreshedBy.js +29 -0
  150. package/lib/module/utils/useNativeValueRefreshedBy.js.map +1 -0
  151. package/lib/module/web/NativeAudioBrowser.js +32 -24
  152. package/lib/module/web/NativeAudioBrowser.js.map +1 -1
  153. package/lib/module/web/browser/BrowserManager.js +144 -87
  154. package/lib/module/web/browser/BrowserManager.js.map +1 -1
  155. package/lib/module/web/browser/FavoriteManager.js +31 -21
  156. package/lib/module/web/browser/FavoriteManager.js.map +1 -1
  157. package/lib/module/web/browser/assertBrowsePageShape.js +2 -2
  158. package/lib/module/web/browser/assertBrowsePageShape.js.map +1 -1
  159. package/lib/module/web/browser/classifyTrackNavigation.js +9 -9
  160. package/lib/module/web/browser/classifyTrackNavigation.js.map +1 -1
  161. package/lib/module/web/browser/sections.js +83 -0
  162. package/lib/module/web/browser/sections.js.map +1 -0
  163. package/lib/module/web/player/NowPlayingManager.js +4 -3
  164. package/lib/module/web/player/NowPlayingManager.js.map +1 -1
  165. package/lib/module/web/util/BrowserPathHelper.js +56 -11
  166. package/lib/module/web/util/BrowserPathHelper.js.map +1 -1
  167. package/lib/typescript/src/AudioBrowser.d.ts +1 -0
  168. package/lib/typescript/src/AudioBrowser.d.ts.map +1 -1
  169. package/lib/typescript/src/features/browser-config.d.ts.map +1 -1
  170. package/lib/typescript/src/features/browser.d.ts +2 -2
  171. package/lib/typescript/src/features/favorites.d.ts +13 -10
  172. package/lib/typescript/src/features/favorites.d.ts.map +1 -1
  173. package/lib/typescript/src/features/playback/controls.d.ts +4 -2
  174. package/lib/typescript/src/features/playback/controls.d.ts.map +1 -1
  175. package/lib/typescript/src/features/playback/state.d.ts +2 -3
  176. package/lib/typescript/src/features/playback/state.d.ts.map +1 -1
  177. package/lib/typescript/src/features/playback/trackPlaybackTime.d.ts +1 -1
  178. package/lib/typescript/src/features/playback/trackPlaybackTime.d.ts.map +1 -1
  179. package/lib/typescript/src/features/player/options.d.ts +21 -19
  180. package/lib/typescript/src/features/player/options.d.ts.map +1 -1
  181. package/lib/typescript/src/features/player/setup.d.ts.map +1 -1
  182. package/lib/typescript/src/features/player/validateOptions.d.ts +1 -8
  183. package/lib/typescript/src/features/player/validateOptions.d.ts.map +1 -1
  184. package/lib/typescript/src/features/queue/activeTrack.d.ts +8 -1
  185. package/lib/typescript/src/features/queue/activeTrack.d.ts.map +1 -1
  186. package/lib/typescript/src/features/queue/queue.d.ts +5 -2
  187. package/lib/typescript/src/features/queue/queue.d.ts.map +1 -1
  188. package/lib/typescript/src/types/browser-native.d.ts +2 -2
  189. package/lib/typescript/src/types/browser-native.d.ts.map +1 -1
  190. package/lib/typescript/src/types/browser-nodes.d.ts +260 -127
  191. package/lib/typescript/src/types/browser-nodes.d.ts.map +1 -1
  192. package/lib/typescript/src/types/browser.d.ts +33 -53
  193. package/lib/typescript/src/types/browser.d.ts.map +1 -1
  194. package/lib/typescript/src/utils/LazyNativeEmitter.d.ts +16 -17
  195. package/lib/typescript/src/utils/LazyNativeEmitter.d.ts.map +1 -1
  196. package/lib/typescript/src/utils/NativeUpdatedValue.d.ts +24 -19
  197. package/lib/typescript/src/utils/NativeUpdatedValue.d.ts.map +1 -1
  198. package/lib/typescript/src/utils/getTrackIdentity.d.ts +18 -0
  199. package/lib/typescript/src/utils/getTrackIdentity.d.ts.map +1 -0
  200. package/lib/typescript/src/utils/useNativeValueRefreshedBy.d.ts +21 -0
  201. package/lib/typescript/src/utils/useNativeValueRefreshedBy.d.ts.map +1 -0
  202. package/nitrogen/generated/android/AudioBrowser+autolinking.cmake +0 -1
  203. package/nitrogen/generated/android/c++/{JFavoritesMatchMode.hpp → JArtworkRendering.hpp} +15 -15
  204. package/nitrogen/generated/android/c++/JArtworkRequestConfig.hpp +4 -3
  205. package/nitrogen/generated/android/c++/JBrowseResult.hpp +10 -4
  206. package/nitrogen/generated/android/c++/JCarPlayPlayingIndicatorLocation.hpp +58 -0
  207. package/nitrogen/generated/android/c++/JFavoriteChangedEvent.hpp +4 -3
  208. package/nitrogen/generated/android/c++/JFormatNowPlayingParams.hpp +4 -3
  209. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___Track.hpp +4 -3
  210. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_NowPlayingUpdate____FormatNowPlayingParams.hpp +4 -3
  211. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_std__string____Track.hpp +4 -3
  212. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____Track.hpp +4 -3
  213. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__vector_Track______SearchParams.hpp +4 -2
  214. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_void_____TrackLoadEvent.hpp +4 -2
  215. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__variant_ResolvedTrack__BrowseError__std__shared_ptr_Promise_std__variant_ResolvedTrack__BrowseError_______BrowserSourceCallbackParam.hpp +10 -4
  216. package/nitrogen/generated/android/c++/JFunc_void_FavoriteChangedEvent.hpp +4 -3
  217. package/nitrogen/generated/android/c++/JFunc_void_Options.hpp +2 -5
  218. package/nitrogen/generated/android/c++/JFunc_void_PlaybackActiveTrackChangedEvent.hpp +4 -3
  219. package/nitrogen/generated/android/c++/JFunc_void_std__optional_ResolvedTrack_.hpp +9 -3
  220. package/nitrogen/generated/android/c++/JFunc_void_std__vector_Track_.hpp +4 -2
  221. package/nitrogen/generated/android/c++/JHybridAudioBrowserSpec.cpp +21 -14
  222. package/nitrogen/generated/android/c++/JIOSOptions.hpp +9 -3
  223. package/nitrogen/generated/android/c++/JMediaRequestConfig.hpp +4 -3
  224. package/nitrogen/generated/android/c++/JNativeBrowserConfiguration.hpp +16 -10
  225. package/nitrogen/generated/android/c++/JNativeRouteEntry.hpp +8 -2
  226. package/nitrogen/generated/android/c++/JNativeSetupPlayerOptions.hpp +6 -7
  227. package/nitrogen/generated/android/c++/JNativeUpdateOptions.hpp +2 -5
  228. package/nitrogen/generated/android/c++/JNitroIOSUpdateOptions.hpp +9 -3
  229. package/nitrogen/generated/android/c++/JOptions.hpp +2 -5
  230. package/nitrogen/generated/android/c++/JPlaybackActiveTrackChangedEvent.hpp +4 -3
  231. package/nitrogen/generated/android/c++/JPlayerCapabilities.hpp +5 -11
  232. package/nitrogen/generated/android/c++/JResolvedTrack.hpp +49 -51
  233. package/nitrogen/generated/android/c++/JSection.hpp +114 -0
  234. package/nitrogen/generated/android/c++/JSectionStyle.hpp +69 -0
  235. package/nitrogen/generated/android/c++/JStyleDisplay.hpp +58 -0
  236. package/nitrogen/generated/android/c++/JTrack.hpp +19 -48
  237. package/nitrogen/generated/android/c++/JTrackLoadEvent.hpp +4 -2
  238. package/nitrogen/generated/android/c++/JTrackStyle.hpp +25 -18
  239. package/nitrogen/generated/android/c++/JVariant_ResolvedTrack_BrowseError_Promise_BrowseResult_.hpp +10 -4
  240. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/{FavoritesMatchMode.kt → ArtworkRendering.kt} +5 -5
  241. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/CarPlayPlayingIndicatorLocation.kt +23 -0
  242. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/IOSOptions.kt +6 -3
  243. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeBrowserConfiguration.kt +5 -5
  244. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NitroIOSUpdateOptions.kt +6 -3
  245. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlayerCapabilities.kt +2 -2
  246. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ResolvedTrack.kt +12 -18
  247. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Section.kt +50 -0
  248. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/{FavoriteConfig.kt → SectionStyle.kt} +12 -6
  249. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/StyleDisplay.kt +23 -0
  250. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Track.kt +6 -15
  251. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/TrackStyle.kt +23 -5
  252. package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Bridge.hpp +104 -82
  253. package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Umbrella.hpp +16 -10
  254. package/nitrogen/generated/ios/c++/HybridAudioBrowserSpecSwift.hpp +16 -10
  255. package/nitrogen/generated/ios/swift/ArtworkRendering.swift +40 -0
  256. package/nitrogen/generated/ios/swift/CarPlayPlayingIndicatorLocation.swift +40 -0
  257. package/nitrogen/generated/ios/swift/IOSOptions.swift +7 -2
  258. package/nitrogen/generated/ios/swift/NativeBrowserConfiguration.swift +5 -5
  259. package/nitrogen/generated/ios/swift/NitroIOSUpdateOptions.swift +12 -1
  260. package/nitrogen/generated/ios/swift/PlayerCapabilities.swift +8 -27
  261. package/nitrogen/generated/ios/swift/ResolvedTrack.swift +54 -83
  262. package/nitrogen/generated/ios/swift/Section.swift +100 -0
  263. package/nitrogen/generated/ios/swift/SectionStyle.swift +64 -0
  264. package/nitrogen/generated/ios/swift/StyleDisplay.swift +40 -0
  265. package/nitrogen/generated/ios/swift/Track.swift +20 -73
  266. package/nitrogen/generated/ios/swift/TrackStyle.swift +28 -22
  267. package/nitrogen/generated/shared/c++/{FavoritesMatchMode.hpp → ArtworkRendering.hpp} +17 -17
  268. package/nitrogen/generated/shared/c++/CarPlayPlayingIndicatorLocation.hpp +76 -0
  269. package/nitrogen/generated/shared/c++/IOSOptions.hpp +9 -2
  270. package/nitrogen/generated/shared/c++/NativeBrowserConfiguration.hpp +6 -6
  271. package/nitrogen/generated/shared/c++/NitroIOSUpdateOptions.hpp +9 -2
  272. package/nitrogen/generated/shared/c++/PlayerCapabilities.hpp +6 -9
  273. package/nitrogen/generated/shared/c++/ResolvedTrack.hpp +30 -38
  274. package/nitrogen/generated/shared/c++/Section.hpp +106 -0
  275. package/nitrogen/generated/shared/c++/SectionStyle.hpp +96 -0
  276. package/nitrogen/generated/shared/c++/StyleDisplay.hpp +76 -0
  277. package/nitrogen/generated/shared/c++/Track.hpp +15 -31
  278. package/nitrogen/generated/shared/c++/TrackStyle.hpp +50 -34
  279. package/package.json +1 -1
  280. package/src/AudioBrowser.ts +1 -0
  281. package/src/features/browser-config.test.ts +21 -6
  282. package/src/features/browser-config.ts +11 -8
  283. package/src/features/browser.test.ts +1 -1
  284. package/src/features/browser.ts +2 -2
  285. package/src/features/favorites.ts +13 -10
  286. package/src/features/hook-wiring.test.ts +63 -15
  287. package/src/features/playback/controls.ts +4 -2
  288. package/src/features/playback/state.ts +2 -3
  289. package/src/features/playback/trackPlaybackTime.ts +1 -1
  290. package/src/features/player/options.ts +27 -19
  291. package/src/features/player/setup.test.ts +12 -3
  292. package/src/features/player/setup.ts +3 -1
  293. package/src/features/player/validateOptions.ts +2 -0
  294. package/src/features/queue/activeTrack.ts +14 -3
  295. package/src/features/queue/queue.ts +11 -4
  296. package/src/nitro-stub-drift.test.ts +40 -0
  297. package/src/public-surface.test.ts +40 -0
  298. package/src/specs/audio-browser.nitro.ts +4 -3
  299. package/src/style-resolution.test.ts +139 -0
  300. package/src/types/browser-native.ts +2 -2
  301. package/src/types/browser-nodes.ts +268 -136
  302. package/src/types/browser.ts +34 -55
  303. package/src/utils/LazyNativeEmitter.ts +20 -10
  304. package/src/utils/NativeUpdatedValue.ts +29 -13
  305. package/src/utils/getTrackIdentity.ts +20 -0
  306. package/src/utils/useNativeValueRefreshedBy.ts +38 -0
  307. package/src/web/NativeAudioBrowser.ts +37 -22
  308. package/src/web/browser/BrowserManager.ts +176 -95
  309. package/src/web/browser/FavoriteManager.test.ts +84 -0
  310. package/src/web/browser/FavoriteManager.ts +28 -23
  311. package/src/web/browser/assertBrowsePageShape.test.ts +1 -1
  312. package/src/web/browser/assertBrowsePageShape.ts +5 -3
  313. package/src/web/browser/classifyTrackNavigation.test.ts +10 -8
  314. package/src/web/browser/classifyTrackNavigation.ts +9 -9
  315. package/src/web/browser/parseSearchResponse.test.ts +8 -2
  316. package/src/web/browser/sections.test.ts +91 -0
  317. package/src/web/browser/sections.ts +72 -0
  318. package/src/web/player/NowPlayingManager.ts +4 -3
  319. package/src/web/util/BrowserPathHelper.test.ts +52 -0
  320. package/src/web/util/BrowserPathHelper.ts +61 -13
  321. package/ios/CarPlay/ImageRowItem+CarPlay.swift +0 -19
  322. package/nitrogen/generated/android/c++/JFavoriteConfig.hpp +0 -58
  323. package/nitrogen/generated/android/c++/JImageRowItem.hpp +0 -105
  324. package/nitrogen/generated/android/c++/JVariant_Boolean_FavoriteConfig.cpp +0 -26
  325. package/nitrogen/generated/android/c++/JVariant_Boolean_FavoriteConfig.hpp +0 -71
  326. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ImageRowItem.kt +0 -68
  327. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Variant_Boolean_FavoriteConfig.kt +0 -53
  328. package/nitrogen/generated/ios/swift/FavoriteConfig.swift +0 -29
  329. package/nitrogen/generated/ios/swift/FavoritesMatchMode.swift +0 -40
  330. package/nitrogen/generated/ios/swift/ImageRowItem.swift +0 -195
  331. package/nitrogen/generated/ios/swift/Variant_Bool_FavoriteConfig.swift +0 -18
  332. package/nitrogen/generated/shared/c++/FavoriteConfig.hpp +0 -84
  333. package/nitrogen/generated/shared/c++/ImageRowItem.hpp +0 -129
@@ -1 +1 @@
1
- {"version":3,"names":["_validation","require","_RequestConfigBuilder","_SimpleRouter","_BrowserPathHelper","_assertBrowsePageShape","_parseSearchResponse","BrowserManager","_configuration","router","SimpleRouter","_layerGeneration","_resolvedLayerGeneration","currentNavigationId","onPathChanged","onContentChanged","onTabsChanged","constructor","httpClient","favoriteManager","navigationErrorManager","handleNavigationError","error","path","message","navError","setNavigationError","code","statusCode","_path","value","hasValidConfiguration","clearNavigationError","pathToNavigate","getDefaultPath","navigate","tabs","_tabs","content","_content","configuration","queueSourcePath","_queueSourcePath","setFormatCallback","formatNavigationError","initialPath","tabsRoute","routes","find","r","browseStatic","children","url","navigatePath","navigateTrack","track","console","warn","notifyContentChanged","invalidateAllContent","navigationId","undefined","isSearchPath","startsWith","BrowserPathHelper","SEARCH_PATH_PREFIX","resolveSearchContent","resolveContent","map","src","contextualUrl","encodeURIComponent","hydrateChildren","transformArtworkForContent","queryTabs","searchPath","queryMatch","match","query","decodeURIComponent","searchRoute","searchResults","searchCallback","reference","searchConfig","fetchSearchResults","q","title","artworkConfig","artwork","ensureLayersResolved","requestConfig","_resolvedRequest","parentArtworkSource","RequestConfigBuilder","resolveArtworkSourceAsync","transformedChildren","Promise","all","artworkSource","resolveRouteContent","route","routeParams","errorContext","browseCallback","result","browseConfig","resolveFromConfig","browse","_layerResolution","generation","promise","cfg","resolvedRequest","requestResolver","request","resolvedBrowse","browseResolver","_resolvedBrowse","catch","err","kindConfig","routeConfig","params","merged","applyLayers","response","executeRequest","assertBrowsePageShape","queryParams","parseSearchResponse","length","routePatterns","findBestMatch","matchedPattern","routeMatch","matchedRoute","defaultRoute","expandQueueFromContextualUrl","trackId","extractTrackId","parentPath","stripTrackId","parentResolvedTrack","playableTracks","filter","selectedIndex","findIndex","singleTrack","tracks","assertedNotNullish","resolveMediaItemsForPlayback","startIndex","startPositionMs","searchQuery","trackUrl","createSearchPath","searchTracks","selectedIdx","t","isContextual","expanded","firstTab","exports"],"sourceRoot":"../../../../src","sources":["web/browser/BrowserManager.ts"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["_getTrackIdentity","require","_validation","_RequestConfigBuilder","_SimpleRouter","_BrowserPathHelper","_assertBrowsePageShape","_parseSearchResponse","_sections","BrowserManager","_configuration","router","SimpleRouter","_layerGeneration","_resolvedLayerGeneration","currentNavigationId","onPathChanged","onContentChanged","onTabsChanged","constructor","httpClient","favoriteManager","navigationErrorManager","handleNavigationError","error","path","message","navError","setNavigationError","code","statusCode","_path","value","hasValidConfiguration","clearNavigationError","pathToNavigate","getDefaultPath","navigate","tabs","_tabs","content","_content","configuration","queueSourcePath","_queueSourcePath","setFormatCallback","formatNavigationError","initialPath","tabsRoute","routes","find","r","staticTabs","browseStatic","flattenedChildren","navigatePath","navigateTrack","track","console","warn","notifyContentChanged","invalidateAllContent","navigationId","undefined","isSearchPath","startsWith","BrowserPathHelper","SEARCH_PATH_PREFIX","resolveSearchContent","resolveContent","sections","addContextualPaths","hydrateChildren","transformArtworkForContent","queryTabs","index","map","section","children","flatIndex","identity","getTrackIdentity","src","build","searchPath","queryMatch","match","query","decodeURIComponent","searchRoute","searchResults","searchCallback","reference","searchConfig","fetchSearchResults","q","normalizePage","title","artworkConfig","artwork","ensureLayersResolved","requestConfig","_resolvedRequest","parentArtworkSource","RequestConfigBuilder","resolveArtworkSourceAsync","transformTrack","artworkSource","transformedSections","Promise","all","resolveRouteContent","route","routeParams","errorContext","browseCallback","result","browseConfig","resolveFromConfig","browse","_layerResolution","generation","promise","cfg","resolvedRequest","requestResolver","request","resolvedBrowse","browseResolver","_resolvedBrowse","catch","err","kindConfig","routeConfig","params","merged","applyLayers","response","executeRequest","assertBrowsePageShape","queryParams","parseSearchResponse","length","routePatterns","findBestMatch","matchedPattern","routeMatch","matchedRoute","defaultRoute","flattenSections","expandQueueFromContextualPath","contextualPath","trackId","extractTrackId","parentPath","stripTrackId","parentResolvedTrack","rawSections","every","s","tappedIndex","extractIndex","scoped","sectionContaining","isQueueable","disabled","playableTracks","tracks","filter","selectedIndex","tappedOffset","tapped","slice","findIndex","singleTrack","assertedNotNullish","resolveMediaItemsForPlayback","startIndex","startPositionMs","searchQuery","trackPath","createSearchPath","searchTracks","t","selectedIdx","isContextual","expanded","firstTab","exports"],"sourceRoot":"../../../../src","sources":["web/browser/BrowserManager.ts"],"mappings":"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","ignoreList":[]}
@@ -4,15 +4,17 @@ Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
6
  exports.FavoriteManager = void 0;
7
+ var _getTrackIdentity = require("../../utils/getTrackIdentity");
7
8
  /**
8
- * Manages favorite state for tracks.
9
+ * Manages favorite state for tracks, keyed by track identity (`id` when set,
10
+ * falling back to `src` — see getTrackIdentity / ADR 0008).
9
11
  * Matches Android's favorite hydration behavior.
10
12
  */
11
13
  class FavoriteManager {
12
14
  favorites = new Set();
13
15
 
14
16
  /**
15
- * Sets the favorites cache from an array of track src values.
17
+ * Sets the favorites cache from an array of track identities.
16
18
  * This is typically called when favorites are loaded from storage.
17
19
  */
18
20
  setFavorites(favorites) {
@@ -20,24 +22,27 @@ class FavoriteManager {
20
22
  }
21
23
 
22
24
  /**
23
- * Checks if a track is favorited based on its src.
25
+ * Checks if a track is favorited based on its identity.
24
26
  */
25
- isFavorited(src) {
26
- return this.favorites.has(src);
27
+ isFavorited(track) {
28
+ const identity = (0, _getTrackIdentity.getTrackIdentity)(track);
29
+ return identity !== undefined && this.favorites.has(identity);
27
30
  }
28
31
 
29
32
  /**
30
- * Adds a track src to the favorites cache.
33
+ * Adds a track to the favorites cache under its identity.
31
34
  */
32
- addFavorite(src) {
33
- this.favorites.add(src);
35
+ addFavorite(track) {
36
+ const identity = (0, _getTrackIdentity.getTrackIdentity)(track);
37
+ if (identity !== undefined) this.favorites.add(identity);
34
38
  }
35
39
 
36
40
  /**
37
- * Removes a track src from the favorites cache.
41
+ * Removes a track from the favorites cache under its identity.
38
42
  */
39
- removeFavorite(src) {
40
- this.favorites.delete(src);
43
+ removeFavorite(track) {
44
+ const identity = (0, _getTrackIdentity.getTrackIdentity)(track);
45
+ if (identity !== undefined) this.favorites.delete(identity);
41
46
  }
42
47
 
43
48
  /**
@@ -51,8 +56,7 @@ class FavoriteManager {
51
56
  // Don't overwrite API-provided favorites
52
57
  if (track.favorited !== undefined && track.favorited !== null) return track;
53
58
  if (this.favorites.size === 0) return track;
54
- const isFavorited = track.src ? this.favorites.has(track.src) : false;
55
- if (!isFavorited) return track;
59
+ if (!this.isFavorited(track)) return track;
56
60
  return {
57
61
  ...track,
58
62
  favorited: true
@@ -60,19 +64,24 @@ class FavoriteManager {
60
64
  }
61
65
 
62
66
  /**
63
- * Hydrates favorites on all children of a ResolvedTrack.
64
- * Matches Android's hydrateChildren behavior.
67
+ * Hydrates favorites on all tracks of a resolved page.
68
+ * Matches Android's hydrateChildren behavior. Pages reach hydration
69
+ * normalized (ADR 0010), so `sections` is the only structure to walk.
65
70
  *
66
- * @param resolvedTrack ResolvedTrack with children to hydrate
67
- * @returns ResolvedTrack with favorited properties set on children
71
+ * @param resolvedTrack Resolved page to hydrate
72
+ * @returns Resolved page with favorited properties set on its tracks
68
73
  */
69
74
  hydrateChildren(resolvedTrack) {
70
- const children = resolvedTrack.children;
71
- if (!children) return resolvedTrack;
72
- const hydratedChildren = children.map(track => this.hydrateFavorite(track));
75
+ const {
76
+ sections
77
+ } = resolvedTrack;
78
+ if (!sections) return resolvedTrack;
73
79
  return {
74
80
  ...resolvedTrack,
75
- children: hydratedChildren
81
+ sections: sections.map(section => ({
82
+ ...section,
83
+ children: section.children.map(track => this.hydrateFavorite(track))
84
+ }))
76
85
  };
77
86
  }
78
87
  }
@@ -1 +1 @@
1
- {"version":3,"names":["FavoriteManager","favorites","Set","setFavorites","isFavorited","src","has","addFavorite","add","removeFavorite","delete","hydrateFavorite","track","favorited","undefined","size","hydrateChildren","resolvedTrack","children","hydratedChildren","map","exports"],"sourceRoot":"../../../../src","sources":["web/browser/FavoriteManager.ts"],"mappings":";;;;;;AAEA;AACA;AACA;AACA;AACO,MAAMA,eAAe,CAAC;EACnBC,SAAS,GAAG,IAAIC,GAAG,CAAS,CAAC;;EAErC;AACF;AACA;AACA;EACEC,YAAYA,CAACF,SAAmB,EAAQ;IACtC,IAAI,CAACA,SAAS,GAAG,IAAIC,GAAG,CAACD,SAAS,CAAC;EACrC;;EAEA;AACF;AACA;EACEG,WAAWA,CAACC,GAAW,EAAW;IAChC,OAAO,IAAI,CAACJ,SAAS,CAACK,GAAG,CAACD,GAAG,CAAC;EAChC;;EAEA;AACF;AACA;EACEE,WAAWA,CAACF,GAAW,EAAQ;IAC7B,IAAI,CAACJ,SAAS,CAACO,GAAG,CAACH,GAAG,CAAC;EACzB;;EAEA;AACF;AACA;EACEI,cAAcA,CAACJ,GAAW,EAAQ;IAChC,IAAI,CAACJ,SAAS,CAACS,MAAM,CAACL,GAAG,CAAC;EAC5B;;EAEA;AACF;AACA;AACA;AACA;AACA;AACA;EACEM,eAAeA,CAACC,KAAY,EAAS;IACnC;IACA,IAAIA,KAAK,CAACC,SAAS,KAAKC,SAAS,IAAIF,KAAK,CAACC,SAAS,KAAK,IAAI,EAAE,OAAOD,KAAK;IAC3E,IAAI,IAAI,CAACX,SAAS,CAACc,IAAI,KAAK,CAAC,EAAE,OAAOH,KAAK;IAE3C,MAAMR,WAAW,GAAGQ,KAAK,CAACP,GAAG,GAAG,IAAI,CAACJ,SAAS,CAACK,GAAG,CAACM,KAAK,CAACP,GAAG,CAAC,GAAG,KAAK;IACrE,IAAI,CAACD,WAAW,EAAE,OAAOQ,KAAK;IAE9B,OAAO;MACL,GAAGA,KAAK;MACRC,SAAS,EAAE;IACb,CAAC;EACH;;EAEA;AACF;AACA;AACA;AACA;AACA;AACA;EACEG,eAAeA,CAACC,aAA4B,EAAiB;IAC3D,MAAMC,QAAQ,GAAGD,aAAa,CAACC,QAAQ;IACvC,IAAI,CAACA,QAAQ,EAAE,OAAOD,aAAa;IAEnC,MAAME,gBAAgB,GAAGD,QAAQ,CAACE,GAAG,CAAER,KAAK,IAC1C,IAAI,CAACD,eAAe,CAACC,KAAK,CAC5B,CAAC;IACD,OAAO;MACL,GAAGK,aAAa;MAChBC,QAAQ,EAAEC;IACZ,CAAC;EACH;AACF;AAACE,OAAA,CAAArB,eAAA,GAAAA,eAAA","ignoreList":[]}
1
+ {"version":3,"names":["_getTrackIdentity","require","FavoriteManager","favorites","Set","setFavorites","isFavorited","track","identity","getTrackIdentity","undefined","has","addFavorite","add","removeFavorite","delete","hydrateFavorite","favorited","size","hydrateChildren","resolvedTrack","sections","map","section","children","exports"],"sourceRoot":"../../../../src","sources":["web/browser/FavoriteManager.ts"],"mappings":";;;;;;AACA,IAAAA,iBAAA,GAAAC,OAAA;AAEA;AACA;AACA;AACA;AACA;AACO,MAAMC,eAAe,CAAC;EACnBC,SAAS,GAAG,IAAIC,GAAG,CAAS,CAAC;;EAErC;AACF;AACA;AACA;EACEC,YAAYA,CAACF,SAAmB,EAAQ;IACtC,IAAI,CAACA,SAAS,GAAG,IAAIC,GAAG,CAACD,SAAS,CAAC;EACrC;;EAEA;AACF;AACA;EACEG,WAAWA,CAACC,KAAY,EAAW;IACjC,MAAMC,QAAQ,GAAG,IAAAC,kCAAgB,EAACF,KAAK,CAAC;IACxC,OAAOC,QAAQ,KAAKE,SAAS,IAAI,IAAI,CAACP,SAAS,CAACQ,GAAG,CAACH,QAAQ,CAAC;EAC/D;;EAEA;AACF;AACA;EACEI,WAAWA,CAACL,KAAY,EAAQ;IAC9B,MAAMC,QAAQ,GAAG,IAAAC,kCAAgB,EAACF,KAAK,CAAC;IACxC,IAAIC,QAAQ,KAAKE,SAAS,EAAE,IAAI,CAACP,SAAS,CAACU,GAAG,CAACL,QAAQ,CAAC;EAC1D;;EAEA;AACF;AACA;EACEM,cAAcA,CAACP,KAAY,EAAQ;IACjC,MAAMC,QAAQ,GAAG,IAAAC,kCAAgB,EAACF,KAAK,CAAC;IACxC,IAAIC,QAAQ,KAAKE,SAAS,EAAE,IAAI,CAACP,SAAS,CAACY,MAAM,CAACP,QAAQ,CAAC;EAC7D;;EAEA;AACF;AACA;AACA;AACA;AACA;AACA;EACEQ,eAAeA,CAACT,KAAY,EAAS;IACnC;IACA,IAAIA,KAAK,CAACU,SAAS,KAAKP,SAAS,IAAIH,KAAK,CAACU,SAAS,KAAK,IAAI,EAAE,OAAOV,KAAK;IAC3E,IAAI,IAAI,CAACJ,SAAS,CAACe,IAAI,KAAK,CAAC,EAAE,OAAOX,KAAK;IAE3C,IAAI,CAAC,IAAI,CAACD,WAAW,CAACC,KAAK,CAAC,EAAE,OAAOA,KAAK;IAE1C,OAAO;MACL,GAAGA,KAAK;MACRU,SAAS,EAAE;IACb,CAAC;EACH;;EAEA;AACF;AACA;AACA;AACA;AACA;AACA;AACA;EACEE,eAAeA,CAACC,aAA4B,EAAiB;IAC3D,MAAM;MAAEC;IAAS,CAAC,GAAGD,aAAa;IAClC,IAAI,CAACC,QAAQ,EAAE,OAAOD,aAAa;IAEnC,OAAO;MACL,GAAGA,aAAa;MAChBC,QAAQ,EAAEA,QAAQ,CAACC,GAAG,CAAEC,OAAO,KAAM;QACnC,GAAGA,OAAO;QACVC,QAAQ,EAAED,OAAO,CAACC,QAAQ,CAACF,GAAG,CAAEf,KAAK,IAAK,IAAI,CAACS,eAAe,CAACT,KAAK,CAAC;MACvE,CAAC,CAAC;IACJ,CAAC;EACH;AACF;AAACkB,OAAA,CAAAvB,eAAA,GAAAA,eAAA","ignoreList":[]}
@@ -12,10 +12,10 @@ exports.assertBrowsePageShape = assertBrowsePageShape;
12
12
  */
13
13
  function assertBrowsePageShape(response, path) {
14
14
  if (Array.isArray(response)) {
15
- throw new Error(`Browse endpoint for "${path}" returned a JSON array; expected a ` + `page object { title, children?: Track[] }. Wrap the rows in a ` + `\`children\` array.`);
15
+ throw new Error(`Browse endpoint for "${path}" returned a JSON array; expected a ` + `page object { title, sections?: Section[], children?: Track[] }. ` + `Wrap the rows in a \`children\` array (one untitled section) or ` + `group them into \`sections\`.`);
16
16
  }
17
17
  if (response === null || typeof response !== 'object') {
18
- throw new Error(`Browse endpoint for "${path}" returned ${JSON.stringify(response)}; ` + `expected a page object { title, children?: Track[] }.`);
18
+ throw new Error(`Browse endpoint for "${path}" returned ${JSON.stringify(response)}; ` + `expected a page object { title, sections?: Section[], ` + `children?: Track[] }.`);
19
19
  }
20
20
  return response;
21
21
  }
@@ -1 +1 @@
1
- {"version":3,"names":["assertBrowsePageShape","response","path","Array","isArray","Error","JSON","stringify"],"sourceRoot":"../../../../src","sources":["web/browser/assertBrowsePageShape.ts"],"mappings":";;;;;;AAEA;AACA;AACA;AACA;AACA;AACA;AACO,SAASA,qBAAqBA,CACnCC,QAAiB,EACjBC,IAAY,EACG;EACf,IAAIC,KAAK,CAACC,OAAO,CAACH,QAAQ,CAAC,EAAE;IAC3B,MAAM,IAAII,KAAK,CACb,wBAAwBH,IAAI,sCAAsC,GAChE,gEAAgE,GAChE,qBACJ,CAAC;EACH;EACA,IAAID,QAAQ,KAAK,IAAI,IAAI,OAAOA,QAAQ,KAAK,QAAQ,EAAE;IACrD,MAAM,IAAII,KAAK,CACb,wBAAwBH,IAAI,cAAcI,IAAI,CAACC,SAAS,CAACN,QAAQ,CAAC,IAAI,GACpE,uDACJ,CAAC;EACH;EACA,OAAOA,QAAQ;AACjB","ignoreList":[]}
1
+ {"version":3,"names":["assertBrowsePageShape","response","path","Array","isArray","Error","JSON","stringify"],"sourceRoot":"../../../../src","sources":["web/browser/assertBrowsePageShape.ts"],"mappings":";;;;;;AAEA;AACA;AACA;AACA;AACA;AACA;AACO,SAASA,qBAAqBA,CACnCC,QAAiB,EACjBC,IAAY,EACG;EACf,IAAIC,KAAK,CAACC,OAAO,CAACH,QAAQ,CAAC,EAAE;IAC3B,MAAM,IAAII,KAAK,CACb,wBAAwBH,IAAI,sCAAsC,GAChE,mEAAmE,GACnE,kEAAkE,GAClE,+BACJ,CAAC;EACH;EACA,IAAID,QAAQ,KAAK,IAAI,IAAI,OAAOA,QAAQ,KAAK,QAAQ,EAAE;IACrD,MAAM,IAAII,KAAK,CACb,wBAAwBH,IAAI,cAAcI,IAAI,CAACC,SAAS,CAACN,QAAQ,CAAC,IAAI,GACpE,wDAAwD,GACxD,uBACJ,CAAC;EACH;EACA,OAAOA,QAAQ;AACjB","ignoreList":[]}
@@ -8,10 +8,10 @@ var _BrowserPathHelper = require("../util/BrowserPathHelper");
8
8
  /**
9
9
  * How a selected track should be navigated, decided purely from its shape:
10
10
  * - `contextual` — a playable track carrying its parent queue context in a
11
- * contextual URL (`{parentPath}?__trackId={src}`); expand/skip within that queue.
12
- * - `browse` — a browsable track (has a `url` that isn't contextual); drill in.
13
- * - `playable` — a bare playable track (`src`, no `url`); load and play it alone.
14
- * - `invalid` — neither `url` nor `src`; nothing to do.
11
+ * contextual path (`{parentPath}?__trackId={src}`); expand/skip within that queue.
12
+ * - `browse` — a browsable track (has a `path` that isn't contextual); drill in.
13
+ * - `playable` — a bare playable track (`src`, no `path`); load and play it alone.
14
+ * - `invalid` — neither `path` nor `src`; nothing to do.
15
15
  */
16
16
 
17
17
  /**
@@ -20,15 +20,15 @@ var _BrowserPathHelper = require("../util/BrowserPathHelper");
20
20
  * caller; this only decides which action applies.
21
21
  */
22
22
  function classifyTrackNavigation(track) {
23
- const url = track.url;
24
- if (url && _BrowserPathHelper.BrowserPathHelper.isContextual(url)) {
23
+ const path = track.path;
24
+ if (path && _BrowserPathHelper.BrowserPathHelper.isContextual(path)) {
25
25
  return {
26
26
  kind: 'contextual',
27
- parentPath: _BrowserPathHelper.BrowserPathHelper.stripTrackId(url),
28
- trackId: _BrowserPathHelper.BrowserPathHelper.extractTrackId(url)
27
+ parentPath: _BrowserPathHelper.BrowserPathHelper.stripTrackId(path),
28
+ trackId: _BrowserPathHelper.BrowserPathHelper.extractTrackId(path)
29
29
  };
30
30
  }
31
- if (url) return {
31
+ if (path) return {
32
32
  kind: 'browse'
33
33
  };
34
34
  if (track.src) return {
@@ -1 +1 @@
1
- {"version":3,"names":["_BrowserPathHelper","require","classifyTrackNavigation","track","url","BrowserPathHelper","isContextual","kind","parentPath","stripTrackId","trackId","extractTrackId","src"],"sourceRoot":"../../../../src","sources":["web/browser/classifyTrackNavigation.ts"],"mappings":";;;;;;AACA,IAAAA,kBAAA,GAAAC,OAAA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAOA;AACA;AACA;AACA;AACA;AACO,SAASC,uBAAuBA,CAACC,KAAY,EAAmB;EACrE,MAAMC,GAAG,GAAGD,KAAK,CAACC,GAAG;EACrB,IAAIA,GAAG,IAAIC,oCAAiB,CAACC,YAAY,CAACF,GAAG,CAAC,EAAE;IAC9C,OAAO;MACLG,IAAI,EAAE,YAAY;MAClBC,UAAU,EAAEH,oCAAiB,CAACI,YAAY,CAACL,GAAG,CAAC;MAC/CM,OAAO,EAAEL,oCAAiB,CAACM,cAAc,CAACP,GAAG;IAC/C,CAAC;EACH;EACA,IAAIA,GAAG,EAAE,OAAO;IAAEG,IAAI,EAAE;EAAS,CAAC;EAClC,IAAIJ,KAAK,CAACS,GAAG,EAAE,OAAO;IAAEL,IAAI,EAAE;EAAW,CAAC;EAC1C,OAAO;IAAEA,IAAI,EAAE;EAAU,CAAC;AAC5B","ignoreList":[]}
1
+ {"version":3,"names":["_BrowserPathHelper","require","classifyTrackNavigation","track","path","BrowserPathHelper","isContextual","kind","parentPath","stripTrackId","trackId","extractTrackId","src"],"sourceRoot":"../../../../src","sources":["web/browser/classifyTrackNavigation.ts"],"mappings":";;;;;;AACA,IAAAA,kBAAA,GAAAC,OAAA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAOA;AACA;AACA;AACA;AACA;AACO,SAASC,uBAAuBA,CAACC,KAAY,EAAmB;EACrE,MAAMC,IAAI,GAAGD,KAAK,CAACC,IAAI;EACvB,IAAIA,IAAI,IAAIC,oCAAiB,CAACC,YAAY,CAACF,IAAI,CAAC,EAAE;IAChD,OAAO;MACLG,IAAI,EAAE,YAAY;MAClBC,UAAU,EAAEH,oCAAiB,CAACI,YAAY,CAACL,IAAI,CAAC;MAChDM,OAAO,EAAEL,oCAAiB,CAACM,cAAc,CAACP,IAAI;IAChD,CAAC;EACH;EACA,IAAIA,IAAI,EAAE,OAAO;IAAEG,IAAI,EAAE;EAAS,CAAC;EACnC,IAAIJ,KAAK,CAACS,GAAG,EAAE,OAAO;IAAEL,IAAI,EAAE;EAAW,CAAC;EAC1C,OAAO;IAAEA,IAAI,EAAE;EAAU,CAAC;AAC5B","ignoreList":[]}
@@ -0,0 +1,89 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports.flattenSections = flattenSections;
7
+ exports.flattenedChildren = flattenedChildren;
8
+ exports.normalizePage = normalizePage;
9
+ exports.sectionContaining = sectionContaining;
10
+ var _getTrackIdentity = require("../../utils/getTrackIdentity");
11
+ /**
12
+ * Normalizes a resolved page to the canonical sectioned shape (ADR 0010):
13
+ * `sections` wins when present; plain `children` is authoring sugar for one
14
+ * untitled section. The output never carries `children` — there is exactly
15
+ * one structure downstream code hydrates, transforms, and scopes against.
16
+ */
17
+ function normalizePage(content) {
18
+ const {
19
+ children,
20
+ sections,
21
+ ...rest
22
+ } = content;
23
+ const normalized = sections ?? (children !== undefined ? [{
24
+ children
25
+ }] : undefined);
26
+ return {
27
+ ...rest,
28
+ sections: normalized
29
+ };
30
+ }
31
+
32
+ /**
33
+ * The page's children concatenated in section order — the flattening that
34
+ * defines the contextual `__index` positions (ADR 0009/0010) and the flat
35
+ * views (tabs, search) of a sectioned page.
36
+ */
37
+ function flattenSections(sections) {
38
+ return sections?.flatMap(section => section.children) ?? [];
39
+ }
40
+
41
+ /**
42
+ * The page's tracks as one flat list, normalizing first — the flat view
43
+ * (tabs, search) of a page in either authored shape. Mirrors the native
44
+ * `flattenedChildren` accessors.
45
+ */
46
+ function flattenedChildren(page) {
47
+ return flattenSections(normalizePage(page).sections);
48
+ }
49
+
50
+ /**
51
+ * The section of the page containing the playable `trackId` (a track
52
+ * identity: id when non-blank, else src), or undefined when not found.
53
+ *
54
+ * `tappedIndex` — the flat page position stamped into the contextual URL —
55
+ * is a tie-breaker, never an identifier: when the child at that position
56
+ * still carries the tapped identity, it pins which section (and which copy,
57
+ * via `tappedOffset`) was tapped; when it doesn't (the list shifted),
58
+ * resolution falls back to the first section containing the identity. A
59
+ * stale index can therefore never select a different track — at worst a
60
+ * different copy of the same one.
61
+ */
62
+ function sectionContaining(sections, trackId, tappedIndex) {
63
+ if (tappedIndex !== undefined && tappedIndex >= 0) {
64
+ let start = 0;
65
+ for (const section of sections) {
66
+ const offset = tappedIndex - start;
67
+ if (offset < section.children.length) {
68
+ const tapped = section.children[offset];
69
+ if (tapped && (0, _getTrackIdentity.getTrackIdentity)(tapped) === trackId) {
70
+ return {
71
+ tracks: section.children,
72
+ tappedOffset: offset
73
+ };
74
+ }
75
+ break;
76
+ }
77
+ start += section.children.length;
78
+ }
79
+ }
80
+ for (const section of sections) {
81
+ if (section.children.some(track => (0, _getTrackIdentity.getTrackIdentity)(track) === trackId)) {
82
+ return {
83
+ tracks: section.children
84
+ };
85
+ }
86
+ }
87
+ return undefined;
88
+ }
89
+ //# sourceMappingURL=sections.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"names":["_getTrackIdentity","require","normalizePage","content","children","sections","rest","normalized","undefined","flattenSections","flatMap","section","flattenedChildren","page","sectionContaining","trackId","tappedIndex","start","offset","length","tapped","getTrackIdentity","tracks","tappedOffset","some","track"],"sourceRoot":"../../../../src","sources":["web/browser/sections.ts"],"mappings":";;;;;;;;;AACA,IAAAA,iBAAA,GAAAC,OAAA;AAEA;AACA;AACA;AACA;AACA;AACA;AACO,SAASC,aAAaA,CAACC,OAAsB,EAAiB;EACnE,MAAM;IAAEC,QAAQ;IAAEC,QAAQ;IAAE,GAAGC;EAAK,CAAC,GAAGH,OAAO;EAC/C,MAAMI,UAAU,GACdF,QAAQ,KAAKD,QAAQ,KAAKI,SAAS,GAAG,CAAC;IAAEJ;EAAS,CAAC,CAAC,GAAGI,SAAS,CAAC;EACnE,OAAO;IAAE,GAAGF,IAAI;IAAED,QAAQ,EAAEE;EAAW,CAAC;AAC1C;;AAEA;AACA;AACA;AACA;AACA;AACO,SAASE,eAAeA,CAACJ,QAA+B,EAAW;EACxE,OAAOA,QAAQ,EAAEK,OAAO,CAAEC,OAAO,IAAKA,OAAO,CAACP,QAAQ,CAAC,IAAI,EAAE;AAC/D;;AAEA;AACA;AACA;AACA;AACA;AACO,SAASQ,iBAAiBA,CAACC,IAAmB,EAAW;EAC9D,OAAOJ,eAAe,CAACP,aAAa,CAACW,IAAI,CAAC,CAACR,QAAQ,CAAC;AACtD;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAASS,iBAAiBA,CAC/BT,QAAmB,EACnBU,OAAe,EACfC,WAA+B,EACyB;EACxD,IAAIA,WAAW,KAAKR,SAAS,IAAIQ,WAAW,IAAI,CAAC,EAAE;IACjD,IAAIC,KAAK,GAAG,CAAC;IACb,KAAK,MAAMN,OAAO,IAAIN,QAAQ,EAAE;MAC9B,MAAMa,MAAM,GAAGF,WAAW,GAAGC,KAAK;MAClC,IAAIC,MAAM,GAAGP,OAAO,CAACP,QAAQ,CAACe,MAAM,EAAE;QACpC,MAAMC,MAAM,GAAGT,OAAO,CAACP,QAAQ,CAACc,MAAM,CAAC;QACvC,IAAIE,MAAM,IAAI,IAAAC,kCAAgB,EAACD,MAAM,CAAC,KAAKL,OAAO,EAAE;UAClD,OAAO;YAAEO,MAAM,EAAEX,OAAO,CAACP,QAAQ;YAAEmB,YAAY,EAAEL;UAAO,CAAC;QAC3D;QACA;MACF;MACAD,KAAK,IAAIN,OAAO,CAACP,QAAQ,CAACe,MAAM;IAClC;EACF;EACA,KAAK,MAAMR,OAAO,IAAIN,QAAQ,EAAE;IAC9B,IAAIM,OAAO,CAACP,QAAQ,CAACoB,IAAI,CAAEC,KAAK,IAAK,IAAAJ,kCAAgB,EAACI,KAAK,CAAC,KAAKV,OAAO,CAAC,EAAE;MACzE,OAAO;QAAEO,MAAM,EAAEX,OAAO,CAACP;MAAS,CAAC;IACrC;EACF;EACA,OAAOI,SAAS;AAClB","ignoreList":[]}
@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.NowPlayingManager = void 0;
7
7
  var _artwork = require("../../utils/artwork");
8
+ var _getTrackIdentity = require("../../utils/getTrackIdentity");
8
9
  /**
9
10
  * Manages now playing metadata overrides.
10
11
  * Allows temporary metadata changes for the currently playing track
@@ -31,7 +32,7 @@ class NowPlayingManager {
31
32
  album: update.album ?? currentTrack.album,
32
33
  artwork: (0, _artwork.artworkUrl)(currentTrack.artwork),
33
34
  description: currentTrack.description,
34
- mediaId: currentTrack.src ?? currentTrack.url,
35
+ mediaId: (0, _getTrackIdentity.getTrackIdentity)(currentTrack) ?? currentTrack.path,
35
36
  genre: currentTrack.genre,
36
37
  duration
37
38
  } : {
@@ -40,7 +41,7 @@ class NowPlayingManager {
40
41
  album: currentTrack.album,
41
42
  artwork: (0, _artwork.artworkUrl)(currentTrack.artwork),
42
43
  description: currentTrack.description,
43
- mediaId: currentTrack.src ?? currentTrack.url,
44
+ mediaId: (0, _getTrackIdentity.getTrackIdentity)(currentTrack) ?? currentTrack.path,
44
45
  genre: currentTrack.genre,
45
46
  duration
46
47
  };
@@ -62,7 +63,7 @@ class NowPlayingManager {
62
63
  album: this.override?.album ?? currentTrack.album,
63
64
  artwork: (0, _artwork.artworkUrl)(currentTrack.artwork),
64
65
  description: currentTrack.description,
65
- mediaId: currentTrack.src ?? currentTrack.url,
66
+ mediaId: (0, _getTrackIdentity.getTrackIdentity)(currentTrack) ?? currentTrack.path,
66
67
  genre: currentTrack.genre,
67
68
  duration
68
69
  };
@@ -1 +1 @@
1
- {"version":3,"names":["_artwork","require","NowPlayingManager","onNowPlayingChanged","updateNowPlaying","update","currentTrack","duration","override","metadata","title","artist","album","artwork","artworkUrl","description","mediaId","src","url","genre","getNowPlaying","undefined","clearNowPlayingOverride","exports"],"sourceRoot":"../../../../src","sources":["web/player/NowPlayingManager.ts"],"mappings":";;;;;;AAEA,IAAAA,QAAA,GAAAC,OAAA;AAEA;AACA;AACA;AACA;AACA;AACO,MAAMC,iBAAiB,CAAC;EAG7B;EACAC,mBAAmB,GAA2CA,CAAA,KAAM,CAAC,CAAC;;EAEtE;AACF;AACA;AACA;AACA;AACA;AACA;AACA;EACEC,gBAAgBA,CACdC,MAAoC,EACpCC,YAA+B,EAC/BC,QAAgB,EACV;IACN,IAAI,CAACC,QAAQ,GAAGH,MAAM;IAEtB,IAAI,CAACC,YAAY,EAAE;IAEnB,MAAMG,QAA4B,GAAGJ,MAAM,GACvC;MACEK,KAAK,EAAEL,MAAM,CAACK,KAAK,IAAIJ,YAAY,CAACI,KAAK;MACzCC,MAAM,EAAEN,MAAM,CAACM,MAAM,IAAIL,YAAY,CAACK,MAAM;MAC5CC,KAAK,EAAEP,MAAM,CAACO,KAAK,IAAIN,YAAY,CAACM,KAAK;MACzCC,OAAO,EAAE,IAAAC,mBAAU,EAACR,YAAY,CAACO,OAAO,CAAC;MACzCE,WAAW,EAAET,YAAY,CAACS,WAAW;MACrCC,OAAO,EAAEV,YAAY,CAACW,GAAG,IAAIX,YAAY,CAACY,GAAG;MAC7CC,KAAK,EAAEb,YAAY,CAACa,KAAK;MACzBZ;IACF,CAAC,GACD;MACEG,KAAK,EAAEJ,YAAY,CAACI,KAAK;MACzBC,MAAM,EAAEL,YAAY,CAACK,MAAM;MAC3BC,KAAK,EAAEN,YAAY,CAACM,KAAK;MACzBC,OAAO,EAAE,IAAAC,mBAAU,EAACR,YAAY,CAACO,OAAO,CAAC;MACzCE,WAAW,EAAET,YAAY,CAACS,WAAW;MACrCC,OAAO,EAAEV,YAAY,CAACW,GAAG,IAAIX,YAAY,CAACY,GAAG;MAC7CC,KAAK,EAAEb,YAAY,CAACa,KAAK;MACzBZ;IACF,CAAC;IAEL,IAAI,CAACJ,mBAAmB,CAACM,QAAQ,CAAC;EACpC;;EAEA;AACF;AACA;AACA;AACA;AACA;AACA;EACEW,aAAaA,CACXd,YAA+B,EAC/BC,QAAgB,EACgB;IAChC,IAAI,CAACD,YAAY,EAAE,OAAOe,SAAS;IAEnC,OAAO;MACLX,KAAK,EAAE,IAAI,CAACF,QAAQ,EAAEE,KAAK,IAAIJ,YAAY,CAACI,KAAK;MACjDC,MAAM,EAAE,IAAI,CAACH,QAAQ,EAAEG,MAAM,IAAIL,YAAY,CAACK,MAAM;MACpDC,KAAK,EAAE,IAAI,CAACJ,QAAQ,EAAEI,KAAK,IAAIN,YAAY,CAACM,KAAK;MACjDC,OAAO,EAAE,IAAAC,mBAAU,EAACR,YAAY,CAACO,OAAO,CAAC;MACzCE,WAAW,EAAET,YAAY,CAACS,WAAW;MACrCC,OAAO,EAAEV,YAAY,CAACW,GAAG,IAAIX,YAAY,CAACY,GAAG;MAC7CC,KAAK,EAAEb,YAAY,CAACa,KAAK;MACzBZ;IACF,CAAC;EACH;;EAEA;AACF;AACA;AACA;EACEe,uBAAuBA,CAAA,EAAS;IAC9B,IAAI,CAACd,QAAQ,GAAGa,SAAS;EAC3B;AACF;AAACE,OAAA,CAAArB,iBAAA,GAAAA,iBAAA","ignoreList":[]}
1
+ {"version":3,"names":["_artwork","require","_getTrackIdentity","NowPlayingManager","onNowPlayingChanged","updateNowPlaying","update","currentTrack","duration","override","metadata","title","artist","album","artwork","artworkUrl","description","mediaId","getTrackIdentity","path","genre","getNowPlaying","undefined","clearNowPlayingOverride","exports"],"sourceRoot":"../../../../src","sources":["web/player/NowPlayingManager.ts"],"mappings":";;;;;;AAEA,IAAAA,QAAA,GAAAC,OAAA;AACA,IAAAC,iBAAA,GAAAD,OAAA;AAEA;AACA;AACA;AACA;AACA;AACO,MAAME,iBAAiB,CAAC;EAG7B;EACAC,mBAAmB,GAA2CA,CAAA,KAAM,CAAC,CAAC;;EAEtE;AACF;AACA;AACA;AACA;AACA;AACA;AACA;EACEC,gBAAgBA,CACdC,MAAoC,EACpCC,YAA+B,EAC/BC,QAAgB,EACV;IACN,IAAI,CAACC,QAAQ,GAAGH,MAAM;IAEtB,IAAI,CAACC,YAAY,EAAE;IAEnB,MAAMG,QAA4B,GAAGJ,MAAM,GACvC;MACEK,KAAK,EAAEL,MAAM,CAACK,KAAK,IAAIJ,YAAY,CAACI,KAAK;MACzCC,MAAM,EAAEN,MAAM,CAACM,MAAM,IAAIL,YAAY,CAACK,MAAM;MAC5CC,KAAK,EAAEP,MAAM,CAACO,KAAK,IAAIN,YAAY,CAACM,KAAK;MACzCC,OAAO,EAAE,IAAAC,mBAAU,EAACR,YAAY,CAACO,OAAO,CAAC;MACzCE,WAAW,EAAET,YAAY,CAACS,WAAW;MACrCC,OAAO,EAAE,IAAAC,kCAAgB,EAACX,YAAY,CAAC,IAAIA,YAAY,CAACY,IAAI;MAC5DC,KAAK,EAAEb,YAAY,CAACa,KAAK;MACzBZ;IACF,CAAC,GACD;MACEG,KAAK,EAAEJ,YAAY,CAACI,KAAK;MACzBC,MAAM,EAAEL,YAAY,CAACK,MAAM;MAC3BC,KAAK,EAAEN,YAAY,CAACM,KAAK;MACzBC,OAAO,EAAE,IAAAC,mBAAU,EAACR,YAAY,CAACO,OAAO,CAAC;MACzCE,WAAW,EAAET,YAAY,CAACS,WAAW;MACrCC,OAAO,EAAE,IAAAC,kCAAgB,EAACX,YAAY,CAAC,IAAIA,YAAY,CAACY,IAAI;MAC5DC,KAAK,EAAEb,YAAY,CAACa,KAAK;MACzBZ;IACF,CAAC;IAEL,IAAI,CAACJ,mBAAmB,CAACM,QAAQ,CAAC;EACpC;;EAEA;AACF;AACA;AACA;AACA;AACA;AACA;EACEW,aAAaA,CACXd,YAA+B,EAC/BC,QAAgB,EACgB;IAChC,IAAI,CAACD,YAAY,EAAE,OAAOe,SAAS;IAEnC,OAAO;MACLX,KAAK,EAAE,IAAI,CAACF,QAAQ,EAAEE,KAAK,IAAIJ,YAAY,CAACI,KAAK;MACjDC,MAAM,EAAE,IAAI,CAACH,QAAQ,EAAEG,MAAM,IAAIL,YAAY,CAACK,MAAM;MACpDC,KAAK,EAAE,IAAI,CAACJ,QAAQ,EAAEI,KAAK,IAAIN,YAAY,CAACM,KAAK;MACjDC,OAAO,EAAE,IAAAC,mBAAU,EAACR,YAAY,CAACO,OAAO,CAAC;MACzCE,WAAW,EAAET,YAAY,CAACS,WAAW;MACrCC,OAAO,EAAE,IAAAC,kCAAgB,EAACX,YAAY,CAAC,IAAIA,YAAY,CAACY,IAAI;MAC5DC,KAAK,EAAEb,YAAY,CAACa,KAAK;MACzBZ;IACF,CAAC;EACH;;EAEA;AACF;AACA;AACA;EACEe,uBAAuBA,CAAA,EAAS;IAC9B,IAAI,CAACd,QAAQ,GAAGa,SAAS;EAC3B;AACF;AAACE,OAAA,CAAArB,iBAAA,GAAAA,iBAAA","ignoreList":[]}
@@ -12,8 +12,12 @@ exports.BrowserPathHelper = void 0;
12
12
  * 1. System paths (prefixed with `/__`): Root, recent, and search paths
13
13
  * 2. Contextual URLs: Embed parent context in track identifiers for Media3 integration
14
14
  *
15
- * Contextual URL format: `{parentPath}?__trackId={trackSrc}`
16
- * Example: "/library/radio?__trackId=song.mp3"
15
+ * Contextual URL format: `{parentPath}?__trackId={trackIdentity}&__index={childIndex}`
16
+ * Example: "/library/radio?__trackId=song.mp3&__index=2"
17
+ *
18
+ * `__trackId` is the identity check; `__index` (the child's position on the
19
+ * page at stamp time) is only a tie-breaker between surfaces that carry the
20
+ * same identity — a stale index never selects a different track.
17
21
  *
18
22
  * This allows:
19
23
  * - Media3 to reference playable-only tracks (tracks with `src` but no `url`)
@@ -25,6 +29,8 @@ const BrowserPathHelper = exports.BrowserPathHelper = {
25
29
  SEARCH_PATH_PREFIX: '/__search',
26
30
  /** Query parameter name for contextual track identifiers */
27
31
  CONTEXTUAL_TRACK_PARAM: '__trackId',
32
+ /** Query parameter name for the tapped child's page position (tie-breaker) */
33
+ CONTEXTUAL_INDEX_PARAM: '__index',
28
34
  /**
29
35
  * Create a search path for a given query
30
36
  */
@@ -42,13 +48,13 @@ const BrowserPathHelper = exports.BrowserPathHelper = {
42
48
  return path.includes(`?${this.CONTEXTUAL_TRACK_PARAM}=`) || path.includes(`&${this.CONTEXTUAL_TRACK_PARAM}=`);
43
49
  },
44
50
  /**
45
- * Strips the __trackId parameter from a contextual URL to get the parent path.
46
- * If the URL is not contextual, returns it unchanged.
51
+ * Strips the contextual parameters (__trackId and __index) from a contextual
52
+ * URL to get the parent path. If the URL is not contextual, returns it unchanged.
47
53
  *
48
54
  * @param url The URL to process
49
- * @returns The URL without the __trackId parameter
55
+ * @returns The URL without the contextual parameters
50
56
  *
51
- * Example: "/library/radio?__trackId=song.mp3" → "/library/radio"
57
+ * Example: "/library/radio?__trackId=song.mp3&__index=2" → "/library/radio"
52
58
  * Example: "/search?q=jazz&__trackId=song.mp3" → "/search?q=jazz"
53
59
  */
54
60
  stripTrackId(url) {
@@ -60,8 +66,9 @@ const BrowserPathHelper = exports.BrowserPathHelper = {
60
66
  const isFullUrl = url.startsWith('http://') || url.startsWith('https://');
61
67
  const urlObj = new URL(url, isFullUrl ? undefined : 'http://placeholder');
62
68
 
63
- // Remove the __trackId parameter
69
+ // Remove the contextual parameters
64
70
  urlObj.searchParams.delete(this.CONTEXTUAL_TRACK_PARAM);
71
+ urlObj.searchParams.delete(this.CONTEXTUAL_INDEX_PARAM);
65
72
 
66
73
  // Return the appropriate format
67
74
  if (isFullUrl) {
@@ -72,7 +79,7 @@ const BrowserPathHelper = exports.BrowserPathHelper = {
72
79
  }
73
80
  } catch {
74
81
  // Fallback: simple string manipulation
75
- const paramPattern = new RegExp(`[?&]${this.CONTEXTUAL_TRACK_PARAM}=[^&]*`, 'g');
82
+ const paramPattern = new RegExp(`[?&](?:${this.CONTEXTUAL_TRACK_PARAM}|${this.CONTEXTUAL_INDEX_PARAM})=[^&]*`, 'g');
76
83
  let result = url.replace(paramPattern, '');
77
84
  // Clean up any trailing ? or &
78
85
  result = result.replace(/[?&]$/, '');
@@ -81,6 +88,22 @@ const BrowserPathHelper = exports.BrowserPathHelper = {
81
88
  return result;
82
89
  }
83
90
  },
91
+ /**
92
+ * Builds a contextual URL by appending a track identifier — and optionally
93
+ * the tapped child's page position — to a parent path.
94
+ *
95
+ * @param parentPath The parent container path
96
+ * @param trackId The track identity (`id` when non-blank, else `src`)
97
+ * @param index The child's position on the page at stamp time (tie-breaker)
98
+ * @returns A contextual URL combining parent path, track ID, and index
99
+ *
100
+ * Example: build("/library", "song.mp3", 2) → "/library?__trackId=song.mp3&__index=2"
101
+ */
102
+ build(parentPath, trackId, index) {
103
+ const separator = parentPath.includes('?') ? '&' : '?';
104
+ const indexParam = index === undefined ? '' : `&${this.CONTEXTUAL_INDEX_PARAM}=${index}`;
105
+ return `${parentPath}${separator}${this.CONTEXTUAL_TRACK_PARAM}=${encodeURIComponent(trackId)}${indexParam}`;
106
+ },
84
107
  /**
85
108
  * Extracts the track ID from a contextual URL.
86
109
  * Returns undefined if the URL is not contextual or doesn't contain the track ID parameter.
@@ -94,14 +117,36 @@ const BrowserPathHelper = exports.BrowserPathHelper = {
94
117
  if (!this.isContextual(path)) {
95
118
  return undefined;
96
119
  }
120
+ return this.extractParam(path, this.CONTEXTUAL_TRACK_PARAM);
121
+ },
122
+ /**
123
+ * Extracts the stamped page index from a contextual URL, or undefined when
124
+ * the URL is not contextual or carries no (valid, non-negative) index.
125
+ *
126
+ * Example: "/library/radio?__trackId=song.mp3&__index=2" → 2
127
+ */
128
+ extractIndex(path) {
129
+ if (!this.isContextual(path)) {
130
+ return undefined;
131
+ }
132
+ const raw = this.extractParam(path, this.CONTEXTUAL_INDEX_PARAM);
133
+ if (raw === undefined || !/^\d+$/.test(raw)) {
134
+ return undefined;
135
+ }
136
+ return Number.parseInt(raw, 10);
137
+ },
138
+ /**
139
+ * Extracts a single query parameter, handling both full URLs and paths,
140
+ * with a regex fallback for input the URL parser rejects.
141
+ */
142
+ extractParam(path, param) {
97
143
  try {
98
- // Parse the URL - handle both full URLs and paths
99
144
  const isFullUrl = path.startsWith('http://') || path.startsWith('https://');
100
145
  const urlObj = new URL(path, isFullUrl ? undefined : 'http://placeholder');
101
- return urlObj.searchParams.get(this.CONTEXTUAL_TRACK_PARAM) ?? undefined;
146
+ return urlObj.searchParams.get(param) ?? undefined;
102
147
  } catch {
103
148
  // Fallback: regex extraction
104
- const match = path.match(new RegExp(`[?&]${this.CONTEXTUAL_TRACK_PARAM}=([^&]*)`));
149
+ const match = path.match(new RegExp(`[?&]${param}=([^&]*)`));
105
150
  return match?.[1] ? decodeURIComponent(match[1]) : undefined;
106
151
  }
107
152
  },
@@ -1 +1 @@
1
- {"version":3,"names":["BrowserPathHelper","exports","SEARCH_PATH_PREFIX","CONTEXTUAL_TRACK_PARAM","createSearchPath","query","encodedQuery","encodeURIComponent","isContextual","path","includes","stripTrackId","url","isFullUrl","startsWith","urlObj","URL","undefined","searchParams","delete","toString","search","pathname","paramPattern","RegExp","result","replace","extractTrackId","get","match","decodeURIComponent","buildUrl","baseUrl","normalizedBase","normalizedPath"],"sourceRoot":"../../../../src","sources":["web/util/BrowserPathHelper.ts"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["BrowserPathHelper","exports","SEARCH_PATH_PREFIX","CONTEXTUAL_TRACK_PARAM","CONTEXTUAL_INDEX_PARAM","createSearchPath","query","encodedQuery","encodeURIComponent","isContextual","path","includes","stripTrackId","url","isFullUrl","startsWith","urlObj","URL","undefined","searchParams","delete","toString","search","pathname","paramPattern","RegExp","result","replace","build","parentPath","trackId","index","separator","indexParam","extractTrackId","extractParam","extractIndex","raw","test","Number","parseInt","param","get","match","decodeURIComponent","buildUrl","baseUrl","normalizedBase","normalizedPath"],"sourceRoot":"../../../../src","sources":["web/util/BrowserPathHelper.ts"],"mappings":"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","ignoreList":[]}
@@ -3,5 +3,6 @@
3
3
  // `./native` is deliberately not re-exported — see public-surface.test.ts.
4
4
  export * from './features';
5
5
  export * from './types';
6
+ export * from './utils/getTrackIdentity';
6
7
  export * from './utils/useDebug';
7
8
  //# sourceMappingURL=AudioBrowser.js.map
@@ -1 +1 @@
1
- {"version":3,"names":[],"sourceRoot":"../../src","sources":["AudioBrowser.ts"],"mappings":";;AAAA;AACA,cAAc,YAAY;AAC1B,cAAc,SAAS;AACvB,cAAc,kBAAkB","ignoreList":[]}
1
+ {"version":3,"names":[],"sourceRoot":"../../src","sources":["AudioBrowser.ts"],"mappings":";;AAAA;AACA,cAAc,YAAY;AAC1B,cAAc,SAAS;AACvB,cAAc,0BAA0B;AACxC,cAAc,kBAAkB","ignoreList":[]}