From cfdf47c6e9639e483b5b20d4a31dd3d0e5599526 Mon Sep 17 00:00:00 2001
From: Craig Harshbarger <pleek91@gmail.com>
Date: Thu, 23 Jan 2025 16:29:19 -0600
Subject: [PATCH 1/3] Add a failing test

---
 src/tests/routeProps.browser.spec.ts | 53 ++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 src/tests/routeProps.browser.spec.ts

diff --git a/src/tests/routeProps.browser.spec.ts b/src/tests/routeProps.browser.spec.ts
new file mode 100644
index 00000000..2e316f80
--- /dev/null
+++ b/src/tests/routeProps.browser.spec.ts
@@ -0,0 +1,53 @@
+import { vi, test, expect } from 'vitest'
+import { createRoute } from '@/services/createRoute'
+import { createRouter } from '@/services/createRouter'
+import { defineComponent, h } from 'vue'
+import { mount } from '@vue/test-utils'
+
+test('components are not remounted when props change', async () => {
+  const props = vi.fn().mockImplementation(() => ({ prop: 'foo' }))
+  const setup = vi.fn()
+
+  const route = createRoute({
+    name: 'test',
+    path: '/[param]',
+    component: defineComponent({
+      setup() {
+        setup()
+
+        return { props }
+      },
+      render() {
+        return h('div', {}, 'test')
+      },
+    }),
+  }, props)
+
+  const router = createRouter([route], {
+    initialUrl: '/bar',
+  })
+
+  const root = {
+    template: '<RouterView />',
+  }
+
+  mount(root, {
+    global: {
+      plugins: [router],
+    },
+  })
+
+  await router.start()
+
+  await router.route.update({ param: 'foo' })
+
+  expect(setup).toHaveBeenCalledTimes(1)
+
+  await router.route.update({ param: 'bar' })
+
+  expect(setup).toHaveBeenCalledTimes(1)
+
+  await router.route.update({ param: 'foo' })
+
+  expect(setup).toHaveBeenCalledTimes(1)
+})

From 053e4ea1d37caf8420bb5c3a91b0c1af5fca6b69 Mon Sep 17 00:00:00 2001
From: Craig Harshbarger <pleek91@gmail.com>
Date: Fri, 24 Jan 2025 16:46:58 -0600
Subject: [PATCH 2/3] Rework how the component wrappers work to not be
 factories

---
 src/components/echo.ts               |   4 +-
 src/components/routerView.vue        |  36 +++----
 src/services/component.ts            | 136 +++++++++++++--------------
 src/tests/routeProps.browser.spec.ts |  11 +--
 4 files changed, 84 insertions(+), 103 deletions(-)

diff --git a/src/components/echo.ts b/src/components/echo.ts
index 3ea2457d..0d1a38ed 100644
--- a/src/components/echo.ts
+++ b/src/components/echo.ts
@@ -1,7 +1,7 @@
 import { defineComponent } from 'vue'
 
-export default defineComponent(({ value }) => {
-  return () => value
+export default defineComponent((props) => {
+  return () => props.value
 }, {
   props: {
     value: {
diff --git a/src/components/routerView.vue b/src/components/routerView.vue
index 11f9ad81..af9bcb28 100644
--- a/src/components/routerView.vue
+++ b/src/components/routerView.vue
@@ -1,28 +1,27 @@
 <template>
   <template v-if="component">
     <slot name="default" v-bind="{ route, component, rejection }">
-      <component :is="component" />
+      <template v-if="rejection">
+        <component :is="rejection.component" />
+      </template>
+      <template v-else>
+        <ComponentPropsWrapper :component="component" :props="props" />
+      </template>
     </slot>
   </template>
 </template>
 
-<script lang="ts">
-/**
- * @ignore
- */
-</script>
-
 <script lang="ts" setup>
   import { Component, UnwrapRef, VNode, computed, provide, resolveComponent } from 'vue'
   import { usePropStore } from '@/compositions/usePropStore'
   import { useRejection } from '@/compositions/useRejection'
   import { useRoute } from '@/compositions/useRoute'
   import { useRouterDepth } from '@/compositions/useRouterDepth'
-  import { component as componentUtil } from '@/services/component'
   import { RouterRejection } from '@/services/createRouterReject'
   import { RouterRoute } from '@/services/createRouterRoute'
   import { CreateRouteOptions, isWithComponent, isWithComponents } from '@/types/createRouteOptions'
   import { depthInjectionKey } from '@/types/injectionDepth'
+  import { ComponentPropsWrapper } from '@/services/component'
 
   const { name = 'default' } = defineProps<{
     name?: string,
@@ -45,29 +44,24 @@
 
   provide(depthInjectionKey, depth + 1)
 
-  const component = computed(() => {
-    if (rejection.value) {
-      return rejection.value.component
-    }
-
+  const props = computed(() => {
     const match = route.matches.at(depth)
 
     if (!match) {
       return null
     }
 
-    const component = getComponent(match)
-    const props = getProps(match.id, name, route)
+    return getProps(match.id, name, route)
+  })
+
+  const component = computed(() => {
+    const match = route.matches.at(depth)
 
-    if (!component) {
+    if (!match) {
       return null
     }
 
-    if (props) {
-      return componentUtil(component, () => props)
-    }
-
-    return component
+    return getComponent(match)
   })
 
   function getComponent(match: CreateRouteOptions): Component | undefined {
diff --git a/src/services/component.ts b/src/services/component.ts
index 00a783db..e3b1b08a 100644
--- a/src/services/component.ts
+++ b/src/services/component.ts
@@ -1,6 +1,6 @@
+/* eslint-disable vue/require-prop-types */
 /* eslint-disable vue/one-component-per-file */
-import { AsyncComponentLoader, Component, FunctionalComponent, defineComponent, getCurrentInstance, h, ref } from 'vue'
-import { MaybePromise } from '@/types/utilities'
+import { AsyncComponentLoader, Component, FunctionalComponent, defineComponent, getCurrentInstance, h, ref, watch } from 'vue'
 import { isPromise } from '@/utilities/promises'
 
 type Constructor = new (...args: any) => any
@@ -13,8 +13,6 @@ export type ComponentProps<TComponent extends Component> = TComponent extends Co
       ? T
       : {}
 
-type ComponentPropsGetter<TComponent extends Component> = () => MaybePromise<ComponentProps<TComponent>>
-
 /**
  * Creates a component wrapper which has no props itself but mounts another component within while binding its props
  *
@@ -22,74 +20,68 @@ type ComponentPropsGetter<TComponent extends Component> = () => MaybePromise<Com
  * @param props A callback that returns the props or attributes to bind to the component
  * @returns A component
  */
-export function component<TComponent extends Component>(component: TComponent, props: ComponentPropsGetter<TComponent>): Component {
-  return defineComponent({
-    name: 'PropsWrapper',
-    expose: [],
-    setup() {
-      const values = props()
-      const instance = getCurrentInstance()
-
-      return () => {
-        if (values instanceof Error) {
-          return ''
-        }
-
-        if (isPromise(values)) {
-          // @ts-expect-error there isn't a way to check if suspense is used in the component without accessing a private property
-          if (instance?.suspense) {
-            return h(suspenseAsyncPropsWrapper(component, values))
-          }
-
-          return h(asyncPropsWrapper(component, values))
-        }
-
-        return h(component, values)
-      }
-    },
-  })
-}
 
-/**
- * Creates a component wrapper that binds async props which does not require suspense
- */
-function asyncPropsWrapper<TComponent extends Component>(component: TComponent, props: Promise<ComponentProps<TComponent>>): Component {
-  return defineComponent({
-    name: 'AsyncPropsWrapper',
-    expose: [],
-    setup() {
-      const values = ref()
-
-      ;(async () => {
-        values.value = await props
-      })()
-
-      return () => {
-        if (values.value instanceof Error) {
-          return ''
-        }
-
-        if (values.value) {
-          return h(component, values.value)
-        }
-
-        return ''
+export const ComponentPropsWrapper = defineComponent((input: { component: Component, props: unknown }) => {
+  const instance = getCurrentInstance()
+
+  return () => {
+    if (input.props instanceof Error) {
+      return ''
+    }
+
+    if (isPromise(input.props)) {
+      // @ts-expect-error there isn't a way to check if suspense is used in the component without accessing a private property
+      if (instance?.suspense) {
+        return h(SuspenseAsyncComponentPropsWrapper, { component: input.component, props: input.props })
       }
-    },
-  })
-}
 
-/**
- * Creates a component wrapper that binds async props which requires suspense
- */
-function suspenseAsyncPropsWrapper<TComponent extends Component>(component: TComponent, props: Promise<ComponentProps<TComponent>>): Component {
-  return defineComponent({
-    name: 'SuspenseAsyncPropsWrapper',
-    expose: [],
-    async setup() {
-      const values = await props
-
-      return () => h(component, values)
-    },
-  })
-}
+      return h(AsyncComponentPropsWrapper, { component: input.component, props: input.props })
+    }
+
+    return h(input.component, input.props)
+  }
+}, {
+  props: ['component', 'props'],
+})
+
+const AsyncComponentPropsWrapper = defineComponent((input: { component: Component, props: unknown }) => {
+  const values = ref()
+
+  watch(() => input.props, async (props) => {
+    values.value = await props
+  }, { immediate: true, deep: true })
+
+  return () => {
+    if (values.value instanceof Error) {
+      return ''
+    }
+
+    if (values.value) {
+      return h(input.component, values.value)
+    }
+
+    return ''
+  }
+}, {
+  props: ['component', 'props'],
+})
+
+const SuspenseAsyncComponentPropsWrapper = defineComponent(async (input: { component: Component, props: unknown }) => {
+  const values = ref()
+
+  values.value = await input.props
+
+  watch(() => values.value, async (props) => {
+    values.value = await props
+  }, { deep: true })
+
+  return () => {
+    if (values.value) {
+      return h(input.component, values.value)
+    }
+
+    return ''
+  }
+}, {
+  props: ['component', 'props'],
+})
diff --git a/src/tests/routeProps.browser.spec.ts b/src/tests/routeProps.browser.spec.ts
index 2e316f80..aa3cec18 100644
--- a/src/tests/routeProps.browser.spec.ts
+++ b/src/tests/routeProps.browser.spec.ts
@@ -5,23 +5,18 @@ import { defineComponent, h } from 'vue'
 import { mount } from '@vue/test-utils'
 
 test('components are not remounted when props change', async () => {
-  const props = vi.fn().mockImplementation(() => ({ prop: 'foo' }))
   const setup = vi.fn()
 
   const route = createRoute({
     name: 'test',
     path: '/[param]',
     component: defineComponent({
-      setup() {
-        setup()
-
-        return { props }
-      },
+      setup,
       render() {
         return h('div', {}, 'test')
       },
     }),
-  }, props)
+  }, () => ({ prop: 'foo' }))
 
   const router = createRouter([route], {
     initialUrl: '/bar',
@@ -47,7 +42,7 @@ test('components are not remounted when props change', async () => {
 
   expect(setup).toHaveBeenCalledTimes(1)
 
-  await router.route.update({ param: 'foo' })
+  await router.route.update({ param: 'baz' })
 
   expect(setup).toHaveBeenCalledTimes(1)
 })

From 2424fa1f28aca8cac3861b71139eb1135546f71b Mon Sep 17 00:00:00 2001
From: Craig Harshbarger <pleek91@gmail.com>
Date: Fri, 24 Jan 2025 16:51:56 -0600
Subject: [PATCH 3/3] Update broken tests

---
 src/services/component.browser.spec.ts | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/services/component.browser.spec.ts b/src/services/component.browser.spec.ts
index 3f74e027..4ca205e8 100644
--- a/src/services/component.browser.spec.ts
+++ b/src/services/component.browser.spec.ts
@@ -1,7 +1,6 @@
 import { flushPromises, mount } from '@vue/test-utils'
 import { expect, test } from 'vitest'
 import echo from '@/components/echo'
-import { component } from '@/services/component'
 import { createRoute } from '@/services/createRoute'
 import { createRouter } from '@/services/createRouter'
 import { h, defineComponent, getCurrentInstance } from 'vue'
@@ -10,8 +9,8 @@ test('renders component with sync props', async () => {
   const route = createRoute({
     name: 'echo',
     path: '/echo',
-    component: component(echo, () => ({ value: 'echo' })),
-  })
+    component: echo,
+  }, () => ({ value: 'echo' }))
 
   const router = createRouter([route], {
     initialUrl: '/',
@@ -38,9 +37,9 @@ test('renders component with async props', async () => {
   const route = createRoute({
     name: 'echo',
     path: '/echo',
-    component: component(echo, async () => {
-      return { value: 'echo' }
-    }),
+    component: echo,
+  }, async () => {
+    return { value: 'echo' }
   })
 
   const router = createRouter([route], {
@@ -109,8 +108,8 @@ test('renders component with async props using suspense', async () => {
   const route = createRoute({
     name: 'home',
     path: '/',
-    component: component(echo, () => promise),
-  })
+    component: echo,
+  }, () => promise)
 
   const router = createRouter([route], {
     initialUrl: '/',