Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add operator constants #27

Merged
merged 5 commits into from
Sep 25, 2023
Merged

Add operator constants #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3816bb4
Add operator constants
spinillos Sep 21, 2023
3b5edbd
Remove minLenght and maxLenght
spinillos Sep 21, 2023
c9e5a0f
Set hashtag to equal or not equal operators
spinillos Sep 21, 2023
dbb0276
Rollback last change
spinillos Sep 21, 2023
65a46e7
Use min and max length as operators
spinillos Sep 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions internal/ast/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,21 @@ const (
KindBool ScalarKind = "bool"
)

type Op string

const (
MinLengthOp Op = "minLength"
MaxLengthOp Op = "maxLength"
EqualOp Op = "=="
NotEqualOp Op = "!="
LessThanOp Op = "<"
LessThanEqualOp Op = "<="
GreaterThanOp Op = ">"
GreaterThanEqualOp Op = ">="
)

type TypeConstraint struct {
// TODO: something more descriptive here? constant?
Op string
Op Op
Args []any
}

Expand Down
4 changes: 2 additions & 2 deletions internal/jennies/golang/builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,10 +317,10 @@ func (jenny *Builder) constraint(argumentName string, constraint ast.TypeConstra
}

func (jenny *Builder) constraintComparison(argumentName string, constraint ast.TypeConstraint) string {
if constraint.Op == "minLength" {
if constraint.Op == ast.MinLengthOp {
return fmt.Sprintf("len([]rune(%[1]s)) >= %[2]v", argumentName, constraint.Args[0])
}
if constraint.Op == "maxLength" {
spinillos marked this conversation as resolved.
Show resolved Hide resolved
if constraint.Op == ast.MaxLengthOp {
return fmt.Sprintf("len([]rune(%[1]s)) <= %[2]v", argumentName, constraint.Args[0])
}

Expand Down
4 changes: 2 additions & 2 deletions internal/jennies/typescript/builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,10 +235,10 @@ func (jenny *Builder) constraint(argumentName string, constraint ast.TypeConstra
}

func (jenny *Builder) constraintComparison(argumentName string, constraint ast.TypeConstraint) string {
if constraint.Op == "minLength" {
if constraint.Op == ast.MinLengthOp {
return fmt.Sprintf("%[1]s.length >= %[2]v", argumentName, constraint.Args[0])
}
if constraint.Op == "maxLength" {
if constraint.Op == ast.MaxLengthOp {
return fmt.Sprintf("%[1]s.length <= %[2]v", argumentName, constraint.Args[0])
}

Expand Down
18 changes: 9 additions & 9 deletions internal/simplecue/generator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ func (g *generator) declareStringConstraints(v cue.Value) ([]ast.TypeConstraint,

return []ast.TypeConstraint{
{
Op: "==",
Op: ast.EqualOp,
Args: []any{stringVal},
},
}, nil
Expand All @@ -400,7 +400,7 @@ func (g *generator) declareStringConstraints(v cue.Value) ([]ast.TypeConstraint,
}

constraints = append(constraints, ast.TypeConstraint{
Op: "minLength",
Op: ast.MinLengthOp,
Args: []any{scalar},
})

Expand All @@ -411,7 +411,7 @@ func (g *generator) declareStringConstraints(v cue.Value) ([]ast.TypeConstraint,
}

constraints = append(constraints, ast.TypeConstraint{
Op: "maxLength",
Op: ast.MaxLengthOp,
Args: []any{scalar},
})
}
Expand Down Expand Up @@ -516,7 +516,7 @@ func (g *generator) declareNumberConstraints(v cue.Value) ([]ast.TypeConstraint,
}

func (g *generator) extractConstraint(v cue.Value) (ast.TypeConstraint, error) {
toConstraint := func(operator string, arg cue.Value) (ast.TypeConstraint, error) {
toConstraint := func(operator ast.Op, arg cue.Value) (ast.TypeConstraint, error) {
scalar, err := cueConcreteToScalar(arg)
if err != nil {
return ast.TypeConstraint{}, err
Expand All @@ -530,15 +530,15 @@ func (g *generator) extractConstraint(v cue.Value) (ast.TypeConstraint, error) {

switch op, a := v.Expr(); op {
case cue.LessThanOp:
return toConstraint("<", a[0])
return toConstraint(ast.LessThanOp, a[0])
case cue.LessThanEqualOp:
return toConstraint("<=", a[0])
return toConstraint(ast.LessThanEqualOp, a[0])
case cue.GreaterThanOp:
return toConstraint(">", a[0])
return toConstraint(ast.GreaterThanOp, a[0])
case cue.GreaterThanEqualOp:
return toConstraint(">=", a[0])
return toConstraint(ast.GreaterThanEqualOp, a[0])
case cue.NotEqualOp:
return toConstraint("!=", a[0])
return toConstraint(ast.NotEqualOp, a[0])
default:
return ast.TypeConstraint{}, errorWithCueRef(v, "unsupported op for number %v", op)
}
Expand Down