jordan-rash
commented
1 year ago Adding this issue for tracking....https://github.com/WebAssembly/component-model/issues/125
The current code gen (for the core module) uses maps in three spots. Per that issue, and I have looked through the code gen to verify, there isn't a map/dict type in wit at this time.
type HostEnvValues map[string]string
type LinkSettings map[string]string
type TraceContext map[string]stringThat issue recommends wrapping a tuple in a list list<tuple<string,string>> which generates the following
type WasmcloudCoreTypesTuple2StringStringT struct {
F0 string
F1 string
}
type WasmcloudCoreTypesLinkDefination struct {
ActorId string
ProviderId string
LinkName string
ContractId string
Values Option[[]WasmcloudCoreTypesTuple2StringStringT]
}
type Option[T any] struct {
kind optionKind
val T
}
autodidaddict
brooksmtownsend
Feature or Problem
Initial pass at wit-i-fying the wasmcloud core contract.
Generated Go
```go package wasmcloud_core // #include "wasmcloud_core.h" import "C" type WasmcloudCoreTypesTraceContext struct { F0 string F1 string } type WasmcloudCoreTypesLogLevelKind int const ( WasmcloudCoreTypesLogLevelKindTrace WasmcloudCoreTypesLogLevelKind = iota WasmcloudCoreTypesLogLevelKindDebug WasmcloudCoreTypesLogLevelKindInfo WasmcloudCoreTypesLogLevelKindWarn WasmcloudCoreTypesLogLevelKindError ) type WasmcloudCoreTypesLogLevel struct { kind WasmcloudCoreTypesLogLevelKind } func (n WasmcloudCoreTypesLogLevel) Kind() WasmcloudCoreTypesLogLevelKind { return n.kind } func WasmcloudCoreTypesLogLevelTrace() WasmcloudCoreTypesLogLevel{ return WasmcloudCoreTypesLogLevel{kind: WasmcloudCoreTypesLogLevelKindTrace} } func WasmcloudCoreTypesLogLevelDebug() WasmcloudCoreTypesLogLevel{ return WasmcloudCoreTypesLogLevel{kind: WasmcloudCoreTypesLogLevelKindDebug} } func WasmcloudCoreTypesLogLevelInfo() WasmcloudCoreTypesLogLevel{ return WasmcloudCoreTypesLogLevel{kind: WasmcloudCoreTypesLogLevelKindInfo} } func WasmcloudCoreTypesLogLevelWarn() WasmcloudCoreTypesLogLevel{ return WasmcloudCoreTypesLogLevel{kind: WasmcloudCoreTypesLogLevelKindWarn} } func WasmcloudCoreTypesLogLevelError() WasmcloudCoreTypesLogLevel{ return WasmcloudCoreTypesLogLevel{kind: WasmcloudCoreTypesLogLevelKindError} } type WasmcloudCoreTypesLinkSettings struct { F0 string F1 string } type WasmcloudCoreTypesLinkDefination struct { ActorId string ProviderId string LinkName string ContractId string Values Option[WasmcloudCoreTypesLinkSettings] } type WasmcloudCoreTypesHostEnvValues struct { F0 string F1 string } type WasmcloudCoreTypesHealthCheckResponse struct { Healthy bool Message string } type WasmcloudCoreTypesHealthCheckRequest struct { } type WasmcloudCoreTypesClusterIssuerKey = string type WasmcloudCoreTypesClusterIssuers = string type WasmcloudCoreTypesCapabilityContractId = string type WasmcloudCoreTypesWasmcloudEntity struct { PublicKey string LinkName string ContractId string } type WasmcloudCoreTypesBlob = uint8 type WasmcloudCoreTypesInvocationResponse struct { Msg []uint8 InvocationId string Error string ContentLength uint64 } type WasmcloudCoreTypesInvocation struct { Origin WasmcloudCoreTypesWasmcloudEntity Target WasmcloudCoreTypesWasmcloudEntity Operation string Msg []uint8 Id string EncodedClaims string HostId string ContentLength uint64 TraceContext WasmcloudCoreTypesTraceContext } type WasmcloudCoreTypesActorLinks = WasmcloudCoreTypesLinkDefination type WasmcloudCoreTypesHostData struct { HostId string LatticeRpcPrefix string LinkName string LatticeRpcUserJwt string LatticeRpcUserSeed string LatticeRpcUrl string ProviderKey string InvocationSeed string EnvValues WasmcloudCoreTypesHostEnvValues InstanceId string LinkDefinations []WasmcloudCoreTypesLinkDefination ClusterIssuers []string ConfigJson string DefaultRpcTimeoutMs uint64 StructuredLogging bool LogLevel WasmcloudCoreTypesLogLevel } type WasmcloudCoreHostData = WasmcloudCoreTypesHostData type WasmcloudCoreInvocation = WasmcloudCoreTypesInvocation type WasmcloudCoreInvocationResponse = WasmcloudCoreTypesInvocationResponse type WasmcloudCoreHealthCheckRequest = WasmcloudCoreTypesHealthCheckRequest type WasmcloudCoreHealthCheckResponse = WasmcloudCoreTypesHealthCheckResponse type WasmcloudCoreLinkDefination = WasmcloudCoreTypesLinkDefination // Import functions from wasmcloud:core/types@0.1.0 ```Generated Rust
```rust // Generated by `wit-bindgen` 0.8.0. DO NOT EDIT! pub mod wasmcloud { pub mod core { #[allow(clippy::all)] pub mod types { #[used] #[doc(hidden)] #[cfg(target_arch = "wasm32")] static __FORCE_SECTION_REF: fn() = super::super::super::__link_section; #[repr(u8)] #[derive(Clone, Copy, PartialEq, Eq)] pub enum LogLevel { Trace, Debug, Info, Warn, Error, } impl ::core::fmt::Debug for LogLevel { fn fmt(&self, f: &mut ::core::fmt::Formatter<'_>) -> ::core::fmt::Result { match self { LogLevel::Trace => { f.debug_tuple("LogLevel::Trace").finish() } LogLevel::Debug => { f.debug_tuple("LogLevel::Debug").finish() } LogLevel::Info => { f.debug_tuple("LogLevel::Info").finish() } LogLevel::Warn => { f.debug_tuple("LogLevel::Warn").finish() } LogLevel::Error => { f.debug_tuple("LogLevel::Error").finish() } } } } } } } #[cfg(target_arch = "wasm32")] #[link_section = "component-type:wasmcloud-core"] #[doc(hidden)] pub static __WIT_BINDGEN_COMPONENT_TYPE: [u8; 2513] = [3, 0, 14, 119, 97, 115, 109, 99, 108, 111, 117, 100, 45, 99, 111, 114, 101, 0, 97, 115, 109, 13, 0, 1, 0, 7, 206, 18, 1, 65, 8, 1, 66, 33, 1, 111, 2, 115, 115, 4, 0, 13, 116, 114, 97, 99, 101, 45, 99, 111, 110, 116, 101, 120, 116, 3, 0, 0, 1, 109, 5, 5, 116, 114, 97, 99, 101, 5, 100, 101, 98, 117, 103, 4, 105, 110, 102, 111, 4, 119, 97, 114, 110, 5, 101, 114, 114, 111, 114, 4, 0, 9, 108, 111, 103, 45, 108, 101, 118, 101, 108, 3, 0, 2, 1, 111, 2, 115, 115, 4, 0, 13, 108, 105, 110, 107, 45, 115, 101, 116, 116, 105, 110, 103, 115, 3, 0, 4, 1, 107, 5, 1, 114, 5, 8, 97, 99, 116, 111, 114, 45, 105, 100, 115, 11, 112, 114, 111, 118, 105, 100, 101, 114, 45, 105, 100, 115, 9, 108, 105, 110, 107, 45, 110, 97, 109, 101, 115, 11, 99, 111, 110, 116, 114, 97, 99, 116, 45, 105, 100, 115, 6, 118, 97, 108, 117, 101, 115, 6, 4, 0, 15, 108, 105, 110, 107, 45, 100, 101, 102, 105, 110, 97, 116, 105, 111, 110, 3, 0, 7, 1, 111, 2, 115, 115, 4, 0, 15, 104, 111, 115, 116, 45, 101, 110, 118, 45, 118, 97, 108, 117, 101, 115, 3, 0, 9, 1, 114, 2, 7, 104, 101, 97, 108, 116, 104, 121, 127, 7, 109, 101, 115, 115, 97, 103, 101, 115, 4, 0, 21, 104, 101, 97, 108, 116, 104, 45, 99, 104, 101, 99, 107, 45, 114, 101, 115, 112, 111, 110, 115, 101, 3, 0, 11, 1, 114, 0, 4, 0, 20, 104, 101, 97, 108, 116, 104, 45, 99, 104, 101, 99, 107, 45, 114, 101, 113, 117, 101, 115, 116, 3, 0, 13, 1, 115, 4, 0, 18, 99, 108, 117, 115, 116, 101, 114, 45, 105, 115, 115, 117, 101, 114, 45, 107, 101, 121, 3, 0, 15, 1, 112, 16, 4, 0, 15, 99, 108, 117, 115, 116, 101, 114, 45, 105, 115, 115, 117, 101, 114, 115, 3, 0, 17, 1, 115, 4, 0, 22, 99, 97, 112, 97, 98, 105, 108, 105, 116, 121, 45, 99, 111, 110, 116, 114, 97, 99, 116, 45, 105, 100, 3, 0, 19, 1, 114, 3, 10, 112, 117, 98, 108, 105, 99, 45, 107, 101, 121, 115, 9, 108, 105, 110, 107, 45, 110, 97, 109, 101, 115, 11, 99, 111, 110, 116, 114, 97, 99, 116, 45, 105, 100, 20, 4, 0, 16, 119, 97, 115, 109, 99, 108, 111, 117, 100, 45, 101, 110, 116, 105, 116, 121, 3, 0, 21, 1, 112, 125, 4, 0, 4, 98, 108, 111, 98, 3, 0, 23, 1, 114, 4, 3, 109, 115, 103, 24, 13, 105, 110, 118, 111, 99, 97, 116, 105, 111, 110, 45, 105, 100, 115, 5, 101, 114, 114, 111, 114, 115, 14, 99, 111, 110, 116, 101, 110, 116, 45, 108, 101, 110, 103, 116, 104, 119, 4, 0, 19, 105, 110, 118, 111, 99, 97, 116, 105, 111, 110, 45, 114, 101, 115, 112, 111, 110, 115, 101, 3, 0, 25, 1, 114, 9, 6, 111, 114, 105, 103, 105, 110, 22, 6, 116, 97, 114, 103, 101, 116, 22, 9, 111, 112, 101, 114, 97, 116, 105, 111, 110, 115, 3, 109, 115, 103, 24, 2, 105, 100, 115, 14, 101, 110, 99, 111, 100, 101, 100, 45, 99, 108, 97, 105, 109, 115, 115, 7, 104, 111, 115, 116, 45, 105, 100, 115, 14, 99, 111, 110, 116, 101, 110, 116, 45, 108, 101, 110, 103, 116, 104, 119, 13, 116, 114, 97, 99, 101, 45, 99, 111, 110, 116, 101, 120, 116, 1, 4, 0, 10, 105, 110, 118, 111, 99, 97, 116, 105, 111, 110, 3, 0, 27, 1, 112, 8, 4, 0, 11, 97, 99, 116, 111, 114, 45, 108, 105, 110, 107, 115, 3, 0, 29, 1, 114, 16, 7, 104, 111, 115, 116, 45, 105, 100, 115, 18, 108, 97, 116, 116, 105, 99, 101, 45, 114, 112, 99, 45, 112, 114, 101, 102, 105, 120, 115, 9, 108, 105, 110, 107, 45, 110, 97, 109, 101, 115, 20, 108, 97, 116, 116, 105, 99, 101, 45, 114, 112, 99, 45, 117, 115, 101, 114, 45, 106, 119, 116, 115, 21, 108, 97, 116, 116, 105, 99, 101, 45, 114, 112, 99, 45, 117, 115, 101, 114, 45, 115, 101, 101, 100, 115, 15, 108, 97, 116, 116, 105, 99, 101, 45, 114, 112, 99, 45, 117, 114, 108, 115, 12, 112, 114, 111, 118, 105, 100, 101, 114, 45, 107, 101, 121, 115, 15, 105, 110, 118, 111, 99, 97, 116, 105, 111, 110, 45, 115, 101, 101, 100, 115, 10, 101, 110, 118, 45, 118, 97, 108, 117, 101, 115, 10, 11, 105, 110, 115, 116, 97, 110, 99, 101, 45, 105, 100, 115, 16, 108, 105, 110, 107, 45, 100, 101, 102, 105, 110, 97, 116, 105, 111, 110, 115, 30, 15, 99, 108, 117, 115, 116, 101, 114, 45, 105, 115, 115, 117, 101, 114, 115, 18, 11, 99, 111, 110, 102, 105, 103, 45, 106, 115, 111, 110, 115, 22, 100, 101, 102, 97, 117, 108, 116, 45, 114, 112, 99, 45, 116, 105, 109, 101, 111, 117, 116, 45, 109, 115, 119, 18, 115, 116, 114, 117, 99, 116, 117, 114, 101, 100, 45, 108, 111, 103, 103, 105, 110, 103, 127, 9, 108, 111, 103, 45, 108, 101, 118, 101, 108, 3, 4, 0, 9, 104, 111, 115, 116, 45, 100, 97, 116, 97, 3, 0, 31, 4, 1, 26, 119, 97, 115, 109, 99, 108, 111, 117, 100, 58, 99, 111, 114, 101, 47, 116, 121, 112, 101, 115, 64, 48, 46, 49, 46, 48, 5, 0, 2, 3, 0, 0, 20, 104, 101, 97, 108, 116, 104, 45, 99, 104, 101, 99, 107, 45, 114, 101, 113, 117, 101, 115, 116, 2, 3, 0, 0, 21, 104, 101, 97, 108, 116, 104, 45, 99, 104, 101, 99, 107, 45, 114, 101, 115, 112, 111, 110, 115, 101, 1, 66, 6, 2, 3, 2, 1, 1, 4, 0, 20, 104, 101, 97, 108, 116, 104, 45, 99, 104, 101, 99, 107, 45, 114, 101, 113, 117, 101, 115, 116, 3, 0, 0, 2, 3, 2, 1, 2, 4, 0, 21, 104, 101, 97, 108, 116, 104, 45, 99, 104, 101, 99, 107, 45, 114, 101, 115, 112, 111, 110, 115, 101, 3, 0, 2, 1, 64, 1, 5, 105, 110, 112, 117, 116, 1, 0, 3, 4, 0, 14, 104, 101, 97, 108, 116, 104, 45, 114, 101, 113, 117, 101, 115, 116, 1, 4, 4, 1, 33, 119, 97, 115, 109, 99, 108, 111, 117, 100, 58, 99, 111, 114, 101, 47, 104, 101, 97, 108, 116, 104, 45, 99, 104, 101, 99, 107, 64, 48, 46, 49, 46, 48, 5, 3, 1, 65, 14, 1, 66, 33, 1, 111, 2, 115, 115, 4, 0, 13, 116, 114, 97, 99, 101, 45, 99, 111, 110, 116, 101, 120, 116, 3, 0, 0, 1, 109, 5, 5, 116, 114, 97, 99, 101, 5, 100, 101, 98, 117, 103, 4, 105, 110, 102, 111, 4, 119, 97, 114, 110, 5, 101, 114, 114, 111, 114, 4, 0, 9, 108, 111, 103, 45, 108, 101, 118, 101, 108, 3, 0, 2, 1, 111, 2, 115, 115, 4, 0, 13, 108, 105, 110, 107, 45, 115, 101, 116, 116, 105, 110, 103, 115, 3, 0, 4, 1, 107, 5, 1, 114, 5, 8, 97, 99, 116, 111, 114, 45, 105, 100, 115, 11, 112, 114, 111, 118, 105, 100, 101, 114, 45, 105, 100, 115, 9, 108, 105, 110, 107, 45, 110, 97, 109, 101, 115, 11, 99, 111, 110, 116, 114, 97, 99, 116, 45, 105, 100, 115, 6, 118, 97, 108, 117, 101, 115, 6, 4, 0, 15, 108, 105, 110, 107, 45, 100, 101, 102, 105, 110, 97, 116, 105, 111, 110, 3, 0, 7, 1, 111, 2, 115, 115, 4, 0, 15, 104, 111, 115, 116, 45, 101, 110, 118, 45, 118, 97, 108, 117, 101, 115, 3, 0, 9, 1, 114, 2, 7, 104, 101, 97, 108, 116, 104, 121, 127, 7, 109, 101, 115, 115, 97, 103, 101, 115, 4, 0, 21, 104, 101, 97, 108, 116, 104, 45, 99, 104, 101, 99, 107, 45, 114, 101, 115, 112, 111, 110, 115, 101, 3, 0, 11, 1, 114, 0, 4, 0, 20, 104, 101, 97, 108, 116, 104, 45, 99, 104, 101, 99, 107, 45, 114, 101, 113, 117, 101, 115, 116, 3, 0, 13, 1, 115, 4, 0, 18, 99, 108, 117, 115, 116, 101, 114, 45, 105, 115, 115, 117, 101, 114, 45, 107, 101, 121, 3, 0, 15, 1, 112, 16, 4, 0, 15, 99, 108, 117, 115, 116, 101, 114, 45, 105, 115, 115, 117, 101, 114, 115, 3, 0, 17, 1, 115, 4, 0, 22, 99, 97, 112, 97, 98, 105, 108, 105, 116, 121, 45, 99, 111, 110, 116, 114, 97, 99, 116, 45, 105, 100, 3, 0, 19, 1, 114, 3, 10, 112, 117, 98, 108, 105, 99, 45, 107, 101, 121, 115, 9, 108, 105, 110, 107, 45, 110, 97, 109, 101, 115, 11, 99, 111, 110, 116, 114, 97, 99, 116, 45, 105, 100, 20, 4, 0, 16, 119, 97, 115, 109, 99, 108, 111, 117, 100, 45, 101, 110, 116, 105, 116, 121, 3, 0, 21, 1, 112, 125, 4, 0, 4, 98, 108, 111, 98, 3, 0, 23, 1, 114, 4, 3, 109, 115, 103, 24, 13, 105, 110, 118, 111, 99, 97, 116, 105, 111, 110, 45, 105, 100, 115, 5, 101, 114, 114, 111, 114, 115, 14, 99, 111, 110, 116, 101, 110, 116, 45, 108, 101, 110, 103, 116, 104, 119, 4, 0, 19, 105, 110, 118, 111, 99, 97, 116, 105, 111, 110, 45, 114, 101, 115, 112, 111, 110, 115, 101, 3, 0, 25, 1, 114, 9, 6, 111, 114, 105, 103, 105, 110, 22, 6, 116, 97, 114, 103, 101, 116, 22, 9, 111, 112, 101, 114, 97, 116, 105, 111, 110, 115, 3, 109, 115, 103, 24, 2, 105, 100, 115, 14, 101, 110, 99, 111, 100, 101, 100, 45, 99, 108, 97, 105, 109, 115, 115, 7, 104, 111, 115, 116, 45, 105, 100, 115, 14, 99, 111, 110, 116, 101, 110, 116, 45, 108, 101, 110, 103, 116, 104, 119, 13, 116, 114, 97, 99, 101, 45, 99, 111, 110, 116, 101, 120, 116, 1, 4, 0, 10, 105, 110, 118, 111, 99, 97, 116, 105, 111, 110, 3, 0, 27, 1, 112, 8, 4, 0, 11, 97, 99, 116, 111, 114, 45, 108, 105, 110, 107, 115, 3, 0, 29, 1, 114, 16, 7, 104, 111, 115, 116, 45, 105, 100, 115, 18, 108, 97, 116, 116, 105, 99, 101, 45, 114, 112, 99, 45, 112, 114, 101, 102, 105, 120, 115, 9, 108, 105, 110, 107, 45, 110, 97, 109, 101, 115, 20, 108, 97, 116, 116, 105, 99, 101, 45, 114, 112, 99, 45, 117, 115, 101, 114, 45, 106, 119, 116, 115, 21, 108, 97, 116, 116, 105, 99, 101, 45, 114, 112, 99, 45, 117, 115, 101, 114, 45, 115, 101, 101, 100, 115, 15, 108, 97, 116, 116, 105, 99, 101, 45, 114, 112, 99, 45, 117, 114, 108, 115, 12, 112, 114, 111, 118, 105, 100, 101, 114, 45, 107, 101, 121, 115, 15, 105, 110, 118, 111, 99, 97, 116, 105, 111, 110, 45, 115, 101, 101, 100, 115, 10, 101, 110, 118, 45, 118, 97, 108, 117, 101, 115, 10, 11, 105, 110, 115, 116, 97, 110, 99, 101, 45, 105, 100, 115, 16, 108, 105, 110, 107, 45, 100, 101, 102, 105, 110, 97, 116, 105, 111, 110, 115, 30, 15, 99, 108, 117, 115, 116, 101, 114, 45, 105, 115, 115, 117, 101, 114, 115, 18, 11, 99, 111, 110, 102, 105, 103, 45, 106, 115, 111, 110, 115, 22, 100, 101, 102, 97, 117, 108, 116, 45, 114, 112, 99, 45, 116, 105, 109, 101, 111, 117, 116, 45, 109, 115, 119, 18, 115, 116, 114, 117, 99, 116, 117, 114, 101, 100, 45, 108, 111, 103, 103, 105, 110, 103, 127, 9, 108, 111, 103, 45, 108, 101, 118, 101, 108, 3, 4, 0, 9, 104, 111, 115, 116, 45, 100, 97, 116, 97, 3, 0, 31, 3, 1, 26, 119, 97, 115, 109, 99, 108, 111, 117, 100, 58, 99, 111, 114, 101, 47, 116, 121, 112, 101, 115, 64, 48, 46, 49, 46, 48, 5, 0, 2, 3, 0, 0, 9, 104, 111, 115, 116, 45, 100, 97, 116, 97, 3, 0, 9, 104, 111, 115, 116, 45, 100, 97, 116, 97, 3, 0, 1, 2, 3, 0, 0, 10, 105, 110, 118, 111, 99, 97, 116, 105, 111, 110, 3, 0, 10, 105, 110, 118, 111, 99, 97, 116, 105, 111, 110, 3, 0, 3, 2, 3, 0, 0, 19, 105, 110, 118, 111, 99, 97, 116, 105, 111, 110, 45, 114, 101, 115, 112, 111, 110, 115, 101, 3, 0, 19, 105, 110, 118, 111, 99, 97, 116, 105, 111, 110, 45, 114, 101, 115, 112, 111, 110, 115, 101, 3, 0, 5, 2, 3, 0, 0, 20, 104, 101, 97, 108, 116, 104, 45, 99, 104, 101, 99, 107, 45, 114, 101, 113, 117, 101, 115, 116, 3, 0, 20, 104, 101, 97, 108, 116, 104, 45, 99, 104, 101, 99, 107, 45, 114, 101, 113, 117, 101, 115, 116, 3, 0, 7, 2, 3, 0, 0, 21, 104, 101, 97, 108, 116, 104, 45, 99, 104, 101, 99, 107, 45, 114, 101, 115, 112, 111, 110, 115, 101, 3, 0, 21, 104, 101, 97, 108, 116, 104, 45, 99, 104, 101, 99, 107, 45, 114, 101, 115, 112, 111, 110, 115, 101, 3, 0, 9, 2, 3, 0, 0, 15, 108, 105, 110, 107, 45, 100, 101, 102, 105, 110, 97, 116, 105, 111, 110, 3, 0, 15, 108, 105, 110, 107, 45, 100, 101, 102, 105, 110, 97, 116, 105, 111, 110, 3, 0, 11, 4, 1, 35, 119, 97, 115, 109, 99, 108, 111, 117, 100, 58, 99, 111, 114, 101, 47, 119, 97, 115, 109, 99, 108, 111, 117, 100, 45, 99, 111, 114, 101, 64, 48, 46, 49, 46, 48, 4, 4, 0, 69, 9, 112, 114, 111, 100, 117, 99, 101, 114, 115, 1, 12, 112, 114, 111, 99, 101, 115, 115, 101, 100, 45, 98, 121, 2, 13, 119, 105, 116, 45, 99, 111, 109, 112, 111, 110, 101, 110, 116, 6, 48, 46, 49, 49, 46, 48, 16, 119, 105, 116, 45, 98, 105, 110, 100, 103, 101, 110, 45, 114, 117, 115, 116, 5, 48, 46, 56, 46, 48, 11, 30, 1, 1, 24, 119, 97, 115, 109, 99, 108, 111, 117, 100, 58, 99, 111, 114, 101, 47, 119, 105, 116, 64, 48, 46, 49, 46, 48, 3, 0, 0]; #[inline(never)] #[doc(hidden)] #[cfg(target_arch = "wasm32")] pub fn __link_section() {} ```