update data model schema, small changes in cuetils

lib/cuetils/print.go

@@ -56,8 +56,8 @@ func PrintCueValue(val cue.Value) (string, error) {
 	return string(bytes), nil
 }
 
-func ValueToSyntaxString(val cue.Value) (string, error) {
-	src, err := format.Node(val.Syntax())
+func ValueToSyntaxString(val cue.Value, opts ...cue.Option) (string, error) {
+	src, err := format.Node(val.Syntax(opts...))
 	str := string(src)
 	return str, err
 }

lib/cuetils/runtime.go

@@ -143,11 +143,13 @@ func (CRT *CueRuntime) load() (err error) {
 		// fmt.Println(i, "valued", V)
 
 		// Decode? we want to be lazy
+		/*
 		err = V.Decode(&CRT.Value)
 		if err != nil {
 			errs = append(errs, err)
 			continue
 		}
+		*/
 
 		// fmt.Println(i, "decoded", CRT.Value)
 

schema/datamodel.cue

@@ -32,6 +32,7 @@ import "strings"
 
 	ORM: bool | *false
 	SoftDelete: bool | *false
+	Permissioned: bool | *true
 
 	Views?: #Views
 
@@ -48,6 +49,10 @@ import "strings"
 	fieldName: string | *strings.ToCamel(Name)
 	FieldName: string | *strings.ToTitle(Name)
 
+	type: string
+
+	validation?: [string]: _
+
 	private: bool | *false
 
   ...

schema/datatypes.cue

@@ -15,21 +15,23 @@ package schema
 	type: "uuid"
 	nullable: bool | *false
 	unique:   bool | *true
-	generate: bool | *true
+	default: "gen_random_uuid()"
+	validation: {
+		format: "email"
+	}
 	...
 }
 
 #CUID: #Field & {
 	type: "cuid"
 	nullable: bool | *false
 	unique:   bool | *true
-	generate: bool | *true
 	...
 }
 
 #Bool: #Field & {
 	type: "bool"
-	default: bool | *false
+	default: string | *"false"
 	nullable: bool | *false
 	...
 }
@@ -40,6 +42,9 @@ package schema
 	unique: bool | *false
 	nullable: bool | *false
 	default?: string
+	validation: {
+		max: length
+	}
 	...
 }
 
@@ -51,13 +56,14 @@ package schema
 	...
 }
 
-#Password: #Field & {
-	type: "text"
+#Password: #String & {
 	bcrypt: true
 }
 
 #Email: #String & {
-	validation: "email"
+	validation: {
+		format: "email"
+	}
 	unique: true
 	...
 }