fix!: align package names & locations with Go recommendations (Resolves #101) (#102)

* fix!: align package names with Go recommendations (Resolves #101)

* fix!: move packages to simplify imports (Resolves #101)

Author: steve-r-west

README.md

@@ -1,4 +1,4 @@
-package epsearchast_v3
+package epsearchast
 
 import "regexp"
 

external/epsearchast/v3/aliases.go renamed to aliases.go

@@ -1,4 +1,4 @@
-package epsearchast_v3
+package epsearchast
 
 import (
 	"github.com/stretchr/testify/require"

external/epsearchast/v3/aliases_test.go renamed to aliases_test.go

@@ -1,5 +1,5 @@
-// Package epsearchast_v3 implements structs and functions for working with the EP-Internal-Search-AST-v3 header.
-package epsearchast_v3
+// Package epsearchast implements structs and functions for working with the EP-Internal-Search-AST-v3 header.
+package epsearchast
 
 import (
 	"encoding/json"
@@ -102,7 +102,7 @@ func GetAst(jsonTxt string) (*AstNode, error) {
 
 // The AstVisitor interface provides a way of specifying a [Visitor] for visiting an AST.
 //
-// This interface is clunky to use for conversions or when you need to return state, and you should use [epsearchast_v3.ReduceAst] instead.
+// This interface is clunky to use for conversions or when you need to return state, and you should use [epsearchast.ReduceAst] instead.
 // In particular because the return values are restricted to error, you need to manage and combine the state yourself, which can be more annoying than necessary.
 //
 // [Visitor]: https://en.wikipedia.org/wiki/Visitor_pattern

external/epsearchast/v3/ast.go renamed to ast.go

@@ -1,4 +1,4 @@
-package epsearchast_v3
+package epsearchast
 
 import (
 	"github.com/stretchr/testify/require"

external/epsearchast/v3/ast_test.go renamed to ast_test.go

@@ -1,4 +1,4 @@
-package epsearchast_v3
+package epsearchast
 
 import (
 	"fmt"

external/epsearchast/v3/ast_visitor_test.go renamed to ast_visitor_test.go

@@ -1,4 +1,4 @@
-package epsearchast_v3
+package epsearchast
 
 import "fmt"
 

external/epsearchast/v3/errors.go renamed to errors.go

@@ -1,11 +1,12 @@
-package epsearchast_v3_es
+package astes
 
 import (
 	"fmt"
-	epsearchast_v3 "github.com/elasticpath/epcc-search-ast-helper/external/epsearchast/v3"
 	"regexp"
 	"sort"
 	"strings"
+
+	"github.com/elasticpath/epcc-search-ast-helper"
 )
 
 type JsonObject map[string]any
@@ -150,7 +151,7 @@ func sortByDecreasingLength(groupKeys []string) {
 	})
 }
 
-var _ epsearchast_v3.SemanticReducer[JsonObject] = (*DefaultEsQueryBuilder)(nil)
+var _ epsearchast.SemanticReducer[JsonObject] = (*DefaultEsQueryBuilder)(nil)
 
 func (d DefaultEsQueryBuilder) PostVisitAnd(rs []*JsonObject) (*JsonObject, error) {
 	return &JsonObject{

external/epsearchast/v3/es/es_query_builder.go renamed to es/es_query_builder.go

@@ -1,14 +1,15 @@
-package epsearchast_v3_es
+package astes
 
 import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	epsearchast_v3 "github.com/elasticpath/epcc-search-ast-helper/external/epsearchast/v3"
 	"io/ioutil"
 	"net/http"
 	"os"
 	"testing"
+
+	"github.com/elasticpath/epcc-search-ast-helper"
 )
 
 const esBaseURL = "http://localhost:20003"
@@ -24,7 +25,7 @@ type testStruct struct {
 
 func (t *testStruct) String() string {
 
-	ast, err := epsearchast_v3.GetAst(t.filter)
+	ast, err := epsearchast.GetAst(t.filter)
 
 	if err != nil {
 		panic(fmt.Sprintf("Failed to get filter: %s)", err))
@@ -1048,12 +1049,12 @@ func TestSmokeTestElasticSearchWithFilters(t *testing.T) {
 			}
 
 			// Build Elasticsearch query
-			ast, err := epsearchast_v3.GetAst(tc.filter)
+			ast, err := epsearchast.GetAst(tc.filter)
 			if err != nil {
 				t.Fatalf("Failed to parse filter: %v", err)
 			}
 
-			var qb epsearchast_v3.SemanticReducer[JsonObject] = DefaultEsQueryBuilder{
+			var qb epsearchast.SemanticReducer[JsonObject] = DefaultEsQueryBuilder{
 				OpTypeToFieldNames: map[string]*OperatorTypeToMultiFieldName{
 					"key_value_field.description": {
 						Wildcard: "key_value_field.description.wildcard",
@@ -1082,7 +1083,7 @@ func TestSmokeTestElasticSearchWithFilters(t *testing.T) {
 				DefaultFuzziness: "AUTO",
 			}
 
-			query, err := epsearchast_v3.SemanticReduceAst(ast, qb)
+			query, err := epsearchast.SemanticReduceAst(ast, qb)
 			if err != nil {
 				t.Fatalf("Failed to reduce AST: %v", err)
 			}