Skip to content

Commit 64e1c27

Browse files
dsherretdsherret
authored
refactor: rename EsmModule-like names to EsModule (#368)
1 parent 5e579bb commit 64e1c27

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+104
-107
lines changed

‎src/graph.rs

+10-10
Original file line numberDiff line numberDiff line change
@@ -693,7 +693,7 @@ pub struct WorkspaceMember {
693693
#[serde(rename_all = "camelCase")]
694694
#[serde(tag = "kind")]
695695
pub enum Module {
696-
Esm(EsmModule),
696+
Esm(EsModule),
697697
// todo(#239): remove this when updating the --json output for 2.0
698698
#[serde(rename = "asserted")]
699699
Json(JsonModule),
@@ -721,7 +721,7 @@ impl Module {
721721
}
722722
}
723723

724-
pub fn esm(&self) -> Option<&EsmModule> {
724+
pub fn esm(&self) -> Option<&EsModule> {
725725
if let Module::Esm(module) = &self {
726726
Some(module)
727727
} else {
@@ -817,7 +817,7 @@ pub struct FastCheckTypeModule {
817817

818818
#[derive(Debug, Clone, Serialize)]
819819
#[serde(rename_all = "camelCase")]
820-
pub struct EsmModule {
820+
pub struct EsModule {
821821
#[serde(
822822
skip_serializing_if = "IndexMap::is_empty",
823823
serialize_with = "serialize_dependencies"
@@ -836,7 +836,7 @@ pub struct EsmModule {
836836
pub fast_check: Option<FastCheckTypeModuleSlot>,
837837
}
838838

839-
impl EsmModule {
839+
impl EsModule {
840840
fn new(specifier: ModuleSpecifier, source: Arc<str>) -> Self {
841841
Self {
842842
dependencies: Default::default(),
@@ -1201,7 +1201,7 @@ impl<'a> ModuleGraphErrorIterator<'a> {
12011201

12021202
fn check_resolution(
12031203
&self,
1204-
module: &EsmModule,
1204+
module: &EsModule,
12051205
mode: ResolutionMode,
12061206
specifier_text: &str,
12071207
resolution: &Resolution,
@@ -1877,7 +1877,7 @@ pub(crate) fn parse_module(
18771877
match module_analyzer.analyze(specifier, content.clone(), media_type) {
18781878
Ok(module_info) => {
18791879
// Return the module as a valid module
1880-
Ok(Module::Esm(parse_esm_module_from_module_info(
1880+
Ok(Module::Esm(parse_es_module_from_module_info(
18811881
graph_kind,
18821882
specifier,
18831883
media_type,
@@ -1902,7 +1902,7 @@ pub(crate) fn parse_module(
19021902
) {
19031903
Ok(module_info) => {
19041904
// Return the module as a valid module
1905-
Ok(Module::Esm(parse_esm_module_from_module_info(
1905+
Ok(Module::Esm(parse_es_module_from_module_info(
19061906
graph_kind,
19071907
specifier,
19081908
media_type,
@@ -1928,7 +1928,7 @@ pub(crate) fn parse_module(
19281928
}
19291929

19301930
#[allow(clippy::too_many_arguments)]
1931-
pub(crate) fn parse_esm_module_from_module_info(
1931+
pub(crate) fn parse_es_module_from_module_info(
19321932
graph_kind: GraphKind,
19331933
specifier: &ModuleSpecifier,
19341934
media_type: MediaType,
@@ -1938,8 +1938,8 @@ pub(crate) fn parse_esm_module_from_module_info(
19381938
file_system: &dyn FileSystem,
19391939
maybe_resolver: Option<&dyn Resolver>,
19401940
maybe_npm_resolver: Option<&dyn NpmResolver>,
1941-
) -> EsmModule {
1942-
let mut module = EsmModule::new(specifier.clone(), source);
1941+
) -> EsModule {
1942+
let mut module = EsModule::new(specifier.clone(), source);
19431943
module.media_type = media_type;
19441944

19451945
// Analyze the TypeScript triple-slash references

‎src/lib.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ pub use graph::BuildDiagnostic;
5050
pub use graph::BuildOptions;
5151
pub use graph::Dependency;
5252
pub use graph::DiagnosticRange;
53-
pub use graph::EsmModule;
53+
pub use graph::EsModule;
5454
pub use graph::ExternalModule;
5555
pub use graph::FastCheckTypeModule;
5656
pub use graph::FastCheckTypeModuleSlot;
@@ -136,8 +136,8 @@ pub struct ParseModuleFromAstOptions<'a> {
136136
}
137137

138138
/// Parse an individual module from an AST, returning the module.
139-
pub fn parse_module_from_ast(options: ParseModuleFromAstOptions) -> EsmModule {
140-
graph::parse_esm_module_from_module_info(
139+
pub fn parse_module_from_ast(options: ParseModuleFromAstOptions) -> EsModule {
140+
graph::parse_es_module_from_module_info(
141141
options.graph_kind,
142142
options.specifier,
143143
options.parsed_source.media_type(),

‎src/symbols/analyzer.rs

+15-18
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ use deno_ast::SourceTextInfo;
1717
use indexmap::IndexMap;
1818
use indexmap::IndexSet;
1919

20-
use crate::EsmModule;
20+
use crate::EsModule;
2121
use crate::JsonModule;
2222
use crate::ModuleGraph;
2323
use crate::ModuleParser;
@@ -83,7 +83,7 @@ impl<'a> RootSymbol<'a> {
8383
};
8484

8585
match graph_module {
86-
crate::Module::Esm(esm_module) => self.analyze_esm_module(esm_module),
86+
crate::Module::Esm(es_module) => self.analyze_es_module(es_module),
8787
crate::Module::Json(json_module) => {
8888
Some(self.analyze_json_module(json_module))
8989
}
@@ -151,14 +151,11 @@ impl<'a> RootSymbol<'a> {
151151
)
152152
}
153153

154-
fn analyze_esm_module(
155-
&self,
156-
esm_module: &EsmModule,
157-
) -> Option<ModuleInfoRef> {
158-
let Ok(source) = self.parsed_source(esm_module) else {
154+
fn analyze_es_module(&self, es_module: &EsModule) -> Option<ModuleInfoRef> {
155+
let Ok(source) = self.parsed_source(es_module) else {
159156
return None;
160157
};
161-
let specifier = &esm_module.specifier;
158+
let specifier = &es_module.specifier;
162159
let module = source.module();
163160

164161
let module_id = ModuleId(self.ids_to_modules.len() as u32);
@@ -168,7 +165,7 @@ impl<'a> RootSymbol<'a> {
168165
builder: &builder,
169166
};
170167
filler.fill(module);
171-
let module_symbol = EsmModuleInfo {
168+
let module_symbol = EsModuleInfo {
172169
specifier: specifier.clone(),
173170
module_id,
174171
source: source.clone(),
@@ -243,7 +240,7 @@ impl<'a> RootSymbol<'a> {
243240

244241
fn parsed_source(
245242
&self,
246-
graph_module: &EsmModule,
243+
graph_module: &EsModule,
247244
) -> Result<ParsedSource, deno_ast::Diagnostic> {
248245
self.parser.parse_module(ParseOptions {
249246
specifier: &graph_module.specifier,
@@ -1207,7 +1204,7 @@ impl UniqueSymbolId {
12071204
#[derive(Debug, Clone, Copy)]
12081205
pub enum ModuleInfoRef<'a> {
12091206
Json(&'a JsonModuleInfo),
1210-
Esm(&'a EsmModuleInfo),
1207+
Esm(&'a EsModuleInfo),
12111208
}
12121209

12131210
impl<'a> ModuleInfoRef<'a> {
@@ -1218,7 +1215,7 @@ impl<'a> ModuleInfoRef<'a> {
12181215
}
12191216
}
12201217

1221-
pub fn esm(&self) -> Option<&'a EsmModuleInfo> {
1218+
pub fn esm(&self) -> Option<&'a EsModuleInfo> {
12221219
match self {
12231220
Self::Json(_) => None,
12241221
Self::Esm(esm) => Some(esm),
@@ -1345,7 +1342,7 @@ impl<'a> ModuleInfoRef<'a> {
13451342
#[derive(Debug, Clone)]
13461343
pub enum ModuleInfo {
13471344
Json(Box<JsonModuleInfo>),
1348-
Esm(EsmModuleInfo),
1345+
Esm(EsModuleInfo),
13491346
}
13501347

13511348
impl ModuleInfo {
@@ -1356,7 +1353,7 @@ impl ModuleInfo {
13561353
}
13571354
}
13581355

1359-
pub fn esm(&self) -> Option<&EsmModuleInfo> {
1356+
pub fn esm(&self) -> Option<&EsModuleInfo> {
13601357
match self {
13611358
Self::Json(_) => None,
13621359
Self::Esm(esm) => Some(esm),
@@ -1440,7 +1437,7 @@ impl JsonModuleInfo {
14401437
}
14411438

14421439
#[derive(Clone)]
1443-
pub struct EsmModuleInfo {
1440+
pub struct EsModuleInfo {
14441441
module_id: ModuleId,
14451442
specifier: ModuleSpecifier,
14461443
source: ParsedSource,
@@ -1451,9 +1448,9 @@ pub struct EsmModuleInfo {
14511448
symbols: IndexMap<SymbolId, Symbol>,
14521449
}
14531450

1454-
impl std::fmt::Debug for EsmModuleInfo {
1451+
impl std::fmt::Debug for EsModuleInfo {
14551452
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
1456-
f.debug_struct("EsmModuleInfo")
1453+
f.debug_struct("EsModuleInfo")
14571454
.field("module_id", &self.module_id)
14581455
.field("specifier", &self.specifier.as_str())
14591456
.field(
@@ -1470,7 +1467,7 @@ impl std::fmt::Debug for EsmModuleInfo {
14701467
}
14711468
}
14721469

1473-
impl EsmModuleInfo {
1470+
impl EsModuleInfo {
14741471
pub fn as_ref(&self) -> ModuleInfoRef {
14751472
ModuleInfoRef::Esm(self)
14761473
}

‎src/symbols/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
22

3-
pub use self::analyzer::EsmModuleInfo;
3+
pub use self::analyzer::EsModuleInfo;
44
pub use self::analyzer::ExportDeclRef;
55
pub use self::analyzer::FileDep;
66
pub use self::analyzer::FileDepName;

‎tests/specs/symbols/Basic.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export default class C {
2727
export type D = typeof C;
2828

2929
# output
30-
file:///a.ts: EsmModuleInfo {
30+
file:///a.ts: EsModuleInfo {
3131
module_id: ModuleId(
3232
1,
3333
),
@@ -386,7 +386,7 @@ file:///a.ts: EsmModuleInfo {
386386
6:102..115 [Id(("AInner", #2))]
387387
9:173..198 [Id(("C", #2))]
388388

389-
file:///mod.ts: EsmModuleInfo {
389+
file:///mod.ts: EsModuleInfo {
390390
module_id: ModuleId(
391391
0,
392392
),

‎tests/specs/symbols/ClassPrivateCtorParamProps.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class PublicClass {}
1212
class PrivateClass {}
1313

1414
# output
15-
file:///mod.ts: EsmModuleInfo {
15+
file:///mod.ts: EsModuleInfo {
1616
module_id: ModuleId(
1717
0,
1818
),

‎tests/specs/symbols/Classes01.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class ClassWithIndexSignatures {
6060
}
6161

6262
# output
63-
file:///mod.ts: EsmModuleInfo {
63+
file:///mod.ts: EsModuleInfo {
6464
module_id: ModuleId(
6565
0,
6666
),

‎tests/specs/symbols/DeclarationMerging01.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ namespace Test {
2525
export { Album, Color, Test };
2626

2727
# output
28-
file:///mod.ts: EsmModuleInfo {
28+
file:///mod.ts: EsModuleInfo {
2929
module_id: ModuleId(
3030
0,
3131
),

‎tests/specs/symbols/ExportAssignment01.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ function test() {
66
export = test;
77

88
# output
9-
file:///mod.ts: EsmModuleInfo {
9+
file:///mod.ts: EsModuleInfo {
1010
module_id: ModuleId(
1111
0,
1212
),

‎tests/specs/symbols/ExportDefault01.txt

+5-5
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ export default function Test() {
4141
}
4242

4343
# output
44-
file:///a.ts: EsmModuleInfo {
44+
file:///a.ts: EsModuleInfo {
4545
module_id: ModuleId(
4646
1,
4747
),
@@ -460,7 +460,7 @@ file:///a.ts: EsmModuleInfo {
460460
5:172..180 [Id(("A", #2))]
461461
8:213..218 [Id(("B", #2))]
462462

463-
file:///class.ts: EsmModuleInfo {
463+
file:///class.ts: EsModuleInfo {
464464
module_id: ModuleId(
465465
2,
466466
),
@@ -537,7 +537,7 @@ file:///class.ts: EsmModuleInfo {
537537
},
538538
},
539539
}
540-
file:///function.ts: EsmModuleInfo {
540+
file:///function.ts: EsModuleInfo {
541541
module_id: ModuleId(
542542
3,
543543
),
@@ -614,7 +614,7 @@ file:///function.ts: EsmModuleInfo {
614614
},
615615
},
616616
}
617-
file:///interface.ts: EsmModuleInfo {
617+
file:///interface.ts: EsModuleInfo {
618618
module_id: ModuleId(
619619
4,
620620
),
@@ -691,7 +691,7 @@ file:///interface.ts: EsmModuleInfo {
691691
},
692692
},
693693
}
694-
file:///mod.ts: EsmModuleInfo {
694+
file:///mod.ts: EsModuleInfo {
695695
module_id: ModuleId(
696696
0,
697697
),

‎tests/specs/symbols/ExportDefault02.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
export default Test; class Test {}
33

44
# output
5-
file:///mod.ts: EsmModuleInfo {
5+
file:///mod.ts: EsModuleInfo {
66
module_id: ModuleId(
77
0,
88
),

‎tests/specs/symbols/ExportDefault03.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export class B {}
1313
export class B1 {}
1414

1515
# output
16-
file:///a.ts: EsmModuleInfo {
16+
file:///a.ts: EsModuleInfo {
1717
module_id: ModuleId(
1818
1,
1919
),
@@ -122,7 +122,7 @@ file:///a.ts: EsmModuleInfo {
122122
},
123123
},
124124
}
125-
file:///b.ts: EsmModuleInfo {
125+
file:///b.ts: EsModuleInfo {
126126
module_id: ModuleId(
127127
2,
128128
),
@@ -235,7 +235,7 @@ file:///b.ts: EsmModuleInfo {
235235
},
236236
},
237237
}
238-
file:///mod.ts: EsmModuleInfo {
238+
file:///mod.ts: EsModuleInfo {
239239
module_id: ModuleId(
240240
0,
241241
),

‎tests/specs/symbols/ExportDefault04.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
export default 1 + 1;
33

44
# output
5-
file:///mod.ts: EsmModuleInfo {
5+
file:///mod.ts: EsModuleInfo {
66
module_id: ModuleId(
77
0,
88
),

‎tests/specs/symbols/ExportDefaultLiteral01.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
export default 1;
33

44
# output
5-
file:///mod.ts: EsmModuleInfo {
5+
file:///mod.ts: EsModuleInfo {
66
module_id: ModuleId(
77
0,
88
),

‎tests/specs/symbols/ExportDefaultLiteral02.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
export default "test";
33

44
# output
5-
file:///mod.ts: EsmModuleInfo {
5+
file:///mod.ts: EsModuleInfo {
66
module_id: ModuleId(
77
0,
88
),

0 commit comments

Comments
 (0)