-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This adds `fx.Decorate`, which lets you specify decorators to an fx app. A decorator can take in one or more dependencies that have already been `Provide`d to the app, and produce one or more values that will be used as replacements in the object graph. For example, suppose there is a simple app like this: ```go fx.New( fx.Provide(func() *Logger { return &Logger{Name: "logger"} }), fx.Invoke(func(l *Logger) { fmt.Println(l.Name) }), ) ``` Running this app will print "logger" on the console. Now let us suppose a decorator was provided: ```go fx.New( fx.Provide(...), // Provide same function as above fx.Decorate(func(l *Logger) *Logger { return &Logger{Name: "decorated " + l.Name} }), fx.Invoke(...), // Invoke same function as above ) ``` The decorator here will take in the provided Logger and replace it with another logger whose `Name` is `decorated logger`. The `Invoke`d function is then executed with this replacement value, so running this app will print "decorated logger" on the console. In terms of implementation, a decorator is represented by the target decorator function and the call stack it was provided from, similar to a provider. `module` contains a list of decorators that were specified within its scope. The dig dependency had to be updated to the latest master branch of Dig to ensure the fix for uber-go/dig#316 is in. Following this PR, there are two additional pieces I will be adding: 1. An eventing system for fx.Decorate. 2. fx.Replace, which takes in a value instead of a function to replace a value in the object graph. This is similar to what fx.Supply is to fx.Provide. This PR along with the two PRs above should make the long-awaited feature of graph modifications in fx finally possible. --- Refs #653, #649, #825, uber-go/dig#230, GO-1203, GO-736
- Loading branch information
Showing
7 changed files
with
531 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,137 @@ | ||
// Copyright (c) 2022 Uber Technologies, Inc. | ||
// | ||
// Permission is hereby granted, free of charge, to any person obtaining a copy | ||
// of this software and associated documentation files (the "Software"), to deal | ||
// in the Software without restriction, including without limitation the rights | ||
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
// copies of the Software, and to permit persons to whom the Software is | ||
// furnished to do so, subject to the following conditions: | ||
// | ||
// The above copyright notice and this permission notice shall be included in | ||
// all copies or substantial portions of the Software. | ||
// | ||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
// THE SOFTWARE. | ||
|
||
package fx | ||
|
||
import ( | ||
"fmt" | ||
"strings" | ||
|
||
"go.uber.org/dig" | ||
"go.uber.org/fx/internal/fxreflect" | ||
) | ||
|
||
// Decorate specifies one or more decorator functions to an Fx application. | ||
// Decorator functions let users augment objects in the graph. They can take in | ||
// zero or more dependencies that must be provided to the application with fx.Provide, | ||
// and produce one or more values that can be used by other invoked values. | ||
// | ||
// An example decorator is the following function which accepts a value, augments that value, | ||
// and returns the replacement value. | ||
// | ||
// fx.Decorate(func(log *zap.Logger) *zap.Logger { | ||
// return log.Named("myapp") | ||
// }) | ||
// | ||
// The following decorator accepts multiple dependencies from the graph, augments and returns | ||
// one of them. | ||
// | ||
// fx.Decorate(func(log *zap.Logger, cfg *Config) *zap.Logger { | ||
// return log.Named(cfg.Name) | ||
// }) | ||
// | ||
// Similar to fx.Provide, functions passed to fx.Decorate may optionally return an error | ||
// as their last result. If a decorator returns a non-nil error, it will halt application startup. | ||
// | ||
// All modifications in the object graph due to a decorator are scoped to the fx.Module it was | ||
// specified from. Decorations specified in the top-level fx.New call apply across the application. | ||
// | ||
// Decorators can be annotated using fx.Annotate, but not with fx.Annotated. Refer to documentation | ||
// on fx.Annotate() to learn how to use it for annotating functions. | ||
// | ||
// Decorators support fx.In and fx.Out structs, similar to fx.Provide and fx.Invoke. | ||
// | ||
// Decorators support value groups as well. For example, the following code shows a decorator | ||
// which takes in a value group using fx.In struct, and returns another value group. | ||
// | ||
// type HandlerParam struct { | ||
// fx.In | ||
// | ||
// Handlers []Handler `group:"server" | ||
// } | ||
// | ||
// type HandlerResult struct { | ||
// fx.Out | ||
// | ||
// Handlers []Handler `group:"server" | ||
// } | ||
// | ||
// fx.New( | ||
// // ... | ||
// fx.Decorate(func(p HandlerParam) HandlerResult { | ||
// // ... | ||
// }), | ||
// ) | ||
func Decorate(decorators ...interface{}) Option { | ||
return decorateOption{ | ||
Targets: decorators, | ||
Stack: fxreflect.CallerStack(1, 0), | ||
} | ||
} | ||
|
||
type decorateOption struct { | ||
Targets []interface{} | ||
Stack fxreflect.Stack | ||
} | ||
|
||
func (o decorateOption) apply(mod *module) { | ||
for _, target := range o.Targets { | ||
mod.decorators = append(mod.decorators, decorator{ | ||
Target: target, | ||
Stack: o.Stack, | ||
}) | ||
} | ||
} | ||
|
||
func (o decorateOption) String() string { | ||
items := make([]string, len(o.Targets)) | ||
for i, f := range o.Targets { | ||
items[i] = fxreflect.FuncName(f) | ||
} | ||
return fmt.Sprintf("fx.Decorate(%s)", strings.Join(items, ", ")) | ||
} | ||
|
||
// decorator is a single decorator used in Fx. | ||
type decorator struct { | ||
// Decorator provided to Fx. | ||
Target interface{} | ||
|
||
// Stack trace of where this provide was made. | ||
Stack fxreflect.Stack | ||
} | ||
|
||
func runDecorator(c container, d decorator, opts ...dig.DecorateOption) (err error) { | ||
decorator := d.Target | ||
defer func() { | ||
if err != nil { | ||
err = fmt.Errorf("fx.Decorate(%v) from:\n%+vFailed: %v", decorator, d.Stack, err) | ||
} | ||
}() | ||
|
||
switch decorator := decorator.(type) { | ||
case annotated: | ||
if dcor, derr := decorator.Build(); derr == nil { | ||
err = c.Decorate(dcor, opts...) | ||
} | ||
default: | ||
err = c.Decorate(decorator, opts...) | ||
} | ||
return | ||
} |
Oops, something went wrong.