Refactor the module structure of the namespace module

forc-pkg/src/pkg.rs

@@ -43,15 +43,15 @@ use sway_core::{
         fuel_crypto,
         fuel_tx::{self, Contract, ContractId, StorageSlot},
     },
-    language::{parsed::TreeType, Visibility},
+    language::parsed::TreeType,
     semantic_analysis::namespace,
     source_map::SourceMap,
     transform::AttributeKind,
     write_dwarf, BuildTarget, Engines, FinalizedEntry, LspConfig,
 };
 use sway_core::{PrintAsm, PrintIr};
 use sway_error::{error::CompileError, handler::Handler, warning::CompileWarning};
-use sway_types::constants::{CORE, PRELUDE, STD};
+use sway_types::constants::{CORE, STD};
 use sway_types::{Ident, Span, Spanned};
 use sway_utils::{constants, time_expr, PerformanceData, PerformanceMetric};
 use tracing::{debug, info};
@@ -183,7 +183,7 @@ pub struct CompiledPackage {
     pub program_abi: ProgramABI,
     pub storage_slots: Vec<StorageSlot>,
     pub bytecode: BuiltPackageBytecode,
-    pub root_module: namespace::Module,
+    pub root_module: namespace::Root,
     pub warnings: Vec<CompileWarning>,
     pub metrics: PerformanceData,
 }
@@ -1572,9 +1572,6 @@ pub fn sway_build_config(
     Ok(build_config)
 }
 
-/// The name of the constant holding the contract's id.
-pub const CONTRACT_ID_CONSTANT_NAME: &str = "CONTRACT_ID";
-
 /// Builds the dependency namespace for the package at the given node index within the graph.
 ///
 /// This function is designed to be called for each node in order of compilation.
@@ -1588,7 +1585,7 @@ pub const CONTRACT_ID_CONSTANT_NAME: &str = "CONTRACT_ID";
 /// `contract_id_value` should only be Some when producing the `dependency_namespace` for a contract with tests enabled.
 /// This allows us to provide a contract's `CONTRACT_ID` constant to its own unit tests.
 pub fn dependency_namespace(
-    lib_namespace_map: &HashMap<NodeIx, namespace::Module>,
+    lib_namespace_map: &HashMap<NodeIx, namespace::Root>,
     compiled_contract_deps: &CompiledContractDeps,
     graph: &Graph,
     node: NodeIx,
@@ -1599,30 +1596,25 @@ pub fn dependency_namespace(
     // TODO: Clean this up when config-time constants v1 are removed.
     let node_idx = &graph[node];
     let name = Ident::new_no_span(node_idx.name.clone());
-    let mut root_module = if let Some(contract_id_value) = contract_id_value {
-        namespace::default_with_contract_id(
-            engines,
-            name.clone(),
-            Visibility::Public,
-            contract_id_value,
-            experimental,
-        )?
-    } else {
-        namespace::Module::new(name, Visibility::Public, None)
-    };
-
+    let mut root_namespace =
+	if let Some(contract_id_value) = contract_id_value {
+	    namespace::namespace_with_contract_id(engines, name.clone(), contract_id_value, experimental)?
+	} else {
+	    namespace::namespace_without_contract_id(name.clone())
+	};
+
     // Add direct dependencies.
     let mut core_added = false;
     for edge in graph.edges_directed(node, Direction::Outgoing) {
         let dep_node = edge.target();
         let dep_name = kebab_to_snake_case(&edge.weight().name);
         let dep_edge = edge.weight();
-        let mut dep_namespace = match dep_edge.kind {
+        let dep_namespace = match dep_edge.kind {
             DepKind::Library => lib_namespace_map
                 .get(&dep_node)
                 .cloned()
-                .expect("no namespace module")
-                .read(engines, Clone::clone),
+                .expect("no root module")
+		.clone(),
             DepKind::Contract { salt } => {
                 let dep_contract_id = compiled_contract_deps
                     .get(&dep_node)
@@ -1633,17 +1625,10 @@ pub fn dependency_namespace(
                 let contract_id_value = format!("0x{dep_contract_id}");
                 let node_idx = &graph[dep_node];
                 let name = Ident::new_no_span(node_idx.name.clone());
-                namespace::default_with_contract_id(
-                    engines,
-                    name.clone(),
-                    Visibility::Private,
-                    contract_id_value,
-                    experimental,
-                )?
+		namespace::namespace_with_contract_id(engines, name.clone(), contract_id_value, experimental)?
             }
         };
-        dep_namespace.is_external = true;
-        root_module.insert_submodule(dep_name, dep_namespace);
+        root_namespace.add_external(dep_name, dep_namespace);
         let dep = &graph[dep_node];
         if dep.name == CORE {
             core_added = true;
@@ -1654,51 +1639,29 @@ pub fn dependency_namespace(
     if !core_added {
         if let Some(core_node) = find_core_dep(graph, node) {
             let core_namespace = &lib_namespace_map[&core_node];
-            root_module.insert_submodule(CORE.to_string(), core_namespace.clone());
-            core_added = true;
+            root_namespace.add_external(CORE.to_string(), core_namespace.clone());
+//            core_added = true;
         }
     }
 
-    let mut root = namespace::Root::from(root_module);
-
-    if core_added {
-        let _ = root.star_import(
-            &Handler::default(),
-            engines,
-            &[CORE, PRELUDE].map(|s| Ident::new_no_span(s.into())),
-            &[],
-            Visibility::Private,
-        );
-    }
-
-    if has_std_dep(graph, node) {
-        let _ = root.star_import(
-            &Handler::default(),
-            engines,
-            &[STD, PRELUDE].map(|s| Ident::new_no_span(s.into())),
-            &[],
-            Visibility::Private,
-        );
-    }
-
-    Ok(root)
+    Ok(root_namespace)
 }
 
-/// Find the `std` dependency, if it is a direct one, of the given node.
-fn has_std_dep(graph: &Graph, node: NodeIx) -> bool {
-    // If we are `std`, do nothing.
-    let pkg = &graph[node];
-    if pkg.name == STD {
-        return false;
-    }
-
-    // If we have `std` as a direct dep, use it.
-    graph.edges_directed(node, Direction::Outgoing).any(|edge| {
-        let dep_node = edge.target();
-        let dep = &graph[dep_node];
-        matches!(&dep.name[..], STD)
-    })
-}
+///// Find the `std` dependency, if it is a direct one, of the given node.
+//fn has_std_dep(graph: &Graph, node: NodeIx) -> bool {
+//    // If we are `std`, do nothing.
+//    let pkg = &graph[node];
+//    if pkg.name == STD {
+//        return false;
+//    }
+//
+//    // If we have `std` as a direct dep, use it.
+//    graph.edges_directed(node, Direction::Outgoing).any(|edge| {
+//        let dep_node = edge.target();
+//        let dep = &graph[dep_node];
+//        matches!(&dep.name[..], STD)
+//    })
+//}
 
 /// Find the `core` dependency (whether direct or transitive) for the given node if it exists.
 fn find_core_dep(graph: &Graph, node: NodeIx) -> Option<NodeIx> {
@@ -1758,7 +1721,7 @@ pub fn compile(
     pkg: &PackageDescriptor,
     profile: &BuildProfile,
     engines: &Engines,
-    namespace: &mut namespace::Root,
+    namespace: namespace::Root,
     source_map: &mut SourceMap,
 ) -> Result<CompiledPackage> {
     let mut metrics = PerformanceData::default();
@@ -1953,7 +1916,7 @@ pub fn compile(
         storage_slots,
         tree_type,
         bytecode,
-        root_module: namespace.root_module().clone(),
+        root_module: namespace.root().clone(),
         warnings,
         metrics,
     };
@@ -2380,7 +2343,7 @@ pub fn build(
 
             // `ContractIdConst` is a None here since we do not yet have a
             // contract ID value at this point.
-            let mut dep_namespace = match dependency_namespace(
+            let dep_namespace = match dependency_namespace(
                 &lib_namespace_map,
                 &compiled_contract_deps,
                 plan.graph(),
@@ -2397,7 +2360,7 @@ pub fn build(
                 &descriptor,
                 &profile,
                 &engines,
-                &mut dep_namespace,
+                dep_namespace,
                 &mut source_map,
             )?;
 
@@ -2444,7 +2407,7 @@ pub fn build(
         };
 
         // Note that the contract ID value here is only Some if tests are enabled.
-        let mut dep_namespace = match dependency_namespace(
+        let dep_namespace = match dependency_namespace(
             &lib_namespace_map,
             &compiled_contract_deps,
             plan.graph(),
@@ -2470,7 +2433,7 @@ pub fn build(
             &descriptor,
             &profile,
             &engines,
-            &mut dep_namespace,
+            dep_namespace,
             &mut source_map,
         )?;
 
@@ -2541,7 +2504,7 @@ pub fn check(
         let contract_id_value =
             (idx == plan.compilation_order.len() - 1).then(|| DUMMY_CONTRACT_ID.to_string());
 
-        let mut dep_namespace = dependency_namespace(
+        let dep_namespace = dependency_namespace(
             &lib_namespace_map,
             &compiled_contract_deps,
             &plan.graph,
@@ -2572,7 +2535,7 @@ pub fn check(
             &handler,
             engines,
             input,
-            &mut dep_namespace,
+            dep_namespace,
             Some(&build_config),
             &pkg.name,
             retrigger_compilation.clone(),
@@ -2595,12 +2558,12 @@ pub fn check(
 
         if let Ok(typed_program) = programs.typed.as_ref() {
             if let TreeType::Library = typed_program.kind.tree_type() {
-                let mut module = typed_program
+                let mut lib_root = typed_program
                     .root
                     .namespace
-                    .program_id(engines)
-                    .read(engines, |m| m.clone());
-                module.set_span(
+		    .clone()
+                    .root();
+                lib_root.add_span_to_root_module(
                     Span::new(
                         manifest.entry_string()?,
                         0,
@@ -2609,7 +2572,7 @@ pub fn check(
                     )
                     .unwrap(),
                 );
-                lib_namespace_map.insert(node, module);
+                lib_namespace_map.insert(node, lib_root);
             }
             source_map.insert_dependency(manifest.dir());
         } else {

sway-core/src/abi_generation/fuel_abi.rs

@@ -21,14 +21,16 @@ pub struct AbiContext<'a> {
 }
 
 impl<'a> AbiContext<'a> {
-    fn to_str_context(&self, engines: &Engines, abi_full: bool) -> AbiStrContext {
+    fn to_str_context(
+        &self,
+        abi_full: bool,
+    ) -> AbiStrContext {
         AbiStrContext {
             program_name: self
                 .program
                 .root
                 .namespace
-                .program_id(engines)
-                .read(engines, |m| m.name().to_string()),
+		.current_package_name().to_string(),
             abi_with_callpaths: self.abi_with_callpaths,
             abi_with_fully_specified_types: abi_full,
             abi_root_type_without_generic_type_parameters: !abi_full,
@@ -50,8 +52,8 @@ impl TypeId {
                     .program
                     .root
                     .namespace
-                    .program_id(engines)
-                    .read(engines, |m| m.name().clone().as_str().to_string()),
+                    .current_package_name()
+		    .to_string(),
                 abi_with_callpaths: true,
                 abi_with_fully_specified_types: true,
                 abi_root_type_without_generic_type_parameters: false,
@@ -382,7 +384,7 @@ fn generate_concrete_type_declaration(
     let type_metadata_decl = program_abi::TypeMetadataDeclaration {
         metadata_type_id: MetadataTypeId(type_id.index()),
         type_field: type_id.get_abi_type_str(
-            &ctx.to_str_context(engines, false),
+            &ctx.to_str_context(false),
             engines,
             resolved_type_id,
         ),
@@ -476,7 +478,7 @@ fn generate_type_metadata_declaration(
     let type_metadata_decl = program_abi::TypeMetadataDeclaration {
         metadata_type_id: MetadataTypeId(type_id.index()),
         type_field: type_id.get_abi_type_str(
-            &ctx.to_str_context(engines, false),
+            &ctx.to_str_context(false),
             engines,
             resolved_type_id,
         ),
@@ -1249,7 +1251,7 @@ impl TypeParameter {
         let type_parameter = program_abi::TypeMetadataDeclaration {
             metadata_type_id: type_id.clone(),
             type_field: self.initial_type_id.get_abi_type_str(
-                &ctx.to_str_context(engines, false),
+                &ctx.to_str_context(false),
                 engines,
                 self.type_id,
             ),

sway-core/src/control_flow_analysis/dead_code_analysis.rs

@@ -7,7 +7,7 @@ use crate::{
             self, ConfigurableDecl, ConstantDecl, FunctionDecl, ProjectionKind, StructDecl,
             TraitDecl, TyAstNode, TyAstNodeContent, TyDecl, TyImplItem, TypeAliasDecl,
         },
-        CallPath, Visibility,
+        CallPath, CallPathType, Visibility,
     },
     transform::{self, AttributesMap},
     type_system::TypeInfo,
@@ -857,7 +857,7 @@ fn connect_trait_declaration(
         CallPath {
             prefixes: vec![],
             suffix: decl.name.clone(),
-            is_absolute: false,
+            callpath_type: CallPathType::Ambiguous,
         },
         TraitNamespaceEntry {
             trait_idx: entry_node,
@@ -881,7 +881,7 @@ fn connect_abi_declaration(
         CallPath {
             prefixes: vec![],
             suffix: decl.name.clone(),
-            is_absolute: false,
+            callpath_type: CallPathType::Ambiguous,
         },
         TraitNamespaceEntry {
             trait_idx: entry_node,

sway-core/src/ir_generation.rs

@@ -170,7 +170,7 @@ pub fn compile_program<'eng>(
             engines,
             &mut ctx,
             entry_function,
-            root.namespace.module(engines),
+            root.namespace.current_module(),
             &logged_types,
             &messages_types,
             &test_fns,
@@ -180,7 +180,7 @@ pub fn compile_program<'eng>(
             engines,
             &mut ctx,
             entry_function,
-            root.namespace.module(engines),
+            root.namespace.current_module(),
             &logged_types,
             &messages_types,
             &test_fns,
@@ -193,7 +193,7 @@ pub fn compile_program<'eng>(
             &mut ctx,
             entry_function.as_ref(),
             abi_entries,
-            root.namespace.module(engines),
+            root.namespace.current_module(),
             declarations,
             &logged_types,
             &messages_types,
@@ -204,7 +204,7 @@ pub fn compile_program<'eng>(
         ty::TyProgramKind::Library { .. } => compile::compile_library(
             engines,
             &mut ctx,
-            root.namespace.module(engines),
+            root.namespace.current_module(),
             &logged_types,
             &messages_types,
             &test_fns,