refactor: rearrange $goto and types

Author: jakobrosenberg

lib/runtime/helpers/index.js

@@ -35,33 +35,6 @@ export const getPath = (node1, node2) => {
     return backtrackStr + forwardStepsStr
 }
 
-/**
- * @callback Goto
- * @param {string|RNodeRuntime} pathOrNode relative, absolute or named URL
- * @param {Object.<string, string>=} userParams
- * @param {Partial<$UrlOptions & RouteState>=} options
- * @type {Readable<Goto>} */
-export const goto = {
-    subscribe: (run, invalidate) => {
-        const { router } = contexts
-
-        return derived(url, $url =>
-            /** @type {Goto} */
-            (pathOrNode, userParams, options) => {
-                const path =
-                    typeof pathOrNode === 'string' ? pathOrNode : pathOrNode?.path
-
-                /** @type {options} */
-                const defaults = { mode: 'push', state: {} }
-                options = { ...defaults, ...options }
-                const newUrl = $url(path, userParams, options)
-                router.url[options.mode](newUrl, options.state)
-                return ''
-            },
-        ).subscribe(run, invalidate)
-    },
-}
-
 /**
  * @template T
  * @typedef {import('svelte/store').Readable<T>} Readable
@@ -90,6 +63,33 @@ export const goto = {
  * }>} RouteState
  */
 
+/**
+ * @callback Goto
+ * @param {string|RNodeRuntime} pathOrNode relative, absolute or named URL
+ * @param {Object.<string, string>=} userParams
+ * @param {Partial<$UrlOptions & RouteState>=} options
+ * @type {Readable<Goto>} */
+export const goto = {
+    subscribe: (run, invalidate) => {
+        const { router } = contexts
+
+        return derived(url, $url =>
+            /** @type {Goto} */
+            (pathOrNode, userParams, options) => {
+                const path =
+                    typeof pathOrNode === 'string' ? pathOrNode : pathOrNode?.path
+
+                /** @type {options} */
+                const defaults = { mode: 'push', state: {} }
+                options = { ...defaults, ...options }
+                const newUrl = $url(path, userParams, options)
+                router.url[options.mode](newUrl, options.state)
+                return ''
+            },
+        ).subscribe(run, invalidate)
+    },
+}
+
 /**
  * @typedef {(<T extends string | HTMLAnchorElement>(
  *   inputPath: T,
@@ -98,13 +98,6 @@ export const goto = {
  * ) => T extends HTMLAnchorElement ? void : string)} Url
  */
 
-/**
- * @typedef {((
- *   pathOrNode: string|RNodeRuntime,
- *   userParams?: { [x: string]: string; },
- *   options?: Partial<$UrlOptions>
- * ) => string)} UrlFromString
- */
 /**
  * @type {Readable<Url>}
  */
@@ -140,6 +133,14 @@ export const url = {
     },
 }
 
+/**
+ * @typedef {((
+ *   pathOrNode: string|RNodeRuntime,
+ *   userParams?: { [x: string]: string; },
+ *   options?: Partial<$UrlOptions>
+ * ) => string)} UrlFromString
+ */
+
 /**
  * @param {RouteFragment} fragment
  * @param {Router} router