8000 fix(ast/estree): remove `TSImportTypeOptions` custom serializer by overlookmotel · Pull Request #10873 · oxc-project/oxc · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

fix(ast/estree): remove TSImportTypeOptions custom serializer #10873

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
merged 1 commit into from
May 7, 2025
Merged

fix(ast/estree): remove TSImportTypeOptions custom serializer #10873

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 t 8000 o file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion crates/oxc_ast/src/ast/ts.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1343,7 +1343,6 @@ pub enum TSTypeQueryExprName<'a> {
pub struct TSImportType<'a> {
pub span: Span,
pub argument: TSType<'a>,
#[estree(via = TSImportTypeOptions)]
pub options: Option<Box<'a, ObjectExpression<'a>>>,
pub qualifier: Option<TSTypeName<'a>>,
pub type_arguments: Option<Box<'a, TSTypeParameterInstantiation<'a>>>,
Expand Down
2 changes: 1 addition & 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 @@ -3124,7 +3124,7 @@ impl ESTree for TSImportType<'_> {
state.serialize_field("start", &self.span.start);
state.serialize_field("end", &self.span.end);
state.serialize_field("argument", &self.argument);
state.serialize_field("options", &crate::serialize::TSImportTypeOptions(self));
state.serialize_field("options", &self.options);
state.serialize_field("qualifier", &self.qualifier);
state.serialize_field("typeArguments", &self.type_arguments);
state.end();
Expand Down
77 changes: 0 additions & 77 deletions crates/oxc_ast/src/serialize.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1413,83 +1413,6 @@ impl ESTree for TSTypeNameAsMemberExpression<'_, '_> {
}
}

/// Serializer for `options` field of `TSImportType`.
///
/// TS-ESLint parser replaces a property of `options` called `assert` with one called `with`.
/// <https://github.com/typescript-eslint/typescript-eslint/issues/11114>
#[ast_meta]
#[estree(
ts_type = "ObjectExpression | null",
raw_deser = "
let options = DESER[Option<Box<ObjectExpression>>](POS_OFFSET.options);
if (options !== null && options.properties.length === 1) {
const prop = options.properties[0];
if (
!prop.method && !prop.shorthand && !prop.computed
&& prop.key.type === 'Identifier' && prop.key.name === 'assert'
) {
prop.key.name = 'with';
}
}
options
"
)]
pub struct TSImportTypeOptions<'a, 'b>(pub &'b TSImportType<'a>);

impl ESTree for TSImportTypeOptions<'_, '_> {
fn serialize<S: Serializer>(&self, serializer: S) {
let Some(options) = &self.0.options else {
Null(()).serialize(serializer);
return;
};

if options.properties.len() == 1 {
if let ObjectPropertyKind::ObjectProperty(prop) = &options.properties[0] {
if let PropertyKey::StaticIdentifier(ident) = &prop.key {
if !prop.method && !prop.shorthand && !prop.computed && ident.name == "assert" {
let assert_prop = TSImportTypeAssertProperty { prop, key_span: ident.span };

let mut state = serializer.serialize_struct();
state.serialize_field("type", &JsonSafeString("ObjectExpression"));
state.serialize_field("start", &options.span.start);
state.serialize_field("end", &options.span.end);
state.serialize_field("properties", &[assert_prop]);
state.end();
return;
}
}
}
}

options.serialize(serializer);
}
}

struct TSImportTypeAssertProperty<'a, 'b> {
prop: &'b ObjectProperty<'a>,
key_span: Span,
}

impl ESTree for TSImportTypeAssertProperty<'_, '_> {
fn serialize<S: Serializer>(&self, serializer: S) {
let mut state = serializer.serialize_struct();
state.serialize_field("type", &JsonSafeString("Property"));
state.serialize_field("start", &self.prop.span.start);
state.serialize_field("end", &self.prop.span.end);
state.serialize_field("method", &false);
state.serialize_field("shorthand", &false);
state.serialize_field("computed", &false);
state.serialize_field(
"key",
&IdentifierName { span: self.key_span, name: Atom::from("with") },
);
state.serialize_field("value", &self.prop.value);
state.serialize_field("kind", "init");
state.serialize_field("optional", &false);
state.end();
}
}

/// Serializer for `params` field of `TSCallSignatureDeclaration`.
///
/// These add `this_param` to start of the `params` array.
Expand Down
12 changes: 1 addition & 11 deletions napi/parser/generated/deserialize/js.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1859,22 +1859,12 @@ function deserializeTSTypeQuery(pos) {
}

function deserializeTSImportType(pos) {
let options = deserializeOptionBoxObjectExpression(pos + 24);
if (options !== null && options.properties.length === 1) {
const prop = options.properties[0];
if (
!prop.method && !prop.shorthand && !prop.computed &&
prop.key.type === 'Identifier' && prop.key.name === 'assert'
) {
prop.key.name = 'with';
}
}
return {
type: 'TSImportType',
start: deserializeU32(pos),
end: deserializeU32(pos + 4),
argument: deserializeTSType(pos + 8),
options,
options: deserializeOptionBoxObjectExpression(pos + 24),
qualifier: deserializeOptionTSTypeName(pos + 32),
typeArguments: deserializeOptionBoxTSTypeParameterInstantiation(pos + 48),
};
Expand Down
12 changes: 1 addition & 11 deletions napi/parser/generated/deserialize/ts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2011,22 +2011,12 @@ function deserializeTSTypeQuery(pos) {
}

function deserializeTSImportType(pos) {
let options = deserializeOptionBoxObjectExpression(pos + 24);
if (options !== null && options.properties.length === 1) {
const prop = options.properties[0];
if (
!prop.method && !prop.shorthand && !prop.computed &&
prop.key.type === 'Identifier' && prop.key.name === 'assert'
) {
prop.key.name = 'with';
}
}
return {
type: 'TSImportType',
start: deserializeU32(pos),
end: deserializeU32(pos + 4),
argument: deserializeTSType(pos + 8),
options,
options: deserializeOptionBoxObjectExpression(pos + 24),
qualifier: deserializeOptionTSTypeName(pos + 32),
typeArguments: deserializeOptionBoxTSTypeParameterInstantiation(pos + 48),
};
Expand Down
6 changes: 1 addition & 5 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 : 6481/6481 (100.00%)
Positive Passed: 6314/6481 (97.42%)
Positive Passed: 6316/6481 (97.45%)
Mismatch: tasks/coverage/typescript/tests/cases/compiler/callOfConditionalTypeWithConcreteBranches.ts

Mismatch: tasks/coverage/typescript/tests/cases/compiler/circularConstrainedMappedTypeNoCrash.ts
Expand Down Expand Up @@ -291,10 +291,6 @@ Mismatch: tasks/coverage/typescript/tests/cases/conformance/jsx/tsxReactEmitEnti

Mismatch: tasks/coverage/typescript/tests/cases/conformance/jsx/tsxReactEmitNesting.tsx

Mismatch: tasks/coverage/typescript/tests/cases/conformance/moduleResolution/resolutionModeImportType1.ts

Mismatch: tasks/coverage/typescript/tests/cases/conformance/node/nodeModulesImportTypeModeDeclarationEmit1.ts

Mismatch: tasks/coverage/typescript/tests/cases/conformance/salsa/inferingFromAny.ts

Mismatch: tasks/coverage/typescript/tests/cases/conformance/types/conditional/inferTypes2.ts
Expand Down
Loading
0