fix(compiler-sfc): handle keyof operator

vuejs · May 6, 2024 · e77c0e3 · e77c0e3
1 parent c0c9432
commit e77c0e3
Show file tree

Hide file tree

Showing 2 changed files with 63 additions and 9 deletions.
diff --git a/packages/compiler-sfc/__tests__/compileScript/resolveType.spec.ts b/packages/compiler-sfc/__tests__/compileScript/resolveType.spec.ts
@@ -265,6 +265,42 @@ describe('resolveType', () => {
     })
   })
 
+  test('utility type: keyof', () => {
+    const files = {
+      '/foo.ts': `export type IMP = { ${1}: 1 };`,
+    }
+
+    const { props } = resolve(
+      `
+      import { IMP } from './foo'
+      interface Foo { foo: 1, ${1}: 1 } 
+      type Bar = { bar: 1 }
+      type SubBar = Bar
+      declare const obj: Bar
+      declare const set: Set<any>
+
+      defineProps<{ 
+        imp: keyof IMP,
+        foo: keyof Foo,
+        bar: keyof Bar,
+        subBar: keyof SubBar,
+        obj: keyof typeof obj,
+        set: keyof typeof set,
+      }>()
+      `,
+      files,
+    )
+
+    expect(props).toStrictEqual({
+      imp: ['Number'],
+      foo: ['String', 'Number'],
+      bar: ['String'],
+      subBar: ['String'],
+      obj: ['String'],
+      set: ['String'],
+    })
+  })
+
   test('utility type: ReadonlyArray', () => {
     expect(
       resolve(`

diff --git a/packages/compiler-sfc/src/script/resolveType.ts b/packages/compiler-sfc/src/script/resolveType.ts
@@ -1448,7 +1448,10 @@ export function inferRuntimeType(
   ctx: TypeResolveContext,
   node: Node & MaybeWithScope,
   scope = node._ownerScope || ctxToScope(ctx),
+  options: { isKeyof?: boolean } = {},
 ): string[] {
+  const { isKeyof } = options
+
   try {
     switch (node.type) {
       case 'TSStringKeyword':
@@ -1467,16 +1470,26 @@ export function inferRuntimeType(
         const types = new Set<string>()
         const members =
           node.type === 'TSTypeLiteral' ? node.members : node.body.body
+
         for (const m of members) {
-          if (
-            m.type === 'TSCallSignatureDeclaration' ||
-            m.type === 'TSConstructSignatureDeclaration'
-          ) {
-            types.add('Function')
+          if (isKeyof) {
+            if ((m as any).key.type === 'NumericLiteral') {
+              types.add('Number')
+            } else {
+              types.add('String')
+            }
           } else {
-            types.add('Object')
+            if (
+              m.type === 'TSCallSignatureDeclaration' ||
+              m.type === 'TSConstructSignatureDeclaration'
+            ) {
+              types.add('Function')
+            } else {
+              types.add('Object')
+            }
           }
         }
+
         return types.size ? Array.from(types) : ['Object']
       }
       case 'TSPropertySignature':
@@ -1512,8 +1525,11 @@ export function inferRuntimeType(
       case 'TSTypeReference': {
         const resolved = resolveTypeReference(ctx, node, scope)
         if (resolved) {
-          return inferRuntimeType(ctx, resolved, resolved._ownerScope)
+          return inferRuntimeType(ctx, resolved, resolved._ownerScope, options)
         }
+
+        if (isKeyof) return ['String']
+
         if (node.typeName.type === 'Identifier') {
           switch (node.typeName.name) {
             case 'Array':
@@ -1634,15 +1650,17 @@ export function inferRuntimeType(
           // typeof only support identifier in local scope
           const matched = scope.declares[id.name]
           if (matched) {
-            return inferRuntimeType(ctx, matched, matched._ownerScope)
+            return inferRuntimeType(ctx, matched, matched._ownerScope, options)
           }
         }
         break
       }
 
       // e.g. readonly
       case 'TSTypeOperator': {
-        return inferRuntimeType(ctx, node.typeAnnotation, scope)
+        return inferRuntimeType(ctx, node.typeAnnotation, scope, {
+          isKeyof: node.operator === 'keyof',
+        })
       }
     }
   } catch (e) {