Moved html drivers outside of standard library

pkg/html/driver.go

@@ -1,13 +1,13 @@
-package driver
+package html
 
 import (
 	"context"
 	"fmt"
+	"github.com/MontFerret/ferret/pkg/html/dynamic"
+	"github.com/MontFerret/ferret/pkg/html/static"
 	"github.com/MontFerret/ferret/pkg/runtime/core"
 	"github.com/MontFerret/ferret/pkg/runtime/env"
 	"github.com/MontFerret/ferret/pkg/runtime/values"
-	"github.com/MontFerret/ferret/pkg/stdlib/html/driver/dynamic"
-	"github.com/MontFerret/ferret/pkg/stdlib/html/driver/static"
 )
 
 type Name string

pkg/html/dynamic/document.go

@@ -3,21 +3,20 @@ package dynamic
 import (
 	"context"
 	"fmt"
-	"hash/fnv"
-	"sync"
-	"time"
-
+	"github.com/MontFerret/ferret/pkg/html/dynamic/eval"
+	"github.com/MontFerret/ferret/pkg/html/dynamic/events"
 	"github.com/MontFerret/ferret/pkg/runtime/core"
 	"github.com/MontFerret/ferret/pkg/runtime/logging"
 	"github.com/MontFerret/ferret/pkg/runtime/values"
-	"github.com/MontFerret/ferret/pkg/stdlib/html/driver/dynamic/eval"
-	"github.com/MontFerret/ferret/pkg/stdlib/html/driver/dynamic/events"
 	"github.com/mafredri/cdp"
 	"github.com/mafredri/cdp/protocol/dom"
 	"github.com/mafredri/cdp/protocol/page"
 	"github.com/mafredri/cdp/rpcc"
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+	"hash/fnv"
+	"sync"
+	"time"
 )
 
 const BlankPageURL = "about:blank"

pkg/html/dynamic/element.go

@@ -4,11 +4,11 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
+	"github.com/MontFerret/ferret/pkg/html/common"
+	"github.com/MontFerret/ferret/pkg/html/dynamic/eval"
+	"github.com/MontFerret/ferret/pkg/html/dynamic/events"
 	"github.com/MontFerret/ferret/pkg/runtime/core"
 	"github.com/MontFerret/ferret/pkg/runtime/values"
-	"github.com/MontFerret/ferret/pkg/stdlib/html/driver/common"
-	"github.com/MontFerret/ferret/pkg/stdlib/html/driver/dynamic/eval"
-	"github.com/MontFerret/ferret/pkg/stdlib/html/driver/dynamic/events"
 	"github.com/PuerkitoBio/goquery"
 	"github.com/mafredri/cdp"
 	"github.com/mafredri/cdp/protocol/dom"

pkg/html/dynamic/events/dispatch.go

@@ -3,8 +3,8 @@ package events
 import (
 	"context"
 	"fmt"
+	"github.com/MontFerret/ferret/pkg/html/dynamic/eval"
 	"github.com/MontFerret/ferret/pkg/runtime/values"
-	"github.com/MontFerret/ferret/pkg/stdlib/html/driver/dynamic/eval"
 	"github.com/mafredri/cdp"
 	"github.com/mafredri/cdp/protocol/dom"
 	"github.com/mafredri/cdp/protocol/runtime"

pkg/html/dynamic/events/wait.go

@@ -1,9 +1,9 @@
 package events
 
 import (
+	"github.com/MontFerret/ferret/pkg/html/dynamic/eval"
 	"github.com/MontFerret/ferret/pkg/runtime/core"
 	"github.com/MontFerret/ferret/pkg/runtime/values"
-	"github.com/MontFerret/ferret/pkg/stdlib/html/driver/dynamic/eval"
 	"github.com/mafredri/cdp"
 	"time"
 )

pkg/html/dynamic/helpers.go

@@ -2,9 +2,9 @@ package dynamic
 
 import (
 	"context"
+	"github.com/MontFerret/ferret/pkg/html/common"
+	"github.com/MontFerret/ferret/pkg/html/dynamic/events"
 	"github.com/MontFerret/ferret/pkg/runtime/values"
-	"github.com/MontFerret/ferret/pkg/stdlib/html/driver/common"
-	"github.com/MontFerret/ferret/pkg/stdlib/html/driver/dynamic/events"
 	"github.com/mafredri/cdp"
 	"github.com/mafredri/cdp/protocol/dom"
 	"github.com/mafredri/cdp/protocol/page"

pkg/html/static/document_test.go

@@ -2,7 +2,7 @@ package static_test
 
 import (
 	"bytes"
-	"github.com/MontFerret/ferret/pkg/stdlib/html/driver/static"
+	"github.com/MontFerret/ferret/pkg/html/static"
 	"github.com/PuerkitoBio/goquery"
 	. "github.com/smartystreets/goconvey/convey"
 	"testing"

pkg/html/static/element.go

@@ -2,9 +2,9 @@ package static
 
 import (
 	"encoding/json"
+	"github.com/MontFerret/ferret/pkg/html/common"
 	"github.com/MontFerret/ferret/pkg/runtime/core"
 	"github.com/MontFerret/ferret/pkg/runtime/values"
-	"github.com/MontFerret/ferret/pkg/stdlib/html/driver/common"
 	"github.com/PuerkitoBio/goquery"
 	"hash/fnv"
 )

pkg/html/static/element_test.go

@@ -2,7 +2,7 @@ package static_test
 
 import (
 	"bytes"
-	"github.com/MontFerret/ferret/pkg/stdlib/html/driver/static"
+	"github.com/MontFerret/ferret/pkg/html/static"
 	"github.com/PuerkitoBio/goquery"
 	. "github.com/smartystreets/goconvey/convey"
 	"testing"

pkg/runtime/program.go

@@ -2,9 +2,9 @@ package runtime
 
 import (
 	"context"
+	"github.com/MontFerret/ferret/pkg/html"
 	"github.com/MontFerret/ferret/pkg/runtime/core"
 	"github.com/MontFerret/ferret/pkg/runtime/values"
-	"github.com/MontFerret/ferret/pkg/stdlib/html/driver"
 )
 
 type Program struct {
@@ -40,9 +40,8 @@ func (p *Program) Run(ctx context.Context, setters ...Option) ([]byte, error) {
 	}
 
 	ctx = opts.withContext(ctx)
-	// TODO: Decouple from STDLIB
-	ctx = driver.WithDynamicDriver(ctx)
-	ctx = driver.WithStaticDriver(ctx)
+	ctx = html.WithDynamicDriver(ctx)
+	ctx = html.WithStaticDriver(ctx)
 
 	out, err := p.body.Exec(ctx, scope)
 

pkg/stdlib/html/blob.go

@@ -1,11 +1,11 @@
 package html
 
 import (
-	"fmt"
 	"context"
+	"fmt"
 
+	"github.com/MontFerret/ferret/pkg/html/dynamic"
 	"github.com/MontFerret/ferret/pkg/runtime/values"
-	"github.com/MontFerret/ferret/pkg/stdlib/html/driver/dynamic"
 
 	"github.com/MontFerret/ferret/pkg/runtime/core"
 )
@@ -79,9 +79,9 @@ func Screenshot(ctx context.Context, args ...core.Value) (core.Value, error) {
 			}
 			if !dynamic.IsScreenshotFormatValid(format.String()) {
 				return values.None, core.Error(
-					core.ErrInvalidArgument, 
+					core.ErrInvalidArgument,
 					fmt.Sprintf("format is not valid, expected jpeg or png, but got %s", format.String()))
-			} 
+			}
 			screenshotParams.Format = dynamic.ScreenshotFormat(format.String())
 		}
 		x, found := params.Get("x")

pkg/stdlib/html/click.go

@@ -2,9 +2,9 @@ package html
 
 import (
 	"context"
+	"github.com/MontFerret/ferret/pkg/html/dynamic"
 	"github.com/MontFerret/ferret/pkg/runtime/core"
 	"github.com/MontFerret/ferret/pkg/runtime/values"
-	"github.com/MontFerret/ferret/pkg/stdlib/html/driver/dynamic"
 )
 
 /*

pkg/stdlib/html/click_all.go

@@ -2,9 +2,9 @@ package html
 
 import (
 	"context"
+	"github.com/MontFerret/ferret/pkg/html/dynamic"
 	"github.com/MontFerret/ferret/pkg/runtime/core"
 	"github.com/MontFerret/ferret/pkg/runtime/values"
-	"github.com/MontFerret/ferret/pkg/stdlib/html/driver/dynamic"
 )
 
 /*

pkg/stdlib/html/document.go

@@ -2,9 +2,9 @@ package html
 
 import (
 	"context"
+	"github.com/MontFerret/ferret/pkg/html"
 	"github.com/MontFerret/ferret/pkg/runtime/core"
 	"github.com/MontFerret/ferret/pkg/runtime/values"
-	"github.com/MontFerret/ferret/pkg/stdlib/html/driver"
 )
 
 /*
@@ -37,12 +37,12 @@ func Document(ctx context.Context, args ...core.Value) (core.Value, error) {
 		dynamic = args[1].(values.Boolean)
 	}
 
-	var drv driver.Driver
+	var drv html.Driver
 
 	if !dynamic {
-		drv, err = driver.FromContext(ctx, driver.Static)
+		drv, err = html.FromContext(ctx, html.Static)
 	} else {
-		drv, err = driver.FromContext(ctx, driver.Dynamic)
+		drv, err = html.FromContext(ctx, html.Dynamic)
 	}
 
 	if err != nil {

pkg/stdlib/html/document_parse.go

@@ -2,10 +2,10 @@ package html
 
 import (
 	"context"
+	"github.com/MontFerret/ferret/pkg/html"
+	"github.com/MontFerret/ferret/pkg/html/static"
 	"github.com/MontFerret/ferret/pkg/runtime/core"
 	"github.com/MontFerret/ferret/pkg/runtime/values"
-	"github.com/MontFerret/ferret/pkg/stdlib/html/driver"
-	"github.com/MontFerret/ferret/pkg/stdlib/html/driver/static"
 )
 
 /*
@@ -27,7 +27,7 @@ func DocumentParse(ctx context.Context, args ...core.Value) (core.Value, error)
 		return values.None, err
 	}
 
-	drv, err := driver.FromContext(ctx, driver.Static)
+	drv, err := html.FromContext(ctx, html.Static)
 
 	if err != nil {
 		return values.None, err

pkg/stdlib/html/input.go

@@ -2,9 +2,9 @@ package html
 
 import (
 	"context"
+	"github.com/MontFerret/ferret/pkg/html/dynamic"
 	"github.com/MontFerret/ferret/pkg/runtime/core"
 	"github.com/MontFerret/ferret/pkg/runtime/values"
-	"github.com/MontFerret/ferret/pkg/stdlib/html/driver/dynamic"
 )
 
 /*

pkg/stdlib/html/navigate.go

@@ -2,9 +2,9 @@ package html
 
 import (
 	"context"
+	"github.com/MontFerret/ferret/pkg/html/dynamic"
 	"github.com/MontFerret/ferret/pkg/runtime/core"
 	"github.com/MontFerret/ferret/pkg/runtime/values"
-	"github.com/MontFerret/ferret/pkg/stdlib/html/driver/dynamic"
 )
 
 /*

pkg/stdlib/html/wait_class.go

@@ -2,9 +2,9 @@ package html
 
 import (
 	"context"
+	"github.com/MontFerret/ferret/pkg/html/dynamic"
 	"github.com/MontFerret/ferret/pkg/runtime/core"
 	"github.com/MontFerret/ferret/pkg/runtime/values"
-	"github.com/MontFerret/ferret/pkg/stdlib/html/driver/dynamic"
 )
 
 /*

pkg/stdlib/html/wait_class_all.go

@@ -2,9 +2,9 @@ package html
 
 import (
 	"context"
+	"github.com/MontFerret/ferret/pkg/html/dynamic"
 	"github.com/MontFerret/ferret/pkg/runtime/core"
 	"github.com/MontFerret/ferret/pkg/runtime/values"
-	"github.com/MontFerret/ferret/pkg/stdlib/html/driver/dynamic"
 )
 
 /*

pkg/stdlib/html/wait_element.go

@@ -2,9 +2,9 @@ package html
 
 import (
 	"context"
+	"github.com/MontFerret/ferret/pkg/html/dynamic"
 	"github.com/MontFerret/ferret/pkg/runtime/core"
 	"github.com/MontFerret/ferret/pkg/runtime/values"
-	"github.com/MontFerret/ferret/pkg/stdlib/html/driver/dynamic"
 )
 
 /*

pkg/stdlib/html/wait_navigation.go

@@ -2,9 +2,9 @@ package html
 
 import (
 	"context"
+	"github.com/MontFerret/ferret/pkg/html/dynamic"
 	"github.com/MontFerret/ferret/pkg/runtime/core"
 	"github.com/MontFerret/ferret/pkg/runtime/values"
-	"github.com/MontFerret/ferret/pkg/stdlib/html/driver/dynamic"
 )
 
 /*