Merge pull request #298 from bytecodealliance/ydnar/wasm-tools-1.226.0

all: update wasm-tools to 1.226.0

Author: ydnar

.github/workflows/test.yaml

@@ -14,7 +14,7 @@ on:
 
 env:
   go-modules: ./... ./cm/...
-  wasm-tools-version: "1.224.0"
+  wasm-tools-version: "1.226.0"
   wasmtime-version: "26.0.0"
 
 jobs:

CHANGELOG.md

@@ -13,6 +13,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 ### Changed
 
 - Breaking: generated `*.wasm.go` files will now have correct WIT kebab-case base name. Interfaces or worlds with `-` in their name will require removal of the previous `*.wasm.go` files.
+- Breaking: upgraded to `wasm-tools` [v1.226.0](https://github.com/bytecodealliance/wasm-tools/releases/tag/v1.226.0), which [removes support](https://github.com/bytecodealliance/wasm-tools/pull/2050) for multiple return values and flags with > 32 values. To ease migration, this package will continue to support JSON generated by `wasm-tools` v1.225.0 and earlier.
 - Dropped support for TinyGo v0.32.0.
 
 ### Fixed

internal/wasmtools/Cargo.lock

@@ -3,7 +3,7 @@ name = 'wasm-tools-go'
 edition = '2021'
 
 [dependencies]
-wasm-tools = { version = '1.224.0', default-features = false, features = [
+wasm-tools = { version = '1.226.0', default-features = false, features = [
 	'component',
 ] }
 

internal/wasmtools/Cargo.toml

@@ -6,7 +6,6 @@ world bindings {
 
 interface component {
     variant unused-variant {
-        %string,
         %enum(unused-enum),
         %record(unused-record)
     }

internal/wasmtools/wasm-tools.wasm.gz

@@ -62,10 +62,6 @@
       "kind": {
         "variant": {
           "cases": [
-            {
-              "name": "string",
-              "type": null
-            },
             {
               "name": "enum",
               "type": 0

testdata/codegen/allow-unused.wit

@@ -4,7 +4,6 @@ interface component {
 	enum unused-enum { unused }
 	record unused-record { x: u32 }
 	variant unused-variant {
-		%string,
 		%enum(unused-enum),
 		%record(unused-record),
 	}

testdata/codegen/allow-unused.wit.json

@@ -33,7 +33,6 @@
               "type": "char"
             }
           ],
-          "results": [],
           "docs": {
             "contents": "A function that accepts a character"
           }
@@ -42,11 +41,7 @@
           "name": "return-char",
           "kind": "freestanding",
           "params": [],
-          "results": [
-            {
-              "type": "char"
-            }
-          ],
+          "result": "char",
           "docs": {
             "contents": "A function that returns a character"
           }

testdata/codegen/allow-unused.wit.json.golden.wit

@@ -29,8 +29,7 @@
         "kebab-case": {
           "name": "kebab-case",
           "kind": "freestanding",
-          "params": [],
-          "results": []
+          "params": []
         },
         "foo": {
           "name": "foo",
@@ -40,71 +39,60 @@
               "name": "x",
               "type": 0
             }
-          ],
-          "results": []
+          ]
         },
         "function-with-dashes": {
           "name": "function-with-dashes",
           "kind": "freestanding",
-          "params": [],
-          "results": []
+          "params": []
         },
         "function-with-no-weird-characters": {
           "name": "function-with-no-weird-characters",
           "kind": "freestanding",
-          "params": [],
-          "results": []
+          "params": []
         },
         "apple": {
           "name": "apple",
           "kind": "freestanding",
-          "params": [],
-          "results": []
+          "params": []
         },
         "apple-pear": {
           "name": "apple-pear",
           "kind": "freestanding",
-          "params": [],
-          "results": []
+          "params": []
         },
         "apple-pear-grape": {
           "name": "apple-pear-grape",
           "kind": "freestanding",
-          "params": [],
-          "results": []
+          "params": []
         },
         "a0": {
           "name": "a0",
           "kind": "freestanding",
-          "params": [],
-          "results": []
+          "params": []
         },
         "is-XML": {
           "name": "is-XML",
           "kind": "freestanding",
           "params": [],
-          "results": [],
           "docs": {
             "contents": " Comment out identifiers that collide when mapped to snake_case, for now; see\n https://github.com/WebAssembly/component-model/issues/118\nAPPLE: func()\nAPPLE-pear-GRAPE: func()\napple-PEAR-grape: func()"
           }
         },
         "explicit": {
           "name": "explicit",
           "kind": "freestanding",
-          "params": [],
-          "results": []
+          "params": []
         },
         "explicit-kebab": {
           "name": "explicit-kebab",
           "kind": "freestanding",
-          "params": [],
-          "results": []
+          "params": []
         },
         "bool": {
           "name": "bool",
           "kind": "freestanding",
           "params": [],
-          "results": [],
           "docs": {
             "contents": "Identifiers with the same name as keywords are quoted."
           }