encoding/jsonschema: add test for a doc comment on a definition

This adds a test for some behaviour that will be fixed in a subsequent CL. We also run the basic.txtar JSON through `cue export` for consistent formatting. Also the error messages have changed for the external tests, without any of the actual behavior changing. For #3522 Signed-off-by: Roger Peppe <rogpeppe@gmail.com> Change-Id: I4c0ae4ec2cc49e6f60bc25c72b1d0367821f99e0 Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/1204940 Unity-Result: CUE porcuepine <cue.porcuepine@gmail.com> Reviewed-by: Daniel Martí <mvdan@mvdan.cc> TryBot-Result: CUEcueckoo <cueckoo@cuelang.org>
cue-lang · Nov 29, 2024 · 65b1005 · 65b1005
1 parent c360ba8
commit 65b1005
Show file tree

Hide file tree

Showing 15 changed files with 95 additions and 78 deletions.
diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/additionalItems.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/additionalItems.json
@@ -104,7 +104,7 @@
 				"valid": true,
 				"skip": {
 					"v2": "5 errors in empty disjunction:\nconflicting values [] and {...} (mismatched types list and struct):\n    generated.cue:2:1\n    generated.cue:2:45\n    instance.json:1:1\nconflicting values bool and [] (mismatched types bool and list):\n    generated.cue:2:8\n    instance.json:1:1\nconflicting values null and [] (mismatched types null and list):\n    generated.cue:2:1\n    instance.json:1:1\nconflicting values number and [] (mismatched types number and list):\n    generated.cue:2:15\n    instance.json:1:1\nconflicting values string and [] (mismatched types string and list):\n    generated.cue:2:24\n    instance.json:1:1\n",
-					"v3": "conflicting values [] and {...} (mismatched types list and struct):\n    generated.cue:2:45\n    instance.json:1:1\nconflicting values bool and [] (mismatched types bool and list):\n    generated.cue:2:8\n    instance.json:1:1\nconflicting values null and [] (mismatched types null and list):\n    generated.cue:2:1\n    instance.json:1:1\nconflicting values number and [] (mismatched types number and list):\n    generated.cue:2:15\n    instance.json:1:1\nconflicting values string and [] (mismatched types string and list):\n    generated.cue:2:24\n    instance.json:1:1\nincompatible list lengths (0 and 3):\n    instance.json:1:1\n"
+					"v3": "conflicting values [] and bool (mismatched types list and bool):\n    generated.cue:2:8\n    instance.json:1:1\nconflicting values [] and null (mismatched types list and null):\n    generated.cue:2:1\n    instance.json:1:1\nconflicting values [] and number (mismatched types list and number):\n    generated.cue:2:15\n    instance.json:1:1\nconflicting values [] and string (mismatched types list and string):\n    generated.cue:2:24\n    instance.json:1:1\nconflicting values [] and {...} (mismatched types list and struct):\n    generated.cue:2:45\n    instance.json:1:1\nincompatible list lengths (0 and 3):\n    generated.cue:2:33\n"
 				}
 			},
 			{
@@ -115,7 +115,7 @@
 				"valid": true,
 				"skip": {
 					"v2": "5 errors in empty disjunction:\nconflicting values [1] and {...} (mismatched types list and struct):\n    generated.cue:2:1\n    generated.cue:2:45\n    instance.json:1:1\nconflicting values bool and [1] (mismatched types bool and list):\n    generated.cue:2:8\n    instance.json:1:1\nconflicting values null and [1] (mismatched types null and list):\n    generated.cue:2:1\n    instance.json:1:1\nconflicting values number and [1] (mismatched types number and list):\n    generated.cue:2:15\n    instance.json:1:1\nconflicting values string and [1] (mismatched types string and list):\n    generated.cue:2:24\n    instance.json:1:1\n",
-					"v3": "conflicting values [1] and {...} (mismatched types list and struct):\n    generated.cue:2:45\n    instance.json:1:1\nconflicting values bool and [1] (mismatched types bool and list):\n    generated.cue:2:8\n    instance.json:1:1\nconflicting values null and [1] (mismatched types null and list):\n    generated.cue:2:1\n    instance.json:1:1\nconflicting values number and [1] (mismatched types number and list):\n    generated.cue:2:15\n    instance.json:1:1\nconflicting values string and [1] (mismatched types string and list):\n    generated.cue:2:24\n    instance.json:1:1\nincompatible list lengths (1 and 3):\n    instance.json:1:1\n"
+					"v3": "conflicting values [1] and bool (mismatched types list and bool):\n    generated.cue:2:8\n    instance.json:1:1\nconflicting values [1] and null (mismatched types list and null):\n    generated.cue:2:1\n    instance.json:1:1\nconflicting values [1] and number (mismatched types list and number):\n    generated.cue:2:15\n    instance.json:1:1\nconflicting values [1] and string (mismatched types list and string):\n    generated.cue:2:24\n    instance.json:1:1\nconflicting values [1] and {...} (mismatched types list and struct):\n    generated.cue:2:45\n    instance.json:1:1\nincompatible list lengths (1 and 3):\n    generated.cue:2:33\n"
 				}
 			},
 			{
@@ -127,7 +127,7 @@
 				"valid": true,
 				"skip": {
 					"v2": "5 errors in empty disjunction:\nconflicting values [1,2] and {...} (mismatched types list and struct):\n    generated.cue:2:1\n    generated.cue:2:45\n    instance.json:1:1\nconflicting values bool and [1,2] (mismatched types bool and list):\n    generated.cue:2:8\n    instance.json:1:1\nconflicting values null and [1,2] (mismatched types null and list):\n    generated.cue:2:1\n    instance.json:1:1\nconflicting values number and [1,2] (mismatched types number and list):\n    generated.cue:2:15\n    instance.json:1:1\nconflicting values string and [1,2] (mismatched types string and list):\n    generated.cue:2:24\n    instance.json:1:1\n",
-					"v3": "conflicting values [1,2] and {...} (mismatched types list and struct):\n    generated.cue:2:45\n    instance.json:1:1\nconflicting values bool and [1,2] (mismatched types bool and list):\n    generated.cue:2:8\n    instance.json:1:1\nconflicting values null and [1,2] (mismatched types null and list):\n    generated.cue:2:1\n    instance.json:1:1\nconflicting values number and [1,2] (mismatched types number and list):\n    generated.cue:2:15\n    instance.json:1:1\nconflicting values string and [1,2] (mismatched types string and list):\n    generated.cue:2:24\n    instance.json:1:1\nincompatible list lengths (2 and 3):\n    instance.json:1:1\n"
+					"v3": "conflicting values [1,2] and bool (mismatched types list and bool):\n    generated.cue:2:8\n    instance.json:1:1\nconflicting values [1,2] and null (mismatched types list and null):\n    generated.cue:2:1\n    instance.json:1:1\nconflicting values [1,2] and number (mismatched types list and number):\n    generated.cue:2:15\n    instance.json:1:1\nconflicting values [1,2] and string (mismatched types list and string):\n    generated.cue:2:24\n    instance.json:1:1\nconflicting values [1,2] and {...} (mismatched types list and struct):\n    generated.cue:2:45\n    instance.json:1:1\nincompatible list lengths (2 and 3):\n    generated.cue:2:33\n"
 				}
 			},
 			{

diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/contains.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/contains.json
@@ -210,7 +210,7 @@
 				"valid": true,
 				"skip": {
 					"v2": "6 errors in empty disjunction:\nconflicting values [\"foo\"] and {...} (mismatched types list and struct):\n    generated.cue:4:1\n    generated.cue:4:72\n    instance.json:1:1\nconflicting values bool and [\"foo\"] (mismatched types bool and list):\n    generated.cue:4:8\n    instance.json:1:1\nconflicting values null and [\"foo\"] (mismatched types null and list):\n    generated.cue:4:1\n    instance.json:1:1\nconflicting values number and [\"foo\"] (mismatched types number and list):\n    generated.cue:4:15\n    instance.json:1:1\nconflicting values string and [\"foo\"] (mismatched types string and list):\n    generated.cue:4:24\n    instance.json:1:1\nexplicit error (_|_ literal) in source:\n    generated.cue:4:58\n",
-					"v3": "conflicting values [\"foo\"] and {...} (mismatched types list and struct):\n    generated.cue:4:72\n    instance.json:1:1\nconflicting values bool and [\"foo\"] (mismatched types bool and list):\n    generated.cue:4:8\n    instance.json:1:1\nconflicting values null and [\"foo\"] (mismatched types null and list):\n    generated.cue:4:1\n    instance.json:1:1\nconflicting values number and [\"foo\"] (mismatched types number and list):\n    generated.cue:4:15\n    instance.json:1:1\nconflicting values string and [\"foo\"] (mismatched types string and list):\n    generated.cue:4:24\n    instance.json:1:1\nexplicit error (_|_ literal) in source:\n    generated.cue:4:58\n"
+					"v3": "conflicting values [\"foo\"] and bool (mismatched types list and bool):\n    generated.cue:4:8\n    instance.json:1:1\nconflicting values [\"foo\"] and null (mismatched types list and null):\n    generated.cue:4:1\n    instance.json:1:1\nconflicting values [\"foo\"] and number (mismatched types list and number):\n    generated.cue:4:15\n    instance.json:1:1\nconflicting values [\"foo\"] and string (mismatched types list and string):\n    generated.cue:4:24\n    instance.json:1:1\nconflicting values [\"foo\"] and {...} (mismatched types list and struct):\n    generated.cue:4:72\n    instance.json:1:1\nexplicit error (_|_ literal) in source:\n    generated.cue:4:58\n"
 				}
 			},
 			{

diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/items.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/items.json
@@ -80,7 +80,7 @@
 				"valid": true,
 				"skip": {
 					"v2": "5 errors in empty disjunction:\nconflicting values [1] and {...} (mismatched types list and struct):\n    generated.cue:2:1\n    generated.cue:2:54\n    instance.json:1:1\nconflicting values bool and [1] (mismatched types bool and list):\n    generated.cue:2:8\n    instance.json:1:1\nconflicting values null and [1] (mismatched types null and list):\n    generated.cue:2:1\n    instance.json:1:1\nconflicting values number and [1] (mismatched types number and list):\n    generated.cue:2:15\n    instance.json:1:1\nconflicting values string and [1] (mismatched types string and list):\n    generated.cue:2:24\n    instance.json:1:1\n",
-					"v3": "conflicting values [1] and {...} (mismatched types list and struct):\n    generated.cue:2:54\n    instance.json:1:1\nconflicting values bool and [1] (mismatched types bool and list):\n    generated.cue:2:8\n    instance.json:1:1\nconflicting values null and [1] (mismatched types null and list):\n    generated.cue:2:1\n    instance.json:1:1\nconflicting values number and [1] (mismatched types number and list):\n    generated.cue:2:15\n    instance.json:1:1\nconflicting values string and [1] (mismatched types string and list):\n    generated.cue:2:24\n    instance.json:1:1\nincompatible list lengths (1 and 2):\n    instance.json:1:1\n"
+					"v3": "conflicting values [1] and bool (mismatched types list and bool):\n    generated.cue:2:8\n    instance.json:1:1\nconflicting values [1] and null (mismatched types list and null):\n    generated.cue:2:1\n    instance.json:1:1\nconflicting values [1] and number (mismatched types list and number):\n    generated.cue:2:15\n    instance.json:1:1\nconflicting values [1] and string (mismatched types list and string):\n    generated.cue:2:24\n    instance.json:1:1\nconflicting values [1] and {...} (mismatched types list and struct):\n    generated.cue:2:54\n    instance.json:1:1\nincompatible list lengths (1 and 3):\n    generated.cue:2:33\n"
 				}
 			},
 			{
@@ -98,7 +98,7 @@
 				"valid": true,
 				"skip": {
 					"v2": "5 errors in empty disjunction:\nconflicting values [] and {...} (mismatched types list and struct):\n    generated.cue:2:1\n    generated.cue:2:54\n    instance.json:1:1\nconflicting values bool and [] (mismatched types bool and list):\n    generated.cue:2:8\n    instance.json:1:1\nconflicting values null and [] (mismatched types null and list):\n    generated.cue:2:1\n    instance.json:1:1\nconflicting values number and [] (mismatched types number and list):\n    generated.cue:2:15\n    instance.json:1:1\nconflicting values string and [] (mismatched types string and list):\n    generated.cue:2:24\n    instance.json:1:1\n",
-					"v3": "conflicting values [] and {...} (mismatched types list and struct):\n    generated.cue:2:54\n    instance.json:1:1\nconflicting values bool and [] (mismatched types bool and list):\n    generated.cue:2:8\n    instance.json:1:1\nconflicting values null and [] (mismatched types null and list):\n    generated.cue:2:1\n    instance.json:1:1\nconflicting values number and [] (mismatched types number and list):\n    generated.cue:2:15\n    instance.json:1:1\nconflicting values string and [] (mismatched types string and list):\n    generated.cue:2:24\n    instance.json:1:1\nincompatible list lengths (0 and 2):\n    instance.json:1:1\n"
+					"v3": "conflicting values [] and bool (mismatched types list and bool):\n    generated.cue:2:8\n    instance.json:1:1\nconflicting values [] and null (mismatched types list and null):\n    generated.cue:2:1\n    instance.json:1:1\nconflicting values [] and number (mismatched types list and number):\n    generated.cue:2:15\n    instance.json:1:1\nconflicting values [] and string (mismatched types list and string):\n    generated.cue:2:24\n    instance.json:1:1\nconflicting values [] and {...} (mismatched types list and struct):\n    generated.cue:2:54\n    instance.json:1:1\nincompatible list lengths (0 and 3):\n    generated.cue:2:33\n"
 				}
 			},
 			{
@@ -176,7 +176,7 @@
 				"valid": true,
 				"skip": {
 					"v2": "5 errors in empty disjunction:\nconflicting values [1] and {...} (mismatched types list and struct):\n    generated.cue:2:1\n    generated.cue:2:49\n    instance.json:1:1\nconflicting values bool and [1] (mismatched types bool and list):\n    generated.cue:2:8\n    instance.json:1:1\nconflicting values null and [1] (mismatched types null and list):\n    generated.cue:2:1\n    instance.json:1:1\nconflicting values number and [1] (mismatched types number and list):\n    generated.cue:2:15\n    instance.json:1:1\nconflicting values string and [1] (mismatched types string and list):\n    generated.cue:2:24\n    instance.json:1:1\n",
-					"v3": "conflicting values [1] and {...} (mismatched types list and struct):\n    generated.cue:2:49\n    instance.json:1:1\nconflicting values bool and [1] (mismatched types bool and list):\n    generated.cue:2:8\n    instance.json:1:1\nconflicting values null and [1] (mismatched types null and list):\n    generated.cue:2:1\n    instance.json:1:1\nconflicting values number and [1] (mismatched types number and list):\n    generated.cue:2:15\n    instance.json:1:1\nconflicting values string and [1] (mismatched types string and list):\n    generated.cue:2:24\n    instance.json:1:1\nexplicit error (_|_ literal) in source:\n    generated.cue:2:37\nincompatible list lengths (1 and 2):\n    instance.json:1:1\n"
+					"v3": "conflicting values [1] and bool (mismatched types list and bool):\n    generated.cue:2:8\n    instance.json:1:1\nconflicting values [1] and null (mismatched types list and null):\n    generated.cue:2:1\n    instance.json:1:1\nconflicting values [1] and number (mismatched types list and number):\n    generated.cue:2:15\n    instance.json:1:1\nconflicting values [1] and string (mismatched types list and string):\n    generated.cue:2:24\n    instance.json:1:1\nconflicting values [1] and {...} (mismatched types list and struct):\n    generated.cue:2:49\n    instance.json:1:1\nincompatible list lengths (1 and 3):\n    generated.cue:2:33\nexplicit error (_|_ literal) in source:\n    generated.cue:2:37\n"
 				}
 			},
 			{
@@ -193,7 +193,7 @@
 				"valid": true,
 				"skip": {
 					"v2": "5 errors in empty disjunction:\nconflicting values [] and {...} (mismatched types list and struct):\n    generated.cue:2:1\n    generated.cue:2:49\n    instance.json:1:1\nconflicting values bool and [] (mismatched types bool and list):\n    generated.cue:2:8\n    instance.json:1:1\nconflicting values null and [] (mismatched types null and list):\n    generated.cue:2:1\n    instance.json:1:1\nconflicting values number and [] (mismatched types number and list):\n    generated.cue:2:15\n    instance.json:1:1\nconflicting values string and [] (mismatched types string and list):\n    generated.cue:2:24\n    instance.json:1:1\n",
-					"v3": "conflicting values [] and {...} (mismatched types list and struct):\n    generated.cue:2:49\n    instance.json:1:1\nconflicting values bool and [] (mismatched types bool and list):\n    generated.cue:2:8\n    instance.json:1:1\nconflicting values null and [] (mismatched types null and list):\n    generated.cue:2:1\n    instance.json:1:1\nconflicting values number and [] (mismatched types number and list):\n    generated.cue:2:15\n    instance.json:1:1\nconflicting values string and [] (mismatched types string and list):\n    generated.cue:2:24\n    instance.json:1:1\nexplicit error (_|_ literal) in source:\n    generated.cue:2:37\nincompatible list lengths (0 and 2):\n    instance.json:1:1\n"
+					"v3": "conflicting values [] and bool (mismatched types list and bool):\n    generated.cue:2:8\n    instance.json:1:1\nconflicting values [] and null (mismatched types list and null):\n    generated.cue:2:1\n    instance.json:1:1\nconflicting values [] and number (mismatched types list and number):\n    generated.cue:2:15\n    instance.json:1:1\nconflicting values [] and string (mismatched types list and string):\n    generated.cue:2:24\n    instance.json:1:1\nconflicting values [] and {...} (mismatched types list and struct):\n    generated.cue:2:49\n    instance.json:1:1\nincompatible list lengths (0 and 3):\n    generated.cue:2:33\n"
 				}
 			}
 		]

diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/contains.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/contains.json
@@ -210,7 +210,7 @@
 				"valid": true,
 				"skip": {
 					"v2": "6 errors in empty disjunction:\nconflicting values [\"foo\"] and {...} (mismatched types list and struct):\n    generated.cue:4:1\n    generated.cue:4:72\n    instance.json:1:1\nconflicting values bool and [\"foo\"] (mismatched types bool and list):\n    generated.cue:4:8\n    instance.json:1:1\nconflicting values null and [\"foo\"] (mismatched types null and list):\n    generated.cue:4:1\n    instance.json:1:1\nconflicting values number and [\"foo\"] (mismatched types number and list):\n    generated.cue:4:15\n    instance.json:1:1\nconflicting values string and [\"foo\"] (mismatched types string and list):\n    generated.cue:4:24\n    instance.json:1:1\nexplicit error (_|_ literal) in source:\n    generated.cue:4:58\n",
-					"v3": "conflicting values [\"foo\"] and {...} (mismatched types list and struct):\n    generated.cue:4:72\n    instance.json:1:1\nconflicting values bool and [\"foo\"] (mismatched types bool and list):\n    generated.cue:4:8\n    instance.json:1:1\nconflicting values null and [\"foo\"] (mismatched types null and list):\n    generated.cue:4:1\n    instance.json:1:1\nconflicting values number and [\"foo\"] (mismatched types number and list):\n    generated.cue:4:15\n    instance.json:1:1\nconflicting values string and [\"foo\"] (mismatched types string and list):\n    generated.cue:4:24\n    instance.json:1:1\nexplicit error (_|_ literal) in source:\n    generated.cue:4:58\n"
+					"v3": "conflicting values [\"foo\"] and bool (mismatched types list and bool):\n    generated.cue:4:8\n    instance.json:1:1\nconflicting values [\"foo\"] and null (mismatched types list and null):\n    generated.cue:4:1\n    instance.json:1:1\nconflicting values [\"foo\"] and number (mismatched types list and number):\n    generated.cue:4:15\n    instance.json:1:1\nconflicting values [\"foo\"] and string (mismatched types list and string):\n    generated.cue:4:24\n    instance.json:1:1\nconflicting values [\"foo\"] and {...} (mismatched types list and struct):\n    generated.cue:4:72\n    instance.json:1:1\nexplicit error (_|_ literal) in source:\n    generated.cue:4:58\n"
 				}
 			},
 			{