Merge pull request #70 from strongdm/move-ast-to-exp

x/exp/ast: move internal ast into the x/exp package

Author: philhassey

ast/annotation.go

@@ -1,8 +1,8 @@
 package ast
 
 import (
-	"github.com/cedar-policy/cedar-go/internal/ast"
 	"github.com/cedar-policy/cedar-go/types"
+	"github.com/cedar-policy/cedar-go/x/exp/ast"
 )
 
 type Annotations ast.Annotations

ast/ast_test.go

@@ -6,9 +6,9 @@ import (
 	"time"
 
 	"github.com/cedar-policy/cedar-go/ast"
-	internalast "github.com/cedar-policy/cedar-go/internal/ast"
 	"github.com/cedar-policy/cedar-go/internal/testutil"
 	"github.com/cedar-policy/cedar-go/types"
+	internalast "github.com/cedar-policy/cedar-go/x/exp/ast"
 )
 
 func TestASTByTable(t *testing.T) {

ast/node.go

@@ -1,6 +1,6 @@
 package ast
 
-import "github.com/cedar-policy/cedar-go/internal/ast"
+import "github.com/cedar-policy/cedar-go/x/exp/ast"
 
 // Node is a wrapper type for all the Cedar language operators.  See the [Cedar operators documentation] for details.
 //

ast/operator.go

@@ -1,8 +1,8 @@
 package ast
 
 import (
-	"github.com/cedar-policy/cedar-go/internal/ast"
 	"github.com/cedar-policy/cedar-go/types"
+	"github.com/cedar-policy/cedar-go/x/exp/ast"
 )
 
 //   ____                                 _

ast/policy.go

@@ -9,9 +9,9 @@ package ast
 import (
 	"bytes"
 
-	"github.com/cedar-policy/cedar-go/internal/ast"
 	"github.com/cedar-policy/cedar-go/internal/json"
 	"github.com/cedar-policy/cedar-go/internal/parser"
+	"github.com/cedar-policy/cedar-go/x/exp/ast"
 )
 
 type Policy ast.Policy

ast/policy_test.go

@@ -4,9 +4,9 @@ import (
 	"testing"
 
 	"github.com/cedar-policy/cedar-go/ast"
-	internalast "github.com/cedar-policy/cedar-go/internal/ast"
 	"github.com/cedar-policy/cedar-go/internal/testutil"
 	"github.com/cedar-policy/cedar-go/types"
+	internalast "github.com/cedar-policy/cedar-go/x/exp/ast"
 )
 
 func TestPolicy_MarshalJSON(t *testing.T) {

ast/value.go

@@ -4,8 +4,8 @@ import (
 	"net/netip"
 	"time"
 
-	"github.com/cedar-policy/cedar-go/internal/ast"
 	"github.com/cedar-policy/cedar-go/types"
+	"github.com/cedar-policy/cedar-go/x/exp/ast"
 )
 
 // Boolean creates a value node containing a Boolean.

ast/variable.go

@@ -1,6 +1,6 @@
 package ast
 
-import "github.com/cedar-policy/cedar-go/internal/ast"
+import "github.com/cedar-policy/cedar-go/x/exp/ast"
 
 func Principal() Node {
 	return wrapNode(ast.Principal())

internal/eval/compile.go

@@ -3,8 +3,8 @@ package eval
 import (
 	"fmt"
 
-	"github.com/cedar-policy/cedar-go/internal/ast"
 	"github.com/cedar-policy/cedar-go/types"
+	"github.com/cedar-policy/cedar-go/x/exp/ast"
 )
 
 type BoolEvaler struct {

internal/eval/compile_test.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/cedar-policy/cedar-go/internal/ast"
 	"github.com/cedar-policy/cedar-go/internal/testutil"
 	"github.com/cedar-policy/cedar-go/types"
+	"github.com/cedar-policy/cedar-go/x/exp/ast"
 )
 
 func TestCompile(t *testing.T) {

internal/eval/convert.go

@@ -3,9 +3,9 @@ package eval
 import (
 	"fmt"
 
-	"github.com/cedar-policy/cedar-go/internal/ast"
 	"github.com/cedar-policy/cedar-go/internal/consts"
 	"github.com/cedar-policy/cedar-go/types"
+	"github.com/cedar-policy/cedar-go/x/exp/ast"
 )
 
 func toEval(n ast.IsNode) Evaler {

internal/eval/convert_test.go

@@ -5,9 +5,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/cedar-policy/cedar-go/internal/ast"
 	"github.com/cedar-policy/cedar-go/internal/testutil"
 	"github.com/cedar-policy/cedar-go/types"
+	"github.com/cedar-policy/cedar-go/x/exp/ast"
 )
 
 func TestToEval(t *testing.T) {

internal/eval/fold.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"slices"
 
-	"github.com/cedar-policy/cedar-go/internal/ast"
 	"github.com/cedar-policy/cedar-go/types"
+	"github.com/cedar-policy/cedar-go/x/exp/ast"
 )
 
 // foldPolicy takes in a given policy and attempts as much constant folding as possible.

internal/eval/fold_test.go

@@ -5,9 +5,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/cedar-policy/cedar-go/internal/ast"
 	"github.com/cedar-policy/cedar-go/internal/testutil"
 	"github.com/cedar-policy/cedar-go/types"
+	"github.com/cedar-policy/cedar-go/x/exp/ast"
 )
 
 func TestFoldNode(t *testing.T) {

internal/eval/partial.go

@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"slices"
 
-	"github.com/cedar-policy/cedar-go/internal/ast"
 	"github.com/cedar-policy/cedar-go/internal/mapset"
 	"github.com/cedar-policy/cedar-go/types"
+	"github.com/cedar-policy/cedar-go/x/exp/ast"
 )
 
 const variableEntityType = "__cedar::variable"

internal/eval/partial_test.go

@@ -7,9 +7,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/cedar-policy/cedar-go/internal/ast"
 	"github.com/cedar-policy/cedar-go/internal/testutil"
 	"github.com/cedar-policy/cedar-go/types"
+	"github.com/cedar-policy/cedar-go/x/exp/ast"
 )
 
 func TestPartialScopeEval(t *testing.T) {

internal/json/json_marshal.go

@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/cedar-policy/cedar-go/internal/ast"
 	"github.com/cedar-policy/cedar-go/types"
+	"github.com/cedar-policy/cedar-go/x/exp/ast"
 )
 
 func (s *scopeJSON) FromNode(src ast.IsScopeNode) {

internal/json/json_test.go

@@ -5,9 +5,9 @@ import (
 	"net/netip"
 	"testing"
 
-	"github.com/cedar-policy/cedar-go/internal/ast"
 	"github.com/cedar-policy/cedar-go/internal/testutil"
 	"github.com/cedar-policy/cedar-go/types"
+	"github.com/cedar-policy/cedar-go/x/exp/ast"
 )
 
 func TestUnmarshalJSON(t *testing.T) {

internal/json/json_unmarshal.go

@@ -6,10 +6,10 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/cedar-policy/cedar-go/internal/ast"
 	"github.com/cedar-policy/cedar-go/internal/consts"
 	"github.com/cedar-policy/cedar-go/internal/extensions"
 	"github.com/cedar-policy/cedar-go/types"
+	"github.com/cedar-policy/cedar-go/x/exp/ast"
 )
 
 type isPrincipalResourceScopeNode interface {

internal/parser/cedar_marshal.go

@@ -4,9 +4,9 @@ import (
 	"bytes"
 	"fmt"
 
-	"github.com/cedar-policy/cedar-go/internal/ast"
 	"github.com/cedar-policy/cedar-go/internal/consts"
 	"github.com/cedar-policy/cedar-go/internal/extensions"
+	"github.com/cedar-policy/cedar-go/x/exp/ast"
 )
 
 func (p *Policy) MarshalCedar(buf *bytes.Buffer) {

internal/parser/cedar_parse_test.go

@@ -4,9 +4,9 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/cedar-policy/cedar-go/internal/ast"
 	"github.com/cedar-policy/cedar-go/internal/parser"
 	"github.com/cedar-policy/cedar-go/internal/testutil"
+	"github.com/cedar-policy/cedar-go/x/exp/ast"
 )
 
 func TestParse(t *testing.T) {

internal/parser/cedar_tokenize.go

@@ -9,8 +9,8 @@ import (
 	"strings"
 	"unicode/utf8"
 
-	"github.com/cedar-policy/cedar-go/internal/ast"
 	"github.com/cedar-policy/cedar-go/internal/rust"
+	"github.com/cedar-policy/cedar-go/x/exp/ast"
 )
 
 //go:generate moq -pkg parser -fmt goimports -out tokenize_mocks_test.go . reader

internal/parser/cedar_unmarshal.go

@@ -5,11 +5,11 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/cedar-policy/cedar-go/internal/ast"
 	"github.com/cedar-policy/cedar-go/internal/consts"
 	"github.com/cedar-policy/cedar-go/internal/extensions"
 	"github.com/cedar-policy/cedar-go/internal/mapset"
 	"github.com/cedar-policy/cedar-go/types"
+	"github.com/cedar-policy/cedar-go/x/exp/ast"
 )
 
 func (p *PolicySlice) UnmarshalCedar(b []byte) error {

internal/parser/cedar_unmarshal_test.go

@@ -5,10 +5,10 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/cedar-policy/cedar-go/internal/ast"
 	"github.com/cedar-policy/cedar-go/internal/parser"
 	"github.com/cedar-policy/cedar-go/internal/testutil"
 	"github.com/cedar-policy/cedar-go/types"
+	"github.com/cedar-policy/cedar-go/x/exp/ast"
 )
 
 var johnny = types.EntityUID{

internal/parser/internal_test.go

@@ -3,8 +3,8 @@ package parser
 import (
 	"testing"
 
-	"github.com/cedar-policy/cedar-go/internal/ast"
 	"github.com/cedar-policy/cedar-go/internal/testutil"
+	"github.com/cedar-policy/cedar-go/x/exp/ast"
 )
 
 func TestScopeToNode(t *testing.T) {

internal/parser/node.go

@@ -3,7 +3,7 @@ package parser
 import (
 	"bytes"
 
-	"github.com/cedar-policy/cedar-go/internal/ast"
+	"github.com/cedar-policy/cedar-go/x/exp/ast"
 )
 
 type NodeTypeIf struct{ ast.NodeTypeIfThenElse }

internal/parser/policy.go

@@ -1,6 +1,6 @@
 package parser
 
-import "github.com/cedar-policy/cedar-go/internal/ast"
+import "github.com/cedar-policy/cedar-go/x/exp/ast"
 
 type PolicySlice []*Policy
 type Policy ast.Policy

policy.go

@@ -4,11 +4,11 @@ import (
 	"bytes"
 
 	"github.com/cedar-policy/cedar-go/ast"
-	internalast "github.com/cedar-policy/cedar-go/internal/ast"
 	"github.com/cedar-policy/cedar-go/internal/eval"
 	"github.com/cedar-policy/cedar-go/internal/json"
 	"github.com/cedar-policy/cedar-go/internal/parser"
 	"github.com/cedar-policy/cedar-go/types"
+	internalast "github.com/cedar-policy/cedar-go/x/exp/ast"
 )
 
 // A Policy is the parsed form of a single Cedar language policy statement.

policy_list.go

@@ -4,8 +4,8 @@ import (
 	"bytes"
 	"fmt"
 
-	internalast "github.com/cedar-policy/cedar-go/internal/ast"
 	"github.com/cedar-policy/cedar-go/internal/parser"
+	internalast "github.com/cedar-policy/cedar-go/x/exp/ast"
 )
 
 // PolicyList represents a list of un-named Policy's. Cedar documents, unlike the PolicySet form, don't have a means of

policy_set.go

@@ -8,9 +8,9 @@ import (
 	"maps"
 	"slices"
 
-	internalast "github.com/cedar-policy/cedar-go/internal/ast"
 	internaljson "github.com/cedar-policy/cedar-go/internal/json"
 	"github.com/cedar-policy/cedar-go/types"
+	internalast "github.com/cedar-policy/cedar-go/x/exp/ast"
 )
 
 type PolicyID = types.PolicyID

internal/ast/annotation.go x/exp/ast/annotation.go

@@ -5,9 +5,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/cedar-policy/cedar-go/internal/ast"
 	"github.com/cedar-policy/cedar-go/internal/testutil"
 	"github.com/cedar-policy/cedar-go/types"
+	"github.com/cedar-policy/cedar-go/x/exp/ast"
 )
 
 // These tests serve mostly as examples of how to translate from Cedar text into programmatic AST construction. They

internal/ast/ast_test.go x/exp/ast/ast_test.go

@@ -0,0 +1,21 @@
+/*
+The AST package exposes the internal AST used within cedar-go.  This AST is
+subject to change.  The AST is most useful for analyzing existing policies
+created by the Cedar / JSON parser or created using the external AST.  The
+external AST is a type definition of the internal AST, so you can cast from the
+external to internal types.
+
+Example:
+
+	import (
+		"github.com/cedar-policy/cedar-go/ast"
+		internalast "github.com/cedar-policy/cedar-go/x/exp/ast"
+	)
+
+	func main() {
+		policy := ast.Permit()
+		internal := (*internalast.Policy)(policy)
+		_ = internal
+	}
+*/
+package ast

x/exp/ast/doc.go

@@ -14,11 +14,11 @@ import (
 	"slices"
 
 	"github.com/cedar-policy/cedar-go"
-	"github.com/cedar-policy/cedar-go/internal/ast"
 	"github.com/cedar-policy/cedar-go/internal/consts"
 	"github.com/cedar-policy/cedar-go/internal/eval"
 	"github.com/cedar-policy/cedar-go/internal/mapset"
 	"github.com/cedar-policy/cedar-go/types"
+	"github.com/cedar-policy/cedar-go/x/exp/ast"
 )
 
 // Ignore returns a value that should be ignored during batch evaluation.

internal/ast/internal_test.go x/exp/ast/internal_test.go

@@ -9,10 +9,10 @@ import (
 
 	"github.com/cedar-policy/cedar-go"
 	publicast "github.com/cedar-policy/cedar-go/ast"
-	"github.com/cedar-policy/cedar-go/internal/ast"
 	"github.com/cedar-policy/cedar-go/internal/mapset"
 	"github.com/cedar-policy/cedar-go/internal/testutil"
 	"github.com/cedar-policy/cedar-go/types"
+	"github.com/cedar-policy/cedar-go/x/exp/ast"
 )
 
 func TestBatch(t *testing.T) {