New type system (MontFerret#232)

* New type system * Fixed dot notation for HTML elements
3timeslazy · Apr 10, 2019 · e26b7b2 · e26b7b2
1 parent abeffe8
commit e26b7b2
Show file tree

Hide file tree

Showing 8 changed files with 59 additions and 140 deletions.
diff --git a/pkg/drivers/cdp/document.go b/pkg/drivers/cdp/document.go
@@ -3,7 +3,6 @@ package cdp
 import (
 	"context"
 	"fmt"
-	"github.com/mafredri/cdp/protocol/dom"
 	"hash/fnv"
 	"sync"
 	"time"
@@ -13,7 +12,9 @@ import (
 	"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/runtime/values/types"
 	"github.com/mafredri/cdp"
+	"github.com/mafredri/cdp/protocol/dom"
 	"github.com/mafredri/cdp/protocol/input"
 	"github.com/mafredri/cdp/protocol/page"
 	"github.com/mafredri/cdp/rpcc"
@@ -142,7 +143,7 @@ func (doc *HTMLDocument) MarshalJSON() ([]byte, error) {
 }
 
 func (doc *HTMLDocument) Type() core.Type {
-	return core.HTMLDocumentType
+	return types.HTMLDocument
 }
 
 func (doc *HTMLDocument) String() string {
@@ -176,22 +177,17 @@ func (doc *HTMLDocument) Copy() core.Value {
 	return values.None
 }
 
-func (doc *HTMLDocument) Compare(other core.Value) int {
+func (doc *HTMLDocument) Compare(other core.Value) int64 {
 	doc.Lock()
 	defer doc.Unlock()
 
-	switch other.Type() {
-	case core.HTMLDocumentType:
+	if other.Type() == types.HTMLDocument {
 		other := other.(*HTMLDocument)
 
 		return doc.url.Compare(other.url)
-	default:
-		if other.Type() > core.HTMLDocumentType {
-			return -1
-		}
-
-		return 1
 	}
+
+	return types.Compare(other.Type(), types.HTMLDocument)
 }
 
 func (doc *HTMLDocument) Close() error {
@@ -399,7 +395,7 @@ func (doc *HTMLDocument) ClickBySelector(selector values.String) (values.Boolean
 		return values.False, err
 	}
 
-	if res.Type() == core.BooleanType {
+	if res.Type() == types.Boolean {
 		return res.(values.Boolean), nil
 	}
 
@@ -431,7 +427,7 @@ func (doc *HTMLDocument) ClickBySelectorAll(selector values.String) (values.Bool
 		return values.False, err
 	}
 
-	if res.Type() == core.BooleanType {
+	if res.Type() == types.Boolean {
 		return res.(values.Boolean), nil
 	}
 
@@ -461,7 +457,7 @@ func (doc *HTMLDocument) InputBySelector(selector values.String, value core.Valu
 		return values.False, err
 	}
 
-	if res.Type() == core.BooleanType && res.(values.Boolean) == values.False {
+	if res.Type() == types.Boolean && res.(values.Boolean) == values.False {
 		return values.False, nil
 	}
 
@@ -531,7 +527,7 @@ func (doc *HTMLDocument) SelectBySelector(selector values.String, value *values.
 		return arr, nil
 	}
 
-	return nil, core.TypeError(core.ArrayType, res.Type())
+	return nil, core.TypeError(types.Array, res.Type())
 }
 
 func (doc *HTMLDocument) HoverBySelector(selector values.String) error {

diff --git a/pkg/drivers/http/document.go b/pkg/drivers/http/document.go
@@ -3,6 +3,7 @@ package http
 import (
 	"github.com/MontFerret/ferret/pkg/runtime/core"
 	"github.com/MontFerret/ferret/pkg/runtime/values"
+	"github.com/MontFerret/ferret/pkg/runtime/values/types"
 	"github.com/PuerkitoBio/goquery"
 )
 
@@ -33,22 +34,17 @@ func NewHTMLDocument(
 }
 
 func (doc *HTMLDocument) Type() core.Type {
-	return core.HTMLDocumentType
+	return types.HTMLDocument
 }
 
-func (doc *HTMLDocument) Compare(other core.Value) int {
-	switch other.Type() {
-	case core.HTMLDocumentType:
+func (doc *HTMLDocument) Compare(other core.Value) int64 {
+	if other.Type() == types.HTMLDocument {
 		otherDoc := other.(values.HTMLDocument)
 
 		return doc.url.Compare(otherDoc.URL())
-	default:
-		if other.Type() > core.HTMLDocumentType {
-			return -1
-		}
-
-		return 1
 	}
+
+	return types.Compare(other.Type(), types.HTMLDocument)
 }
 
 func (doc *HTMLDocument) URL() core.Value {

diff --git a/pkg/drivers/http/element.go b/pkg/drivers/http/element.go
@@ -7,6 +7,7 @@ import (
 	"github.com/MontFerret/ferret/pkg/drivers/common"
 	"github.com/MontFerret/ferret/pkg/runtime/core"
 	"github.com/MontFerret/ferret/pkg/runtime/values"
+	"github.com/MontFerret/ferret/pkg/runtime/values/types"
 	"github.com/PuerkitoBio/goquery"
 )
 
@@ -29,25 +30,20 @@ func (el *HTMLElement) MarshalJSON() ([]byte, error) {
 }
 
 func (el *HTMLElement) Type() core.Type {
-	return core.HTMLElementType
+	return types.HTMLElement
 }
 
 func (el *HTMLElement) String() string {
 	return el.InnerHTML().String()
 }
 
-func (el *HTMLElement) Compare(other core.Value) int {
-	switch other.Type() {
-	case core.HTMLElementType:
+func (el *HTMLElement) Compare(other core.Value) int64 {
+	if other.Type() == types.HTMLElement {
 		// TODO: complete the comparison
 		return -1
-	default:
-		if other.Type() > core.HTMLElementType {
-			return -1
-		}
-
-		return 1
 	}
+
+	return types.Compare(other.Type(), types.HTMLElement)
 }
 
 func (el *HTMLElement) Unwrap() interface{} {

diff --git a/pkg/runtime/core/value_test.go b/pkg/runtime/core/value_test.go
diff --git a/pkg/runtime/expressions/param_test.go b/pkg/runtime/expressions/param_test.go
@@ -2,6 +2,7 @@ package expressions_test
 
 import (
 	"context"
+	"github.com/MontFerret/ferret/pkg/runtime/values/types"
 	"testing"
 
 	"github.com/MontFerret/ferret/pkg/runtime/values/types"

diff --git a/pkg/stdlib/html/parse.go b/pkg/stdlib/html/parse.go
@@ -6,6 +6,7 @@ import (
 	"github.com/MontFerret/ferret/pkg/drivers"
 	"github.com/MontFerret/ferret/pkg/runtime/core"
 	"github.com/MontFerret/ferret/pkg/runtime/values"
+	"github.com/MontFerret/ferret/pkg/runtime/values/types"
 )
 
 // Parse parses a given HTML string and returns a HTML document.
@@ -19,7 +20,7 @@ func Parse(ctx context.Context, args ...core.Value) (core.Value, error) {
 		return values.None, err
 	}
 
-	err = core.ValidateType(args[0], core.StringType)
+	err = core.ValidateType(args[0], types.String)
 
 	if err != nil {
 		return values.None, err