Merge pull request #82 from peterhuene/update-parser

Reimplement `wac-parser` on `wac-graph`.

Cargo.toml

@@ -19,6 +19,8 @@ keywords = ["webassembly", "wasm", "components", "component-model"]
 repository = "https://github.com/bytecodealliance/wac"
 
 [dependencies]
+wac-types = { workspace = true }
+wac-graph = { workspace = true }
 wac-resolver = { workspace = true, default-features = false }
 wac-parser = { workspace = true, default-features = false }
 anyhow = { workspace = true }
@@ -30,7 +32,6 @@ owo-colors = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 wat = { workspace = true }
-wasmparser = { workspace = true }
 wasmprinter = { workspace = true }
 thiserror = { workspace = true }
 indexmap = { workspace = true }

crates/wac-graph/Cargo.toml

@@ -21,6 +21,7 @@ semver = { workspace = true }
 serde = { workspace = true, optional = true }
 wasm-encoder = { workspace = true }
 log = { workspace = true }
+wasm-metadata = { workspace = true }
 
 [dev-dependencies]
 pretty_assertions = { workspace = true }

crates/wac-graph/src/encoding.rs

@@ -1,5 +1,6 @@
-use crate::{NodeId, PackageId};
+use crate::PackageId;
 use indexmap::IndexMap;
+use petgraph::graph::NodeIndex;
 use std::collections::HashMap;
 use wac_types::{
     CoreExtern, DefinedType, DefinedTypeId, Enum, Flags, FuncResult, FuncTypeId, InterfaceId,
@@ -116,11 +117,11 @@ pub struct State {
     /// The current encoding scope.
     pub current: Scope,
     /// A map of nodes in the graph to their encoded indexes.
-    pub node_indexes: HashMap<NodeId, u32>,
+    pub node_indexes: HashMap<NodeIndex, u32>,
     /// The map of package identifiers to encoded components (either imported or defined).
     pub packages: HashMap<PackageId, u32>,
     /// A map of instantiation nodes to a list of their encoded implicitly imported arguments.
-    pub implicit_args: HashMap<NodeId, Vec<(String, ComponentExportKind, u32)>>,
+    pub implicit_args: HashMap<NodeIndex, Vec<(String, ComponentExportKind, u32)>>,
 }
 
 impl State {