More poking, non of this works

appuniversum · Nov 26, 2024 · cc1c18d · cc1c18d
1 parent 49de067
commit cc1c18d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 19 deletions.
diff --git a/addon/services/toaster.ts b/addon/services/toaster.ts
@@ -5,16 +5,12 @@ import { A, type NativeArray } from '@ember/array';
 import type { ComponentLike } from '@glint/template';
 
 export type ToastData = {
+  component?: ComponentLike<CustomToastSignature>;
   title?: string;
   message?: string;
-  options: ToastOptions;
+  options: ToastOptions | Record<string, unknown>;
 };
 
-export type CustomToastData = {
-  component?: ComponentLike<CustomToastSignature>;
-  options: object;
-}
-
 export type ToastOptions = {
   icon?: string | ComponentLike<{ Element: Element }>;
   closable?: boolean;
@@ -24,7 +20,7 @@ export type ToastOptions = {
 
 export interface CustomToastSignature {
   Args: {
-    options: object;
+    options: Record<string, unknown>;
     close: () => void;
   };
 }
@@ -35,26 +31,26 @@ export default class ToasterService extends Service {
   @tracked toasts: NativeArray<ToastData> = A<ToastData>([]);
 
   displayToast = task(async (toast: ToastData) => {
-    if (typeof toast.options.timeOut === 'undefined') {
-      toast.options.timeOut = null;
+    if (typeof toast.options['timeOut'] === 'undefined') {
+      toast.options['timeOut'] = null;
     }
 
-    if (typeof toast.options.closable === 'undefined') {
-      toast.options.closable = true;
+    if (typeof toast.options['closable'] === 'undefined') {
+      toast.options['closable'] = true;
     }
 
     this.toasts.pushObject(toast);
 
-    if (toast.options.timeOut) {
-      await timeout(toast.options.timeOut);
+    if (toast.options['timeOut']) {
+      await timeout(toast.options['timeOut']);
 
       this.close(toast);
     }
   });
 
   show(
-    component: ComponentLike<CustomToastSignature>,
-    options: object = {},
+    component: ComponentLike<unknown>,
+    options: Record<string, unknown> = {},
   ) {
     const toast = {
       component,

diff --git a/tests/integration/components/au-toaster-test.gts b/tests/integration/components/au-toaster-test.gts
@@ -153,10 +153,10 @@ module('Integration | Component | au-toaster', function (hooks) {
 
     const CustomToast: TOC<{
       Args: {
-        options: {
-          foo: string
-        };
-        // options: ToastOptionsWithFoo; // Doesn't work
+        // options: {
+        //   foo: string
+        // };
+        options: ToastOptionsWithFoo; // Doesn't work
         // options: ToastOptions; // Works, but fails on the `@options.foo` usage in the template
         // options: ToastOptions & { foo: string }; // Doesn't work
         close: CustomToastSignature['Args']['close'];