chore: improve tests

Author: pikax

packages/runtime-core/src/directives.ts

@@ -40,7 +40,7 @@ export type DirectiveHook<
   Arg extends string = string
 > = (
   el: HostElement,
-  binding: DirectiveBinding<Value, Arg, Modifiers>,
+  binding: DirectiveBinding<Value, Modifiers, Arg>,
   vnode: VNode<any, HostElement>,
   prevVNode: Prev
 ) => void
@@ -56,25 +56,25 @@ export interface ObjectDirective<
   Modifiers extends string = string,
   Arg extends string = string
 > {
-  created?: DirectiveHook<HostElement, null, Value, Arg, Modifiers>
-  beforeMount?: DirectiveHook<HostElement, null, Value, Arg, Modifiers>
-  mounted?: DirectiveHook<HostElement, null, Value, Arg, Modifiers>
+  created?: DirectiveHook<HostElement, null, Value, Modifiers, Arg>
+  beforeMount?: DirectiveHook<HostElement, null, Value, Modifiers, Arg>
+  mounted?: DirectiveHook<HostElement, null, Value, Modifiers, Arg>
   beforeUpdate?: DirectiveHook<
     HostElement,
     VNode<any, HostElement>,
     Value,
-    Arg,
-    Modifiers
+    Modifiers,
+    Arg
   >
   updated?: DirectiveHook<
     HostElement,
     VNode<any, HostElement>,
     Value,
-    Arg,
-    Modifiers
+    Modifiers,
+    Arg
   >
-  beforeUnmount?: DirectiveHook<HostElement, null, Value, Arg, Modifiers>
-  unmounted?: DirectiveHook<HostElement, null, Value, Arg, Modifiers>
+  beforeUnmount?: DirectiveHook<HostElement, null, Value, Modifiers, Arg>
+  unmounted?: DirectiveHook<HostElement, null, Value, Modifiers, Arg>
   getSSRProps?: SSRDirectiveHook
 }
 
@@ -83,16 +83,16 @@ export type FunctionDirective<
   V = any,
   Modifiers extends string = string,
   Arg extends string = string
-> = DirectiveHook<HostElement, any, V, Arg, Modifiers>
+> = DirectiveHook<HostElement, any, V, Modifiers, Arg>
 
 export type Directive<
   HostElement = any,
   Value = any,
   Modifiers extends string = string,
   Arg extends string = string
 > =
-  | ObjectDirective<HostElement, Value, Arg, Modifiers>
-  | FunctionDirective<HostElement, Value, Arg, Modifiers>
+  | ObjectDirective<HostElement, Value, Modifiers, Arg>
+  | FunctionDirective<HostElement, Value, Modifiers, Arg>
 
 export type DirectiveModifiers<K extends string = string> = Record<K, boolean>
 

test-dts/directives.test-d.ts

@@ -1,4 +1,5 @@
-import { Directive, expectError, expectType } from './index'
+import { ObjectDirective } from '@vue/runtime-core'
+import { Directive, expectError, expectType, vModelText } from './index'
 
 type ExtractBinding<T> = T extends (
   el: any,
@@ -13,35 +14,45 @@ declare function testDirective<
   Value,
   Modifiers extends string = string,
   Arg extends string = string
->(): ExtractBinding<Directive<any, Value, Arg, Modifiers>>
+>(): ExtractBinding<Directive<any, Value, Modifiers, Arg>>
 
-expectType<{
-  value: number
-  oldValue: number | null
-  arg?: 'Arg'
-  modifiers: Record<'a' | 'b', boolean>
-}>(testDirective<number, 'a' | 'b', 'Arg'>())
-
-expectError<{
-  value: number
-  oldValue: number | null
-  arg?: 'Arg'
-  modifiers: Record<'a' | 'b', boolean>
+describe('vmodel', () => {
+  expectType<ObjectDirective<any, any, 'trim' | 'number' | 'lazy', string>>(
+    vModelText
+  )
   // @ts-expect-error
-}>(testDirective<number, 'a', 'Arg'>())
+  expectType<ObjectDirective<any, any, 'trim' | 'number', string>>(vModelText)
+})
 
-expectType<{
-  value: number
-  oldValue: number | null
-  arg?: 'Arg'
-  modifiers: Record<'a' | 'b', boolean>
-  // @ts-expect-error
-}>(testDirective<number, 'a' | 'b', 'Argx'>())
+describe('custom', () => {
+  expectType<{
+    value: number
+    oldValue: number | null
+    arg?: 'Arg'
+    modifiers: Record<'a' | 'b', boolean>
+  }>(testDirective<number, 'a' | 'b', 'Arg'>())
 
-expectType<{
-  value: number
-  oldValue: number | null
-  arg?: 'Arg'
-  modifiers: Record<'a' | 'b', boolean>
-  // @ts-expect-error
-}>(testDirective<string, 'a' | 'b', 'Arg'>())
+  expectError<{
+    value: number
+    oldValue: number | null
+    arg?: 'Arg'
+    modifiers: Record<'a' | 'b', boolean>
+    // @ts-expect-error
+  }>(testDirective<number, 'a', 'Arg'>())
+
+  expectType<{
+    value: number
+    oldValue: number | null
+    arg?: 'Arg'
+    modifiers: Record<'a' | 'b', boolean>
+    // @ts-expect-error
+  }>(testDirective<number, 'a' | 'b', 'Argx'>())
+
+  expectType<{
+    value: number
+    oldValue: number | null
+    arg?: 'Arg'
+    modifiers: Record<'a' | 'b', boolean>
+    // @ts-expect-error
+  }>(testDirective<string, 'a' | 'b', 'Arg'>())
+})