refactor(pkg/builder) - move package out of parser

PxyUp · Jan 12, 2024 · 6b0ce25 · 6b0ce25
1 parent ff95234
commit 6b0ce25
Show file tree

Hide file tree

Showing 30 changed files with 23 additions and 18 deletions.
diff --git a/README.md b/README.md
@@ -242,7 +242,7 @@ import (
 	"fmt"
 	"github.com/PxyUp/fitter/pkg/config"
 	"github.com/PxyUp/fitter/pkg/logger"
-	"github.com/PxyUp/fitter/pkg/parser/builder"
+	"github.com/PxyUp/fitter/pkg/builder"
 	pl "github.com/PxyUp/fitter/pkg/plugins/plugin"
 )
 

diff --git a/cmd/fitter/main.go b/cmd/fitter/main.go
@@ -31,6 +31,11 @@ func getConfig(filePath string) *config.Config {
 			return nil
 		}
 
+		if len(cfg.Items) == 0 {
+			log.Fatal("empty config")
+			return nil
+		}
+
 		return cfg
 	}
 

diff --git a/examples/plugin/README.md b/examples/plugin/README.md
@@ -33,7 +33,7 @@ import (
 	"fmt"
 	"github.com/PxyUp/fitter/pkg/config"
 	"github.com/PxyUp/fitter/pkg/logger"
-	"github.com/PxyUp/fitter/pkg/parser/builder"
+	"github.com/PxyUp/fitter/pkg/builder"
 	pl "github.com/PxyUp/fitter/pkg/plugins/plugin"
 )
 

diff --git a/examples/plugin/connector/connector.go b/examples/plugin/connector/connector.go
@@ -3,9 +3,9 @@ package main
 import (
 	"encoding/json"
 	"fmt"
+	"github.com/PxyUp/fitter/pkg/builder"
 	"github.com/PxyUp/fitter/pkg/config"
 	"github.com/PxyUp/fitter/pkg/logger"
-	"github.com/PxyUp/fitter/pkg/parser/builder"
 	pl "github.com/PxyUp/fitter/pkg/plugins/plugin"
 )
 

diff --git a/examples/plugin/hardcoder/hardcoder.go b/examples/plugin/hardcoder/hardcoder.go
@@ -3,9 +3,9 @@ package main
 import (
 	"encoding/json"
 	"fmt"
+	builder "github.com/PxyUp/fitter/pkg/builder"
 	"github.com/PxyUp/fitter/pkg/config"
 	"github.com/PxyUp/fitter/pkg/logger"
-	"github.com/PxyUp/fitter/pkg/parser/builder"
 	pl "github.com/PxyUp/fitter/pkg/plugins/plugin"
 )
 

diff --git a/pkg/parser/builder/array.go → pkg/builder/array.go b/pkg/parser/builder/array.go → pkg/builder/array.go
diff --git a/pkg/parser/builder/bool.go → pkg/builder/bool.go b/pkg/parser/builder/bool.go → pkg/builder/bool.go
diff --git a/pkg/parser/builder/builder.go → pkg/builder/builder.go b/pkg/parser/builder/builder.go → pkg/builder/builder.go
diff --git a/pkg/parser/builder/float.go → pkg/builder/float.go b/pkg/parser/builder/float.go → pkg/builder/float.go
diff --git a/pkg/parser/builder/int.go → pkg/builder/int.go b/pkg/parser/builder/int.go → pkg/builder/int.go
diff --git a/pkg/parser/builder/null.go → pkg/builder/null.go b/pkg/parser/builder/null.go → pkg/builder/null.go
diff --git a/pkg/parser/builder/object.go → pkg/builder/object.go b/pkg/parser/builder/object.go → pkg/builder/object.go
diff --git a/pkg/parser/builder/pure_string.go → pkg/builder/pure_string.go b/pkg/parser/builder/pure_string.go → pkg/builder/pure_string.go
diff --git a/pkg/parser/builder/static.go → pkg/builder/static.go b/pkg/parser/builder/static.go → pkg/builder/static.go
diff --git a/pkg/parser/builder/string.go → pkg/builder/string.go b/pkg/parser/builder/string.go → pkg/builder/string.go
diff --git a/pkg/parser/builder/uuid.go → pkg/builder/uuid.go b/pkg/parser/builder/uuid.go → pkg/builder/uuid.go
diff --git a/pkg/connectors/browser.go b/pkg/connectors/browser.go
@@ -1,9 +1,9 @@
 package connectors
 
 import (
+	"github.com/PxyUp/fitter/pkg/builder"
 	"github.com/PxyUp/fitter/pkg/config"
 	"github.com/PxyUp/fitter/pkg/logger"
-	"github.com/PxyUp/fitter/pkg/parser/builder"
 	"github.com/PxyUp/fitter/pkg/utils"
 )
 

diff --git a/pkg/connectors/connectors.go b/pkg/connectors/connectors.go
@@ -2,7 +2,7 @@ package connectors
 
 import (
 	"errors"
-	"github.com/PxyUp/fitter/pkg/parser/builder"
+	"github.com/PxyUp/fitter/pkg/builder"
 )
 
 var (

diff --git a/pkg/connectors/server.go b/pkg/connectors/server.go
@@ -3,11 +3,11 @@ package connectors
 import (
 	"bytes"
 	"context"
+	"github.com/PxyUp/fitter/pkg/builder"
 	"github.com/PxyUp/fitter/pkg/config"
 	"github.com/PxyUp/fitter/pkg/connectors/limitter"
 	"github.com/PxyUp/fitter/pkg/http_client"
 	"github.com/PxyUp/fitter/pkg/logger"
-	"github.com/PxyUp/fitter/pkg/parser/builder"
 	"github.com/PxyUp/fitter/pkg/utils"
 	"golang.org/x/sync/semaphore"
 	"io"

diff --git a/pkg/connectors/static.go b/pkg/connectors/static.go
@@ -1,9 +1,9 @@
 package connectors
 
 import (
+	"github.com/PxyUp/fitter/pkg/builder"
 	"github.com/PxyUp/fitter/pkg/config"
 	"github.com/PxyUp/fitter/pkg/logger"
-	"github.com/PxyUp/fitter/pkg/parser/builder"
 	"github.com/PxyUp/fitter/pkg/utils"
 )
 

diff --git a/pkg/notifier/notifier.go b/pkg/notifier/notifier.go
@@ -2,9 +2,9 @@ package notifier
 
 import (
 	"fmt"
+	"github.com/PxyUp/fitter/pkg/builder"
 	"github.com/PxyUp/fitter/pkg/config"
 	"github.com/PxyUp/fitter/pkg/parser"
-	"github.com/PxyUp/fitter/pkg/parser/builder"
 	"strconv"
 )
 

diff --git a/pkg/parser/expression.go b/pkg/parser/expression.go
@@ -1,7 +1,7 @@
 package parser
 
 import (
-	"github.com/PxyUp/fitter/pkg/parser/builder"
+	"github.com/PxyUp/fitter/pkg/builder"
 	"github.com/antonmedv/expr"
 )
 

diff --git a/pkg/parser/file.go b/pkg/parser/file.go
@@ -2,11 +2,11 @@ package parser
 
 import (
 	"errors"
+	"github.com/PxyUp/fitter/pkg/builder"
 	"github.com/PxyUp/fitter/pkg/config"
 	"github.com/PxyUp/fitter/pkg/connectors"
 	"github.com/PxyUp/fitter/pkg/http_client"
 	"github.com/PxyUp/fitter/pkg/logger"
-	"github.com/PxyUp/fitter/pkg/parser/builder"
 	"github.com/PxyUp/fitter/pkg/utils"
 	"mime"
 	"net/url"

diff --git a/pkg/parser/html.go b/pkg/parser/html.go
@@ -2,13 +2,13 @@ package parser
 
 import (
 	"bytes"
+	builder "github.com/PxyUp/fitter/pkg/builder"
 	"strconv"
 	"sync"
 
 	"github.com/PuerkitoBio/goquery"
 	"github.com/PxyUp/fitter/pkg/config"
 	"github.com/PxyUp/fitter/pkg/logger"
-	"github.com/PxyUp/fitter/pkg/parser/builder"
 )
 
 type htmlParser struct {

diff --git a/pkg/parser/json.go b/pkg/parser/json.go
@@ -1,11 +1,11 @@
 package parser
 
 import (
+	builder "github.com/PxyUp/fitter/pkg/builder"
 	"sync"
 
 	"github.com/PxyUp/fitter/pkg/config"
 	"github.com/PxyUp/fitter/pkg/logger"
-	"github.com/PxyUp/fitter/pkg/parser/builder"
 	"github.com/tidwall/gjson"
 )
 

diff --git a/pkg/parser/parser.go b/pkg/parser/parser.go
@@ -2,10 +2,10 @@ package parser
 
 import (
 	"fmt"
+	"github.com/PxyUp/fitter/pkg/builder"
 	"github.com/PxyUp/fitter/pkg/config"
 	"github.com/PxyUp/fitter/pkg/connectors"
 	"github.com/PxyUp/fitter/pkg/logger"
-	"github.com/PxyUp/fitter/pkg/parser/builder"
 	"github.com/PxyUp/fitter/pkg/plugins/store"
 	"github.com/PxyUp/fitter/pkg/utils"
 	"github.com/tidwall/gjson"

diff --git a/pkg/parser/xpath.go b/pkg/parser/xpath.go
@@ -2,12 +2,12 @@ package parser
 
 import (
 	"bytes"
+	"github.com/PxyUp/fitter/pkg/builder"
 	"strconv"
 	"sync"
 
 	"github.com/PxyUp/fitter/pkg/config"
 	"github.com/PxyUp/fitter/pkg/logger"
-	"github.com/PxyUp/fitter/pkg/parser/builder"
 	"github.com/antchfx/htmlquery"
 	"golang.org/x/net/html"
 )

diff --git a/pkg/plugins/plugin/plugin.go b/pkg/plugins/plugin/plugin.go
@@ -1,10 +1,10 @@
 package plugin
 
 import (
+	"github.com/PxyUp/fitter/pkg/builder"
 	"github.com/PxyUp/fitter/pkg/config"
 	"github.com/PxyUp/fitter/pkg/connectors"
 	"github.com/PxyUp/fitter/pkg/logger"
-	"github.com/PxyUp/fitter/pkg/parser/builder"
 )
 
 type FieldPlugin interface {

diff --git a/pkg/plugins/store/store.go b/pkg/plugins/store/store.go
@@ -2,9 +2,9 @@ package store
 
 import (
 	"fmt"
+	builder "github.com/PxyUp/fitter/pkg/builder"
 	"github.com/PxyUp/fitter/pkg/config"
 	"github.com/PxyUp/fitter/pkg/logger"
-	"github.com/PxyUp/fitter/pkg/parser/builder"
 	"github.com/PxyUp/fitter/pkg/plugins/plugin"
 	"os"
 	"path"

diff --git a/pkg/utils/formatter.go b/pkg/utils/formatter.go
@@ -2,7 +2,7 @@ package utils
 
 import (
 	"fmt"
-	"github.com/PxyUp/fitter/pkg/parser/builder"
+	builder "github.com/PxyUp/fitter/pkg/builder"
 	"github.com/tidwall/gjson"
 	"strings"
 )