refactor: simplify addon API

szkiba · Jun 12, 2023 · 80ad15f · 80ad15f
1 parent b788376
commit 80ad15f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 14 deletions.
diff --git a/g0/bootstrap.go b/g0/bootstrap.go
@@ -18,23 +18,24 @@ import (
 )
 
 func registerBuiltins() {
-	RegisterExports(stdlib.Exports)
-	RegisterExports(logrus.Exports)
-	RegisterExports(resty.Exports)
-	RegisterExports(testify.Exports)
-	RegisterExports(goquery.Exports)
-	RegisterExports(gjson.Exports)
-	RegisterExports(jsonpath.Exports)
-	RegisterExports(jsonschema.Exports)
-	RegisterExports(gofakeit.Exports)
+	registerExports(stdlib.Exports)
+	registerExports(logrus.Exports)
+	registerExports(resty.Exports)
+	registerExports(testify.Exports)
+	registerExports(goquery.Exports)
+	registerExports(gjson.Exports)
+	registerExports(jsonpath.Exports)
+	registerExports(jsonschema.Exports)
+	registerExports(gofakeit.Exports)
 }
 
 func registerExtension() {
 	modules.Register("k6/x/g0", New())
 }
 
-func Bootstrap() {
+func Bootstrap(addons ...ExportsFunc) {
 	registerBuiltins()
+	registerExports(addons...)
 	redirectStdin()
 	registerExtension()
 }
diff --git a/g0/exports.go b/g0/exports.go
@@ -14,8 +14,8 @@ import (
 
 type ExportsFunc func(modules.VU) interp.Exports
 
-func RegisterExports(fn ExportsFunc) {
-	registry.register(fn)
+func registerExports(fn ...ExportsFunc) {
+	registry.register(fn...)
 }
 
 type exportsRegistry struct {
@@ -25,11 +25,11 @@ type exportsRegistry struct {
 
 var registry exportsRegistry
 
-func (r *exportsRegistry) register(fn ExportsFunc) {
+func (r *exportsRegistry) register(fn ...ExportsFunc) {
 	r.mu.Lock()
 	defer r.mu.Unlock()
 
-	r.exports = append(r.exports, fn)
+	r.exports = append(r.exports, fn...)
 }
 
 func (r *exportsRegistry) merge(vu modules.VU) (interp.Exports, error) { //nolint:varnamelen