Also check world uses

Signed-off-by: Ryan Levick <ryan.levick@fermyon.com>

Author: rylev

…lution/fail/targets-implicit-imports.wac …esolution/fail/targets-interface-use.waccrates/wac-parser/tests/resolution/fail/targets-implicit-imports.wac renamed to crates/wac-parser/tests/resolution/fail/targets-interface-use.wac crates/wac-parser/tests/resolution/fail/targets-implicit-imports.wac renamed to crates/wac-parser/tests/resolution/fail/targets-interface-use.wac

@@ -0,0 +1,13 @@
+package test:comp targets test:comp/foo;
+
+interface indirect-dependency {
+    // The resource is actually named "other-resource" in the instance
+    resource my-resource {}
+}
+
+world foo {   
+    use indirect-dependency.{my-resource};
+    import my-func: func() -> my-resource;
+}
+
+let i = new foo:bar { ... };

…fail/targets-implicit-imports.wac.result …on/fail/targets-interface-use.wac.resultcrates/wac-parser/tests/resolution/fail/targets-implicit-imports.wac.result renamed to crates/wac-parser/tests/resolution/fail/targets-interface-use.wac.result crates/wac-parser/tests/resolution/fail/targets-implicit-imports.wac.result renamed to crates/wac-parser/tests/resolution/fail/targets-interface-use.wac.result

@@ -0,0 +1,4 @@
+failed to resolve document
+
+  × import `test:comp/indirect-dependency` has a mismatched type for target world `test:comp/foo`
+  ╰─▶ instance has unexpected resource export `other-resource`

…ail/targets-implicit-imports/foo/bar.wat …n/fail/targets-interface-use/foo/bar.watcrates/wac-parser/tests/resolution/fail/targets-implicit-imports/foo/bar.wat renamed to crates/wac-parser/tests/resolution/fail/targets-interface-use/foo/bar.wat crates/wac-parser/tests/resolution/fail/targets-implicit-imports/foo/bar.wat renamed to crates/wac-parser/tests/resolution/fail/targets-interface-use/foo/bar.wat

@@ -0,0 +1,14 @@
+(component
+  (type (;0;)
+    (instance
+      (export (;0;) "other-resource" (type (sub resource)))
+    )
+  )
+  (import "test:comp/indirect-dependency" (instance (;0;) (type 0)))
+  (alias export 0 "other-resource" (type (;1;)))
+  (import "my-resource" (type (;2;) (eq 1)))
+  (type (;3;) (own 2))
+  (type (;4;) (func (result 3)))
+  (import "my-func" (func (;0;) (type 4)))
+  (alias export 0 "other-resource" (type (;5;)))
+)

crates/wac-parser/tests/resolution/fail/targets-world-use.wac

@@ -990,18 +990,22 @@ impl World {
         types: &'a Types,
     ) -> IndexMap<&str, ItemKind> {
         let mut interfaces = IndexMap::new();
+        let mut add_interface_for_used_type = |used_item: &UsedType| {
+            let used_interface_id = used_item.interface;
+            // The id must be set since used interfaces are always named.
+            let used_interface_name = types[used_interface_id].id.as_deref().unwrap();
+            interfaces.insert(used_interface_name, ItemKind::Instance(used_interface_id));
+        };
+
+        for (_, used_type) in self.uses.iter() {
+            add_interface_for_used_type(used_type);
+        }
+
         for (_, import) in self.imports.iter() {
             if let ItemKind::Instance(interface_id) = import {
                 let import = &types[*interface_id];
                 for (_, used_item) in &import.uses {
-                    let used_interface_id = used_item.interface;
-                    let used_interface = &types[used_interface_id];
-                    // The id must be set since used interfaces are always named.
-                    let used_interface_name = used_interface.id.as_ref().unwrap();
-                    interfaces.insert(
-                        used_interface_name.as_str(),
-                        ItemKind::Instance(used_interface_id),
-                    );
+                    add_interface_for_used_type(used_item);
                 }
             }
         }