improved types

Author: cappuc

resources/js/components/banner.ts

@@ -12,7 +12,7 @@ import { CookieConfig, CookiePurpose, CookieSolutionConfig } from '../types';
 import clsx from 'clsx';
 import { getContrastColor } from '../utils/colorContrast';
 
-interface AcceptStatus {
+export interface AcceptStatus {
     timestamp: string;
     digest?: string;
     purposes: Record<CookiePurpose, boolean>;
@@ -168,13 +168,15 @@ export class CookieSolutionBanner extends LitElement {
                 return;
             }
 
+            //@ts-expect-error
             if (typeof gtag !== 'function') {
                 this._gtagRetries++;
                 setTimeout(emitGtagEvent, 100 * this._gtagRetries);
                 return;
             }
 
             try {
+                //@ts-expect-error
                 gtag('consent', 'update', {
                     analytics_storage: this._status?.purposes.statistics ? 'granted' : 'denied',
                     ad_storage: this._status?.purposes.marketing ? 'granted' : 'denied',
@@ -203,13 +205,15 @@ export class CookieSolutionBanner extends LitElement {
                 return;
             }
 
+            //@ts-expect-error
             if (typeof fbq !== 'function') {
                 this._fbqRetries++;
                 setTimeout(emitFbqEvent, 100 * this._fbqRetries);
                 return;
             }
 
             try {
+                //@ts-expect-error
                 fbq('consent', this._status?.purposes.marketing ? 'grant' : 'revoke');
             } catch (e) {
                 this._fbqRetries++;

resources/js/laravel-cookie-solution.ts

@@ -3,17 +3,14 @@ import './components/banner';
 import './components/toggle';
 import './components/policyFormatter';
 import { CookieSolutionConfig } from './types';
-import { CookieSolutionBanner } from './components/banner';
+import { type AcceptStatus, CookieSolutionBanner } from './components/banner';
 import { CookieSolutionDuration } from './components/duration';
 import { CookieSolutionToggle } from './components/toggle';
 import { CookieSolutionPolicyFormatter } from './components/policyFormatter';
 
 export type { CookieSolutionConfig, ServiceConfig, CookieConfig, CookiePurpose } from './types';
 
 declare global {
-    const gtag: Function | undefined;
-    const fbq: Function | undefined;
-
     interface Window {
         _cookieSolution?: CookieSolutionConfig;
         dataLayer?: Record<string, any>[];
@@ -25,6 +22,10 @@ declare global {
         'cookie-solution-duration': CookieSolutionDuration;
         'cookie-solution-policy-formatter': CookieSolutionPolicyFormatter;
     }
+
+    interface GlobalEventHandlersEventMap {
+        'cookie-solution-status-change': CustomEvent<AcceptStatus>;
+    }
 }
 
 (function () {