Skip to content

fix(ast/estree): Fix TSImportType #10200

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

Merged
overlookmotel merged 1 commit into from
Apr 3, 2025
Merged

fix(ast/estree): Fix TSImportType #10200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions crates/oxc_ast/src/ast/ts.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1302,6 +1302,7 @@ pub struct TSImportType<'a> {
pub qualifier: Option<TSTypeName<'a>>,
pub type_arguments: Option<Box<'a, TSTypeParameterInstantiation<'a>>>,
/// `true` for `typeof import("foo")`
#[estree(skip)]
pub is_type_of: bool,
}

Expand Down
1 change: 0 additions & 1 deletion crates/oxc_ast/src/generated/derive_estree.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3117,7 +3117,6 @@ impl ESTree for TSImportType<'_> {
state.serialize_field("options", &self.options);
state.serialize_field("qualifier", &self.qualifier);
state.serialize_field("typeArguments", &self.type_arguments);
state.serialize_field("isTypeOf", &self.is_type_of);
state.end();
}
}
Expand Down
1 change: 0 additions & 1 deletion napi/parser/deserialize-js.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1810,7 +1810,6 @@ function deserializeTSImportType(pos) {
options: deserializeOptionBoxObjectExpression(pos + 24),
qualifier: deserializeOptionTSTypeName(pos + 32),
typeArguments: deserializeOptionBoxTSTypeParameterInstantiation(pos + 48),
isTypeOf: deserializeBool(pos + 56),
};
}

Expand Down
1 change: 0 additions & 1 deletion napi/parser/deserialize-ts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1885,7 +1885,6 @@ function deserializeTSImportType(pos) {
options: deserializeOptionBoxObjectExpression(pos + 24),
qualifier: deserializeOptionTSTypeName(pos + 32),
typeArguments: deserializeOptionBoxTSTypeParameterInstantiation(pos + 48),
isTypeOf: deserializeBool(pos + 56),
};
}

Expand Down
1 change: 0 additions & 1 deletion npm/oxc-types/types.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1321,7 +1321,6 @@ export interface TSImportType extends Span {
options: ObjectExpression | null;
qualifier: TSTypeName | null;
typeArguments: TSTypeParameterInstantiation | null;
isTypeOf: boolean;
}

export interface TSFunctionType extends Span {
Expand Down
17 changes: 1 addition & 16 deletions tasks/coverage/snapshots/estree_typescript.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ commit: 15392346

estree_typescript Summary:
AST Parsed : 10618/10725 (99.00%)
Positive Passed: 7072/10725 (65.94%)
Positive Passed: 7087/10725 (66.08%)
Mismatch: tasks/coverage/typescript/tests/cases/compiler/APISample_compile.ts
Mismatch: tasks/coverage/typescript/tests/cases/compiler/APISample_linter.ts
Mismatch: tasks/coverage/typescript/tests/cases/compiler/APISample_parseConfig.ts
Expand Down Expand Up @@ -548,7 +548,6 @@ Mismatch: tasks/coverage/typescript/tests/cases/compiler/declarationEmitStringEn
Mismatch: tasks/coverage/typescript/tests/cases/compiler/declarationEmitSymlinkPaths.ts
Mismatch: tasks/coverage/typescript/tests/cases/compiler/declarationEmitTopLevelNodeFromCrossFile2.ts
Mismatch: tasks/coverage/typescript/tests/cases/compiler/declarationEmitTransitiveImportOfHtmlDeclarationItem.ts
Mismatch: tasks/coverage/typescript/tests/cases/compiler/declarationEmitTripleSlashReferenceAmbientModule.ts
Mismatch: tasks/coverage/typescript/tests/cases/compiler/declarationEmitTypeAliasTypeParameterExtendingUnknownSymbol.ts
Mismatch: tasks/coverage/typescript/tests/cases/compiler/declarationEmitTypeAliasWithTypeParameters1.ts
Mismatch: tasks/coverage/typescript/tests/cases/compiler/declarationEmitTypeAliasWithTypeParameters2.ts
Expand All @@ -567,18 +566,15 @@ Unexpected estree file content error: 2 != 3
tasks/coverage/typescript/tests/cases/compiler/declarationEmitUsingAlternativeContainingModules2.ts
Unexpected estree file content error: 2 != 3

Mismatch: tasks/coverage/typescript/tests/cases/compiler/declarationEmitUsingTypeAlias1.ts
Mismatch: tasks/coverage/typescript/tests/cases/compiler/declarationEmitUsingTypeAlias2.ts
Mismatch: tasks/coverage/typescript/tests/cases/compiler/declarationEmitVarInElidedBlock.ts
Mismatch: tasks/coverage/typescript/tests/cases/compiler/declarationEmitWithInvalidPackageJsonTypings.ts
Mismatch: tasks/coverage/typescript/tests/cases/compiler/declarationFileNoCrashOnExtraExportModifier.ts
Mismatch: tasks/coverage/typescript/tests/cases/compiler/declarationImportTypeAliasInferredAndEmittable.ts
Mismatch: tasks/coverage/typescript/tests/cases/compiler/declarationMaps.ts
Mismatch: tasks/coverage/typescript/tests/cases/compiler/declarationMapsWithoutDeclaration.ts
Mismatch: tasks/coverage/typescript/tests/cases/compiler/declarationNoDanglingGenerics.ts
Mismatch: tasks/coverage/typescript/tests/cases/compiler/declarationQuotedMembers.ts
Mismatch: tasks/coverage/typescript/tests/cases/compiler/declarationTypecheckNoUseBeforeReferenceCheck.ts
Mismatch: tasks/coverage/typescript/tests/cases/compiler/declarationsForInferredTypeFromOtherFile.ts
Mismatch: tasks/coverage/typescript/tests/cases/compiler/declarationsWithRecursiveInternalTypesProduceUniqueTypeParams.ts
Expect to Parse: tasks/coverage/typescript/tests/cases/compiler/declareAlreadySeen.ts
declare' modifier already seen.
Expand Down Expand Up @@ -1122,7 +1118,6 @@ Unexpected estree file content error: 1 != 2

Mismatch: tasks/coverage/typescript/tests/cases/compiler/importTypeTypeofClassStaticLookup.ts
Mismatch: tasks/coverage/typescript/tests/cases/compiler/importTypeWithUnparenthesizedGenericFunctionParsed.ts
Mismatch: tasks/coverage/typescript/tests/cases/compiler/importUsedAsTypeWithErrors.ts
Mismatch: tasks/coverage/typescript/tests/cases/compiler/importUsedInGenericImportResolves.ts
Mismatch: tasks/coverage/typescript/tests/cases/compiler/importWithTrailingSlash_noResolve.ts
Mismatch: tasks/coverage/typescript/tests/cases/compiler/importedAliasesInTypePositions.ts
Expand Down Expand Up @@ -1659,7 +1654,6 @@ Mismatch: tasks/coverage/typescript/tests/cases/compiler/narrowingRestGenericCal
Mismatch: tasks/coverage/typescript/tests/cases/compiler/narrowingUnionToUnion.ts
Mismatch: tasks/coverage/typescript/tests/cases/compiler/narrowingUnionWithBang.ts
Mismatch: tasks/coverage/typescript/tests/cases/compiler/nestedExcessPropertyChecking.ts
Mismatch: tasks/coverage/typescript/tests/cases/compiler/nestedGenericConditionalTypeWithGenericImportType.ts
Mismatch: tasks/coverage/typescript/tests/cases/compiler/nestedHomomorphicMappedTypesWithArrayConstraint1.ts
Mismatch: tasks/coverage/typescript/tests/cases/compiler/nestedLoops.ts
Mismatch: tasks/coverage/typescript/tests/cases/compiler/nestedObjectRest.ts
Expand Down Expand Up @@ -2221,7 +2215,6 @@ Mismatch: tasks/coverage/typescript/tests/cases/compiler/unionWithIndexSignature
Mismatch: tasks/coverage/typescript/tests/cases/compiler/uniqueSymbolAllowsIndexInObjectWithIndexSignature.ts
Mismatch: tasks/coverage/typescript/tests/cases/compiler/uniqueSymbolAssignmentOnGlobalAugmentationSuceeds.ts
Mismatch: tasks/coverage/typescript/tests/cases/compiler/uniqueSymbolPropertyDeclarationEmit.ts
Mismatch: tasks/coverage/typescript/tests/cases/compiler/unmetTypeConstraintInImportCall.ts
Mismatch: tasks/coverage/typescript/tests/cases/compiler/unreachableDeclarations.ts
Mismatch: tasks/coverage/typescript/tests/cases/compiler/unresolvableSelfReferencingAwaitedUnion.ts
Mismatch: tasks/coverage/typescript/tests/cases/compiler/unspecializedConstraints.ts
Expand Down Expand Up @@ -2392,7 +2385,6 @@ Mismatch: tasks/coverage/typescript/tests/cases/conformance/classes/members/priv
Mismatch: tasks/coverage/typescript/tests/cases/conformance/classes/members/privateNames/privateNameStaticMethodAssignment.ts
Mismatch: tasks/coverage/typescript/tests/cases/conformance/classes/members/privateNames/privateNameStaticMethodCallExpression.ts
Mismatch: tasks/coverage/typescript/tests/cases/conformance/classes/members/privateNames/privateNameUnused.ts
Mismatch: tasks/coverage/typescript/tests/cases/conformance/classes/members/privateNames/privateNamesUnique-2.ts
Mismatch: tasks/coverage/typescript/tests/cases/conformance/classes/members/privateNames/privateWriteOnlyAccessorRead.ts
Mismatch: tasks/coverage/typescript/tests/cases/conformance/classes/mixinClassesAnnotated.ts
Mismatch: tasks/coverage/typescript/tests/cases/conformance/classes/mixinClassesAnonymous.ts
Expand Down Expand Up @@ -3325,7 +3317,6 @@ Cannot use `await` as an identifier in an async context
Expect to Parse: tasks/coverage/typescript/tests/cases/conformance/externalModules/topLevelAwaitNonModule.ts
`await` is only allowed within async functions and at the top levels of modules
Mismatch: tasks/coverage/typescript/tests/cases/conformance/externalModules/topLevelFileModule.ts
Mismatch: tasks/coverage/typescript/tests/cases/conformance/externalModules/typeOnly/allowsImportingTsExtension.ts
Mismatch: tasks/coverage/typescript/tests/cases/conformance/externalModules/typeOnly/enums.ts
tasks/coverage/typescript/tests/cases/conformance/externalModules/typeOnly/grammarErrors.ts
Unexpected estree file content error: 3 != 4
Expand Down Expand Up @@ -3615,7 +3606,6 @@ Mismatch: tasks/coverage/typescript/tests/cases/conformance/jsx/tsxUnionElementT
Mismatch: tasks/coverage/typescript/tests/cases/conformance/jsx/tsxUnionElementType4.tsx
Mismatch: tasks/coverage/typescript/tests/cases/conformance/jsx/tsxUnionElementType5.tsx
Mismatch: tasks/coverage/typescript/tests/cases/conformance/jsx/tsxUnionElementType6.tsx
Mismatch: tasks/coverage/typescript/tests/cases/conformance/moduleResolution/allowImportingTypesDtsExtension.ts
tasks/coverage/typescript/tests/cases/conformance/moduleResolution/bundler/bundlerConditionsExcludesNode.ts
Unexpected estree file content error: 3 != 5

Expand Down Expand Up @@ -3788,7 +3778,6 @@ Mismatch: tasks/coverage/typescript/tests/cases/conformance/node/nodeModulesImpo
tasks/coverage/typescript/tests/cases/conformance/node/nodeModulesImportAttributes.ts
Unexpected estree file content error: 1 != 2

Mismatch: tasks/coverage/typescript/tests/cases/conformance/node/nodeModulesImportAttributesTypeModeDeclarationEmit.ts
Mismatch: tasks/coverage/typescript/tests/cases/conformance/node/nodeModulesImportHelpersCollisions.ts
Mismatch: tasks/coverage/typescript/tests/cases/conformance/node/nodeModulesImportHelpersCollisions2.ts
Mismatch: tasks/coverage/typescript/tests/cases/conformance/node/nodeModulesImportHelpersCollisions3.ts
Expand Down Expand Up @@ -4225,17 +4214,13 @@ Mismatch: tasks/coverage/typescript/tests/cases/conformance/types/contextualType
Mismatch: tasks/coverage/typescript/tests/cases/conformance/types/contextualTypes/jsxAttributes/contextuallyTypedStringLiteralsInJsxAttributes01.tsx
Mismatch: tasks/coverage/typescript/tests/cases/conformance/types/contextualTypes/jsxAttributes/contextuallyTypedStringLiteralsInJsxAttributes02.tsx
Mismatch: tasks/coverage/typescript/tests/cases/conformance/types/import/importTypeAmbient.ts
Mismatch: tasks/coverage/typescript/tests/cases/conformance/types/import/importTypeAmbientMissing.ts
Mismatch: tasks/coverage/typescript/tests/cases/conformance/types/import/importTypeAmdBundleRewrite.ts
Mismatch: tasks/coverage/typescript/tests/cases/conformance/types/import/importTypeGeneric.ts
Mismatch: tasks/coverage/typescript/tests/cases/conformance/types/import/importTypeGenericTypes.ts
tasks/coverage/typescript/tests/cases/conformance/types/import/importTypeInJSDoc.ts
Unexpected estree file content error: 1 != 2

Mismatch: tasks/coverage/typescript/tests/cases/conformance/types/import/importTypeLocal.ts
Mismatch: tasks/coverage/typescript/tests/cases/conformance/types/import/importTypeLocalMissing.ts
Mismatch: tasks/coverage/typescript/tests/cases/conformance/types/import/importTypeNested.ts
Mismatch: tasks/coverage/typescript/tests/cases/conformance/types/import/importTypeNestedNoRef.ts
Mismatch: tasks/coverage/typescript/tests/cases/conformance/types/import/importTypeNonString.ts
Expect to Parse: tasks/coverage/typescript/tests/cases/conformance/types/import/importWithTypeArguments.ts
Expected `from` but found `<`
Expand Down
Loading