test: move mockedLoader around

playground/src/pages/users/query.[id].vue

@@ -1,6 +1,6 @@
 <script lang="ts">
 // FIXME: should be able to import from vue-router or auto import
-import { defineQueryLoader } from 'unplugin-vue-router/runtime'
+import { defineQueryLoader } from 'unplugin-vue-router/data-loaders/vue-query'
 
 import {
   type TypesConfig,

src/data-loaders/defineLoader.spec.ts

@@ -3,6 +3,7 @@
  */
 import { App, defineComponent } from 'vue'
 import {
+  DefineDataLoaderOptions,
   INITIAL_DATA_KEY,
   SERVER_INITIAL_DATA_KEY,
   defineBasicLoader,
@@ -19,16 +20,34 @@ import {
 import {
   DataLoaderPlugin,
   DataLoaderPluginOptions,
+  NavigationResult,
   UseDataLoader,
   setCurrentContext,
 } from 'unplugin-vue-router/runtime'
 import { testDefineLoader } from '../../tests/data-loaders'
 import { getRouter } from 'vue-router-mock'
 import { enableAutoUnmount, mount } from '@vue/test-utils'
 import RouterViewMock from '../../tests/data-loaders/RouterViewMock.vue'
-import { mockedLoader } from '../../tests/utils'
+import { mockPromise } from '../../tests/utils'
 import { RouteLocationNormalizedLoaded } from 'vue-router'
 
+function mockedLoader<T = string | NavigationResult>(
+  // boolean is easier to handle for router mock
+  options?: DefineDataLoaderOptions<boolean>
+) {
+  const [spy, resolve, reject] = mockPromise<T, unknown>(
+    // not correct as T could be something else
+    'ok' as T,
+    new Error('ko')
+  )
+  return {
+    spy,
+    resolve,
+    reject,
+    loader: defineBasicLoader(async () => await spy(), options),
+  }
+}
+
 describe(
   'defineBasicLoader',
   // change it during dev while working on features

src/data-loaders/navigation-guard.spec.ts

@@ -2,7 +2,7 @@
  * @vitest-environment happy-dom
  */
 import { App, createApp, defineComponent } from 'vue'
-import { defineBasicLoader } from './defineLoader'
+import { DefineDataLoaderOptions, defineBasicLoader } from './defineLoader'
 import {
   afterAll,
   afterEach,
@@ -20,13 +20,30 @@ import {
   DataLoaderPlugin,
   NavigationResult,
 } from 'unplugin-vue-router/runtime'
-import { mockedLoader } from '../../tests/utils'
+import { mockPromise } from '../../tests/utils'
 import {
   useDataOne,
   useDataTwo,
 } from '../../tests/data-loaders/ComponentWithLoader.vue'
 import type { NavigationFailure } from 'vue-router'
 
+function mockedLoader<T = string | NavigationResult>(
+  // boolean is easier to handle for router mock
+  options?: DefineDataLoaderOptions<boolean>
+) {
+  const [spy, resolve, reject] = mockPromise<T, unknown>(
+    // not correct as T could be something else
+    'ok' as T,
+    new Error('ko')
+  )
+  return {
+    spy,
+    resolve,
+    reject,
+    loader: defineBasicLoader(async () => await spy(), options),
+  }
+}
+
 describe('navigation-guard', () => {
   let globalApp: App | undefined
 

tests/utils.ts

@@ -38,21 +38,3 @@ export function mockPromise<Resolved, Err>(resolved: Resolved, rejected?: Err) {
 
   return [spy, resolve, reject] as const
 }
-
-// FIXME: shouldn't be using defineBasicLoader
-export function mockedLoader<T = string | NavigationResult>(
-  // boolean is easier to handle for router mock
-  options?: DefineDataLoaderOptions<boolean>
-) {
-  const [spy, resolve, reject] = mockPromise<T, unknown>(
-    // not correct as T could be something else
-    'ok' as T,
-    new Error('ko')
-  )
-  return {
-    spy,
-    resolve,
-    reject,
-    loader: defineBasicLoader(async () => await spy(), options),
-  }
-}