diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index df1fbab..26459fc 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -38,17 +38,6 @@ jobs: cp binaryen-version_110/bin/wasm-opt /usr/local/bin rm -Rf binaryen-version_110 - - name: Install tinyjson - run: go install github.com/CosmWasm/tinyjson/...@latest - - - name: Install Apex CLI - run: | - wget -q https://apexlang.io/install.sh -O - | /bin/bash - apex install @wapc/codegen - - - name: Apex code generation - run: apex generate - - name: Build WebAssembly parser run: | tinygo build -o apex-parser.wasm -scheduler=none -target=wasi -wasm-abi=generic -no-debug cmd/apex-api/main.go diff --git a/model/msgpack.go b/model/msgpack.go index 0a5b984..30edb32 100644 --- a/model/msgpack.go +++ b/model/msgpack.go @@ -9,11 +9,11 @@ import ( var _ = convert.Package -type parserParseArgs struct { +type ParserParseArgs struct { Source string `json:"source" yaml:"source" msgpack:"source"` } -func (o *parserParseArgs) Decode(decoder msgpack.Reader) error { +func (o *ParserParseArgs) Decode(decoder msgpack.Reader) error { numFields, err := decoder.ReadMapSize() if err != nil { return err @@ -39,7 +39,7 @@ func (o *parserParseArgs) Decode(decoder msgpack.Reader) error { return nil } -func (o *parserParseArgs) Encode(encoder msgpack.Writer) error { +func (o *ParserParseArgs) Encode(encoder msgpack.Writer) error { if o == nil { encoder.WriteNil() return nil @@ -51,12 +51,12 @@ func (o *parserParseArgs) Encode(encoder msgpack.Writer) error { return nil } -type resolverResolveArgs struct { +type ResolverResolveArgs struct { Location string `json:"location" yaml:"location" msgpack:"location"` From string `json:"from" yaml:"from" msgpack:"from"` } -func (o *resolverResolveArgs) Decode(decoder msgpack.Reader) error { +func (o *ResolverResolveArgs) Decode(decoder msgpack.Reader) error { numFields, err := decoder.ReadMapSize() if err != nil { return err @@ -84,7 +84,7 @@ func (o *resolverResolveArgs) Decode(decoder msgpack.Reader) error { return nil } -func (o *resolverResolveArgs) Encode(encoder msgpack.Writer) error { +func (o *ResolverResolveArgs) Encode(encoder msgpack.Writer) error { if o == nil { encoder.WriteNil() return nil diff --git a/model/wapc.go b/model/wapc.go index 0352ccb..cc23690 100644 --- a/model/wapc.go +++ b/model/wapc.go @@ -27,7 +27,7 @@ func NewResolver(binding ...string) *ResolverImpl { } func (h *ResolverImpl) Resolve(ctx context.Context, location string, from string) (string, error) { - inputArgs := resolverResolveArgs{ + inputArgs := ResolverResolveArgs{ Location: location, From: from, } @@ -56,7 +56,7 @@ func parserParseWrapper(svc Parser) wapc.Function { return func(payload []byte) ([]byte, error) { ctx := context.Background() decoder := msgpack.NewDecoder(payload) - var inputArgs parserParseArgs + var inputArgs ParserParseArgs inputArgs.Decode(&decoder) response, err := svc.Parse(ctx, inputArgs.Source) if err != nil {