Skip to content

wit, wit/bindgen: fix handling of transitively included @since gates across package boundaries #326

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 9 commits into
base: main
Choose a base branch
from
Draft

wit, wit/bindgen: fix handling of transitively included @since gates across package boundaries #326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4ae64e7
wit: sort unversioned packages first
ydnar Mar 23, 2025
0cacbca
wit: add Stability.Versioned method
ydnar Mar 23, 2025
af9469d
wit: skip incompatible @since gates from transitive included worlds f…
ydnar Mar 23, 2025
6c6ee2a
testdata: update fixtures for #306 and #325, add fixture from wit-par…
ydnar Mar 23, 2025
b84a802
testdata/issues: fix indentation
ydnar Mar 23, 2025
d0cd84f
wit/bindgen: define a Go package for every world, regardless of use
ydnar Mar 23, 2025
916c975
wit/bindgen: remove unused function findWorld
ydnar Mar 23, 2025
16743d2
wit/bindgen: clarify Go packages vs WIT packages
ydnar Mar 23, 2025
79fe4f7
wit/bindgen: revert field names
ydnar Apr 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion testdata/issues/issue306.wit
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// https://github.com/bytecodealliance/go-modules/issues/306
package issues:[email protected];

world w {
Expand Down
3 changes: 0 additions & 3 deletions testdata/issues/issue306.wit.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,6 @@
},
{
"name": "issues:[email protected]",
"docs": {
"contents": "https://github.com/bytecodealliance/go-modules/issues/306"
},
"interfaces": {},
"worlds": {
"w": 1
Expand Down
2 changes: 0 additions & 2 deletions testdata/issues/issue306.wit.json.golden.wit
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
package issues:[email protected];

world w {
@since(version = 0.2.0)
import issues:dep2/gated-interface;
}

/// https://github.com/bytecodealliance/go-modules/issues/306
package issues:[email protected] {
world w {
import issues:dep2/gated-interface;
Expand Down
34 changes: 34 additions & 0 deletions testdata/issues/issue325-processed.wit
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
package issues:issue325;

world w {
@unstable(feature = active)
import issues:dep2/i@0.2.0;
@unstable(feature = active)
use issues:dep2/i@0.2.0.{r};
}

package issues:dep1@0.1.0 {
world w {
import issues:dep2/[email protected];
}
}

package issues:unstable@0.1.0 {
world w {
@unstable(feature = active)
import issues:dep2/[email protected];
@unstable(feature = active)
use issues:dep2/[email protected].{r};
}
}

package issues:dep2@0.2.0 {
interface i {
resource r;
}

world w {
@since(version = 0.2.0)
import i;
}
}
152 changes: 152 additions & 0 deletions testdata/issues/issue325-processed.wit.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,152 @@
{
"worlds": [
{
"name": "w",
"imports": {
"interface-0": {
"interface": {
"id": 0,
"stability": {
"stable": {
"since": "0.2.0"
}
}
}
}
},
"exports": {},
"package": 0
},
{
"name": "w",
"imports": {
"interface-0": {
"interface": {
"id": 0
}
}
},
"exports": {},
"package": 1
},
{
"name": "w",
"imports": {
"interface-0": {
"interface": {
"id": 0,
"stability": {
"unstable": {
"feature": "active"
}
}
}
},
"r": {
"type": 1
}
},
"exports": {},
"package": 2
},
{
"name": "w",
"imports": {
"interface-0": {
"interface": {
"id": 0,
"stability": {
"unstable": {
"feature": "active"
}
}
}
},
"r": {
"type": 2
}
},
"exports": {},
"package": 3
}
],
"interfaces": [
{
"name": "i",
"types": {
"r": 0
},
"functions": {},
"package": 0
}
],
"types": [
{
"name": "r",
"kind": "resource",
"owner": {
"interface": 0
}
},
{
"name": "r",
"kind": {
"type": 0
},
"owner": {
"world": 2
},
"stability": {
"unstable": {
"feature": "active"
}
}
},
{
"name": "r",
"kind": {
"type": 0
},
"owner": {
"world": 3
},
"stability": {
"unstable": {
"feature": "active"
}
}
}
],
"packages": [
{
"name": "issues:[email protected]",
"interfaces": {
"i": 0
},
"worlds": {
"w": 0
}
},
{
"name": "issues:[email protected]",
"interfaces": {},
"worlds": {
"w": 1
}
},
{
"name": "issues:issue325",
"interfaces": {},
"worlds": {
"w": 2
}
},
{
"name": "issues:[email protected]",
"interfaces": {},
"worlds": {
"w": 3
}
}
]
}
34 changes: 34 additions & 0 deletions testdata/issues/issue325-processed.wit.json.golden.wit
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
package issues:issue325;

world w {
@unstable(feature = active)
import issues:dep2/[email protected];
@unstable(feature = active)
use issues:dep2/[email protected].{r};
}

package issues:[email protected] {
world w {
import issues:dep2/[email protected];
}
}

package issues:[email protected] {
world w {
@unstable(feature = active)
import issues:dep2/[email protected];
@unstable(feature = active)
use issues:dep2/[email protected].{r};
}
}

package issues:[email protected] {
interface i {
resource r;
}

world w {
@since(version = 0.2.0)
import i;
}
}
31 changes: 31 additions & 0 deletions testdata/issues/issue325.wit
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
package issues:issue325;

world w {
@unstable(feature = active)
include issues:dep1/[email protected];
include issues:unstable/[email protected];
}

package issues:[email protected] {
world w {
@unstable(feature = active)
use issues:dep2/[email protected].{r};
}
}

package issues:[email protected] {
world w {
include issues:dep2/[email protected];
}
}

package issues:[email protected] {
world w {
@since(version = 0.2.0)
import i;
}

interface i {
resource r;
}
}
Loading
Loading