Add names section to encoded WAC documents.

Implements #37.

Author: peterhuene

crates/wac-parser/src/resolution.rs

@@ -785,6 +785,14 @@ impl State {
             });
         }
 
+        if let Item::Node(node) = item {
+            // Use only the first name encountered for the node, ignoring
+            // aliasing in the form of `let x = y;`
+            if self.graph[node].name.is_none() {
+                self.graph.set_node_name(node, id.string.to_owned());
+            }
+        }
+
         Ok(())
     }
 

crates/wac-parser/tests/encoding/instantiation.wac.result

@@ -14,16 +14,16 @@
       (export (;0;) "foo" (func (type 0)))
     )
   )
-  (import "i" (instance (;1;) (type 2)))
+  (import "i" (instance $i (;1;) (type 2)))
   (type (;3;)
     (instance
       (type (;0;) (func))
       (export (;0;) "baz" (func (type 0)))
     )
   )
-  (import "i2" (instance (;2;) (type 3)))
+  (import "i2" (instance $i2 (;2;) (type 3)))
   (type (;4;) (func))
-  (import "f" (func (;1;) (type 4)))
+  (import "f" (func $f (;1;) (type 4)))
   (type (;5;)
     (component
       (type (;0;) (func))
@@ -32,20 +32,20 @@
     )
   )
   (import "unlocked-dep=<foo:bar>" (component (;0;) (type 5)))
-  (instance (;3;) (instantiate 0
+  (instance $x1 (;3;) (instantiate 0
       (with "baz" (func 0))
     )
   )
-  (instance (;4;) (instantiate 0
-      (with "baz" (func 1))
+  (instance $x2 (;4;) (instantiate 0
+      (with "baz" (func $f))
     )
   )
-  (instance (;5;) (instantiate 0
-      (with "baz" (func 1))
+  (instance $x3 (;5;) (instantiate 0
+      (with "baz" (func $f))
     )
   )
-  (alias export 2 "baz" (func (;2;)))
-  (instance (;6;) (instantiate 0
+  (alias export $i2 "baz" (func (;2;)))
+  (instance $x4 (;6;) (instantiate 0
       (with "baz" (func 2))
     )
   )
@@ -61,27 +61,27 @@
     )
   )
   (import "unlocked-dep=<bar:baz>" (component (;1;) (type 6)))
-  (instance (;7;) (instantiate 1
+  (instance $y1 (;7;) (instantiate 1
       (with "foo" (instance 0))
     )
   )
-  (instance (;8;) (instantiate 1
-      (with "foo" (instance 1))
+  (instance $y2 (;8;) (instantiate 1
+      (with "foo" (instance $i))
     )
   )
-  (instance (;9;) (instantiate 1
-      (with "foo" (instance 3))
+  (instance $y3 (;9;) (instantiate 1
+      (with "foo" (instance $x1))
     )
   )
-  (instance (;10;) (instantiate 1
-      (with "foo" (instance 4))
+  (instance $y4 (;10;) (instantiate 1
+      (with "foo" (instance $x2))
     )
   )
-  (instance (;11;) (instantiate 1
-      (with "foo" (instance 5))
+  (instance $y5 (;11;) (instantiate 1
+      (with "foo" (instance $x3))
     )
   )
-  (alias export 6 "foo" (func (;3;)))
+  (alias export $x4 "foo" (func (;3;)))
   (export (;4;) "foo" (func 3))
   (@producers
     (processed-by "wac-parser" "0.1.0")

crates/wac-parser/tests/encoding/merged-functions.wac.result

@@ -24,7 +24,7 @@
     )
   )
   (import "unlocked-dep=<foo:bar>" (component (;0;) (type 1)))
-  (instance (;1;) (instantiate 0
+  (instance $a (;1;) (instantiate 0
       (with "foo:bar/baz" (instance 0))
     )
   )
@@ -42,7 +42,7 @@
     )
   )
   (import "unlocked-dep=<foo:baz>" (component (;1;) (type 2)))
-  (instance (;2;) (instantiate 1
+  (instance $b (;2;) (instantiate 1
       (with "foo:bar/baz" (instance 0))
     )
   )

crates/wac-parser/tests/encoding/resources.wac.result

@@ -20,7 +20,7 @@
       (export (;4;) "baz" (func (type 11)))
     )
   )
-  (import "foo" (instance (;0;) (type 0)))
+  (import "foo" (instance $foo (;0;) (type 0)))
   (type (;1;)
     (component
       (type (;0;)
@@ -43,11 +43,11 @@
     )
   )
   (import "unlocked-dep=<foo:bar>" (component (;0;) (type 1)))
-  (instance (;1;) (instantiate 0
-      (with "foo" (instance 0))
+  (instance $x (;1;) (instantiate 0
+      (with "foo" (instance $foo))
     )
   )
-  (alias export 1 "foo" (instance (;2;)))
+  (alias export $x "foo" (instance (;2;)))
   (export (;3;) "foo" (instance 2))
   (@producers
     (processed-by "wac-parser" "0.1.0")

crates/wac-parser/tests/encoding/types.wac.result

@@ -1,42 +1,42 @@
 (component
   (type (;0;) u8)
-  (export (;1;) "a" (type 0))
+  (export $a (;1;) "a" (type 0))
   (type (;2;) s8)
-  (export (;3;) "b" (type 2))
+  (export $b (;3;) "b" (type 2))
   (type (;4;) u16)
-  (export (;5;) "c" (type 4))
+  (export $c (;5;) "c" (type 4))
   (type (;6;) s16)
-  (export (;7;) "d" (type 6))
+  (export $d (;7;) "d" (type 6))
   (type (;8;) u32)
-  (export (;9;) "e" (type 8))
+  (export $e (;9;) "e" (type 8))
   (type (;10;) s32)
-  (export (;11;) "f" (type 10))
+  (export $f (;11;) "f" (type 10))
   (type (;12;) u64)
-  (export (;13;) "g" (type 12))
+  (export $g (;13;) "g" (type 12))
   (type (;14;) s64)
-  (export (;15;) "h" (type 14))
+  (export $h (;15;) "h" (type 14))
   (type (;16;) f32)
-  (export (;17;) "i" (type 16))
+  (export $i (;17;) "i" (type 16))
   (type (;18;) f64)
-  (export (;19;) "j" (type 18))
+  (export $j (;19;) "j" (type 18))
   (type (;20;) bool)
-  (export (;21;) "k" (type 20))
+  (export $k (;21;) "k" (type 20))
   (type (;22;) char)
-  (export (;23;) "l" (type 22))
+  (export $l (;23;) "l" (type 22))
   (type (;24;) string)
-  (export (;25;) "m" (type 24))
+  (export $m (;25;) "m" (type 24))
   (type (;26;) (list u8))
   (type (;27;) (tuple s8 u16 s16))
   (type (;28;) (option u32))
   (type (;29;) (record (field "a" 26) (field "b" 27) (field "c" 28)))
-  (export (;30;) "n" (type 29))
-  (type (;31;) (tuple 30 30 30))
-  (type (;32;) (variant (case "foo") (case "bar" 30) (case "baz" 31)))
-  (export (;33;) "o" (type 32))
+  (export $n (;30;) "n" (type 29))
+  (type (;31;) (tuple $n $n $n))
+  (type (;32;) (variant (case "foo") (case "bar" $n) (case "baz" 31)))
+  (export $o (;33;) "o" (type 32))
   (type (;34;) (flags "foo" "bar" "baz"))
-  (export (;35;) "p" (type 34))
+  (export $p (;35;) "p" (type 34))
   (type (;36;) (enum "a" "b" "c"))
-  (export (;37;) "q" (type 36))
+  (export $q (;37;) "q" (type 36))
   (type (;38;)
     (component
       (type (;0;)
@@ -64,7 +64,7 @@
       (export (;0;) "test:pkg/r" (instance (type 0)))
     )
   )
-  (export (;39;) "r" (type 38))
+  (export $r (;39;) "r" (type 38))
   (type (;40;)
     (component
       (type (;0;)
@@ -108,7 +108,7 @@
       (export (;1;) "test:pkg/s" (instance (type 4)))
     )
   )
-  (export (;41;) "s" (type 40))
+  (export $s (;41;) "s" (type 40))
   (type (;42;)
     (component
       (type (;0;)
@@ -152,24 +152,24 @@
       (export (;0;) "test:pkg/t" (component (type 0)))
     )
   )
-  (export (;43;) "t" (type 42))
-  (export (;44;) "a2" (type 1))
-  (export (;45;) "b2" (type 3))
-  (export (;46;) "c2" (type 5))
-  (export (;47;) "d2" (type 7))
-  (export (;48;) "e2" (type 9))
-  (export (;49;) "f2" (type 11))
-  (export (;50;) "g2" (type 13))
-  (export (;51;) "h2" (type 15))
-  (export (;52;) "i2" (type 17))
-  (export (;53;) "j2" (type 19))
-  (export (;54;) "k2" (type 21))
-  (export (;55;) "l2" (type 23))
-  (export (;56;) "n2" (type 30))
-  (export (;57;) "m2" (type 25))
-  (export (;58;) "o2" (type 33))
-  (export (;59;) "p2" (type 35))
-  (export (;60;) "q2" (type 37))
+  (export $t (;43;) "t" (type 42))
+  (export $a2 (;44;) "a2" (type $a))
+  (export $b2 (;45;) "b2" (type $b))
+  (export $c2 (;46;) "c2" (type $c))
+  (export $d2 (;47;) "d2" (type $d))
+  (export $e2 (;48;) "e2" (type $e))
+  (export $f2 (;49;) "f2" (type $f))
+  (export $g2 (;50;) "g2" (type $g))
+  (export $h2 (;51;) "h2" (type $h))
+  (export $i2 (;52;) "i2" (type $i))
+  (export $j2 (;53;) "j2" (type $j))
+  (export $k2 (;54;) "k2" (type $k))
+  (export $l2 (;55;) "l2" (type $l))
+  (export $n2 (;56;) "n2" (type $n))
+  (export $m2 (;57;) "m2" (type $m))
+  (export $o2 (;58;) "o2" (type $o))
+  (export $p2 (;59;) "p2" (type $p))
+  (export $q2 (;60;) "q2" (type $q))
   (@producers
     (processed-by "wac-parser" "0.1.0")
   )

crates/wac-resolver/tests/registry.rs

@@ -79,14 +79,14 @@ export i2.foo as "bar";
       (export (;0;) "bar" (func (type 0)))
     )
   )
-  (import "test:wit/foo" (instance (;0;) (type 0)))
+  (import "test:wit/foo" (instance $x (;0;) (type 0)))
   (type (;1;)
     (instance
       (type (;0;) (func))
       (export (;0;) "bar" (func (type 0)))
     )
   )
-  (import "y" (instance (;1;) (type 1)))
+  (import "y" (instance $y (;1;) (type 1)))
   (type (;2;)
     (component
       (type (;0;)
@@ -100,16 +100,16 @@ export i2.foo as "bar";
     )
   )
   (import "unlocked-dep=<test:comp>" (component (;0;) (type 2)))
-  (instance (;2;) (instantiate 0
-      (with "test:wit/foo" (instance 0))
+  (instance $i1 (;2;) (instantiate 0
+      (with "test:wit/foo" (instance $x))
     )
   )
-  (instance (;3;) (instantiate 0
-      (with "test:wit/foo" (instance 1))
+  (instance $i2 (;3;) (instantiate 0
+      (with "test:wit/foo" (instance $y))
     )
   )
-  (alias export 2 "test:wit/foo" (instance (;4;)))
-  (alias export 3 "test:wit/foo" (instance (;5;)))
+  (alias export $i1 "test:wit/foo" (instance (;4;)))
+  (alias export $i2 "test:wit/foo" (instance (;5;)))
   (export (;6;) "test:wit/foo" (instance 4))
   (export (;7;) "bar" (instance 5))
   (@producers