update test fixtures

Author: ota-meshi

.github/workflows/NodeCI.yml

@@ -43,6 +43,6 @@ jobs:
       - name: Test
         run: yarn cover
       - name: Coveralls GitHub Action
-        uses: coverallsapp/github-action@643bc377ffa44ace6394b2b5d0d3950076de9f63 # v2.3.0
+        uses: coverallsapp/[email protected]
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}

tests/fixtures/types/vue/vue-script-setup01/types.vue

@@ -5,11 +5,11 @@ export default {
 </script>
 
 <script setup lang="ts">
-import Foo from "../vue-script-setup02/source.vue"; // Foo: DefineComponent<{ a: { type: NumberConstructor; default: number; }; }, { foo: number; }, unknown, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, ... 5 more ..., {}>
+import Foo from "../vue-script-setup02/source.vue"; // Foo: DefineComponent<ExtractPropTypes<{ a: { type: NumberConstructor; default: number; }; }>, { foo: number; }, {}, {}, {}, ComponentOptionsMixin, ... 13 more ..., any>
 import { TypeFoo } from "../vue-script-setup02/source.vue"; // TypeFoo: any, TypeFoo: any
 import { numberValue } from "./number"; // numberValue: 1, numberValue: 1
-import { ref } from "vue"; // ref: { <T>(value: T): Ref<UnwrapRef<T>>; <T = any>(): Ref<T | undefined>; }, ref: { <T>(value: T): Ref<UnwrapRef<T>>; <T = any>(): Ref<T | undefined>; }
-let a: TypeFoo = ref(1); // a: string, ref(1): Ref<number>
+import { ref } from "vue"; // ref: { <T>(value: T): [T] extends [Ref<any, any>] ? IfAny<T, Ref<T, T>, T> : Ref<UnwrapRef<T>, T | UnwrapRef<T>>; <T = any>(): Ref<...>; }, ref: { <T>(value: T): [T] extends [Ref<any, any>] ? IfAny<T, Ref<T, T>, T> : Ref<UnwrapRef<T>, T | UnwrapRef<T>>; <T = any>(): Ref<...>; }
+let a: TypeFoo = ref(1); // a: string, ref(1): Ref<number, number>
 let b: TypeFoo; // b: string
 defineProps<{ foo: string }>(); // defineProps<{ foo: string }>(): DefineProps<LooseRequired<{ foo: string; }>, never>
 console.log(numberValue); // console.log(numberValue): void

tests/fixtures/types/vue/vue-script-setup03/types.vue

@@ -1,18 +1,18 @@
 <script setup lang="ts">
-import { watchEffect, ref } from "vue"; // watchEffect: (effect: WatchEffect, options?: WatchOptionsBase | undefined) => WatchStopHandle, watchEffect: (effect: WatchEffect, options?: WatchOptionsBase | undefined) => WatchStopHandle, ref: { <T>(value: T): Ref<UnwrapRef<T>>; <T = any>(): Ref<T | undefined>; }, ref: { <T>(value: T): Ref<UnwrapRef<T>>; <T = any>(): Ref<T | undefined>; }
-import Foo from "./component.vue"; // Foo: DefineComponent<{}, { exposeA: Ref<number>; exposeFn: () => Ret | null; exposeFn2: () => number; }, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, ... 5 more ..., {}>
-type VMFoo = InstanceType<typeof Foo>; // VMFoo: CreateComponentPublicInstance<Readonly<ExtractPropTypes<{}>>, { exposeA: Ref<number>; exposeFn: () => Ret | null; exposeFn2: () => number; }, {}, {}, {}, ComponentOptionsMixin, ... 13 more ..., {}>, InstanceType: InstanceType<T>, Foo: DefineComponent<{}, { exposeA: Ref<number>; exposeFn: () => Ret | null; exposeFn2: () => number; }, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, ... 5 more ..., {}>
-let a = ref<VMFoo | null>(null); // a: Ref<CreateComponentPublicInstance<Readonly<ExtractPropTypes<{}>>, { exposeA: Ref<number>; exposeFn: () => Ret | null; exposeFn2: () => number; }, {}, {}, {}, ComponentOptionsMixin, ... 13 more ..., {}> | null>, ref<VMFoo | null>(null): Ref<CreateComponentPublicInstance<Readonly<ExtractPropTypes<{}>>, { exposeA: Ref<number>; exposeFn: () => Ret | null; exposeFn2: () => number; }, {}, {}, {}, ComponentOptionsMixin, ... 13 more ..., {}> | null>
-watchEffect(() => { // watchEffect(() => { if (a.value) fn(a); }): WatchStopHandle
+import { watchEffect, ref } from "vue"; // watchEffect: (effect: WatchEffect, options?: WatchEffectOptions | undefined) => WatchHandle, watchEffect: (effect: WatchEffect, options?: WatchEffectOptions | undefined) => WatchHandle, ref: { <T>(value: T): [T] extends [Ref<any, any>] ? IfAny<T, Ref<T, T>, T> : Ref<UnwrapRef<T>, T | UnwrapRef<T>>; <T = any>(): Ref<...>; }, ref: { <T>(value: T): [T] extends [Ref<any, any>] ? IfAny<T, Ref<T, T>, T> : Ref<UnwrapRef<T>, T | UnwrapRef<T>>; <T = any>(): Ref<...>; }
+import Foo from "./component.vue"; // Foo: DefineComponent<{}, { exposeA: Ref<number, number>; exposeFn: () => Ret | null; exposeFn2: () => number; }, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, ... 12 more ..., any>
+type VMFoo = InstanceType<typeof Foo>; // VMFoo: CreateComponentPublicInstanceWithMixins<ToResolvedProps<{}, {}>, { exposeA: Ref<number, number>; exposeFn: () => Ret | null; exposeFn2: () => number; }, {}, {}, {}, ComponentOptionsMixin, ... 19 more ..., {}>, InstanceType: InstanceType<T>, Foo: DefineComponent<{}, { exposeA: Ref<number, number>; exposeFn: () => Ret | null; exposeFn2: () => number; }, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, ... 12 more ..., any>
+let a = ref<VMFoo | null>(null); // a: Ref<CreateComponentPublicInstanceWithMixins<ToResolvedProps<{}, {}>, { exposeA: Ref<number, number>; exposeFn: () => Ret | null; exposeFn2: () => number; }, {}, {}, {}, ComponentOptionsMixin, ... 19 more ..., {}> | null, CreateComponentPublicInstanceWithMixins<...> | null>, ref<VMFoo | null>(null): Ref<CreateComponentPublicInstanceWithMixins<ToResolvedProps<{}, {}>, { exposeA: Ref<number, number>; exposeFn: () => Ret | null; exposeFn2: () => number; }, {}, {}, {}, ComponentOptionsMixin, ... 19 more ..., {}> | null, CreateComponentPublicInstanceWithMixins<...> | null>
+watchEffect(() => { // watchEffect(() => { if (a.value) fn(a); }): WatchHandle
   if (a.value) fn(a);
 });
 
-const comp = {} as VMFoo | undefined; // comp: CreateComponentPublicInstance<Readonly<ExtractPropTypes<{}>>, { exposeA: Ref<number>; exposeFn: () => Ret | null; exposeFn2: () => number; }, {}, {}, {}, ComponentOptionsMixin, ... 13 more ..., {}> | undefined, VMFoo: CreateComponentPublicInstance<Readonly<ExtractPropTypes<{}>>, { exposeA: Ref<number>; exposeFn: () => Ret | null; exposeFn2: () => number; }, {}, {}, {}, ComponentOptionsMixin, ... 13 more ..., {}>
+const comp = {} as VMFoo | undefined; // comp: CreateComponentPublicInstanceWithMixins<ToResolvedProps<{}, {}>, { exposeA: Ref<number, number>; exposeFn: () => Ret | null; exposeFn2: () => number; }, {}, {}, {}, ComponentOptionsMixin, ... 19 more ..., {}> | undefined, VMFoo: CreateComponentPublicInstanceWithMixins<ToResolvedProps<{}, {}>, { exposeA: Ref<number, number>; exposeFn: () => Ret | null; exposeFn2: () => number; }, {}, {}, {}, ComponentOptionsMixin, ... 19 more ..., {}>
 const r = comp?.exposeFn(); // r: Ret | null | undefined, comp?.exposeFn(): Ret | null | undefined
 const r2 = r?.num(); // r2: number | undefined, r?.num(): number | undefined
 console.log(r2); // console.log(r2): void
 
-function fn(vm: VMFoo) { // fn: (vm: CreateComponentPublicInstance<Readonly<ExtractPropTypes<{}>>, { exposeA: Ref<number>; exposeFn: () => Ret | null; exposeFn2: () => number; }, {}, {}, {}, ComponentOptionsMixin, ... 13 more ..., {}>) => void, vm: CreateComponentPublicInstance<Readonly<ExtractPropTypes<{}>>, { exposeA: Ref<number>; exposeFn: () => Ret | null; exposeFn2: () => number; }, {}, {}, {}, ComponentOptionsMixin, ... 13 more ..., {}>
+function fn(vm: VMFoo) { // fn: (vm: CreateComponentPublicInstanceWithMixins<ToResolvedProps<{}, {}>, { exposeA: Ref<number, number>; exposeFn: () => Ret | null; exposeFn2: () => number; }, {}, {}, {}, ComponentOptionsMixin, ... 19 more ..., {}>) => void, vm: CreateComponentPublicInstanceWithMixins<ToResolvedProps<{}, {}>, { exposeA: Ref<number, number>; exposeFn: () => Ret | null; exposeFn2: () => number; }, {}, {}, {}, ComponentOptionsMixin, ... 19 more ..., {}>
   const b = vm.exposeA; // b: number, vm.exposeA: number
   console.log(b); // console.log(b): void
   const c = vm.exposeFn(); // c: Ret | null, vm.exposeFn(): Ret | null

tests/fixtures/types/vue/vue-script-setup04/types.vue

@@ -1,9 +1,9 @@
 <script setup lang="ts">
-import { watchEffect, ref } from "vue"; // watchEffect: (effect: WatchEffect, options?: WatchOptionsBase | undefined) => WatchStopHandle, watchEffect: (effect: WatchEffect, options?: WatchOptionsBase | undefined) => WatchStopHandle, ref: { <T>(value: T): Ref<UnwrapRef<T>>; <T = any>(): Ref<T | undefined>; }, ref: { <T>(value: T): Ref<UnwrapRef<T>>; <T = any>(): Ref<T | undefined>; }
+import { watchEffect, ref } from "vue"; // watchEffect: (effect: WatchEffect, options?: WatchEffectOptions | undefined) => WatchHandle, watchEffect: (effect: WatchEffect, options?: WatchEffectOptions | undefined) => WatchHandle, ref: { <T>(value: T): [T] extends [Ref<any, any>] ? IfAny<T, Ref<T, T>, T> : Ref<UnwrapRef<T>, T | UnwrapRef<T>>; <T = any>(): Ref<...>; }, ref: { <T>(value: T): [T] extends [Ref<any, any>] ? IfAny<T, Ref<T, T>, T> : Ref<UnwrapRef<T>, T | UnwrapRef<T>>; <T = any>(): Ref<...>; }
 import Foo from "./component.vue"; // Foo: { new (...args: any[]): { $: ComponentInternalInstance; $data: {}; $props: Partial<{}> & Omit<Readonly<ExtractPropTypes<{}>> & VNodeProps & AllowedComponentProps & ComponentCustomProps, never>; ... 10 more ...; $watch<T extends string | ((...args: any) => any)>(source: T, cb: T extends (...args: any) => infer R ? (a...
 type VMFoo = InstanceType<typeof Foo>; // VMFoo: { $: ComponentInternalInstance; $data: {}; $props: Partial<{}> & Omit<Readonly<ExtractPropTypes<{}>> & VNodeProps & AllowedComponentProps & ComponentCustomProps, never>; ... 10 more ...; $watch<T extends string | ((...args: any) => any)>(source: T, cb: T extends (...args: any) => infer R ? (args_0: R, args_1: R) => ..., InstanceType: InstanceType<T>, Foo: { new (...args: any[]): { $: ComponentInternalInstance; $data: {}; $props: Partial<{}> & Omit<Readonly<ExtractPropTypes<{}>> & VNodeProps & AllowedComponentProps & ComponentCustomProps, never>; ... 10 more ...; $watch<T extends string | ((...args: any) => any)>(source: T, cb: T extends (...args: any) => infer R ? (a...
 let a = ref<VMFoo | null>(null); // a: Ref<({ $: ComponentInternalInstance; $data: {}; $props: Partial<{}> & Omit<Readonly<ExtractPropTypes<{}>> & VNodeProps & AllowedComponentProps & ComponentCustomProps, never>; ... 10 more ...; $watch<T extends string | ((...args: any) => any)>(source: T, cb: T extends (...args: any) => infer R ? (args_0: R, args_1: R..., ref<VMFoo | null>(null): Ref<({ $: ComponentInternalInstance; $data: {}; $props: Partial<{}> & Omit<Readonly<ExtractPropTypes<{}>> & VNodeProps & AllowedComponentProps & ComponentCustomProps, never>; ... 10 more ...; $watch<T extends string | ((...args: any) => any)>(source: T, cb: T extends (...args: any) => infer R ? (args_0: R, args_1: R...
-watchEffect(() => { // watchEffect(() => { if (a.value) fn(a); }): WatchStopHandle
+watchEffect(() => { // watchEffect(() => { if (a.value) fn(a); }): WatchHandle
   if (a.value) fn(a);
 });
 

tests/fixtures/types/vue/z-types/types.ts

@@ -1,8 +1,8 @@
 import A from "../vue-options01/source.vue"; // A: { name: string; components: { Foo: { name: string; props: { a: { type: NumberConstructor; default: number; }; }; }; }; data(): { a: number; numberValue: number; }; }
 import B from "../vue-options02/source.vue"; // B: { name: string; props: { a: { type: NumberConstructor; default: number; }; }; }
-import C from "../vue-script-setup01/source.vue"; // C: DefineComponent<{ foo: { type: StringConstructor; required: true; }; }, { a: string; b: string; Foo: DefineComponent<{ a: { type: NumberConstructor; default: number; }; }, { foo: number; }, ... 10 more ..., {}>; }, ... 10 more ..., {}>
-import D from "../vue-script-setup02/source.vue"; // D: DefineComponent<{ a: { type: NumberConstructor; default: number; }; }, { foo: number; }, unknown, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, ... 5 more ..., {}>
+import C from "../vue-script-setup01/source.vue"; // C: DefineComponent<ExtractPropTypes<{ foo: { type: StringConstructor; required: true; }; }>, { a: string; b: string; Foo: DefineComponent<ExtractPropTypes<{ a: { type: NumberConstructor; default: number; }; }>, ... 18 more ..., any>; }, ... 17 more ..., any>
+import D from "../vue-script-setup02/source.vue"; // D: DefineComponent<ExtractPropTypes<{ a: { type: NumberConstructor; default: number; }; }>, { foo: number; }, {}, {}, {}, ComponentOptionsMixin, ... 13 more ..., any>
 import { TypeFoo } from "../vue-script-setup02/source.vue"; // TypeFoo: any, TypeFoo: any
 import E from "../vue-simple-types/source.vue"; // E: { name: string; data(): { a: number; }; }
 export let a: TypeFoo; // a: string
-export { A, B, C, D, E, TypeFoo }; // A: { name: string; components: { Foo: { name: string; props: { a: { type: NumberConstructor; default: number; }; }; }; }; data(): { a: number; numberValue: number; }; }, A: { name: string; components: { Foo: { name: string; props: { a: { type: NumberConstructor; default: number; }; }; }; }; data(): { a: number; numberValue: number; }; }, B: { name: string; props: { a: { type: NumberConstructor; default: number; }; }; }, B: { name: string; props: { a: { type: NumberConstructor; default: number; }; }; }, C: DefineComponent<{ foo: { type: StringConstructor; required: true; }; }, { a: string; b: string; Foo: DefineComponent<{ a: { type: NumberConstructor; default: number; }; }, { foo: number; }, ... 10 more ..., {}>; }, ... 10 more ..., {}>, C: DefineComponent<{ foo: { type: StringConstructor; required: true; }; }, { a: string; b: string; Foo: DefineComponent<{ a: { type: NumberConstructor; default: number; }; }, { foo: number; }, ... 10 more ..., {}>; }, ... 10 more ..., {}>, D: DefineComponent<{ a: { type: NumberConstructor; default: number; }; }, { foo: number; }, unknown, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, ... 5 more ..., {}>, D: DefineComponent<{ a: { type: NumberConstructor; default: number; }; }, { foo: number; }, unknown, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, ... 5 more ..., {}>, E: { name: string; data(): { a: number; }; }, E: { name: string; data(): { a: number; }; }, TypeFoo: any, TypeFoo: any
+export { A, B, C, D, E, TypeFoo }; // A: { name: string; components: { Foo: { name: string; props: { a: { type: NumberConstructor; default: number; }; }; }; }; data(): { a: number; numberValue: number; }; }, A: { name: string; components: { Foo: { name: string; props: { a: { type: NumberConstructor; default: number; }; }; }; }; data(): { a: number; numberValue: number; }; }, B: { name: string; props: { a: { type: NumberConstructor; default: number; }; }; }, B: { name: string; props: { a: { type: NumberConstructor; default: number; }; }; }, C: DefineComponent<ExtractPropTypes<{ foo: { type: StringConstructor; required: true; }; }>, { a: string; b: string; Foo: DefineComponent<ExtractPropTypes<{ a: { type: NumberConstructor; default: number; }; }>, ... 18 more ..., any>; }, ... 17 more ..., any>, C: DefineComponent<ExtractPropTypes<{ foo: { type: StringConstructor; required: true; }; }>, { a: string; b: string; Foo: DefineComponent<ExtractPropTypes<{ a: { type: NumberConstructor; default: number; }; }>, ... 18 more ..., any>; }, ... 17 more ..., any>, D: DefineComponent<ExtractPropTypes<{ a: { type: NumberConstructor; default: number; }; }>, { foo: number; }, {}, {}, {}, ComponentOptionsMixin, ... 13 more ..., any>, D: DefineComponent<ExtractPropTypes<{ a: { type: NumberConstructor; default: number; }; }>, { foo: number; }, {}, {}, {}, ComponentOptionsMixin, ... 13 more ..., any>, E: { name: string; data(): { a: number; }; }, E: { name: string; data(): { a: number; }; }, TypeFoo: any, TypeFoo: any