fix: array writes (robertkrimen#454)

Fix array writes not being persisted by passing in writeable
reflect.Value when available instead of .Interface() which looses that
property.

Also:
* Use value.IsValid() instead of comparison with zero entry.
* Use propertyLength instead of literal.

Fixes robertkrimen#386

issue_test.go

@@ -53,26 +53,18 @@ func Test_issue13(t *testing.T) {
 			"number": 42,
 			"array":  []string{"def", "ghi"},
 		})
-		if err != nil {
-			t.Error(err)
-			t.FailNow()
-		}
+		require.NoError(t, err)
 
 		fn, err := vm.Object(`
             (function(value){
                 return ""+[value.string, value.number, value.array]
             })
         `)
-		if err != nil {
-			t.Error(err)
-			t.FailNow()
-		}
+		require.NoError(t, err)
 
 		result, err := fn.Value().Call(fn.Value(), value)
-		if err != nil {
-			t.Error(err)
-			t.FailNow()
-		}
+		require.NoError(t, err)
+
 		is(result.string(), "Xyzzy,42,def,ghi")
 
 		anything := struct {
@@ -899,3 +891,40 @@ func Test_issue390(t *testing.T) {
 	require.NoError(t, err)
 	require.Equal(t, int64(1), rows)
 }
+
+type testSetType struct {
+	String string
+	Array  [1]string
+	Slice  []string
+}
+
+func Test_issue386(t *testing.T) {
+	var msg testSetType
+	msg.String = "string"
+	msg.Slice = []string{"slice"}
+	msg.Array[0] = "array"
+
+	vm := New()
+	err := vm.Set("msg", &msg)
+	require.NoError(t, err)
+
+	tests := map[string]string{
+		"string": `
+			msg.TypeMessage = 'something';
+			msg.TypeMessage;`,
+		"array": `
+			msg.Array[0] = 'something';
+			msg.Array[0]`,
+		"slice": `
+			msg.Slice[0] = 'something';
+			msg.Slice[0]`,
+	}
+
+	for name, code := range tests {
+		t.Run(name, func(t *testing.T) {
+			val, err := vm.Run(code)
+			require.NoError(t, err)
+			require.Equal(t, "something", val.String())
+		})
+	}
+}

runtime.go

@@ -652,6 +652,11 @@ func (self *_runtime) convertCallParameter(v Value, t reflect.Type) (reflect.Val
 }
 
 func (self *_runtime) toValue(value interface{}) Value {
+	rv, ok := value.(reflect.Value)
+	if ok {
+		value = rv.Interface()
+	}
+
 	switch value := value.(type) {
 	case Value:
 		return value
@@ -684,6 +689,10 @@ func (self *_runtime) toValue(value interface{}) Value {
 	default:
 		{
 			value := reflect.ValueOf(value)
+			if ok && value.Kind() == rv.Kind() {
+				// Use passed in rv which may be writable.
+				value = rv
+			}
 
 			switch value.Kind() {
 			case reflect.Ptr:

type_go_array.go

@@ -20,7 +20,7 @@ type _goArrayObject struct {
 }
 
 func _newGoArrayObject(value reflect.Value) *_goArrayObject {
-	writable := value.Kind() == reflect.Ptr // The Array is addressable (like a Slice)
+	writable := value.Kind() == reflect.Ptr || value.CanSet() // The Array is addressable (like a Slice)
 	mode := _propertyMode(0010)
 	if writable {
 		mode = 0110

type_go_map.go

@@ -54,7 +54,7 @@ func goMapGetOwnProperty(self *_object, name string) *_property {
 	}
 
 	// Other methods
-	if method := self.value.(*_goMapObject).value.MethodByName(name); (method != reflect.Value{}) {
+	if method := self.value.(*_goMapObject).value.MethodByName(name); method.IsValid() {
 		return &_property{
 			value: self.runtime.toValue(method.Interface()),
 			mode:  0110,

type_go_slice.go

@@ -54,8 +54,7 @@ func goSliceGetOwnProperty(self *_object, name string) *_property {
 	}
 
 	// .0, .1, .2, ...
-	index := stringToArrayIndex(name)
-	if index >= 0 {
+	if index := stringToArrayIndex(name); index >= 0 {
 		value := Value{}
 		reflectValue, exists := self.value.(*_goSliceObject).getValue(index)
 		if exists {
@@ -68,7 +67,7 @@ func goSliceGetOwnProperty(self *_object, name string) *_property {
 	}
 
 	// Other methods
-	if method := self.value.(*_goSliceObject).value.MethodByName(name); (method != reflect.Value{}) {
+	if method := self.value.(*_goSliceObject).value.MethodByName(name); method.IsValid() {
 		return &_property{
 			value: self.runtime.toValue(method.Interface()),
 			mode:  0110,
@@ -106,7 +105,7 @@ func goSliceDefineOwnProperty(self *_object, name string, descriptor _property,
 
 func goSliceDelete(self *_object, name string, throw bool) bool {
 	// length
-	if name == "length" {
+	if name == propertyLength {
 		return self.runtime.typeErrorResult(throw)
 	}
 

type_go_struct.go

@@ -41,12 +41,12 @@ func (self _goStructObject) getValue(name string) reflect.Value {
 	}
 
 	if validGoStructName(name) {
-		// Do not reveal hidden or unexported fields
-		if field := reflect.Indirect(self.value).FieldByName(name); (field != reflect.Value{}) {
+		// Do not reveal hidden or unexported fields.
+		if field := reflect.Indirect(self.value).FieldByName(name); field.IsValid() {
 			return field
 		}
 
-		if method := self.value.MethodByName(name); (method != reflect.Value{}) {
+		if method := self.value.MethodByName(name); method.IsValid() {
 			return method
 		}
 	}
@@ -81,7 +81,7 @@ func goStructGetOwnProperty(self *_object, name string) *_property {
 	object := self.value.(*_goStructObject)
 	value := object.getValue(name)
 	if value.IsValid() {
-		return &_property{self.runtime.toValue(value.Interface()), 0110}
+		return &_property{self.runtime.toValue(value), 0110}
 	}
 
 	return objectGetOwnProperty(self, name)