AssemblyScript Updates

(Revert after #277 is merged)

Author: mattjohnsonpint

functions/assemblyscript/objects.go

@@ -8,6 +8,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"reflect"
 	"time"
 
 	"hmruntime/plugins"
@@ -48,18 +49,30 @@ func readObject(ctx context.Context, mem wasm.Memory, typ plugins.TypeInfo, offs
 func writeObject(ctx context.Context, mod wasm.Module, typ plugins.TypeInfo, val any) (offset uint32, err error) {
 	switch typ.Name {
 	case "ArrayBuffer":
-		bytes, ok := val.([]byte)
-		if !ok {
+		switch v := val.(type) {
+		case []byte:
+			return writeBytes(ctx, mod, v)
+		case *[]byte:
+			if v == nil {
+				return 0, nil
+			}
+			return writeBytes(ctx, mod, *v)
+		default:
 			return 0, fmt.Errorf("input value is not a byte array")
 		}
-		return writeBytes(ctx, mod, bytes)
 
 	case "string":
-		s, ok := val.(string)
-		if !ok {
+		switch v := val.(type) {
+		case string:
+			return WriteString(ctx, mod, v)
+		case *string:
+			if v == nil {
+				return 0, nil
+			}
+			return WriteString(ctx, mod, *v)
+		default:
 			return 0, fmt.Errorf("input value is not a string")
 		}
-		return WriteString(ctx, mod, s)
 
 	case "Date":
 		var t time.Time
@@ -70,16 +83,44 @@ func writeObject(ctx context.Context, mod wasm.Module, typ plugins.TypeInfo, val
 				return 0, err
 			}
 			t = time.UnixMilli(n)
+		case *json.Number:
+			if v == nil {
+				return 0, nil
+			}
+			n, err := v.Int64()
+			if err != nil {
+				return 0, err
+			}
+			t = time.UnixMilli(n)
 		case string:
 			var err error
 			t, err = utils.ParseTime(v)
 			if err != nil {
 				return 0, err
 			}
+		case *string:
+			if v == nil {
+				return 0, nil
+			}
+			var err error
+			t, err = utils.ParseTime(*v)
+			if err != nil {
+				return 0, err
+			}
 		case utils.JSONTime:
 			t = time.Time(v)
+		case *utils.JSONTime:
+			if v == nil {
+				return 0, nil
+			}
+			t = time.Time(*v)
 		case time.Time:
 			t = v
+		case *time.Time:
+			if v == nil {
+				return 0, nil
+			}
+			t = *v
 		default:
 			return 0, fmt.Errorf("input value is not a valid for a time object")
 		}
@@ -92,6 +133,15 @@ func writeObject(ctx context.Context, mod wasm.Module, typ plugins.TypeInfo, val
 		return 0, err
 	}
 
+	if reflect.TypeOf(val).Kind() == reflect.Ptr {
+		v := reflect.ValueOf(val)
+		if v.IsNil() {
+			return 0, nil
+		} else {
+			val = v.Elem().Interface()
+		}
+	}
+
 	if isArrayType(typ.Path) {
 		return writeArray(ctx, mod, def, val)
 	} else if isMapType(typ.Path) {

functions/assemblyscript/values.go

@@ -20,7 +20,7 @@ func EncodeValue(ctx context.Context, mod wasm.Module, typ plugins.TypeInfo, dat
 
 	// Handle null values if the type is nullable
 	if isNullable(typ.Path) {
-		if data == nil {
+		if data == nil || reflect.ValueOf(data).IsNil() {
 			return 0, nil
 		}
 		typ = removeNull(typ)

hostfunctions/helpers.go

@@ -14,10 +14,17 @@ import (
 )
 
 func writeResult[T any](ctx context.Context, mod wasm.Module, val T) (uint32, error) {
-	switch any(val).(type) {
+	switch t := any(val).(type) {
 	case string:
 		// fast path for strings
-		return assemblyscript.WriteString(ctx, mod, any(val).(string))
+		return assemblyscript.WriteString(ctx, mod, t)
+	case *string:
+		// fast path for nullable strings
+		if any(val) == nil {
+			return 0, nil
+		} else {
+			return assemblyscript.WriteString(ctx, mod, *t)
+		}
 	default:
 		typ, err := assemblyscript.GetTypeInfo[T]()
 		if err != nil {
@@ -42,7 +49,19 @@ func readParam[T any](ctx context.Context, mod wasm.Module, p uint32, v *T) erro
 			return err
 		}
 		*v = any(s).(T)
-
+	case *string:
+		// fast path for nullable strings
+		if p == 0 {
+			var s *string
+			*v = any(s).(T)
+		} else {
+			mem := mod.Memory()
+			s, err := assemblyscript.ReadString(mem, p)
+			if err != nil {
+				return err
+			}
+			*v = any(&s).(T)
+		}
 	default:
 		typ, err := assemblyscript.GetTypeInfo[T]()
 		if err != nil {