From 2d1ccf16cbef17a12febff3580cc1a18d8746ef9 Mon Sep 17 00:00:00 2001
From: Jason Lee <jason@zerodevx.com>
Date: Sun, 26 Mar 2023 03:26:42 +0800
Subject: [PATCH] Pesky `jsdoc` type coercions are pesky

---
 src/lib/SvelteToast.svelte |  6 ++++--
 src/lib/ToastItem.svelte   |  6 +++++-
 src/lib/stores.js          | 19 ++++++++++---------
 src/routes/+page.svelte    | 16 ++++++++++------
 src/routes/Dummy.svelte    |  6 +++---
 5 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/src/lib/SvelteToast.svelte b/src/lib/SvelteToast.svelte
index ef4775c..66eafd8 100644
--- a/src/lib/SvelteToast.svelte
+++ b/src/lib/SvelteToast.svelte
@@ -9,10 +9,12 @@ export let options = {}
 /** @type {(string|'default')} */
 export let target = 'default'
 
+/** @type {import('./stores').SvelteToastOptions[]} */
 let items = []
 
+/** @param {Object<string,string|number>} [theme] */
 function getCss(theme) {
-  return Object.keys(theme).reduce((a, c) => `${a}${c}:${theme[c]};`, '')
+  return theme ? Object.keys(theme).reduce((a, c) => `${a}${c}:${theme[c]};`, '') : undefined
 }
 
 $: toast._init(target, options)
@@ -23,7 +25,7 @@ $: items = $toast.filter((i) => i.target === target)
 <ul class="_toastContainer">
   {#each items as item (item.id)}
     <li
-      class={item.classes.join(' ')}
+      class={item.classes?.join(' ')}
       in:fly={item.intro}
       out:fade
       animate:flip={{ duration: 200 }}
diff --git a/src/lib/ToastItem.svelte b/src/lib/ToastItem.svelte
index 4a70013..158578b 100644
--- a/src/lib/ToastItem.svelte
+++ b/src/lib/ToastItem.svelte
@@ -7,10 +7,12 @@ import { toast } from './stores'
 /** @type {import('./stores').SvelteToastOptions} */
 export let item
 
+/** @type {any} */
 let next = item.initial
 let prev = next
 let paused = false
 let cprops = {}
+/** @type {any} */
 let unlisten
 
 const progress = tweened(item.initial, { duration: item.duration, easing: linear })
@@ -32,13 +34,14 @@ function pause() {
 
 function resume() {
   if (paused) {
-    const d = item.duration
+    const d = /** @type {any} */ (item.duration)
     const duration = d - d * (($progress - prev) / (next - prev))
     progress.set(next, { duration }).then(autoclose)
     paused = false
   }
 }
 
+/** @param {any} prop */
 function check(prop, kind = 'undefined') {
   return typeof prop === kind
 }
@@ -73,6 +76,7 @@ onMount(listen)
 
 onDestroy(() => {
   if (check(item.onpop, 'function')) {
+    // @ts-ignore
     item.onpop(item.id)
   }
   unlisten && unlisten()
diff --git a/src/lib/stores.js b/src/lib/stores.js
index 98a2019..8bce7fa 100644
--- a/src/lib/stores.js
+++ b/src/lib/stores.js
@@ -11,7 +11,7 @@ import { writable } from 'svelte/store'
 /**
  * @typedef {Object} SvelteToastCustomComponent
  * @property {SvelteComponent} src - custom Svelte Component
- * @property {Object.<string, *>} [props] - props to pass into custom component
+ * @property {Object<string,any>} [props] - props to pass into custom component
  * @property {string} [sendIdTo] - forward toast id to prop name
  */
 
@@ -32,7 +32,7 @@ import { writable } from 'svelte/store'
  * @property {boolean} [dismissable] - allow dissmiss with close button
  * @property {boolean} [reversed] - display toasts in reverse order
  * @property {FlyParams} [intro] - toast intro fly animation settings
- * @property {Object.<string, string|number>} [theme] - css var overrides
+ * @property {Object<string,string|number>} [theme] - css var overrides
  * @property {string[]} [classes] - user-defined classes
  * @property {SvelteToastOnPopCallback} [onpop] - callback that runs on toast dismiss
  * @property {SvelteToastCustomComponent} [component] - send custom Svelte Component as a message
@@ -50,13 +50,13 @@ const defaults = {
   intro: { x: 256 }
 }
 
-const createToast = () => {
-  const { subscribe, update } = writable([])
-  /** @type {Object.<string, SvelteToastOptions>} */
+function createToast() {
+  const { subscribe, update } = writable(new Array())
+  /** @type {Object<string,SvelteToastOptions>} */
   const options = {}
   let count = 0
 
-  /** @param {*} obj */
+  /** @param {any} obj */
   function _obj(obj) {
     return obj instanceof Object
   }
@@ -96,14 +96,15 @@ const createToast = () => {
    * - toast.pop(0) // remove all toasts
    * - toast.pop(id) // removes the toast with specified `id`
    * - toast.pop({ target: 'foo' }) // remove all toasts from target `foo`
-   * @param {(number|Object.<'target', string>)} [id]
+   * @param {(number|Object<'target',string>)} [id]
    */
   function pop(id) {
     update((n) => {
       if (!n.length || id === 0) return []
       // Filter function is deprecated; shim added for backward compatibility
       if (typeof id === 'function') return n.filter((i) => id(i))
-      if (_obj(id)) return n.filter((i) => i.target !== id.target)
+      if (_obj(id))
+        return n.filter(/** @type {SvelteToastOptions[]} i */ (i) => i.target !== id.target)
       const found = id || Math.max(...n.map((i) => i.id))
       return n.filter((i) => i.id !== found)
     })
@@ -115,7 +116,7 @@ const createToast = () => {
    * @param {SvelteToastOptions} [opts]
    */
   function set(id, opts) {
-    /** @type {object} */
+    /** @type {any} */
     const param = _obj(id) ? id : { ...opts, id }
     update((n) => {
       const idx = n.findIndex((i) => i.id === param.id)
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index 0947d8e..3943437 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -14,12 +14,12 @@ if (browser) window.toast = toast
 
 const version = PUBLIC_VERSION
 
-let selected
+let selected = ''
 let code = '// Tap a button below'
 let colors = false
 let bottom = false
 let options = {}
-let formatted
+let formatted = ''
 
 const buttons = [
   {
@@ -133,7 +133,8 @@ toast.set(id, { msg: 'Just a bit more', next: 0.8 })
 await sleep(2000)
 toast.set(id, { next: 1 })`,
     run: async () => {
-      const sleep = (t) => new Promise((resolve) => setTimeout(resolve, t))
+      const sleep = (/** @type {number|undefined} */ t) =>
+        new Promise((resolve) => setTimeout(resolve, t))
       const id = toast.push('Loading, please wait...', {
         duration: 300,
         initial: 0,
@@ -354,6 +355,7 @@ toast.pop(0)`,
   }
 ]
 
+/** @param {{ name: any; code: any; run: any; }} btn */
 function clicked(btn) {
   selected = btn.name
   code = btn.code
@@ -361,6 +363,7 @@ function clicked(btn) {
   if (browser && !dev) window.gtag('event', 'toast', { event_label: btn.name })
 }
 
+// @ts-ignore
 $: formatted = Prism.highlight(code, Prism.languages.javascript, 'javascript')
 </script>
 
@@ -385,9 +388,10 @@ $: formatted = Prism.highlight(code, Prism.languages.javascript, 'javascript')
   </div>
   <p class="max-w-2xl mx-auto text-center mb-6">
     Simple elegant toast notifications for modern web frontends in very little lines of code.
-    Because a demo helps better than a thousand API docs, so here it is. Use in Vanilla JS <span
-      class="font-mono text-sm">(8kB gzipped)</span
-    > or as a Svelte component.
+    Because a demo helps better than a thousand API docs, so here it is. Use in Vanilla JS (<strong
+      >8kB</strong
+    >
+    gzipped) or as a Svelte component.
   </p>
   <div class="mockup-code h-80 mb-4 text-sm overflow-auto">
     <pre><code class="language-javascript">{@html formatted}</code></pre>
diff --git a/src/routes/Dummy.svelte b/src/routes/Dummy.svelte
index f6ff983..fcd547e 100644
--- a/src/routes/Dummy.svelte
+++ b/src/routes/Dummy.svelte
@@ -1,10 +1,10 @@
 <script>
 import { toast } from '$lib/index.js'
 
-export let toastId
-export let title
+export let toastId = 0
+export let title = ''
 
-const clicked = (ok) => {
+const clicked = (/** @type {boolean} */ ok) => {
   toast.pop(toastId)
   toast.push({
     msg: ok ? 'Accepted!' : 'Declined!',