chore: tests and prettier

schema/testdata/validation_fields_unique_in_model/errors.json

@@ -1,8 +1,8 @@
 {
   "errors": [
     {
-      "message": "You have duplicate field names name",
-      "hint": "Remove 'name' on line 4",
+      "message": "Cannot use 'name' as it has already been defined on this model",
+      "hint": "Rename this field to some other name which has not yet been defined",
       "code": "E003",
       "pos": {
         "filename": "testdata/validation_fields_unique_in_model/schema.keel",

schema/testdata/validation_identity_backlinks_invalid_relations_field/errors.json

@@ -1,8 +1,8 @@
 {
   "errors": [
     {
-      "message": "You have duplicate field names createdAt",
-      "hint": "Remove 'createdAt' on line 0",
+      "message": "Cannot use 'createdAt' as it has already been defined on this model",
+      "hint": "Rename this field to some other name which has not yet been defined",
       "code": "E003",
       "pos": {
         "filename": "",

schema/testdata/validation_identity_backlinks_no_relations_attribute/errors.json

@@ -1,8 +1,8 @@
 {
   "errors": [
     {
-      "message": "You have duplicate field names companyEmployee",
-      "hint": "Remove 'companyEmployee' on line 0",
+      "message": "Cannot use 'companyEmployee' as it has already been defined on this model",
+      "hint": "Rename this field to some other name which has not yet been defined",
       "code": "E003",
       "pos": {
         "filename": "",

schema/testdata/validation_reserved_field_name_created_at/errors.json

@@ -1,20 +1,20 @@
 {
   "errors": [
     {
-      "message": "You have a reserved field name createdAt",
-      "hint": "Try '\u003cno value\u003e' instead",
+      "message": "Cannot use 'createdAt' as it already exists as a built-in field",
+      "hint": "Rename this field to some other name which has not yet been defined",
       "code": "E006",
       "pos": {
-        "filename": "",
-        "offset": 0,
-        "line": 0,
-        "column": 0
+        "filename": "testdata/validation_reserved_field_name_created_at/schema.keel",
+        "offset": 28,
+        "line": 3,
+        "column": 5
       },
       "endPos": {
-        "filename": "",
-        "offset": 0,
-        "line": 0,
-        "column": 0
+        "filename": "testdata/validation_reserved_field_name_created_at/schema.keel",
+        "offset": 37,
+        "line": 3,
+        "column": 14
       }
     }
   ]

schema/testdata/validation_reserved_field_name_id/errors.json

@@ -1,20 +1,20 @@
 {
   "errors": [
     {
-      "message": "You have a reserved field name id",
-      "hint": "Try '\u003cno value\u003e' instead",
+      "message": "Cannot use 'id' as it already exists as a built-in field",
+      "hint": "Rename this field to some other name which has not yet been defined",
       "code": "E006",
       "pos": {
-        "filename": "",
-        "offset": 0,
-        "line": 0,
-        "column": 0
+        "filename": "testdata/validation_reserved_field_name_id/schema.keel",
+        "offset": 36,
+        "line": 3,
+        "column": 9
       },
       "endPos": {
-        "filename": "",
-        "offset": 0,
-        "line": 0,
-        "column": 0
+        "filename": "testdata/validation_reserved_field_name_id/schema.keel",
+        "offset": 38,
+        "line": 3,
+        "column": 11
       }
     }
   ]

schema/testdata/validation_reserved_field_name_updated_at/errors.json

@@ -1,20 +1,20 @@
 {
   "errors": [
     {
-      "message": "You have a reserved field name updatedAt",
-      "hint": "Try '\u003cno value\u003e' instead",
+      "message": "Cannot use 'updatedAt' as it already exists as a built-in field",
+      "hint": "Rename this field to some other name which has not yet been defined",
       "code": "E006",
       "pos": {
-        "filename": "",
-        "offset": 0,
-        "line": 0,
-        "column": 0
+        "filename": "testdata/validation_reserved_field_name_updated_at/schema.keel",
+        "offset": 28,
+        "line": 3,
+        "column": 5
       },
       "endPos": {
-        "filename": "",
-        "offset": 0,
-        "line": 0,
-        "column": 0
+        "filename": "testdata/validation_reserved_field_name_updated_at/schema.keel",
+        "offset": 37,
+        "line": 3,
+        "column": 14
       }
     }
   ]

schema/validation/errorhandling/errors.yml

@@ -5,18 +5,12 @@ en:
   E002:
     message: "Action names should be written in lowerCamelCase"
     hint: "Did you mean '{{ .Suggested }}'?"
-  E003:
-    message: "You have duplicate field names {{ .Name }}"
-    hint: "Remove '{{ .Name }}' on line {{ .Line }}"
   E004:
     message: "You have duplicate actions Model:{{ .Model }} Name:{{ .Name }}"
     hint: "Remove '{{ .Name }}' on line {{ .Line }}"
   E005:
     message: "Action inputs must be one of the fields defined in the model"
     hint: "{{ .Suggested }}"
-  E006:
-    message: "You have a reserved field name {{ .Name }}"
-    hint: "Try '{{ .Suggestion }}' instead"
   E008:
     message: "Action {{ .Name }} must either take a unique field as input or filter on a unique field using a @where attribute"
     hint: "Did you mean to add 'id' as an input?"

schema/validation/rules/field/field.go

@@ -12,16 +12,16 @@ import (
 
 func UniqueFieldNamesRule(asts []*parser.AST) (errs errorhandling.ValidationErrors) {
 	for _, model := range query.Models(asts) {
-		fieldNames := map[string]bool{}
+		fieldNames := map[string]*parser.FieldNode{}
 		for _, field := range query.ModelFields(model) {
-			if _, ok := fieldNames[field.Name.Value]; ok {
+			if existingField, ok := fieldNames[field.Name.Value]; ok {
 				if field.BuiltIn {
 					errs.Append(errorhandling.ErrorReservedFieldName,
 						map[string]string{
 							"Name": field.Name.Value,
 							"Line": fmt.Sprint(field.Name.Pos.Line),
 						},
-						field.Name,
+						existingField.Name,
 					)
 				} else {
 					errs.Append(errorhandling.ErrorFieldNamesUniqueInModel,
@@ -34,7 +34,7 @@ func UniqueFieldNamesRule(asts []*parser.AST) (errs errorhandling.ValidationErro
 				}
 			}
 
-			fieldNames[field.Name.Value] = true
+			fieldNames[field.Name.Value] = field
 		}
 	}