Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feat: Added CurrentValue and InitialValue (DerivedVariable) #604

Merged
merged 2 commits into from
Nov 7, 2023
Merged

Feat: Added CurrentValue and InitialValue (DerivedVariable) #604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
408c4a4
Feat: Added CurrentValue and InitialValue (DerivedVariable)
hmoog Nov 7, 2023
624c362
Fix: fixed test
hmoog Nov 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ds/reactive/clock_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ func TestClock(t *testing.T) {

time.Sleep(time.Second)

require.Greater(t, tickCount, 10)
require.GreaterOrEqual(t, tickCount, 10)
}
44 changes: 26 additions & 18 deletions ds/reactive/variable.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,69 +105,77 @@ type DerivedVariable[Type comparable] interface {
}

// NewDerivedVariable creates a DerivedVariable that transforms an input value into a different one.
func NewDerivedVariable[Type, InputType1 comparable, InputValueType1 ReadableVariable[InputType1]](compute func(InputType1) Type, input1 InputValueType1) DerivedVariable[Type] {
func NewDerivedVariable[Type, InputType1 comparable, InputValueType1 ReadableVariable[InputType1]](compute func(currentValue Type, inputValue1 InputType1) Type, input1 InputValueType1, initialValue ...Type) DerivedVariable[Type] {
return newDerivedVariable[Type](func(d DerivedVariable[Type]) func() {
return input1.OnUpdate(func(_, input1 InputType1) {
d.Compute(func(_ Type) Type { return compute(input1) })
d.Compute(func(currentValue Type) Type { return compute(currentValue, input1) })
}, true)
})
}, initialValue...)
}

// NewDerivedVariable2 creates a DerivedVariable that transforms two input values into a different one.
func NewDerivedVariable2[Type, InputType1, InputType2 comparable, InputValueType1 ReadableVariable[InputType1], InputValueType2 ReadableVariable[InputType2]](compute func(InputType1, InputType2) Type, input1 InputValueType1, input2 InputValueType2) DerivedVariable[Type] {
func NewDerivedVariable2[Type, InputType1, InputType2 comparable, InputValueType1 ReadableVariable[InputType1], InputValueType2 ReadableVariable[InputType2]](compute func(currentValue Type, inputValue1 InputType1, inputValue2 InputType2) Type, input1 InputValueType1, input2 InputValueType2, initialValue ...Type) DerivedVariable[Type] {
return newDerivedVariable[Type](func(d DerivedVariable[Type]) func() {
return lo.Batch(
input1.OnUpdate(func(_, input1 InputType1) {
d.Compute(func(_ Type) Type { return compute(input1, input2.Get()) })
d.Compute(func(currentValue Type) Type { return compute(currentValue, input1, input2.Get()) })
}, true),

input2.OnUpdate(func(_, input2 InputType2) {
d.Compute(func(_ Type) Type { return compute(input1.Get(), input2) })
d.Compute(func(currentValue Type) Type { return compute(currentValue, input1.Get(), input2) })
}, true),
)
})
}, initialValue...)
}

// NewDerivedVariable3 creates a DerivedVariable that transforms three input values into a different one.
func NewDerivedVariable3[Type, InputType1, InputType2, InputType3 comparable, InputValueType1 ReadableVariable[InputType1], InputValueType2 ReadableVariable[InputType2], InputValueType3 ReadableVariable[InputType3]](compute func(InputType1, InputType2, InputType3) Type, input1 InputValueType1, input2 InputValueType2, input3 InputValueType3) DerivedVariable[Type] {
func NewDerivedVariable3[Type, InputType1, InputType2, InputType3 comparable, InputValueType1 ReadableVariable[InputType1], InputValueType2 ReadableVariable[InputType2], InputValueType3 ReadableVariable[InputType3]](compute func(currentValue Type, inputValue1 InputType1, inputValue2 InputType2, inputValue3 InputType3) Type, input1 InputValueType1, input2 InputValueType2, input3 InputValueType3, initialValue ...Type) DerivedVariable[Type] {
return newDerivedVariable[Type](func(d DerivedVariable[Type]) func() {
return lo.Batch(
input1.OnUpdate(func(_, input1 InputType1) {
d.Compute(func(_ Type) Type { return compute(input1, input2.Get(), input3.Get()) })
d.Compute(func(currentValue Type) Type { return compute(currentValue, input1, input2.Get(), input3.Get()) })
}, true),

input2.OnUpdate(func(_, input2 InputType2) {
d.Compute(func(_ Type) Type { return compute(input1.Get(), input2, input3.Get()) })
d.Compute(func(currentValue Type) Type { return compute(currentValue, input1.Get(), input2, input3.Get()) })
}, true),

input3.OnUpdate(func(_, input3 InputType3) {
d.Compute(func(_ Type) Type { return compute(input1.Get(), input2.Get(), input3) })
d.Compute(func(currentValue Type) Type { return compute(currentValue, input1.Get(), input2.Get(), input3) })
}, true),
)
})
}, initialValue...)
}

// NewDerivedVariable4 creates a DerivedVariable that transforms four input values into a different one.
func NewDerivedVariable4[Type, InputType1, InputType2, InputType3, InputType4 comparable, InputValueType1 ReadableVariable[InputType1], InputValueType2 ReadableVariable[InputType2], InputValueType3 ReadableVariable[InputType3], InputValueType4 ReadableVariable[InputType4]](compute func(InputType1, InputType2, InputType3, InputType4) Type, input1 InputValueType1, input2 InputValueType2, input3 InputValueType3, input4 InputValueType4) DerivedVariable[Type] {
func NewDerivedVariable4[Type, InputType1, InputType2, InputType3, InputType4 comparable, InputValueType1 ReadableVariable[InputType1], InputValueType2 ReadableVariable[InputType2], InputValueType3 ReadableVariable[InputType3], InputValueType4 ReadableVariable[InputType4]](compute func(currentValue Type, inputValue1 InputType1, inputValue2 InputType2, inputValue3 InputType3, inputValue4 InputType4) Type, input1 InputValueType1, input2 InputValueType2, input3 InputValueType3, input4 InputValueType4, initialValue ...Type) DerivedVariable[Type] {
return newDerivedVariable[Type](func(d DerivedVariable[Type]) func() {
return lo.Batch(
input1.OnUpdate(func(_, input1 InputType1) {
d.Compute(func(_ Type) Type { return compute(input1, input2.Get(), input3.Get(), input4.Get()) })
d.Compute(func(currentValue Type) Type {
return compute(currentValue, input1, input2.Get(), input3.Get(), input4.Get())
})
}, true),

input2.OnUpdate(func(_, input2 InputType2) {
d.Compute(func(_ Type) Type { return compute(input1.Get(), input2, input3.Get(), input4.Get()) })
d.Compute(func(currentValue Type) Type {
return compute(currentValue, input1.Get(), input2, input3.Get(), input4.Get())
})
}, true),

input3.OnUpdate(func(_, input3 InputType3) {
d.Compute(func(_ Type) Type { return compute(input1.Get(), input2.Get(), input3, input4.Get()) })
d.Compute(func(currentValue Type) Type {
return compute(currentValue, input1.Get(), input2.Get(), input3, input4.Get())
})
}, true),

input4.OnUpdate(func(_, input4 InputType4) {
d.Compute(func(_ Type) Type { return compute(input1.Get(), input2.Get(), input3.Get(), input4) })
d.Compute(func(currentValue Type) Type {
return compute(currentValue, input1.Get(), input2.Get(), input3.Get(), input4)
})
}, true),
)
})
}, initialValue...)
}

// endregion ///////////////////////////////////////////////////////////////////////////////////////////////////////////
Expand Down
4 changes: 2 additions & 2 deletions ds/reactive/variable_impl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,9 +283,9 @@ type derivedVariable[ValueType comparable] struct {
}

// newDerivedVariable creates a new derivedVariable instance.
func newDerivedVariable[ValueType comparable](subscribe func(DerivedVariable[ValueType]) func()) *derivedVariable[ValueType] {
func newDerivedVariable[ValueType comparable](subscribe func(DerivedVariable[ValueType]) func(), initialValue ...ValueType) *derivedVariable[ValueType] {
d := &derivedVariable[ValueType]{
Variable: NewVariable[ValueType](),
Variable: NewVariable[ValueType]().Init(lo.First(initialValue)),
}

d.unsubscribe = subscribe(d)
Expand Down
Loading