Fix types

Author: amortemousque

packages/core/src/browser/types.ts

@@ -40,7 +40,6 @@ export interface VisualViewport extends EventTarget {
 }
 
 // Those are native API types that are not official supported by TypeScript yet
-// https://github.com/microsoft/TypeScript/blob/13c374a868c926f6a907666a5599992c1351b773/src/lib/dom.generated.d.ts#L15399-L15418
 
 export interface CookieStore extends EventTarget {}
 

packages/core/src/index.ts

@@ -96,6 +96,7 @@ export {
   deleteCookie,
   resetInitCookies,
 } from './browser/cookie'
+export { CookieStore } from './browser/types'
 export { initXhrObservable, XhrCompleteContext, XhrStartContext } from './browser/xhrObservable'
 export { initFetchObservable, FetchResolveContext, FetchStartContext, FetchContext } from './browser/fetchObservable'
 export { createPageExitObservable, PageExitEvent, PageExitReason, isPageExitReason } from './browser/pageExitObservable'

packages/rum-core/src/browser/cookieObservable.spec.ts

@@ -2,10 +2,9 @@ import type { Subscription } from '@datadog/browser-core'
 import { ONE_MINUTE, STORAGE_POLL_DELAY, deleteCookie, setCookie } from '@datadog/browser-core'
 import type { Clock } from '@datadog/browser-core/test'
 import { mockClock } from '@datadog/browser-core/test'
-import type { CookieChangeItem } from 'packages/core/src/browser/types'
 import type { RumConfiguration } from '../domain/configuration'
 import { createCookieObservable } from './cookieObservable'
-import type { CookieObservable } from './cookieObservable'
+import type { CookieChange, CookieObservable } from './cookieObservable'
 
 const COOKIE_NAME = 'cookie_name'
 const COOKIE_DURATION = ONE_MINUTE
@@ -44,7 +43,7 @@ describe('cookieObservable', () => {
 
   it('should notify observers on cookie change when cookieStore is not supported', () => {
     Object.defineProperty(window, 'cookieStore', { get: () => undefined })
-    let cookieChange: CookieChangeItem | undefined
+    let cookieChange: CookieChange | undefined
     observable.subscribe((change) => (cookieChange = change))
 
     setCookie(COOKIE_NAME, 'foo', COOKIE_DURATION)

packages/rum-core/src/browser/cookieObservable.ts

@@ -1,4 +1,4 @@
-import type { Configuration } from '@datadog/browser-core'
+import type { Configuration, CookieStore } from '@datadog/browser-core'
 import {
   setInterval,
   clearInterval,
@@ -7,16 +7,17 @@ import {
   ONE_SECOND,
   findCommaSeparatedValue,
 } from '@datadog/browser-core'
-import type { CookieChangeItem, CookieStore } from 'packages/core/src/browser/types'
 
 export interface CookieStoreWindow extends Window {
-  cookieStore: CookieStore
+  cookieStore?: CookieStore
 }
 
 export type CookieObservable = ReturnType<typeof createCookieObservable>
 
+export type CookieChange = { name: string; value: string | undefined }
+
 export function createCookieObservable(configuration: Configuration, cookieName: string) {
-  return new Observable<CookieChangeItem>(
+  return new Observable<CookieChange>(
     (observable) =>
       listenToCookieStoreChange(configuration, cookieName, (event) => observable.notify(event)) ??
       watchCookieFallback(cookieName, (event) => observable.notify(event))
@@ -26,13 +27,13 @@ export function createCookieObservable(configuration: Configuration, cookieName:
 function listenToCookieStoreChange(
   configuration: Configuration,
   cookieName: string,
-  callback: (event: CookieChangeItem) => void
+  callback: (event: CookieChange) => void
 ) {
-  if (!('cookieStore' in window)) {
+  if (!(window as CookieStoreWindow).cookieStore) {
     return
   }
 
-  const listener = addEventListener(configuration, (window as CookieStoreWindow).cookieStore, 'change', (event) => {
+  const listener = addEventListener(configuration, (window as CookieStoreWindow).cookieStore!, 'change', (event) => {
     event.changed
       .concat(event.deleted)
       .filter((change) => change.name === cookieName)