Skip to content

Commit

Permalink
fix api name
Browse files Browse the repository at this point in the history
  • Loading branch information
zhishun lin committed Oct 23, 2023
1 parent 74f586e commit 6f25a18
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 18 deletions.
16 changes: 8 additions & 8 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ func TestCustomizeMarshaller1(t *testing.T) {
Name: "hello",
}

data, err := interpreter.MarshalIntoTemplate(item)
data, err := jsonextend.MarshalIntoTemplate(item)
if err != nil {
t.FailNow()
}
Expand All @@ -291,7 +291,7 @@ func TestCustomizeMarshaller3Ext(t *testing.T) {
Name: "hello",
}

data, err := interpreter.MarshalIntoTemplate(item)
data, err := jsonextend.MarshalIntoTemplate(item)
if err != nil {
t.FailNow()
}
Expand Down Expand Up @@ -320,7 +320,7 @@ func TestCustomizeMarshaller2(t *testing.T) {
Name: "hello",
}

data, err := interpreter.MarshalIntoTemplate(item)
data, err := jsonextend.MarshalIntoTemplate(item)
if err != nil {
t.FailNow()
}
Expand All @@ -346,7 +346,7 @@ func TestCustomizeMarshaller3(t *testing.T) {
Name: "hello",
}

data, err := interpreter.MarshalIntoTemplate(item)
data, err := jsonextend.MarshalIntoTemplate(item)
if err != nil {
t.FailNow()
}
Expand Down Expand Up @@ -379,7 +379,7 @@ func TestCustomizeMarshallerStealSky1(t *testing.T) {
Name: "hello",
}

data, err := interpreter.MarshalWithVariable(item, map[string]interface{}{"var1": "my love"})
data, err := jsonextend.MarshalWithVariable(item, map[string]interface{}{"var1": "my love"})
if err != nil {
t.FailNow()
}
Expand All @@ -399,7 +399,7 @@ func TestCustomizeMarshallerStealSky2(t *testing.T) {
Name: "hello",
}

data, err := interpreter.MarshalWithVariable(item, map[string]interface{}{"var1": "my love"})
data, err := jsonextend.MarshalWithVariable(item, map[string]interface{}{"var1": "my love"})
if err != nil {
t.FailNow()
}
Expand All @@ -426,7 +426,7 @@ func TestCustomizeMarshallerOnStruct(t *testing.T) {
Name: someStruct{"ddd"},
}

data, err := interpreter.MarshalWithVariable(item, map[string]interface{}{"var1": "hello", "var2": "world"})
data, err := jsonextend.MarshalWithVariable(item, map[string]interface{}{"var1": "hello", "var2": "world"})
if err != nil {
t.FailNow()
}
Expand All @@ -447,7 +447,7 @@ func TestCustomizeMarshallerOnStruct2(t *testing.T) {
Name: []int{1, 2, 3, 4, 5},
}

data, err := interpreter.MarshalWithVariable(item, map[string]interface{}{"var1": "hello", "var2": "world"})
data, err := jsonextend.MarshalWithVariable(item, map[string]interface{}{"var1": "hello", "var2": "world"})
if err != nil {
t.FailNow()
}
Expand Down
8 changes: 4 additions & 4 deletions interpreter/marshal_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,7 @@ func TestCustomizeMarshallerVariable(t *testing.T) {
Name: "hello",
}

data, err := interpreter.MarshalWithVariable(item, map[string]interface{}{"var1": "my love"})
data, err := interpreter.MarshalWithVariables(item, map[string]interface{}{"var1": "my love"})
if err != nil {
t.FailNow()
}
Expand All @@ -518,7 +518,7 @@ func TestCustomizeMarshallerKey(t *testing.T) {
Name: "hello",
}

data, err := interpreter.MarshalWithVariable(item, map[string]interface{}{"var1": "my love"})
data, err := interpreter.MarshalWithVariables(item, map[string]interface{}{"var1": "my love"})
if err != nil {
t.FailNow()
}
Expand All @@ -541,7 +541,7 @@ func TestCustomizeMarshallerOnStruct(t *testing.T) {
Name: someStruct{"ddd"},
}

data, err := interpreter.MarshalWithVariable(item, map[string]interface{}{"var1": "hello", "var2": "world"})
data, err := interpreter.MarshalWithVariables(item, map[string]interface{}{"var1": "hello", "var2": "world"})
if err != nil {
t.FailNow()
}
Expand All @@ -562,7 +562,7 @@ func TestCustomizeMarshallerOnStruct2(t *testing.T) {
Name: []int{1, 2, 3, 4, 5},
}

data, err := interpreter.MarshalWithVariable(item, map[string]interface{}{"var1": "hello", "var2": "world"})
data, err := interpreter.MarshalWithVariables(item, map[string]interface{}{"var1": "hello", "var2": "world"})
if err != nil {
t.FailNow()
}
Expand Down
2 changes: 1 addition & 1 deletion interpreter/marshaler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ func Marshal(v interface{}) ([]byte, error) {
return marshal(v, 1, nil, nil)
}

func MarshalWithVariable(v interface{}, variables map[string]interface{}) ([]byte, error) {
func MarshalWithVariables(v interface{}, variables map[string]interface{}) ([]byte, error) {
return marshal(v, 1, variables, []astbuilder.TokenProviderOptions{golang.EnableJsonExtTag})
}

Expand Down
8 changes: 8 additions & 0 deletions jsonextend.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,11 @@ func Unmarshal(reader io.Reader, variables map[string]interface{}, out interface
func Marshal(v interface{}) ([]byte, error) {
return interpreter.Marshal(v)
}

func MarshalWithVariables(v interface{}, variables map[string]interface{}) ([]byte, error) {
return interpreter.MarshalWithVariables(v, variables)
}

func MarshalIntoTemplate(v interface{}) ([]byte, error) {
return interpreter.MarshalIntoTemplate(v)
}
9 changes: 4 additions & 5 deletions marshal_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import (

"github.com/jaksonlin/go-jsonextend"
"github.com/jaksonlin/go-jsonextend/astbuilder/golang"
"github.com/jaksonlin/go-jsonextend/interpreter"
)

func TestMarshalObj(t *testing.T) {
Expand Down Expand Up @@ -252,7 +251,7 @@ func TestCustomizeMarshaller(t *testing.T) {
Name: "hello",
}

data, err := interpreter.MarshalIntoTemplate(item)
data, err := jsonextend.MarshalIntoTemplate(item)
if err != nil {
t.FailNow()
}
Expand All @@ -272,7 +271,7 @@ func TestCustomizeMarshallerStealSky1(t *testing.T) {
Name: "hello",
}

data, err := interpreter.MarshalWithVariable(item, map[string]interface{}{"var1": "my love"})
data, err := jsonextend.MarshalWithVariables(item, map[string]interface{}{"var1": "my love"})
if err != nil {
t.FailNow()
}
Expand All @@ -292,7 +291,7 @@ func TestCustomizeMarshallerStealSky2(t *testing.T) {
Name: "hello",
}

data, err := interpreter.MarshalWithVariable(item, map[string]interface{}{"var1": "my love"})
data, err := jsonextend.MarshalWithVariables(item, map[string]interface{}{"var1": "my love"})
if err != nil {
t.FailNow()
}
Expand All @@ -315,7 +314,7 @@ func TestCustomizeMarshallerStealSky3(t *testing.T) {
Name: someStruct{"ddd"},
}

data, err := interpreter.MarshalIntoTemplate(item)
data, err := jsonextend.MarshalIntoTemplate(item)
if err != nil {
t.FailNow()
}
Expand Down

0 comments on commit 6f25a18

Please sign in to comment.