versioned nest package names and general tidying

Author: macovedj

crates/wit-component/src/encoding/wit/v1.rs

@@ -171,11 +171,8 @@ impl InterfaceEncoder<'_> {
         let mut type_order = IndexSet::new();
         for (_, id) in iface.types.iter() {
             let ty = &self.resolve.types[*id];
-            match ty.owner {
-                TypeOwner::Interface(iface_id) => {
-                    self.interface = Some(iface_id);
-                }
-                _ => unreachable!(),
+            if let TypeOwner::Interface(iface_id) = ty.owner {
+                self.interface = Some(iface_id);
             }
             self.encode_valtype(self.resolve, &Type::Id(*id))?;
             type_order.insert(*id);

crates/wit-component/src/encoding/wit/v2.rs

@@ -185,11 +185,8 @@ impl InterfaceEncoder<'_> {
         let mut type_order = IndexSet::new();
         for (_, id) in iface.types.iter() {
             let ty = &self.resolve.types[*id];
-            match ty.owner {
-                TypeOwner::Interface(iface_id) => {
-                    self.interface = Some(iface_id);
-                }
-                _ => unreachable!(),
+            if let TypeOwner::Interface(iface_id) = ty.owner {
+                self.interface = Some(iface_id);
             }
             self.encode_valtype(self.resolve, &Type::Id(*id))?;
             type_order.insert(*id);
@@ -240,65 +237,47 @@ impl InterfaceEncoder<'_> {
         iface: &Interface,
         instance: &'a mut InstanceType,
     ) -> Result<&mut InstanceType> {
-        for (orig_name, _) in &iface.nested {
-            let mut pkg_parts = orig_name.split("/");
-            let pkg = pkg_parts.next().expect("expected projection");
-            let iface_name = pkg_parts.next().expect("expected projection");
-            let mut parts = pkg.split(":");
-            let namespace = parts.next().expect("expected <namespace>:<id>");
-            let name = parts.next().expect("expected <namespace>:<id>");
-            let name = PackageName {
-                namespace: namespace.to_string(),
-                name: name.to_string(),
-                version: None,
-            };
-
-            let package_id = self.resolve.package_names.get(&name).unwrap();
+        for (nest_name, nest_item) in &iface.nested {
+            let package_id = self
+                .resolve
+                .package_names
+                .get(&nest_item.package_name)
+                .unwrap();
             let package = &self.resolve.packages[*package_id];
-            let nested = package.interfaces.get(iface_name).unwrap();
+            let nested = package.interfaces.get(&nest_item.iface_name).unwrap();
             let nested_iface = &self.resolve.interfaces[*nested];
             let mut inst = InterfaceEncoder::new(&self.resolve);
             inst.push_instance();
             for (_, id) in &nested_iface.types {
                 let ty = &self.resolve.types[*id];
-                match ty.owner {
-                    TypeOwner::Interface(iface_id) => {
-                        inst.interface = Some(iface_id);
-                    }
-                    _ => unreachable!(),
+                if let TypeOwner::Interface(iface_id) = ty.owner {
+                    inst.interface = Some(iface_id);
                 }
                 inst.encode_valtype(self.resolve, &Type::Id(*id))?;
             }
             let ty = instance.ty();
             let nested_instance = &mut inst.pop_instance();
-            for (orig_name, _) in &nested_iface.nested {
-                let mut nest_package_parts = orig_name.split("/");
-                let nest_pkg = nest_package_parts.next().unwrap();
-                let nest_iface = nest_package_parts.next().unwrap();
-                let mut parts = nest_pkg.split(":");
-                let ns = parts.next().unwrap();
-                let name = parts.next().unwrap();
-                let name = PackageName {
-                    namespace: ns.to_string(),
-                    name: name.to_string(),
-                    version: None,
-                };
-                let nest_pkg_id = self.resolve.package_names.get(&name).unwrap();
-                let nested_package = &self.resolve.packages[*nest_pkg_id];
-                let myguy = nested_package.interfaces.get(nest_iface).unwrap();
-                let nest = &self.resolve.interfaces[*myguy];
+            for (nest_name, deep_nest) in &nested_iface.nested {
+                let deep_pkg_id = self
+                    .resolve
+                    .package_names
+                    .get(&deep_nest.package_name)
+                    .unwrap();
+                let deep_package = &self.resolve.packages[*deep_pkg_id];
+                let deep_iface_id = deep_package.interfaces.get(&deep_nest.iface_name).unwrap();
+                let deep_nest = &self.resolve.interfaces[*deep_iface_id];
                 let mut clone = nested_instance.clone();
-                let deep_instance = self.encode_nested(nest, &mut clone)?;
+                let deep_instance = self.encode_nested(deep_nest, &mut clone)?;
                 let deep_ty = nested_instance.ty();
                 deep_ty.instance(&deep_instance);
                 nested_instance.export(
-                    orig_name,
+                    nest_name,
                     ComponentTypeRef::Instance(deep_instance.type_count()),
                 );
             }
             ty.instance(&nested_instance);
             instance.export(
-                orig_name,
+                nest_name,
                 ComponentTypeRef::Instance(instance.type_count() - 1),
             );
         }

crates/wit-component/tests/interfaces.rs

@@ -53,6 +53,7 @@ fn run_test(path: &Path, is_dir: bool) -> Result<()> {
     } else {
         resolve.append(UnresolvedPackageGroup::parse_file(path)?)?
     };
+
     for package in packages {
         assert_print(&resolve, &[package], path, is_dir)?;
 
@@ -76,6 +77,7 @@ fn run_test(path: &Path, is_dir: bool) -> Result<()> {
             decoded.packages().len(),
             "Each input WIT package should produce WASM that contains only one package"
         );
+
         let decoded_package = decoded.packages()[0];
         let resolve = decoded.resolve();
 

crates/wit-component/tests/interfaces/nested.wat

@@ -4,112 +4,36 @@
       (type (;0;)
         (instance
           (type (;0;) (record (field "foo" string)))
-          (export (;1;) "usable-record" (type (eq 0)))
-        )
-      )
-      (import "foo:nestee/usable" (instance (;0;) (type 0)))
-      (alias export 0 "usable-record" (type (;1;)))
-      (type (;2;)
-        (instance
-          (alias outer 1 1 (type (;0;)))
-          (export (;1;) "usable-record" (type (eq 0)))
-          (type (;2;) (record (field "foo" string)))
-          (export (;3;) "my-record" (type (eq 2)))
-          (type (;4;) (func (result string)))
-          (export (;0;) "hello" (func (type 4)))
-          (type (;5;)
+          (export (;1;) "my-record" (type (eq 0)))
+          (type (;2;) (func (result string)))
+          (export (;0;) "hello" (func (type 2)))
+          (type (;3;)
             (instance
               (type (;0;) (record (field "foo" string)))
-              (export (;1;) "nestrecord" (type (eq 0)))
+              (export (;1;) "nest-record" (type (eq 0)))
               (type (;2;)
                 (instance
                   (type (;0;) (record (field "foo" string)))
-                  (export (;1;) "nestrecord" (type (eq 0)))
+                  (export (;1;) "nest-record" (type (eq 0)))
                 )
               )
               (export (;0;) "foo:nestnest/deep" (instance (type 2)))
             )
           )
-          (export (;0;) "foo:nestee/things" (instance (type 5)))
-          (type (;6;)
+          (export (;0;) "foo:nestee/things@1.0.0" (instance (type 3)))
+          (type (;4;)
             (instance
               (export (;0;) "foo" (type (sub resource)))
             )
           )
-          (export (;1;) "foo:nestee/more" (instance (type 6)))
+          (export (;1;) "foo:nestee/more@1.0.0" (instance (type 4)))
         )
       )
-      (export (;1;) "foo:thing/something" (instance (type 2)))
+      (export (;0;) "foo:thing/something" (instance (type 0)))
     )
   )
   (export (;1;) "something" (type 0))
-  (type (;2;)
-    (component
-      (type (;0;)
-        (instance
-          (type (;0;) (list u8))
-          (export (;1;) "random" (type (eq 0)))
-        )
-      )
-      (export (;0;) "foo:thing/flat" (instance (type 0)))
-    )
-  )
-  (export (;3;) "flat" (type 2))
-  (type (;4;)
-    (component
-      (type (;0;)
-        (component
-          (type (;0;)
-            (instance
-              (type (;0;) (record (field "foo" string)))
-              (export (;1;) "usable-record" (type (eq 0)))
-            )
-          )
-          (import "foo:nestee/usable" (instance (;0;) (type 0)))
-          (alias export 0 "usable-record" (type (;1;)))
-          (type (;2;)
-            (instance
-              (alias outer 1 1 (type (;0;)))
-              (export (;1;) "usable-record" (type (eq 0)))
-              (type (;2;) (record (field "foo" string)))
-              (export (;3;) "my-record" (type (eq 2)))
-              (type (;4;) (func (result string)))
-              (export (;0;) "hello" (func (type 4)))
-            )
-          )
-          (import "foo:thing/something" (instance (;1;) (type 2)))
-          (type (;3;)
-            (instance
-              (type (;0;) (list u8))
-              (export (;1;) "random" (type (eq 0)))
-            )
-          )
-          (import "foo:thing/flat" (instance (;2;) (type 3)))
-          (type (;4;)
-            (instance
-              (alias outer 1 1 (type (;0;)))
-              (export (;1;) "usable-record" (type (eq 0)))
-              (type (;2;) (record (field "foo" string)))
-              (export (;3;) "my-record" (type (eq 2)))
-              (type (;4;) (func (result string)))
-              (export (;0;) "hello" (func (type 4)))
-            )
-          )
-          (export (;3;) "foo:thing/something" (instance (type 4)))
-          (type (;5;)
-            (instance
-              (type (;0;) (list u8))
-              (export (;1;) "random" (type (eq 0)))
-            )
-          )
-          (export (;4;) "foo:thing/flat" (instance (type 5)))
-        )
-      )
-      (export (;0;) "foo:thing/my-world" (component (type 0)))
-    )
-  )
-  (export (;5;) "my-world" (type 4))
-  (@custom "package-docs" "\01{\22interfaces\22:{\22something\22:{\22types\22:{\22my-record\22:{\22stability\22:{\22stable\22:{\22since\22:\221.0.0\22}}}},\22nested\22:{\22foo:nestee/things\22:{\22docs\22:{\22contents\22:\22nesting can be documented\22},\22stability\22:\22unknown\22},\22foo:nestee/more\22:{\22docs\22:{\22contents\22:null},\22stability\22:{\22stable\22:{\22since\22:\221.0.0\22}}}}}}}")
+  (@custom "package-docs" "\01{\22interfaces\22:{\22something\22:{\22types\22:{\22my-record\22:{\22stability\22:{\22stable\22:{\22since\22:\221.0.0\22}}}},\22nested\22:{\22foo:nestee/[email protected]\22:{\22docs\22:{\22contents\22:\22nesting can be documented\22},\22stability\22:\22unknown\22},\22foo:nestee/[email protected]\22:{\22docs\22:{\22contents\22:null},\22stability\22:{\22stable\22:{\22since\22:\221.0.0\22}}}}}}}")
   (@producers
     (processed-by "wit-component" "$CARGO_PKG_VERSION")
   )

crates/wit-component/tests/interfaces/nested/deps/nestee.wit

@@ -1,10 +1,10 @@
-package foo:nestee;
+package foo:nestee@1.0.0;
 
 interface things {
   //nesting can be documented
   @since(version = 1.0.0)
   nest foo:nestnest/deep;
-  record nestrecord {
+  record nest-record {
     foo: string
   }
   hello: func() -> string;
@@ -14,10 +14,4 @@ interface more {
   resource foo {
     bar: func() -> option<string>;
   }
-}
-
-interface usable {
-  record usable-record {
-    foo: string
-  }
 }

crates/wit-component/tests/interfaces/nested/nested.wit

@@ -1,26 +1,14 @@
 package foo:thing;
 
 interface something {
-  use foo:nestee/usable.{usable-record};
   //nesting can be documented
-  nest foo:nestee/things;
+  nest foo:nestee/things@1.0.0;
   @since(version = 1.0.0)
-  nest foo:nestee/more;
+  nest foo:nestee/more@1.0.0;
   @since(version = 1.0.0)
   record my-record {
     foo: string
   }
 
   hello: func() -> string;
 }
-
-interface flat {
-  type random = list<u8>;
-}
-
-world my-world {
-  import something;
-  export something;
-  import flat;
-  export flat;
-}

crates/wit-component/tests/interfaces/nested/thing.wit.print

@@ -2,11 +2,9 @@ package foo:thing;
 
 interface something {
   /// nesting can be documented
-  nest foo:nestee/things;
+  nest foo:nestee/things@1.0.0;
   @since(version = 1.0.0)
-  nest foo:nestee/more;
-  use foo:nestee/usable.{usable-record};
-
+  nest foo:nestee/[email protected];
   @since(version = 1.0.0)
   record my-record {
     foo: string,
@@ -15,15 +13,3 @@ interface something {
   hello: func() -> string;
 }
 
-interface flat {
-  type random = list<u8>;
-}
-
-world my-world {
-  import foo:nestee/usable;
-  import something;
-  import flat;
-
-  export something;
-  export flat;
-}