fix(define-props-refs): nested props w/ withDefaults

closes #348
vue-macros · Apr 29, 2023 · 50f8fe5 · 50f8fe5
1 parent 3bf2d6a
commit 50f8fe5
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 4 deletions.
diff --git a/.changeset/sharp-colts-sparkle.md b/.changeset/sharp-colts-sparkle.md
@@ -0,0 +1,5 @@
+---
+'@vue-macros/define-props-refs': patch
+---
+
+fix nested props w/ withDefaults in definePropsRefs
diff --git a/packages/define-props-refs/macros.d.ts b/packages/define-props-refs/macros.d.ts
@@ -34,6 +34,11 @@ export declare type PropsWithDefaults<Base, Defaults> = Base & {
     : never
 }
 
+export declare function withDefaults<
+  Props,
+  Defaults extends InferDefaults<Props>
+>(props: Props, defaults: Defaults): PropsWithDefaults<Props, Defaults>
+
 export declare function withDefaults<
   PropsWithRefs extends PropRefs<Record<string, any>>,
   Defaults extends InferDefaults<Props>,
@@ -45,10 +50,6 @@ export declare function withDefaults<
       : PropsWithRefs[K]
   }
 >(props: PropsWithRefs, defaults: Defaults): PropRefs<Props>
-export declare function withDefaults<
-  Props,
-  Defaults extends InferDefaults<Props>
->(props: Props, defaults: Defaults): PropsWithDefaults<Props, Defaults>
 
 export declare function definePropsRefs<PropNames extends string = string>(
   props: PropNames[]

diff --git a/packages/define-props-refs/tests/__snapshots__/fixtures.test.ts.snap b/packages/define-props-refs/tests/__snapshots__/fixtures.test.ts.snap
@@ -41,3 +41,30 @@ expectTypeOf(bar).toEqualTypeOf<ComputedRef<readonly number[]>>()
 </script>
 "
 `;
+
+exports[`fixtures > ./fixtures/with-defaults-define-props.vue 1`] = `
+"<script setup lang=\\"ts\\">
+const __MACROS_props = withDefaults(defineProps<Props>(), {
+  modelValue: () => ({
+    signatureAppearance: 'none',
+  }),
+})
+import { toRefs as __MACROS_toRefs } from \\"vue\\";
+import { expectTypeOf } from 'expect-type'
+
+interface Props {
+  modelValue?: {
+    signatureAppearance: 'none'
+  }
+}
+
+// definePropsRefs
+
+const props = __MACROS_toRefs(__MACROS_props)
+
+expectTypeOf(props.modelValue).toEqualTypeOf<{
+  signatureAppearance: 'none'
+}>()
+</script>
+"
+`;
diff --git a/packages/define-props-refs/tests/fixtures/with-defaults-define-props.vue b/packages/define-props-refs/tests/fixtures/with-defaults-define-props.vue
@@ -0,0 +1,21 @@
+<script setup lang="ts">
+import { expectTypeOf } from 'expect-type'
+
+interface Props {
+  modelValue?: {
+    signatureAppearance: 'none'
+  }
+}
+
+// definePropsRefs
+
+const props = withDefaults(defineProps<Props>(), {
+  modelValue: () => ({
+    signatureAppearance: 'none',
+  }),
+})
+
+expectTypeOf(props.modelValue).toEqualTypeOf<{
+  signatureAppearance: 'none'
+}>()
+</script>