Skip to content

Commit 3614080

Browse files
authored
fix: Upgrade deno_ast to 0.40.0 and deno_graph 0.80.0 (#607)
1 parent aba1543 commit 3614080

File tree

4 files changed

+37
-53
lines changed

4 files changed

+37
-53
lines changed

Cargo.lock

Lines changed: 24 additions & 24 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ repository = "https://github.com/denoland/deno_doc"
1111
members = ["lib"]
1212

1313
[workspace.dependencies]
14-
deno_graph = { version = "0.79.0", default-features = false, features = ["symbols"] }
14+
deno_graph = { version = "0.80.0", default-features = false, features = ["symbols"] }
15+
deno_ast = { version = "0.40.0" }
1516
import_map = "0.20.0"
1617
serde = { version = "1.0.140", features = ["derive"] }
1718

@@ -26,7 +27,7 @@ required-features = ["html"]
2627
[dependencies]
2728
anyhow = "1.0.58"
2829
cfg-if = "1.0.0"
29-
deno_ast = "0.39.0"
30+
deno_ast.workspace = true
3031
deno_graph.workspace = true
3132
indexmap = "2.0.2"
3233
futures = "0.3.26"

src/interface.rs

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ pub fn get_doc_for_ts_interface_decl(
145145
js_doc: method_js_doc,
146146
location: get_location(parsed_source, ts_getter_sig.start()),
147147
computed: ts_getter_sig.computed,
148-
optional: ts_getter_sig.optional,
148+
optional: false,
149149
params: vec![],
150150
return_type: maybe_return_type,
151151
type_params: vec![],
@@ -169,7 +169,7 @@ pub fn get_doc_for_ts_interface_decl(
169169
js_doc: method_js_doc,
170170
location: get_location(parsed_source, ts_setter_sig.start()),
171171
computed: ts_setter_sig.computed,
172-
optional: ts_setter_sig.optional,
172+
optional: false,
173173
params,
174174
return_type: None,
175175
type_params: vec![],
@@ -183,28 +183,19 @@ pub fn get_doc_for_ts_interface_decl(
183183
{
184184
let name = expr_to_name(&ts_prop_sig.key);
185185

186-
let mut params = vec![];
187-
188-
for param in &ts_prop_sig.params {
189-
let param_def = ts_fn_param_to_param_def(parsed_source, param);
190-
params.push(param_def);
191-
}
192-
193186
let ts_type = ts_prop_sig
194187
.type_ann
195188
.as_deref()
196189
.map(|type_ann| TsTypeDef::new(parsed_source, &type_ann.type_ann));
197190

198-
let type_params = maybe_type_param_decl_to_type_param_defs(
199-
parsed_source,
200-
ts_prop_sig.type_params.as_deref(),
201-
);
191+
let type_params =
192+
maybe_type_param_decl_to_type_param_defs(parsed_source, None);
202193

203194
let prop_def = PropertyDef {
204195
name,
205196
js_doc: prop_js_doc,
206197
location: get_location(parsed_source, ts_prop_sig.start()),
207-
params,
198+
params: vec![],
208199
ts_type,
209200
readonly: ts_prop_sig.readonly,
210201
computed: ts_prop_sig.computed,

src/ts_type.rs

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ impl TsTypeDef {
397397
location: get_location(parsed_source, ts_getter_sig.start()),
398398
params: vec![],
399399
computed: ts_getter_sig.computed,
400-
optional: ts_getter_sig.optional,
400+
optional: false,
401401
return_type: maybe_return_type,
402402
type_params: vec![],
403403
};
@@ -422,7 +422,7 @@ impl TsTypeDef {
422422
location: get_location(parsed_source, ts_setter_sig.start()),
423423
params,
424424
computed: ts_setter_sig.computed,
425-
optional: ts_setter_sig.optional,
425+
optional: false,
426426
return_type: None,
427427
type_params: vec![],
428428
};
@@ -435,26 +435,18 @@ impl TsTypeDef {
435435
{
436436
let name = expr_to_name(&ts_prop_sig.key);
437437

438-
let params = ts_prop_sig
439-
.params
440-
.iter()
441-
.map(|param| ts_fn_param_to_param_def(parsed_source, param))
442-
.collect();
443-
444438
let ts_type = ts_prop_sig
445439
.type_ann
446440
.as_ref()
447441
.map(|rt| TsTypeDef::new(parsed_source, &rt.type_ann));
448442

449-
let type_params = maybe_type_param_decl_to_type_param_defs(
450-
parsed_source,
451-
ts_prop_sig.type_params.as_deref(),
452-
);
443+
let type_params =
444+
maybe_type_param_decl_to_type_param_defs(parsed_source, None);
453445
let prop_def = PropertyDef {
454446
name,
455447
js_doc,
456448
location: get_location(parsed_source, ts_prop_sig.start()),
457-
params,
449+
params: vec![],
458450
ts_type,
459451
readonly: ts_prop_sig.readonly,
460452
computed: ts_prop_sig.computed,

0 commit comments

Comments
 (0)