Adding value scalar type and bringing apex config current (#16)

Co-authored-by: Phil Kedy <pkedy@gmail.com>

Author: pkedy

.github/workflows/build.yaml

@@ -20,11 +20,11 @@ jobs:
 
       - uses: actions/setup-go@v3
         with:
-          go-version: '1.21'
+          go-version: '1.24'
 
       - uses: acifani/setup-tinygo@v1
         with:
-          tinygo-version: 0.30.0
+          tinygo-version: 0.37.0
 
       - name: Install wasm-opt
         run: |
@@ -36,12 +36,12 @@ jobs:
 
       - name: Build WebAssembly parser
         run: |
-          tinygo build -o apex-parser.wasm -scheduler=none -target=wasi -no-debug cmd/apex-api/main.go
+          tinygo build -o apex-parser.wasm -scheduler=none -target=wasip1 -buildmode=c-shared -no-debug cmd/apex-api/main.go
           wasm-opt -O apex-parser.wasm -o apex-parser.wasm
 
       - name: Build waPC module
         run: |
-          tinygo build -o apex-wapc.wasm -scheduler=none -target=wasi -no-debug cmd/wapc/main.go
+          tinygo build -o apex-wapc.wasm -scheduler=none -target=wasip1 -buildmode=c-shared -no-debug cmd/wapc/main.go
           wasm-opt -O apex-wapc.wasm -o apex-wapc.wasm
 
       - name: Release

Makefile

@@ -3,16 +3,16 @@
 all: codegen wasm-cli wasm-api wasm-wapc wasm-host
 
 wasm-cli:
-	tinygo build -o apex-cli.wasm -scheduler=none -target=wasi -no-debug cmd/apex-cli/main.go
+	tinygo build -o apex-cli.wasm -scheduler=none -target=wasip1 -no-debug cmd/apex-cli/main.go
 	wasm-opt -O apex-cli.wasm -o apex-cli.wasm
 
 wasm-api:
-	tinygo build -o apex-api.wasm -scheduler=none -target=wasi -no-debug cmd/apex-api/main.go
+	tinygo build -o apex-api.wasm -scheduler=none -target=wasip1 -buildmode=c-shared -no-debug cmd/apex-api/main.go
 	wasm-opt -O apex-api.wasm -o apex-api.wasm
 	cp apex-api.wasm cmd/host/apex-api.wasm
 
 wasm-wapc:
-	tinygo build -o apex-wapc.wasm -scheduler=none -target=wasi -no-debug cmd/wapc/main.go
+	tinygo build -o apex-wapc.wasm -scheduler=none -target=wasip1 -buildmode=c-shared -no-debug cmd/wapc/main.go
 	wasm-opt -O apex-wapc.wasm -o apex-wapc.wasm
 
 wasm-host:

apex.yaml

@@ -4,20 +4,20 @@ config:
   module: github.com/apexlang/apex-go
 generates:
   model/model.go:
-    module: 'https://deno.land/x/apex_codegen@v0.1.10/go/mod.ts'
+    module: 'jsr:@apexlang/codegen@^0.2.9/go'
     visitorClass: InterfacesVisitor
     config:
       writeTypeInfo: false
     runAfter:
       - command: tinyjson -all model/model.go
   model/msgpack.go:
-    module: 'https://deno.land/x/apex_codegen@v0.1.10/go/mod.ts'
+    module: 'jsr:@apexlang/codegen@^0.2.9/go'
     visitorClass: MsgPackVisitor
   model/wapc.go:
-    module: 'https://deno.land/x/wapc_codegen@v0.0.6/tinygo/mod.ts'
+    module: 'jsr:@wapc/codegen@^0.1.1/tinygo'
     visitorClass: ExportVisitor
   cmd/wapc/main.go:
-    module: 'https://deno.land/x/wapc_codegen@v0.0.6/tinygo/mod.ts'
+    module: 'jsr:@wapc/codegen@^0.1.1/tinygo'
     visitorClass: MainVisitor
     config:
       import: github.com/apexlang/apex-go/model

cmd/apex-api/main.go

@@ -27,16 +27,13 @@ import (
 	"github.com/apexlang/apex-go/rules"
 )
 
-// main is required for TinyGo to compile to Wasm.
-func main() {}
-
 //go:wasm-module apex
 //go:export resolve
-func resolve(
+func Resolve(
 	locationPtr uintptr, locationSize uint32,
 	fromPtr uintptr, fromSize uint32) uint64
 
-//export parse
+//go:wasmexport parse
 func Parse(ptr uintptr, size uint32) (ptrSize uint64) {
 	source := tinymem.PtrToString(ptr, size)
 
@@ -47,7 +44,7 @@ func Parse(ptr uintptr, size uint32) (ptrSize uint64) {
 			Resolver: func(location, from string) (string, error) {
 				locationPtr, locationSize := tinymem.StringToPtr(location)
 				fromPtr, fromSize := tinymem.StringToPtr(from)
-				ptrsize := resolve(
+				ptrsize := Resolve(
 					locationPtr, locationSize,
 					fromPtr, fromSize)
 				if ptrsize == 0 {

cmd/wapc/main.go

@@ -6,7 +6,7 @@ require (
 	github.com/CosmWasm/tinyjson v0.9.0
 	github.com/iancoleman/strcase v0.3.0
 	github.com/tetratelabs/tinymem v0.1.0
-	github.com/wapc/tinygo-msgpack v0.1.6
+	github.com/wapc/tinygo-msgpack v0.1.8
 	github.com/wapc/wapc-guest-tinygo v0.3.3
 )
 

go.mod

@@ -14,6 +14,8 @@ github.com/tetratelabs/tinymem v0.1.0 h1:Qza1JAg9lquPPJ/CIei5qQYx7t18KLie83O2WR6
 github.com/tetratelabs/tinymem v0.1.0/go.mod h1:WFFTZFhLod6lTL+UetFAopVbGaB+KFsVcIY+RUv7NeY=
 github.com/wapc/tinygo-msgpack v0.1.6 h1:geW3N0MAVehJBZp1ITnK2J1R2woI/S1APJB+tFShO6Y=
 github.com/wapc/tinygo-msgpack v0.1.6/go.mod h1:2P4rQimy/6oQAkytwC2LdtVjLJ2D1dYkQHejfCtZXZQ=
+github.com/wapc/tinygo-msgpack v0.1.8 h1:KUKeWQ2G/SBVU7EOolTAjFaVWg6oDhAqlD/o1weeyBo=
+github.com/wapc/tinygo-msgpack v0.1.8/go.mod h1:u5RU3BuXpvLgefF1DT33saNDgkE9qYeu0PeoE3aGRCs=
 github.com/wapc/wapc-guest-tinygo v0.3.3 h1:jLebiwjVSHLGnS+BRabQ6+XOV7oihVWAc05Hf1SbeR0=
 github.com/wapc/wapc-guest-tinygo v0.3.3/go.mod h1:mzM3CnsdSYktfPkaBdZ8v88ZlfUDEy5Jh5XBOV3fYcw=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

go.sum

@@ -195,6 +195,7 @@ enum Scalar {
   DATETIME = 14
   ANY      = 15
   RAW      = 16
+  VALUE    = 17
 }
 
 type Named {

model.axdl

@@ -44,6 +44,7 @@ var scalars = map[string]Scalar{
 	"datetime": ScalarDatetime,
 	"any":      ScalarAny,
 	"raw":      ScalarRaw,
+	"value":    ScalarValue,
 }
 
 type Converter struct {