Skip to content
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,8 @@ fn test() {
"import Default, { mod } from 'mod'",
"import { Named } from 'mod'",
"import type { Named } from 'mod'",
"import type Default, { Named } from 'mod'",
// "import type Default, { Named } from 'mod'", ts error 1363
"import type Default from 'mod'",
"import type * as Namespace from 'mod'",
"import * as Namespace from 'mod'",
r#"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ fn test() {
"import { type T, U } from 'mod';",
"import { T, type U } from 'mod';",
"import type T from 'mod';",
"import type T, { U } from 'mod';",
// "import type T, { U } from 'mod';", ts error 1363
"import T, { type U } from 'mod';",
"import type * as T from 'mod';",
"import 'mod';",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ fn test() {
r#"import {foo} from "foo""#,
r#"import foo,{bar} from "foo""#,
r#"import type foo from "foo""#,
r#"import type foo,{bar} from "foo""#,
// r#"import type foo,{bar} from "foo""#, ts error 1363
r#"import foo,{type bar} from "foo""#,
"const foo = 1;
export {foo};",
Expand Down
10 changes: 10 additions & 0 deletions crates/oxc_parser/src/diagnostics.rs
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,16 @@ pub fn implements_clause_already_seen(span: Span, seen_span: Span) -> OxcDiagnos
.with_help("Merge the two 'implements' clauses into one by a ','")
}

// A type-only import can specify a default import or named bindings, but not both. ts(1363)
#[cold]
pub fn type_only_import_default_and_named(specifier_span: Span) -> OxcDiagnostic {
ts_error(
"1363",
"A type-only import can specify a default import or named bindings, but not both.",
)
.with_label(specifier_span)
}

#[cold]
pub fn binding_rest_element_last(span: Span) -> OxcDiagnostic {
OxcDiagnostic::error("A rest element must be last in a destructuring pattern").with_label(span)
Expand Down
11 changes: 0 additions & 11 deletions crates/oxc_parser/src/js/module.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1274,17 +1274,6 @@ mod test {
assert_eq!(specifiers[0].name(), "defer");
});

let src = "import type foo, { bar } from 'bar';";
parse_and_assert_import_declarations(src, |declarations| {
assert_eq!(declarations.len(), 1);
let decl = declarations[0];
assert_eq!(decl.import_kind, ImportOrExportKind::Type);
let specifiers = decl.specifiers.as_ref().unwrap();
assert_eq!(specifiers.len(), 2);
assert_eq!(specifiers[0].name(), "foo");
assert_eq!(specifiers[1].name(), "bar");
});

let src = "import foo = bar";
parse_and_assert_statements(src, |statements| {
if let Statement::TSImportEqualsDeclaration(decl) = statements[0] {
Expand Down
84 changes: 60 additions & 24 deletions crates/oxc_parser/src/module_record.rs
Original file line number Diff line number Diff line change
Expand Up @@ -37,35 +37,71 @@ impl<'a> ModuleRecordBuilder<'a> {
pub fn errors(&self) -> std::vec::Vec<OxcDiagnostic> {
let mut errors = vec![];

let module_record = &self.module_record;

// Skip checking for exports in TypeScript
if self.source_type.is_typescript() {
return errors;
}

let module_record = &self.module_record;
// TS1363: A type-only import can specify a default import or named bindings, but not both.
// Group import entries by statement and check only those statements that are type-only imports.
if !module_record.import_entries.is_empty() {
// Build map of type-only import statement spans -> (has_default, has_named).
// `requested_modules` contains entries for both imports and exports, so filter is_import && is_type.
let mut seen: rustc_hash::FxHashMap<Span, (bool, bool)> =
rustc_hash::FxHashMap::default();
for requests in module_record.requested_modules.values() {
for req in requests {
if req.is_import && req.is_type {
seen.entry(req.statement_span).or_insert((false, false));
}
}
}
if !seen.is_empty() {
for entry in &module_record.import_entries {
if let Some(lookup) = seen.get_mut(&entry.statement_span) {
match &entry.import_name {
ImportImportName::Default(_) => lookup.0 = true,
ImportImportName::Name(_) | ImportImportName::NamespaceObject => {
lookup.1 = true;
}
}
}
}
for (stmt_span, (has_default, has_named)) in seen {
if has_default && has_named {
errors.push(diagnostics::type_only_import_default_and_named(stmt_span));
}
}
}
}
} else {
// It is a Syntax Error if the ExportedNames of ModuleItemList contains any duplicate entries.
for name_span in &self.exported_bindings_duplicated {
let old_span = module_record.exported_bindings[&name_span.name];
errors.push(diagnostics::duplicate_export(
&name_span.name,
name_span.span,
old_span,
));
}

// It is a Syntax Error if the ExportedNames of ModuleItemList contains any duplicate entries.
for name_span in &self.exported_bindings_duplicated {
let old_span = module_record.exported_bindings[&name_span.name];
errors.push(diagnostics::duplicate_export(&name_span.name, name_span.span, old_span));
// Multiple default exports
// `export default foo`
// `export { default }`
let default_exports = module_record
.local_export_entries
.iter()
.filter_map(|export_entry| export_entry.export_name.default_export_span())
.chain(
module_record
.indirect_export_entries
.iter()
.filter_map(|export_entry| export_entry.export_name.default_export_span()),
);
if default_exports.clone().count() > 1 {
errors.push(diagnostics::duplicate_default_export(default_exports));
}
}

// Multiple default exports
// `export default foo`
// `export { default }`
let default_exports = module_record
.local_export_entries
.iter()
.filter_map(|export_entry| export_entry.export_name.default_export_span())
.chain(
module_record
.indirect_export_entries
.iter()
.filter_map(|export_entry| export_entry.export_name.default_export_span()),
);
if default_exports.clone().count() > 1 {
errors.push(diagnostics::duplicate_default_export(default_exports));
}
errors
}

Expand Down
10 changes: 7 additions & 3 deletions tasks/coverage/snapshots/parser_babel.snap
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ commit: 761c2509
parser_babel Summary:
AST Parsed : 2223/2235 (99.46%)
Positive Passed: 2203/2235 (98.57%)
Negative Passed: 1646/1696 (97.05%)
Negative Passed: 1647/1696 (97.11%)
Expect Syntax Error: tasks/coverage/babel/packages/babel-parser/test/fixtures/es2022/private-in/invalid-private-followed-by-in-2/input.js

Expect Syntax Error: tasks/coverage/babel/packages/babel-parser/test/fixtures/es2026/async-explicit-resource-management/invalid-script-top-level-using-binding/input.js
Expand Down Expand Up @@ -90,8 +90,6 @@ Expect Syntax Error: tasks/coverage/babel/packages/babel-parser/test/fixtures/ty

Expect Syntax Error: tasks/coverage/babel/packages/babel-parser/test/fixtures/typescript/types/const-type-parameters-invalid/input.ts

Expect Syntax Error: tasks/coverage/babel/packages/babel-parser/test/fixtures/typescript/types/import-type-declaration-error/input.ts

Expect Syntax Error: tasks/coverage/babel/packages/babel-parser/test/fixtures/typescript/types/invalid-import-type-options-escaped-with/input.ts

Expect Syntax Error: tasks/coverage/babel/packages/babel-parser/test/fixtures/typescript/types/invalid-import-type-options-string-with/input.ts
Expand Down Expand Up @@ -14290,6 +14288,12 @@ Expect to Parse: tasks/coverage/babel/packages/babel-parser/test/fixtures/typesc
· ─────
╰────

× TS(1363): A type-only import can specify a default import or named bindings, but not both.
╭─[babel/packages/babel-parser/test/fixtures/typescript/types/import-type-declaration-error/input.ts:1:1]
1 │ import type FooDefault, { Bar, Baz } from "module";
· ───────────────────────────────────────────────────
╰────

× TS(1141): String literal expected.
╭─[babel/packages/babel-parser/test/fixtures/typescript/types/import-type-dynamic-errors/input.ts:1:17]
1 │ type X = import(3);
Expand Down
10 changes: 4 additions & 6 deletions tasks/coverage/snapshots/parser_typescript.snap
Original file line number Diff line number Diff line change
Expand Up @@ -19906,12 +19906,10 @@ Expect to Parse: tasks/coverage/typescript/tests/cases/conformance/parser/ecmasc
· ╰── Opened here
╰────

× Expected `from` but found `Identifier`
╭─[typescript/tests/cases/conformance/externalModules/typeOnly/grammarErrors.ts:1:13]
1 │ import type A from './a';
· ┬
· ╰── `from` expected
2 │ export type { A };
× TS(1363): A type-only import can specify a default import or named bindings, but not both.
╭─[typescript/tests/cases/conformance/externalModules/typeOnly/grammarErrors.ts:1:1]
1 │ import type A, { B, C } from './a';
· ───────────────────────────────────
╰────

× Expected `,` or `}` but found `as`
Expand Down
2 changes: 1 addition & 1 deletion tasks/track_memory_allocations/allocs_parser.snap
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ File | File size || Sys allocs | Sys reallocs |
-------------------------------------------------------------------------------------------------------------------------------------------
checker.ts | 2.92 MB || 9672 | 21 || 267681 | 22847

cal.com.tsx | 1.06 MB || 1083 | 49 || 138162 | 13699
cal.com.tsx | 1.06 MB || 1091 | 49 || 138162 | 13699

RadixUIAdoptionSection.jsx | 2.52 kB || 1 | 0 || 365 | 66

Expand Down
Loading