go/ferret
go/ferret
1
0
Fork 0
mirror of https://github.com/MontFerret/ferret.git synced 2024-12-14 11:23:02 +02:00
Code Issues Releases Activity

Bug into object function KEEP (#121)

Browse Source
This commit is contained in:
3timeslazy 2018-10-14 22:22:41 +03:00 committed by Tim Voronov
parent 6df08a60cb
commit 0f3128e842
2 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkg/stdlib/objects/keep.go
View File

@ -30,7 +30,7 @@ func Keep(_ context.Context, args ...core.Value) (core.Value, error) {
keys = args[1].(*values.Array) keys = args[1].(*values.Array)
} }
err = validateArrayOfStrings(keys) err = validateArrayOf(core.StringType, keys)
if err != nil { if err != nil {
return values.None, err return values.None, err
@ -43,22 +43,18 @@ func Keep(_ context.Context, args ...core.Value) (core.Value, error) {
var val core.Value var val core.Value
var exists values.Boolean var exists values.Boolean
for idx := values.NewInt(0); idx < keys.Length(); idx++ { keys.ForEach(func(keyVal core.Value, idx int) bool {
key = keys.Get(idx).(values.String) key = keyVal.(values.String)
if val, exists = obj.Get(key); exists { if val, exists = obj.Get(key); exists {
if values.IsCloneable(val) {
val = val.(core.Cloneable).Clone()
}
resultObj.Set(key, val) resultObj.Set(key, val)
} }
}
return true
})
return resultObj, nil return resultObj, nil
} }
func validateArrayOfStrings(arr *values.Array) (err error) {
for idx := values.NewInt(0); idx < arr.Length(); idx++ {
err = core.ValidateType(arr.Get(idx), core.StringType)
if err != nil {
break
}
}
return
}

18
pkg/stdlib/objects/keep_test.go
View File

@ -45,6 +45,24 @@ func TestKeep(t *testing.T) {
So(err, ShouldBeError) So(err, ShouldBeError)
So(obj, ShouldEqual, values.None) So(obj, ShouldEqual, values.None)
}) })
Convey("Result object is independent of the source object", t, func() {
arr := values.NewArrayWith(values.Int(0))
obj := values.NewObjectWith(
values.NewObjectProperty("a", arr),
)
resultObj := values.NewObjectWith(
values.NewObjectProperty("a", values.NewArrayWith(values.Int(0))),
)
afterKeep, err := objects.Keep(context.Background(), obj, values.NewString("a"))
So(err, ShouldBeNil)
arr.Push(values.NewInt(1))
So(afterKeep.Compare(resultObj), ShouldEqual, 0)
})
} }
func TestKeepStrings(t *testing.T) { func TestKeepStrings(t *testing.T) {