|
|
@ -48,29 +48,7 @@ func (r *reader) Merge(kvs ...*KeyValue) error { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
func (r *reader) Value(path string) (Value, bool) { |
|
|
|
func (r *reader) Value(path string) (Value, bool) { |
|
|
|
var ( |
|
|
|
return readValue(r.values, path) |
|
|
|
next = r.values |
|
|
|
|
|
|
|
keys = strings.Split(path, ".") |
|
|
|
|
|
|
|
last = len(keys) - 1 |
|
|
|
|
|
|
|
) |
|
|
|
|
|
|
|
for idx, key := range keys { |
|
|
|
|
|
|
|
value, ok := next[key] |
|
|
|
|
|
|
|
if !ok { |
|
|
|
|
|
|
|
return nil, false |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
if idx == last { |
|
|
|
|
|
|
|
av := &atomicValue{} |
|
|
|
|
|
|
|
av.Store(value) |
|
|
|
|
|
|
|
return av, true |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
switch vm := value.(type) { |
|
|
|
|
|
|
|
case map[string]interface{}: |
|
|
|
|
|
|
|
next = vm |
|
|
|
|
|
|
|
default: |
|
|
|
|
|
|
|
return nil, false |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
return nil, false |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
func (r *reader) Source() ([]byte, error) { |
|
|
|
func (r *reader) Source() ([]byte, error) { |
|
|
@ -114,6 +92,34 @@ func convertMap(src interface{}) interface{} { |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// readValue read Value in given map[string]interface{}
|
|
|
|
|
|
|
|
// by the given path, will return false if not found.
|
|
|
|
|
|
|
|
func readValue(values map[string]interface{}, path string) (Value, bool) { |
|
|
|
|
|
|
|
var ( |
|
|
|
|
|
|
|
next = values |
|
|
|
|
|
|
|
keys = strings.Split(path, ".") |
|
|
|
|
|
|
|
last = len(keys) - 1 |
|
|
|
|
|
|
|
) |
|
|
|
|
|
|
|
for idx, key := range keys { |
|
|
|
|
|
|
|
value, ok := next[key] |
|
|
|
|
|
|
|
if !ok { |
|
|
|
|
|
|
|
return nil, false |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
if idx == last { |
|
|
|
|
|
|
|
av := &atomicValue{} |
|
|
|
|
|
|
|
av.Store(value) |
|
|
|
|
|
|
|
return av, true |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
switch vm := value.(type) { |
|
|
|
|
|
|
|
case map[string]interface{}: |
|
|
|
|
|
|
|
next = vm |
|
|
|
|
|
|
|
default: |
|
|
|
|
|
|
|
return nil, false |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
return nil, false |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
func marshalJSON(v interface{}) ([]byte, error) { |
|
|
|
func marshalJSON(v interface{}) ([]byte, error) { |
|
|
|
if m, ok := v.(proto.Message); ok { |
|
|
|
if m, ok := v.(proto.Message); ok { |
|
|
|
return protojson.MarshalOptions{EmitUnpopulated: true}.Marshal(m) |
|
|
|
return protojson.MarshalOptions{EmitUnpopulated: true}.Marshal(m) |
|
|
|