1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
//! Module resolver for multi-file imports
//!
//! This module provides functionality to resolve file imports in Ruchy programs
//! by pre-processing the AST to inline external modules before transpilation.
//!
//! # Architecture
//!
//! The module resolver works as a pre-processing step before transpilation:
//! 1. Parse the main file into an AST
//! 2. Scan for file imports (`use module_name;` where `module_name` has no `::`)
//! 3. Load and parse external module files
//! 4. Replace Import nodes with inline Module nodes
//! 5. Pass the resolved AST to the transpiler
//!
//! # Usage
//!
//! ```rust
//! use ruchy::{ModuleResolver, Parser, Transpiler};
//!
//! # fn main() -> Result<(), Box<dyn std::error::Error>> {
//! let mut resolver = ModuleResolver::new();
//! resolver.add_search_path("./src");
//!
//! let mut parser = Parser::new("2 + 2");
//! let ast = parser.parse()?;
//!
//! // Would resolve imports if there were any
//! // let resolved_ast = resolver.resolve_imports(ast)?;
//!
//! let mut transpiler = Transpiler::new();
//! let rust_code = transpiler.transpile(&ast)?;
//! # Ok(())
//! # }
//! ```
use crate::frontend::ast::{Expr, ExprKind, Span};
// ImportItem removed - Import now uses Option<Vec<String>> instead of Vec<ImportItem>
use crate::backend::module_loader::ModuleLoader;
use crate::utils::common_patterns::ResultContextExt;
use anyhow::Result;
/// Module resolver for processing file imports
///
/// Resolves file imports by loading external modules and inlining them
/// as Module declarations in the AST before transpilation.
pub struct ModuleResolver {
/// Module loader for file system operations
pub(crate) module_loader: ModuleLoader,
}
impl ModuleResolver {
/// Create a new module resolver with default search paths
///
/// Default search paths:
/// - `.` (current directory)
/// - `./src` (source directory)
/// - `./modules` (modules directory)
#[must_use]
/// # Examples
///
/// ```
/// use ruchy::backend::module_resolver::ModuleResolver;
///
/// let resolver = ModuleResolver::new();
/// // ModuleResolver created successfully
/// ```
pub fn new() -> Self {
Self {
module_loader: ModuleLoader::new(),
}
}
/// Add a directory to the module search path
///
/// # Arguments
///
/// * `path` - Directory to search for modules
pub fn add_search_path<P: AsRef<std::path::Path>>(&mut self, path: P) {
self.module_loader.add_search_path(path);
}
/// Resolve all file imports in an AST
///
/// Recursively processes the AST to find file imports, loads the corresponding
/// modules, and replaces Import nodes with inline Module nodes.
///
/// # Arguments
///
/// * `ast` - The AST to process
///
/// # Returns
///
/// A new AST with all file imports resolved to inline modules
///
/// # Errors
///
/// Returns an error if:
/// - Module files cannot be found or loaded
/// - Module files contain invalid syntax
/// - Circular dependencies are detected
/// # Examples
///
/// ```
/// use ruchy::backend::module_resolver::ModuleResolver;
/// use ruchy::ast::Expr;
///
/// let mut resolver = ModuleResolver::new();
/// let ast = Expr::literal(42.into());
/// let result = resolver.resolve_imports(ast);
/// assert!(result.is_ok());
/// ```
pub fn resolve_imports(&mut self, ast: Expr) -> Result<Expr> {
self.resolve_expr(ast)
}
/// Recursively resolve imports in an expression
fn resolve_expr(&mut self, expr: Expr) -> Result<Expr> {
match &expr.kind {
ExprKind::Import { module, items } => {
// Pass the full expression to preserve attributes
self.resolve_simple_import_with_attrs(&expr, module, items.as_deref())
}
ExprKind::ImportAll { module, alias } => {
self.resolve_import_all(expr.span, module, alias)
}
ExprKind::ImportDefault { module, name } => {
self.resolve_import_default(expr.span, module, name)
}
ExprKind::ReExport { items, module } => self.resolve_reexport(expr.span, items, module),
ExprKind::Block(exprs) => self.resolve_block_expr(exprs.clone(), expr.span),
ExprKind::Module { name, body } => {
self.resolve_module_expr(name.clone(), body.as_ref().clone(), expr.span)
}
ExprKind::ModuleDeclaration { name } => {
// ISSUE-106: Load external module file and transform to inline module
self.resolve_module_declaration(name.clone(), expr.span)
}
ExprKind::Function {
name,
type_params,
params,
body,
is_async,
return_type,
is_pub,
} => self.resolve_function_expr(
name.clone(),
type_params.clone(),
params.clone(),
body.as_ref().clone(),
*is_async,
return_type.clone(),
*is_pub,
expr.span,
),
ExprKind::If {
condition,
then_branch,
else_branch,
} => self.resolve_if_expr(
condition.as_ref().clone(),
then_branch.as_ref().clone(),
else_branch.as_ref().map(|e| Box::new(e.as_ref().clone())),
expr.span,
),
// For other expression types, recursively process children as needed
// For now, just return the expression as-is
_ => Ok(expr),
}
}
/// Resolve import expressions
fn resolve_simple_import(
&mut self,
span: Span,
module: &str,
items: Option<&[String]>,
) -> Result<Expr> {
if self.is_file_import(module) {
self.resolve_file_import(span, module, items)
} else {
Ok(Expr::new(
ExprKind::Import {
module: module.to_string(),
items: items.map(<[std::string::String]>::to_vec),
},
span,
))
}
}
/// Resolve simple import with attributes preservation
fn resolve_simple_import_with_attrs(
&mut self,
expr: &Expr,
module: &str,
items: Option<&[String]>,
) -> Result<Expr> {
if self.is_file_import(module) {
// For file imports, we need to preserve attributes on the resolved expression
let mut resolved = self.resolve_file_import(expr.span, module, items)?;
resolved.attributes.clone_from(&expr.attributes);
Ok(resolved)
} else {
// Standard import - preserve attributes
Ok(Expr {
kind: ExprKind::Import {
module: module.to_string(),
items: items.map(<[std::string::String]>::to_vec),
},
span: expr.span,
attributes: expr.attributes.clone(),
leading_comments: Vec::new(),
trailing_comment: None,
})
}
}
fn resolve_import_all(&mut self, span: Span, module: &str, alias: &str) -> Result<Expr> {
if self.is_file_import(module) {
self.resolve_file_module(span, module)?;
}
Ok(Expr::new(
ExprKind::ImportAll {
module: module.to_string(),
alias: alias.to_string(),
},
span,
))
}
fn resolve_import_default(&mut self, span: Span, module: &str, name: &str) -> Result<Expr> {
if self.is_file_import(module) {
self.resolve_file_module(span, module)?;
}
Ok(Expr::new(
ExprKind::ImportDefault {
module: module.to_string(),
name: name.to_string(),
},
span,
))
}
fn resolve_reexport(&mut self, span: Span, items: &[String], module: &str) -> Result<Expr> {
if self.is_file_import(module) {
self.resolve_file_module(span, module)?;
}
Ok(Expr::new(
ExprKind::ReExport {
items: items.to_vec(),
module: module.to_string(),
},
span,
))
}
fn resolve_file_import(
&mut self,
span: Span,
module: &str,
items: Option<&[String]>,
) -> Result<Expr> {
// Load the module file
let parsed_module = self
.module_loader
.load_module(module)
.module_context("resolve import", module)?;
// Recursively resolve imports in the loaded module
let resolved_module_ast = self.resolve_expr(parsed_module.ast)?;
// Create inline module
let module_expr = self.create_inline_module(module, resolved_module_ast, span);
// ISSUE-103: For simple imports like `use logger`, only emit module declaration
// For specific imports like `use logger::{func}`, emit both module + use statement
if let Some(item_list) = items {
// Specific items imported - need use statement
let use_statement = self.create_use_statement(module, Some(item_list), span);
Ok(Expr::new(
ExprKind::Block(vec![module_expr, use_statement]),
span,
))
} else {
// Simple module import - module declaration is sufficient
Ok(module_expr)
}
}
fn resolve_file_module(&mut self, _span: Span, module: &str) -> Result<()> {
// Load and parse the module file
let _ = self
.module_loader
.load_module(module)
.module_context("resolve import", module)?;
// Module integration is handled by the module loader
// The exports are made available through the loader's cache
Ok(())
}
fn create_inline_module(&self, name: &str, resolved_ast: Expr, span: Span) -> Expr {
// ISSUE-103: Make all functions in imported modules public
let public_ast = Self::make_functions_public(resolved_ast);
Expr::new(
ExprKind::Module {
name: name.to_string(),
body: Box::new(public_ast),
},
span,
)
}
/// Make all functions in an expression tree public (ISSUE-103)
fn make_functions_public(expr: Expr) -> Expr {
match expr.kind {
ExprKind::Function {
name,
type_params,
params,
body,
is_async,
return_type,
..
} => {
Expr::new(
ExprKind::Function {
name,
type_params,
params,
body,
is_async,
return_type,
is_pub: true, // Force all module functions to be public
},
expr.span,
)
}
ExprKind::Block(exprs) => {
let public_exprs = exprs.into_iter().map(Self::make_functions_public).collect();
Expr::new(ExprKind::Block(public_exprs), expr.span)
}
_ => expr,
}
}
fn create_use_statement(&self, module: &str, items: Option<&[String]>, span: Span) -> Expr {
// Always create Import expression - preserve the original import structure
Expr::new(
ExprKind::Import {
module: module.to_string(),
items: items.map(<[std::string::String]>::to_vec),
},
span,
)
}
/* DISABLED - Needs update for new Import AST structure
fn resolve_file_import(&mut self, span: Span, path: &str, items: &[ImportItem]) -> Result<Expr> {
// Load the module file
let parsed_module = self.module_loader.load_module(path)
.module_context("resolve import", path)?;
// Recursively resolve imports in the loaded module
let resolved_module_ast = self.resolve_expr(parsed_module.ast)?;
let module_expr = self.create_inline_module(path, resolved_module_ast, span);
let use_statement = self.create_use_statement(path, items);
Ok(Expr::new(
ExprKind::Block(vec![module_expr, use_statement]),
span,
))
}
*/
/* DISABLED - Needs update for new Import AST structure
fn resolve_standard_import(&self, span: Span, path: &str, _items: &[ImportItem]) -> Result<Expr> {
Ok(Expr::new(
ExprKind::Import {
module: path.to_string(),
items: None, // Legacy standard imports converted to simple imports
},
span,
))
}
fn create_inline_module(&self, path: &str, resolved_ast: Expr, span: Span) -> Expr {
Expr::new(
ExprKind::Module {
name: path.to_string(),
body: Box::new(resolved_ast),
},
span,
)
}
*/
/* DISABLED - Needs update for new Import AST structure
fn create_use_statement(&mut self, path: &str, items: &[ImportItem]) -> Expr {
if items.iter().any(|item| matches!(item, ImportItem::Wildcard)) || items.is_empty() {
// Wildcard import: use module::*;
Expr::new(
ExprKind::ImportAll {
module: path.to_string(),
alias: "*".to_string(), // Wildcard imports
},
Span { start: 0, end: 0 },
)
} else {
// Specific imports: use module::{item1, item2};
self.create_use_statements(path, items)
}
}
*/
/// Resolve block expressions
fn resolve_block_expr(&mut self, exprs: Vec<Expr>, span: Span) -> Result<Expr> {
// Resolve imports in all block expressions
let resolved_exprs: Result<Vec<_>> =
exprs.into_iter().map(|e| self.resolve_expr(e)).collect();
Ok(Expr::new(ExprKind::Block(resolved_exprs?), span))
}
/// Resolve module expressions
fn resolve_module_expr(&mut self, name: String, body: Expr, span: Span) -> Result<Expr> {
// Resolve imports in module body
let resolved_body = self.resolve_expr(body)?;
Ok(Expr::new(
ExprKind::Module {
name,
body: Box::new(resolved_body),
},
span,
))
}
/// Resolve external module declaration (ISSUE-106)
///
/// Loads an external module file and transforms it into an inline module.
/// For `mod scanner;`, this loads `scanner.ruchy` and returns `mod scanner { ... }`
fn resolve_module_declaration(&mut self, name: String, span: Span) -> Result<Expr> {
// Load the external module file
let parsed_module = self
.module_loader
.load_module(&name)
.module_context("resolve module declaration", &name)?;
// Recursively resolve imports in the loaded module
let resolved_module_ast = self.resolve_expr(parsed_module.ast)?;
// ISSUE-106: Make all functions in loaded module public (same as use imports)
let public_ast = Self::make_functions_public(resolved_module_ast);
// Transform to inline module
Ok(Expr::new(
ExprKind::Module {
name,
body: Box::new(public_ast),
},
span,
))
}
/// Resolve function expressions
fn resolve_function_expr(
&mut self,
name: String,
type_params: Vec<String>,
params: Vec<crate::frontend::ast::Param>,
body: Expr,
is_async: bool,
return_type: Option<crate::frontend::ast::Type>,
is_pub: bool,
span: Span,
) -> Result<Expr> {
// Resolve imports in function body
let resolved_body = self.resolve_expr(body)?;
Ok(Expr::new(
ExprKind::Function {
name,
type_params,
params,
body: Box::new(resolved_body),
is_async,
return_type,
is_pub,
},
span,
))
}
/// Resolve if expressions
fn resolve_if_expr(
&mut self,
condition: Expr,
then_branch: Expr,
else_branch: Option<Box<Expr>>,
span: Span,
) -> Result<Expr> {
let resolved_condition = self.resolve_expr(condition)?;
let resolved_then = self.resolve_expr(then_branch)?;
let resolved_else = else_branch.map(|e| self.resolve_expr(*e)).transpose()?;
Ok(Expr::new(
ExprKind::If {
condition: Box::new(resolved_condition),
then_branch: Box::new(resolved_then),
else_branch: resolved_else.map(Box::new),
},
span,
))
}
/// Check if an import path represents a file import
fn is_file_import(&self, path: &str) -> bool {
// Keywords that refer to local modules, not files
if path == "self"
|| path == "super"
|| path == "crate"
|| path.starts_with("self.")
|| path.starts_with("super.")
|| path.starts_with("crate.")
{
return false;
}
// Standard library and common modules are never file imports
// Recognize both :: and . notation for std
if path.starts_with("std")
|| path.starts_with("core")
|| path.starts_with("alloc")
|| path.starts_with("tokio") // Popular async runtime
|| path.starts_with("async_std") // Alternative async runtime
|| path.starts_with("futures") // Futures library
|| path.starts_with("serde") // Serialization
|| path == "fs" // File system module
|| path == "os" // Operating system module
|| path == "path" // Path module
|| path == "process" // Process module
|| path == "http" // HTTP module
|| path == "net" // Network module
|| path == "crypto"
// Crypto module
{
return false;
}
// HTTP imports are not file imports
if path.starts_with("http") {
return false;
}
// Empty paths are not file imports
if path.is_empty() {
return false;
}
// Everything else that doesn't contain :: is a potential file import
!path.contains("::")
}
/// Create use statements for specific imports
/* DISABLED - Needs update for new Import AST structure
fn create_use_statements(&self, module_path: &str, items: &[ImportItem]) -> Expr {
// Create a use statement that imports specific items from the module
// This will be transpiled to proper Rust use statements
// Convert legacy ImportItem list to string list for new AST
let item_names: Vec<String> = items.iter().filter_map(|item| {
match item {
ImportItem::Named(name) => Some(name.clone()),
ImportItem::Aliased { name, .. } => Some(name.clone()),
ImportItem::Wildcard => None,
}
}).collect();
Expr::new(
ExprKind::Import {
module: module_path.to_string(),
items: if item_names.is_empty() { None } else { Some(item_names) },
},
Span { start: 0, end: 0 },
)
}
*/
/// Get module loading statistics
#[must_use]
/// # Examples
///
/// ```
/// use ruchy::backend::module_resolver::ModuleResolver;
///
/// let resolver = ModuleResolver::new();
/// let stats = resolver.stats();
/// assert!(stats.cached_modules >= 0);
/// ```
pub fn stats(&self) -> crate::backend::module_loader::ModuleLoaderStats {
self.module_loader.stats()
}
/// Clear the module cache
///
/// Forces all modules to be reloaded from disk on next access.
/// # Examples
///
/// ```
/// use ruchy::backend::module_resolver::ModuleResolver;
///
/// let mut resolver = ModuleResolver::new();
/// resolver.clear_cache();
/// // Cache cleared successfully
/// ```
pub fn clear_cache(&mut self) {
self.module_loader.clear_cache();
}
}
impl Default for ModuleResolver {
fn default() -> Self {
Self::new()
}
}
// Module resolver tests for Import AST structure
#[cfg(test)]
mod tests {
use super::*;
use crate::frontend::ast::Literal;
use std::fs;
use tempfile::TempDir;
fn create_test_module(temp_dir: &TempDir, name: &str, content: &str) -> Result<()> {
let file_path = temp_dir.path().join(format!("{name}.ruchy"));
fs::write(file_path, content)?;
Ok(())
}
#[test]
fn test_module_resolver_creation() {
let resolver = ModuleResolver::new();
let stats = resolver.stats();
assert_eq!(stats.cached_modules, 0);
}
#[test]
fn test_add_search_path() {
let mut resolver = ModuleResolver::new();
resolver.add_search_path("/custom/path");
// Module loader doesn't expose search paths, so we can't directly test this
// But we can test that it doesn't panic
}
#[test]
fn test_is_file_import() {
let resolver = ModuleResolver::new();
// Should be file imports
assert!(resolver.is_file_import("math"));
assert!(resolver.is_file_import("utils"));
assert!(resolver.is_file_import("snake_case_module"));
// Should NOT be file imports (standard library)
assert!(!resolver.is_file_import("std"));
assert!(!resolver.is_file_import("std.collections"));
assert!(!resolver.is_file_import("std.collections.HashMap"));
assert!(!resolver.is_file_import("core"));
assert!(!resolver.is_file_import("core.mem"));
assert!(!resolver.is_file_import("alloc"));
assert!(!resolver.is_file_import("std::collections"));
assert!(!resolver.is_file_import("std::io::Read"));
assert!(!resolver.is_file_import("https://example.com/module.ruchy"));
assert!(!resolver.is_file_import("http://localhost/module.ruchy"));
assert!(!resolver.is_file_import(""));
}
#[test]
fn test_resolve_simple_file_import() -> Result<()> {
let temp_dir = TempDir::new()?;
let mut resolver = ModuleResolver::new();
resolver.add_search_path(temp_dir.path());
// Create a simple math module
create_test_module(
&temp_dir,
"math",
r"
pub fun add(a: i32, b: i32) -> i32 {
a + b
}
",
)?;
// Create an import expression
let import_expr = Expr::new(
ExprKind::Import {
module: "math".to_string(),
items: None, // Wildcard import
},
Span { start: 0, end: 0 },
);
// Resolve the import
let resolved_expr = resolver.resolve_imports(import_expr)?;
// ISSUE-103: Simple wildcard imports (items=None) now return just Module, not Block
// For specific imports (items=Some), it returns Block([Module, Import])
match resolved_expr.kind {
ExprKind::Module { name, body } => {
// Wildcard import returns inline module only
assert_eq!(name, "math");
// Verify the module body contains the function
match &body.kind {
ExprKind::Function {
name: func_name, ..
} => {
assert_eq!(func_name, "add");
}
_ => panic!("Expected function in module body, got {:?}", body.kind),
}
}
_ => panic!(
"Expected Module expression for wildcard import, got {:?}",
resolved_expr.kind
),
}
Ok(())
}
#[test]
fn test_resolve_non_file_import() -> Result<()> {
let mut resolver = ModuleResolver::new();
// Create a standard library import
let import_expr = Expr::new(
ExprKind::Import {
module: "std::collections".to_string(),
items: Some(vec!["HashMap".to_string()]),
},
Span { start: 0, end: 0 },
);
// Resolve the import - should remain unchanged
let resolved_expr = resolver.resolve_imports(import_expr)?;
match resolved_expr.kind {
ExprKind::Import { module, items } => {
assert_eq!(module, "std::collections");
assert_eq!(items.as_ref().unwrap().len(), 1);
}
_ => unreachable!("Expected Import expression to remain unchanged"),
}
Ok(())
}
#[test]
fn test_resolve_block_with_imports() -> Result<()> {
let temp_dir = TempDir::new()?;
let mut resolver = ModuleResolver::new();
resolver.add_search_path(temp_dir.path());
create_test_module(&temp_dir, "math", "42")?;
// Create a block with mixed imports
let block_expr = Expr::new(
ExprKind::Block(vec![
Expr::new(
ExprKind::Import {
module: "math".to_string(),
items: Some(vec!["*".to_string()]),
},
Span { start: 0, end: 0 },
),
Expr::new(
ExprKind::Import {
module: "std::io".to_string(),
items: Some(vec!["Read".to_string()]),
},
Span { start: 0, end: 0 },
),
Expr::new(
ExprKind::Literal(Literal::Integer(42, None)),
Span { start: 0, end: 0 },
),
]),
Span { start: 0, end: 0 },
);
let resolved_block = resolver.resolve_imports(block_expr)?;
if let ExprKind::Block(exprs) = resolved_block.kind {
assert_eq!(exprs.len(), 3);
// First should be Block containing Module and use statement (from file import)
match &exprs[0].kind {
ExprKind::Block(inner_exprs) => {
assert_eq!(inner_exprs.len(), 2);
assert!(matches!(inner_exprs[0].kind, ExprKind::Module { .. }));
assert!(matches!(inner_exprs[1].kind, ExprKind::Import { .. }));
}
_ => unreachable!(
"Expected first element to be Block, got {:?}",
exprs[0].kind
),
}
// Second should remain as Import (std::io - not a file import)
assert!(matches!(exprs[1].kind, ExprKind::Import { .. }));
// Third should remain as Literal
assert!(matches!(
exprs[2].kind,
ExprKind::Literal(Literal::Integer(42, _))
));
} else {
unreachable!("Expected Block expression");
}
Ok(())
}
#[test]
fn test_default_creation() {
let resolver = ModuleResolver::default();
let stats = resolver.stats();
assert_eq!(stats.cached_modules, 0);
assert_eq!(stats.files_loaded, 0);
}
#[test]
fn test_resolve_imports_error_handling() -> Result<()> {
let mut resolver = ModuleResolver::new();
resolver.module_loader.search_paths.clear();
// Try to import non-existent module
let import_expr = Expr::new(
ExprKind::Import {
module: "nonexistent".to_string(),
items: Some(vec!["*".to_string()]),
},
Span { start: 0, end: 0 },
);
let result = resolver.resolve_imports(import_expr);
assert!(result.is_err());
let error_msg = result.unwrap_err().to_string();
assert!(error_msg.contains("Failed to resolve import module"));
Ok(())
}
#[test]
fn test_nested_module_resolution() -> Result<()> {
let temp_dir = TempDir::new()?;
let mut resolver = ModuleResolver::new();
resolver.add_search_path(temp_dir.path());
// Create nested modules
create_test_module(&temp_dir, "utils", "let x = 42;")?;
create_test_module(&temp_dir, "math", "use utils;\nlet y = 1;")?;
let import_expr = Expr::new(
ExprKind::Import {
module: "math".to_string(),
items: None, // Wildcard import
},
Span { start: 0, end: 0 },
);
// This might fail due to nested imports, but shouldn't panic
let _ = resolver.resolve_imports(import_expr);
Ok(())
}
#[test]
fn test_specific_import_items() -> Result<()> {
let temp_dir = TempDir::new()?;
let mut resolver = ModuleResolver::new();
resolver.add_search_path(temp_dir.path());
create_test_module(&temp_dir, "math", "pub fun add() {}\npub fun sub() {}")?;
// Import specific items
let import_expr = Expr::new(
ExprKind::Import {
module: "math".to_string(),
items: Some(vec!["add".to_string(), "sub".to_string()]),
},
Span { start: 0, end: 0 },
);
let result = resolver.resolve_imports(import_expr)?;
if let ExprKind::Block(exprs) = result.kind {
assert_eq!(exprs.len(), 2);
// Check that module was loaded
assert!(matches!(exprs[0].kind, ExprKind::Module { .. }));
}
Ok(())
}
#[test]
fn test_stats_and_cache() -> Result<()> {
let temp_dir = TempDir::new()?;
let mut resolver = ModuleResolver::new();
resolver.module_loader.search_paths.clear(); // Remove default paths
resolver.add_search_path(temp_dir.path());
create_test_module(&temp_dir, "test", "42")?;
let initial_stats = resolver.stats();
assert_eq!(initial_stats.files_loaded, 0);
// Load a module
let import_expr = Expr::new(
ExprKind::Import {
module: "test".to_string(),
items: Some(vec!["*".to_string()]),
},
Span { start: 0, end: 0 },
);
resolver.resolve_imports(import_expr)?;
let after_stats = resolver.stats();
assert_eq!(after_stats.files_loaded, 1);
assert_eq!(after_stats.cached_modules, 1);
// Clear cache
resolver.clear_cache();
let cleared_stats = resolver.stats();
assert_eq!(cleared_stats.files_loaded, 0);
assert_eq!(cleared_stats.cached_modules, 0);
Ok(())
}
// ========================================
// Coverage Sprint: Inline Unit Tests (bashrs pattern: 13.5 tests/file)
// Target: Test untested code paths and edge cases
// ========================================
// Test 14: resolve_expr with Literal (pass-through)
#[test]
fn test_resolve_expr_literal_passthrough() -> Result<()> {
let mut resolver = ModuleResolver::new();
let literal_expr = Expr::new(
ExprKind::Literal(Literal::Integer(42, None)),
Span { start: 0, end: 0 },
);
let result_expr = resolver.resolve_imports(literal_expr)?;
// Literals should pass through unchanged
match result_expr.kind {
ExprKind::Literal(Literal::Integer(val, _)) => assert_eq!(val, 42),
_ => panic!("Expected literal to pass through"),
}
Ok(())
}
// Test 15: resolve_expr with BinaryOp (recursive resolution)
#[test]
fn test_resolve_expr_binary_op() -> Result<()> {
let mut resolver = ModuleResolver::new();
let left = Box::new(Expr::new(
ExprKind::Literal(Literal::Integer(1, None)),
Span { start: 0, end: 0 },
));
let right = Box::new(Expr::new(
ExprKind::Literal(Literal::Integer(2, None)),
Span { start: 0, end: 0 },
));
let bin_op = Expr::new(
ExprKind::Binary {
left,
op: crate::frontend::ast::BinaryOp::Add,
right,
},
Span { start: 0, end: 0 },
);
let result_expr = resolver.resolve_imports(bin_op)?;
// Should resolve both operands
assert!(matches!(result_expr.kind, ExprKind::Binary { .. }));
Ok(())
}
// Test 16: resolve_expr with UnaryOp (recursive resolution)
#[test]
fn test_resolve_expr_unary_op() -> Result<()> {
let mut resolver = ModuleResolver::new();
let operand = Box::new(Expr::new(
ExprKind::Literal(Literal::Integer(42, None)),
Span { start: 0, end: 0 },
));
let unary_op = Expr::new(
ExprKind::Unary {
op: crate::frontend::ast::UnaryOp::Negate,
operand,
},
Span { start: 0, end: 0 },
);
let result_expr = resolver.resolve_imports(unary_op)?;
// Should resolve the operand
assert!(matches!(result_expr.kind, ExprKind::Unary { .. }));
Ok(())
}
// Test 17: resolve_expr with Call (recursive resolution)
#[test]
fn test_resolve_expr_call() -> Result<()> {
let mut resolver = ModuleResolver::new();
let call_expr = Expr::new(
ExprKind::Call {
func: Box::new(Expr::new(
ExprKind::Identifier("print".to_string()),
Span { start: 0, end: 0 },
)),
args: vec![Expr::new(
ExprKind::Literal(Literal::String("hello".to_string())),
Span { start: 0, end: 0 },
)],
},
Span { start: 0, end: 0 },
);
let result_expr = resolver.resolve_imports(call_expr)?;
// Should resolve func and args
assert!(matches!(result_expr.kind, ExprKind::Call { .. }));
Ok(())
}
// Test 18: resolve_expr with While (recursive resolution)
#[test]
fn test_resolve_expr_while_loop() -> Result<()> {
let mut resolver = ModuleResolver::new();
let while_expr = Expr::new(
ExprKind::While {
label: None,
condition: Box::new(Expr::new(
ExprKind::Literal(Literal::Bool(true)),
Span { start: 0, end: 0 },
)),
body: Box::new(Expr::new(
ExprKind::Block(vec![]),
Span { start: 0, end: 0 },
)),
},
Span { start: 0, end: 0 },
);
let result_expr = resolver.resolve_imports(while_expr)?;
// Should resolve condition and body
assert!(matches!(result_expr.kind, ExprKind::While { .. }));
Ok(())
}
// Test 19: resolve_expr with For (recursive resolution)
#[test]
fn test_resolve_expr_for_loop() -> Result<()> {
let mut resolver = ModuleResolver::new();
let for_expr = Expr::new(
ExprKind::For {
label: None,
var: "i".to_string(),
pattern: Some(crate::frontend::ast::Pattern::Identifier("i".to_string())),
iter: Box::new(Expr::new(
ExprKind::Identifier("items".to_string()),
Span { start: 0, end: 0 },
)),
body: Box::new(Expr::new(
ExprKind::Block(vec![]),
Span { start: 0, end: 0 },
)),
},
Span { start: 0, end: 0 },
);
let result_expr = resolver.resolve_imports(for_expr)?;
// Should resolve iterable and body
assert!(matches!(result_expr.kind, ExprKind::For { .. }));
Ok(())
}
// Test 20: resolve_expr with Match (recursive resolution)
#[test]
fn test_resolve_expr_match() -> Result<()> {
let mut resolver = ModuleResolver::new();
let match_expr = Expr::new(
ExprKind::Match {
expr: Box::new(Expr::new(
ExprKind::Literal(Literal::Integer(1, None)),
Span { start: 0, end: 0 },
)),
arms: vec![],
},
Span { start: 0, end: 0 },
);
let result_expr = resolver.resolve_imports(match_expr)?;
// Should resolve the matched expression
assert!(matches!(result_expr.kind, ExprKind::Match { .. }));
Ok(())
}
// Test 21: is_file_import with camelCase module names
#[test]
fn test_is_file_import_camel_case() {
let resolver = ModuleResolver::new();
// camelCase should be considered file imports
assert!(resolver.is_file_import("camelCase"));
assert!(resolver.is_file_import("MyModule"));
assert!(resolver.is_file_import("myModule"));
}
// Test 22: is_file_import with numbers
#[test]
fn test_is_file_import_with_numbers() {
let resolver = ModuleResolver::new();
// Module names with numbers should be file imports
assert!(resolver.is_file_import("module123"));
assert!(resolver.is_file_import("test2"));
assert!(resolver.is_file_import("v1_utils"));
}
// Test 23: is_file_import with special prefixes (not std/core/alloc)
#[test]
fn test_is_file_import_custom_prefixes() {
let resolver = ModuleResolver::new();
// Names starting with stdlib prefixes are NOT file imports (avoid conflicts)
assert!(!resolver.is_file_import("core_utils")); // Starts with "core"
assert!(!resolver.is_file_import("stdlib")); // Starts with "std"
// Completely different names are file imports
assert!(resolver.is_file_import("my_module"));
assert!(resolver.is_file_import("utils"));
}
// Test 24: clear_cache multiple times (idempotent)
#[test]
fn test_clear_cache_idempotent() -> Result<()> {
let temp_dir = TempDir::new()?;
let mut resolver = ModuleResolver::new();
resolver.module_loader.search_paths.clear();
resolver.add_search_path(temp_dir.path());
create_test_module(&temp_dir, "test", "42")?;
// Load a module
let import_expr = Expr::new(
ExprKind::Import {
module: "test".to_string(),
items: None,
},
Span { start: 0, end: 0 },
);
resolver.resolve_imports(import_expr)?;
// Clear cache multiple times - should be idempotent
resolver.clear_cache();
let stats1 = resolver.stats();
resolver.clear_cache();
let stats2 = resolver.stats();
assert_eq!(stats1.cached_modules, 0);
assert_eq!(stats2.cached_modules, 0);
assert_eq!(stats1.files_loaded, 0);
assert_eq!(stats2.files_loaded, 0);
Ok(())
}
// === COVERAGE: Additional tests for uncovered branches ===
#[test]
fn test_resolve_import_all() -> Result<()> {
let mut resolver = ModuleResolver::new();
let import_all = Expr::new(
ExprKind::ImportAll {
module: "std::collections".to_string(),
alias: "collections".to_string(),
},
Span { start: 0, end: 0 },
);
let result = resolver.resolve_imports(import_all)?;
// Non-file import should be preserved
if let ExprKind::ImportAll { module, alias } = result.kind {
assert_eq!(module, "std::collections");
assert_eq!(alias, "collections");
} else {
panic!("Expected ImportAll");
}
Ok(())
}
#[test]
fn test_resolve_import_default() -> Result<()> {
let mut resolver = ModuleResolver::new();
let import_default = Expr::new(
ExprKind::ImportDefault {
module: "std::io".to_string(),
name: "stdout".to_string(),
},
Span { start: 0, end: 0 },
);
let result = resolver.resolve_imports(import_default)?;
if let ExprKind::ImportDefault { module, name } = result.kind {
assert_eq!(module, "std::io");
assert_eq!(name, "stdout");
} else {
panic!("Expected ImportDefault");
}
Ok(())
}
#[test]
fn test_resolve_reexport() -> Result<()> {
let mut resolver = ModuleResolver::new();
let reexport = Expr::new(
ExprKind::ReExport {
items: vec!["foo".to_string(), "bar".to_string()],
module: "std::lib".to_string(),
},
Span { start: 0, end: 0 },
);
let result = resolver.resolve_imports(reexport)?;
if let ExprKind::ReExport { items, module } = result.kind {
assert_eq!(module, "std::lib");
assert_eq!(items.len(), 2);
} else {
panic!("Expected ReExport");
}
Ok(())
}
#[test]
fn test_make_functions_public() {
// Test function is made public
let private_func = Expr::new(
ExprKind::Function {
name: "my_func".to_string(),
type_params: vec![],
params: vec![],
body: Box::new(Expr::new(
ExprKind::Literal(crate::frontend::ast::Literal::Integer(42, None)),
Span { start: 0, end: 2 },
)),
is_async: false,
return_type: None,
is_pub: false,
},
Span { start: 0, end: 10 },
);
let result = ModuleResolver::make_functions_public(private_func);
if let ExprKind::Function { is_pub, .. } = result.kind {
assert!(is_pub, "Function should be made public");
} else {
panic!("Expected Function");
}
}
#[test]
fn test_make_functions_public_in_block() {
// Test block of functions are all made public
let block = Expr::new(
ExprKind::Block(vec![
Expr::new(
ExprKind::Function {
name: "f1".to_string(),
type_params: vec![],
params: vec![],
body: Box::new(Expr::new(
ExprKind::Literal(crate::frontend::ast::Literal::Integer(1, None)),
Span { start: 0, end: 1 },
)),
is_async: false,
return_type: None,
is_pub: false,
},
Span { start: 0, end: 5 },
),
Expr::new(
ExprKind::Function {
name: "f2".to_string(),
type_params: vec![],
params: vec![],
body: Box::new(Expr::new(
ExprKind::Literal(crate::frontend::ast::Literal::Integer(2, None)),
Span { start: 0, end: 1 },
)),
is_async: false,
return_type: None,
is_pub: false,
},
Span { start: 0, end: 5 },
),
]),
Span { start: 0, end: 20 },
);
let result = ModuleResolver::make_functions_public(block);
if let ExprKind::Block(exprs) = result.kind {
for expr in exprs {
if let ExprKind::Function { is_pub, .. } = expr.kind {
assert!(is_pub, "All functions in block should be public");
}
}
} else {
panic!("Expected Block");
}
}
#[test]
fn test_make_functions_public_passthrough() {
// Non-function expressions pass through unchanged
let literal = Expr::new(
ExprKind::Literal(crate::frontend::ast::Literal::Integer(42, None)),
Span { start: 0, end: 2 },
);
let result = ModuleResolver::make_functions_public(literal);
if let ExprKind::Literal(crate::frontend::ast::Literal::Integer(n, _)) = result.kind {
assert_eq!(n, 42);
} else {
panic!("Expected Literal");
}
}
#[test]
fn test_resolve_module_declaration() -> Result<()> {
let temp_dir = TempDir::new()?;
let mut resolver = ModuleResolver::new();
resolver.module_loader.search_paths.clear();
resolver.add_search_path(temp_dir.path());
create_test_module(&temp_dir, "mymod", "fun helper() { 1 }")?;
let module_decl = Expr::new(
ExprKind::ModuleDeclaration {
name: "mymod".to_string(),
},
Span { start: 0, end: 10 },
);
let result = resolver.resolve_imports(module_decl)?;
// Should be resolved to inline Module
if let ExprKind::Module { name, .. } = result.kind {
assert_eq!(name, "mymod");
} else {
panic!("Expected Module, got {:?}", result.kind);
}
Ok(())
}
#[test]
fn test_resolve_if_expression() -> Result<()> {
let mut resolver = ModuleResolver::new();
let if_expr = Expr::new(
ExprKind::If {
condition: Box::new(Expr::new(
ExprKind::Literal(crate::frontend::ast::Literal::Bool(true)),
Span { start: 0, end: 4 },
)),
then_branch: Box::new(Expr::new(
ExprKind::Literal(crate::frontend::ast::Literal::Integer(1, None)),
Span { start: 5, end: 6 },
)),
else_branch: Some(Box::new(Expr::new(
ExprKind::Literal(crate::frontend::ast::Literal::Integer(2, None)),
Span { start: 7, end: 8 },
))),
},
Span { start: 0, end: 10 },
);
let result = resolver.resolve_imports(if_expr)?;
if let ExprKind::If { .. } = result.kind {
// If expression is preserved
} else {
panic!("Expected If expression");
}
Ok(())
}
}
#[cfg(test)]
mod property_tests_module_resolver {
use proptest::{prop_assert_eq, proptest};
proptest! {
/// Property: is_file_import never panics on any input
#[test]
fn test_is_file_import_never_panics(input: String) {
let resolver = super::ModuleResolver::new();
// Should never panic regardless of input
let _ = resolver.is_file_import(&input);
}
/// Property: resolve_imports maintains AST structure for non-file imports
#[test]
fn test_resolve_preserves_non_file_imports(module_name: String) {
use crate::frontend::ast::{Expr, ExprKind, Span};
let mut resolver = super::ModuleResolver::new();
// Create an import that's not a file (contains ::)
let module = format!("std::{module_name}");
let import_expr = Expr::new(
ExprKind::Import {
module: module.clone(),
items: None,
},
Span { start: 0, end: 0 },
);
// Should preserve the import unchanged
if let Ok(resolved) = resolver.resolve_imports(import_expr) {
if let ExprKind::Import { module: resolved_module, .. } = resolved.kind {
prop_assert_eq!(resolved_module, module);
}
}
}
}
}