Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support imported types in SFC macros #8083

Merged
merged 9 commits into from Apr 15, 2023
+959 −247
Merged

Support imported types in SFC macros #8083

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c55c204
feat(compiler-sfc): support relative imported types in macros
yyx990803 Apr 13, 2023
40f8a14
refactor: improve type resolve error output
yyx990803 Apr 13, 2023
c2fb0df
wip: cache fileToScope + improve vue file offset
yyx990803 Apr 13, 2023
ef06d29
feat(compiler-sfc): support resolving type imports from modules
yyx990803 Apr 14, 2023
5773600
test: refactor resolveType test
yyx990803 Apr 14, 2023
e1eff4c
chore: comments [ci skip]
yyx990803 Apr 14, 2023
e5d899d
refactor: avoid hard error when inferring runtime type
yyx990803 Apr 15, 2023
f35e693
feat(compiler-sfc): expose type import deps on compiled script block
yyx990803 Apr 15, 2023
e436e79
feat(compiler-sfc): support string/number indexed types in macros
yyx990803 Apr 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 1 addition & 15 deletions packages/compiler-core/src/babelUtils.ts
View file
Open in desktop
Expand Up @@ -6,10 +6,7 @@ import type {
Function,
ObjectProperty,
BlockStatement,
Program,
ImportDefaultSpecifier,
ImportNamespaceSpecifier,
ImportSpecifier
Program
} from '@babel/types'
import { walk } from 'estree-walker'

Expand Down Expand Up @@ -246,17 +243,6 @@ export const isStaticProperty = (node: Node): node is ObjectProperty =>
export const isStaticPropertyKey = (node: Node, parent: Node) =>
isStaticProperty(parent) && parent.key === node

export function getImportedName(
specifier: ImportSpecifier | ImportDefaultSpecifier | ImportNamespaceSpecifier
) {
if (specifier.type === 'ImportSpecifier')
return specifier.imported.type === 'Identifier'
? specifier.imported.name
: specifier.imported.value
else if (specifier.type === 'ImportNamespaceSpecifier') return '*'
return 'default'
}

/**
* Copied from https://github.com/babel/babel/blob/main/packages/babel-types/src/validators/isReferenced.ts
* To avoid runtime dependency on @babel/types (which includes process references)
Expand Down