Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions packages/compiler-sfc/__tests__/compileScript/resolveType.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1467,6 +1467,26 @@ describe('resolveType', () => {
})
})

test('declare global with indexed access type', () => {
const files = {
'/global.d.ts': `
declare global {
type Options = {
code: {
selected: boolean
}
}
}`,
}
const { props } = resolve(`defineProps<Options["code"]>()`, files, {
globalTypeFiles: Object.keys(files),
})

expect(props).toStrictEqual({
selected: ['Boolean'],
})
})

// #9871
test('shared generics with different args', () => {
const files = {
Expand Down
12 changes: 12 additions & 0 deletions packages/compiler-sfc/src/script/resolveType.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1388,6 +1388,18 @@ function recordType(
case 'TSInterfaceDeclaration':
case 'TSEnumDeclaration':
case 'TSModuleDeclaration': {
// Handle `declare global { ... }` blocks by recursively processing their contents
if (node.type === 'TSModuleDeclaration' && node.global) {
const body = node.body as TSModuleBlock
for (const s of body.body) {
if (s.type === 'ExportNamedDeclaration' && s.declaration) {
recordType(s.declaration, types, declares)
} else {
recordType(s, types, declares)
}
}
break
}
const id = overwriteId || getId(node.id)
let existing = types[id]
if (existing) {
Expand Down
Loading