chore: Move not publicly used APIs in internal package

.github/workflows/tc39.yml

@@ -27,6 +27,6 @@ jobs:
       - name: Run tests
         run: |
           set -x
-          cd js/tc39
+          cd internal/js/tc39
           sh checkout.sh
           go test -timeout 1h

.github/workflows/wpt.yml

@@ -22,12 +22,12 @@ jobs:
       - name: Run Streams Tests
         run: |
           set -x
-          cd js/modules/k6/experimental/streams/tests
+          cd internal/js/modules/k6/experimental/streams/tests
           sh checkout.sh
           go test ../... -tags=wpt
       - name: Run Webcrypto Tests
         run: |
           set -x
-          cd js/modules/k6/webcrypto/tests
+          cd internal/js/modules/k6/experimental/webcrypto/tests
           sh checkout.sh
           go test ./... -tags=wpt

.gitignore

@@ -2,8 +2,8 @@
 /k6.exe
 /dist
 /pkg-build
-/js/tc39/TestTC39
-/js/modules/k6/experimental/streams/tests/wpt
+/internal/js/tc39/TestTC39
+/internal/js/modules/k6/experimental/streams/tests/wpt
 
 .vscode
 *.sublime-workspace
@@ -36,4 +36,4 @@ script.js
 /packaging/*.gpg
 
 # web platform tests
-js/modules/k6/webcrypto/tests/wpt/
+/internal/js/modules/k6/webcrypto/tests/wpt/

api/v1/control_surface.go

@@ -3,10 +3,10 @@ package v1
 import (
 	"context"
 
-	"go.k6.io/k6/execution"
+	"go.k6.io/k6/internal/execution"
+	"go.k6.io/k6/internal/metrics/engine"
 	"go.k6.io/k6/lib"
 	"go.k6.io/k6/metrics"
-	"go.k6.io/k6/metrics/engine"
 )
 
 // ControlSurface includes the methods the REST API can use to control and

api/v1/group_routes_test.go

@@ -10,14 +10,14 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"go.k6.io/k6/execution"
-	"go.k6.io/k6/execution/local"
+	"go.k6.io/k6/internal/execution"
+	"go.k6.io/k6/internal/execution/local"
+	"go.k6.io/k6/internal/lib/testutils"
+	"go.k6.io/k6/internal/lib/testutils/minirunner"
+	"go.k6.io/k6/internal/metrics/engine"
+	"go.k6.io/k6/internal/usage"
 	"go.k6.io/k6/lib"
-	"go.k6.io/k6/lib/testutils"
-	"go.k6.io/k6/lib/testutils/minirunner"
 	"go.k6.io/k6/metrics"
-	"go.k6.io/k6/metrics/engine"
-	"go.k6.io/k6/usage"
 )
 
 func getTestPreInitState(tb testing.TB) *lib.TestPreInitState {

api/v1/metric_routes_test.go

@@ -10,8 +10,8 @@ import (
 	"github.com/stretchr/testify/require"
 	"gopkg.in/guregu/null.v3"
 
+	"go.k6.io/k6/internal/lib/testutils/minirunner"
 	"go.k6.io/k6/lib"
-	"go.k6.io/k6/lib/testutils/minirunner"
 	"go.k6.io/k6/metrics"
 )
 

api/v1/setup_teardown_routes_test.go

@@ -15,14 +15,14 @@ import (
 	"github.com/stretchr/testify/require"
 	"gopkg.in/guregu/null.v3"
 
-	"go.k6.io/k6/execution"
-	"go.k6.io/k6/execution/local"
-	"go.k6.io/k6/js"
+	"go.k6.io/k6/internal/execution"
+	"go.k6.io/k6/internal/execution/local"
+	"go.k6.io/k6/internal/js"
+	"go.k6.io/k6/internal/loader"
+	"go.k6.io/k6/internal/metrics/engine"
 	"go.k6.io/k6/lib"
 	"go.k6.io/k6/lib/types"
-	"go.k6.io/k6/loader"
 	"go.k6.io/k6/metrics"
-	"go.k6.io/k6/metrics/engine"
 	"go.k6.io/k6/output"
 )
 

api/v1/status_routes.go

@@ -9,7 +9,7 @@ import (
 
 	"go.k6.io/k6/errext"
 	"go.k6.io/k6/errext/exitcodes"
-	"go.k6.io/k6/execution"
+	"go.k6.io/k6/internal/execution"
 	"go.k6.io/k6/lib/executor"
 )
 

api/v1/status_routes_test.go

@@ -15,12 +15,12 @@ import (
 	"github.com/stretchr/testify/require"
 	"gopkg.in/guregu/null.v3"
 
-	"go.k6.io/k6/execution"
-	"go.k6.io/k6/execution/local"
+	"go.k6.io/k6/internal/execution"
+	"go.k6.io/k6/internal/execution/local"
+	"go.k6.io/k6/internal/lib/testutils/minirunner"
+	"go.k6.io/k6/internal/metrics/engine"
 	"go.k6.io/k6/lib"
-	"go.k6.io/k6/lib/testutils/minirunner"
 	"go.k6.io/k6/metrics"
-	"go.k6.io/k6/metrics/engine"
 	"go.k6.io/k6/output"
 )
 

cloudapi/api_test.go

@@ -20,7 +20,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"go.k6.io/k6/lib/testutils"
+	"go.k6.io/k6/internal/lib/testutils"
 	"go.k6.io/k6/lib/types"
 )
 

cloudapi/logs_test.go

@@ -20,8 +20,8 @@ import (
 	"github.com/stretchr/testify/require"
 	"gopkg.in/guregu/null.v3"
 
-	"go.k6.io/k6/lib/testutils"
-	"go.k6.io/k6/lib/testutils/httpmultibin"
+	"go.k6.io/k6/internal/lib/testutils"
+	"go.k6.io/k6/internal/lib/testutils/httpmultibin"
 )
 
 func TestMsgParsing(t *testing.T) {

cmd/execute.go

@@ -0,0 +1,10 @@
+// Package cmd is here to provide a way for xk6 to build a binary with added extensions
+package cmd
+
+import "go.k6.io/k6/internal/cmd"
+
+// Execute exectues the k6 command
+// It only is exported here for backwards compatibility and the ability to use xk6 to build extended k6
+func Execute() {
+	cmd.Execute()
+}

cmd/state/state.go

@@ -12,9 +12,9 @@ import (
 	"github.com/mattn/go-isatty"
 	"github.com/sirupsen/logrus"
 
-	"go.k6.io/k6/event"
+	"go.k6.io/k6/internal/event"
+	"go.k6.io/k6/internal/ui/console"
 	"go.k6.io/k6/lib/fsext"
-	"go.k6.io/k6/ui/console"
 )
 
 const defaultConfigFileName = "config.json"

cmd/tests/global_state.go

@@ -0,0 +1,17 @@
+// Package tests contains types needed for running integration tests that run k6 commands.
+package tests
+
+import (
+	"testing"
+
+	"go.k6.io/k6/internal/cmd/tests"
+)
+
+// GlobalTestState is a wrapper around GlobalState for use in tests.
+type GlobalTestState = tests.GlobalTestState
+
+// NewGlobalTestState returns an initialized GlobalTestState, mocking all
+// GlobalState fields for use in tests.
+func NewGlobalTestState(tb testing.TB) *GlobalTestState {
+	return tests.NewGlobalTestState(tb)
+}

api/server.go → internal/api/server.go

@@ -13,10 +13,10 @@ import (
 	"github.com/sirupsen/logrus"
 
 	v1 "go.k6.io/k6/api/v1"
-	"go.k6.io/k6/execution"
+	"go.k6.io/k6/internal/execution"
+	"go.k6.io/k6/internal/metrics/engine"
 	"go.k6.io/k6/lib"
 	"go.k6.io/k6/metrics"
-	"go.k6.io/k6/metrics/engine"
 )
 
 func newHandler(cs *v1.ControlSurface, profilingEnabled bool) http.Handler {

api/server_test.go → internal/api/server_test.go

@@ -10,7 +10,7 @@ import (
 	logtest "github.com/sirupsen/logrus/hooks/test"
 	"github.com/stretchr/testify/assert"
 
-	"go.k6.io/k6/lib/testutils"
+	"go.k6.io/k6/internal/lib/testutils"
 )
 
 func testHTTPHandler(rw http.ResponseWriter, _ *http.Request) {

cloudapi/insights/client.go → internal/cloudapi/insights/client.go

@@ -17,7 +17,7 @@ import (
 	"google.golang.org/grpc/credentials/insecure"
 	"google.golang.org/grpc/status"
 
-	"go.k6.io/k6/cloudapi/insights/proto/v1/ingester"
+	"go.k6.io/k6/internal/cloudapi/insights/proto/v1/ingester"
 )
 
 const (

cloudapi/insights/client_test.go → internal/cloudapi/insights/client_test.go

@@ -13,7 +13,7 @@ import (
 	"google.golang.org/grpc/status"
 	"google.golang.org/grpc/test/bufconn"
 
-	"go.k6.io/k6/cloudapi/insights/proto/v1/ingester"
+	"go.k6.io/k6/internal/cloudapi/insights/proto/v1/ingester"
 )
 
 func newMockListener(t *testing.T, ingesterServer ingester.IngesterServiceServer) *bufconn.Listener {

cloudapi/insights/mappers.go → internal/cloudapi/insights/mappers.go

@@ -4,8 +4,8 @@ import (
 	"errors"
 	"fmt"
 
-	"go.k6.io/k6/cloudapi/insights/proto/v1/ingester"
-	"go.k6.io/k6/cloudapi/insights/proto/v1/k6"
+	"go.k6.io/k6/internal/cloudapi/insights/proto/v1/ingester"
+	"go.k6.io/k6/internal/cloudapi/insights/proto/v1/k6"
 )
 
 func newBatchCreateRequestMetadatasRequest(

cloudapi/insights/mappers_test.go → internal/cloudapi/insights/mappers_test.go

@@ -6,8 +6,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"go.k6.io/k6/cloudapi/insights/proto/v1/ingester"
-	"go.k6.io/k6/cloudapi/insights/proto/v1/k6"
+	"go.k6.io/k6/internal/cloudapi/insights/proto/v1/ingester"
+	"go.k6.io/k6/internal/cloudapi/insights/proto/v1/k6"
 )
 
 func Test_newBatchCreateRequestMetadatasRequest_CorrectlyMapsDomainTypeToProtoDefinition(t *testing.T) {

cmd/archive_test.go → internal/cmd/archive_test.go

@@ -8,10 +8,10 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"go.k6.io/k6/cmd/tests"
 	"go.k6.io/k6/errext/exitcodes"
+	"go.k6.io/k6/internal/cmd/tests"
+	"go.k6.io/k6/internal/lib/testutils"
 	"go.k6.io/k6/lib/fsext"
-	"go.k6.io/k6/lib/testutils"
 )
 
 func TestArchiveThresholds(t *testing.T) {

cmd/cloud.go → internal/cmd/cloud.go

@@ -16,9 +16,9 @@ import (
 	"go.k6.io/k6/cmd/state"
 	"go.k6.io/k6/errext"
 	"go.k6.io/k6/errext/exitcodes"
+	"go.k6.io/k6/internal/ui/pb"
 	"go.k6.io/k6/lib"
 	"go.k6.io/k6/lib/consts"
-	"go.k6.io/k6/ui/pb"
 
 	"github.com/fatih/color"
 	"github.com/spf13/cobra"

cmd/cloud_login.go → internal/cmd/cloud_login.go

@@ -13,8 +13,8 @@ import (
 
 	"go.k6.io/k6/cloudapi"
 	"go.k6.io/k6/cmd/state"
+	"go.k6.io/k6/internal/ui"
 	"go.k6.io/k6/lib/consts"
-	"go.k6.io/k6/ui"
 )
 
 const cloudLoginCommandName = "login"

cmd/cloud_run.go → internal/cmd/cloud_run.go

@@ -9,8 +9,8 @@ import (
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
-	"go.k6.io/k6/execution"
-	"go.k6.io/k6/execution/local"
+	"go.k6.io/k6/internal/execution"
+	"go.k6.io/k6/internal/execution/local"
 )
 
 const cloudRunCommandName string = "run"

cmd/config_consolidation_test.go → internal/cmd/config_consolidation_test.go

@@ -10,7 +10,7 @@ import (
 	"gopkg.in/guregu/null.v3"
 
 	"go.k6.io/k6/cmd/state"
-	"go.k6.io/k6/cmd/tests"
+	"go.k6.io/k6/internal/cmd/tests"
 	"go.k6.io/k6/lib"
 	"go.k6.io/k6/lib/executor"
 	"go.k6.io/k6/lib/fsext"

cmd/login_cloud.go → internal/cmd/login_cloud.go

@@ -13,8 +13,8 @@ import (
 
 	"go.k6.io/k6/cloudapi"
 	"go.k6.io/k6/cmd/state"
+	"go.k6.io/k6/internal/ui"
 	"go.k6.io/k6/lib/consts"
-	"go.k6.io/k6/ui"
 )
 
 //nolint:funlen,gocognit

cmd/login_influxdb.go → internal/cmd/login_influxdb.go

@@ -10,8 +10,8 @@ import (
 	"gopkg.in/guregu/null.v3"
 
 	"go.k6.io/k6/cmd/state"
-	"go.k6.io/k6/output/influxdb"
-	"go.k6.io/k6/ui"
+	"go.k6.io/k6/internal/output/influxdb"
+	"go.k6.io/k6/internal/ui"
 )
 
 //nolint:funlen

cmd/new_test.go → internal/cmd/new_test.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"go.k6.io/k6/cmd/tests"
+	"go.k6.io/k6/internal/cmd/tests"
 	"go.k6.io/k6/lib/fsext"
 )
 

cmd/outputs.go → internal/cmd/outputs.go

@@ -8,12 +8,12 @@ import (
 
 	"go.k6.io/k6/cmd/state"
 	"go.k6.io/k6/ext"
+	"go.k6.io/k6/internal/output/cloud"
+	"go.k6.io/k6/internal/output/influxdb"
+	"go.k6.io/k6/internal/output/json"
 	"go.k6.io/k6/lib"
 	"go.k6.io/k6/output"
-	"go.k6.io/k6/output/cloud"
 	"go.k6.io/k6/output/csv"
-	"go.k6.io/k6/output/influxdb"
-	"go.k6.io/k6/output/json"
 
 	"github.com/grafana/xk6-dashboard/dashboard"
 	"github.com/grafana/xk6-output-opentelemetry/pkg/opentelemetry"

cmd/report.go → internal/cmd/report.go

@@ -8,9 +8,9 @@ import (
 	"runtime"
 	"strconv"
 
-	"go.k6.io/k6/execution"
+	"go.k6.io/k6/internal/execution"
+	"go.k6.io/k6/internal/usage"
 	"go.k6.io/k6/lib/consts"
-	"go.k6.io/k6/usage"
 )
 
 func createReport(u *usage.Usage, execScheduler *execution.Scheduler) map[string]any {