Skip to content

Commit fb0db41

Browse files
committed
refactor: remove snippet config
1 parent ccafbc8 commit fb0db41

File tree

3 files changed

+16
-55
lines changed

3 files changed

+16
-55
lines changed

pkg/plugin/controllx/builder.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@ func AddToScheme() func(*scheme.Scheme) error {
1010
return func(s *scheme.Scheme) error {
1111
s.AddKnownType(KindSnippet, &SnippetSpec{})
1212
s.AddCodec(KindSnippet, scheme.CodecWithType[*SnippetSpec](func(spec *SnippetSpec) (node.Node, error) {
13-
return NewSnippetNode(SnippetNodeConfig{
14-
Lang: spec.Lang,
15-
Code: spec.Code,
16-
})
13+
return NewSnippetNode(spec.Lang, spec.Code)
1714
}))
1815

1916
s.AddKnownType(KindSwitch, &SwitchSpec{})

pkg/plugin/controllx/snippet.go

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,6 @@ import (
1818
"github.com/xiatechs/jsonata-go"
1919
)
2020

21-
// SnippetNodeConfig holds the configuration for creating a SnippetNode.
22-
type SnippetNodeConfig struct {
23-
Lang string
24-
Code string
25-
}
26-
2721
// SnippetNode represents a node that runs a snippet of code.
2822
type SnippetNode struct {
2923
*node.OneToOneNode
@@ -57,13 +51,10 @@ var (
5751
var _ node.Node = (*SnippetNode)(nil)
5852
var _ scheme.Spec = (*SnippetSpec)(nil)
5953

60-
// NewSnippetNode creates a new SnippetNode with the given configuration.
61-
func NewSnippetNode(config SnippetNodeConfig) (*SnippetNode, error) {
54+
// NewSnippetNode creates a new SnippetNode.
55+
func NewSnippetNode(lang, code string) (*SnippetNode, error) {
6256
defer func() { _ = recover() }()
6357

64-
lang := config.Lang
65-
code := config.Code
66-
6758
run, err := compile(lang, code)
6859
if err != nil {
6960
return nil, err

pkg/plugin/controllx/snippet_test.go

Lines changed: 13 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,7 @@ import (
1616
)
1717

1818
func TestNewSnippetNode(t *testing.T) {
19-
n, err := NewSnippetNode(SnippetNodeConfig{
20-
Lang: LangJSON,
21-
Code: "{}",
22-
})
19+
n, err := NewSnippetNode(LangJSON, "")
2320
assert.NoError(t, err)
2421
assert.NotNil(t, n)
2522

@@ -28,14 +25,11 @@ func TestNewSnippetNode(t *testing.T) {
2825

2926
func TestSnippetNode_Send(t *testing.T) {
3027
t.Run(LangTypescript, func(t *testing.T) {
31-
n, _ := NewSnippetNode(SnippetNodeConfig{
32-
Lang: LangTypescript,
33-
Code: `
28+
n, _ := NewSnippetNode(LangTypescript, `
3429
function main(inPayload: any): any {
3530
return inPayload;
3631
}
37-
`,
38-
})
32+
`)
3933
defer func() { _ = n.Close() }()
4034

4135
io := port.New()
@@ -64,14 +58,11 @@ function main(inPayload: any): any {
6458
})
6559

6660
t.Run(LangJavascript, func(t *testing.T) {
67-
n, _ := NewSnippetNode(SnippetNodeConfig{
68-
Lang: LangJavascript,
69-
Code: `
61+
n, _ := NewSnippetNode(LangTypescript, `
7062
function main(inPayload) {
7163
return inPayload;
7264
}
73-
`,
74-
})
65+
`)
7566
defer func() { _ = n.Close() }()
7667

7768
io := port.New()
@@ -102,10 +93,7 @@ function main(inPayload) {
10293
t.Run(LangJSON, func(t *testing.T) {
10394
data := faker.UUIDHyphenated()
10495

105-
n, _ := NewSnippetNode(SnippetNodeConfig{
106-
Lang: LangJSON,
107-
Code: fmt.Sprintf("\"%s\"", data),
108-
})
96+
n, _ := NewSnippetNode(LangJSON, fmt.Sprintf("\"%s\"", data))
10997
defer func() { _ = n.Close() }()
11098

11199
io := port.New()
@@ -134,10 +122,7 @@ function main(inPayload) {
134122
})
135123

136124
t.Run(LangJSONata, func(t *testing.T) {
137-
n, _ := NewSnippetNode(SnippetNodeConfig{
138-
Lang: LangJSONata,
139-
Code: "$",
140-
})
125+
n, _ := NewSnippetNode(LangJSONata, "$")
141126
defer func() { _ = n.Close() }()
142127

143128
io := port.New()
@@ -168,14 +153,11 @@ function main(inPayload) {
168153

169154
func BenchmarkSnippetNode_Send(b *testing.B) {
170155
b.Run(LangTypescript, func(b *testing.B) {
171-
n, _ := NewSnippetNode(SnippetNodeConfig{
172-
Lang: LangTypescript,
173-
Code: `
156+
n, _ := NewSnippetNode(LangTypescript, `
174157
function main(inPayload: any): any {
175158
return inPayload;
176159
}
177-
`,
178-
})
160+
`)
179161
defer func() { _ = n.Close() }()
180162

181163
io := port.New()
@@ -199,14 +181,11 @@ function main(inPayload: any): any {
199181
})
200182

201183
b.Run(LangJavascript, func(b *testing.B) {
202-
n, _ := NewSnippetNode(SnippetNodeConfig{
203-
Lang: LangJavascript,
204-
Code: `
184+
n, _ := NewSnippetNode(LangJavascript, `
205185
function main(inPayload) {
206186
return inPayload;
207187
}
208-
`,
209-
})
188+
`)
210189
defer func() { _ = n.Close() }()
211190

212191
io := port.New()
@@ -230,10 +209,7 @@ function main(inPayload) {
230209
})
231210

232211
b.Run(LangJSON, func(b *testing.B) {
233-
n, _ := NewSnippetNode(SnippetNodeConfig{
234-
Lang: LangJSON,
235-
Code: fmt.Sprintf("\"%s\"", faker.UUIDHyphenated()),
236-
})
212+
n, _ := NewSnippetNode(LangJSON, fmt.Sprintf("\"%s\"", faker.UUIDHyphenated()))
237213
defer func() { _ = n.Close() }()
238214

239215
io := port.New()
@@ -257,10 +233,7 @@ function main(inPayload) {
257233
})
258234

259235
b.Run(LangJSONata, func(b *testing.B) {
260-
n, _ := NewSnippetNode(SnippetNodeConfig{
261-
Lang: LangJSONata,
262-
Code: "$",
263-
})
236+
n, _ := NewSnippetNode(LangJSONata, "$")
264237
defer func() { _ = n.Close() }()
265238

266239
io := port.New()

0 commit comments

Comments
 (0)