cue/ast: introduce NewNull()

This seems like a trivial helper, but defining a null
value properly is somewhat unintuitive and
cumbersome.

This fixes a bug in the go converter and jsonschema
as well.

Change-Id: I14d2bda3b74f846dbfa7cd19c791c263dc87e7a8
Reviewed-on: https://cue-review.googlesource.com/c/cue/+/6305
Reviewed-by: CUE cueckoo <[email protected]>
Reviewed-by: Marcel van Lohuizen <[email protected]>

Author: mpvl

cmd/cue/cmd/get_go.go

@@ -942,7 +942,7 @@ func (e *extractor) makeType(expr types.Type) (result cueast.Expr) {
 	switch x := expr.(type) {
 	case *types.Pointer:
 		return &cueast.BinaryExpr{
-			X:  e.ident("null", false),
+			X:  cueast.NewNull(),
 			Op: cuetoken.OR,
 			Y:  e.makeType(x.Elem()),
 		}

cue.mod/pkg/github.com/SchemaStore/schemastore/src/schemas/json/github-workflow.cue

@@ -424,8 +424,7 @@ import "strings"
 					// environment variables. The variable is prefixed with INPUT_
 					// and converted to upper case.
 					with?: #env & {
-						args?: string, entrypoint?: string
-						...
+						args?: string, entrypoint?: string, ...
 					}
 
 					// Prevents a job from failing when a step fails. Set to true to
@@ -466,7 +465,7 @@ import "strings"
 					// https://help.github.com/en/articles/contexts-and-expression-syntax-for-github-actions.
 					matrix: {
 						{[=~"^(in|ex)clude$" & !~"^()$"]: [...{
-							[string]: #configuration
+											[string]: #configuration
 						}] & [_, ...]}
 
 						{[!~"^(in|ex)clude$" & !~"^()$"]: [...#configuration] & [_, ...]}

cue/ast/ast.go

@@ -435,6 +435,12 @@ func NewString(str string) *BasicLit {
 	return &BasicLit{Kind: token.STRING, ValuePos: token.NoPos, Value: str}
 }
 
+// NewNull creates a new BasicLit configured to be a null value.
+// Useful for ASTs generated by code other than the CUE parser.
+func NewNull() *BasicLit {
+	return &BasicLit{Kind: token.NULL, Value: "null"}
+}
+
 // NewLit creates a new BasicLit with from a token type and string without
 // position.
 // Useful for ASTs generated by code other than the CUE parser.

cue/export.go

@@ -613,7 +613,7 @@ func (p *exporter) expr(v value) ast.Expr {
 		}
 
 	case *nullLit:
-		return &ast.BasicLit{Kind: token.NULL, Value: "null"}
+		return ast.NewNull()
 
 	case *boolLit:
 		return ast.NewBool(x.b)

encoding/jsonschema/decode.go

@@ -314,7 +314,7 @@ func (s *state) finalize() (e ast.Expr) {
 		switch k {
 		case cue.NullKind:
 			// TODO: handle OpenAPI restrictions.
-			add(ast.NewIdent("null"))
+			add(ast.NewNull())
 		case cue.BoolKind:
 			add(ast.NewIdent("bool"))
 		case cue.StringKind:

encoding/protobuf/types.go

@@ -99,7 +99,7 @@ func (p *protoConverter) mapBuiltinPackage(pos scanner.Position, file string, re
 		}, nil)
 
 		p.setBuiltin("google.protobuf.NullValue", func() ast.Expr {
-			return ast.NewLit(token.NULL, "null")
+			return ast.NewNull()
 		}, nil)
 
 		p.setBuiltin("google.protobuf.ListValue", func() ast.Expr {