Merge pull request #71 from rylev/import-components

peterhuene · web-flow · commit 81a5ef9c9138 · 2024-04-08T12:36:25.000-07:00
Import component dependencies in tests instead of defining inline.
diff --git a/crates/wac-graph/tests/encoding.rs b/crates/wac-graph/tests/encoding.rs
@@ -312,7 +312,13 @@ fn encoding() -> Result<()> {
             .into_composition_graph(&path, test_case)
             .and_then(|graph| {
                 graph
-                    .encode(EncodeOptions::default())
+                    .encode(EncodeOptions {
+                        // We import the component definitions instead
+                        // of defining them inline to make the encoded wat
+                        // more readable and to test encoding a bit more.
+                        define_components: false,
+                        validate: true,
+                    })
                     .context("failed to encode the graph")
             });
 
diff --git a/crates/wac-graph/tests/graphs/merged-usings/encoded.wat b/crates/wac-graph/tests/graphs/merged-usings/encoded.wat
@@ -16,178 +16,78 @@
     )
   )
   (import "foo:bar/qux" (instance (;1;) (type 2)))
-  (component (;0;)
-    (type (;0;)
-      (instance
-        (export (;0;) "x" (type (sub resource)))
+  (type (;3;)
+    (component
+      (type (;0;)
+        (instance
+          (export (;0;) "x" (type (sub resource)))
+        )
       )
-    )
-    (import "foo:bar/baz" (instance (;0;) (type 0)))
-    (alias export 0 "x" (type (;1;)))
-    (type (;2;)
-      (instance
-        (alias outer 1 1 (type (;0;)))
-        (export (;1;) "x" (type (eq 0)))
-        (type (;2;) (own 1))
-        (type (;3;) (func (result 2)))
-        (export (;0;) "f" (func (type 3)))
-      )
-    )
-    (import "foo:bar/qux" (instance (;1;) (type 2)))
-    (core module (;0;)
-      (type (;0;) (func (param i32)))
-      (type (;1;) (func (result i32)))
-      (type (;2;) (func (param i32 i32 i32 i32) (result i32)))
-      (import "foo:bar/baz" "[resource-drop]x" (func (;0;) (type 0)))
-      (import "foo:bar/qux" "f" (func (;1;) (type 1)))
-      (func (;2;) (type 1) (result i32)
-        unreachable
-      )
-      (func (;3;) (type 2) (param i32 i32 i32 i32) (result i32)
-        unreachable
-      )
-      (memory (;0;) 0)
-      (export "foo:bar/qux#f" (func 2))
-      (export "memory" (memory 0))
-      (export "cabi_realloc" (func 3))
-      (@producers
-        (processed-by "wit-component" "0.202.0")
-      )
-    )
-    (alias export 0 "x" (type (;3;)))
-    (core func (;0;) (canon resource.drop 3))
-    (core instance (;0;)
-      (export "[resource-drop]x" (func 0))
-    )
-    (alias export 1 "f" (func (;0;)))
-    (core func (;1;) (canon lower (func 0)))
-    (core instance (;1;)
-      (export "f" (func 1))
-    )
-    (core instance (;2;) (instantiate 0
-        (with "foo:bar/baz" (instance 0))
-        (with "foo:bar/qux" (instance 1))
+      (import "foo:bar/baz" (instance (;0;) (type 0)))
+      (alias export 0 "x" (type (;1;)))
+      (type (;2;)
+        (instance
+          (alias outer 1 1 (type (;0;)))
+          (export (;1;) "x" (type (eq 0)))
+          (type (;2;) (own 1))
+          (type (;3;) (func (result 2)))
+          (export (;0;) "f" (func (type 3)))
+        )
       )
-    )
-    (alias core export 2 "memory" (core memory (;0;)))
-    (alias core export 2 "cabi_realloc" (core func (;2;)))
-    (alias export 0 "x" (type (;4;)))
-    (type (;5;) (own 4))
-    (type (;6;) (func (result 5)))
-    (alias core export 2 "foo:bar/qux#f" (core func (;3;)))
-    (func (;1;) (type 6) (canon lift (core func 3)))
-    (alias export 0 "x" (type (;7;)))
-    (component (;0;)
-      (import "import-type-x" (type (;0;) (sub resource)))
-      (import "import-type-x0" (type (;1;) (eq 0)))
-      (type (;2;) (own 1))
-      (type (;3;) (func (result 2)))
-      (import "import-func-f" (func (;0;) (type 3)))
-      (export (;4;) "x" (type 0))
-      (type (;5;) (own 4))
-      (type (;6;) (func (result 5)))
-      (export (;1;) "f" (func 0) (func (type 6)))
-    )
-    (instance (;2;) (instantiate 0
-        (with "import-func-f" (func 1))
-        (with "import-type-x" (type 7))
-        (with "import-type-x0" (type 4))
+      (import "foo:bar/qux" (instance (;1;) (type 2)))
+      (alias export 0 "x" (type (;3;)))
+      (type (;4;)
+        (instance
+          (alias outer 1 3 (type (;0;)))
+          (export (;1;) "x" (type (eq 0)))
+          (type (;2;) (own 1))
+          (type (;3;) (func (result 2)))
+          (export (;0;) "f" (func (type 3)))
+        )
       )
-    )
-    (export (;3;) "foo:bar/qux" (instance 2))
-    (@producers
-      (processed-by "wit-component" "0.202.0")
+      (export (;2;) "foo:bar/qux" (instance (type 4)))
     )
   )
+  (import "unlocked-dep=<test:bar>" (component (;0;) (type 3)))
   (instance $component2 (;2;) (instantiate 0
       (with "foo:bar/baz" (instance 0))
       (with "foo:bar/qux" (instance 1))
     )
   )
   (alias export $component2 "foo:bar/qux" (instance $alias (;3;)))
-  (component (;1;)
-    (type (;0;)
-      (instance
-        (export (;0;) "x" (type (sub resource)))
+  (type (;4;)
+    (component
+      (type (;0;)
+        (instance
+          (export (;0;) "x" (type (sub resource)))
+        )
       )
-    )
-    (import "foo:bar/baz" (instance (;0;) (type 0)))
-    (alias export 0 "x" (type (;1;)))
-    (type (;2;)
-      (instance
-        (alias outer 1 1 (type (;0;)))
-        (export (;1;) "x" (type (eq 0)))
-        (type (;2;) (own 1))
-        (type (;3;) (func (result 2)))
-        (export (;0;) "f" (func (type 3)))
-      )
-    )
-    (import "foo:bar/qux" (instance (;1;) (type 2)))
-    (core module (;0;)
-      (type (;0;) (func (param i32)))
-      (type (;1;) (func (result i32)))
-      (type (;2;) (func (param i32 i32 i32 i32) (result i32)))
-      (import "foo:bar/baz" "[resource-drop]x" (func (;0;) (type 0)))
-      (import "foo:bar/qux" "f" (func (;1;) (type 1)))
-      (func (;2;) (type 1) (result i32)
-        unreachable
-      )
-      (func (;3;) (type 2) (param i32 i32 i32 i32) (result i32)
-        unreachable
-      )
-      (memory (;0;) 0)
-      (export "foo:bar/qux#f" (func 2))
-      (export "memory" (memory 0))
-      (export "cabi_realloc" (func 3))
-      (@producers
-        (processed-by "wit-component" "0.202.0")
-      )
-    )
-    (alias export 0 "x" (type (;3;)))
-    (core func (;0;) (canon resource.drop 3))
-    (core instance (;0;)
-      (export "[resource-drop]x" (func 0))
-    )
-    (alias export 1 "f" (func (;0;)))
-    (core func (;1;) (canon lower (func 0)))
-    (core instance (;1;)
-      (export "f" (func 1))
-    )
-    (core instance (;2;) (instantiate 0
-        (with "foo:bar/baz" (instance 0))
-        (with "foo:bar/qux" (instance 1))
+      (import "foo:bar/baz" (instance (;0;) (type 0)))
+      (alias export 0 "x" (type (;1;)))
+      (type (;2;)
+        (instance
+          (alias outer 1 1 (type (;0;)))
+          (export (;1;) "x" (type (eq 0)))
+          (type (;2;) (own 1))
+          (type (;3;) (func (result 2)))
+          (export (;0;) "f" (func (type 3)))
+        )
       )
-    )
-    (alias core export 2 "memory" (core memory (;0;)))
-    (alias core export 2 "cabi_realloc" (core func (;2;)))
-    (alias export 0 "x" (type (;4;)))
-    (type (;5;) (own 4))
-    (type (;6;) (func (result 5)))
-    (alias core export 2 "foo:bar/qux#f" (core func (;3;)))
-    (func (;1;) (type 6) (canon lift (core func 3)))
-    (alias export 0 "x" (type (;7;)))
-    (component (;0;)
-      (import "import-type-x" (type (;0;) (sub resource)))
-      (import "import-type-x0" (type (;1;) (eq 0)))
-      (type (;2;) (own 1))
-      (type (;3;) (func (result 2)))
-      (import "import-func-f" (func (;0;) (type 3)))
-      (export (;4;) "x" (type 0))
-      (type (;5;) (own 4))
-      (type (;6;) (func (result 5)))
-      (export (;1;) "f" (func 0) (func (type 6)))
-    )
-    (instance (;2;) (instantiate 0
-        (with "import-func-f" (func 1))
-        (with "import-type-x" (type 7))
-        (with "import-type-x0" (type 4))
+      (import "foo:bar/qux" (instance (;1;) (type 2)))
+      (alias export 0 "x" (type (;3;)))
+      (type (;4;)
+        (instance
+          (alias outer 1 3 (type (;0;)))
+          (export (;1;) "x" (type (eq 0)))
+          (type (;2;) (own 1))
+          (type (;3;) (func (result 2)))
+          (export (;0;) "f" (func (type 3)))
+        )
       )
-    )
-    (export (;3;) "foo:bar/qux" (instance 2))
-    (@producers
-      (processed-by "wit-component" "0.202.0")
+      (export (;2;) "foo:bar/qux" (instance (type 4)))
     )
   )
+  (import "unlocked-dep=<test:foo>" (component (;1;) (type 4)))
   (instance $component1 (;4;) (instantiate 1
       (with "foo:bar/qux" (instance $alias))
       (with "foo:bar/baz" (instance 0))
diff --git a/crates/wac-graph/tests/graphs/simple/encoded.wat b/crates/wac-graph/tests/graphs/simple/encoded.wat
@@ -18,49 +18,55 @@
   (import "i2" (instance (;2;) (type 2)))
   (type (;3;) (func))
   (import "my-foo" (func $my-foo (;0;) (type 3)))
-  (component (;0;)
-    (type (;0;) (func))
-    (type (;1;) (func))
-    (import "foo" (func (;0;) (type 1)))
-    (type (;2;)
-      (instance)
-    )
-    (import "i1" (instance (;0;) (type 2)))
-    (type (;3;)
-      (instance
-        (type (;0;) (func))
-        (export (;0;) "a" (func (type 0)))
-        (type (;1;) (func))
-        (export (;1;) "b" (func (type 1)))
+  (type (;4;)
+    (component
+      (type (;0;) (func))
+      (import "foo" (func (;0;) (type 0)))
+      (type (;1;)
+        (instance)
+      )
+      (import "i1" (instance (;0;) (type 1)))
+      (type (;2;)
+        (instance
+          (type (;0;) (func))
+          (export (;0;) "a" (func (type 0)))
+          (type (;1;) (func))
+          (export (;1;) "b" (func (type 1)))
+        )
       )
+      (import "merged" (instance (;1;) (type 2)))
+      (export (;1;) "bar" (func (type 0)))
+      (type (;3;) (func))
+      (export (;4;) "f" (type (eq 3)))
     )
-    (import "merged" (instance (;1;) (type 3)))
-    (export (;1;) "bar" (func 0))
-    (export (;4;) "f" (type 0))
   )
+  (import "unlocked-dep=<test:foo>" (component (;0;) (type 4)))
   (instance $foo (;3;) (instantiate 0
       (with "foo" (func $my-foo))
       (with "i1" (instance 0))
       (with "merged" (instance 1))
     )
   )
   (alias export $foo "bar" (func $e (;1;)))
-  (component (;1;)
-    (type (;0;) (func))
-    (import "e" (func (;0;) (type 0)))
-    (type (;1;)
-      (instance)
-    )
-    (import "i2" (instance (;0;) (type 1)))
-    (type (;2;)
-      (instance
-        (type (;0;) (func))
-        (export (;0;) "a" (func (type 0)))
+  (type (;5;)
+    (component
+      (type (;0;) (func))
+      (import "e" (func (;0;) (type 0)))
+      (type (;1;)
+        (instance)
+      )
+      (import "i2" (instance (;0;) (type 1)))
+      (type (;2;)
+        (instance
+          (type (;0;) (func))
+          (export (;0;) "a" (func (type 0)))
+        )
       )
+      (import "merged" (instance (;1;) (type 2)))
+      (export (;1;) "e" (func (type 0)))
     )
-    (import "merged" (instance (;1;) (type 2)))
-    (export (;1;) "e" (func 0))
   )
+  (import "unlocked-dep=<test:bar>" (component (;1;) (type 5)))
   (instance $bar (;4;) (instantiate 1
       (with "e" (func $e))
       (with "i2" (instance 2))
