Merge pull request #307 from bytecodealliance/ydnar/issue-306

wit/bindgen: always run wasm-tools with --all-features

Author: ydnar

CHANGELOG.md

@@ -21,6 +21,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 - [#281](https://github.com/bytecodealliance/go-modules/issues/281): errors from internal `wasm-tools` calls are no longer silently ignored. This required fixing a number of related issues, including synthetic world packages for Component Model metadata generation, WIT generation, and WIT keyword escaping in WIT package or interface names.
 - [#284](https://github.com/bytecodealliance/go-modules/issues/284): do not use `bool` for `variant` or `result` GC shapes. TinyGo returns `result` and `variant` values with `bool` as 0 or 1, which breaks the memory representation of tagged unions (variants).
 - [#288](https://github.com/bytecodealliance/go-modules/issues/288): correctly report the `wasm32` ABI alignment of `list<T>` as 4, rather than 8.
+- [#306](https://github.com/bytecodealliance/go-modules/issues/306): run `wasm-tools` with the `--all-features` argument so feature-gated WIT is correctly found when synthesizing Component Model metadata for a Go package.
 
 ## [v0.5.0] — 2024-12-14
 

testdata/issues/issue306.wit

@@ -0,0 +1,19 @@
+// https://github.com/bytecodealliance/go-modules/issues/306
+package issues:issue306;
+
+world w {
+    include issues:dep1/w;
+}
+
+package issues:dep1 {
+	world w {
+		import issues:dep2/gated-interface;
+	}
+}
+
+package issues:dep2 {
+	@unstable(feature = some-feature-gate)
+	interface gated-interface {
+		f: func(v: u64) -> s32;
+	}
+}

testdata/issues/issue306.wit.json

@@ -0,0 +1,80 @@
+{
+  "worlds": [
+    {
+      "name": "w",
+      "imports": {
+        "interface-0": {
+          "interface": {
+            "id": 0
+          }
+        }
+      },
+      "exports": {},
+      "package": 1
+    },
+    {
+      "name": "w",
+      "imports": {
+        "interface-0": {
+          "interface": {
+            "id": 0
+          }
+        }
+      },
+      "exports": {},
+      "package": 2
+    }
+  ],
+  "interfaces": [
+    {
+      "name": "gated-interface",
+      "types": {},
+      "functions": {
+        "f": {
+          "name": "f",
+          "kind": "freestanding",
+          "params": [
+            {
+              "name": "v",
+              "type": "u64"
+            }
+          ],
+          "result": "s32"
+        }
+      },
+      "stability": {
+        "unstable": {
+          "feature": "some-feature-gate"
+        }
+      },
+      "package": 0
+    }
+  ],
+  "types": [],
+  "packages": [
+    {
+      "name": "issues:dep2",
+      "interfaces": {
+        "gated-interface": 0
+      },
+      "worlds": {}
+    },
+    {
+      "name": "issues:dep1",
+      "interfaces": {},
+      "worlds": {
+        "w": 0
+      }
+    },
+    {
+      "name": "issues:issue306",
+      "docs": {
+        "contents": "https://github.com/bytecodealliance/go-modules/issues/306"
+      },
+      "interfaces": {},
+      "worlds": {
+        "w": 1
+      }
+    }
+  ]
+}

testdata/issues/issue306.wit.json.golden.wit

@@ -0,0 +1,19 @@
+package issues:dep1;
+
+world w {
+	import issues:dep2/gated-interface;
+}
+
+/// https://github.com/bytecodealliance/go-modules/issues/306
+package issues:issue306 {
+	world w {
+		import issues:dep2/gated-interface;
+	}
+}
+
+package issues:dep2 {
+	@unstable(feature = some-feature-gate)
+	interface gated-interface {
+		f: func(v: u64) -> s32;
+	}
+}

wit/bindgen/generator.go

@@ -2417,7 +2417,7 @@ func (g *generator) componentEmbed(witData string) ([]byte, error) {
 
 	// TODO: --all-features?
 	filename := "component.wit"
-	args := []string{"component", "embed", "--only-custom", filename}
+	args := []string{"component", "embed", "--only-custom", "--all-features", filename}
 	fsMap := map[string]fs.FS{
 		"": fstest.MapFS{
 			filename: &fstest.MapFile{Data: []byte(witData)},