diff --git a/cmd/cue/cmd/testdata/script/cmd_err.txtar b/cmd/cue/cmd/testdata/script/cmd_err.txtar index dc9c5f2b3fc..2b941c55a3c 100644 --- a/cmd/cue/cmd/testdata/script/cmd_err.txtar +++ b/cmd/cue/cmd/testdata/script/cmd_err.txtar @@ -3,14 +3,14 @@ cmp stderr cmd_badfields.out -- cmd_badfields.out -- -command.ref.task.display.contents: invalid bytes argument: non-concrete value (string|bytes): - ./task_tool.cue:6:8 - tool/file:17:3 command.ref.task.display.filename: invalid string argument: non-concrete value string: ./task_tool.cue:6:8 ./task_tool.cue:7:9 tool/file:15:3 tool/file:15:16 +command.ref.task.display.contents: invalid bytes argument: non-concrete value (string|bytes): + ./task_tool.cue:6:8 + tool/file:17:3 -- task_tool.cue -- package home diff --git a/cmd/cue/cmd/testdata/script/cmd_errpos.txtar b/cmd/cue/cmd/testdata/script/cmd_errpos.txtar index b377362d047..c59fa97e9aa 100644 --- a/cmd/cue/cmd/testdata/script/cmd_errpos.txtar +++ b/cmd/cue/cmd/testdata/script/cmd_errpos.txtar @@ -5,15 +5,15 @@ cmp stderr expect-stderr -- expect-stdout -- -- expect-stderr -- +command.prompter.filename: invalid string argument: non-concrete value string: + ./task_tool.cue:9:10 + tool/file:9:3 + tool/file:9:16 command.prompter.contents: invalid bytes argument: non-concrete value string: ./task_tool.cue:9:10 ./task_tool.cue:12:13 ./task_tool.cue:17:3 tool/file:11:3 -command.prompter.filename: invalid string argument: non-concrete value string: - ./task_tool.cue:9:10 - tool/file:9:3 - tool/file:9:16 -- task_tool.cue -- package foo diff --git a/cmd/cue/cmd/testdata/script/def_jsonschema.txtar b/cmd/cue/cmd/testdata/script/def_jsonschema.txtar index d3cc92a194e..a3bec07bd7f 100644 --- a/cmd/cue/cmd/testdata/script/def_jsonschema.txtar +++ b/cmd/cue/cmd/testdata/script/def_jsonschema.txtar @@ -84,10 +84,10 @@ import "strings" "foo": true } -- expect-stderr-strict -- -keyword "$dynamicAnchor" not yet implemented: - ./bad.json:4:3 unknown keyword "foo": ./bad.json:5:3 +keyword "$dynamicAnchor" not yet implemented: + ./bad.json:4:3 -- expect-stderr-strict-features -- keyword "$dynamicAnchor" not yet implemented: ./bad.json:4:3 diff --git a/cmd/cue/cmd/testdata/script/eval_errs.txtar b/cmd/cue/cmd/testdata/script/eval_errs.txtar index a4456ea8697..d03e014b601 100644 --- a/cmd/cue/cmd/testdata/script/eval_errs.txtar +++ b/cmd/cue/cmd/testdata/script/eval_errs.txtar @@ -4,6 +4,9 @@ cmp stdout expect-stdout -- expect-stdout -- -- expect-stderr -- +x.q: conflicting values "goodbye" and "hello": + ./errs.cue:1:4 + ./errs.cue:2:4 bar: 2 errors in empty disjunction: bar.a: conflicting values "str" and int (mismatched types string and int): ./errs.cue:5:10 @@ -11,9 +14,6 @@ bar.a: conflicting values "str" and int (mismatched types string and int): bar.b: conflicting values 2 and string (mismatched types int and string): ./errs.cue:5:21 ./errs.cue:6:26 -x.q: conflicting values "goodbye" and "hello": - ./errs.cue:1:4 - ./errs.cue:2:4 -- errs.cue -- a: "hello" b: "goodbye" diff --git a/cmd/cue/cmd/testdata/script/exp_gengotypes.txtar b/cmd/cue/cmd/testdata/script/exp_gengotypes.txtar index ff82a43a69e..6d733cbf501 100644 --- a/cmd/cue/cmd/testdata/script/exp_gengotypes.txtar +++ b/cmd/cue/cmd/testdata/script/exp_gengotypes.txtar @@ -163,6 +163,12 @@ _typeTests: [...#typeTest] & [ {name: "LinkedList", fail: both: {next: "x"}}, ] -- cuetest/fail_check.stderr -- +fail.both.notString: conflicting values "not_a_struct" and {embedded2?:int} (mismatched types string and struct): + ./cuetest/all.cue:4:24 + ./root/root.cue:95:2 +fail.both.notList: conflicting values [1,2,3] and {embedded2?:int} (mismatched types list and struct): + ./cuetest/all.cue:5:24 + ./root/root.cue:95:2 fail.both."16_IntList".types.IntList.0: conflicting values "foo" and int (mismatched types string and int): ./cuetest/all.cue:67:40 ./root/types.cue:26:23 @@ -184,16 +190,22 @@ fail.both."40_NonEmptyString".types.NonEmptyString: conflicting values string an fail.both."42_LinkedList".types.LinkedList.next: conflicting values "x" and {item?:_,next?:#linkedList} (mismatched types string and struct): ./cuetest/all.cue:94:50 ./root/types.cue:43:14 -fail.both.notList: conflicting values [1,2,3] and {embedded2?:int} (mismatched types list and struct): - ./cuetest/all.cue:5:24 - ./root/root.cue:95:2 -fail.both.notString: conflicting values "not_a_struct" and {embedded2?:int} (mismatched types string and struct): - ./cuetest/all.cue:4:24 - ./root/root.cue:95:2 +fail.cue.isNotEqual.mustEqual2: conflicting values 8 and 99: + ./cuetest/all.cue:11:37 + ./cuetest/all.cue:11:52 +fail.cue.discBoth.discriminatorField: 2 errors in empty disjunction: +fail.cue.discBoth.discriminatorField.two: field not allowed: + ./cuetest/all.cue:14:51 +fail.cue.discBoth.discriminatorField.one: field not allowed: + ./cuetest/all.cue:14:43 +fail.cue."9_Uint".types.Uint: invalid value -34 (out of bound >=0): + ./cuetest/all.cue:59:30 fail.cue."11_Int8".types.Int8: invalid value 99999 (out of bound <=127): ./cuetest/all.cue:61:30 fail.cue."12_Int8".types.Int8: invalid value -99999 (out of bound >=-128): ./cuetest/all.cue:62:30 +fail.cue."18_IntListClosed2".types.IntListClosed2: incompatible list lengths (2 and 4): + ./cuetest/all.cue:69:38 fail.cue."29_NullOrStruct".types.NullOrStruct: 2 errors in empty disjunction: fail.cue."29_NullOrStruct".types.NullOrStruct: conflicting values "foo" and null (mismatched types string and null): ./cuetest/all.cue:81:43 @@ -208,21 +220,6 @@ fail.cue."32_NullOrString".types.NullOrString: conflicting values 123 and null ( fail.cue."32_NullOrString".types.NullOrString: conflicting values 123 and string (mismatched types int and string): ./cuetest/all.cue:84:43 ./root/types.cue:36:30 -fail.cue."39_UniqueStrings".types.UniqueStrings: invalid value ["foo","foo"] (does not satisfy list.UniqueItems): equal value ("foo") at position 0 and 1: - ./cuetest/all.cue:25:55 - ./root/types.cue:39:23 -fail.cue."9_Uint".types.Uint: invalid value -34 (out of bound >=0): - ./cuetest/all.cue:59:30 -fail.cue.discBoth.discriminatorField: 2 errors in empty disjunction: -fail.cue.discBoth.discriminatorField.one: field not allowed: - ./cuetest/all.cue:14:43 -fail.cue.discBoth.discriminatorField.two: field not allowed: - ./cuetest/all.cue:14:51 -fail.cue.isNotEqual.mustEqual2: conflicting values 8 and 99: - ./cuetest/all.cue:11:37 - ./cuetest/all.cue:11:52 -fail.cue."18_IntListClosed2".types.IntListClosed2: incompatible list lengths (2 and 4): - ./cuetest/all.cue:69:38 fail.cue."34_NumericBounds".types.NumericBounds: invalid value 5555 (out of bound <100): ./root/types.cue:37:28 ./cuetest/all.cue:86:43 @@ -231,6 +228,9 @@ fail.cue."36_NonEmptyString".types.NonEmptyString: invalid value "" (out of boun ./cuetest/all.cue:25:55 ./cuetest/all.cue:88:43 ./root/types.cue:38:23 +fail.cue."39_UniqueStrings".types.UniqueStrings: invalid value ["foo","foo"] (does not satisfy list.UniqueItems): equal value ("foo") at position 0 and 1: + ./cuetest/all.cue:25:55 + ./root/types.cue:39:23 -- go.mod -- module "foo.test/bar" diff --git a/cmd/cue/cmd/testdata/script/export_required.txtar b/cmd/cue/cmd/testdata/script/export_required.txtar index e47c24d1f86..b7de20e2072 100644 --- a/cmd/cue/cmd/testdata/script/export_required.txtar +++ b/cmd/cue/cmd/testdata/script/export_required.txtar @@ -27,7 +27,7 @@ a: x?: int // do not include this position b: #Def -- stderr.golden -- -#Def.x: field is required but not present: - ./y.cue:5:2 a.x: field is required but not present: ./y.cue:1:4 +#Def.x: field is required but not present: + ./y.cue:5:2 diff --git a/cmd/cue/cmd/testdata/script/load_underscore.txtar b/cmd/cue/cmd/testdata/script/load_underscore.txtar index 37d5b1b25dc..8a412ed3ddf 100644 --- a/cmd/cue/cmd/testdata/script/load_underscore.txtar +++ b/cmd/cue/cmd/testdata/script/load_underscore.txtar @@ -8,7 +8,7 @@ cmp stderr want-stderr ! exec cue export other.example/m:_ cmp stderr want-stderr-2 -- want-stderr -- -test.example/foo/foo@v0: import failed: _ is not a valid import path qualifier in "other.example/m:_": +test.example/foo/foo@v0: import failed: cannot find package "other.example/m": _ is not a valid import path qualifier in "other.example/m:_": ./foo/foo.cue:8:8 -- want-stderr-2 -- invalid import path qualifier _ in "other.example/m:_" diff --git a/cmd/cue/cmd/testdata/script/vet_concrete.txtar b/cmd/cue/cmd/testdata/script/vet_concrete.txtar index 5fe17f93b48..050d8084ca1 100644 --- a/cmd/cue/cmd/testdata/script/vet_concrete.txtar +++ b/cmd/cue/cmd/testdata/script/vet_concrete.txtar @@ -1,11 +1,11 @@ ! exec cue vet -c cmp stderr expect-stderr -- expect-stderr -- -b.str: incomplete value string: - ./partial.cue:8:7 sum: incomplete value 1 | 2 b.idx: invalid non-ground value string (must be concrete string): ./partial.cue:8:7 +b.str: incomplete value string: + ./partial.cue:8:7 -- partial.cue -- package partial diff --git a/cmd/cue/cmd/testdata/script/vet_path.txtar b/cmd/cue/cmd/testdata/script/vet_path.txtar index ad997e1a12c..af940042946 100644 --- a/cmd/cue/cmd/testdata/script/vet_path.txtar +++ b/cmd/cue/cmd/testdata/script/vet_path.txtar @@ -1,12 +1,12 @@ ! exec cue vet -l 'strings.ToLower(kind)' -l name services.jsonl services.cue cmp stderr expect-stderr -- expect-stderr -- -deployment.Booster.name: invalid value "Booster" (out of bound !~"^[A-Z]"): - ./services.cue:1:29 - ./services.jsonl:7:13 service."Supplement\nfoo".name: invalid value "Supplement\nfoo" (out of bound !~"^[A-Z]"): ./services.cue:2:26 ./services.jsonl:12:13 +deployment.Booster.name: invalid value "Booster" (out of bound !~"^[A-Z]"): + ./services.cue:1:29 + ./services.jsonl:7:13 -- services.cue -- deployment: [string]: name: !~"^[A-Z]" service: [string]: name: !~"^[A-Z]" diff --git a/cue/errors/errors.go b/cue/errors/errors.go index f1492f10210..1cdd0230ac4 100644 --- a/cue/errors/errors.go +++ b/cue/errors/errors.go @@ -396,9 +396,7 @@ func (p list) sanitize() list { if p == nil { return p } - a := slices.Clone(p) - a.RemoveMultiples() - return a + return p.RemoveMultiples() } // Sort sorts an List. *posError entries are sorted by position, @@ -417,19 +415,22 @@ func (p list) Sort() { }) } -// RemoveMultiples sorts an List and removes all but the first error per line. -func (p *list) RemoveMultiples() { - p.Sort() - var last Error - i := 0 - for _, e := range *p { - if last == nil || !approximateEqual(last, e) { - last = e - (*p)[i] = e - i++ +// RemoveMultiples removes all but the first instance of an error message per line. +func (p list) RemoveMultiples() list { + deduplicated := slices.Clone(p) + + deduplicatedIdx := 0 +OUTER: + for _, element := range p { + for _, deduplicatedElement := range deduplicated[0:deduplicatedIdx] { + if approximateEqual(deduplicatedElement, element) { + continue OUTER + } } + deduplicated[deduplicatedIdx] = element + deduplicatedIdx++ } - (*p) = (*p)[0:i] + return deduplicated[0:deduplicatedIdx] } func approximateEqual(a, b Error) bool { diff --git a/cue/errors/errors_test.go b/cue/errors/errors_test.go index 83641f878f3..5e232d4dd9d 100644 --- a/cue/errors/errors_test.go +++ b/cue/errors/errors_test.go @@ -17,6 +17,7 @@ package errors import ( "bytes" "fmt" + "slices" "testing" "cuelang.org/go/cue/token" @@ -79,14 +80,44 @@ func TestErrorList_Sort(t *testing.T) { } func TestErrorList_RemoveMultiples(t *testing.T) { + error1 := Promote(fmt.Errorf("error1"), "msg1") + error2 := Promote(fmt.Errorf("error2"), "msg2") + tests := []struct { name string - p *list + p list + want list }{ - // TODO: Add test cases. + { + name: "SingleError", + p: list{error1}, + want: list{error1}, + }, + { + name: "TwoErrorsNoDuplicatesOrder12", + p: list{error1, error2}, + want: list{error1, error2}, + }, + { + name: "TwoErrorsNoDuplicatesOrder21", + p: list{error2, error1}, + want: list{error2, error1}, + }, + { + name: "TwoErrorsDuplicates", + p: list{error1, error1}, + want: list{error1}, + }, + { + name: "ThreeErrorsPreserveOrder", + p: list{error1, error2, error1}, + want: list{error1, error2}, + }, } for _, tt := range tests { - tt.p.RemoveMultiples() + if got := tt.p.RemoveMultiples(); !slices.Equal(got, tt.want) { + t.Errorf("%q. list.RemoveMultiples() list = %v, want = %v", tt.name, got, tt.want) + } } } diff --git a/cue/load/loader_test.go b/cue/load/loader_test.go index 7e40fcd1adf..1dfe99677e4 100644 --- a/cue/load/loader_test.go +++ b/cue/load/loader_test.go @@ -69,12 +69,12 @@ func TestLoad(t *testing.T) { cfg: badModCfg, args: []string{"."}, want: `err: module: 2 errors in empty disjunction: -module: conflicting values 123 and "" (mismatched types int and string): - $CWD/testdata/badmod/cue.mod/module.cue:2:9 - cuelang.org/go/mod/modfile/schema.cue:56:22 module: conflicting values 123 and string (mismatched types int and string): $CWD/testdata/badmod/cue.mod/module.cue:2:9 cuelang.org/go/mod/modfile/schema.cue:98:12 +module: conflicting values 123 and "" (mismatched types int and string): + $CWD/testdata/badmod/cue.mod/module.cue:2:9 + cuelang.org/go/mod/modfile/schema.cue:56:22 path: "" module: "" root: "" @@ -215,8 +215,8 @@ files: name: "BadIdentifier", cfg: dirCfg, args: []string{"foo.com/bad-identifier"}, - want: `err: cannot determine package name for "foo.com/bad-identifier"; set it explicitly with ':' -cannot find package "foo.com/bad-identifier": cannot find module providing package foo.com/bad-identifier + want: `err: cannot find package "foo.com/bad-identifier": cannot find module providing package foo.com/bad-identifier +cannot determine package name for "foo.com/bad-identifier"; set it explicitly with ':' path: foo.com/bad-identifier module: "" root: $CWD/testdata/testmod @@ -335,11 +335,11 @@ files: Tags: []string{"prod"}, }, args: []string{"./tagsbad"}, - want: `err: tag "prod" not used in any file + want: `err: multiple @if attributes: + $CWD/testdata/testmod/tagsbad/prod.cue:2:1 previous declaration here: $CWD/testdata/testmod/tagsbad/prod.cue:1:1 -multiple @if attributes: - $CWD/testdata/testmod/tagsbad/prod.cue:2:1 +tag "prod" not used in any file path: mod.test/test/tagsbad@v0 module: mod.test/test@v0 root: $CWD/testdata/testmod diff --git a/cue/testdata/basicrewrite/001_regexp.txtar b/cue/testdata/basicrewrite/001_regexp.txtar index 9c155e34345..dda9ef46613 100644 --- a/cue/testdata/basicrewrite/001_regexp.txtar +++ b/cue/testdata/basicrewrite/001_regexp.txtar @@ -74,9 +74,6 @@ Conjuncts: 25 Disjuncts: 16 -- out/eval -- Errors: -e3: conflicting values !="a" and <5 (mismatched types string and number): - ./in.cue:22:5 - ./in.cue:22:13 b3: invalid value "foo" (out of bound =~"[a-z]{4}"): ./in.cue:10:5 ./in.cue:11:5 @@ -86,6 +83,9 @@ e1: cannot use 1 (type int) as type (string|bytes): e2: cannot use true (type bool) as type (string|bytes): ./in.cue:21:5 ./in.cue:21:14 +e3: conflicting values !="a" and <5 (mismatched types string and number): + ./in.cue:22:5 + ./in.cue:22:13 Result: (_|_){ diff --git a/cue/testdata/basicrewrite/015_types.txtar b/cue/testdata/basicrewrite/015_types.txtar index 994975df65e..e064319bd4d 100644 --- a/cue/testdata/basicrewrite/015_types.txtar +++ b/cue/testdata/basicrewrite/015_types.txtar @@ -47,14 +47,14 @@ Conjuncts: 14 Disjuncts: 10 -- out/eval -- Errors: -b: invalid operand int ('!' requires concrete value): - ./in.cue:7:6 e: conflicting values int and string (mismatched types int and string): ./in.cue:5:5 ./in.cue:5:11 e2: conflicting values 1 and string (mismatched types int and string): ./in.cue:6:5 ./in.cue:6:9 +b: invalid operand int ('!' requires concrete value): + ./in.cue:7:6 p: invalid operation +true (+ bool): ./in.cue:8:5 m: invalid operation -false (- bool): diff --git a/cue/testdata/basicrewrite/018_self-reference_cycles.txtar b/cue/testdata/basicrewrite/018_self-reference_cycles.txtar index 83cae522ee8..0afe961581e 100644 --- a/cue/testdata/basicrewrite/018_self-reference_cycles.txtar +++ b/cue/testdata/basicrewrite/018_self-reference_cycles.txtar @@ -191,13 +191,13 @@ Disjuncts: 88 } t2: (struct){ a: (_|_){ - // [incomplete] oneway.t2.a: 2 errors in empty disjunction: + // [incomplete] oneway.t2.a: non-concrete value <3 in operand to +: + // ./disjunction.cue:4:12 + // ./disjunction.cue:5:12 + // oneway.t2.a: 2 errors in empty disjunction: // oneway.t2.a: conflicting values 1 and 3: // ./disjunction.cue:3:13 // ./disjunction.cue:8:12 - // oneway.t2.a: non-concrete value <3 in operand to +: - // ./disjunction.cue:4:12 - // ./disjunction.cue:5:12 } b: (number){ <3 } } @@ -205,16 +205,16 @@ Disjuncts: 88 issue3669: (struct){ #Schema: (#struct){ two: (_|_){ - // [cycle] issue3669.#Schema.two: cycle with field: one: - // ./disjunction.cue:14:12 - // issue3669.#Schema.one: cycle with field: two: + // [cycle] issue3669.#Schema.one: cycle with field: two: // ./disjunction.cue:15:8 + // issue3669.#Schema.two: cycle with field: one: + // ./disjunction.cue:14:12 } one: (_|_){ - // [cycle] issue3669.#Schema.two: cycle with field: one: - // ./disjunction.cue:14:12 - // issue3669.#Schema.one: cycle with field: two: + // [cycle] issue3669.#Schema.one: cycle with field: two: // ./disjunction.cue:15:8 + // issue3669.#Schema.two: cycle with field: one: + // ./disjunction.cue:14:12 } } out: (#struct){ @@ -223,16 +223,16 @@ Disjuncts: 88 } } a: (_|_){ - // [cycle] a: cycle with field: b: - // ./in.cue:1:4 - // b: cycle with field: a: + // [cycle] b: cycle with field: a: // ./in.cue:2:4 + // a: cycle with field: b: + // ./in.cue:1:4 } b: (_|_){ - // [cycle] a: cycle with field: b: - // ./in.cue:1:4 - // b: cycle with field: a: + // [cycle] b: cycle with field: a: // ./in.cue:2:4 + // a: cycle with field: b: + // ./in.cue:1:4 } c: (#list){ 0: (_){ _ } @@ -244,16 +244,16 @@ Disjuncts: 88 reduced1: (struct){ #A: (#struct){ a: (_|_){ - // [cycle] issue3737.reduced1.#A.a: cycle with field: b: - // ./issue3737.cue:3:12 - // issue3737.reduced1.#A.b: cycle with field: a: + // [cycle] issue3737.reduced1.#A.b: cycle with field: a: // ./issue3737.cue:4:12 + // issue3737.reduced1.#A.a: cycle with field: b: + // ./issue3737.cue:3:12 } b: (_|_){ - // [cycle] issue3737.reduced1.#A.a: cycle with field: b: - // ./issue3737.cue:3:12 - // issue3737.reduced1.#A.b: cycle with field: a: + // [cycle] issue3737.reduced1.#A.b: cycle with field: a: // ./issue3737.cue:4:12 + // issue3737.reduced1.#A.a: cycle with field: b: + // ./issue3737.cue:3:12 } } x: (#struct){ @@ -278,10 +278,10 @@ Disjuncts: 88 } #TimeSpan: (#struct){ start: (_|_){ - // [cycle] issue3737.reduced2.#TimeSpan.start: cycle with field: end: - // ./issue3737.cue:23:19 - // issue3737.reduced2.#TimeSpan.end: cycle with field: start: + // [cycle] issue3737.reduced2.#TimeSpan.end: cycle with field: start: // ./issue3737.cue:25:19 + // issue3737.reduced2.#TimeSpan.start: cycle with field: end: + // ./issue3737.cue:23:19 // issue3737.reduced2.#TimeSpan.end: cycle with field: duration: // ./issue3737.cue:25:27 } @@ -309,32 +309,43 @@ Disjuncts: 88 diff old new --- old +++ new -@@ -13,7 +13,6 @@ - // [incomplete] oneway.t2.a: 2 errors in empty disjunction: +@@ -10,14 +10,13 @@ + } + t2: (struct){ + a: (_|_){ +- // [incomplete] oneway.t2.a: 2 errors in empty disjunction: ++ // [incomplete] oneway.t2.a: non-concrete value <3 in operand to +: ++ // ./disjunction.cue:4:12 ++ // ./disjunction.cue:5:12 ++ // oneway.t2.a: 2 errors in empty disjunction: // oneway.t2.a: conflicting values 1 and 3: // ./disjunction.cue:3:13 - // ./disjunction.cue:7:9 // ./disjunction.cue:8:12 - // oneway.t2.a: non-concrete value <3 in operand to +: - // ./disjunction.cue:4:12 -@@ -25,57 +24,60 @@ +- // oneway.t2.a: non-concrete value <3 in operand to +: +- // ./disjunction.cue:4:12 +- // ./disjunction.cue:5:12 + } + b: (number){ <3 } + } +@@ -25,28 +24,33 @@ issue3669: (struct){ #Schema: (#struct){ two: (_|_){ - // [cycle] cycle error: - // ./disjunction.cue:14:8 -+ // [cycle] issue3669.#Schema.two: cycle with field: one: -+ // ./disjunction.cue:14:12 -+ // issue3669.#Schema.one: cycle with field: two: ++ // [cycle] issue3669.#Schema.one: cycle with field: two: + // ./disjunction.cue:15:8 ++ // issue3669.#Schema.two: cycle with field: one: ++ // ./disjunction.cue:14:12 } one: (_|_){ - // [cycle] cycle error: - // ./disjunction.cue:14:8 -+ // [cycle] issue3669.#Schema.two: cycle with field: one: -+ // ./disjunction.cue:14:12 -+ // issue3669.#Schema.one: cycle with field: two: ++ // [cycle] issue3669.#Schema.one: cycle with field: two: + // ./disjunction.cue:15:8 ++ // issue3669.#Schema.two: cycle with field: one: ++ // ./disjunction.cue:14:12 } } out: (#struct){ @@ -349,21 +360,20 @@ diff old new } a: (_|_){ - // [cycle] cycle error: -- // ./in.cue:1:4 -+ // [cycle] a: cycle with field: b: -+ // ./in.cue:1:4 -+ // b: cycle with field: a: ++ // [cycle] b: cycle with field: a: + // ./in.cue:2:4 ++ // a: cycle with field: b: + // ./in.cue:1:4 } b: (_|_){ - // [cycle] cycle error: -- // ./in.cue:1:4 -+ // [cycle] a: cycle with field: b: -+ // ./in.cue:1:4 -+ // b: cycle with field: a: ++ // [cycle] b: cycle with field: a: + // ./in.cue:2:4 ++ // a: cycle with field: b: + // ./in.cue:1:4 } c: (#list){ +@@ -53,29 +57,27 @@ 0: (_){ _ } 1: (_){ _ } } @@ -382,11 +392,10 @@ diff old new #A: (#struct){ a: (_|_){ - // [cycle] cycle error: -- // ./issue3737.cue:3:12 -+ // [cycle] issue3737.reduced1.#A.a: cycle with field: b: -+ // ./issue3737.cue:3:12 -+ // issue3737.reduced1.#A.b: cycle with field: a: ++ // [cycle] issue3737.reduced1.#A.b: cycle with field: a: + // ./issue3737.cue:4:12 ++ // issue3737.reduced1.#A.a: cycle with field: b: + // ./issue3737.cue:3:12 } b: (_|_){ - // [cycle] cycle error: @@ -395,10 +404,10 @@ diff old new - } - x: (#struct){ - a: (float){ 12000.0 } -+ // [cycle] issue3737.reduced1.#A.a: cycle with field: b: -+ // ./issue3737.cue:3:12 -+ // issue3737.reduced1.#A.b: cycle with field: a: ++ // [cycle] issue3737.reduced1.#A.b: cycle with field: a: + // ./issue3737.cue:4:12 ++ // issue3737.reduced1.#A.a: cycle with field: b: ++ // ./issue3737.cue:3:12 + } + } + x: (#struct){ @@ -430,10 +439,10 @@ diff old new start: (_|_){ - // [cycle] cycle error: - // ./issue3737.cue:23:19 -+ // [cycle] issue3737.reduced2.#TimeSpan.start: cycle with field: end: -+ // ./issue3737.cue:23:19 -+ // issue3737.reduced2.#TimeSpan.end: cycle with field: start: ++ // [cycle] issue3737.reduced2.#TimeSpan.end: cycle with field: start: + // ./issue3737.cue:25:19 ++ // issue3737.reduced2.#TimeSpan.start: cycle with field: end: ++ // ./issue3737.cue:23:19 + // issue3737.reduced2.#TimeSpan.end: cycle with field: duration: + // ./issue3737.cue:25:27 } diff --git a/cue/testdata/benchmarks/dedupelem.txtar b/cue/testdata/benchmarks/dedupelem.txtar index f0d5abf20e1..53e63d43dba 100644 --- a/cue/testdata/benchmarks/dedupelem.txtar +++ b/cue/testdata/benchmarks/dedupelem.txtar @@ -66,30 +66,33 @@ Result: diff old new --- old +++ new -@@ -1,10 +1,4 @@ +@@ -1,13 +1,7 @@ Errors: -foo.0: 2 errors in empty disjunction: + foo.0.type: conflicting values "string" and "float": + ./in.cue:5:14 + ./in.cue:10:14 -foo.0.type: conflicting values "int" and "float": - ./in.cue:3:16 - ./in.cue:5:14 - ./in.cue:5:27 - ./in.cue:5:30 - foo.0.type: conflicting values "string" and "float": - ./in.cue:5:14 - ./in.cue:10:14 + + Result: + (_|_){ @@ -22,15 +16,7 @@ foo: (_|_){ // [eval] 0: (_|_){ - // [eval] foo.0: 2 errors in empty disjunction: +- // foo.0.type: conflicting values "string" and "float": +- // ./in.cue:5:14 +- // ./in.cue:10:14 - // foo.0.type: conflicting values "int" and "float": - // ./in.cue:3:16 - // ./in.cue:5:14 - // ./in.cue:5:27 - // ./in.cue:5:30 -- // foo.0.type: conflicting values "string" and "float": -- // ./in.cue:5:14 -- // ./in.cue:10:14 + // [eval] type: (_|_){ // [eval] foo.0.type: conflicting values "string" and "float": @@ -99,14 +102,14 @@ Improved and simplified error message which can be detected before disjunction. -- out/eval -- Errors: foo.0: 2 errors in empty disjunction: +foo.0.type: conflicting values "string" and "float": + ./in.cue:5:14 + ./in.cue:10:14 foo.0.type: conflicting values "int" and "float": ./in.cue:3:16 ./in.cue:5:14 ./in.cue:5:27 ./in.cue:5:30 -foo.0.type: conflicting values "string" and "float": - ./in.cue:5:14 - ./in.cue:10:14 Result: (_|_){ @@ -122,14 +125,14 @@ Result: // [eval] 0: (_|_){ // [eval] foo.0: 2 errors in empty disjunction: + // foo.0.type: conflicting values "string" and "float": + // ./in.cue:5:14 + // ./in.cue:10:14 // foo.0.type: conflicting values "int" and "float": // ./in.cue:3:16 // ./in.cue:5:14 // ./in.cue:5:27 // ./in.cue:5:30 - // foo.0.type: conflicting values "string" and "float": - // ./in.cue:5:14 - // ./in.cue:10:14 type: (_|_){ // [eval] foo.0.type: conflicting values "string" and "float": // ./in.cue:5:14 diff --git a/cue/testdata/benchmarks/issue3517.txtar b/cue/testdata/benchmarks/issue3517.txtar index 4bf445541d4..b532fd4ec0e 100644 --- a/cue/testdata/benchmarks/issue3517.txtar +++ b/cue/testdata/benchmarks/issue3517.txtar @@ -118,12 +118,12 @@ Result: // ./main.cue:10:12 } duration: (_|_){ - // [incomplete] #TimeSpan.start: non-concrete value end for bound <=: - // ./main.cue:12:11 - // #TimeSpan.duration: non-concrete value float in operand to -: + // [incomplete] #TimeSpan.duration: non-concrete value float in operand to -: // ./main.cue:9:12 // ./main.cue:6:12 // ./main.cue:10:12 + // #TimeSpan.start: non-concrete value end for bound <=: + // ./main.cue:12:11 } end: (_|_){ // [incomplete] #TimeSpan.start: non-concrete value end for bound <=: @@ -150,32 +150,32 @@ Result: action: (string){ "Task 1" } timeSpan: (#struct){ duration: (_|_){ - // [incomplete] #T1.timeSpan.start: non-concrete value end for bound <=: - // ./main.cue:12:11 - // #T1.timeSpan.start: non-concrete value float in operand to -: - // ./main.cue:8:12 + // [incomplete] #T1.timeSpan.duration: non-concrete value float in operand to -: + // ./main.cue:9:12 // ./main.cue:6:12 // ./main.cue:10:12 - // #T1.timeSpan.duration: non-concrete value float in operand to -: - // ./main.cue:9:12 + // #T1.timeSpan.start: non-concrete value float in operand to -: + // ./main.cue:8:12 // ./main.cue:6:12 // ./main.cue:10:12 + // #T1.timeSpan.start: non-concrete value end for bound <=: + // ./main.cue:12:11 } start: (_|_){ - // [incomplete] #T1.timeSpan.start: non-concrete value end for bound <=: - // ./main.cue:12:11 - // #T1.timeSpan.start: non-concrete value float in operand to -: + // [incomplete] #T1.timeSpan.start: non-concrete value float in operand to -: // ./main.cue:8:12 // ./main.cue:6:12 // ./main.cue:10:12 + // #T1.timeSpan.start: non-concrete value end for bound <=: + // ./main.cue:12:11 } end: (_|_){ - // [incomplete] #T1.timeSpan.start: non-concrete value end for bound <=: - // ./main.cue:12:11 - // #T1.timeSpan.start: non-concrete value float in operand to -: + // [incomplete] #T1.timeSpan.start: non-concrete value float in operand to -: // ./main.cue:8:12 // ./main.cue:6:12 // ./main.cue:10:12 + // #T1.timeSpan.start: non-concrete value end for bound <=: + // ./main.cue:12:11 } } } @@ -183,32 +183,32 @@ Result: action: (string){ "Task 2" } timeSpan: (#struct){ duration: (_|_){ - // [incomplete] #T2.timeSpan.start: non-concrete value end for bound <=: - // ./main.cue:12:11 - // #T2.timeSpan.start: non-concrete value float in operand to -: - // ./main.cue:8:12 + // [incomplete] #T2.timeSpan.duration: non-concrete value float in operand to -: + // ./main.cue:9:12 // ./main.cue:6:12 // ./main.cue:10:12 - // #T2.timeSpan.duration: non-concrete value float in operand to -: - // ./main.cue:9:12 + // #T2.timeSpan.start: non-concrete value float in operand to -: + // ./main.cue:8:12 // ./main.cue:6:12 // ./main.cue:10:12 + // #T2.timeSpan.start: non-concrete value end for bound <=: + // ./main.cue:12:11 } start: (_|_){ - // [incomplete] #T2.timeSpan.start: non-concrete value end for bound <=: - // ./main.cue:12:11 - // #T2.timeSpan.start: non-concrete value float in operand to -: + // [incomplete] #T2.timeSpan.start: non-concrete value float in operand to -: // ./main.cue:8:12 // ./main.cue:6:12 // ./main.cue:10:12 + // #T2.timeSpan.start: non-concrete value end for bound <=: + // ./main.cue:12:11 } end: (_|_){ - // [incomplete] #T2.timeSpan.start: non-concrete value end for bound <=: - // ./main.cue:12:11 - // #T2.timeSpan.start: non-concrete value float in operand to -: + // [incomplete] #T2.timeSpan.start: non-concrete value float in operand to -: // ./main.cue:8:12 // ./main.cue:6:12 // ./main.cue:10:12 + // #T2.timeSpan.start: non-concrete value end for bound <=: + // ./main.cue:12:11 } } } @@ -320,12 +320,12 @@ diff old new duration: (_|_){ - // [cycle] cycle error: - // ./main.cue:9:12 -+ // [incomplete] #TimeSpan.start: non-concrete value end for bound <=: -+ // ./main.cue:12:11 -+ // #TimeSpan.duration: non-concrete value float in operand to -: ++ // [incomplete] #TimeSpan.duration: non-concrete value float in operand to -: + // ./main.cue:9:12 + // ./main.cue:6:12 + // ./main.cue:10:12 ++ // #TimeSpan.start: non-concrete value end for bound <=: ++ // ./main.cue:12:11 } end: (_|_){ - // [cycle] cycle error: @@ -356,7 +356,7 @@ diff old new } #TaskSet: (#struct){ action: (string){ string } -@@ -44,32 +46,38 @@ +@@ -44,40 +46,38 @@ } tasks: (#list){ } @@ -379,88 +379,104 @@ diff old new action: (string){ "Task 1" } timeSpan: (#struct){ - start: (_|_){ -- // [cycle] cycle error +- // [cycle] cycle error: +- // ./main.cue:8:12 +- // cycle error: +- // ./main.cue:12:9 - } - duration: (_|_){ - // [cycle] cycle error: - // ./main.cue:9:12 - } - end: (_|_){ -- // [cycle] cycle error +- // [cycle] cycle error: +- // ./main.cue:8:12 +- // cycle error: +- // ./main.cue:12:9 +- // cycle error: +- // ./main.cue:9:12 + duration: (_|_){ -+ // [incomplete] #T1.timeSpan.start: non-concrete value end for bound <=: -+ // ./main.cue:12:11 -+ // #T1.timeSpan.start: non-concrete value float in operand to -: -+ // ./main.cue:8:12 ++ // [incomplete] #T1.timeSpan.duration: non-concrete value float in operand to -: ++ // ./main.cue:9:12 + // ./main.cue:6:12 + // ./main.cue:10:12 -+ // #T1.timeSpan.duration: non-concrete value float in operand to -: -+ // ./main.cue:9:12 ++ // #T1.timeSpan.start: non-concrete value float in operand to -: ++ // ./main.cue:8:12 + // ./main.cue:6:12 + // ./main.cue:10:12 ++ // #T1.timeSpan.start: non-concrete value end for bound <=: ++ // ./main.cue:12:11 + } + start: (_|_){ -+ // [incomplete] #T1.timeSpan.start: non-concrete value end for bound <=: -+ // ./main.cue:12:11 -+ // #T1.timeSpan.start: non-concrete value float in operand to -: ++ // [incomplete] #T1.timeSpan.start: non-concrete value float in operand to -: + // ./main.cue:8:12 + // ./main.cue:6:12 + // ./main.cue:10:12 ++ // #T1.timeSpan.start: non-concrete value end for bound <=: ++ // ./main.cue:12:11 + } + end: (_|_){ -+ // [incomplete] #T1.timeSpan.start: non-concrete value end for bound <=: -+ // ./main.cue:12:11 -+ // #T1.timeSpan.start: non-concrete value float in operand to -: ++ // [incomplete] #T1.timeSpan.start: non-concrete value float in operand to -: + // ./main.cue:8:12 + // ./main.cue:6:12 + // ./main.cue:10:12 ++ // #T1.timeSpan.start: non-concrete value end for bound <=: ++ // ./main.cue:12:11 } } } -@@ -76,15 +84,33 @@ +@@ -84,23 +84,33 @@ #T2: (#struct){ action: (string){ "Task 2" } timeSpan: (#struct){ - start: (_|_){ -- // [cycle] cycle error +- // [cycle] cycle error: +- // ./main.cue:8:12 +- // cycle error: +- // ./main.cue:12:9 - } - duration: (_|_){ - // [cycle] cycle error: - // ./main.cue:9:12 - } - end: (_|_){ -- // [cycle] cycle error +- // [cycle] cycle error: +- // ./main.cue:8:12 +- // cycle error: +- // ./main.cue:12:9 +- // cycle error: +- // ./main.cue:9:12 + duration: (_|_){ -+ // [incomplete] #T2.timeSpan.start: non-concrete value end for bound <=: -+ // ./main.cue:12:11 -+ // #T2.timeSpan.start: non-concrete value float in operand to -: -+ // ./main.cue:8:12 ++ // [incomplete] #T2.timeSpan.duration: non-concrete value float in operand to -: ++ // ./main.cue:9:12 + // ./main.cue:6:12 + // ./main.cue:10:12 -+ // #T2.timeSpan.duration: non-concrete value float in operand to -: -+ // ./main.cue:9:12 ++ // #T2.timeSpan.start: non-concrete value float in operand to -: ++ // ./main.cue:8:12 + // ./main.cue:6:12 + // ./main.cue:10:12 ++ // #T2.timeSpan.start: non-concrete value end for bound <=: ++ // ./main.cue:12:11 + } + start: (_|_){ -+ // [incomplete] #T2.timeSpan.start: non-concrete value end for bound <=: -+ // ./main.cue:12:11 -+ // #T2.timeSpan.start: non-concrete value float in operand to -: ++ // [incomplete] #T2.timeSpan.start: non-concrete value float in operand to -: + // ./main.cue:8:12 + // ./main.cue:6:12 + // ./main.cue:10:12 ++ // #T2.timeSpan.start: non-concrete value end for bound <=: ++ // ./main.cue:12:11 + } + end: (_|_){ -+ // [incomplete] #T2.timeSpan.start: non-concrete value end for bound <=: -+ // ./main.cue:12:11 -+ // #T2.timeSpan.start: non-concrete value float in operand to -: ++ // [incomplete] #T2.timeSpan.start: non-concrete value float in operand to -: + // ./main.cue:8:12 + // ./main.cue:6:12 + // ./main.cue:10:12 ++ // #T2.timeSpan.start: non-concrete value end for bound <=: ++ // ./main.cue:12:11 } } } -@@ -93,66 +119,73 @@ +@@ -109,66 +119,73 @@ action: (string){ "Task 1 and Task 2" } #tasks: (_|_){ // [eval] @@ -648,14 +664,22 @@ Result: action: (string){ "Task 1" } timeSpan: (#struct){ start: (_|_){ - // [cycle] cycle error + // [cycle] cycle error: + // ./main.cue:8:12 + // cycle error: + // ./main.cue:12:9 } duration: (_|_){ // [cycle] cycle error: // ./main.cue:9:12 } end: (_|_){ - // [cycle] cycle error + // [cycle] cycle error: + // ./main.cue:8:12 + // cycle error: + // ./main.cue:12:9 + // cycle error: + // ./main.cue:9:12 } } } @@ -663,14 +687,22 @@ Result: action: (string){ "Task 2" } timeSpan: (#struct){ start: (_|_){ - // [cycle] cycle error + // [cycle] cycle error: + // ./main.cue:8:12 + // cycle error: + // ./main.cue:12:9 } duration: (_|_){ // [cycle] cycle error: // ./main.cue:9:12 } end: (_|_){ - // [cycle] cycle error + // [cycle] cycle error: + // ./main.cue:8:12 + // cycle error: + // ./main.cue:12:9 + // cycle error: + // ./main.cue:9:12 } } } diff --git a/cue/testdata/builtins/matchn.txtar b/cue/testdata/builtins/matchn.txtar index 3b379fbed59..4231f737c00 100644 --- a/cue/testdata/builtins/matchn.txtar +++ b/cue/testdata/builtins/matchn.txtar @@ -357,67 +357,26 @@ Conjuncts: 1635 Disjuncts: 1081 -- out/eval -- Errors: -closedByDefinition.err5.out.exports: conflicting values null and {exp1:"./main-module.js"} (mismatched types null and struct): - ./closedness.cue:80:13 - ./closedness.cue:80:24 - ./closedness.cue:85:7 - ./closedness.cue:86:12 -closedByDefinition.err5.out.exports.exp1: conflicting values "./main-module.js" and null (mismatched types string and null): - ./closedness.cue:80:30 - ./closedness.cue:81:24 - ./closedness.cue:82:26 - ./closedness.cue:85:7 - ./closedness.cue:86:18 -closedByDefinition.err5.out.exports.exp1: conflicting values "./main-module.js" and {exp1?:#exports} (mismatched types string and struct): - ./closedness.cue:80:30 - ./closedness.cue:81:30 - ./closedness.cue:82:19 - ./closedness.cue:82:26 - ./closedness.cue:85:7 - ./closedness.cue:86:18 -explicitClose.err1.out.a: conflicting values "all" and {baz:"notAllowed"} (mismatched types string and struct): - ./closedness.cue:32:12 - ./closedness.cue:33:6 - ./closedness.cue:33:17 - ./closedness.cue:35:7 - ./closedness.cue:36:6 -incomplete.err1.x.bar: conflicting values 2 and string (mismatched types int and string): - ./incomplete.cue:34:24 - ./incomplete.cue:35:11 -incomplete.err3.x.bar: conflicting values 2 and string (mismatched types int and string): - ./incomplete.cue:46:24 - ./incomplete.cue:47:11 -incomplete.err4.x.bar: conflicting values 2 and string (mismatched types int and string): - ./incomplete.cue:51:25 - ./incomplete.cue:52:11 -match.defaults.pickNested1Err.a: conflicting values 2 and 3: - ./in.cue:36:23 - ./in.cue:36:38 - ./in.cue:39:23 -match.incompleteErr.a: conflicting values string and int (mismatched types string and int): - ./in.cue:4:5 - ./in.cue:12:21 - ./in.cue:12:32 - ./in.cue:14:20 -match.singleErr.a: conflicting values "foo" and int (mismatched types string and int): - ./in.cue:4:5 - ./in.cue:8:17 - ./in.cue:8:28 - ./in.cue:10:16 +openArguments.err2.out.a: invalid value {allowed:"once"} (does not satisfy matchN): 2 matched, expected 1: + ./closedness.cue:21:13 + ./closedness.cue:21:20 + ./closedness.cue:28:6 openArguments.err2.out.a: conflicting values null and {allowed:"once"} (mismatched types null and struct): ./closedness.cue:20:12 ./closedness.cue:21:13 ./closedness.cue:22:5 ./closedness.cue:27:7 ./closedness.cue:28:6 -openArguments.err2.out.a: invalid value {allowed:"once"} (does not satisfy matchN): 2 matched, expected 1: - ./closedness.cue:21:13 - ./closedness.cue:21:20 - ./closedness.cue:28:6 explicitClose.err1.out.a: invalid value {baz:"notAllowed"} (does not satisfy matchN): 0 matched, expected 1: ./closedness.cue:33:6 ./closedness.cue:33:13 ./closedness.cue:36:6 +explicitClose.err1.out.a: conflicting values "all" and {baz:"notAllowed"} (mismatched types string and struct): + ./closedness.cue:32:12 + ./closedness.cue:33:6 + ./closedness.cue:33:17 + ./closedness.cue:35:7 + ./closedness.cue:36:6 explicitClose.err1.out.a.baz: field not allowed: ./closedness.cue:33:6 ./closedness.cue:32:12 @@ -429,23 +388,55 @@ closedByDefinition.err5.out.exports: invalid value {exp1:"./main-module.js"} (do ./closedness.cue:80:13 ./closedness.cue:80:20 ./closedness.cue:86:12 +closedByDefinition.err5.out.exports: conflicting values null and {exp1:"./main-module.js"} (mismatched types null and struct): + ./closedness.cue:80:13 + ./closedness.cue:80:24 + ./closedness.cue:85:7 + ./closedness.cue:86:12 closedByDefinition.err5.out.exports.exp1: invalid value "./main-module.js" (does not satisfy matchN): 0 matched, expected 1: ./closedness.cue:81:13 ./closedness.cue:81:20 ./closedness.cue:82:26 ./closedness.cue:86:18 +closedByDefinition.err5.out.exports.exp1: conflicting values "./main-module.js" and null (mismatched types string and null): + ./closedness.cue:80:30 + ./closedness.cue:81:24 + ./closedness.cue:82:26 + ./closedness.cue:85:7 + ./closedness.cue:86:18 +closedByDefinition.err5.out.exports.exp1: conflicting values "./main-module.js" and {exp1?:#exports} (mismatched types string and struct): + ./closedness.cue:80:30 + ./closedness.cue:81:30 + ./closedness.cue:82:19 + ./closedness.cue:82:26 + ./closedness.cue:85:7 + ./closedness.cue:86:18 match.singleErr: invalid value {a:"foo"} (does not satisfy matchN): 0 matched, expected 1: ./in.cue:8:17 ./in.cue:8:24 ./in.cue:10:13 +match.singleErr.a: conflicting values "foo" and int (mismatched types string and int): + ./in.cue:4:5 + ./in.cue:8:17 + ./in.cue:8:28 + ./in.cue:10:16 match.incompleteErr: invalid value {a:string} (does not satisfy matchN): 0 matched, expected 1: ./in.cue:12:21 ./in.cue:12:28 ./in.cue:14:17 +match.incompleteErr.a: conflicting values string and int (mismatched types string and int): + ./in.cue:4:5 + ./in.cue:12:21 + ./in.cue:12:32 + ./in.cue:14:20 match.defaults.pickNested1Err: invalid value {a:*3 | int} (does not satisfy matchN): 0 matched, expected 1: ./in.cue:36:23 ./in.cue:36:30 ./in.cue:39:19 +match.defaults.pickNested1Err.a: conflicting values 2 and 3: + ./in.cue:36:23 + ./in.cue:36:38 + ./in.cue:39:23 match.defaults.pickNested2Err: invalid value {a:*3 | int} (does not satisfy matchN): 0 matched, expected 1: ./in.cue:41:23 ./in.cue:41:30 @@ -465,10 +456,6 @@ oneOf.multiple1Err1: invalid value 1 (does not satisfy matchN): 0 matched, expec ./in.cue:84:20 ./in.cue:84:27 ./in.cue:86:17 -oneOf.multiple1Err2: invalid value 15 (does not satisfy matchN): 2 matched, expected 1: - ./in.cue:84:20 - ./in.cue:84:27 - ./in.cue:91:17 oneOf.multiple1Err1: invalid value 1 (does not satisfy math.MultipleOf(3)): ./in.cue:84:31 ./in.cue:84:20 @@ -479,6 +466,10 @@ oneOf.multiple1Err1: invalid value 1 (does not satisfy math.MultipleOf(5)): ./in.cue:84:20 ./in.cue:84:67 ./in.cue:86:17 +oneOf.multiple1Err2: invalid value 15 (does not satisfy matchN): 2 matched, expected 1: + ./in.cue:84:20 + ./in.cue:84:27 + ./in.cue:91:17 anyOf.multiple1Err1: invalid value 1 (does not satisfy matchN): 0 matched, expected >0: ./in.cue:95:20 ./in.cue:95:27 @@ -497,34 +488,34 @@ allOf.multiple1Err1: invalid value 1 (does not satisfy matchN): 0 matched, expec ./in.cue:106:20 ./in.cue:106:27 ./in.cue:108:17 -allOf.multiple1Err2: invalid value 3 (does not satisfy matchN): 1 matched, expected 2: - ./in.cue:106:20 - ./in.cue:106:27 - ./in.cue:109:17 -allOf.multiple1Err3: invalid value 5 (does not satisfy matchN): 1 matched, expected 2: - ./in.cue:106:20 - ./in.cue:106:27 - ./in.cue:110:17 allOf.multiple1Err1: invalid value 1 (does not satisfy math.MultipleOf(3)): ./in.cue:106:31 ./in.cue:106:20 ./in.cue:106:47 ./in.cue:108:17 -allOf.multiple1Err3: invalid value 5 (does not satisfy math.MultipleOf(3)): - ./in.cue:106:31 - ./in.cue:106:20 - ./in.cue:106:47 - ./in.cue:110:17 allOf.multiple1Err1: invalid value 1 (does not satisfy math.MultipleOf(5)): ./in.cue:106:51 ./in.cue:106:20 ./in.cue:106:67 ./in.cue:108:17 +allOf.multiple1Err2: invalid value 3 (does not satisfy matchN): 1 matched, expected 2: + ./in.cue:106:20 + ./in.cue:106:27 + ./in.cue:109:17 allOf.multiple1Err2: invalid value 3 (does not satisfy math.MultipleOf(5)): ./in.cue:106:51 ./in.cue:106:20 ./in.cue:106:67 ./in.cue:109:17 +allOf.multiple1Err3: invalid value 5 (does not satisfy matchN): 1 matched, expected 2: + ./in.cue:106:20 + ./in.cue:106:27 + ./in.cue:110:17 +allOf.multiple1Err3: invalid value 5 (does not satisfy math.MultipleOf(3)): + ./in.cue:106:31 + ./in.cue:106:20 + ./in.cue:106:47 + ./in.cue:110:17 issue3575.test1.x: invalid value [{a:1}] (does not satisfy matchN): 0 matched, expected 1: ./in.cue:153:7 ./in.cue:153:14 @@ -540,6 +531,9 @@ incomplete.err1.x: invalid value {bar:2} (does not satisfy matchN): 0 matched, e ./incomplete.cue:34:6 ./incomplete.cue:34:13 ./incomplete.cue:35:6 +incomplete.err1.x.bar: conflicting values 2 and string (mismatched types int and string): + ./incomplete.cue:34:24 + ./incomplete.cue:35:11 incomplete.err2.x: invalid value {bar:2} (does not satisfy matchN): 1 matched, expected 0: ./incomplete.cue:40:6 ./incomplete.cue:40:13 @@ -548,10 +542,16 @@ incomplete.err3.x: invalid value {bar:2} (does not satisfy matchN): 0 matched, e ./incomplete.cue:46:6 ./incomplete.cue:46:13 ./incomplete.cue:47:6 +incomplete.err3.x.bar: conflicting values 2 and string (mismatched types int and string): + ./incomplete.cue:46:24 + ./incomplete.cue:47:11 incomplete.err4.x: invalid value {bar:2} (does not satisfy matchN): 0 matched, expected >1: ./incomplete.cue:51:6 ./incomplete.cue:51:13 ./incomplete.cue:52:6 +incomplete.err4.x.bar: conflicting values 2 and string (mismatched types int and string): + ./incomplete.cue:51:25 + ./incomplete.cue:52:11 incomplete.err5.x: invalid value {bar:2} (does not satisfy matchN): 1 matched, expected <1: ./incomplete.cue:55:6 ./incomplete.cue:55:13 @@ -629,16 +629,16 @@ Result: out: (_|_){ // [eval] a: (_|_){ - // [eval] openArguments.err2.out.a: conflicting values null and {allowed:"once"} (mismatched types null and struct): + // [eval] openArguments.err2.out.a: invalid value {allowed:"once"} (does not satisfy matchN): 2 matched, expected 1: + // ./closedness.cue:21:13 + // ./closedness.cue:21:20 + // ./closedness.cue:28:6 + // openArguments.err2.out.a: conflicting values null and {allowed:"once"} (mismatched types null and struct): // ./closedness.cue:20:12 // ./closedness.cue:21:13 // ./closedness.cue:22:5 // ./closedness.cue:27:7 // ./closedness.cue:28:6 - // openArguments.err2.out.a: invalid value {allowed:"once"} (does not satisfy matchN): 2 matched, expected 1: - // ./closedness.cue:21:13 - // ./closedness.cue:21:20 - // ./closedness.cue:28:6 allowed: (string){ "once" } } } @@ -661,16 +661,16 @@ Result: out: (_|_){ // [eval] a: (_|_){ - // [eval] explicitClose.err1.out.a: conflicting values "all" and {baz:"notAllowed"} (mismatched types string and struct): + // [eval] explicitClose.err1.out.a: invalid value {baz:"notAllowed"} (does not satisfy matchN): 0 matched, expected 1: + // ./closedness.cue:33:6 + // ./closedness.cue:33:13 + // ./closedness.cue:36:6 + // explicitClose.err1.out.a: conflicting values "all" and {baz:"notAllowed"} (mismatched types string and struct): // ./closedness.cue:32:12 // ./closedness.cue:33:6 // ./closedness.cue:33:17 // ./closedness.cue:35:7 // ./closedness.cue:36:6 - // explicitClose.err1.out.a: invalid value {baz:"notAllowed"} (does not satisfy matchN): 0 matched, expected 1: - // ./closedness.cue:33:6 - // ./closedness.cue:33:13 - // ./closedness.cue:36:6 // explicitClose.err1.out.a.baz: field not allowed: // ./closedness.cue:33:6 // ./closedness.cue:32:12 @@ -825,11 +825,20 @@ Result: out: (_|_){ // [eval] exports: (_|_){ - // [eval] closedByDefinition.err5.out.exports: conflicting values null and {exp1:"./main-module.js"} (mismatched types null and struct): + // [eval] closedByDefinition.err5.out.exports: invalid value {exp1:"./main-module.js"} (does not satisfy matchN): 0 matched, expected 1: + // ./closedness.cue:80:13 + // ./closedness.cue:80:20 + // ./closedness.cue:86:12 + // closedByDefinition.err5.out.exports: conflicting values null and {exp1:"./main-module.js"} (mismatched types null and struct): // ./closedness.cue:80:13 // ./closedness.cue:80:24 // ./closedness.cue:85:7 // ./closedness.cue:86:12 + // closedByDefinition.err5.out.exports.exp1: invalid value "./main-module.js" (does not satisfy matchN): 0 matched, expected 1: + // ./closedness.cue:81:13 + // ./closedness.cue:81:20 + // ./closedness.cue:82:26 + // ./closedness.cue:86:18 // closedByDefinition.err5.out.exports.exp1: conflicting values "./main-module.js" and null (mismatched types string and null): // ./closedness.cue:80:30 // ./closedness.cue:81:24 @@ -843,15 +852,6 @@ Result: // ./closedness.cue:82:26 // ./closedness.cue:85:7 // ./closedness.cue:86:18 - // closedByDefinition.err5.out.exports: invalid value {exp1:"./main-module.js"} (does not satisfy matchN): 0 matched, expected 1: - // ./closedness.cue:80:13 - // ./closedness.cue:80:20 - // ./closedness.cue:86:12 - // closedByDefinition.err5.out.exports.exp1: invalid value "./main-module.js" (does not satisfy matchN): 0 matched, expected 1: - // ./closedness.cue:81:13 - // ./closedness.cue:81:20 - // ./closedness.cue:82:26 - // ./closedness.cue:86:18 exp1: (string){ "./main-module.js" } } #exports: (_){ matchN(1, (#list){ @@ -880,30 +880,30 @@ Result: a: (int){ 2 } } singleErr: (_|_){ - // [eval] match.singleErr.a: conflicting values "foo" and int (mismatched types string and int): + // [eval] match.singleErr: invalid value {a:"foo"} (does not satisfy matchN): 0 matched, expected 1: + // ./in.cue:8:17 + // ./in.cue:8:24 + // ./in.cue:10:13 + // match.singleErr.a: conflicting values "foo" and int (mismatched types string and int): // ./in.cue:4:5 // ./in.cue:8:17 // ./in.cue:8:28 // ./in.cue:10:16 - // match.singleErr: invalid value {a:"foo"} (does not satisfy matchN): 0 matched, expected 1: - // ./in.cue:8:17 - // ./in.cue:8:24 - // ./in.cue:10:13 a: (string){ "foo" } } incompleteOK: (struct){ a: (int){ int } } incompleteErr: (_|_){ - // [eval] match.incompleteErr.a: conflicting values string and int (mismatched types string and int): + // [eval] match.incompleteErr: invalid value {a:string} (does not satisfy matchN): 0 matched, expected 1: + // ./in.cue:12:21 + // ./in.cue:12:28 + // ./in.cue:14:17 + // match.incompleteErr.a: conflicting values string and int (mismatched types string and int): // ./in.cue:4:5 // ./in.cue:12:21 // ./in.cue:12:32 // ./in.cue:14:20 - // match.incompleteErr: invalid value {a:string} (does not satisfy matchN): 0 matched, expected 1: - // ./in.cue:12:21 - // ./in.cue:12:28 - // ./in.cue:14:17 a: (string){ string } } #A: (#struct){ @@ -929,14 +929,14 @@ Result: a: (int){ int } } pickNested1Err: (_|_){ - // [eval] match.defaults.pickNested1Err.a: conflicting values 2 and 3: - // ./in.cue:36:23 - // ./in.cue:36:38 - // ./in.cue:39:23 - // match.defaults.pickNested1Err: invalid value {a:*3 | int} (does not satisfy matchN): 0 matched, expected 1: + // [eval] match.defaults.pickNested1Err: invalid value {a:*3 | int} (does not satisfy matchN): 0 matched, expected 1: // ./in.cue:36:23 // ./in.cue:36:30 // ./in.cue:39:19 + // match.defaults.pickNested1Err.a: conflicting values 2 and 3: + // ./in.cue:36:23 + // ./in.cue:36:38 + // ./in.cue:39:23 a: (int){ |(*(int){ 3 }, (int){ int }) } } pickNested2OK1: (struct){ @@ -1235,12 +1235,12 @@ Result: // ./incomplete.cue:20:6 // ./incomplete.cue:20:13 // ./incomplete.cue:21:6 - // incomplete.incomplete4.x.baz: field is required but not present: - // ./incomplete.cue:20:6 - // ./incomplete.cue:20:61 // incomplete.incomplete4.x.foo: field is required but not present: // ./incomplete.cue:20:6 // ./incomplete.cue:20:48 + // incomplete.incomplete4.x.baz: field is required but not present: + // ./incomplete.cue:20:6 + // ./incomplete.cue:20:61 bar: (int){ 2 } } } @@ -1250,12 +1250,12 @@ Result: // ./incomplete.cue:24:6 // ./incomplete.cue:24:13 // ./incomplete.cue:25:6 - // incomplete.incomplete5.x.baz: field is required but not present: - // ./incomplete.cue:24:6 - // ./incomplete.cue:24:51 // incomplete.incomplete5.x.foo: field is required but not present: // ./incomplete.cue:24:6 // ./incomplete.cue:24:38 + // incomplete.incomplete5.x.baz: field is required but not present: + // ./incomplete.cue:24:6 + // ./incomplete.cue:24:51 bar: (int){ 2 } } } @@ -1265,25 +1265,25 @@ Result: // ./incomplete.cue:28:6 // ./incomplete.cue:28:13 // ./incomplete.cue:29:6 - // incomplete.incomplete6.x.baz: field is required but not present: - // ./incomplete.cue:28:6 - // ./incomplete.cue:28:46 // incomplete.incomplete6.x.foo: field is required but not present: // ./incomplete.cue:28:6 // ./incomplete.cue:28:33 + // incomplete.incomplete6.x.baz: field is required but not present: + // ./incomplete.cue:28:6 + // ./incomplete.cue:28:46 bar: (int){ 2 } } } err1: (_|_){ // [eval] x: (_|_){ - // [eval] incomplete.err1.x.bar: conflicting values 2 and string (mismatched types int and string): - // ./incomplete.cue:34:24 - // ./incomplete.cue:35:11 - // incomplete.err1.x: invalid value {bar:2} (does not satisfy matchN): 0 matched, expected 1: + // [eval] incomplete.err1.x: invalid value {bar:2} (does not satisfy matchN): 0 matched, expected 1: // ./incomplete.cue:34:6 // ./incomplete.cue:34:13 // ./incomplete.cue:35:6 + // incomplete.err1.x.bar: conflicting values 2 and string (mismatched types int and string): + // ./incomplete.cue:34:24 + // ./incomplete.cue:35:11 bar: (int){ 2 } } } @@ -1300,26 +1300,26 @@ Result: err3: (_|_){ // [eval] x: (_|_){ - // [eval] incomplete.err3.x.bar: conflicting values 2 and string (mismatched types int and string): - // ./incomplete.cue:46:24 - // ./incomplete.cue:47:11 - // incomplete.err3.x: invalid value {bar:2} (does not satisfy matchN): 0 matched, expected 2: + // [eval] incomplete.err3.x: invalid value {bar:2} (does not satisfy matchN): 0 matched, expected 2: // ./incomplete.cue:46:6 // ./incomplete.cue:46:13 // ./incomplete.cue:47:6 + // incomplete.err3.x.bar: conflicting values 2 and string (mismatched types int and string): + // ./incomplete.cue:46:24 + // ./incomplete.cue:47:11 bar: (int){ 2 } } } err4: (_|_){ // [eval] x: (_|_){ - // [eval] incomplete.err4.x.bar: conflicting values 2 and string (mismatched types int and string): - // ./incomplete.cue:51:25 - // ./incomplete.cue:52:11 - // incomplete.err4.x: invalid value {bar:2} (does not satisfy matchN): 0 matched, expected >1: + // [eval] incomplete.err4.x: invalid value {bar:2} (does not satisfy matchN): 0 matched, expected >1: // ./incomplete.cue:51:6 // ./incomplete.cue:51:13 // ./incomplete.cue:52:6 + // incomplete.err4.x.bar: conflicting values 2 and string (mismatched types int and string): + // ./incomplete.cue:51:25 + // ./incomplete.cue:52:11 bar: (int){ 2 } } } @@ -1353,12 +1353,12 @@ Result: // ./issue3694.cue:2:9 // ./issue3694.cue:2:16 // ./issue3694.cue:9:9 - // issue3694.full.#step.run: field is required but not present: - // ./issue3694.cue:2:9 - // ./issue3694.cue:6:3 // issue3694.full.#step.uses: field is required but not present: // ./issue3694.cue:2:9 // ./issue3694.cue:3:3 + // issue3694.full.#step.run: field is required but not present: + // ./issue3694.cue:2:9 + // ./issue3694.cue:6:3 uses?: (string){ string } run?: (string){ string } } @@ -1383,50 +1383,22 @@ Result: } -- out/evalalpha -- Errors: -closedByDefinition.err5.out.exports: conflicting values null and {exp1:"./main-module.js"} (mismatched types null and struct): - ./closedness.cue:80:13 - ./closedness.cue:80:24 - ./closedness.cue:86:12 -closedByDefinition.err5.out.exports.exp1: conflicting values "./main-module.js" and null (mismatched types string and null): - ./closedness.cue:81:24 - ./closedness.cue:86:18 -closedByDefinition.err5.out.exports.exp1: conflicting values "./main-module.js" and {exp1?:#exports} (mismatched types string and struct): - ./closedness.cue:82:19 - ./closedness.cue:86:18 -explicitClose.err1.out.a: conflicting values "all" and {baz:"notAllowed"} (mismatched types string and struct): - ./closedness.cue:33:6 - ./closedness.cue:33:17 - ./closedness.cue:36:6 -incomplete.err1.x.bar: conflicting values 2 and string (mismatched types int and string): - ./incomplete.cue:34:24 - ./incomplete.cue:35:11 -incomplete.err3.x.bar: conflicting values 2 and string (mismatched types int and string): - ./incomplete.cue:46:24 - ./incomplete.cue:47:11 -incomplete.err4.x.bar: conflicting values 2 and string (mismatched types int and string): - ./incomplete.cue:51:25 - ./incomplete.cue:52:11 -match.defaults.pickNested1Err.a: conflicting values 2 and 3: - ./in.cue:36:38 - ./in.cue:39:23 -match.incompleteErr.a: conflicting values string and int (mismatched types string and int): - ./in.cue:4:5 - ./in.cue:14:20 -match.singleErr.a: conflicting values "foo" and int (mismatched types string and int): - ./in.cue:4:5 - ./in.cue:10:16 -openArguments.err2.out.a: conflicting values null and {allowed:"once"} (mismatched types null and struct): - ./closedness.cue:21:13 - ./closedness.cue:22:5 - ./closedness.cue:28:6 openArguments.err2.out.a: invalid value {allowed:"once"} (does not satisfy matchN): 2 matched, expected 1: ./closedness.cue:21:13 ./closedness.cue:21:20 ./closedness.cue:28:6 +openArguments.err2.out.a: conflicting values null and {allowed:"once"} (mismatched types null and struct): + ./closedness.cue:21:13 + ./closedness.cue:22:5 + ./closedness.cue:28:6 explicitClose.err1.out.a: invalid value {baz:"notAllowed"} (does not satisfy matchN): 0 matched, expected 1: ./closedness.cue:33:6 ./closedness.cue:33:13 ./closedness.cue:36:6 +explicitClose.err1.out.a: conflicting values "all" and {baz:"notAllowed"} (mismatched types string and struct): + ./closedness.cue:33:6 + ./closedness.cue:33:17 + ./closedness.cue:36:6 explicitClose.err1.out.a.baz: field not allowed: ./closedness.cue:33:6 ./closedness.cue:36:11 @@ -1434,23 +1406,42 @@ closedByDefinition.err5.out.exports: invalid value {exp1:"./main-module.js"} (do ./closedness.cue:80:13 ./closedness.cue:80:20 ./closedness.cue:86:12 +closedByDefinition.err5.out.exports: conflicting values null and {exp1:"./main-module.js"} (mismatched types null and struct): + ./closedness.cue:80:13 + ./closedness.cue:80:24 + ./closedness.cue:86:12 closedByDefinition.err5.out.exports.exp1: invalid value "./main-module.js" (does not satisfy matchN): 0 matched, expected 1: ./closedness.cue:81:13 ./closedness.cue:81:20 ./closedness.cue:82:26 ./closedness.cue:86:18 +closedByDefinition.err5.out.exports.exp1: conflicting values "./main-module.js" and null (mismatched types string and null): + ./closedness.cue:81:24 + ./closedness.cue:86:18 +closedByDefinition.err5.out.exports.exp1: conflicting values "./main-module.js" and {exp1?:#exports} (mismatched types string and struct): + ./closedness.cue:82:19 + ./closedness.cue:86:18 match.singleErr: invalid value {a:"foo"} (does not satisfy matchN): 0 matched, expected 1: ./in.cue:8:17 ./in.cue:8:24 ./in.cue:10:13 +match.singleErr.a: conflicting values "foo" and int (mismatched types string and int): + ./in.cue:4:5 + ./in.cue:10:16 match.incompleteErr: invalid value {a:string} (does not satisfy matchN): 0 matched, expected 1: ./in.cue:12:21 ./in.cue:12:28 ./in.cue:14:17 +match.incompleteErr.a: conflicting values string and int (mismatched types string and int): + ./in.cue:4:5 + ./in.cue:14:20 match.defaults.pickNested1Err: invalid value {a:*3 | int} (does not satisfy matchN): 0 matched, expected 1: ./in.cue:36:23 ./in.cue:36:30 ./in.cue:39:19 +match.defaults.pickNested1Err.a: conflicting values 2 and 3: + ./in.cue:36:38 + ./in.cue:39:23 match.defaults.pickNested2Err: invalid value {a:*3 | int} (does not satisfy matchN): 0 matched, expected 1: ./in.cue:41:23 ./in.cue:41:30 @@ -1470,10 +1461,6 @@ oneOf.multiple1Err1: invalid value 1 (does not satisfy matchN): 0 matched, expec ./in.cue:84:20 ./in.cue:84:27 ./in.cue:86:17 -oneOf.multiple1Err2: invalid value 15 (does not satisfy matchN): 2 matched, expected 1: - ./in.cue:84:20 - ./in.cue:84:27 - ./in.cue:91:17 oneOf.multiple1Err1: invalid value 1 (does not satisfy math.MultipleOf(3)): ./in.cue:84:31 ./in.cue:84:20 @@ -1484,6 +1471,10 @@ oneOf.multiple1Err1: invalid value 1 (does not satisfy math.MultipleOf(5)): ./in.cue:84:20 ./in.cue:84:67 ./in.cue:86:17 +oneOf.multiple1Err2: invalid value 15 (does not satisfy matchN): 2 matched, expected 1: + ./in.cue:84:20 + ./in.cue:84:27 + ./in.cue:91:17 anyOf.multiple1Err1: invalid value 1 (does not satisfy matchN): 0 matched, expected >0: ./in.cue:95:20 ./in.cue:95:27 @@ -1502,38 +1493,41 @@ allOf.multiple1Err1: invalid value 1 (does not satisfy matchN): 0 matched, expec ./in.cue:106:20 ./in.cue:106:27 ./in.cue:108:17 -allOf.multiple1Err2: invalid value 3 (does not satisfy matchN): 1 matched, expected 2: - ./in.cue:106:20 - ./in.cue:106:27 - ./in.cue:109:17 -allOf.multiple1Err3: invalid value 5 (does not satisfy matchN): 1 matched, expected 2: - ./in.cue:106:20 - ./in.cue:106:27 - ./in.cue:110:17 allOf.multiple1Err1: invalid value 1 (does not satisfy math.MultipleOf(3)): ./in.cue:106:31 ./in.cue:106:20 ./in.cue:106:47 ./in.cue:108:17 -allOf.multiple1Err3: invalid value 5 (does not satisfy math.MultipleOf(3)): - ./in.cue:106:31 - ./in.cue:106:20 - ./in.cue:106:47 - ./in.cue:110:17 allOf.multiple1Err1: invalid value 1 (does not satisfy math.MultipleOf(5)): ./in.cue:106:51 ./in.cue:106:20 ./in.cue:106:67 ./in.cue:108:17 +allOf.multiple1Err2: invalid value 3 (does not satisfy matchN): 1 matched, expected 2: + ./in.cue:106:20 + ./in.cue:106:27 + ./in.cue:109:17 allOf.multiple1Err2: invalid value 3 (does not satisfy math.MultipleOf(5)): ./in.cue:106:51 ./in.cue:106:20 ./in.cue:106:67 ./in.cue:109:17 +allOf.multiple1Err3: invalid value 5 (does not satisfy matchN): 1 matched, expected 2: + ./in.cue:106:20 + ./in.cue:106:27 + ./in.cue:110:17 +allOf.multiple1Err3: invalid value 5 (does not satisfy math.MultipleOf(3)): + ./in.cue:106:31 + ./in.cue:106:20 + ./in.cue:106:47 + ./in.cue:110:17 incomplete.err1.x: invalid value {bar:2} (does not satisfy matchN): 0 matched, expected 1: ./incomplete.cue:34:6 ./incomplete.cue:34:13 ./incomplete.cue:35:6 +incomplete.err1.x.bar: conflicting values 2 and string (mismatched types int and string): + ./incomplete.cue:34:24 + ./incomplete.cue:35:11 incomplete.err2.x: invalid value {bar:2} (does not satisfy matchN): 1 matched, expected 0: ./incomplete.cue:40:6 ./incomplete.cue:40:13 @@ -1542,10 +1536,16 @@ incomplete.err3.x: invalid value {bar:2} (does not satisfy matchN): 0 matched, e ./incomplete.cue:46:6 ./incomplete.cue:46:13 ./incomplete.cue:47:6 +incomplete.err3.x.bar: conflicting values 2 and string (mismatched types int and string): + ./incomplete.cue:46:24 + ./incomplete.cue:47:11 incomplete.err4.x: invalid value {bar:2} (does not satisfy matchN): 0 matched, expected >1: ./incomplete.cue:51:6 ./incomplete.cue:51:13 ./incomplete.cue:52:6 +incomplete.err4.x.bar: conflicting values 2 and string (mismatched types int and string): + ./incomplete.cue:51:25 + ./incomplete.cue:52:11 incomplete.err5.x: invalid value {bar:2} (does not satisfy matchN): 1 matched, expected <1: ./incomplete.cue:55:6 ./incomplete.cue:55:13 @@ -1623,13 +1623,13 @@ Result: out: (_|_){ // [eval] a: (_|_){ - // [eval] openArguments.err2.out.a: conflicting values null and {allowed:"once"} (mismatched types null and struct): + // [eval] openArguments.err2.out.a: invalid value {allowed:"once"} (does not satisfy matchN): 2 matched, expected 1: // ./closedness.cue:21:13 - // ./closedness.cue:22:5 + // ./closedness.cue:21:20 // ./closedness.cue:28:6 - // openArguments.err2.out.a: invalid value {allowed:"once"} (does not satisfy matchN): 2 matched, expected 1: + // openArguments.err2.out.a: conflicting values null and {allowed:"once"} (mismatched types null and struct): // ./closedness.cue:21:13 - // ./closedness.cue:21:20 + // ./closedness.cue:22:5 // ./closedness.cue:28:6 allowed: (string){ "once" } } @@ -1653,13 +1653,13 @@ Result: out: (_|_){ // [eval] a: (_|_){ - // [eval] explicitClose.err1.out.a: conflicting values "all" and {baz:"notAllowed"} (mismatched types string and struct): + // [eval] explicitClose.err1.out.a: invalid value {baz:"notAllowed"} (does not satisfy matchN): 0 matched, expected 1: // ./closedness.cue:33:6 - // ./closedness.cue:33:17 + // ./closedness.cue:33:13 // ./closedness.cue:36:6 - // explicitClose.err1.out.a: invalid value {baz:"notAllowed"} (does not satisfy matchN): 0 matched, expected 1: + // explicitClose.err1.out.a: conflicting values "all" and {baz:"notAllowed"} (mismatched types string and struct): // ./closedness.cue:33:6 - // ./closedness.cue:33:13 + // ./closedness.cue:33:17 // ./closedness.cue:36:6 // explicitClose.err1.out.a.baz: field not allowed: // ./closedness.cue:33:6 @@ -1811,25 +1811,25 @@ Result: out: (_|_){ // [eval] exports: (_|_){ - // [eval] closedByDefinition.err5.out.exports: conflicting values null and {exp1:"./main-module.js"} (mismatched types null and struct): + // [eval] closedByDefinition.err5.out.exports: invalid value {exp1:"./main-module.js"} (does not satisfy matchN): 0 matched, expected 1: // ./closedness.cue:80:13 - // ./closedness.cue:80:24 + // ./closedness.cue:80:20 // ./closedness.cue:86:12 - // closedByDefinition.err5.out.exports.exp1: conflicting values "./main-module.js" and null (mismatched types string and null): - // ./closedness.cue:81:24 - // ./closedness.cue:86:18 - // closedByDefinition.err5.out.exports.exp1: conflicting values "./main-module.js" and {exp1?:#exports} (mismatched types string and struct): - // ./closedness.cue:82:19 - // ./closedness.cue:86:18 - // closedByDefinition.err5.out.exports: invalid value {exp1:"./main-module.js"} (does not satisfy matchN): 0 matched, expected 1: + // closedByDefinition.err5.out.exports: conflicting values null and {exp1:"./main-module.js"} (mismatched types null and struct): // ./closedness.cue:80:13 - // ./closedness.cue:80:20 + // ./closedness.cue:80:24 // ./closedness.cue:86:12 // closedByDefinition.err5.out.exports.exp1: invalid value "./main-module.js" (does not satisfy matchN): 0 matched, expected 1: // ./closedness.cue:81:13 // ./closedness.cue:81:20 // ./closedness.cue:82:26 // ./closedness.cue:86:18 + // closedByDefinition.err5.out.exports.exp1: conflicting values "./main-module.js" and null (mismatched types string and null): + // ./closedness.cue:81:24 + // ./closedness.cue:86:18 + // closedByDefinition.err5.out.exports.exp1: conflicting values "./main-module.js" and {exp1?:#exports} (mismatched types string and struct): + // ./closedness.cue:82:19 + // ./closedness.cue:86:18 exp1: (string){ "./main-module.js" } } #exports: (_){ matchN(1, (#list){ @@ -1858,26 +1858,26 @@ Result: a: (int){ 2 } } singleErr: (_|_){ - // [eval] match.singleErr.a: conflicting values "foo" and int (mismatched types string and int): - // ./in.cue:4:5 - // ./in.cue:10:16 - // match.singleErr: invalid value {a:"foo"} (does not satisfy matchN): 0 matched, expected 1: + // [eval] match.singleErr: invalid value {a:"foo"} (does not satisfy matchN): 0 matched, expected 1: // ./in.cue:8:17 // ./in.cue:8:24 // ./in.cue:10:13 + // match.singleErr.a: conflicting values "foo" and int (mismatched types string and int): + // ./in.cue:4:5 + // ./in.cue:10:16 a: (string){ "foo" } } incompleteOK: (struct){ a: (int){ int } } incompleteErr: (_|_){ - // [eval] match.incompleteErr.a: conflicting values string and int (mismatched types string and int): - // ./in.cue:4:5 - // ./in.cue:14:20 - // match.incompleteErr: invalid value {a:string} (does not satisfy matchN): 0 matched, expected 1: + // [eval] match.incompleteErr: invalid value {a:string} (does not satisfy matchN): 0 matched, expected 1: // ./in.cue:12:21 // ./in.cue:12:28 // ./in.cue:14:17 + // match.incompleteErr.a: conflicting values string and int (mismatched types string and int): + // ./in.cue:4:5 + // ./in.cue:14:20 a: (string){ string } } #A: (#struct){ @@ -1903,13 +1903,13 @@ Result: a: (int){ int } } pickNested1Err: (_|_){ - // [eval] match.defaults.pickNested1Err.a: conflicting values 2 and 3: - // ./in.cue:36:38 - // ./in.cue:39:23 - // match.defaults.pickNested1Err: invalid value {a:*3 | int} (does not satisfy matchN): 0 matched, expected 1: + // [eval] match.defaults.pickNested1Err: invalid value {a:*3 | int} (does not satisfy matchN): 0 matched, expected 1: // ./in.cue:36:23 // ./in.cue:36:30 // ./in.cue:39:19 + // match.defaults.pickNested1Err.a: conflicting values 2 and 3: + // ./in.cue:36:38 + // ./in.cue:39:23 a: (int){ |(*(int){ 3 }, (int){ int }) } } pickNested2OK1: (struct){ @@ -2195,12 +2195,12 @@ Result: // ./incomplete.cue:20:6 // ./incomplete.cue:20:13 // ./incomplete.cue:21:6 - // incomplete.incomplete4.x.baz: field is required but not present: - // ./incomplete.cue:20:6 - // ./incomplete.cue:20:61 // incomplete.incomplete4.x.foo: field is required but not present: // ./incomplete.cue:20:6 // ./incomplete.cue:20:48 + // incomplete.incomplete4.x.baz: field is required but not present: + // ./incomplete.cue:20:6 + // ./incomplete.cue:20:61 bar: (int){ 2 } } } @@ -2210,12 +2210,12 @@ Result: // ./incomplete.cue:24:6 // ./incomplete.cue:24:13 // ./incomplete.cue:25:6 - // incomplete.incomplete5.x.baz: field is required but not present: - // ./incomplete.cue:24:6 - // ./incomplete.cue:24:51 // incomplete.incomplete5.x.foo: field is required but not present: // ./incomplete.cue:24:6 // ./incomplete.cue:24:38 + // incomplete.incomplete5.x.baz: field is required but not present: + // ./incomplete.cue:24:6 + // ./incomplete.cue:24:51 bar: (int){ 2 } } } @@ -2225,25 +2225,25 @@ Result: // ./incomplete.cue:28:6 // ./incomplete.cue:28:13 // ./incomplete.cue:29:6 - // incomplete.incomplete6.x.baz: field is required but not present: - // ./incomplete.cue:28:6 - // ./incomplete.cue:28:46 // incomplete.incomplete6.x.foo: field is required but not present: // ./incomplete.cue:28:6 // ./incomplete.cue:28:33 + // incomplete.incomplete6.x.baz: field is required but not present: + // ./incomplete.cue:28:6 + // ./incomplete.cue:28:46 bar: (int){ 2 } } } err1: (_|_){ // [eval] x: (_|_){ - // [eval] incomplete.err1.x.bar: conflicting values 2 and string (mismatched types int and string): - // ./incomplete.cue:34:24 - // ./incomplete.cue:35:11 - // incomplete.err1.x: invalid value {bar:2} (does not satisfy matchN): 0 matched, expected 1: + // [eval] incomplete.err1.x: invalid value {bar:2} (does not satisfy matchN): 0 matched, expected 1: // ./incomplete.cue:34:6 // ./incomplete.cue:34:13 // ./incomplete.cue:35:6 + // incomplete.err1.x.bar: conflicting values 2 and string (mismatched types int and string): + // ./incomplete.cue:34:24 + // ./incomplete.cue:35:11 bar: (int){ 2 } } } @@ -2260,26 +2260,26 @@ Result: err3: (_|_){ // [eval] x: (_|_){ - // [eval] incomplete.err3.x.bar: conflicting values 2 and string (mismatched types int and string): - // ./incomplete.cue:46:24 - // ./incomplete.cue:47:11 - // incomplete.err3.x: invalid value {bar:2} (does not satisfy matchN): 0 matched, expected 2: + // [eval] incomplete.err3.x: invalid value {bar:2} (does not satisfy matchN): 0 matched, expected 2: // ./incomplete.cue:46:6 // ./incomplete.cue:46:13 // ./incomplete.cue:47:6 + // incomplete.err3.x.bar: conflicting values 2 and string (mismatched types int and string): + // ./incomplete.cue:46:24 + // ./incomplete.cue:47:11 bar: (int){ 2 } } } err4: (_|_){ // [eval] x: (_|_){ - // [eval] incomplete.err4.x.bar: conflicting values 2 and string (mismatched types int and string): - // ./incomplete.cue:51:25 - // ./incomplete.cue:52:11 - // incomplete.err4.x: invalid value {bar:2} (does not satisfy matchN): 0 matched, expected >1: + // [eval] incomplete.err4.x: invalid value {bar:2} (does not satisfy matchN): 0 matched, expected >1: // ./incomplete.cue:51:6 // ./incomplete.cue:51:13 // ./incomplete.cue:52:6 + // incomplete.err4.x.bar: conflicting values 2 and string (mismatched types int and string): + // ./incomplete.cue:51:25 + // ./incomplete.cue:52:11 bar: (int){ 2 } } } @@ -2313,12 +2313,12 @@ Result: // ./issue3694.cue:2:9 // ./issue3694.cue:2:16 // ./issue3694.cue:9:9 - // issue3694.full.#step.run: field is required but not present: - // ./issue3694.cue:2:9 - // ./issue3694.cue:6:3 // issue3694.full.#step.uses: field is required but not present: // ./issue3694.cue:2:9 // ./issue3694.cue:3:3 + // issue3694.full.#step.run: field is required but not present: + // ./issue3694.cue:2:9 + // ./issue3694.cue:6:3 uses?: (string){ string } run?: (string){ string } } @@ -2345,12 +2345,46 @@ Result: diff old new --- old +++ new -@@ -2,26 +2,16 @@ +@@ -4,10 +4,8 @@ + ./closedness.cue:21:20 + ./closedness.cue:28:6 + openArguments.err2.out.a: conflicting values null and {allowed:"once"} (mismatched types null and struct): +- ./closedness.cue:20:12 + ./closedness.cue:21:13 + ./closedness.cue:22:5 +- ./closedness.cue:27:7 + ./closedness.cue:28:6 + explicitClose.err1.out.a: invalid value {baz:"notAllowed"} (does not satisfy matchN): 0 matched, expected 1: + ./closedness.cue:33:6 +@@ -14,17 +12,11 @@ + ./closedness.cue:33:13 + ./closedness.cue:36:6 + explicitClose.err1.out.a: conflicting values "all" and {baz:"notAllowed"} (mismatched types string and struct): +- ./closedness.cue:32:12 + ./closedness.cue:33:6 + ./closedness.cue:33:17 +- ./closedness.cue:35:7 + ./closedness.cue:36:6 + explicitClose.err1.out.a.baz: field not allowed: + ./closedness.cue:33:6 +- ./closedness.cue:32:12 +- ./closedness.cue:33:24 +- ./closedness.cue:33:30 +- ./closedness.cue:35:7 + ./closedness.cue:36:11 + closedByDefinition.err5.out.exports: invalid value {exp1:"./main-module.js"} (does not satisfy matchN): 0 matched, expected 1: + ./closedness.cue:80:13 +@@ -33,7 +25,6 @@ closedByDefinition.err5.out.exports: conflicting values null and {exp1:"./main-module.js"} (mismatched types null and struct): ./closedness.cue:80:13 ./closedness.cue:80:24 - ./closedness.cue:85:7 ./closedness.cue:86:12 + closedByDefinition.err5.out.exports.exp1: invalid value "./main-module.js" (does not satisfy matchN): 0 matched, expected 1: + ./closedness.cue:81:13 +@@ -41,17 +32,10 @@ + ./closedness.cue:82:26 + ./closedness.cue:86:18 closedByDefinition.err5.out.exports.exp1: conflicting values "./main-module.js" and null (mismatched types string and null): - ./closedness.cue:80:30 ./closedness.cue:81:24 @@ -2364,54 +2398,38 @@ diff old new - ./closedness.cue:82:26 - ./closedness.cue:85:7 ./closedness.cue:86:18 - explicitClose.err1.out.a: conflicting values "all" and {baz:"notAllowed"} (mismatched types string and struct): -- ./closedness.cue:32:12 - ./closedness.cue:33:6 - ./closedness.cue:33:17 -- ./closedness.cue:35:7 - ./closedness.cue:36:6 - incomplete.err1.x.bar: conflicting values 2 and string (mismatched types int and string): - ./incomplete.cue:34:24 -@@ -33,24 +23,17 @@ - ./incomplete.cue:51:25 - ./incomplete.cue:52:11 - match.defaults.pickNested1Err.a: conflicting values 2 and 3: -- ./in.cue:36:23 - ./in.cue:36:38 - ./in.cue:39:23 - match.incompleteErr.a: conflicting values string and int (mismatched types string and int): - ./in.cue:4:5 -- ./in.cue:12:21 -- ./in.cue:12:32 - ./in.cue:14:20 + match.singleErr: invalid value {a:"foo"} (does not satisfy matchN): 0 matched, expected 1: + ./in.cue:8:17 +@@ -59,8 +43,6 @@ + ./in.cue:10:13 match.singleErr.a: conflicting values "foo" and int (mismatched types string and int): ./in.cue:4:5 - ./in.cue:8:17 - ./in.cue:8:28 ./in.cue:10:16 - openArguments.err2.out.a: conflicting values null and {allowed:"once"} (mismatched types null and struct): -- ./closedness.cue:20:12 - ./closedness.cue:21:13 - ./closedness.cue:22:5 -- ./closedness.cue:27:7 - ./closedness.cue:28:6 - openArguments.err2.out.a: invalid value {allowed:"once"} (does not satisfy matchN): 2 matched, expected 1: - ./closedness.cue:21:13 -@@ -62,10 +45,6 @@ - ./closedness.cue:36:6 - explicitClose.err1.out.a.baz: field not allowed: - ./closedness.cue:33:6 -- ./closedness.cue:32:12 -- ./closedness.cue:33:24 -- ./closedness.cue:33:30 -- ./closedness.cue:35:7 - ./closedness.cue:36:11 - closedByDefinition.err5.out.exports: invalid value {exp1:"./main-module.js"} (does not satisfy matchN): 0 matched, expected 1: - ./closedness.cue:80:13 -@@ -167,17 +146,6 @@ + match.incompleteErr: invalid value {a:string} (does not satisfy matchN): 0 matched, expected 1: + ./in.cue:12:21 +@@ -68,8 +50,6 @@ + ./in.cue:14:17 + match.incompleteErr.a: conflicting values string and int (mismatched types string and int): + ./in.cue:4:5 +- ./in.cue:12:21 +- ./in.cue:12:32 + ./in.cue:14:20 + match.defaults.pickNested1Err: invalid value {a:*3 | int} (does not satisfy matchN): 0 matched, expected 1: + ./in.cue:36:23 +@@ -76,7 +56,6 @@ + ./in.cue:36:30 + ./in.cue:39:19 + match.defaults.pickNested1Err.a: conflicting values 2 and 3: +- ./in.cue:36:23 + ./in.cue:36:38 + ./in.cue:39:23 + match.defaults.pickNested2Err: invalid value {a:*3 | int} (does not satisfy matchN): 0 matched, expected 1: +@@ -158,17 +137,6 @@ ./in.cue:106:20 - ./in.cue:106:67 - ./in.cue:109:17 + ./in.cue:106:47 + ./in.cue:110:17 -issue3575.test1.x: invalid value [{a:1}] (does not satisfy matchN): 0 matched, expected 1: - ./in.cue:153:7 - ./in.cue:153:14 @@ -2444,29 +2462,25 @@ diff old new baz: (string){ "allowed" } } } -@@ -272,10 +240,8 @@ - // [eval] - a: (_|_){ - // [eval] openArguments.err2.out.a: conflicting values null and {allowed:"once"} (mismatched types null and struct): +@@ -276,10 +244,8 @@ + // ./closedness.cue:21:20 + // ./closedness.cue:28:6 + // openArguments.err2.out.a: conflicting values null and {allowed:"once"} (mismatched types null and struct): - // ./closedness.cue:20:12 // ./closedness.cue:21:13 // ./closedness.cue:22:5 - // ./closedness.cue:27:7 // ./closedness.cue:28:6 - // openArguments.err2.out.a: invalid value {allowed:"once"} (does not satisfy matchN): 2 matched, expected 1: - // ./closedness.cue:21:13 -@@ -304,10 +270,8 @@ - // [eval] - a: (_|_){ - // [eval] explicitClose.err1.out.a: conflicting values "all" and {baz:"notAllowed"} (mismatched types string and struct): + allowed: (string){ "once" } + } +@@ -308,17 +274,11 @@ + // ./closedness.cue:33:13 + // ./closedness.cue:36:6 + // explicitClose.err1.out.a: conflicting values "all" and {baz:"notAllowed"} (mismatched types string and struct): - // ./closedness.cue:32:12 // ./closedness.cue:33:6 // ./closedness.cue:33:17 - // ./closedness.cue:35:7 - // ./closedness.cue:36:6 - // explicitClose.err1.out.a: invalid value {baz:"notAllowed"} (does not satisfy matchN): 0 matched, expected 1: - // ./closedness.cue:33:6 -@@ -315,10 +279,6 @@ // ./closedness.cue:36:6 // explicitClose.err1.out.a.baz: field not allowed: // ./closedness.cue:33:6 @@ -2504,12 +2518,17 @@ diff old new exp1: (string){ "./main-module.js" } } #exports: (_){ matchN(1, (#list){ -@@ -470,20 +430,12 @@ - // [eval] closedByDefinition.err5.out.exports: conflicting values null and {exp1:"./main-module.js"} (mismatched types null and struct): +@@ -474,7 +434,6 @@ + // closedByDefinition.err5.out.exports: conflicting values null and {exp1:"./main-module.js"} (mismatched types null and struct): // ./closedness.cue:80:13 // ./closedness.cue:80:24 - // ./closedness.cue:85:7 // ./closedness.cue:86:12 + // closedByDefinition.err5.out.exports.exp1: invalid value "./main-module.js" (does not satisfy matchN): 0 matched, expected 1: + // ./closedness.cue:81:13 +@@ -482,17 +441,10 @@ + // ./closedness.cue:82:26 + // ./closedness.cue:86:18 // closedByDefinition.err5.out.exports.exp1: conflicting values "./main-module.js" and null (mismatched types string and null): - // ./closedness.cue:80:30 // ./closedness.cue:81:24 @@ -2523,34 +2542,34 @@ diff old new - // ./closedness.cue:82:26 - // ./closedness.cue:85:7 // ./closedness.cue:86:18 - // closedByDefinition.err5.out.exports: invalid value {exp1:"./main-module.js"} (does not satisfy matchN): 0 matched, expected 1: - // ./closedness.cue:80:13 -@@ -524,8 +476,6 @@ - singleErr: (_|_){ - // [eval] match.singleErr.a: conflicting values "foo" and int (mismatched types string and int): + exp1: (string){ "./main-module.js" } + } +@@ -528,8 +480,6 @@ + // ./in.cue:10:13 + // match.singleErr.a: conflicting values "foo" and int (mismatched types string and int): // ./in.cue:4:5 - // ./in.cue:8:17 - // ./in.cue:8:28 // ./in.cue:10:16 - // match.singleErr: invalid value {a:"foo"} (does not satisfy matchN): 0 matched, expected 1: - // ./in.cue:8:17 -@@ -539,8 +489,6 @@ - incompleteErr: (_|_){ - // [eval] match.incompleteErr.a: conflicting values string and int (mismatched types string and int): + a: (string){ "foo" } + } +@@ -543,8 +493,6 @@ + // ./in.cue:14:17 + // match.incompleteErr.a: conflicting values string and int (mismatched types string and int): // ./in.cue:4:5 - // ./in.cue:12:21 - // ./in.cue:12:32 // ./in.cue:14:20 - // match.incompleteErr: invalid value {a:string} (does not satisfy matchN): 0 matched, expected 1: - // ./in.cue:12:21 -@@ -572,7 +520,6 @@ - } - pickNested1Err: (_|_){ - // [eval] match.defaults.pickNested1Err.a: conflicting values 2 and 3: + a: (string){ string } + } +@@ -576,7 +524,6 @@ + // ./in.cue:36:30 + // ./in.cue:39:19 + // match.defaults.pickNested1Err.a: conflicting values 2 and 3: - // ./in.cue:36:23 // ./in.cue:36:38 // ./in.cue:39:23 - // match.defaults.pickNested1Err: invalid value {a:*3 | int} (does not satisfy matchN): 0 matched, expected 1: + a: (int){ |(*(int){ 3 }, (int){ int }) } @@ -800,10 +747,8 @@ } } diff --git a/cue/testdata/builtins/validators.txtar b/cue/testdata/builtins/validators.txtar index c934a52b36d..b49238882a5 100644 --- a/cue/testdata/builtins/validators.txtar +++ b/cue/testdata/builtins/validators.txtar @@ -223,10 +223,6 @@ Conjuncts: 327 Disjuncts: 202 -- out/evalalpha -- Errors: -issue3474.topValidator.failType.A: conflicting values >10 and {C:1} (mismatched types number and struct): - ./issue3474.cue:53:5 - ./issue3474.cue:53:16 - ./issue3474.cue:54:5 callOfCallToValidator.e: cannot call previously called validator b: ./in.cue:94:5 issue3418.t1: invalid value "foo" (does not satisfy matchN): conflicting values 2 and 1: @@ -275,6 +271,10 @@ issue3474.topValidator.failType.A: invalid value {C:1} (does not satisfy matchN) ./issue3474.cue:53:5 ./issue3474.cue:53:12 ./issue3474.cue:54:5 +issue3474.topValidator.failType.A: conflicting values >10 and {C:1} (mismatched types number and struct): + ./issue3474.cue:53:5 + ./issue3474.cue:53:16 + ./issue3474.cue:54:5 issue3474.topValidator.failType.A: invalid operands {C:1} and 10 to '>' (type _|_ and int): ./issue3474.cue:53:16 ./issue3474.cue:53:5 @@ -489,13 +489,13 @@ Result: failType: (_|_){ // [eval] A: (_|_){ - // [eval] issue3474.topValidator.failType.A: conflicting values >10 and {C:1} (mismatched types number and struct): + // [eval] issue3474.topValidator.failType.A: invalid value {C:1} (does not satisfy matchN): 0 matched, expected 1: // ./issue3474.cue:53:5 - // ./issue3474.cue:53:16 + // ./issue3474.cue:53:12 // ./issue3474.cue:54:5 - // issue3474.topValidator.failType.A: invalid value {C:1} (does not satisfy matchN): 0 matched, expected 1: + // issue3474.topValidator.failType.A: conflicting values >10 and {C:1} (mismatched types number and struct): // ./issue3474.cue:53:5 - // ./issue3474.cue:53:12 + // ./issue3474.cue:53:16 // ./issue3474.cue:54:5 // issue3474.topValidator.failType.A: invalid operands {C:1} and 10 to '>' (type _|_ and int): // ./issue3474.cue:53:16 @@ -552,7 +552,7 @@ Result: diff old new --- old +++ new -@@ -31,7 +31,7 @@ +@@ -27,7 +27,7 @@ ./issue3418.cue:10:16 ./issue3418.cue:10:18 ./issue3418.cue:11:5 @@ -563,7 +563,7 @@ diff old new ./issue3474.cue:13:5 @@ -51,6 +51,11 @@ ./issue3474.cue:53:5 - ./issue3474.cue:53:12 + ./issue3474.cue:53:16 ./issue3474.cue:54:5 +issue3474.topValidator.failType.A: invalid operands {C:1} and 10 to '>' (type _|_ and int): + ./issue3474.cue:53:16 @@ -597,7 +597,7 @@ diff old new // ./issue3474.cue:13:5 @@ -270,6 +273,11 @@ // ./issue3474.cue:53:5 - // ./issue3474.cue:53:12 + // ./issue3474.cue:53:16 // ./issue3474.cue:54:5 + // issue3474.topValidator.failType.A: invalid operands {C:1} and 10 to '>' (type _|_ and int): + // ./issue3474.cue:53:16 @@ -642,10 +642,6 @@ diff old new } -- out/eval -- Errors: -issue3474.topValidator.failType.A: conflicting values >10 and {C:1} (mismatched types number and struct): - ./issue3474.cue:53:5 - ./issue3474.cue:53:16 - ./issue3474.cue:54:5 callOfCallToValidator.e: cannot call previously called validator b: ./in.cue:94:5 issue3418.t1: invalid value "foo" (does not satisfy matchN): conflicting values 2 and 1: @@ -694,6 +690,10 @@ issue3474.topValidator.failType.A: invalid value {C:1} (does not satisfy matchN) ./issue3474.cue:53:5 ./issue3474.cue:53:12 ./issue3474.cue:54:5 +issue3474.topValidator.failType.A: conflicting values >10 and {C:1} (mismatched types number and struct): + ./issue3474.cue:53:5 + ./issue3474.cue:53:16 + ./issue3474.cue:54:5 Result: (_|_){ @@ -905,13 +905,13 @@ Result: failType: (_|_){ // [eval] A: (_|_){ - // [eval] issue3474.topValidator.failType.A: conflicting values >10 and {C:1} (mismatched types number and struct): + // [eval] issue3474.topValidator.failType.A: invalid value {C:1} (does not satisfy matchN): 0 matched, expected 1: // ./issue3474.cue:53:5 - // ./issue3474.cue:53:16 + // ./issue3474.cue:53:12 // ./issue3474.cue:54:5 - // issue3474.topValidator.failType.A: invalid value {C:1} (does not satisfy matchN): 0 matched, expected 1: + // issue3474.topValidator.failType.A: conflicting values >10 and {C:1} (mismatched types number and struct): // ./issue3474.cue:53:5 - // ./issue3474.cue:53:12 + // ./issue3474.cue:53:16 // ./issue3474.cue:54:5 C: (int){ 1 } } diff --git a/cue/testdata/compile/erralias.txtar b/cue/testdata/compile/erralias.txtar index 7a8a15e8465..f8b13e8cc75 100644 --- a/cue/testdata/compile/erralias.txtar +++ b/cue/testdata/compile/erralias.txtar @@ -9,12 +9,12 @@ for x in c {a: E} Z1=[Z2=string]: Z1 + Z2 -- out/compile -- -unreferenced alias or let clause X: - ./in.cue:1:2 a: reference "Y" not found: ./in.cue:4:12 for[].a: reference "E" not found: ./in.cue:7:16 +unreferenced alias or let clause X: + ./in.cue:1:2 --- in.cue { let X#1 = {} diff --git a/cue/testdata/comprehensions/closed.txtar b/cue/testdata/comprehensions/closed.txtar index 95ba5728efd..5e8683dfee2 100644 --- a/cue/testdata/comprehensions/closed.txtar +++ b/cue/testdata/comprehensions/closed.txtar @@ -250,7 +250,7 @@ Result: diff old new --- old +++ new -@@ -1,19 +1,8 @@ +@@ -1,20 +1,9 @@ Errors: disallowed.vErr.d: field not allowed: - ./in.cue:26:6 @@ -259,17 +259,18 @@ diff old new ./in.cue:28:4 - ./in.cue:32:8 ./in.cue:32:14 + noEraseDefinition.a.0.b: field not allowed: +- ./in.cue:54:17 +- ./in.cue:55:7 + ./in.cue:55:17 -issue3486.out.extra: field not allowed: - ./v3issues.cue:10:11 - ./v3issues.cue:12:2 - ./v3issues.cue:14:4 - ./v3issues.cue:16:4 - noEraseDefinition.a.0.b: field not allowed: -- ./in.cue:54:17 -- ./in.cue:55:7 - ./in.cue:55:17 Result: + (_|_){ @@ -50,11 +39,7 @@ // [eval] d: (_|_){ @@ -349,15 +350,15 @@ disallowed.vErr.d: field not allowed: ./in.cue:28:4 ./in.cue:32:8 ./in.cue:32:14 +noEraseDefinition.a.0.b: field not allowed: + ./in.cue:54:17 + ./in.cue:55:7 + ./in.cue:55:17 issue3486.out.extra: field not allowed: ./v3issues.cue:10:11 ./v3issues.cue:12:2 ./v3issues.cue:14:4 ./v3issues.cue:16:4 -noEraseDefinition.a.0.b: field not allowed: - ./in.cue:54:17 - ./in.cue:55:7 - ./in.cue:55:17 Result: (_|_){ diff --git a/cue/testdata/comprehensions/errors.txtar b/cue/testdata/comprehensions/errors.txtar index 714b8e1a9b7..18c3873d71a 100644 --- a/cue/testdata/comprehensions/errors.txtar +++ b/cue/testdata/comprehensions/errors.txtar @@ -55,13 +55,13 @@ Conjuncts: 40 Disjuncts: 29 -- out/evalalpha -- Errors: -conflictRangingOverSelf.x.age: conflicting values int and "age" (mismatched types int and string): - ./in.cue:36:9 - ./in.cue:40:3 circularFor.#list: cannot range over tail != null (found bool, want list or struct): ./in.cue:12:12 intField: integer fields not supported: ./in.cue:27:4 +conflictRangingOverSelf.x.age: conflicting values int and "age" (mismatched types int and string): + ./in.cue:36:9 + ./in.cue:40:3 Result: (_|_){ @@ -106,14 +106,14 @@ Result: diff old new --- old +++ new -@@ -2,7 +2,6 @@ +@@ -6,7 +6,6 @@ conflictRangingOverSelf.x.age: conflicting values int and "age" (mismatched types int and string): ./in.cue:36:9 ./in.cue:40:3 - ./in.cue:41:9 - circularFor.#list: cannot range over tail != null (found bool, want list or struct): - ./in.cue:12:12 - intField: integer fields not supported: + + Result: + (_|_){ @@ -13,9 +12,7 @@ // [eval] circularIf: (struct){ @@ -148,14 +148,14 @@ diff old new Missing error message. -- out/eval -- Errors: -conflictRangingOverSelf.x.age: conflicting values int and "age" (mismatched types int and string): - ./in.cue:36:9 - ./in.cue:40:3 - ./in.cue:41:9 circularFor.#list: cannot range over tail != null (found bool, want list or struct): ./in.cue:12:12 intField: integer fields not supported: ./in.cue:27:4 +conflictRangingOverSelf.x.age: conflicting values int and "age" (mismatched types int and string): + ./in.cue:36:9 + ./in.cue:40:3 + ./in.cue:41:9 Result: (_|_){ diff --git a/cue/testdata/comprehensions/fields.txtar b/cue/testdata/comprehensions/fields.txtar index bdc07e2fc2d..f19e3eb95a1 100644 --- a/cue/testdata/comprehensions/fields.txtar +++ b/cue/testdata/comprehensions/fields.txtar @@ -91,12 +91,12 @@ Disjuncts: 30 c: (string){ string } } y: (_|_){ - // [incomplete] missingRequiredError.y: missing required field in for comprehension: a: + // [incomplete] missingRequiredError.y: key value of dynamic field must be concrete, found _|_(missingRequiredError.y: missing required field in for comprehension: a): + // ./in.cue:34:5 + // missingRequiredError.y: missing required field in for comprehension: a: // ./in.cue:33:3 // ./in.cue:27:3 // ./in.cue:33:14 - // missingRequiredError.y: key value of dynamic field must be concrete, found _|_(missingRequiredError.y: missing required field in for comprehension: a): - // ./in.cue:34:5 } } issue560: (struct){ @@ -123,15 +123,17 @@ Disjuncts: 30 diff old new --- old +++ new -@@ -24,6 +24,8 @@ +@@ -20,7 +20,9 @@ + c: (string){ string } + } + y: (_|_){ +- // [incomplete] missingRequiredError.y: missing required field in for comprehension: a: ++ // [incomplete] missingRequiredError.y: key value of dynamic field must be concrete, found _|_(missingRequiredError.y: missing required field in for comprehension: a): ++ // ./in.cue:34:5 ++ // missingRequiredError.y: missing required field in for comprehension: a: // ./in.cue:33:3 // ./in.cue:27:3 // ./in.cue:33:14 -+ // missingRequiredError.y: key value of dynamic field must be concrete, found _|_(missingRequiredError.y: missing required field in for comprehension: a): -+ // ./in.cue:34:5 - } - } - issue560: (struct){ -- diff/todo/p2 -- Near-duplicate message -- out/eval -- diff --git a/cue/testdata/comprehensions/iferror.txtar b/cue/testdata/comprehensions/iferror.txtar index 45321077649..934cc1b7807 100644 --- a/cue/testdata/comprehensions/iferror.txtar +++ b/cue/testdata/comprehensions/iferror.txtar @@ -158,15 +158,15 @@ Conjuncts: 66 Disjuncts: 57 -- out/evalalpha -- Errors: -issue1972.err1: conflicting values [...{}] and {someCondition:_,patchs:[...{}],patchs,if someCondition {patchs:_}} (mismatched types list and struct): - ./in.cue:61:8 - ./in.cue:63:11 wrongConcreteType: cannot use 2 (type int) as type bool: ./in.cue:4:2 ./in.cue:1:8 wrongType: cannot use int (type int) as type bool: ./in.cue:10:2 ./in.cue:1:14 +issue1972.err1: conflicting values [...{}] and {someCondition:_,patchs:[...{}],patchs,if someCondition {patchs:_}} (mismatched types list and struct): + ./in.cue:61:8 + ./in.cue:63:11 Result: (_|_){ @@ -241,22 +241,17 @@ Result: diff old new --- old +++ new -@@ -1,7 +1,7 @@ - Errors: --issue1972.err1: conflicting values [] and {someCondition:_,patchs:[...{}],patchs,if someCondition {patchs:_}} (mismatched types list and struct): -- ./in.cue:54:12 -+issue1972.err1: conflicting values [...{}] and {someCondition:_,patchs:[...{}],patchs,if someCondition {patchs:_}} (mismatched types list and struct): - ./in.cue:61:8 -+ ./in.cue:63:11 - wrongConcreteType: cannot use 2 (type int) as type bool: - ./in.cue:4:2 - ./in.cue:1:8 -@@ -8,8 +8,6 @@ +@@ -5,11 +5,9 @@ wrongType: cannot use int (type int) as type bool: ./in.cue:10:2 ./in.cue:1:14 -issue1972.err1: invalid list index someCondition (type string): - ./in.cue:65:6 +-issue1972.err1: conflicting values [] and {someCondition:_,patchs:[...{}],patchs,if someCondition {patchs:_}} (mismatched types list and struct): +- ./in.cue:54:12 ++issue1972.err1: conflicting values [...{}] and {someCondition:_,patchs:[...{}],patchs,if someCondition {patchs:_}} (mismatched types list and struct): + ./in.cue:61:8 ++ ./in.cue:63:11 Result: (_|_){ @@ -264,12 +259,12 @@ diff old new issue1972: (_|_){ // [eval] err1: (_|_){ -- // [eval] issue1972.err1: conflicting values [] and {someCondition:_,patchs:[...{}],patchs,if someCondition {patchs:_}} (mismatched types list and struct): +- // [eval] issue1972.err1: invalid list index someCondition (type string): +- // ./in.cue:65:6 +- // issue1972.err1: conflicting values [] and {someCondition:_,patchs:[...{}],patchs,if someCondition {patchs:_}} (mismatched types list and struct): - // ./in.cue:54:12 + // [eval] issue1972.err1: conflicting values [...{}] and {someCondition:_,patchs:[...{}],patchs,if someCondition {patchs:_}} (mismatched types list and struct): // ./in.cue:61:8 -- // issue1972.err1: invalid list index someCondition (type string): -- // ./in.cue:65:6 - #patchs: (#list){ - } - someCondition: (_){ _ } @@ -292,9 +287,6 @@ are already covered by the other error message and should be elided. This may lead to a large number of errors otherwise. -- out/eval -- Errors: -issue1972.err1: conflicting values [] and {someCondition:_,patchs:[...{}],patchs,if someCondition {patchs:_}} (mismatched types list and struct): - ./in.cue:54:12 - ./in.cue:61:8 wrongConcreteType: cannot use 2 (type int) as type bool: ./in.cue:4:2 ./in.cue:1:8 @@ -303,6 +295,9 @@ wrongType: cannot use int (type int) as type bool: ./in.cue:1:14 issue1972.err1: invalid list index someCondition (type string): ./in.cue:65:6 +issue1972.err1: conflicting values [] and {someCondition:_,patchs:[...{}],patchs,if someCondition {patchs:_}} (mismatched types list and struct): + ./in.cue:54:12 + ./in.cue:61:8 Result: (_|_){ @@ -359,11 +354,11 @@ Result: issue1972: (_|_){ // [eval] err1: (_|_){ - // [eval] issue1972.err1: conflicting values [] and {someCondition:_,patchs:[...{}],patchs,if someCondition {patchs:_}} (mismatched types list and struct): + // [eval] issue1972.err1: invalid list index someCondition (type string): + // ./in.cue:65:6 + // issue1972.err1: conflicting values [] and {someCondition:_,patchs:[...{}],patchs,if someCondition {patchs:_}} (mismatched types list and struct): // ./in.cue:54:12 // ./in.cue:61:8 - // issue1972.err1: invalid list index someCondition (type string): - // ./in.cue:65:6 #patchs: (#list){ } someCondition: (_){ _ } diff --git a/cue/testdata/comprehensions/issue293.txtar b/cue/testdata/comprehensions/issue293.txtar index 2006d9f01b6..afbd6ef545a 100644 --- a/cue/testdata/comprehensions/issue293.txtar +++ b/cue/testdata/comprehensions/issue293.txtar @@ -42,10 +42,10 @@ Conjuncts: 33 Disjuncts: 20 -- out/evalalpha -- Errors: -#V1.x.f2: field not allowed: - ./variant1.cue:3:5 z.x.f2: field not allowed: ./in.cue:14:3 +#V1.x.f2: field not allowed: + ./variant1.cue:3:5 Result: (_|_){ @@ -90,14 +90,14 @@ diff old new +++ new @@ -1,11 +1,7 @@ Errors: - #V1.x.f2: field not allowed: -- ./variant1.cue:2:11 - ./variant1.cue:3:5 z.x.f2: field not allowed: - ./in.cue:2:2 - ./in.cue:5:12 - ./in.cue:11:4 ./in.cue:14:3 + #V1.x.f2: field not allowed: +- ./variant1.cue:2:11 + ./variant1.cue:3:5 Result: @@ -23,9 +19,6 @@ @@ -130,14 +130,14 @@ Missing positions Reordering -- out/eval -- Errors: -#V1.x.f2: field not allowed: - ./variant1.cue:2:11 - ./variant1.cue:3:5 z.x.f2: field not allowed: ./in.cue:2:2 ./in.cue:5:12 ./in.cue:11:4 ./in.cue:14:3 +#V1.x.f2: field not allowed: + ./variant1.cue:2:11 + ./variant1.cue:3:5 Result: (_|_){ diff --git a/cue/testdata/comprehensions/issue837.txtar b/cue/testdata/comprehensions/issue837.txtar index 6e01257d8bb..92bc1c7a1fe 100644 --- a/cue/testdata/comprehensions/issue837.txtar +++ b/cue/testdata/comprehensions/issue837.txtar @@ -192,9 +192,9 @@ diff old new +++ new @@ -1,8 +1,4 @@ Errors: --#Configure.service.description.role: undefined field: role: -- ./in.cue:40:19 -#DoDeploy.deployment.description.service.description.role: undefined field: role: +- ./in.cue:40:19 +-#Configure.service.description.role: undefined field: role: - ./in.cue:40:19 #RelabelService.out.labstr: undefined field: label: ./in.cue:51:14 @@ -413,10 +413,10 @@ Conjuncts: 243 Disjuncts: 170 -- out/eval -- Errors: -#Configure.service.description.role: undefined field: role: - ./in.cue:40:19 #DoDeploy.deployment.description.service.description.role: undefined field: role: ./in.cue:40:19 +#Configure.service.description.role: undefined field: role: + ./in.cue:40:19 #RelabelService.out.labstr: undefined field: label: ./in.cue:51:14 diff --git a/cue/testdata/comprehensions/pushdown.txtar b/cue/testdata/comprehensions/pushdown.txtar index ed49825c9c4..dd7b2b41bec 100644 --- a/cue/testdata/comprehensions/pushdown.txtar +++ b/cue/testdata/comprehensions/pushdown.txtar @@ -932,20 +932,20 @@ embed.fail1.p: field not allowed: ./in.cue:49:9 embed.fail4.p: field not allowed: ./in.cue:87:4 -issue3535.regular.foo.regular: field not allowed: - ./issue3535.cue:22:4 -issue3729.withoutDisjunction.root.#sub1.#sub2: conflicting values null and {#sub1?:{#sub2:true}} (mismatched types null and struct): - ./issue3729.cue:9:9 - ./issue3729.cue:11:9 +fieldMismatch.a: cannot combine regular field "x" with 2: + ./in.cue:152:7 + ./in.cue:150:3 noStackOverflowStructCycle.#list.tail: structural cycle noStackOverflowStructCycle.list.tail: structural cycle provideIncompleteSuccess.t2.a.c.d: field not allowed: ./in.cue:203:8 structShare.err1.x.d.e: field not allowed: ./in.cue:591:9 -fieldMismatch.a: cannot combine regular field "x" with 2: - ./in.cue:152:7 - ./in.cue:150:3 +issue3535.regular.foo.regular: field not allowed: + ./issue3535.cue:22:4 +issue3729.withoutDisjunction.root.#sub1.#sub2: conflicting values null and {#sub1?:{#sub2:true}} (mismatched types null and struct): + ./issue3729.cue:9:9 + ./issue3729.cue:11:9 Result: (_|_){ @@ -1783,7 +1783,7 @@ Result: diff old new --- old +++ new -@@ -1,39 +1,19 @@ +@@ -1,16 +1,8 @@ Errors: embed.fail1.p: field not allowed: - ./in.cue:37:9 @@ -1798,17 +1798,9 @@ diff old new - ./in.cue:84:9 - ./in.cue:85:3 ./in.cue:87:4 - issue3535.regular.foo.regular: field not allowed: -- ./issue3535.cue:15:6 -- ./issue3535.cue:19:7 -- ./issue3535.cue:19:12 -- ./issue3535.cue:21:3 - ./issue3535.cue:22:4 -- ./issue3535.cue:25:7 - issue3729.withoutDisjunction.root.#sub1.#sub2: conflicting values null and {#sub1?:{#sub2:true}} (mismatched types null and struct): - ./issue3729.cue:9:9 -- ./issue3729.cue:10:2 - ./issue3729.cue:11:9 + fieldMismatch.a: cannot combine regular field "x" with 2: + ./in.cue:152:7 +@@ -18,25 +10,13 @@ noStackOverflowStructCycle.#list.tail: structural cycle noStackOverflowStructCycle.list.tail: structural cycle provideIncompleteSuccess.t2.a.c.d: field not allowed: @@ -1821,8 +1813,19 @@ diff old new - ./in.cue:589:9 - ./in.cue:590:2 ./in.cue:591:9 - fieldMismatch.a: cannot combine regular field "x" with 2: - ./in.cue:152:7 + issue3535.regular.foo.regular: field not allowed: +- ./issue3535.cue:15:6 +- ./issue3535.cue:19:7 +- ./issue3535.cue:19:12 +- ./issue3535.cue:21:3 + ./issue3535.cue:22:4 +- ./issue3535.cue:25:7 + issue3729.withoutDisjunction.root.#sub1.#sub2: conflicting values null and {#sub1?:{#sub2:true}} (mismatched types null and struct): + ./issue3729.cue:9:9 +- ./issue3729.cue:10:2 + ./issue3729.cue:11:9 + + Result: @@ -79,8 +59,8 @@ } fail: (struct){ @@ -2181,17 +2184,9 @@ embed.fail4.p: field not allowed: ./in.cue:84:9 ./in.cue:85:3 ./in.cue:87:4 -issue3535.regular.foo.regular: field not allowed: - ./issue3535.cue:15:6 - ./issue3535.cue:19:7 - ./issue3535.cue:19:12 - ./issue3535.cue:21:3 - ./issue3535.cue:22:4 - ./issue3535.cue:25:7 -issue3729.withoutDisjunction.root.#sub1.#sub2: conflicting values null and {#sub1?:{#sub2:true}} (mismatched types null and struct): - ./issue3729.cue:9:9 - ./issue3729.cue:10:2 - ./issue3729.cue:11:9 +fieldMismatch.a: cannot combine regular field "x" with 2: + ./in.cue:152:7 + ./in.cue:150:3 noStackOverflowStructCycle.#list.tail: structural cycle noStackOverflowStructCycle.list.tail: structural cycle provideIncompleteSuccess.t2.a.c.d: field not allowed: @@ -2204,9 +2199,17 @@ structShare.err1.x.d.e: field not allowed: ./in.cue:589:9 ./in.cue:590:2 ./in.cue:591:9 -fieldMismatch.a: cannot combine regular field "x" with 2: - ./in.cue:152:7 - ./in.cue:150:3 +issue3535.regular.foo.regular: field not allowed: + ./issue3535.cue:15:6 + ./issue3535.cue:19:7 + ./issue3535.cue:19:12 + ./issue3535.cue:21:3 + ./issue3535.cue:22:4 + ./issue3535.cue:25:7 +issue3729.withoutDisjunction.root.#sub1.#sub2: conflicting values null and {#sub1?:{#sub2:true}} (mismatched types null and struct): + ./issue3729.cue:9:9 + ./issue3729.cue:10:2 + ./issue3729.cue:11:9 Result: (_|_){ diff --git a/cue/testdata/cycle/023_reentrance.txtar b/cue/testdata/cycle/023_reentrance.txtar index 3be0192d110..d99a75e41d0 100644 --- a/cue/testdata/cycle/023_reentrance.txtar +++ b/cue/testdata/cycle/023_reentrance.txtar @@ -149,9 +149,9 @@ diff old new structural cycle: ./in.cue:3:25 -structural cycle: -- ./in.cue:8:9 --structural cycle: - ./in.cue:8:38 +-structural cycle: +- ./in.cue:8:9 Result: (_|_){ @@ -172,19 +172,21 @@ diff old new } fib7: (_|_){ // [structural cycle] structural cycle: - // ./in.cue:3:25 -- // structural cycle: - // ./in.cue:8:9 - // structural cycle: +- // ./in.cue:3:25 +- // structural cycle: - // ./in.cue:8:38 ++ // ./in.cue:3:25 } fib12: (_|_){ // [structural cycle] structural cycle: - // ./in.cue:3:25 -- // structural cycle: - // ./in.cue:8:9 - // structural cycle: +- // ./in.cue:3:25 +- // structural cycle: - // ./in.cue:8:38 ++ // ./in.cue:3:25 } } -- diff/todo/p3 -- @@ -203,10 +205,10 @@ Disjuncts: 268 Errors: structural cycle: ./in.cue:3:25 -structural cycle: - ./in.cue:8:9 structural cycle: ./in.cue:8:38 +structural cycle: + ./in.cue:8:9 Result: (_|_){ @@ -243,18 +245,18 @@ Result: } fib7: (_|_){ // [structural cycle] structural cycle: - // ./in.cue:3:25 - // structural cycle: // ./in.cue:8:9 // structural cycle: + // ./in.cue:3:25 + // structural cycle: // ./in.cue:8:38 } fib12: (_|_){ // [structural cycle] structural cycle: - // ./in.cue:3:25 - // structural cycle: // ./in.cue:8:9 // structural cycle: + // ./in.cue:3:25 + // structural cycle: // ./in.cue:8:38 } } diff --git a/cue/testdata/cycle/builtins.txtar b/cue/testdata/cycle/builtins.txtar index 3eaee8a59a5..b43aaa81b3f 100644 --- a/cue/testdata/cycle/builtins.txtar +++ b/cue/testdata/cycle/builtins.txtar @@ -298,16 +298,16 @@ Conjuncts: 821 Disjuncts: 537 -- out/evalalpha -- Errors: -noCycle.t1.#x: invalid value {} (does not satisfy matchN): 0 matched, expected 1: +noCycle.t1._s.#x: invalid value {} (does not satisfy matchN): 0 matched, expected 1: ./cycle.cue:4:7 ./cycle.cue:4:14 ./cycle.cue:5:13 -noCycle.t1.#x.#x: structural cycle: - ./cycle.cue:4:7 -noCycle.t1._s.#x: invalid value {} (does not satisfy matchN): 0 matched, expected 1: +noCycle.t1.#x: invalid value {} (does not satisfy matchN): 0 matched, expected 1: ./cycle.cue:4:7 ./cycle.cue:4:14 ./cycle.cue:5:13 +noCycle.t1.#x.#x: structural cycle: + ./cycle.cue:4:7 issue3649.cycle.t1.data.a: invalid value {b:"foo"} (does not satisfy matchN): 0 matched, expected 1: ./cycle.cue:31:6 ./cycle.cue:28:11 @@ -375,10 +375,10 @@ selfCycle.yamlVal.t2.x.y: invalid value "{}" (does not satisfy encoding/yaml.Val ./yamlcycle.cue:31:8 ./yamlcycle.cue:32:8 ./yamlcycle.cue:33:8 -selfCycle.yamlFun.t2.x.y: error in call to encoding/yaml.Validate: structural cycle: - ./yamlcycle.cue:41:8 selfCycle.yamlFun.t2.z.y: error in call to encoding/yaml.Validate: structural cycle: ./yamlcycle.cue:41:8 +selfCycle.yamlFun.t2.x.y: error in call to encoding/yaml.Validate: structural cycle: + ./yamlcycle.cue:41:8 selfCycle.yamlValidatePartial.x.y: invalid value "{}" (does not satisfy encoding/yaml.ValidatePartial): error in call to encoding/yaml.ValidatePartial: structural cycle: ./yamlcycle.cue:44:8 ./yamlcycle.cue:45:8 @@ -861,17 +861,15 @@ diff old new ./cycle.cue:4:7 ./cycle.cue:4:14 ./cycle.cue:5:13 --noCycle.t1.#x.#x: invalid value {} (does not satisfy matchN): 0 matched, expected 1: +-noCycle.t1._s.#x.#x: invalid value {} (does not satisfy matchN): 0 matched, expected 1: - ./cycle.cue:4:7 - ./cycle.cue:4:14 - ./cycle.cue:5:13 -+noCycle.t1.#x.#x: structural cycle: -+ ./cycle.cue:4:7 - noCycle.t1._s.#x: invalid value {} (does not satisfy matchN): 0 matched, expected 1: + noCycle.t1.#x: invalid value {} (does not satisfy matchN): 0 matched, expected 1: ./cycle.cue:4:7 ./cycle.cue:4:14 ./cycle.cue:5:13 --noCycle.t1._s.#x.#x: invalid value {} (does not satisfy matchN): 0 matched, expected 1: +-noCycle.t1.#x.#x: invalid value {} (does not satisfy matchN): 0 matched, expected 1: - ./cycle.cue:4:7 - ./cycle.cue:4:14 - ./cycle.cue:5:13 @@ -879,6 +877,8 @@ diff old new - ./jsoncycle.cue:4:22 -listMatchN.structCycle.x.y.y: structural cycle: - ./listmatchncycle.cue:4:23 ++noCycle.t1.#x.#x: structural cycle: ++ ./cycle.cue:4:7 +issue3649.cycle.t1.data.a: invalid value {b:"foo"} (does not satisfy matchN): 0 matched, expected 1: + ./cycle.cue:31:6 + ./cycle.cue:28:11 @@ -941,10 +941,10 @@ diff old new + ./yamlcycle.cue:31:8 + ./yamlcycle.cue:32:8 + ./yamlcycle.cue:33:8 -+selfCycle.yamlFun.t2.x.y: error in call to encoding/yaml.Validate: structural cycle: -+ ./yamlcycle.cue:41:8 +selfCycle.yamlFun.t2.z.y: error in call to encoding/yaml.Validate: structural cycle: + ./yamlcycle.cue:41:8 ++selfCycle.yamlFun.t2.x.y: error in call to encoding/yaml.Validate: structural cycle: ++ ./yamlcycle.cue:41:8 +selfCycle.yamlValidatePartial.x.y: invalid value "{}" (does not satisfy encoding/yaml.ValidatePartial): error in call to encoding/yaml.ValidatePartial: structural cycle: + ./yamlcycle.cue:44:8 + ./yamlcycle.cue:45:8 @@ -1120,23 +1120,15 @@ diff old new n: (struct){ n: (_){ _ } } -@@ -393,13 +432,13 @@ - // ./matchn.cue:63:6 - // ./matchn.cue:62:8 - // ./matchn.cue:63:13 -- // issue3633.final.a: field is required but not present: -- // ./matchn.cue:63:17 -- // ./matchn.cue:63:29 - // issue3633.final.data: invalid value {} (does not satisfy matchN): 0 matched, expected 1: +@@ -397,7 +436,7 @@ // ./matchn.cue:63:17 // ./matchn.cue:62:8 // ./matchn.cue:63:24 +- // issue3633.final.a: field is required but not present: + // issue3633.final.data.a: field is required but not present: -+ // ./matchn.cue:63:17 -+ // ./matchn.cue:63:29 + // ./matchn.cue:63:17 + // ./matchn.cue:63:29 } - #s: (_){ matchN(1, (#list){ - 0: (_|_){// matchN(1, [ @@ -417,8 +456,8 @@ a?: ((string|bytes)){ "encoding/yaml".Validate(yamlNoCycle.#c) } } @@ -1260,19 +1252,19 @@ diff old new issue3443: Sort out differences in reporting of cycles. -- out/eval -- Errors: -noCycle.t1.#x: invalid value {} (does not satisfy matchN): 0 matched, expected 1: +noCycle.t1._s.#x: invalid value {} (does not satisfy matchN): 0 matched, expected 1: ./cycle.cue:4:7 ./cycle.cue:4:14 ./cycle.cue:5:13 -noCycle.t1.#x.#x: invalid value {} (does not satisfy matchN): 0 matched, expected 1: +noCycle.t1._s.#x.#x: invalid value {} (does not satisfy matchN): 0 matched, expected 1: ./cycle.cue:4:7 ./cycle.cue:4:14 ./cycle.cue:5:13 -noCycle.t1._s.#x: invalid value {} (does not satisfy matchN): 0 matched, expected 1: +noCycle.t1.#x: invalid value {} (does not satisfy matchN): 0 matched, expected 1: ./cycle.cue:4:7 ./cycle.cue:4:14 ./cycle.cue:5:13 -noCycle.t1._s.#x.#x: invalid value {} (does not satisfy matchN): 0 matched, expected 1: +noCycle.t1.#x.#x: invalid value {} (does not satisfy matchN): 0 matched, expected 1: ./cycle.cue:4:7 ./cycle.cue:4:14 ./cycle.cue:5:13 @@ -1654,13 +1646,13 @@ Result: // ./matchn.cue:63:6 // ./matchn.cue:62:8 // ./matchn.cue:63:13 - // issue3633.final.a: field is required but not present: - // ./matchn.cue:63:17 - // ./matchn.cue:63:29 // issue3633.final.data: invalid value {} (does not satisfy matchN): 0 matched, expected 1: // ./matchn.cue:63:17 // ./matchn.cue:62:8 // ./matchn.cue:63:24 + // issue3633.final.a: field is required but not present: + // ./matchn.cue:63:17 + // ./matchn.cue:63:29 } #s: (_){ matchN(1, (#list){ 0: (_|_){// matchN(1, [ diff --git a/cue/testdata/cycle/chain.txtar b/cue/testdata/cycle/chain.txtar index 0ddaca59ca4..04e9fa2928f 100644 --- a/cue/testdata/cycle/chain.txtar +++ b/cue/testdata/cycle/chain.txtar @@ -462,7 +462,7 @@ issue2052: full: { #funcs: (_|_){ // [incomplete] issue2052.full.#RecurseN: error in call to list.Range: non-concrete value _: // ./issue2052.cue:111:15 - // issue2052.full.#RecurseN.#funcs: invalid interpolation: non-concrete value _ (type _): + // issue2052.full.#RecurseN.#funcs: key value of dynamic field must be concrete, found _|_(invalid interpolation: issue2052.full.#RecurseN.#funcs: non-concrete value _ (type _)): // ./issue2052.cue:117:11 } } @@ -1152,7 +1152,7 @@ diff old new + #funcs: (_|_){ + // [incomplete] issue2052.full.#RecurseN: error in call to list.Range: non-concrete value _: + // ./issue2052.cue:111:15 -+ // issue2052.full.#RecurseN.#funcs: invalid interpolation: non-concrete value _ (type _): ++ // issue2052.full.#RecurseN.#funcs: key value of dynamic field must be concrete, found _|_(invalid interpolation: issue2052.full.#RecurseN.#funcs: non-concrete value _ (type _)): + // ./issue2052.cue:117:11 } } diff --git a/cue/testdata/cycle/compbottom2.txtar b/cue/testdata/cycle/compbottom2.txtar index e5653a29843..5fe2dccc5e8 100644 --- a/cue/testdata/cycle/compbottom2.txtar +++ b/cue/testdata/cycle/compbottom2.txtar @@ -596,10 +596,10 @@ Disjuncts: 302 } } doubleAddfail: (_|_){ - // [incomplete] nestedChain.doubleAddfail.#E.y: cyclic reference to field y: - // ./nestedchain.cue:25:3 - // nestedChain.doubleAddfail.#E.x: cyclic reference to field x: + // [incomplete] nestedChain.doubleAddfail.#E.x: cyclic reference to field x: // ./nestedchain.cue:28:3 + // nestedChain.doubleAddfail.#E.y: cyclic reference to field y: + // ./nestedchain.cue:25:3 #E: (#struct){ } } @@ -715,10 +715,10 @@ diff old new doubleAddfail: (_|_){ - // [cycle] nestedChain.doubleAddfail: cycle with field #E.y: - // ./nestedchain.cue:28:6 -+ // [incomplete] nestedChain.doubleAddfail.#E.y: cyclic reference to field y: -+ // ./nestedchain.cue:25:3 -+ // nestedChain.doubleAddfail.#E.x: cyclic reference to field x: ++ // [incomplete] nestedChain.doubleAddfail.#E.x: cyclic reference to field x: + // ./nestedchain.cue:28:3 ++ // nestedChain.doubleAddfail.#E.y: cyclic reference to field y: ++ // ./nestedchain.cue:25:3 + #E: (#struct){ + } } diff --git a/cue/testdata/cycle/constraints.txtar b/cue/testdata/cycle/constraints.txtar index b13f6e14859..ad8ab2f01cb 100644 --- a/cue/testdata/cycle/constraints.txtar +++ b/cue/testdata/cycle/constraints.txtar @@ -588,15 +588,15 @@ Conjuncts: 399 Disjuncts: 213 -- out/evalalpha -- Errors: -brokenRing.t1.p1.T.b: structural cycle -cyclicRing.t1.T.b: structural cycle -mutuallyTriggeringCycle.t1.x.c.b.b.b.b.b: structural cycle noCancelSelfInvoke.t1.x.c.b.b: structural cycle noCancelSelfInvoke.t1.x.c.c: structural cycle -selfTriggerCycle.issue1503.#T.a.b.link: structural cycle -selfTriggerCycle.long1.a.c.b.c.b.c.b: structural cycle selfTriggerCycle.t1.#T.b.b: structural cycle selfTriggerCycle.t2.b.c.a: structural cycle +selfTriggerCycle.long1.a.c.b.c.b.c.b: structural cycle +selfTriggerCycle.issue1503.#T.a.b.link: structural cycle +mutuallyTriggeringCycle.t1.x.c.b.b.b.b.b: structural cycle +brokenRing.t1.p1.T.b: structural cycle +cyclicRing.t1.T.b: structural cycle Result: (_|_){ @@ -1015,22 +1015,23 @@ Result: diff old new --- old +++ new -@@ -1,12 +1,11 @@ +@@ -1,13 +1,12 @@ Errors: - brokenRing.t1.p1.T.b: structural cycle --cyclicRing.t1.D.a.b: structural cycle - cyclicRing.t1.T.b: structural cycle --mutuallyTriggeringCycle.t1.x.c.b.b.b.b: structural cycle --noCancelSelfInvoke.t1.x.c.b.b.b: structural cycle -+mutuallyTriggeringCycle.t1.x.c.b.b.b.b.b: structural cycle +noCancelSelfInvoke.t1.x.c.b.b: structural cycle noCancelSelfInvoke.t1.x.c.c: structural cycle - selfTriggerCycle.issue1503.#T.a.b.link: structural cycle --selfTriggerCycle.long1.a.c.b.c.b.c.b.c.b: structural cycle -+selfTriggerCycle.long1.a.c.b.c.b.c.b: structural cycle +-noCancelSelfInvoke.t1.x.c.b.b.b: structural cycle selfTriggerCycle.t1.#T.b.b: structural cycle selfTriggerCycle.t2.b.c.a: structural cycle +-selfTriggerCycle.long1.a.c.b.c.b.c.b.c.b: structural cycle ++selfTriggerCycle.long1.a.c.b.c.b.c.b: structural cycle + selfTriggerCycle.issue1503.#T.a.b.link: structural cycle +-mutuallyTriggeringCycle.t1.x.c.b.b.b.b: structural cycle ++mutuallyTriggeringCycle.t1.x.c.b.b.b.b.b: structural cycle + brokenRing.t1.p1.T.b: structural cycle +-cyclicRing.t1.D.a.b: structural cycle + cyclicRing.t1.T.b: structural cycle + Result: @@ -152,18 +151,10 @@ #D: (#struct){ } @@ -1205,16 +1206,16 @@ diff old new selfTriggerCycle.t1.a.b.b: cycle detected slightly too late -- out/eval -- Errors: -brokenRing.t1.p1.T.b: structural cycle -cyclicRing.t1.D.a.b: structural cycle -cyclicRing.t1.T.b: structural cycle -mutuallyTriggeringCycle.t1.x.c.b.b.b.b: structural cycle -noCancelSelfInvoke.t1.x.c.b.b.b: structural cycle noCancelSelfInvoke.t1.x.c.c: structural cycle -selfTriggerCycle.issue1503.#T.a.b.link: structural cycle -selfTriggerCycle.long1.a.c.b.c.b.c.b.c.b: structural cycle +noCancelSelfInvoke.t1.x.c.b.b.b: structural cycle selfTriggerCycle.t1.#T.b.b: structural cycle selfTriggerCycle.t2.b.c.a: structural cycle +selfTriggerCycle.long1.a.c.b.c.b.c.b.c.b: structural cycle +selfTriggerCycle.issue1503.#T.a.b.link: structural cycle +mutuallyTriggeringCycle.t1.x.c.b.b.b.b: structural cycle +brokenRing.t1.p1.T.b: structural cycle +cyclicRing.t1.D.a.b: structural cycle +cyclicRing.t1.T.b: structural cycle Result: (_|_){ diff --git a/cue/testdata/cycle/disjunction.txtar b/cue/testdata/cycle/disjunction.txtar index 6beadaed39c..6d281311443 100644 --- a/cue/testdata/cycle/disjunction.txtar +++ b/cue/testdata/cycle/disjunction.txtar @@ -141,14 +141,14 @@ Result: } -- out/evalalpha -- Errors: -cycle.a: structural cycle issue3042.data: 2 errors in empty disjunction: -issue3042.data: conflicting values [...#nesting] and {secret:{infra:[{name:"bar1"}]}} (mismatched types list and struct): - ./issue3042.cue:5:57 - ./issue3042.cue:7:19 issue3042.data: conflicting values string and {secret:{infra:[{name:"bar1"}]}} (mismatched types string and struct): ./issue3042.cue:5:12 ./issue3042.cue:7:19 +issue3042.data: conflicting values [...#nesting] and {secret:{infra:[{name:"bar1"}]}} (mismatched types list and struct): + ./issue3042.cue:5:57 + ./issue3042.cue:7:19 +cycle.a: structural cycle Result: (_|_){ @@ -216,12 +216,12 @@ Result: }) } data: (_|_){ // [eval] issue3042.data: 2 errors in empty disjunction: - // issue3042.data: conflicting values [...#nesting] and {secret:{infra:[{name:"bar1"}]}} (mismatched types list and struct): - // ./issue3042.cue:5:57 - // ./issue3042.cue:7:19 // issue3042.data: conflicting values string and {secret:{infra:[{name:"bar1"}]}} (mismatched types string and struct): // ./issue3042.cue:5:12 // ./issue3042.cue:7:19 + // issue3042.data: conflicting values [...#nesting] and {secret:{infra:[{name:"bar1"}]}} (mismatched types list and struct): + // ./issue3042.cue:5:57 + // ./issue3042.cue:7:19 secret: (struct){ infra: (list){ list } } @@ -234,14 +234,14 @@ diff old new +++ new @@ -1,9 +1,16 @@ Errors: - cycle.a: structural cycle +issue3042.data: 2 errors in empty disjunction: -+issue3042.data: conflicting values [...#nesting] and {secret:{infra:[{name:"bar1"}]}} (mismatched types list and struct): -+ ./issue3042.cue:5:57 -+ ./issue3042.cue:7:19 +issue3042.data: conflicting values string and {secret:{infra:[{name:"bar1"}]}} (mismatched types string and struct): + ./issue3042.cue:5:12 + ./issue3042.cue:7:19 ++issue3042.data: conflicting values [...#nesting] and {secret:{infra:[{name:"bar1"}]}} (mismatched types list and struct): ++ ./issue3042.cue:5:57 ++ ./issue3042.cue:7:19 + cycle.a: structural cycle Result: (_|_){ @@ -272,12 +272,12 @@ diff old new - name?: (string){ =~"^foo" } + data: (_|_){ + // [eval] issue3042.data: 2 errors in empty disjunction: -+ // issue3042.data: conflicting values [...#nesting] and {secret:{infra:[{name:"bar1"}]}} (mismatched types list and struct): -+ // ./issue3042.cue:5:57 -+ // ./issue3042.cue:7:19 + // issue3042.data: conflicting values string and {secret:{infra:[{name:"bar1"}]}} (mismatched types string and struct): + // ./issue3042.cue:5:12 + // ./issue3042.cue:7:19 ++ // issue3042.data: conflicting values [...#nesting] and {secret:{infra:[{name:"bar1"}]}} (mismatched types list and struct): ++ // ./issue3042.cue:5:57 ++ // ./issue3042.cue:7:19 + secret: (struct){ + infra: (list){ list } } diff --git a/cue/testdata/cycle/evaluate.txtar b/cue/testdata/cycle/evaluate.txtar index 05bb9da6c97..771ad1201bc 100644 --- a/cue/testdata/cycle/evaluate.txtar +++ b/cue/testdata/cycle/evaluate.txtar @@ -159,24 +159,24 @@ Conjuncts: 299 Disjuncts: 192 -- out/evalalpha -- Errors: -closeCycle.c: structural cycle -closeFail.x.b: field not allowed: - ./in.cue:104:6 - ./in.cue:107:5 -letCycleFail.t1.a.c: structural cycle -printCycle.a.X: structural cycle -structCycle.c: structural cycle disjunctionCycle.b: cannot use 1 (type int) as type list: ./in.cue:56:5 ./in.cue:56:9 +letCycleFail.t1.a.c: structural cycle b: structural cycle: ./in.cue:62:6 +closeCycle.c: structural cycle +structCycle.c: structural cycle structural cycle: ./in.cue:85:12 listAddCycle.c: structural cycle: ./in.cue:91:5 listMulCycle.c: structural cycle: ./in.cue:97:5 +closeFail.x.b: field not allowed: + ./in.cue:104:6 + ./in.cue:107:5 +printCycle.a.X: structural cycle Result: (_|_){ @@ -372,44 +372,45 @@ diff old new +++ new @@ -1,33 +1,22 @@ Errors: --closeCycle.a: structural cycle --closeCycle.b.d: structural cycle -+closeCycle.c: structural cycle - closeFail.x.b: field not allowed: - ./in.cue:104:6 -- ./in.cue:105:12 -- ./in.cue:106:6 - ./in.cue:107:5 - letCycleFail.t1.a.c: structural cycle --structCycle.a: structural cycle --structCycle.b.d: structural cycle -disjunctionCycle.a: cannot use 1 (type int) as type list: - ./in.cue:56:5 - ./in.cue:56:9 -+printCycle.a.X: structural cycle -+structCycle.c: structural cycle +-letCycleFail.t1.a.c: structural cycle disjunctionCycle.b: cannot use 1 (type int) as type list: ./in.cue:56:5 ./in.cue:56:9 -disjunctionCycle.c: cannot use 1 (type int) as type list: - ./in.cue:56:5 - ./in.cue:56:9 ++letCycleFail.t1.a.c: structural cycle b: structural cycle: ./in.cue:62:6 +-closeCycle.a: structural cycle +-closeCycle.b.d: structural cycle -closeCycle.c: structural cycle: - ./in.cue:73:15 +-structCycle.a: structural cycle +-structCycle.b.d: structural cycle -structCycle.c: structural cycle: - ./in.cue:79:14 -embedCycle: structural cycle: - ./in.cue:85:11 --printCycle.a.X.X: structural cycle: -- ./in.cue:113:6 ++closeCycle.c: structural cycle ++structCycle.c: structural cycle +structural cycle: + ./in.cue:85:12 +listAddCycle.c: structural cycle: + ./in.cue:91:5 +listMulCycle.c: structural cycle: + ./in.cue:97:5 + closeFail.x.b: field not allowed: + ./in.cue:104:6 +- ./in.cue:105:12 +- ./in.cue:106:6 + ./in.cue:107:5 +-printCycle.a.X.X: structural cycle: +- ./in.cue:113:6 ++printCycle.a.X: structural cycle Result: (_|_){ @@ -622,19 +623,10 @@ embedCycle: technically not a structural cycle, so V3 result is okay or even an improvement. See TODO(dyncyclecheck). -- out/eval -- Errors: -closeCycle.a: structural cycle -closeCycle.b.d: structural cycle -closeFail.x.b: field not allowed: - ./in.cue:104:6 - ./in.cue:105:12 - ./in.cue:106:6 - ./in.cue:107:5 -letCycleFail.t1.a.c: structural cycle -structCycle.a: structural cycle -structCycle.b.d: structural cycle disjunctionCycle.a: cannot use 1 (type int) as type list: ./in.cue:56:5 ./in.cue:56:9 +letCycleFail.t1.a.c: structural cycle disjunctionCycle.b: cannot use 1 (type int) as type list: ./in.cue:56:5 ./in.cue:56:9 @@ -643,12 +635,21 @@ disjunctionCycle.c: cannot use 1 (type int) as type list: ./in.cue:56:9 b: structural cycle: ./in.cue:62:6 +closeCycle.a: structural cycle +closeCycle.b.d: structural cycle closeCycle.c: structural cycle: ./in.cue:73:15 +structCycle.a: structural cycle +structCycle.b.d: structural cycle structCycle.c: structural cycle: ./in.cue:79:14 embedCycle: structural cycle: ./in.cue:85:11 +closeFail.x.b: field not allowed: + ./in.cue:104:6 + ./in.cue:105:12 + ./in.cue:106:6 + ./in.cue:107:5 printCycle.a.X.X: structural cycle: ./in.cue:113:6 diff --git a/cue/testdata/cycle/freeze.txtar b/cue/testdata/cycle/freeze.txtar index abadbd36170..41d1eac13fc 100644 --- a/cue/testdata/cycle/freeze.txtar +++ b/cue/testdata/cycle/freeze.txtar @@ -154,7 +154,7 @@ Disjuncts: 83 Errors: comprehension.t2.err.a: adding field xq not allowed as field set was already referenced: ./comprehension.cue:71:13 -comprehension.t3.err.a: adding field xq not allowed as field set was already referenced: +comprehension.t3.err.a: adding field yq not allowed as field set was already referenced: ./comprehension.cue:82:13 comprehension.moreSpecific.err.a.x: adding field z not allowed as field set was already referenced: ./comprehension.cue:114:9 @@ -244,7 +244,7 @@ Result: err: (_|_){ // [eval] a: (_|_){ - // [eval] comprehension.t3.err.a: adding field xq not allowed as field set was already referenced: + // [eval] comprehension.t3.err.a: adding field yq not allowed as field set was already referenced: // ./comprehension.cue:82:13 x: (int){ 1 } } @@ -308,16 +308,16 @@ diff old new +++ new @@ -1,11 +1,10 @@ Errors: --comprehension.moreSpecific.err.a: field z not allowed by earlier comprehension or reference cycle -comprehension.t1.ok.p0.x: field z not allowed by earlier comprehension or reference cycle -comprehension.t1.ok.p1.x: field z not allowed by earlier comprehension or reference cycle -comprehension.t1.ok.p2.x: field z not allowed by earlier comprehension or reference cycle -comprehension.t2.err.a: field xq not allowed by earlier comprehension or reference cycle -comprehension.t3.err.b: field x not allowed by earlier comprehension or reference cycle -comprehension.t3.err.b: field yq not allowed by earlier comprehension or reference cycle +-comprehension.moreSpecific.err.a: field z not allowed by earlier comprehension or reference cycle +comprehension.t2.err.a: adding field xq not allowed as field set was already referenced: + ./comprehension.cue:71:13 -+comprehension.t3.err.a: adding field xq not allowed as field set was already referenced: ++comprehension.t3.err.a: adding field yq not allowed as field set was already referenced: + ./comprehension.cue:82:13 +comprehension.moreSpecific.err.a.x: adding field z not allowed as field set was already referenced: + ./comprehension.cue:114:9 @@ -412,7 +412,7 @@ diff old new - // [eval] comprehension.t3.err.b: field x not allowed by earlier comprehension or reference cycle - // comprehension.t3.err.b: field yq not allowed by earlier comprehension or reference cycle + a: (_|_){ -+ // [eval] comprehension.t3.err.a: adding field xq not allowed as field set was already referenced: ++ // [eval] comprehension.t3.err.a: adding field yq not allowed as field set was already referenced: + // ./comprehension.cue:82:13 + x: (int){ 1 } + } @@ -443,13 +443,13 @@ v0.7 fixes bugs in v0.6: resolution. -- out/eval -- Errors: -comprehension.moreSpecific.err.a: field z not allowed by earlier comprehension or reference cycle comprehension.t1.ok.p0.x: field z not allowed by earlier comprehension or reference cycle comprehension.t1.ok.p1.x: field z not allowed by earlier comprehension or reference cycle comprehension.t1.ok.p2.x: field z not allowed by earlier comprehension or reference cycle comprehension.t2.err.a: field xq not allowed by earlier comprehension or reference cycle comprehension.t3.err.b: field x not allowed by earlier comprehension or reference cycle comprehension.t3.err.b: field yq not allowed by earlier comprehension or reference cycle +comprehension.moreSpecific.err.a: field z not allowed by earlier comprehension or reference cycle Result: (_|_){ diff --git a/cue/testdata/cycle/inline_non_recursive.txtar b/cue/testdata/cycle/inline_non_recursive.txtar index b52803cd682..92777bdaf1a 100644 --- a/cue/testdata/cycle/inline_non_recursive.txtar +++ b/cue/testdata/cycle/inline_non_recursive.txtar @@ -105,9 +105,9 @@ Conjuncts: 354 Disjuncts: 0 -- out/evalalpha -- Errors: -issue3182.first.t2.x.b: structural cycle structural cycle: ./in.cue:56:8 +issue3182.first.t2.x.b: structural cycle Result: (_|_){ @@ -267,14 +267,13 @@ diff old new diff old new --- old +++ new -@@ -1,5 +1,7 @@ +@@ -1,4 +1,6 @@ Errors: - issue3182.first.t2.x.b: structural cycle +structural cycle: + ./in.cue:56:8 + issue3182.first.t2.x.b: structural cycle Result: - (_|_){ @@ -44,7 +46,8 @@ k20: (int){ 0 } k30: (int){ 0 } diff --git a/cue/testdata/cycle/issue3118.txtar b/cue/testdata/cycle/issue3118.txtar index a00e868dc1f..524a0d7deb2 100644 --- a/cue/testdata/cycle/issue3118.txtar +++ b/cue/testdata/cycle/issue3118.txtar @@ -83,12 +83,12 @@ Disjuncts: 19 // ./in.cue:8:12 } duration: (_|_){ - // [incomplete] #TimeSpan.start: non-concrete value end for bound <=: - // ./in.cue:10:11 - // #TimeSpan.duration: non-concrete value float in operand to -: + // [incomplete] #TimeSpan.duration: non-concrete value float in operand to -: // ./in.cue:7:12 // ./in.cue:4:12 // ./in.cue:8:12 + // #TimeSpan.start: non-concrete value end for bound <=: + // ./in.cue:10:11 } end: (_|_){ // [incomplete] #TimeSpan.start: non-concrete value end for bound <=: @@ -107,9 +107,7 @@ Disjuncts: 19 } eg2: (#struct){ start: (_|_){ - // [incomplete] examples.eg2.start: non-concrete value end for bound <=: - // ./in.cue:10:11 - // examples.eg2.start: non-concrete value float in operand to -: + // [incomplete] examples.eg2.start: non-concrete value float in operand to -: // ./in.cue:6:12 // ./in.cue:4:12 // ./in.cue:8:12 @@ -117,6 +115,8 @@ Disjuncts: 19 // ./in.cue:7:12 // ./in.cue:4:12 // ./in.cue:8:12 + // examples.eg2.start: non-concrete value end for bound <=: + // ./in.cue:10:11 } duration: (_|_){ // [incomplete] examples.eg2.duration: non-concrete value float in operand to -: @@ -133,13 +133,13 @@ Disjuncts: 19 } eg3: (#struct){ end: (_|_){ - // [incomplete] examples.eg3.duration: non-concrete value <=10.0 & float in operand to -: - // ./in.cue:7:12 + // [incomplete] examples.eg3.end: non-concrete value <=10.0 & float in operand to +: + // ./in.cue:8:12 // ./in.cue:2:12 // ./in.cue:6:12 // ./in.cue:10:9 - // examples.eg3.end: non-concrete value <=10.0 & float in operand to +: - // ./in.cue:8:12 + // examples.eg3.duration: non-concrete value <=10.0 & float in operand to -: + // ./in.cue:7:12 // ./in.cue:2:12 // ./in.cue:6:12 // ./in.cue:10:9 @@ -186,12 +186,12 @@ diff old new duration: (_|_){ - // [cycle] cycle error: - // ./in.cue:7:12 -+ // [incomplete] #TimeSpan.start: non-concrete value end for bound <=: -+ // ./in.cue:10:11 -+ // #TimeSpan.duration: non-concrete value float in operand to -: ++ // [incomplete] #TimeSpan.duration: non-concrete value float in operand to -: + // ./in.cue:7:12 + // ./in.cue:4:12 + // ./in.cue:8:12 ++ // #TimeSpan.start: non-concrete value end for bound <=: ++ // ./in.cue:10:11 } end: (_|_){ - // [cycle] cycle error: @@ -203,21 +203,27 @@ diff old new // ./in.cue:8:12 } } -@@ -20,26 +37,56 @@ +@@ -20,36 +37,56 @@ } eg2: (#struct){ start: (_|_){ -- // [cycle] cycle error +- // [cycle] cycle error: +- // ./in.cue:6:12 +- // cycle error: +- // ./in.cue:10:9 - } - duration: (_|_){ - // [cycle] cycle error: - // ./in.cue:7:12 - } - end: (_|_){ -- // [cycle] cycle error -+ // [incomplete] examples.eg2.start: non-concrete value end for bound <=: -+ // ./in.cue:10:11 -+ // examples.eg2.start: non-concrete value float in operand to -: +- // [cycle] cycle error: +- // ./in.cue:6:12 +- // cycle error: +- // ./in.cue:10:9 +- // cycle error: +- // ./in.cue:7:12 ++ // [incomplete] examples.eg2.start: non-concrete value float in operand to -: + // ./in.cue:6:12 + // ./in.cue:4:12 + // ./in.cue:8:12 @@ -225,6 +231,8 @@ diff old new + // ./in.cue:7:12 + // ./in.cue:4:12 + // ./in.cue:8:12 ++ // examples.eg2.start: non-concrete value end for bound <=: ++ // ./in.cue:10:11 + } + duration: (_|_){ + // [incomplete] examples.eg2.duration: non-concrete value float in operand to -: @@ -245,17 +253,19 @@ diff old new - // ./in.cue:8:12 - } - start: (_|_){ -- // [cycle] cycle error +- // [cycle] cycle error: +- // ./in.cue:8:12 - } - duration: (_|_){ -- // [cycle] cycle error -+ // [incomplete] examples.eg3.duration: non-concrete value <=10.0 & float in operand to -: -+ // ./in.cue:7:12 +- // [cycle] cycle error: +- // ./in.cue:8:12 ++ // [incomplete] examples.eg3.end: non-concrete value <=10.0 & float in operand to +: ++ // ./in.cue:8:12 + // ./in.cue:2:12 + // ./in.cue:6:12 + // ./in.cue:10:9 -+ // examples.eg3.end: non-concrete value <=10.0 & float in operand to +: -+ // ./in.cue:8:12 ++ // examples.eg3.duration: non-concrete value <=10.0 & float in operand to -: ++ // ./in.cue:7:12 + // ./in.cue:2:12 + // ./in.cue:6:12 + // ./in.cue:10:9 @@ -299,14 +309,22 @@ diff old new } eg2: (#struct){ start: (_|_){ - // [cycle] cycle error + // [cycle] cycle error: + // ./in.cue:6:12 + // cycle error: + // ./in.cue:10:9 } duration: (_|_){ // [cycle] cycle error: // ./in.cue:7:12 } end: (_|_){ - // [cycle] cycle error + // [cycle] cycle error: + // ./in.cue:6:12 + // cycle error: + // ./in.cue:10:9 + // cycle error: + // ./in.cue:7:12 } } eg3: (#struct){ @@ -315,10 +333,12 @@ diff old new // ./in.cue:8:12 } start: (_|_){ - // [cycle] cycle error + // [cycle] cycle error: + // ./in.cue:8:12 } duration: (_|_){ - // [cycle] cycle error + // [cycle] cycle error: + // ./in.cue:8:12 } } } diff --git a/cue/testdata/cycle/issue429.txtar b/cue/testdata/cycle/issue429.txtar index 942b2e1eb48..009d889c316 100644 --- a/cue/testdata/cycle/issue429.txtar +++ b/cue/testdata/cycle/issue429.txtar @@ -60,21 +60,21 @@ Conjuncts: 150 Disjuncts: 101 -- out/evalalpha -- Errors: -er3.min: 2 errors in empty disjunction: -er3.min: conflicting values 1 and 5: - ./in.cue:28:8 - ./in.cue:44:7 -es3.max: 2 errors in empty disjunction: es3.max: 4 errors in empty disjunction: -es3.max: conflicting values 1 and 5: - ./in.cue:4:16 +es3.max: invalid value 5 (out of bound >10): + ./in.cue:5:7 ./in.cue:22:7 es3.max: conflicting values 10 and 5: ./in.cue:21:7 ./in.cue:22:7 -es3.max: invalid value 5 (out of bound >10): - ./in.cue:5:7 +es3.max: 2 errors in empty disjunction: +es3.max: conflicting values 1 and 5: + ./in.cue:4:16 ./in.cue:22:7 +er3.min: 2 errors in empty disjunction: +er3.min: conflicting values 1 and 5: + ./in.cue:28:8 + ./in.cue:44:7 er3.min: invalid value 5 (out of bound <5): ./in.cue:29:7 ./in.cue:44:7 @@ -111,16 +111,16 @@ Result: // [eval] min: (int){ 10 } max: (_|_){ - // [eval] es3.max: 2 errors in empty disjunction: - // es3.max: 4 errors in empty disjunction: - // es3.max: conflicting values 1 and 5: - // ./in.cue:4:16 + // [eval] es3.max: 4 errors in empty disjunction: + // es3.max: invalid value 5 (out of bound >10): + // ./in.cue:5:7 // ./in.cue:22:7 // es3.max: conflicting values 10 and 5: // ./in.cue:21:7 // ./in.cue:22:7 - // es3.max: invalid value 5 (out of bound >10): - // ./in.cue:5:7 + // es3.max: 2 errors in empty disjunction: + // es3.max: conflicting values 1 and 5: + // ./in.cue:4:16 // ./in.cue:22:7 } res: (int){ |(*(int){ 0 }, (int){ &(>=0, int) }) } @@ -167,28 +167,32 @@ Result: diff old new --- old +++ new -@@ -2,17 +2,13 @@ - er3.min: 2 errors in empty disjunction: - er3.min: conflicting values 1 and 5: - ./in.cue:28:8 -- ./in.cue:43:6 -- ./in.cue:44:7 +@@ -1,22 +1,18 @@ + Errors: -es3.max: 3 errors in empty disjunction: -+ ./in.cue:44:7 -+es3.max: 2 errors in empty disjunction: +es3.max: 4 errors in empty disjunction: - es3.max: conflicting values 1 and 5: - ./in.cue:4:16 -- ./in.cue:5:15 -- ./in.cue:20:6 + es3.max: invalid value 5 (out of bound >10): + ./in.cue:5:7 ./in.cue:22:7 es3.max: conflicting values 10 and 5: - ./in.cue:5:15 - ./in.cue:20:6 ./in.cue:21:7 ./in.cue:22:7 - es3.max: invalid value 5 (out of bound >10): -@@ -36,34 +32,30 @@ ++es3.max: 2 errors in empty disjunction: + es3.max: conflicting values 1 and 5: + ./in.cue:4:16 +- ./in.cue:5:15 +- ./in.cue:20:6 + ./in.cue:22:7 + er3.min: 2 errors in empty disjunction: + er3.min: conflicting values 1 and 5: + ./in.cue:28:8 +- ./in.cue:43:6 + ./in.cue:44:7 + er3.min: invalid value 5 (out of bound <5): + ./in.cue:29:7 +@@ -36,45 +32,40 @@ max: (number){ |(*(int){ 2 }, (number){ >1 }, (number){ >2 }) } } s1: (#struct){ @@ -218,23 +222,24 @@ diff old new min: (int){ 10 } max: (_|_){ - // [eval] es3.max: 3 errors in empty disjunction: -+ // [eval] es3.max: 2 errors in empty disjunction: -+ // es3.max: 4 errors in empty disjunction: - // es3.max: conflicting values 1 and 5: - // ./in.cue:4:16 -- // ./in.cue:5:15 -- // ./in.cue:20:6 ++ // [eval] es3.max: 4 errors in empty disjunction: + // es3.max: invalid value 5 (out of bound >10): + // ./in.cue:5:7 // ./in.cue:22:7 // es3.max: conflicting values 10 and 5: - // ./in.cue:5:15 - // ./in.cue:20:6 // ./in.cue:21:7 // ./in.cue:22:7 - // es3.max: invalid value 5 (out of bound >10): -@@ -70,11 +62,10 @@ - // ./in.cue:5:7 - // ./in.cue:22:7 - } ++ // es3.max: 2 errors in empty disjunction: + // es3.max: conflicting values 1 and 5: + // ./in.cue:4:16 +- // ./in.cue:5:15 +- // ./in.cue:20:6 +- // ./in.cue:22:7 +- } ++ // ./in.cue:22:7 ++ } + res: (int){ |(*(int){ 0 }, (int){ &(>=0, int) }) } } #nonEmptyRange: (#struct){ @@ -297,25 +302,25 @@ Missing empty disjunction message. Missing error positions. -- out/eval -- Errors: -er3.min: 2 errors in empty disjunction: -er3.min: conflicting values 1 and 5: - ./in.cue:28:8 - ./in.cue:43:6 - ./in.cue:44:7 es3.max: 3 errors in empty disjunction: -es3.max: conflicting values 1 and 5: - ./in.cue:4:16 - ./in.cue:5:15 - ./in.cue:20:6 +es3.max: invalid value 5 (out of bound >10): + ./in.cue:5:7 ./in.cue:22:7 es3.max: conflicting values 10 and 5: ./in.cue:5:15 ./in.cue:20:6 ./in.cue:21:7 ./in.cue:22:7 -es3.max: invalid value 5 (out of bound >10): - ./in.cue:5:7 +es3.max: conflicting values 1 and 5: + ./in.cue:4:16 + ./in.cue:5:15 + ./in.cue:20:6 ./in.cue:22:7 +er3.min: 2 errors in empty disjunction: +er3.min: conflicting values 1 and 5: + ./in.cue:28:8 + ./in.cue:43:6 + ./in.cue:44:7 er3.min: invalid value 5 (out of bound <5): ./in.cue:29:7 ./in.cue:44:7 @@ -354,18 +359,18 @@ Result: min: (int){ 10 } max: (_|_){ // [eval] es3.max: 3 errors in empty disjunction: - // es3.max: conflicting values 1 and 5: - // ./in.cue:4:16 - // ./in.cue:5:15 - // ./in.cue:20:6 + // es3.max: invalid value 5 (out of bound >10): + // ./in.cue:5:7 // ./in.cue:22:7 // es3.max: conflicting values 10 and 5: // ./in.cue:5:15 // ./in.cue:20:6 // ./in.cue:21:7 // ./in.cue:22:7 - // es3.max: invalid value 5 (out of bound >10): - // ./in.cue:5:7 + // es3.max: conflicting values 1 and 5: + // ./in.cue:4:16 + // ./in.cue:5:15 + // ./in.cue:20:6 // ./in.cue:22:7 } } diff --git a/cue/testdata/cycle/structural.txtar b/cue/testdata/cycle/structural.txtar index 8d9f5071cd9..c7b538b5363 100644 --- a/cue/testdata/cycle/structural.txtar +++ b/cue/testdata/cycle/structural.txtar @@ -620,29 +620,41 @@ Conjuncts: 1299 Disjuncts: 896 -- out/evalalpha -- Errors: -a1.f.0: structural cycle -a3.f.g: structural cycle -b12b.#list.tail: structural cycle -b13.root.a.0.0: structural cycle -b14.root.b.1.1: structural cycle b4.b.0: conflicting values 1 and [y] (mismatched types int and list): ./in.cue:55:12 ./in.cue:56:8 +resolveToAncestor.t1.X.b: structural cycle +resolveToAncestor.t2.X.b: structural cycle +a1.f.0: structural cycle +a3.f.g: structural cycle +b4.x.y.0: structural cycle b4.cond1.x.y.0: structural cycle b4.cond2.x.y.0: structural cycle -b4.x.y.0: structural cycle b6.b.a.0: conflicting values 1 and [1] (mismatched types int and list): ./in.cue:94:13 ./in.cue:94:14 b6.x.a.0: structural cycle -b7.a.0: structural cycle b7.b.0.0: conflicting values 1 and [a] (mismatched types int and list): ./in.cue:99:11 ./in.cue:100:5 +b7.a.0: structural cycle +b12b.#list.tail: structural cycle +b13.root.a.0.0: structural cycle +b14.root.b.1.1: structural cycle +p2.#T.a.b.link: structural cycle +p3.#U.#T.a.b.link: structural cycle +p5.#T.a.0.link: structural cycle +p6.#U.#T.a.0.link: structural cycle c1.a.c.c: structural cycle d1.r: structural cycle d2.a.b.c.d.t: structural cycle d3.x.indirect: structural cycle +shortPathFail.elipsis.t2.Foo.ref: structural cycle +patternFail.issue2374.a.b: structural cycle +withLetFail.schema.next: structural cycle +3: structural cycle: + ./in.cue:371:9 +issue2545.#B.A: structural cycle e1.a.c: structural cycle e1.b.c: structural cycle e2.a.c: structural cycle @@ -654,9 +666,6 @@ e3.b: conflicting values [b] and {c:b} (mismatched types list and struct): ./in.cue:415:5 ./in.cue:416:5 e4.a.0: 4 errors in empty disjunction: -e4.a.0: conflicting values [{c:1}] and {} (mismatched types list and struct): - ./in.cue:420:10 - ./in.cue:421:6 e4.a.0.0: 2 errors in empty disjunction: e4.a.0.0: conflicting values [{c:1}] and {c:1} (mismatched types list and struct): ./in.cue:421:6 @@ -664,10 +673,10 @@ e4.a.0.0: conflicting values [{c:1}] and {c:1} (mismatched types list and struct e4.a.0.0: conflicting values [{c:1}] and {} (mismatched types list and struct): ./in.cue:420:10 ./in.cue:421:6 +e4.a.0: conflicting values [{c:1}] and {} (mismatched types list and struct): + ./in.cue:420:10 + ./in.cue:421:6 e4.b.0: 4 errors in empty disjunction: -e4.b.0: conflicting values [{c:1}] and {} (mismatched types list and struct): - ./in.cue:423:6 - ./in.cue:424:10 e4.b.0.0: 2 errors in empty disjunction: e4.b.0.0: conflicting values [{c:1}] and {c:1} (mismatched types list and struct): ./in.cue:423:6 @@ -675,39 +684,30 @@ e4.b.0.0: conflicting values [{c:1}] and {c:1} (mismatched types list and struct e4.b.0.0: conflicting values [{c:1}] and {} (mismatched types list and struct): ./in.cue:423:6 ./in.cue:424:10 -issue2545.#B.A: structural cycle +e4.b.0: conflicting values [{c:1}] and {} (mismatched types list and struct): + ./in.cue:423:6 + ./in.cue:424:10 nestedList.v1e.y.0: 4 errors in empty disjunction: -nestedList.v1e.y.0: conflicting values [[2],1] and int (mismatched types list and int): - ./in.cue:438:11 - ./in.cue:439:11 nestedList.v1e.y.0.0: 2 errors in empty disjunction: +nestedList.v1e.y.0.0: incompatible list lengths (1 and 2): + ./in.cue:438:6 nestedList.v1e.y.0.0: conflicting values [2] and int (mismatched types list and int): ./in.cue:438:11 ./in.cue:439:12 +nestedList.v1e.y.0: conflicting values [[2],1] and int (mismatched types list and int): + ./in.cue:438:11 + ./in.cue:439:11 nestedList.v2e.y.0: 4 errors in empty disjunction: -nestedList.v2e.y.0: conflicting values [[2],1] and int (mismatched types list and int): - ./in.cue:443:11 - ./in.cue:444:11 nestedList.v2e.y.0.0: 2 errors in empty disjunction: +nestedList.v2e.y.0.0: incompatible list lengths (1 and 2): + ./in.cue:444:6 nestedList.v2e.y.0.0: conflicting values [2] and int (mismatched types list and int): ./in.cue:443:12 ./in.cue:444:11 -p2.#T.a.b.link: structural cycle -p3.#U.#T.a.b.link: structural cycle -p5.#T.a.0.link: structural cycle -p6.#U.#T.a.0.link: structural cycle -patternFail.issue2374.a.b: structural cycle -resolveToAncestor.t1.X.b: structural cycle -resolveToAncestor.t2.X.b: structural cycle -shortPathFail.elipsis.t2.Foo.ref: structural cycle -withLetFail.schema.next: structural cycle +nestedList.v2e.y.0: conflicting values [[2],1] and int (mismatched types list and int): + ./in.cue:443:11 + ./in.cue:444:11 z1.z.g.h: structural cycle -3: structural cycle: - ./in.cue:371:9 -nestedList.v1e.y.0.0: incompatible list lengths (1 and 2): - ./in.cue:438:6 -nestedList.v2e.y.0.0: incompatible list lengths (1 and 2): - ./in.cue:444:6 Result: (_|_){ @@ -1465,9 +1465,6 @@ Result: // [eval] 0: (_|_){ // [eval] e4.a.0: 4 errors in empty disjunction: - // e4.a.0: conflicting values [{c:1}] and {} (mismatched types list and struct): - // ./in.cue:420:10 - // ./in.cue:421:6 // e4.a.0.0: 2 errors in empty disjunction: // e4.a.0.0: conflicting values [{c:1}] and {c:1} (mismatched types list and struct): // ./in.cue:421:6 @@ -1475,6 +1472,9 @@ Result: // e4.a.0.0: conflicting values [{c:1}] and {} (mismatched types list and struct): // ./in.cue:420:10 // ./in.cue:421:6 + // e4.a.0: conflicting values [{c:1}] and {} (mismatched types list and struct): + // ./in.cue:420:10 + // ./in.cue:421:6 0: (struct){ c: (int){ 1 } } @@ -1484,9 +1484,6 @@ Result: // [eval] 0: (_|_){ // [eval] e4.b.0: 4 errors in empty disjunction: - // e4.b.0: conflicting values [{c:1}] and {} (mismatched types list and struct): - // ./in.cue:423:6 - // ./in.cue:424:10 // e4.b.0.0: 2 errors in empty disjunction: // e4.b.0.0: conflicting values [{c:1}] and {c:1} (mismatched types list and struct): // ./in.cue:423:6 @@ -1494,6 +1491,9 @@ Result: // e4.b.0.0: conflicting values [{c:1}] and {} (mismatched types list and struct): // ./in.cue:423:6 // ./in.cue:424:10 + // e4.b.0: conflicting values [{c:1}] and {} (mismatched types list and struct): + // ./in.cue:423:6 + // ./in.cue:424:10 0: (struct){ c: (int){ 1 } } @@ -1520,15 +1520,15 @@ Result: // [eval] 0: (_|_){ // [eval] nestedList.v1e.y.0: 4 errors in empty disjunction: - // nestedList.v1e.y.0: conflicting values [[2],1] and int (mismatched types list and int): - // ./in.cue:438:11 - // ./in.cue:439:11 // nestedList.v1e.y.0.0: 2 errors in empty disjunction: + // nestedList.v1e.y.0.0: incompatible list lengths (1 and 2): + // ./in.cue:438:6 // nestedList.v1e.y.0.0: conflicting values [2] and int (mismatched types list and int): // ./in.cue:438:11 // ./in.cue:439:12 - // nestedList.v1e.y.0.0: incompatible list lengths (1 and 2): - // ./in.cue:438:6 + // nestedList.v1e.y.0: conflicting values [[2],1] and int (mismatched types list and int): + // ./in.cue:438:11 + // ./in.cue:439:11 0: (list){ list } 1: (int){ 1 } } @@ -1541,15 +1541,15 @@ Result: // [eval] 0: (_|_){ // [eval] nestedList.v2e.y.0: 4 errors in empty disjunction: - // nestedList.v2e.y.0: conflicting values [[2],1] and int (mismatched types list and int): - // ./in.cue:443:11 - // ./in.cue:444:11 // nestedList.v2e.y.0.0: 2 errors in empty disjunction: + // nestedList.v2e.y.0.0: incompatible list lengths (1 and 2): + // ./in.cue:444:6 // nestedList.v2e.y.0.0: conflicting values [2] and int (mismatched types list and int): // ./in.cue:443:12 // ./in.cue:444:11 - // nestedList.v2e.y.0.0: incompatible list lengths (1 and 2): - // ./in.cue:444:6 + // nestedList.v2e.y.0: conflicting values [[2],1] and int (mismatched types list and int): + // ./in.cue:443:11 + // ./in.cue:444:11 0: (list){ list } 1: (int){ 1 } } @@ -1790,38 +1790,61 @@ Result: diff old new --- old +++ new -@@ -4,22 +4,24 @@ - b12b.#list.tail: structural cycle - b13.root.a.0.0: structural cycle - b14.root.b.1.1: structural cycle +@@ -1,11 +1,8 @@ + Errors: +-b6.b.a.0: conflicting values 1 and [1] (mismatched types int and list): +- ./in.cue:94:5 +- ./in.cue:94:13 +- ./in.cue:94:14 +- ./in.cue:95:9 +-resolveToAncestor.t1.X.b: structural cycle: +- ./edge.cue:3:6 +b4.b.0: conflicting values 1 and [y] (mismatched types int and list): + ./in.cue:55:12 + ./in.cue:56:8 ++resolveToAncestor.t1.X.b: structural cycle + resolveToAncestor.t2.X.b: structural cycle + a1.f.0: structural cycle + a3.f.g: structural cycle +@@ -12,8 +9,13 @@ + b4.x.y.0: structural cycle b4.cond1.x.y.0: structural cycle b4.cond2.x.y.0: structural cycle - b4.x.y.0: structural cycle - b6.b.a.0: conflicting values 1 and [1] (mismatched types int and list): -- ./in.cue:94:5 - ./in.cue:94:13 - ./in.cue:94:14 -- ./in.cue:95:9 -b6.b.a.0.0: structural cycle ++b6.b.a.0: conflicting values 1 and [1] (mismatched types int and list): ++ ./in.cue:94:13 ++ ./in.cue:94:14 b6.x.a.0: structural cycle - b7.a.0: structural cycle +b7.b.0.0: conflicting values 1 and [a] (mismatched types int and list): + ./in.cue:99:11 + ./in.cue:100:5 + b7.a.0: structural cycle + b12b.#list.tail: structural cycle + b13.root.a.0.0: structural cycle +@@ -23,17 +25,14 @@ + p5.#T.a.0.link: structural cycle + p6.#U.#T.a.0.link: structural cycle c1.a.c.c: structural cycle -d1.a.b.c.d.t: structural cycle +-d1.r: structural cycle: +- ./in.cue:301:26 +-d2.r.c.d.t: structural cycle +d1.r: structural cycle d2.a.b.c.d.t: structural cycle --d2.r.c.d.t: structural cycle -d3.x.a.b.c: structural cycle +-d3.x.indirect: structural cycle: +- ./in.cue:316:12 +-shortPathFail.elipsis.t2.Foo.ref.ref: structural cycle +d3.x.indirect: structural cycle ++shortPathFail.elipsis.t2.Foo.ref: structural cycle + patternFail.issue2374.a.b: structural cycle + withLetFail.schema.next: structural cycle ++3: structural cycle: ++ ./in.cue:371:9 + issue2545.#B.A: structural cycle e1.a.c: structural cycle e1.b.c: structural cycle - e2.a.c: structural cycle -@@ -27,21 +29,18 @@ +@@ -42,18 +41,15 @@ e3.a: conflicting values [a] and {c:a} (mismatched types list and struct): ./in.cue:412:5 ./in.cue:413:5 @@ -1831,9 +1854,6 @@ diff old new ./in.cue:416:5 -e3.b.c: structural cycle e4.a.0: 4 errors in empty disjunction: - e4.a.0: conflicting values [{c:1}] and {} (mismatched types list and struct): - ./in.cue:420:10 - ./in.cue:421:6 e4.a.0.0: 2 errors in empty disjunction: -e4.a.0.0: conflicting values [[{c:1}]] and {c:1} (mismatched types list and struct): - ./in.cue:421:5 @@ -1844,10 +1864,10 @@ diff old new - ./in.cue:420:6 ./in.cue:420:10 ./in.cue:421:6 + e4.a.0: conflicting values [{c:1}] and {} (mismatched types list and struct): +@@ -61,12 +57,11 @@ + ./in.cue:421:6 e4.b.0: 4 errors in empty disjunction: -@@ -49,48 +48,45 @@ - ./in.cue:423:6 - ./in.cue:424:10 e4.b.0.0: 2 errors in empty disjunction: -e4.b.0.0: conflicting values [(b|{})] and {c:1} (mismatched types list and struct): +e4.b.0.0: conflicting values [{c:1}] and {c:1} (mismatched types list and struct): @@ -1858,56 +1878,40 @@ diff old new ./in.cue:423:6 - ./in.cue:424:6 ./in.cue:424:10 - issue2545.#B.A: structural cycle + e4.b.0: conflicting values [{c:1}] and {} (mismatched types list and struct): + ./in.cue:423:6 +@@ -73,23 +68,24 @@ + ./in.cue:424:10 nestedList.v1e.y.0: 4 errors in empty disjunction: --nestedList.v1e.y.0: conflicting values int and [[2],1] (mismatched types int and list): -+nestedList.v1e.y.0: conflicting values [[2],1] and int (mismatched types list and int): - ./in.cue:438:11 - ./in.cue:439:11 nestedList.v1e.y.0.0: 2 errors in empty disjunction: +-nestedList.v1e.y.0.0: incompatible list lengths (1 and 2) -nestedList.v1e.y.0.0: conflicting values int and [2] (mismatched types int and list): ++nestedList.v1e.y.0.0: incompatible list lengths (1 and 2): ++ ./in.cue:438:6 +nestedList.v1e.y.0.0: conflicting values [2] and int (mismatched types list and int): ./in.cue:438:11 ./in.cue:439:12 --nestedList.v1e.y.0.0: incompatible list lengths (1 and 2) +-nestedList.v1e.y.0: conflicting values int and [[2],1] (mismatched types int and list): ++nestedList.v1e.y.0: conflicting values [[2],1] and int (mismatched types list and int): + ./in.cue:438:11 + ./in.cue:439:11 nestedList.v2e.y.0: 4 errors in empty disjunction: --nestedList.v2e.y.0: conflicting values int and [[2],1] (mismatched types int and list): -+nestedList.v2e.y.0: conflicting values [[2],1] and int (mismatched types list and int): - ./in.cue:443:11 - ./in.cue:444:11 nestedList.v2e.y.0.0: 2 errors in empty disjunction: +-nestedList.v2e.y.0.0: incompatible list lengths (1 and 2) -nestedList.v2e.y.0.0: conflicting values int and [2] (mismatched types int and list): ++nestedList.v2e.y.0.0: incompatible list lengths (1 and 2): ++ ./in.cue:444:6 +nestedList.v2e.y.0.0: conflicting values [2] and int (mismatched types list and int): ./in.cue:443:12 ./in.cue:444:11 --nestedList.v2e.y.0.0: incompatible list lengths (1 and 2) - p2.#T.a.b.link: structural cycle - p3.#U.#T.a.b.link: structural cycle - p5.#T.a.0.link: structural cycle - p6.#U.#T.a.0.link: structural cycle - patternFail.issue2374.a.b: structural cycle -+resolveToAncestor.t1.X.b: structural cycle - resolveToAncestor.t2.X.b: structural cycle --shortPathFail.elipsis.t2.Foo.ref.ref: structural cycle -+shortPathFail.elipsis.t2.Foo.ref: structural cycle - withLetFail.schema.next: structural cycle +-nestedList.v2e.y.0: conflicting values int and [[2],1] (mismatched types int and list): ++nestedList.v2e.y.0: conflicting values [[2],1] and int (mismatched types list and int): + ./in.cue:443:11 + ./in.cue:444:11 -z1.z.f.h: structural cycle z1.z.g.h: structural cycle --resolveToAncestor.t1.X.b: structural cycle: -- ./edge.cue:3:6 --d1.r: structural cycle: -- ./in.cue:301:26 --d3.x.indirect: structural cycle: -- ./in.cue:316:12 -+3: structural cycle: -+ ./in.cue:371:9 -+nestedList.v1e.y.0.0: incompatible list lengths (1 and 2): -+ ./in.cue:438:6 -+nestedList.v2e.y.0.0: incompatible list lengths (1 and 2): -+ ./in.cue:444:6 Result: - (_|_){ @@ -101,13 +97,9 @@ // [structural cycle] X: (_|_){ @@ -2287,9 +2291,9 @@ diff old new } } } -@@ -892,11 +848,10 @@ - // ./in.cue:420:10 - // ./in.cue:421:6 +@@ -889,11 +845,10 @@ + 0: (_|_){ + // [eval] e4.a.0: 4 errors in empty disjunction: // e4.a.0.0: 2 errors in empty disjunction: - // e4.a.0.0: conflicting values [[{c:1}]] and {c:1} (mismatched types list and struct): - // ./in.cue:421:5 @@ -2300,10 +2304,10 @@ diff old new - // ./in.cue:420:6 // ./in.cue:420:10 // ./in.cue:421:6 - 0: (struct){ -@@ -912,12 +867,11 @@ - // ./in.cue:423:6 - // ./in.cue:424:10 + // e4.a.0: conflicting values [{c:1}] and {} (mismatched types list and struct): +@@ -909,12 +864,11 @@ + 0: (_|_){ + // [eval] e4.b.0: 4 errors in empty disjunction: // e4.b.0.0: 2 errors in empty disjunction: - // e4.b.0.0: conflicting values [(b|{})] and {c:1} (mismatched types list and struct): + // e4.b.0.0: conflicting values [{c:1}] and {c:1} (mismatched types list and struct): @@ -2314,50 +2318,48 @@ diff old new // ./in.cue:423:6 - // ./in.cue:424:6 // ./in.cue:424:10 - 0: (struct){ - c: (int){ 1 } -@@ -945,17 +899,16 @@ - // [eval] + // e4.b.0: conflicting values [{c:1}] and {} (mismatched types list and struct): + // ./in.cue:423:6 +@@ -946,16 +900,15 @@ 0: (_|_){ // [eval] nestedList.v1e.y.0: 4 errors in empty disjunction: -- // nestedList.v1e.y.0: conflicting values int and [[2],1] (mismatched types int and list): -+ // nestedList.v1e.y.0: conflicting values [[2],1] and int (mismatched types list and int): - // ./in.cue:438:11 - // ./in.cue:439:11 // nestedList.v1e.y.0.0: 2 errors in empty disjunction: +- // nestedList.v1e.y.0.0: incompatible list lengths (1 and 2) - // nestedList.v1e.y.0.0: conflicting values int and [2] (mismatched types int and list): ++ // nestedList.v1e.y.0.0: incompatible list lengths (1 and 2): ++ // ./in.cue:438:6 + // nestedList.v1e.y.0.0: conflicting values [2] and int (mismatched types list and int): // ./in.cue:438:11 // ./in.cue:439:12 -- // nestedList.v1e.y.0.0: incompatible list lengths (1 and 2) +- // nestedList.v1e.y.0: conflicting values int and [[2],1] (mismatched types int and list): ++ // nestedList.v1e.y.0: conflicting values [[2],1] and int (mismatched types list and int): + // ./in.cue:438:11 + // ./in.cue:439:11 - 0: (#list){ - 0: (int){ 2 } - } -+ // nestedList.v1e.y.0.0: incompatible list lengths (1 and 2): -+ // ./in.cue:438:6 + 0: (list){ list } 1: (int){ 1 } } 1: (int){ 1 } -@@ -967,17 +920,16 @@ - // [eval] +@@ -968,16 +921,15 @@ 0: (_|_){ // [eval] nestedList.v2e.y.0: 4 errors in empty disjunction: -- // nestedList.v2e.y.0: conflicting values int and [[2],1] (mismatched types int and list): -+ // nestedList.v2e.y.0: conflicting values [[2],1] and int (mismatched types list and int): - // ./in.cue:443:11 - // ./in.cue:444:11 // nestedList.v2e.y.0.0: 2 errors in empty disjunction: +- // nestedList.v2e.y.0.0: incompatible list lengths (1 and 2) - // nestedList.v2e.y.0.0: conflicting values int and [2] (mismatched types int and list): ++ // nestedList.v2e.y.0.0: incompatible list lengths (1 and 2): ++ // ./in.cue:444:6 + // nestedList.v2e.y.0.0: conflicting values [2] and int (mismatched types list and int): // ./in.cue:443:12 // ./in.cue:444:11 -- // nestedList.v2e.y.0.0: incompatible list lengths (1 and 2) +- // nestedList.v2e.y.0: conflicting values int and [[2],1] (mismatched types int and list): ++ // nestedList.v2e.y.0: conflicting values [[2],1] and int (mismatched types list and int): + // ./in.cue:443:11 + // ./in.cue:444:11 - 0: (#list){ - 0: (int){ 2 } - } -+ // nestedList.v2e.y.0.0: incompatible list lengths (1 and 2): -+ // ./in.cue:444:6 + 0: (list){ list } 1: (int){ 1 } } @@ -2587,27 +2589,42 @@ fieldsSumInfinite.issue3310: evalv3 correctly spots a structural cycle, issue2545: a regression in evalv2 around v0.6 is fixed in evalv3. -- out/eval -- Errors: -a1.f.0: structural cycle -a3.f.g: structural cycle -b12b.#list.tail: structural cycle -b13.root.a.0.0: structural cycle -b14.root.b.1.1: structural cycle -b4.cond1.x.y.0: structural cycle -b4.cond2.x.y.0: structural cycle -b4.x.y.0: structural cycle b6.b.a.0: conflicting values 1 and [1] (mismatched types int and list): ./in.cue:94:5 ./in.cue:94:13 ./in.cue:94:14 ./in.cue:95:9 +resolveToAncestor.t1.X.b: structural cycle: + ./edge.cue:3:6 +resolveToAncestor.t2.X.b: structural cycle +a1.f.0: structural cycle +a3.f.g: structural cycle +b4.x.y.0: structural cycle +b4.cond1.x.y.0: structural cycle +b4.cond2.x.y.0: structural cycle b6.b.a.0.0: structural cycle b6.x.a.0: structural cycle b7.a.0: structural cycle +b12b.#list.tail: structural cycle +b13.root.a.0.0: structural cycle +b14.root.b.1.1: structural cycle +p2.#T.a.b.link: structural cycle +p3.#U.#T.a.b.link: structural cycle +p5.#T.a.0.link: structural cycle +p6.#U.#T.a.0.link: structural cycle c1.a.c.c: structural cycle d1.a.b.c.d.t: structural cycle -d2.a.b.c.d.t: structural cycle +d1.r: structural cycle: + ./in.cue:301:26 d2.r.c.d.t: structural cycle +d2.a.b.c.d.t: structural cycle d3.x.a.b.c: structural cycle +d3.x.indirect: structural cycle: + ./in.cue:316:12 +shortPathFail.elipsis.t2.Foo.ref.ref: structural cycle +patternFail.issue2374.a.b: structural cycle +withLetFail.schema.next: structural cycle +issue2545.#B.A: structural cycle e1.a.c: structural cycle e1.b.c: structural cycle e2.a.c: structural cycle @@ -2621,9 +2638,6 @@ e3.b: conflicting values [b] and {c:b} (mismatched types list and struct): ./in.cue:416:5 e3.b.c: structural cycle e4.a.0: 4 errors in empty disjunction: -e4.a.0: conflicting values [{c:1}] and {} (mismatched types list and struct): - ./in.cue:420:10 - ./in.cue:421:6 e4.a.0.0: 2 errors in empty disjunction: e4.a.0.0: conflicting values [[{c:1}]] and {c:1} (mismatched types list and struct): ./in.cue:421:5 @@ -2632,10 +2646,10 @@ e4.a.0.0: conflicting values [{c:1}] and {} (mismatched types list and struct): ./in.cue:420:6 ./in.cue:420:10 ./in.cue:421:6 +e4.a.0: conflicting values [{c:1}] and {} (mismatched types list and struct): + ./in.cue:420:10 + ./in.cue:421:6 e4.b.0: 4 errors in empty disjunction: -e4.b.0: conflicting values [{c:1}] and {} (mismatched types list and struct): - ./in.cue:423:6 - ./in.cue:424:10 e4.b.0.0: 2 errors in empty disjunction: e4.b.0.0: conflicting values [(b|{})] and {c:1} (mismatched types list and struct): ./in.cue:423:7 @@ -2644,41 +2658,29 @@ e4.b.0.0: conflicting values [{c:1}] and {} (mismatched types list and struct): ./in.cue:423:6 ./in.cue:424:6 ./in.cue:424:10 -issue2545.#B.A: structural cycle +e4.b.0: conflicting values [{c:1}] and {} (mismatched types list and struct): + ./in.cue:423:6 + ./in.cue:424:10 nestedList.v1e.y.0: 4 errors in empty disjunction: -nestedList.v1e.y.0: conflicting values int and [[2],1] (mismatched types int and list): - ./in.cue:438:11 - ./in.cue:439:11 nestedList.v1e.y.0.0: 2 errors in empty disjunction: +nestedList.v1e.y.0.0: incompatible list lengths (1 and 2) nestedList.v1e.y.0.0: conflicting values int and [2] (mismatched types int and list): ./in.cue:438:11 ./in.cue:439:12 -nestedList.v1e.y.0.0: incompatible list lengths (1 and 2) +nestedList.v1e.y.0: conflicting values int and [[2],1] (mismatched types int and list): + ./in.cue:438:11 + ./in.cue:439:11 nestedList.v2e.y.0: 4 errors in empty disjunction: -nestedList.v2e.y.0: conflicting values int and [[2],1] (mismatched types int and list): - ./in.cue:443:11 - ./in.cue:444:11 nestedList.v2e.y.0.0: 2 errors in empty disjunction: +nestedList.v2e.y.0.0: incompatible list lengths (1 and 2) nestedList.v2e.y.0.0: conflicting values int and [2] (mismatched types int and list): ./in.cue:443:12 ./in.cue:444:11 -nestedList.v2e.y.0.0: incompatible list lengths (1 and 2) -p2.#T.a.b.link: structural cycle -p3.#U.#T.a.b.link: structural cycle -p5.#T.a.0.link: structural cycle -p6.#U.#T.a.0.link: structural cycle -patternFail.issue2374.a.b: structural cycle -resolveToAncestor.t2.X.b: structural cycle -shortPathFail.elipsis.t2.Foo.ref.ref: structural cycle -withLetFail.schema.next: structural cycle +nestedList.v2e.y.0: conflicting values int and [[2],1] (mismatched types int and list): + ./in.cue:443:11 + ./in.cue:444:11 z1.z.f.h: structural cycle z1.z.g.h: structural cycle -resolveToAncestor.t1.X.b: structural cycle: - ./edge.cue:3:6 -d1.r: structural cycle: - ./in.cue:301:26 -d3.x.indirect: structural cycle: - ./in.cue:316:12 Result: (_|_){ @@ -3476,9 +3478,6 @@ Result: // [eval] 0: (_|_){ // [eval] e4.a.0: 4 errors in empty disjunction: - // e4.a.0: conflicting values [{c:1}] and {} (mismatched types list and struct): - // ./in.cue:420:10 - // ./in.cue:421:6 // e4.a.0.0: 2 errors in empty disjunction: // e4.a.0.0: conflicting values [[{c:1}]] and {c:1} (mismatched types list and struct): // ./in.cue:421:5 @@ -3487,6 +3486,9 @@ Result: // ./in.cue:420:6 // ./in.cue:420:10 // ./in.cue:421:6 + // e4.a.0: conflicting values [{c:1}] and {} (mismatched types list and struct): + // ./in.cue:420:10 + // ./in.cue:421:6 0: (struct){ c: (int){ 1 } } @@ -3496,9 +3498,6 @@ Result: // [eval] 0: (_|_){ // [eval] e4.b.0: 4 errors in empty disjunction: - // e4.b.0: conflicting values [{c:1}] and {} (mismatched types list and struct): - // ./in.cue:423:6 - // ./in.cue:424:10 // e4.b.0.0: 2 errors in empty disjunction: // e4.b.0.0: conflicting values [(b|{})] and {c:1} (mismatched types list and struct): // ./in.cue:423:7 @@ -3507,6 +3506,9 @@ Result: // ./in.cue:423:6 // ./in.cue:424:6 // ./in.cue:424:10 + // e4.b.0: conflicting values [{c:1}] and {} (mismatched types list and struct): + // ./in.cue:423:6 + // ./in.cue:424:10 0: (struct){ c: (int){ 1 } } @@ -3533,14 +3535,14 @@ Result: // [eval] 0: (_|_){ // [eval] nestedList.v1e.y.0: 4 errors in empty disjunction: - // nestedList.v1e.y.0: conflicting values int and [[2],1] (mismatched types int and list): - // ./in.cue:438:11 - // ./in.cue:439:11 // nestedList.v1e.y.0.0: 2 errors in empty disjunction: + // nestedList.v1e.y.0.0: incompatible list lengths (1 and 2) // nestedList.v1e.y.0.0: conflicting values int and [2] (mismatched types int and list): // ./in.cue:438:11 // ./in.cue:439:12 - // nestedList.v1e.y.0.0: incompatible list lengths (1 and 2) + // nestedList.v1e.y.0: conflicting values int and [[2],1] (mismatched types int and list): + // ./in.cue:438:11 + // ./in.cue:439:11 0: (#list){ 0: (int){ 2 } } @@ -3555,14 +3557,14 @@ Result: // [eval] 0: (_|_){ // [eval] nestedList.v2e.y.0: 4 errors in empty disjunction: - // nestedList.v2e.y.0: conflicting values int and [[2],1] (mismatched types int and list): - // ./in.cue:443:11 - // ./in.cue:444:11 // nestedList.v2e.y.0.0: 2 errors in empty disjunction: + // nestedList.v2e.y.0.0: incompatible list lengths (1 and 2) // nestedList.v2e.y.0.0: conflicting values int and [2] (mismatched types int and list): // ./in.cue:443:12 // ./in.cue:444:11 - // nestedList.v2e.y.0.0: incompatible list lengths (1 and 2) + // nestedList.v2e.y.0: conflicting values int and [[2],1] (mismatched types int and list): + // ./in.cue:443:11 + // ./in.cue:444:11 0: (#list){ 0: (int){ 2 } } diff --git a/cue/testdata/definitions/026_combined_definitions.txtar b/cue/testdata/definitions/026_combined_definitions.txtar index fd9fc357d2c..529f1703a75 100644 --- a/cue/testdata/definitions/026_combined_definitions.txtar +++ b/cue/testdata/definitions/026_combined_definitions.txtar @@ -126,10 +126,10 @@ Conjuncts: 41 Disjuncts: 30 -- out/evalalpha -- Errors: -#D4.env.b: field not allowed: - ./in.cue:27:7 d1.env.c: field not allowed: ./in.cue:9:17 +#D4.env.b: field not allowed: + ./in.cue:27:7 Result: (_|_){ @@ -189,19 +189,20 @@ Result: diff old new --- old +++ new -@@ -1,12 +1,7 @@ +@@ -1,13 +1,8 @@ Errors: - #D4.env.b: field not allowed: -- ./in.cue:26:7 - ./in.cue:27:7 -- ./in.cue:30:6 d1.env.c: field not allowed: - ./in.cue:3:7 - ./in.cue:4:7 - ./in.cue:9:5 ./in.cue:9:17 + #D4.env.b: field not allowed: +- ./in.cue:26:7 + ./in.cue:27:7 +- ./in.cue:30:6 Result: + (_|_){ @@ -26,15 +21,12 @@ // [eval] env: (_|_){ @@ -242,15 +243,15 @@ Missing positions Reordering -- out/eval -- Errors: -#D4.env.b: field not allowed: - ./in.cue:26:7 - ./in.cue:27:7 - ./in.cue:30:6 d1.env.c: field not allowed: ./in.cue:3:7 ./in.cue:4:7 ./in.cue:9:5 ./in.cue:9:17 +#D4.env.b: field not allowed: + ./in.cue:26:7 + ./in.cue:27:7 + ./in.cue:30:6 Result: (_|_){ diff --git a/cue/testdata/definitions/037_closing_with_comprehensions.txtar b/cue/testdata/definitions/037_closing_with_comprehensions.txtar index 9b60dbc060c..a0b8ba0d0ec 100644 --- a/cue/testdata/definitions/037_closing_with_comprehensions.txtar +++ b/cue/testdata/definitions/037_closing_with_comprehensions.txtar @@ -112,10 +112,10 @@ Conjuncts: 43 Disjuncts: 28 -- out/evalalpha -- Errors: -#E.f3: field not allowed: - ./in.cue:29:3 a.f3: field not allowed: ./in.cue:4:11 +#E.f3: field not allowed: + ./in.cue:29:3 Result: (_|_){ @@ -158,17 +158,17 @@ diff old new +++ new @@ -1,14 +1,7 @@ Errors: + a.f3: field not allowed: +- ./in.cue:1:5 +- ./in.cue:3:1 +- ./in.cue:4:5 + ./in.cue:4:11 #E.f3: field not allowed: - ./in.cue:1:5 - ./in.cue:27:5 - ./in.cue:27:10 - ./in.cue:28:2 ./in.cue:29:3 - a.f3: field not allowed: -- ./in.cue:1:5 -- ./in.cue:3:1 -- ./in.cue:4:5 - ./in.cue:4:11 Result: @@ -24,9 +17,6 @@ @@ -196,17 +196,17 @@ diff old new error positions -- out/eval -- Errors: +a.f3: field not allowed: + ./in.cue:1:5 + ./in.cue:3:1 + ./in.cue:4:5 + ./in.cue:4:11 #E.f3: field not allowed: ./in.cue:1:5 ./in.cue:27:5 ./in.cue:27:10 ./in.cue:28:2 ./in.cue:29:3 -a.f3: field not allowed: - ./in.cue:1:5 - ./in.cue:3:1 - ./in.cue:4:5 - ./in.cue:4:11 Result: (_|_){ diff --git a/cue/testdata/definitions/embed.txtar b/cue/testdata/definitions/embed.txtar index b4141490743..e6557185fbe 100644 --- a/cue/testdata/definitions/embed.txtar +++ b/cue/testdata/definitions/embed.txtar @@ -85,10 +85,10 @@ Conjuncts: 124 Disjuncts: 69 -- out/evalalpha -- Errors: -reclose1.z.d: field not allowed: - ./in.cue:34:5 recloseSimple.a.b: field not allowed: ./in.cue:17:15 +reclose1.z.d: field not allowed: + ./in.cue:34:5 Result: (_|_){ @@ -190,15 +190,15 @@ diff old new +++ new @@ -1,12 +1,7 @@ Errors: - reclose1.z.d: field not allowed: -- ./in.cue:28:6 -- ./in.cue:33:5 - ./in.cue:34:5 recloseSimple.a.b: field not allowed: - ./in.cue:16:8 - ./in.cue:17:5 - ./in.cue:17:6 ./in.cue:17:15 + reclose1.z.d: field not allowed: +- ./in.cue:28:6 +- ./in.cue:33:5 + ./in.cue:34:5 Result: @@ -20,9 +15,7 @@ @@ -286,15 +286,15 @@ Reordering Missing error positions -- out/eval -- Errors: -reclose1.z.d: field not allowed: - ./in.cue:28:6 - ./in.cue:33:5 - ./in.cue:34:5 recloseSimple.a.b: field not allowed: ./in.cue:16:8 ./in.cue:17:5 ./in.cue:17:6 ./in.cue:17:15 +reclose1.z.d: field not allowed: + ./in.cue:28:6 + ./in.cue:33:5 + ./in.cue:34:5 Result: (_|_){ diff --git a/cue/testdata/definitions/fields.txtar b/cue/testdata/definitions/fields.txtar index 5f80b591a24..8e74f2c42b0 100644 --- a/cue/testdata/definitions/fields.txtar +++ b/cue/testdata/definitions/fields.txtar @@ -268,6 +268,10 @@ Conjuncts: 441 Disjuncts: 263 -- out/evalalpha -- Errors: +ok.t5.x.c: field not allowed: + ./in.cue:41:5 +ok.t13.x.c: field not allowed: + ./in.cue:112:5 err.t1.a.disallowed: field not allowed: ./in.cue:135:5 err.t2.V.c.e: field not allowed: @@ -286,10 +290,6 @@ err.t7.a.b: field not allowed: ./in.cue:189:5 err.t8.V.c.e: field not allowed: ./in.cue:196:10 -ok.t13.x.c: field not allowed: - ./in.cue:112:5 -ok.t5.x.c: field not allowed: - ./in.cue:41:5 validator.keepClosed.x.c: field not allowed: ./validators.cue:24:5 @@ -759,8 +759,20 @@ Result: diff old new --- old +++ new -@@ -1,74 +1,28 @@ +@@ -1,73 +1,27 @@ Errors: + ok.t5.x.c: field not allowed: +- ./in.cue:35:6 +- ./in.cue:36:3 +- ./in.cue:39:10 +- ./in.cue:40:5 + ./in.cue:41:5 + ok.t13.x.c: field not allowed: +- ./in.cue:106:6 +- ./in.cue:107:3 +- ./in.cue:110:10 +- ./in.cue:111:5 + ./in.cue:112:5 err.t1.a.disallowed: field not allowed: - ./in.cue:133:10 - ./in.cue:134:5 @@ -805,35 +817,22 @@ diff old new - ./in.cue:194:13 - ./in.cue:195:5 ./in.cue:196:10 - ok.t13.x.c: field not allowed: -- ./in.cue:106:6 -- ./in.cue:107:3 -- ./in.cue:110:10 -- ./in.cue:111:5 - ./in.cue:112:5 - ok.t5.x.c: field not allowed: -- ./in.cue:35:6 -- ./in.cue:36:3 -- ./in.cue:39:10 -- ./in.cue:40:5 - ./in.cue:41:5 - validator.keepClosed.x.c: field not allowed: -- ./validators.cue:18:6 -- ./validators.cue:23:5 - ./validators.cue:24:5 --validator.open.data: invalid value {trailingComma:_|_(validator.open.data.trailingComma: field not allowed),#x:{trailingComma?:"all"}} (does not satisfy matchN): 0 matched, expected 1: +-validator.open.data.trailingComma: field not allowed: - ./validators.cue:10:3 -- ./validators.cue:10:10 +- ./validators.cue:9:11 - ./validators.cue:13:8 - ./validators.cue:14:8 --validator.open.data.trailingComma: field not allowed: +-validator.open.data: invalid value {trailingComma:_|_(validator.open.data.trailingComma: field not allowed),#x:{trailingComma?:"all"}} (does not satisfy matchN): 0 matched, expected 1: - ./validators.cue:10:3 -- ./validators.cue:9:11 +- ./validators.cue:10:10 - ./validators.cue:13:8 - ./validators.cue:14:8 + validator.keepClosed.x.c: field not allowed: +- ./validators.cue:18:6 +- ./validators.cue:23:5 + ./validators.cue:24:5 Result: - (_|_){ @@ -77,7 +31,7 @@ // [eval] t1: (struct){ @@ -1161,14 +1160,14 @@ diff old new } } - data: (_|_){ -- // [eval] validator.open.data: invalid value {trailingComma:_|_(validator.open.data.trailingComma: field not allowed),#x:{trailingComma?:"all"}} (does not satisfy matchN): 0 matched, expected 1: +- // [eval] validator.open.data.trailingComma: field not allowed: - // ./validators.cue:10:3 -- // ./validators.cue:10:10 +- // ./validators.cue:9:11 - // ./validators.cue:13:8 - // ./validators.cue:14:8 -- // validator.open.data.trailingComma: field not allowed: +- // validator.open.data: invalid value {trailingComma:_|_(validator.open.data.trailingComma: field not allowed),#x:{trailingComma?:"all"}} (does not satisfy matchN): 0 matched, expected 1: - // ./validators.cue:10:3 -- // ./validators.cue:9:11 +- // ./validators.cue:10:10 - // ./validators.cue:13:8 - // ./validators.cue:14:8 - trailingComma: (_|_){ @@ -1213,6 +1212,18 @@ issue1830: the new evaluator correctly rejects inserting new fields in a closed err.t(1|2): bug fixes. -- out/eval -- Errors: +ok.t5.x.c: field not allowed: + ./in.cue:35:6 + ./in.cue:36:3 + ./in.cue:39:10 + ./in.cue:40:5 + ./in.cue:41:5 +ok.t13.x.c: field not allowed: + ./in.cue:106:6 + ./in.cue:107:3 + ./in.cue:110:10 + ./in.cue:111:5 + ./in.cue:112:5 err.t1.a.disallowed: field not allowed: ./in.cue:133:10 ./in.cue:134:5 @@ -1257,32 +1268,20 @@ err.t8.V.c.e: field not allowed: ./in.cue:194:13 ./in.cue:195:5 ./in.cue:196:10 -ok.t13.x.c: field not allowed: - ./in.cue:106:6 - ./in.cue:107:3 - ./in.cue:110:10 - ./in.cue:111:5 - ./in.cue:112:5 -ok.t5.x.c: field not allowed: - ./in.cue:35:6 - ./in.cue:36:3 - ./in.cue:39:10 - ./in.cue:40:5 - ./in.cue:41:5 -validator.keepClosed.x.c: field not allowed: - ./validators.cue:18:6 - ./validators.cue:23:5 - ./validators.cue:24:5 -validator.open.data: invalid value {trailingComma:_|_(validator.open.data.trailingComma: field not allowed),#x:{trailingComma?:"all"}} (does not satisfy matchN): 0 matched, expected 1: +validator.open.data.trailingComma: field not allowed: ./validators.cue:10:3 - ./validators.cue:10:10 + ./validators.cue:9:11 ./validators.cue:13:8 ./validators.cue:14:8 -validator.open.data.trailingComma: field not allowed: +validator.open.data: invalid value {trailingComma:_|_(validator.open.data.trailingComma: field not allowed),#x:{trailingComma?:"all"}} (does not satisfy matchN): 0 matched, expected 1: ./validators.cue:10:3 - ./validators.cue:9:11 + ./validators.cue:10:10 ./validators.cue:13:8 ./validators.cue:14:8 +validator.keepClosed.x.c: field not allowed: + ./validators.cue:18:6 + ./validators.cue:23:5 + ./validators.cue:24:5 Result: (_|_){ @@ -1766,14 +1765,14 @@ Result: } } data: (_|_){ - // [eval] validator.open.data: invalid value {trailingComma:_|_(validator.open.data.trailingComma: field not allowed),#x:{trailingComma?:"all"}} (does not satisfy matchN): 0 matched, expected 1: + // [eval] validator.open.data.trailingComma: field not allowed: // ./validators.cue:10:3 - // ./validators.cue:10:10 + // ./validators.cue:9:11 // ./validators.cue:13:8 // ./validators.cue:14:8 - // validator.open.data.trailingComma: field not allowed: + // validator.open.data: invalid value {trailingComma:_|_(validator.open.data.trailingComma: field not allowed),#x:{trailingComma?:"all"}} (does not satisfy matchN): 0 matched, expected 1: // ./validators.cue:10:3 - // ./validators.cue:9:11 + // ./validators.cue:10:10 // ./validators.cue:13:8 // ./validators.cue:14:8 trailingComma: (_|_){ diff --git a/cue/testdata/definitions/typocheck.txtar b/cue/testdata/definitions/typocheck.txtar index 4b0f064a14f..c3f3313ed7b 100644 --- a/cue/testdata/definitions/typocheck.txtar +++ b/cue/testdata/definitions/typocheck.txtar @@ -342,36 +342,36 @@ Conjuncts: 1396 Disjuncts: 901 -- out/evalalpha -- Errors: -and.transitive.out.ok: field not allowed: - ./in.cue:38:3 -and.transitiveWithEmbed.out.ok: field not allowed: - ./in.cue:46:3 -embed.andEmbed.d.err: field not allowed: - ./in.cue:31:11 +embed.simple.a.err: field not allowed: + ./in.cue:4:5 embed.andInStruct.a.err: field not allowed: ./in.cue:8:16 -embed.embedAndRecursive.x.err: field not allowed: - ./in.cue:25:11 -embed.embedComprehension.a.err: field not allowed: - ./in.cue:16:16 embed.embedDefWithEmbedding.a.err: field not allowed: ./in.cue:12:16 +embed.embedComprehension.a.err: field not allowed: + ./in.cue:16:16 embed.fieldWithAnd.a.err: field not allowed: ./in.cue:20:13 -embed.normalValidator.x.err: field not allowed: - ./validators.cue:9:5 -embed.openValidator.t2.a.b: conflicting values 1 and {b?:Y} (mismatched types int and struct): - ./validators.cue:22:5 - ./validators.cue:24:8 -embed.simple.a.err: field not allowed: - ./in.cue:4:5 +embed.embedAndRecursive.x.err: field not allowed: + ./in.cue:25:11 +embed.andEmbed.d.err: field not allowed: + ./in.cue:31:11 embed.withIndirect.err: field not allowed: ./in.cue:71:8 +embed.normalValidator.x.err: field not allowed: + ./validators.cue:9:5 embed.openValidator.t2.a.b: invalid value 1 (does not satisfy matchN): 0 matched, expected 1: ./validators.cue:21:5 ./validators.cue:21:12 ./validators.cue:22:9 ./validators.cue:24:8 +embed.openValidator.t2.a.b: conflicting values 1 and {b?:Y} (mismatched types int and struct): + ./validators.cue:22:5 + ./validators.cue:24:8 +and.transitive.out.ok: field not allowed: + ./in.cue:38:3 +and.transitiveWithEmbed.out.ok: field not allowed: + ./in.cue:46:3 Result: (_|_){ @@ -575,14 +575,14 @@ Result: a: (_|_){ // [eval] b: (_|_){ - // [eval] embed.openValidator.t2.a.b: conflicting values 1 and {b?:Y} (mismatched types int and struct): - // ./validators.cue:22:5 - // ./validators.cue:24:8 - // embed.openValidator.t2.a.b: invalid value 1 (does not satisfy matchN): 0 matched, expected 1: + // [eval] embed.openValidator.t2.a.b: invalid value 1 (does not satisfy matchN): 0 matched, expected 1: // ./validators.cue:21:5 // ./validators.cue:21:12 // ./validators.cue:22:9 // ./validators.cue:24:8 + // embed.openValidator.t2.a.b: conflicting values 1 and {b?:Y} (mismatched types int and struct): + // ./validators.cue:22:5 + // ./validators.cue:24:8 } } } @@ -909,7 +909,7 @@ Result: patch: (list){ } output: (_|_){ - // [incomplete] full.#JSONPatch.output: cannot reference optional field: namespace: + // [incomplete] full.#JSONPatch.output: key value of dynamic field must be concrete, found _|_(full.#JSONPatch.output: cannot reference optional field: namespace): // ./large.cue:21:24 } } @@ -1038,41 +1038,24 @@ Result: diff old new --- old +++ new -@@ -1,81 +1,29 @@ +@@ -1,60 +1,22 @@ Errors: - and.transitive.out.ok: field not allowed: -- ./in.cue:34:5 -- ./in.cue:35:6 -- ./in.cue:36:6 -- ./in.cue:36:11 -- ./in.cue:37:7 - ./in.cue:38:3 - and.transitiveWithEmbed.out.ok: field not allowed: -- ./in.cue:42:5 -- ./in.cue:43:6 -- ./in.cue:43:11 -- ./in.cue:44:6 -- ./in.cue:44:7 -- ./in.cue:45:7 - ./in.cue:46:3 - embed.andEmbed.d.err: field not allowed: -- ./in.cue:28:6 -- ./in.cue:29:6 -- ./in.cue:30:6 -- ./in.cue:30:7 -- ./in.cue:30:12 -- ./in.cue:31:5 - ./in.cue:31:11 + embed.simple.a.err: field not allowed: +- ./in.cue:2:6 +- ./in.cue:3:5 +- ./in.cue:3:7 + ./in.cue:4:5 embed.andInStruct.a.err: field not allowed: - ./in.cue:7:8 - ./in.cue:8:5 - ./in.cue:8:7 ./in.cue:8:16 - embed.embedAndRecursive.x.err: field not allowed: -- ./in.cue:23:6 -- ./in.cue:24:8 -- ./in.cue:25:2 - ./in.cue:25:11 + embed.embedDefWithEmbedding.a.err: field not allowed: +- ./in.cue:11:8 +- ./in.cue:11:9 +- ./in.cue:12:5 +- ./in.cue:12:7 + ./in.cue:12:16 embed.embedComprehension.a.err: field not allowed: - ./in.cue:15:8 - ./in.cue:15:9 @@ -1080,38 +1063,34 @@ diff old new - ./in.cue:16:5 - ./in.cue:16:7 ./in.cue:16:16 - embed.embedDefWithEmbedding.a.err: field not allowed: -- ./in.cue:11:8 -- ./in.cue:11:9 -- ./in.cue:12:5 -- ./in.cue:12:7 - ./in.cue:12:16 embed.fieldWithAnd.a.err: field not allowed: - ./in.cue:19:6 - ./in.cue:20:2 - ./in.cue:20:7 ./in.cue:20:13 - embed.normalValidator.x.err: field not allowed: -- ./validators.cue:3:6 -- ./validators.cue:8:5 - ./validators.cue:9:5 - embed.openValidator.t2.a.b: conflicting values 1 and {b?:Y} (mismatched types int and struct): -- ./validators.cue:21:16 - ./validators.cue:22:5 -- ./validators.cue:22:9 -- ./validators.cue:23:5 - ./validators.cue:24:8 - embed.simple.a.err: field not allowed: -- ./in.cue:2:6 -- ./in.cue:3:5 -- ./in.cue:3:7 - ./in.cue:4:5 + embed.embedAndRecursive.x.err: field not allowed: +- ./in.cue:23:6 +- ./in.cue:24:8 +- ./in.cue:25:2 + ./in.cue:25:11 + embed.andEmbed.d.err: field not allowed: +- ./in.cue:28:6 +- ./in.cue:29:6 +- ./in.cue:30:6 +- ./in.cue:30:7 +- ./in.cue:30:12 +- ./in.cue:31:5 + ./in.cue:31:11 embed.withIndirect.err: field not allowed: - ./in.cue:68:22 - ./in.cue:69:5 - ./in.cue:70:6 - ./in.cue:71:2 ./in.cue:71:8 + embed.normalValidator.x.err: field not allowed: +- ./validators.cue:3:6 +- ./validators.cue:8:5 + ./validators.cue:9:5 -embed.openValidator.t1.x.err: field not allowed: - ./validators.cue:13:3 - ./validators.cue:12:6 @@ -1120,6 +1099,32 @@ diff old new embed.openValidator.t2.a.b: invalid value 1 (does not satisfy matchN): 0 matched, expected 1: ./validators.cue:21:5 ./validators.cue:21:12 +@@ -61,25 +23,11 @@ + ./validators.cue:22:9 + ./validators.cue:24:8 + embed.openValidator.t2.a.b: conflicting values 1 and {b?:Y} (mismatched types int and struct): +- ./validators.cue:21:16 + ./validators.cue:22:5 +- ./validators.cue:22:9 +- ./validators.cue:23:5 + ./validators.cue:24:8 + and.transitive.out.ok: field not allowed: +- ./in.cue:34:5 +- ./in.cue:35:6 +- ./in.cue:36:6 +- ./in.cue:36:11 +- ./in.cue:37:7 + ./in.cue:38:3 + and.transitiveWithEmbed.out.ok: field not allowed: +- ./in.cue:42:5 +- ./in.cue:43:6 +- ./in.cue:43:11 +- ./in.cue:44:6 +- ./in.cue:44:7 +- ./in.cue:45:7 + ./in.cue:46:3 + + Result: @@ -94,14 +42,11 @@ } a: (_|_){ @@ -1349,17 +1354,17 @@ diff old new } } t2: (_|_){ -@@ -330,10 +233,7 @@ - // [eval] - b: (_|_){ - // [eval] embed.openValidator.t2.a.b: conflicting values 1 and {b?:Y} (mismatched types int and struct): +@@ -335,10 +238,7 @@ + // ./validators.cue:22:9 + // ./validators.cue:24:8 + // embed.openValidator.t2.a.b: conflicting values 1 and {b?:Y} (mismatched types int and struct): - // ./validators.cue:21:16 // ./validators.cue:22:5 - // ./validators.cue:22:9 - // ./validators.cue:23:5 // ./validators.cue:24:8 - // embed.openValidator.t2.a.b: invalid value 1 (does not satisfy matchN): 0 matched, expected 1: - // ./validators.cue:21:5 + } + } @@ -360,16 +260,11 @@ } out: (_|_){ @@ -1581,6 +1586,15 @@ diff old new z: (int){ 1 } } } +@@ -686,7 +566,7 @@ + patch: (list){ + } + output: (_|_){ +- // [incomplete] full.#JSONPatch.output: cannot reference optional field: namespace: ++ // [incomplete] full.#JSONPatch.output: key value of dynamic field must be concrete, found _|_(full.#JSONPatch.output: cannot reference optional field: namespace): + // ./large.cue:21:24 + } + } @@ -701,38 +581,11 @@ #Main: (#struct){ namespace: (string){ string } @@ -1668,39 +1682,22 @@ embed.openValidator.t1.err: unexpected pass. and.transitive(WithEmbed)?.out.ok: unexpected error -- out/eval -- Errors: -and.transitive.out.ok: field not allowed: - ./in.cue:34:5 - ./in.cue:35:6 - ./in.cue:36:6 - ./in.cue:36:11 - ./in.cue:37:7 - ./in.cue:38:3 -and.transitiveWithEmbed.out.ok: field not allowed: - ./in.cue:42:5 - ./in.cue:43:6 - ./in.cue:43:11 - ./in.cue:44:6 - ./in.cue:44:7 - ./in.cue:45:7 - ./in.cue:46:3 -embed.andEmbed.d.err: field not allowed: - ./in.cue:28:6 - ./in.cue:29:6 - ./in.cue:30:6 - ./in.cue:30:7 - ./in.cue:30:12 - ./in.cue:31:5 - ./in.cue:31:11 +embed.simple.a.err: field not allowed: + ./in.cue:2:6 + ./in.cue:3:5 + ./in.cue:3:7 + ./in.cue:4:5 embed.andInStruct.a.err: field not allowed: ./in.cue:7:8 ./in.cue:8:5 ./in.cue:8:7 ./in.cue:8:16 -embed.embedAndRecursive.x.err: field not allowed: - ./in.cue:23:6 - ./in.cue:24:8 - ./in.cue:25:2 - ./in.cue:25:11 +embed.embedDefWithEmbedding.a.err: field not allowed: + ./in.cue:11:8 + ./in.cue:11:9 + ./in.cue:12:5 + ./in.cue:12:7 + ./in.cue:12:16 embed.embedComprehension.a.err: field not allowed: ./in.cue:15:8 ./in.cue:15:9 @@ -1708,38 +1705,34 @@ embed.embedComprehension.a.err: field not allowed: ./in.cue:16:5 ./in.cue:16:7 ./in.cue:16:16 -embed.embedDefWithEmbedding.a.err: field not allowed: - ./in.cue:11:8 - ./in.cue:11:9 - ./in.cue:12:5 - ./in.cue:12:7 - ./in.cue:12:16 embed.fieldWithAnd.a.err: field not allowed: ./in.cue:19:6 ./in.cue:20:2 ./in.cue:20:7 ./in.cue:20:13 -embed.normalValidator.x.err: field not allowed: - ./validators.cue:3:6 - ./validators.cue:8:5 - ./validators.cue:9:5 -embed.openValidator.t2.a.b: conflicting values 1 and {b?:Y} (mismatched types int and struct): - ./validators.cue:21:16 - ./validators.cue:22:5 - ./validators.cue:22:9 - ./validators.cue:23:5 - ./validators.cue:24:8 -embed.simple.a.err: field not allowed: - ./in.cue:2:6 - ./in.cue:3:5 - ./in.cue:3:7 - ./in.cue:4:5 +embed.embedAndRecursive.x.err: field not allowed: + ./in.cue:23:6 + ./in.cue:24:8 + ./in.cue:25:2 + ./in.cue:25:11 +embed.andEmbed.d.err: field not allowed: + ./in.cue:28:6 + ./in.cue:29:6 + ./in.cue:30:6 + ./in.cue:30:7 + ./in.cue:30:12 + ./in.cue:31:5 + ./in.cue:31:11 embed.withIndirect.err: field not allowed: ./in.cue:68:22 ./in.cue:69:5 ./in.cue:70:6 ./in.cue:71:2 ./in.cue:71:8 +embed.normalValidator.x.err: field not allowed: + ./validators.cue:3:6 + ./validators.cue:8:5 + ./validators.cue:9:5 embed.openValidator.t1.x.err: field not allowed: ./validators.cue:13:3 ./validators.cue:12:6 @@ -1750,6 +1743,27 @@ embed.openValidator.t2.a.b: invalid value 1 (does not satisfy matchN): 0 matched ./validators.cue:21:12 ./validators.cue:22:9 ./validators.cue:24:8 +embed.openValidator.t2.a.b: conflicting values 1 and {b?:Y} (mismatched types int and struct): + ./validators.cue:21:16 + ./validators.cue:22:5 + ./validators.cue:22:9 + ./validators.cue:23:5 + ./validators.cue:24:8 +and.transitive.out.ok: field not allowed: + ./in.cue:34:5 + ./in.cue:35:6 + ./in.cue:36:6 + ./in.cue:36:11 + ./in.cue:37:7 + ./in.cue:38:3 +and.transitiveWithEmbed.out.ok: field not allowed: + ./in.cue:42:5 + ./in.cue:43:6 + ./in.cue:43:11 + ./in.cue:44:6 + ./in.cue:44:7 + ./in.cue:45:7 + ./in.cue:46:3 Result: (_|_){ @@ -1998,17 +2012,17 @@ Result: a: (_|_){ // [eval] b: (_|_){ - // [eval] embed.openValidator.t2.a.b: conflicting values 1 and {b?:Y} (mismatched types int and struct): + // [eval] embed.openValidator.t2.a.b: invalid value 1 (does not satisfy matchN): 0 matched, expected 1: + // ./validators.cue:21:5 + // ./validators.cue:21:12 + // ./validators.cue:22:9 + // ./validators.cue:24:8 + // embed.openValidator.t2.a.b: conflicting values 1 and {b?:Y} (mismatched types int and struct): // ./validators.cue:21:16 // ./validators.cue:22:5 // ./validators.cue:22:9 // ./validators.cue:23:5 // ./validators.cue:24:8 - // embed.openValidator.t2.a.b: invalid value 1 (does not satisfy matchN): 0 matched, expected 1: - // ./validators.cue:21:5 - // ./validators.cue:21:12 - // ./validators.cue:22:9 - // ./validators.cue:24:8 } } } diff --git a/cue/testdata/disjunctions/elimination.txtar b/cue/testdata/disjunctions/elimination.txtar index 56f2f578750..07622e90c72 100644 --- a/cue/testdata/disjunctions/elimination.txtar +++ b/cue/testdata/disjunctions/elimination.txtar @@ -1659,9 +1659,25 @@ diff old new +++ new @@ -1,58 +1,4 @@ -Errors: +-issue1417.ids.1: invalid value "ab" (out of bound !~"^a"): +- ./issue1417.cue:2:7 +- ./issue1417.cue:4:11 +- ./issue1417.cue:4:26 -issue1417.ids.2: 2 errors in empty disjunction: +-issue1417.ids.2: invalid value "aB" (out of bound !~"^a"): +- ./issue1417.cue:2:7 +- ./issue1417.cue:4:11 +- ./issue1417.cue:4:32 +-issue1417.ids.2: invalid value "aB" (out of bound !~"[A-Z]"): +- ./issue1417.cue:3:16 +- ./issue1417.cue:4:11 +- ./issue1417.cue:4:32 +-issue2209.simplified.t3.BAZ: undefined field: y: +- ./issue2209full.cue:35:9 -issue2209.full.Bar.resource.spec: 6 errors in empty disjunction: -issue2209.full.Bar.resource.spec.minBar: 2 errors in empty disjunction: +-issue2209.full.Bar.resource.spec.minBar: undefined field: min: +- ./issue2209full.cue:77:25 -issue2209.full.Bar.resource.spec.minBar: conflicting values null and int (mismatched types null and int): - ./issue2209full.cue:43:7 - ./issue2209full.cue:48:13 @@ -1670,13 +1686,6 @@ diff old new - ./issue2209full.cue:87:13 - ./issue2209full.cue:107:20 -issue2209.full.Bar.resource.spec.minFoo: 2 errors in empty disjunction: --issue2209.full.Bar.resource.spec.minFoo: conflicting values null and 10 (mismatched types null and int): -- ./issue2209full.cue:43:7 -- ./issue2209full.cue:48:13 -- ./issue2209full.cue:55:16 -- ./issue2209full.cue:71:4 -- ./issue2209full.cue:72:13 -- ./issue2209full.cue:92:13 -issue2209.full.Bar.resource.spec.minFoo: conflicting values null and int (mismatched types null and int): - ./issue2209full.cue:43:7 - ./issue2209full.cue:48:13 @@ -1684,23 +1693,14 @@ diff old new - ./issue2209full.cue:83:16 - ./issue2209full.cue:92:13 - ./issue2209full.cue:105:20 +-issue2209.full.Bar.resource.spec.minFoo: conflicting values null and 10 (mismatched types null and int): +- ./issue2209full.cue:43:7 +- ./issue2209full.cue:48:13 +- ./issue2209full.cue:55:16 +- ./issue2209full.cue:71:4 +- ./issue2209full.cue:72:13 +- ./issue2209full.cue:92:13 -issue3149.list.3.name: 2 errors in empty disjunction: --issue1417.ids.1: invalid value "ab" (out of bound !~"^a"): -- ./issue1417.cue:2:7 -- ./issue1417.cue:4:11 -- ./issue1417.cue:4:26 --issue1417.ids.2: invalid value "aB" (out of bound !~"^a"): -- ./issue1417.cue:2:7 -- ./issue1417.cue:4:11 -- ./issue1417.cue:4:32 --issue1417.ids.2: invalid value "aB" (out of bound !~"[A-Z]"): -- ./issue1417.cue:3:16 -- ./issue1417.cue:4:11 -- ./issue1417.cue:4:32 --issue2209.simplified.t3.BAZ: undefined field: y: -- ./issue2209full.cue:35:9 --issue2209.full.Bar.resource.spec.minBar: undefined field: min: -- ./issue2209full.cue:77:25 -issue3149.list.3.name: invalid value "an exception" (out of bound =~"^Foo"): - ./issue3149.cue:3:13 - ./issue3149.cue:3:10 @@ -1979,6 +1979,8 @@ diff old new - spec: (_|_){ - // [eval] issue2209.full.Bar.resource.spec: 6 errors in empty disjunction: - // issue2209.full.Bar.resource.spec.minBar: 2 errors in empty disjunction: +- // issue2209.full.Bar.resource.spec.minBar: undefined field: min: +- // ./issue2209full.cue:77:25 - // issue2209.full.Bar.resource.spec.minBar: conflicting values null and int (mismatched types null and int): - // ./issue2209full.cue:43:7 - // ./issue2209full.cue:48:13 @@ -1987,13 +1989,6 @@ diff old new - // ./issue2209full.cue:87:13 - // ./issue2209full.cue:107:20 - // issue2209.full.Bar.resource.spec.minFoo: 2 errors in empty disjunction: -- // issue2209.full.Bar.resource.spec.minFoo: conflicting values null and 10 (mismatched types null and int): -- // ./issue2209full.cue:43:7 -- // ./issue2209full.cue:48:13 -- // ./issue2209full.cue:55:16 -- // ./issue2209full.cue:71:4 -- // ./issue2209full.cue:72:13 -- // ./issue2209full.cue:92:13 - // issue2209.full.Bar.resource.spec.minFoo: conflicting values null and int (mismatched types null and int): - // ./issue2209full.cue:43:7 - // ./issue2209full.cue:48:13 @@ -2001,10 +1996,22 @@ diff old new - // ./issue2209full.cue:83:16 - // ./issue2209full.cue:92:13 - // ./issue2209full.cue:105:20 -- // issue2209.full.Bar.resource.spec.minBar: undefined field: min: -- // ./issue2209full.cue:77:25 +- // issue2209.full.Bar.resource.spec.minFoo: conflicting values null and 10 (mismatched types null and int): +- // ./issue2209full.cue:43:7 +- // ./issue2209full.cue:48:13 +- // ./issue2209full.cue:55:16 +- // ./issue2209full.cue:71:4 +- // ./issue2209full.cue:72:13 +- // ./issue2209full.cue:92:13 - minFoo: (_|_){ - // [eval] issue2209.full.Bar.resource.spec.minFoo: 2 errors in empty disjunction: +- // issue2209.full.Bar.resource.spec.minFoo: conflicting values null and int (mismatched types null and int): +- // ./issue2209full.cue:43:7 +- // ./issue2209full.cue:48:13 +- // ./issue2209full.cue:67:10 +- // ./issue2209full.cue:83:16 +- // ./issue2209full.cue:92:13 +- // ./issue2209full.cue:105:20 - // issue2209.full.Bar.resource.spec.minFoo: conflicting values null and 10 (mismatched types null and int): - // ./issue2209full.cue:43:7 - // ./issue2209full.cue:48:13 @@ -2012,16 +2019,16 @@ diff old new - // ./issue2209full.cue:71:4 - // ./issue2209full.cue:72:13 - // ./issue2209full.cue:92:13 -- // issue2209.full.Bar.resource.spec.minFoo: conflicting values null and int (mismatched types null and int): +- } +- maxFoo: (_|_){ +- // [eval] issue2209.full.Bar.resource.spec.maxFoo: 2 errors in empty disjunction: +- // issue2209.full.Bar.resource.spec.maxFoo: conflicting values null and int (mismatched types null and int): - // ./issue2209full.cue:43:7 - // ./issue2209full.cue:48:13 - // ./issue2209full.cue:67:10 - // ./issue2209full.cue:83:16 -- // ./issue2209full.cue:92:13 -- // ./issue2209full.cue:105:20 -- } -- maxFoo: (_|_){ -- // [eval] issue2209.full.Bar.resource.spec.maxFoo: 2 errors in empty disjunction: +- // ./issue2209full.cue:93:13 +- // ./issue2209full.cue:106:20 - // issue2209.full.Bar.resource.spec.maxFoo: conflicting values null and 20 (mismatched types null and int): - // ./issue2209full.cue:43:7 - // ./issue2209full.cue:48:13 @@ -2029,13 +2036,6 @@ diff old new - // ./issue2209full.cue:71:4 - // ./issue2209full.cue:73:13 - // ./issue2209full.cue:93:13 -- // issue2209.full.Bar.resource.spec.maxFoo: conflicting values null and int (mismatched types null and int): -- // ./issue2209full.cue:43:7 -- // ./issue2209full.cue:48:13 -- // ./issue2209full.cue:67:10 -- // ./issue2209full.cue:83:16 -- // ./issue2209full.cue:93:13 -- // ./issue2209full.cue:106:20 - } - minBar: (_|_){ - // [eval] issue2209.full.Bar.resource.spec.minBar: undefined field: min: @@ -2412,9 +2412,25 @@ issue3149: new evaluator fixes known bug issue770: new evaluator fixes a bug in "c" and "coo" where defaults did not apply correctly. -- out/eval -- Errors: +issue1417.ids.1: invalid value "ab" (out of bound !~"^a"): + ./issue1417.cue:2:7 + ./issue1417.cue:4:11 + ./issue1417.cue:4:26 issue1417.ids.2: 2 errors in empty disjunction: +issue1417.ids.2: invalid value "aB" (out of bound !~"^a"): + ./issue1417.cue:2:7 + ./issue1417.cue:4:11 + ./issue1417.cue:4:32 +issue1417.ids.2: invalid value "aB" (out of bound !~"[A-Z]"): + ./issue1417.cue:3:16 + ./issue1417.cue:4:11 + ./issue1417.cue:4:32 +issue2209.simplified.t3.BAZ: undefined field: y: + ./issue2209full.cue:35:9 issue2209.full.Bar.resource.spec: 6 errors in empty disjunction: issue2209.full.Bar.resource.spec.minBar: 2 errors in empty disjunction: +issue2209.full.Bar.resource.spec.minBar: undefined field: min: + ./issue2209full.cue:77:25 issue2209.full.Bar.resource.spec.minBar: conflicting values null and int (mismatched types null and int): ./issue2209full.cue:43:7 ./issue2209full.cue:48:13 @@ -2423,13 +2439,6 @@ issue2209.full.Bar.resource.spec.minBar: conflicting values null and int (mismat ./issue2209full.cue:87:13 ./issue2209full.cue:107:20 issue2209.full.Bar.resource.spec.minFoo: 2 errors in empty disjunction: -issue2209.full.Bar.resource.spec.minFoo: conflicting values null and 10 (mismatched types null and int): - ./issue2209full.cue:43:7 - ./issue2209full.cue:48:13 - ./issue2209full.cue:55:16 - ./issue2209full.cue:71:4 - ./issue2209full.cue:72:13 - ./issue2209full.cue:92:13 issue2209.full.Bar.resource.spec.minFoo: conflicting values null and int (mismatched types null and int): ./issue2209full.cue:43:7 ./issue2209full.cue:48:13 @@ -2437,23 +2446,14 @@ issue2209.full.Bar.resource.spec.minFoo: conflicting values null and int (mismat ./issue2209full.cue:83:16 ./issue2209full.cue:92:13 ./issue2209full.cue:105:20 +issue2209.full.Bar.resource.spec.minFoo: conflicting values null and 10 (mismatched types null and int): + ./issue2209full.cue:43:7 + ./issue2209full.cue:48:13 + ./issue2209full.cue:55:16 + ./issue2209full.cue:71:4 + ./issue2209full.cue:72:13 + ./issue2209full.cue:92:13 issue3149.list.3.name: 2 errors in empty disjunction: -issue1417.ids.1: invalid value "ab" (out of bound !~"^a"): - ./issue1417.cue:2:7 - ./issue1417.cue:4:11 - ./issue1417.cue:4:26 -issue1417.ids.2: invalid value "aB" (out of bound !~"^a"): - ./issue1417.cue:2:7 - ./issue1417.cue:4:11 - ./issue1417.cue:4:32 -issue1417.ids.2: invalid value "aB" (out of bound !~"[A-Z]"): - ./issue1417.cue:3:16 - ./issue1417.cue:4:11 - ./issue1417.cue:4:32 -issue2209.simplified.t3.BAZ: undefined field: y: - ./issue2209full.cue:35:9 -issue2209.full.Bar.resource.spec.minBar: undefined field: min: - ./issue2209full.cue:77:25 issue3149.list.3.name: invalid value "an exception" (out of bound =~"^Foo"): ./issue3149.cue:3:13 ./issue3149.cue:3:10 @@ -3063,6 +3063,8 @@ Result: spec: (_|_){ // [eval] issue2209.full.Bar.resource.spec: 6 errors in empty disjunction: // issue2209.full.Bar.resource.spec.minBar: 2 errors in empty disjunction: + // issue2209.full.Bar.resource.spec.minBar: undefined field: min: + // ./issue2209full.cue:77:25 // issue2209.full.Bar.resource.spec.minBar: conflicting values null and int (mismatched types null and int): // ./issue2209full.cue:43:7 // ./issue2209full.cue:48:13 @@ -3071,13 +3073,6 @@ Result: // ./issue2209full.cue:87:13 // ./issue2209full.cue:107:20 // issue2209.full.Bar.resource.spec.minFoo: 2 errors in empty disjunction: - // issue2209.full.Bar.resource.spec.minFoo: conflicting values null and 10 (mismatched types null and int): - // ./issue2209full.cue:43:7 - // ./issue2209full.cue:48:13 - // ./issue2209full.cue:55:16 - // ./issue2209full.cue:71:4 - // ./issue2209full.cue:72:13 - // ./issue2209full.cue:92:13 // issue2209.full.Bar.resource.spec.minFoo: conflicting values null and int (mismatched types null and int): // ./issue2209full.cue:43:7 // ./issue2209full.cue:48:13 @@ -3085,10 +3080,22 @@ Result: // ./issue2209full.cue:83:16 // ./issue2209full.cue:92:13 // ./issue2209full.cue:105:20 - // issue2209.full.Bar.resource.spec.minBar: undefined field: min: - // ./issue2209full.cue:77:25 + // issue2209.full.Bar.resource.spec.minFoo: conflicting values null and 10 (mismatched types null and int): + // ./issue2209full.cue:43:7 + // ./issue2209full.cue:48:13 + // ./issue2209full.cue:55:16 + // ./issue2209full.cue:71:4 + // ./issue2209full.cue:72:13 + // ./issue2209full.cue:92:13 minFoo: (_|_){ // [eval] issue2209.full.Bar.resource.spec.minFoo: 2 errors in empty disjunction: + // issue2209.full.Bar.resource.spec.minFoo: conflicting values null and int (mismatched types null and int): + // ./issue2209full.cue:43:7 + // ./issue2209full.cue:48:13 + // ./issue2209full.cue:67:10 + // ./issue2209full.cue:83:16 + // ./issue2209full.cue:92:13 + // ./issue2209full.cue:105:20 // issue2209.full.Bar.resource.spec.minFoo: conflicting values null and 10 (mismatched types null and int): // ./issue2209full.cue:43:7 // ./issue2209full.cue:48:13 @@ -3096,16 +3103,16 @@ Result: // ./issue2209full.cue:71:4 // ./issue2209full.cue:72:13 // ./issue2209full.cue:92:13 - // issue2209.full.Bar.resource.spec.minFoo: conflicting values null and int (mismatched types null and int): + } + maxFoo: (_|_){ + // [eval] issue2209.full.Bar.resource.spec.maxFoo: 2 errors in empty disjunction: + // issue2209.full.Bar.resource.spec.maxFoo: conflicting values null and int (mismatched types null and int): // ./issue2209full.cue:43:7 // ./issue2209full.cue:48:13 // ./issue2209full.cue:67:10 // ./issue2209full.cue:83:16 - // ./issue2209full.cue:92:13 - // ./issue2209full.cue:105:20 - } - maxFoo: (_|_){ - // [eval] issue2209.full.Bar.resource.spec.maxFoo: 2 errors in empty disjunction: + // ./issue2209full.cue:93:13 + // ./issue2209full.cue:106:20 // issue2209.full.Bar.resource.spec.maxFoo: conflicting values null and 20 (mismatched types null and int): // ./issue2209full.cue:43:7 // ./issue2209full.cue:48:13 @@ -3113,13 +3120,6 @@ Result: // ./issue2209full.cue:71:4 // ./issue2209full.cue:73:13 // ./issue2209full.cue:93:13 - // issue2209.full.Bar.resource.spec.maxFoo: conflicting values null and int (mismatched types null and int): - // ./issue2209full.cue:43:7 - // ./issue2209full.cue:48:13 - // ./issue2209full.cue:67:10 - // ./issue2209full.cue:83:16 - // ./issue2209full.cue:93:13 - // ./issue2209full.cue:106:20 } minBar: (_|_){ // [eval] issue2209.full.Bar.resource.spec.minBar: undefined field: min: diff --git a/cue/testdata/disjunctions/errors.txtar b/cue/testdata/disjunctions/errors.txtar index cbf87db487c..89650f309ae 100644 --- a/cue/testdata/disjunctions/errors.txtar +++ b/cue/testdata/disjunctions/errors.txtar @@ -135,14 +135,14 @@ Conjuncts: 268 Disjuncts: 206 -- out/evalalpha -- Errors: -issue516.x: 2 errors in empty disjunction: -issue516.x.match: field not allowed: - ./in.cue:23:5 -issue516.x.match.metrics.foo: field not allowed: - ./in.cue:23:21 issue570.results.result: conflicting values "hello" and [...string] (mismatched types string and list): ./in.cue:3:19 ./in.cue:12:12 +issue516.x: 2 errors in empty disjunction: +issue516.x.match.metrics.foo: field not allowed: + ./in.cue:23:21 +issue516.x.match: field not allowed: + ./in.cue:23:5 Result: (_|_){ @@ -186,10 +186,10 @@ Result: }) } x: (_|_){ // [eval] issue516.x: 2 errors in empty disjunction: - // issue516.x.match: field not allowed: - // ./in.cue:23:5 // issue516.x.match.metrics.foo: field not allowed: // ./in.cue:23:21 + // issue516.x.match: field not allowed: + // ./in.cue:23:5 match: (struct){ metrics: (struct){ foo: (struct){ @@ -256,10 +256,10 @@ Result: reduced: (struct){ list: (_|_){ // [incomplete] issue3581.reduced.list: 2 errors in empty disjunction: - // issue3581.reduced.list: incompatible list lengths (0 and 1): - // ./issue3581.cue:2:17 // issue3581.reduced.list.0: invalid interpolation: non-concrete value _ (type _): // ./issue3581.cue:3:9 + // issue3581.reduced.list: incompatible list lengths (0 and 1): + // ./issue3581.cue:2:17 0: (_){ _ } } c: (_){ _ } @@ -288,9 +288,9 @@ Result: write: (string){ "somefile.txt" } read?: (_|_){ // [user] explicit error (_|_ literal) in source: - // ./issue3599.cue:9:12 - // explicit error (_|_ literal) in source: // ./issue3599.cue:20:13 + // explicit error (_|_ literal) in source: + // ./issue3599.cue:9:12 } } } @@ -345,22 +345,23 @@ Result: diff old new --- old +++ new -@@ -1,15 +1,10 @@ +@@ -1,16 +1,11 @@ Errors: + issue570.results.result: conflicting values "hello" and [...string] (mismatched types string and list): +- ./in.cue:2:11 + ./in.cue:3:19 + ./in.cue:12:12 issue516.x: 2 errors in empty disjunction: - issue516.x.match: field not allowed: -- ./in.cue:20:6 -- ./in.cue:22:5 - ./in.cue:23:5 issue516.x.match.metrics.foo: field not allowed: - ./in.cue:19:19 - ./in.cue:22:5 ./in.cue:23:21 - issue570.results.result: conflicting values "hello" and [...string] (mismatched types string and list): -- ./in.cue:2:11 - ./in.cue:3:19 - ./in.cue:12:12 + issue516.x.match: field not allowed: +- ./in.cue:20:6 +- ./in.cue:22:5 + ./in.cue:23:5 + Result: @@ -19,17 +14,12 @@ issue570: (_|_){ // [eval] @@ -394,14 +395,14 @@ diff old new @@ -59,18 +51,10 @@ x: (_|_){ // [eval] issue516.x: 2 errors in empty disjunction: - // issue516.x.match: field not allowed: -- // ./in.cue:20:6 -- // ./in.cue:22:5 - // ./in.cue:23:5 // issue516.x.match.metrics.foo: field not allowed: - // ./in.cue:19:19 - // ./in.cue:22:5 // ./in.cue:23:21 + // issue516.x.match: field not allowed: +- // ./in.cue:20:6 +- // ./in.cue:22:5 + // ./in.cue:23:5 - match: (_|_){ - // [eval] issue516.x.match: field not allowed: - // ./in.cue:20:6 @@ -425,23 +426,33 @@ diff old new } issue3576: (struct){ reduced: (struct){ -@@ -136,13 +120,11 @@ - reduced: (struct){ - list: (_|_){ +@@ -138,11 +122,9 @@ // [incomplete] issue3581.reduced.list: 2 errors in empty disjunction: -- // issue3581.reduced.list: incompatible list lengths (0 and 1) -+ // issue3581.reduced.list: incompatible list lengths (0 and 1): -+ // ./issue3581.cue:2:17 // issue3581.reduced.list.0: invalid interpolation: non-concrete value _ (type _): // ./issue3581.cue:3:9 +- // issue3581.reduced.list: incompatible list lengths (0 and 1) - 0: (_|_){ - // [incomplete] issue3581.reduced.list.0: invalid interpolation: non-concrete value _ (type _): - // ./issue3581.cue:3:9 - } ++ // issue3581.reduced.list: incompatible list lengths (0 and 1): ++ // ./issue3581.cue:2:17 + 0: (_){ _ } } c: (_){ _ } } +@@ -170,9 +152,9 @@ + write: (string){ "somefile.txt" } + read?: (_|_){ + // [user] explicit error (_|_ literal) in source: +- // ./issue3599.cue:9:12 +- // explicit error (_|_ literal) in source: + // ./issue3599.cue:20:13 ++ // explicit error (_|_ literal) in source: ++ // ./issue3599.cue:9:12 + } + } + } @@ -186,7 +168,6 @@ p1: (struct){ |((struct){ a?: (_|_){ @@ -491,19 +502,19 @@ issue516.x.match: changes are okay and arguably better. issue2916 and issue3157: the old evaluator incorrectly kept a default in the output. -- out/eval -- Errors: +issue570.results.result: conflicting values "hello" and [...string] (mismatched types string and list): + ./in.cue:2:11 + ./in.cue:3:19 + ./in.cue:12:12 issue516.x: 2 errors in empty disjunction: -issue516.x.match: field not allowed: - ./in.cue:20:6 - ./in.cue:22:5 - ./in.cue:23:5 issue516.x.match.metrics.foo: field not allowed: ./in.cue:19:19 ./in.cue:22:5 ./in.cue:23:21 -issue570.results.result: conflicting values "hello" and [...string] (mismatched types string and list): - ./in.cue:2:11 - ./in.cue:3:19 - ./in.cue:12:12 +issue516.x.match: field not allowed: + ./in.cue:20:6 + ./in.cue:22:5 + ./in.cue:23:5 Result: (_|_){ @@ -550,14 +561,14 @@ Result: }) } x: (_|_){ // [eval] issue516.x: 2 errors in empty disjunction: - // issue516.x.match: field not allowed: - // ./in.cue:20:6 - // ./in.cue:22:5 - // ./in.cue:23:5 // issue516.x.match.metrics.foo: field not allowed: // ./in.cue:19:19 // ./in.cue:22:5 // ./in.cue:23:21 + // issue516.x.match: field not allowed: + // ./in.cue:20:6 + // ./in.cue:22:5 + // ./in.cue:23:5 match: (_|_){ // [eval] issue516.x.match: field not allowed: // ./in.cue:20:6 @@ -628,9 +639,9 @@ Result: reduced: (struct){ list: (_|_){ // [incomplete] issue3581.reduced.list: 2 errors in empty disjunction: - // issue3581.reduced.list: incompatible list lengths (0 and 1) // issue3581.reduced.list.0: invalid interpolation: non-concrete value _ (type _): // ./issue3581.cue:3:9 + // issue3581.reduced.list: incompatible list lengths (0 and 1) 0: (_|_){ // [incomplete] issue3581.reduced.list.0: invalid interpolation: non-concrete value _ (type _): // ./issue3581.cue:3:9 diff --git a/cue/testdata/eval/bounds.txtar b/cue/testdata/eval/bounds.txtar index 2789d4b3156..54525a9acb3 100644 --- a/cue/testdata/eval/bounds.txtar +++ b/cue/testdata/eval/bounds.txtar @@ -657,30 +657,6 @@ diff old new +++ new @@ -1,110 +1,106 @@ Errors: --simplifyBinary.byte.err1.p1: incompatible bytes bounds <'a' and >'b': -- ./binarystring.cue:27:13 -- ./binarystring.cue:27:20 --simplifyBinary.byte.err1.p2: incompatible bytes bounds <'a' and >'b': -- ./binarystring.cue:28:13 -- ./binarystring.cue:28:20 --simplifyBinary.byte.err2.p1: incompatible bytes bounds <='a' and >'b': -- ./binarystring.cue:30:13 -- ./binarystring.cue:30:20 --simplifyBinary.byte.err2.p2: incompatible bytes bounds <='a' and >'b': -- ./binarystring.cue:31:13 -- ./binarystring.cue:31:21 --simplifyBinary.byte.err3.p1: incompatible bytes bounds <'b' and >='b': -- ./binarystring.cue:33:13 -- ./binarystring.cue:33:21 --simplifyBinary.byte.err3.p2: incompatible bytes bounds <'b' and >='b': -- ./binarystring.cue:34:13 -- ./binarystring.cue:34:20 --simplifyBinary.byte.err3.p3: incompatible bytes bounds <='b' and >'b': -- ./binarystring.cue:35:13 -- ./binarystring.cue:35:20 --simplifyBinary.byte.err3.p4: incompatible bytes bounds <='b' and >'b': -- ./binarystring.cue:36:13 -- ./binarystring.cue:36:21 simplifyBinary.float.err1.p1: incompatible number bounds <1 and >2: - ./binary.cue:2:13 ./binary.cue:2:18 @@ -797,29 +773,37 @@ diff old new - ./binarystring.cue:11:13 ./binarystring.cue:11:21 + ./binarystring.cue:11:13 -+simplifyBinary.byte.err1.p1: incompatible bytes bounds <'a' and >'b': -+ ./binarystring.cue:27:20 + simplifyBinary.byte.err1.p1: incompatible bytes bounds <'a' and >'b': +- ./binarystring.cue:27:13 + ./binarystring.cue:27:20 + ./binarystring.cue:27:13 -+simplifyBinary.byte.err1.p2: incompatible bytes bounds <'a' and >'b': -+ ./binarystring.cue:28:20 + simplifyBinary.byte.err1.p2: incompatible bytes bounds <'a' and >'b': +- ./binarystring.cue:28:13 + ./binarystring.cue:28:20 + ./binarystring.cue:28:13 -+simplifyBinary.byte.err2.p1: incompatible bytes bounds <='a' and >'b': -+ ./binarystring.cue:30:20 + simplifyBinary.byte.err2.p1: incompatible bytes bounds <='a' and >'b': +- ./binarystring.cue:30:13 + ./binarystring.cue:30:20 + ./binarystring.cue:30:13 -+simplifyBinary.byte.err2.p2: incompatible bytes bounds <='a' and >'b': -+ ./binarystring.cue:31:21 + simplifyBinary.byte.err2.p2: incompatible bytes bounds <='a' and >'b': +- ./binarystring.cue:31:13 + ./binarystring.cue:31:21 + ./binarystring.cue:31:13 -+simplifyBinary.byte.err3.p1: incompatible bytes bounds <'b' and >='b': -+ ./binarystring.cue:33:21 + simplifyBinary.byte.err3.p1: incompatible bytes bounds <'b' and >='b': +- ./binarystring.cue:33:13 + ./binarystring.cue:33:21 + ./binarystring.cue:33:13 -+simplifyBinary.byte.err3.p2: incompatible bytes bounds <'b' and >='b': -+ ./binarystring.cue:34:20 + simplifyBinary.byte.err3.p2: incompatible bytes bounds <'b' and >='b': +- ./binarystring.cue:34:13 + ./binarystring.cue:34:20 + ./binarystring.cue:34:13 -+simplifyBinary.byte.err3.p3: incompatible bytes bounds <='b' and >'b': -+ ./binarystring.cue:35:20 + simplifyBinary.byte.err3.p3: incompatible bytes bounds <='b' and >'b': +- ./binarystring.cue:35:13 + ./binarystring.cue:35:20 + ./binarystring.cue:35:13 -+simplifyBinary.byte.err3.p4: incompatible bytes bounds <='b' and >'b': -+ ./binarystring.cue:36:21 + simplifyBinary.byte.err3.p4: incompatible bytes bounds <='b' and >'b': +- ./binarystring.cue:36:13 + ./binarystring.cue:36:21 + ./binarystring.cue:36:13 simplifyExpr.e2: cannot use null for bound >: ./in.cue:62:8 @@ -1126,30 +1110,6 @@ diff old new simplifyBinary.integer.ok2.*: v3 indicates correct type. -- out/eval -- Errors: -simplifyBinary.byte.err1.p1: incompatible bytes bounds <'a' and >'b': - ./binarystring.cue:27:13 - ./binarystring.cue:27:20 -simplifyBinary.byte.err1.p2: incompatible bytes bounds <'a' and >'b': - ./binarystring.cue:28:13 - ./binarystring.cue:28:20 -simplifyBinary.byte.err2.p1: incompatible bytes bounds <='a' and >'b': - ./binarystring.cue:30:13 - ./binarystring.cue:30:20 -simplifyBinary.byte.err2.p2: incompatible bytes bounds <='a' and >'b': - ./binarystring.cue:31:13 - ./binarystring.cue:31:21 -simplifyBinary.byte.err3.p1: incompatible bytes bounds <'b' and >='b': - ./binarystring.cue:33:13 - ./binarystring.cue:33:21 -simplifyBinary.byte.err3.p2: incompatible bytes bounds <'b' and >='b': - ./binarystring.cue:34:13 - ./binarystring.cue:34:20 -simplifyBinary.byte.err3.p3: incompatible bytes bounds <='b' and >'b': - ./binarystring.cue:35:13 - ./binarystring.cue:35:20 -simplifyBinary.byte.err3.p4: incompatible bytes bounds <='b' and >'b': - ./binarystring.cue:36:13 - ./binarystring.cue:36:21 simplifyBinary.float.err1.p1: incompatible number bounds <1 and >2: ./binary.cue:2:13 ./binary.cue:2:18 @@ -1232,6 +1192,30 @@ simplifyBinary.strings.err3.p3: incompatible string bounds <="b" and >"b": simplifyBinary.strings.err3.p4: incompatible string bounds <="b" and >"b": ./binarystring.cue:11:13 ./binarystring.cue:11:21 +simplifyBinary.byte.err1.p1: incompatible bytes bounds <'a' and >'b': + ./binarystring.cue:27:13 + ./binarystring.cue:27:20 +simplifyBinary.byte.err1.p2: incompatible bytes bounds <'a' and >'b': + ./binarystring.cue:28:13 + ./binarystring.cue:28:20 +simplifyBinary.byte.err2.p1: incompatible bytes bounds <='a' and >'b': + ./binarystring.cue:30:13 + ./binarystring.cue:30:20 +simplifyBinary.byte.err2.p2: incompatible bytes bounds <='a' and >'b': + ./binarystring.cue:31:13 + ./binarystring.cue:31:21 +simplifyBinary.byte.err3.p1: incompatible bytes bounds <'b' and >='b': + ./binarystring.cue:33:13 + ./binarystring.cue:33:21 +simplifyBinary.byte.err3.p2: incompatible bytes bounds <'b' and >='b': + ./binarystring.cue:34:13 + ./binarystring.cue:34:20 +simplifyBinary.byte.err3.p3: incompatible bytes bounds <='b' and >'b': + ./binarystring.cue:35:13 + ./binarystring.cue:35:20 +simplifyBinary.byte.err3.p4: incompatible bytes bounds <='b' and >'b': + ./binarystring.cue:36:13 + ./binarystring.cue:36:21 simplifyExpr.e2: cannot use null for bound >: ./in.cue:62:8 diff --git a/cue/testdata/eval/bulk.txtar b/cue/testdata/eval/bulk.txtar index 6fa055ce800..7a63e37141a 100644 --- a/cue/testdata/eval/bulk.txtar +++ b/cue/testdata/eval/bulk.txtar @@ -183,12 +183,12 @@ Conjuncts: 639 Disjuncts: 297 -- out/evalalpha -- Errors: -issue3670.a.not_int: field not allowed: - ./intpattern.cue:4:5 t1.c.z: field not allowed: ./in.cue:19:11 t2.c.z: field not allowed: ./in.cue:27:11 +issue3670.a.not_int: field not allowed: + ./intpattern.cue:4:5 Result: (_|_){ @@ -440,10 +440,6 @@ diff old new +++ new @@ -1,34 +1,10 @@ Errors: - issue3670.a.not_int: field not allowed: -- ./intpattern.cue:2:6 -- ./intpattern.cue:3:5 - ./intpattern.cue:4:5 t1.c.z: field not allowed: - ./in.cue:15:6 - ./in.cue:19:5 @@ -452,6 +448,10 @@ diff old new - ./in.cue:23:6 - ./in.cue:27:5 ./in.cue:27:11 + issue3670.a.not_int: field not allowed: +- ./intpattern.cue:2:6 +- ./intpattern.cue:3:5 + ./intpattern.cue:4:5 -patternCycle.issue2109.p1.countries: cyclic pattern constraint: - ./issue2109.cue:11:15 - ./issue2109.cue:10:13 @@ -826,10 +826,6 @@ a disjunction that should have already been disambiguated. In V3, the disjunction is properly disambiguated. -- out/eval -- Errors: -issue3670.a.not_int: field not allowed: - ./intpattern.cue:2:6 - ./intpattern.cue:3:5 - ./intpattern.cue:4:5 t1.c.z: field not allowed: ./in.cue:15:6 ./in.cue:19:5 @@ -838,6 +834,10 @@ t2.c.z: field not allowed: ./in.cue:23:6 ./in.cue:27:5 ./in.cue:27:11 +issue3670.a.not_int: field not allowed: + ./intpattern.cue:2:6 + ./intpattern.cue:3:5 + ./intpattern.cue:4:5 patternCycle.issue2109.p1.countries: cyclic pattern constraint: ./issue2109.cue:11:15 ./issue2109.cue:10:13 diff --git a/cue/testdata/eval/closedness.txtar b/cue/testdata/eval/closedness.txtar index 536f26d62c2..838e5131366 100644 --- a/cue/testdata/eval/closedness.txtar +++ b/cue/testdata/eval/closedness.txtar @@ -694,74 +694,136 @@ Conjuncts: 1965 Disjuncts: 845 -- out/eval -- Errors: -a.q.e: field not allowed: - ./in.cue:1:5 - ./in.cue:6:5 - ./in.cue:7:3 - ./in.cue:11:4 - ./in.cue:15:3 -indirect.closed.err1.Y.a.e: field not allowed: - ./reroot.cue:73:7 - ./reroot.cue:74:7 - ./reroot.cue:75:7 - ./reroot.cue:77:6 - ./reroot.cue:79:7 - ./reroot.cue:80:7 - ./reroot.cue:82:7 issue3778.full.z.b: field not allowed: ./ellipsis.cue:2:6 ./ellipsis.cue:3:6 ./ellipsis.cue:3:13 ./ellipsis.cue:4:5 ./ellipsis.cue:6:3 -issue852.a.Foo: field not allowed: - ./in.cue:22:6 - ./in.cue:26:5 - ./in.cue:28:5 -nested.err1.x.#V.c.d: field not allowed: - ./reroot.cue:112:5 - ./reroot.cue:114:6 - ./reroot.cue:117:7 - ./reroot.cue:118:5 - ./reroot.cue:122:8 - ./reroot.cue:123:6 -nested.err1.x.#V.c.f: field not allowed: - ./reroot.cue:112:5 - ./reroot.cue:114:6 - ./reroot.cue:117:7 - ./reroot.cue:117:11 - ./reroot.cue:122:8 - ./reroot.cue:123:6 -nested.err1.x.b.f: field not allowed: - ./reroot.cue:112:5 - ./reroot.cue:114:6 - ./reroot.cue:122:8 - ./reroot.cue:123:6 -nested.err1.x.b.g: field not allowed: - ./reroot.cue:112:5 - ./reroot.cue:114:6 - ./reroot.cue:122:8 - ./reroot.cue:123:6 -nested.err1.x.v.c.d: field not allowed: - ./reroot.cue:112:5 - ./reroot.cue:114:6 - ./reroot.cue:115:6 - ./reroot.cue:117:7 - ./reroot.cue:118:5 - ./reroot.cue:122:8 - ./reroot.cue:123:6 -nested.err1.x.v.c.f: field not allowed: - ./reroot.cue:112:5 - ./reroot.cue:114:6 - ./reroot.cue:115:6 - ./reroot.cue:117:7 - ./reroot.cue:117:11 - ./reroot.cue:122:8 - ./reroot.cue:123:6 -nested.err2.x.b.g: field not allowed: - ./reroot.cue:128:6 - ./reroot.cue:136:5 - ./reroot.cue:137:8 +patterns.shallow.single.err.j: field not allowed: + ./embed.cue:30:6 + ./embed.cue:36:6 + ./embed.cue:37:8 + ./embed.cue:38:8 +patterns.shallow.and.p1.err.j: field not allowed: + ./embed.cue:30:6 + ./embed.cue:31:6 + ./embed.cue:45:6 + ./embed.cue:45:11 + ./embed.cue:47:8 + ./embed.cue:48:8 +patterns.shallow.and.p2.err.j: field not allowed: + ./embed.cue:30:6 + ./embed.cue:31:6 + ./embed.cue:55:6 + ./embed.cue:55:11 + ./embed.cue:56:8 + ./embed.cue:57:8 +patterns.shallow.andEmbed.p1.err.j: field not allowed: + ./embed.cue:30:6 + ./embed.cue:31:6 + ./embed.cue:64:6 + ./embed.cue:64:8 + ./embed.cue:64:13 + ./embed.cue:66:8 + ./embed.cue:67:8 +patterns.shallow.andEmbed.p2.err.j: field not allowed: + ./embed.cue:30:6 + ./embed.cue:31:6 + ./embed.cue:74:6 + ./embed.cue:74:8 + ./embed.cue:74:13 + ./embed.cue:75:8 + ./embed.cue:76:8 +patterns.shallow.andOrEmbed.t1.p1.err1.j: field not allowed: + ./embed.cue:30:6 + ./embed.cue:31:6 + ./embed.cue:32:6 + ./embed.cue:33:6 + ./embed.cue:103:6 + ./embed.cue:104:4 + ./embed.cue:104:9 + ./embed.cue:105:4 + ./embed.cue:105:9 + ./embed.cue:107:9 + ./embed.cue:108:9 +patterns.shallow.andOrEmbed.t1.p2.err1.j: field not allowed: + ./embed.cue:30:6 + ./embed.cue:31:6 + ./embed.cue:32:6 + ./embed.cue:33:6 + ./embed.cue:116:6 + ./embed.cue:117:4 + ./embed.cue:117:9 + ./embed.cue:118:4 + ./embed.cue:118:9 + ./embed.cue:120:9 + ./embed.cue:121:9 +patterns.shallow.andOrEmbed.t2.err1.j: field not allowed: + ./embed.cue:30:6 + ./embed.cue:31:6 + ./embed.cue:32:6 + ./embed.cue:33:6 + ./embed.cue:129:6 + ./embed.cue:130:4 + ./embed.cue:130:9 + ./embed.cue:131:4 + ./embed.cue:131:9 + ./embed.cue:134:9 + ./embed.cue:135:9 +patterns.shallow.indirect.p1.err1.j: field not allowed: + ./embed.cue:146:6 + ./embed.cue:147:7 + ./embed.cue:150:7 + ./embed.cue:151:10 + ./embed.cue:152:10 +patterns.shallow.indirect.p1.err2.j: field not allowed: + ./embed.cue:146:6 + ./embed.cue:147:7 + ./embed.cue:150:7 + ./embed.cue:154:10 + ./embed.cue:155:10 +patterns.shallow.indirect.p2.err1.j: field not allowed: + ./embed.cue:146:6 + ./embed.cue:162:8 + ./embed.cue:163:7 + ./embed.cue:165:10 + ./embed.cue:166:10 +patterns.shallow.indirect.p2.err2.j: field not allowed: + ./embed.cue:146:6 + ./embed.cue:162:8 + ./embed.cue:163:7 + ./embed.cue:168:10 + ./embed.cue:169:10 +patterns.shallow.indirect.p3.err1.j: field not allowed: + ./embed.cue:146:6 + ./embed.cue:147:7 + ./embed.cue:176:7 + ./embed.cue:178:10 + ./embed.cue:179:10 +patterns.shallow.indirect.p3.err2.j: field not allowed: + ./embed.cue:146:6 + ./embed.cue:147:7 + ./embed.cue:176:7 + ./embed.cue:181:10 + ./embed.cue:182:10 +patterns.shallow.indirect.p4.err1.j: field not allowed: + ./embed.cue:146:6 + ./embed.cue:189:8 + ./embed.cue:190:7 + ./embed.cue:193:10 + ./embed.cue:194:10 +patterns.shallow.indirect.p4.err2.j: field not allowed: + ./embed.cue:146:6 + ./embed.cue:189:8 + ./embed.cue:190:7 + ./embed.cue:196:10 + ./embed.cue:197:10 +patterns.nested.single.err.x.y.j: field not allowed: + ./embed.cue:206:12 + ./embed.cue:212:6 + ./embed.cue:213:8 + ./embed.cue:214:14 patterns.nested.and.p1.err.x.y.j: field not allowed: ./embed.cue:206:12 ./embed.cue:207:12 @@ -882,130 +944,68 @@ patterns.nested.indirect.p4.err2.x.y.j: field not allowed: ./embed.cue:366:7 ./embed.cue:372:10 ./embed.cue:373:16 -patterns.nested.single.err.x.y.j: field not allowed: - ./embed.cue:206:12 - ./embed.cue:212:6 - ./embed.cue:213:8 - ./embed.cue:214:14 -patterns.shallow.and.p1.err.j: field not allowed: - ./embed.cue:30:6 - ./embed.cue:31:6 - ./embed.cue:45:6 - ./embed.cue:45:11 - ./embed.cue:47:8 - ./embed.cue:48:8 -patterns.shallow.and.p2.err.j: field not allowed: - ./embed.cue:30:6 - ./embed.cue:31:6 - ./embed.cue:55:6 - ./embed.cue:55:11 - ./embed.cue:56:8 - ./embed.cue:57:8 -patterns.shallow.andEmbed.p1.err.j: field not allowed: - ./embed.cue:30:6 - ./embed.cue:31:6 - ./embed.cue:64:6 - ./embed.cue:64:8 - ./embed.cue:64:13 - ./embed.cue:66:8 - ./embed.cue:67:8 -patterns.shallow.andEmbed.p2.err.j: field not allowed: - ./embed.cue:30:6 - ./embed.cue:31:6 - ./embed.cue:74:6 - ./embed.cue:74:8 - ./embed.cue:74:13 - ./embed.cue:75:8 - ./embed.cue:76:8 -patterns.shallow.andOrEmbed.t1.p1.err1.j: field not allowed: - ./embed.cue:30:6 - ./embed.cue:31:6 - ./embed.cue:32:6 - ./embed.cue:33:6 - ./embed.cue:103:6 - ./embed.cue:104:4 - ./embed.cue:104:9 - ./embed.cue:105:4 - ./embed.cue:105:9 - ./embed.cue:107:9 - ./embed.cue:108:9 -patterns.shallow.andOrEmbed.t1.p2.err1.j: field not allowed: - ./embed.cue:30:6 - ./embed.cue:31:6 - ./embed.cue:32:6 - ./embed.cue:33:6 - ./embed.cue:116:6 - ./embed.cue:117:4 - ./embed.cue:117:9 - ./embed.cue:118:4 - ./embed.cue:118:9 - ./embed.cue:120:9 - ./embed.cue:121:9 -patterns.shallow.andOrEmbed.t2.err1.j: field not allowed: - ./embed.cue:30:6 - ./embed.cue:31:6 - ./embed.cue:32:6 - ./embed.cue:33:6 - ./embed.cue:129:6 - ./embed.cue:130:4 - ./embed.cue:130:9 - ./embed.cue:131:4 - ./embed.cue:131:9 - ./embed.cue:134:9 - ./embed.cue:135:9 -patterns.shallow.indirect.p1.err1.j: field not allowed: - ./embed.cue:146:6 - ./embed.cue:147:7 - ./embed.cue:150:7 - ./embed.cue:151:10 - ./embed.cue:152:10 -patterns.shallow.indirect.p1.err2.j: field not allowed: - ./embed.cue:146:6 - ./embed.cue:147:7 - ./embed.cue:150:7 - ./embed.cue:154:10 - ./embed.cue:155:10 -patterns.shallow.indirect.p2.err1.j: field not allowed: - ./embed.cue:146:6 - ./embed.cue:162:8 - ./embed.cue:163:7 - ./embed.cue:165:10 - ./embed.cue:166:10 -patterns.shallow.indirect.p2.err2.j: field not allowed: - ./embed.cue:146:6 - ./embed.cue:162:8 - ./embed.cue:163:7 - ./embed.cue:168:10 - ./embed.cue:169:10 -patterns.shallow.indirect.p3.err1.j: field not allowed: - ./embed.cue:146:6 - ./embed.cue:147:7 - ./embed.cue:176:7 - ./embed.cue:178:10 - ./embed.cue:179:10 -patterns.shallow.indirect.p3.err2.j: field not allowed: - ./embed.cue:146:6 - ./embed.cue:147:7 - ./embed.cue:176:7 - ./embed.cue:181:10 - ./embed.cue:182:10 -patterns.shallow.indirect.p4.err1.j: field not allowed: - ./embed.cue:146:6 - ./embed.cue:189:8 - ./embed.cue:190:7 - ./embed.cue:193:10 - ./embed.cue:194:10 -patterns.shallow.indirect.p4.err2.j: field not allowed: - ./embed.cue:146:6 - ./embed.cue:189:8 - ./embed.cue:190:7 - ./embed.cue:196:10 - ./embed.cue:197:10 -patterns.shallow.single.err.j: field not allowed: - ./embed.cue:30:6 - ./embed.cue:36:6 - ./embed.cue:37:8 - ./embed.cue:38:8 +a.q.e: field not allowed: + ./in.cue:1:5 + ./in.cue:6:5 + ./in.cue:7:3 + ./in.cue:11:4 + ./in.cue:15:3 +issue852.a.Foo: field not allowed: + ./in.cue:22:6 + ./in.cue:26:5 + ./in.cue:28:5 +indirect.closed.err1.Y.a.e: field not allowed: + ./reroot.cue:73:7 + ./reroot.cue:74:7 + ./reroot.cue:75:7 + ./reroot.cue:77:6 + ./reroot.cue:79:7 + ./reroot.cue:80:7 + ./reroot.cue:82:7 +nested.err1.x.b.f: field not allowed: + ./reroot.cue:112:5 + ./reroot.cue:114:6 + ./reroot.cue:122:8 + ./reroot.cue:123:6 +nested.err1.x.b.g: field not allowed: + ./reroot.cue:112:5 + ./reroot.cue:114:6 + ./reroot.cue:122:8 + ./reroot.cue:123:6 +nested.err1.x.v.c.f: field not allowed: + ./reroot.cue:112:5 + ./reroot.cue:114:6 + ./reroot.cue:115:6 + ./reroot.cue:117:7 + ./reroot.cue:117:11 + ./reroot.cue:122:8 + ./reroot.cue:123:6 +nested.err1.x.v.c.d: field not allowed: + ./reroot.cue:112:5 + ./reroot.cue:114:6 + ./reroot.cue:115:6 + ./reroot.cue:117:7 + ./reroot.cue:118:5 + ./reroot.cue:122:8 + ./reroot.cue:123:6 +nested.err1.x.#V.c.f: field not allowed: + ./reroot.cue:112:5 + ./reroot.cue:114:6 + ./reroot.cue:117:7 + ./reroot.cue:117:11 + ./reroot.cue:122:8 + ./reroot.cue:123:6 +nested.err1.x.#V.c.d: field not allowed: + ./reroot.cue:112:5 + ./reroot.cue:114:6 + ./reroot.cue:117:7 + ./reroot.cue:118:5 + ./reroot.cue:122:8 + ./reroot.cue:123:6 +nested.err2.x.b.g: field not allowed: + ./reroot.cue:128:6 + ./reroot.cue:136:5 + ./reroot.cue:137:8 Result: (_|_){ @@ -2705,54 +2705,10 @@ Result: } -- out/evalalpha -- Errors: -a.q.e: field not allowed: - ./in.cue:15:3 -indirect.closed.err1.Y.a.e: field not allowed: - ./reroot.cue:75:7 issue3778.full.z.b: field not allowed: ./ellipsis.cue:6:3 -issue852.a.Foo: field not allowed: - ./in.cue:28:5 -nested.err1.x.#V.c.d: field not allowed: - ./reroot.cue:118:5 -nested.err1.x.#V.c.f: field not allowed: - ./reroot.cue:114:6 -nested.err1.x.b.f: field not allowed: - ./reroot.cue:114:6 -nested.err1.x.b.g: field not allowed: - ./reroot.cue:123:6 -nested.err2.x.b.g: field not allowed: - ./reroot.cue:137:8 -patterns.nested.and.p1.err.x.y.j: field not allowed: - ./embed.cue:207:12 - ./embed.cue:224:14 -patterns.nested.and.p2.err.x.y.j: field not allowed: - ./embed.cue:207:12 - ./embed.cue:233:14 -patterns.nested.andEmbed.p1.err.x.y.j: field not allowed: - ./embed.cue:207:12 - ./embed.cue:243:14 -patterns.nested.andEmbed.p2.err.x.y.j: field not allowed: - ./embed.cue:207:12 - ./embed.cue:252:14 -patterns.nested.indirect.p1.err1.x.y.j: field not allowed: - ./embed.cue:328:16 -patterns.nested.indirect.p1.err2.x.y.j: field not allowed: - ./embed.cue:331:16 -patterns.nested.indirect.p2.err1.x.y.j: field not allowed: - ./embed.cue:342:16 -patterns.nested.indirect.p2.err2.x.y.j: field not allowed: - ./embed.cue:345:16 -patterns.nested.indirect.p3.err1.x.y.j: field not allowed: - ./embed.cue:355:16 -patterns.nested.indirect.p3.err2.x.y.j: field not allowed: - ./embed.cue:358:16 -patterns.nested.indirect.p4.err1.x.y.j: field not allowed: - ./embed.cue:370:16 -patterns.nested.indirect.p4.err2.x.y.j: field not allowed: - ./embed.cue:373:16 -patterns.nested.single.err.x.y.j: field not allowed: - ./embed.cue:214:14 +patterns.shallow.single.err.j: field not allowed: + ./embed.cue:38:8 patterns.shallow.and.p1.err.j: field not allowed: ./embed.cue:31:6 ./embed.cue:48:8 @@ -2781,8 +2737,52 @@ patterns.shallow.indirect.p4.err1.j: field not allowed: ./embed.cue:194:10 patterns.shallow.indirect.p4.err2.j: field not allowed: ./embed.cue:197:10 -patterns.shallow.single.err.j: field not allowed: - ./embed.cue:38:8 +patterns.nested.single.err.x.y.j: field not allowed: + ./embed.cue:214:14 +patterns.nested.and.p1.err.x.y.j: field not allowed: + ./embed.cue:207:12 + ./embed.cue:224:14 +patterns.nested.and.p2.err.x.y.j: field not allowed: + ./embed.cue:207:12 + ./embed.cue:233:14 +patterns.nested.andEmbed.p1.err.x.y.j: field not allowed: + ./embed.cue:207:12 + ./embed.cue:243:14 +patterns.nested.andEmbed.p2.err.x.y.j: field not allowed: + ./embed.cue:207:12 + ./embed.cue:252:14 +patterns.nested.indirect.p1.err1.x.y.j: field not allowed: + ./embed.cue:328:16 +patterns.nested.indirect.p1.err2.x.y.j: field not allowed: + ./embed.cue:331:16 +patterns.nested.indirect.p2.err1.x.y.j: field not allowed: + ./embed.cue:342:16 +patterns.nested.indirect.p2.err2.x.y.j: field not allowed: + ./embed.cue:345:16 +patterns.nested.indirect.p3.err1.x.y.j: field not allowed: + ./embed.cue:355:16 +patterns.nested.indirect.p3.err2.x.y.j: field not allowed: + ./embed.cue:358:16 +patterns.nested.indirect.p4.err1.x.y.j: field not allowed: + ./embed.cue:370:16 +patterns.nested.indirect.p4.err2.x.y.j: field not allowed: + ./embed.cue:373:16 +a.q.e: field not allowed: + ./in.cue:15:3 +issue852.a.Foo: field not allowed: + ./in.cue:28:5 +indirect.closed.err1.Y.a.e: field not allowed: + ./reroot.cue:75:7 +nested.err1.x.b.f: field not allowed: + ./reroot.cue:114:6 +nested.err1.x.b.g: field not allowed: + ./reroot.cue:123:6 +nested.err1.x.#V.c.d: field not allowed: + ./reroot.cue:118:5 +nested.err1.x.#V.c.f: field not allowed: + ./reroot.cue:114:6 +nested.err2.x.b.g: field not allowed: + ./reroot.cue:137:8 Result: (_|_){ @@ -4136,77 +4136,140 @@ diff old new +++ new @@ -1,315 +1,81 @@ Errors: - a.q.e: field not allowed: -- ./in.cue:1:5 -- ./in.cue:6:5 -- ./in.cue:7:3 -- ./in.cue:11:4 - ./in.cue:15:3 - indirect.closed.err1.Y.a.e: field not allowed: -- ./reroot.cue:73:7 -- ./reroot.cue:74:7 - ./reroot.cue:75:7 -- ./reroot.cue:77:6 -- ./reroot.cue:79:7 -- ./reroot.cue:80:7 -- ./reroot.cue:82:7 issue3778.full.z.b: field not allowed: - ./ellipsis.cue:2:6 - ./ellipsis.cue:3:6 - ./ellipsis.cue:3:13 - ./ellipsis.cue:4:5 ./ellipsis.cue:6:3 - issue852.a.Foo: field not allowed: -- ./in.cue:22:6 -- ./in.cue:26:5 - ./in.cue:28:5 - nested.err1.x.#V.c.d: field not allowed: -- ./reroot.cue:112:5 -- ./reroot.cue:114:6 -- ./reroot.cue:117:7 -- ./reroot.cue:118:5 -- ./reroot.cue:122:8 -- ./reroot.cue:123:6 -+ ./reroot.cue:118:5 - nested.err1.x.#V.c.f: field not allowed: -- ./reroot.cue:112:5 -- ./reroot.cue:114:6 -- ./reroot.cue:117:7 -- ./reroot.cue:117:11 -- ./reroot.cue:122:8 -- ./reroot.cue:123:6 -+ ./reroot.cue:114:6 - nested.err1.x.b.f: field not allowed: -- ./reroot.cue:112:5 -- ./reroot.cue:114:6 -- ./reroot.cue:122:8 -- ./reroot.cue:123:6 -+ ./reroot.cue:114:6 - nested.err1.x.b.g: field not allowed: -- ./reroot.cue:112:5 -- ./reroot.cue:114:6 -- ./reroot.cue:122:8 -- ./reroot.cue:123:6 --nested.err1.x.v.c.d: field not allowed: -- ./reroot.cue:112:5 -- ./reroot.cue:114:6 -- ./reroot.cue:115:6 -- ./reroot.cue:117:7 -- ./reroot.cue:118:5 -- ./reroot.cue:122:8 -- ./reroot.cue:123:6 --nested.err1.x.v.c.f: field not allowed: -- ./reroot.cue:112:5 -- ./reroot.cue:114:6 -- ./reroot.cue:115:6 -- ./reroot.cue:117:7 -- ./reroot.cue:117:11 -- ./reroot.cue:122:8 - ./reroot.cue:123:6 - nested.err2.x.b.g: field not allowed: -- ./reroot.cue:128:6 -- ./reroot.cue:136:5 - ./reroot.cue:137:8 + patterns.shallow.single.err.j: field not allowed: +- ./embed.cue:30:6 +- ./embed.cue:36:6 +- ./embed.cue:37:8 + ./embed.cue:38:8 + patterns.shallow.and.p1.err.j: field not allowed: +- ./embed.cue:30:6 +- ./embed.cue:31:6 +- ./embed.cue:45:6 +- ./embed.cue:45:11 +- ./embed.cue:47:8 ++ ./embed.cue:31:6 + ./embed.cue:48:8 + patterns.shallow.and.p2.err.j: field not allowed: +- ./embed.cue:30:6 +- ./embed.cue:31:6 +- ./embed.cue:55:6 +- ./embed.cue:55:11 +- ./embed.cue:56:8 ++ ./embed.cue:31:6 + ./embed.cue:57:8 + patterns.shallow.andEmbed.p1.err.j: field not allowed: +- ./embed.cue:30:6 +- ./embed.cue:31:6 +- ./embed.cue:64:6 +- ./embed.cue:64:8 +- ./embed.cue:64:13 +- ./embed.cue:66:8 ++ ./embed.cue:31:6 + ./embed.cue:67:8 + patterns.shallow.andEmbed.p2.err.j: field not allowed: +- ./embed.cue:30:6 +- ./embed.cue:31:6 +- ./embed.cue:74:6 +- ./embed.cue:74:8 +- ./embed.cue:74:13 +- ./embed.cue:75:8 ++ ./embed.cue:31:6 + ./embed.cue:76:8 +-patterns.shallow.andOrEmbed.t1.p1.err1.j: field not allowed: +- ./embed.cue:30:6 +- ./embed.cue:31:6 +- ./embed.cue:32:6 +- ./embed.cue:33:6 +- ./embed.cue:103:6 +- ./embed.cue:104:4 +- ./embed.cue:104:9 +- ./embed.cue:105:4 +- ./embed.cue:105:9 +- ./embed.cue:107:9 +- ./embed.cue:108:9 +-patterns.shallow.andOrEmbed.t1.p2.err1.j: field not allowed: +- ./embed.cue:30:6 +- ./embed.cue:31:6 +- ./embed.cue:32:6 +- ./embed.cue:33:6 +- ./embed.cue:116:6 +- ./embed.cue:117:4 +- ./embed.cue:117:9 +- ./embed.cue:118:4 +- ./embed.cue:118:9 +- ./embed.cue:120:9 +- ./embed.cue:121:9 +-patterns.shallow.andOrEmbed.t2.err1.j: field not allowed: +- ./embed.cue:30:6 +- ./embed.cue:31:6 +- ./embed.cue:32:6 +- ./embed.cue:33:6 +- ./embed.cue:129:6 +- ./embed.cue:130:4 +- ./embed.cue:130:9 +- ./embed.cue:131:4 +- ./embed.cue:131:9 +- ./embed.cue:134:9 +- ./embed.cue:135:9 + patterns.shallow.indirect.p1.err1.j: field not allowed: +- ./embed.cue:146:6 +- ./embed.cue:147:7 +- ./embed.cue:150:7 +- ./embed.cue:151:10 + ./embed.cue:152:10 + patterns.shallow.indirect.p1.err2.j: field not allowed: +- ./embed.cue:146:6 +- ./embed.cue:147:7 +- ./embed.cue:150:7 +- ./embed.cue:154:10 + ./embed.cue:155:10 + patterns.shallow.indirect.p2.err1.j: field not allowed: +- ./embed.cue:146:6 +- ./embed.cue:162:8 +- ./embed.cue:163:7 +- ./embed.cue:165:10 + ./embed.cue:166:10 + patterns.shallow.indirect.p2.err2.j: field not allowed: +- ./embed.cue:146:6 +- ./embed.cue:162:8 +- ./embed.cue:163:7 +- ./embed.cue:168:10 + ./embed.cue:169:10 + patterns.shallow.indirect.p3.err1.j: field not allowed: +- ./embed.cue:146:6 +- ./embed.cue:147:7 +- ./embed.cue:176:7 +- ./embed.cue:178:10 + ./embed.cue:179:10 + patterns.shallow.indirect.p3.err2.j: field not allowed: +- ./embed.cue:146:6 +- ./embed.cue:147:7 +- ./embed.cue:176:7 +- ./embed.cue:181:10 + ./embed.cue:182:10 + patterns.shallow.indirect.p4.err1.j: field not allowed: +- ./embed.cue:146:6 +- ./embed.cue:189:8 +- ./embed.cue:190:7 +- ./embed.cue:193:10 + ./embed.cue:194:10 + patterns.shallow.indirect.p4.err2.j: field not allowed: +- ./embed.cue:146:6 +- ./embed.cue:189:8 +- ./embed.cue:190:7 +- ./embed.cue:196:10 + ./embed.cue:197:10 + patterns.nested.single.err.x.y.j: field not allowed: +- ./embed.cue:206:12 +- ./embed.cue:212:6 +- ./embed.cue:213:8 + ./embed.cue:214:14 patterns.nested.and.p1.err.x.y.j: field not allowed: - ./embed.cue:206:12 - ./embed.cue:207:12 @@ -4331,134 +4394,72 @@ diff old new - ./embed.cue:366:7 - ./embed.cue:372:10 ./embed.cue:373:16 - patterns.nested.single.err.x.y.j: field not allowed: -- ./embed.cue:206:12 -- ./embed.cue:212:6 -- ./embed.cue:213:8 - ./embed.cue:214:14 - patterns.shallow.and.p1.err.j: field not allowed: -- ./embed.cue:30:6 -- ./embed.cue:31:6 -- ./embed.cue:45:6 -- ./embed.cue:45:11 -- ./embed.cue:47:8 -+ ./embed.cue:31:6 - ./embed.cue:48:8 - patterns.shallow.and.p2.err.j: field not allowed: -- ./embed.cue:30:6 -- ./embed.cue:31:6 -- ./embed.cue:55:6 -- ./embed.cue:55:11 -- ./embed.cue:56:8 -+ ./embed.cue:31:6 - ./embed.cue:57:8 - patterns.shallow.andEmbed.p1.err.j: field not allowed: -- ./embed.cue:30:6 -- ./embed.cue:31:6 -- ./embed.cue:64:6 -- ./embed.cue:64:8 -- ./embed.cue:64:13 -- ./embed.cue:66:8 -+ ./embed.cue:31:6 - ./embed.cue:67:8 - patterns.shallow.andEmbed.p2.err.j: field not allowed: -- ./embed.cue:30:6 -- ./embed.cue:31:6 -- ./embed.cue:74:6 -- ./embed.cue:74:8 -- ./embed.cue:74:13 -- ./embed.cue:75:8 -+ ./embed.cue:31:6 - ./embed.cue:76:8 --patterns.shallow.andOrEmbed.t1.p1.err1.j: field not allowed: -- ./embed.cue:30:6 -- ./embed.cue:31:6 -- ./embed.cue:32:6 -- ./embed.cue:33:6 -- ./embed.cue:103:6 -- ./embed.cue:104:4 -- ./embed.cue:104:9 -- ./embed.cue:105:4 -- ./embed.cue:105:9 -- ./embed.cue:107:9 -- ./embed.cue:108:9 --patterns.shallow.andOrEmbed.t1.p2.err1.j: field not allowed: -- ./embed.cue:30:6 -- ./embed.cue:31:6 -- ./embed.cue:32:6 -- ./embed.cue:33:6 -- ./embed.cue:116:6 -- ./embed.cue:117:4 -- ./embed.cue:117:9 -- ./embed.cue:118:4 -- ./embed.cue:118:9 -- ./embed.cue:120:9 -- ./embed.cue:121:9 --patterns.shallow.andOrEmbed.t2.err1.j: field not allowed: -- ./embed.cue:30:6 -- ./embed.cue:31:6 -- ./embed.cue:32:6 -- ./embed.cue:33:6 -- ./embed.cue:129:6 -- ./embed.cue:130:4 -- ./embed.cue:130:9 -- ./embed.cue:131:4 -- ./embed.cue:131:9 -- ./embed.cue:134:9 -- ./embed.cue:135:9 - patterns.shallow.indirect.p1.err1.j: field not allowed: -- ./embed.cue:146:6 -- ./embed.cue:147:7 -- ./embed.cue:150:7 -- ./embed.cue:151:10 - ./embed.cue:152:10 - patterns.shallow.indirect.p1.err2.j: field not allowed: -- ./embed.cue:146:6 -- ./embed.cue:147:7 -- ./embed.cue:150:7 -- ./embed.cue:154:10 - ./embed.cue:155:10 - patterns.shallow.indirect.p2.err1.j: field not allowed: -- ./embed.cue:146:6 -- ./embed.cue:162:8 -- ./embed.cue:163:7 -- ./embed.cue:165:10 - ./embed.cue:166:10 - patterns.shallow.indirect.p2.err2.j: field not allowed: -- ./embed.cue:146:6 -- ./embed.cue:162:8 -- ./embed.cue:163:7 -- ./embed.cue:168:10 - ./embed.cue:169:10 - patterns.shallow.indirect.p3.err1.j: field not allowed: -- ./embed.cue:146:6 -- ./embed.cue:147:7 -- ./embed.cue:176:7 -- ./embed.cue:178:10 - ./embed.cue:179:10 - patterns.shallow.indirect.p3.err2.j: field not allowed: -- ./embed.cue:146:6 -- ./embed.cue:147:7 -- ./embed.cue:176:7 -- ./embed.cue:181:10 - ./embed.cue:182:10 - patterns.shallow.indirect.p4.err1.j: field not allowed: -- ./embed.cue:146:6 -- ./embed.cue:189:8 -- ./embed.cue:190:7 -- ./embed.cue:193:10 - ./embed.cue:194:10 - patterns.shallow.indirect.p4.err2.j: field not allowed: -- ./embed.cue:146:6 -- ./embed.cue:189:8 -- ./embed.cue:190:7 -- ./embed.cue:196:10 - ./embed.cue:197:10 - patterns.shallow.single.err.j: field not allowed: -- ./embed.cue:30:6 -- ./embed.cue:36:6 -- ./embed.cue:37:8 - ./embed.cue:38:8 + a.q.e: field not allowed: +- ./in.cue:1:5 +- ./in.cue:6:5 +- ./in.cue:7:3 +- ./in.cue:11:4 + ./in.cue:15:3 + issue852.a.Foo: field not allowed: +- ./in.cue:22:6 +- ./in.cue:26:5 + ./in.cue:28:5 + indirect.closed.err1.Y.a.e: field not allowed: +- ./reroot.cue:73:7 +- ./reroot.cue:74:7 + ./reroot.cue:75:7 +- ./reroot.cue:77:6 +- ./reroot.cue:79:7 +- ./reroot.cue:80:7 +- ./reroot.cue:82:7 + nested.err1.x.b.f: field not allowed: +- ./reroot.cue:112:5 +- ./reroot.cue:114:6 +- ./reroot.cue:122:8 +- ./reroot.cue:123:6 ++ ./reroot.cue:114:6 + nested.err1.x.b.g: field not allowed: +- ./reroot.cue:112:5 +- ./reroot.cue:114:6 +- ./reroot.cue:122:8 +- ./reroot.cue:123:6 +-nested.err1.x.v.c.f: field not allowed: +- ./reroot.cue:112:5 +- ./reroot.cue:114:6 +- ./reroot.cue:115:6 +- ./reroot.cue:117:7 +- ./reroot.cue:117:11 +- ./reroot.cue:122:8 +- ./reroot.cue:123:6 +-nested.err1.x.v.c.d: field not allowed: +- ./reroot.cue:112:5 +- ./reroot.cue:114:6 +- ./reroot.cue:115:6 +- ./reroot.cue:117:7 +- ./reroot.cue:118:5 +- ./reroot.cue:122:8 +- ./reroot.cue:123:6 +-nested.err1.x.#V.c.f: field not allowed: +- ./reroot.cue:112:5 +- ./reroot.cue:114:6 +- ./reroot.cue:117:7 +- ./reroot.cue:117:11 +- ./reroot.cue:122:8 + ./reroot.cue:123:6 + nested.err1.x.#V.c.d: field not allowed: +- ./reroot.cue:112:5 +- ./reroot.cue:114:6 +- ./reroot.cue:117:7 +- ./reroot.cue:118:5 +- ./reroot.cue:122:8 +- ./reroot.cue:123:6 ++ ./reroot.cue:118:5 ++nested.err1.x.#V.c.f: field not allowed: ++ ./reroot.cue:114:6 + nested.err2.x.b.g: field not allowed: +- ./reroot.cue:128:6 +- ./reroot.cue:136:5 + ./reroot.cue:137:8 Result: @@ -330,10 +96,6 @@ diff --git a/cue/testdata/eval/conjuncts.txtar b/cue/testdata/eval/conjuncts.txtar index da8840861d2..97451adde89 100644 --- a/cue/testdata/eval/conjuncts.txtar +++ b/cue/testdata/eval/conjuncts.txtar @@ -195,9 +195,9 @@ diff old new - t3: (_|_){ - // [incomplete] conjunct.t3: 2 errors in empty disjunction: - // conjunct.t3: cannot add field #early: was already used: -- // ./in.cue:6:2 -- // conjunct.t3: cannot add field #early: was already used: - // ./in.cue:15:2 +- // conjunct.t3: cannot add field #early: was already used: +- // ./in.cue:6:2 - #early: (string){ |(*(string){ "X" }, (string){ string }) } - } + t3: (string){ |(*(string){ @@ -273,9 +273,9 @@ Result: t3: (_|_){ // [incomplete] conjunct.t3: 2 errors in empty disjunction: // conjunct.t3: cannot add field #early: was already used: - // ./in.cue:6:2 - // conjunct.t3: cannot add field #early: was already used: // ./in.cue:15:2 + // conjunct.t3: cannot add field #early: was already used: + // ./in.cue:6:2 #early: (string){ |(*(string){ "X" }, (string){ string }) } } } diff --git a/cue/testdata/eval/disjunctions.txtar b/cue/testdata/eval/disjunctions.txtar index fb930ab9b00..ad78e99b63a 100644 --- a/cue/testdata/eval/disjunctions.txtar +++ b/cue/testdata/eval/disjunctions.txtar @@ -285,6 +285,12 @@ Conjuncts: 1394 Disjuncts: 756 -- out/evalalpha -- Errors: +issue3606.data: 2 errors in empty disjunction: +issue3606.data: conflicting values string and {notAllowed:true} (mismatched types string and struct): + ./dependencies.cue:2:8 + ./dependencies.cue:6:6 +issue3606.data.notAllowed: field not allowed: + ./dependencies.cue:3:3 f: 2 errors in empty disjunction: f.name: conflicting values "int" and "str": ./in.cue:5:8 @@ -292,12 +298,6 @@ f.name: conflicting values "int" and "str": f.val: conflicting values 3 and string (mismatched types int and string): ./in.cue:9:8 ./in.cue:15:27 -issue3606.data: 2 errors in empty disjunction: -issue3606.data: conflicting values string and {notAllowed:true} (mismatched types string and struct): - ./dependencies.cue:2:8 - ./dependencies.cue:6:6 -issue3606.data.notAllowed: field not allowed: - ./dependencies.cue:3:3 Result: (_|_){ @@ -704,7 +704,12 @@ Result: diff old new --- old +++ new -@@ -2,11 +2,9 @@ +@@ -5,16 +5,12 @@ + ./dependencies.cue:6:6 + issue3606.data.notAllowed: field not allowed: + ./dependencies.cue:3:3 +- ./dependencies.cue:4:6 +- ./dependencies.cue:6:15 f: 2 errors in empty disjunction: f.name: conflicting values "int" and "str": ./in.cue:5:8 @@ -714,17 +719,8 @@ diff old new ./in.cue:9:8 - ./in.cue:15:4 ./in.cue:15:27 - issue3606.data: 2 errors in empty disjunction: - issue3606.data: conflicting values string and {notAllowed:true} (mismatched types string and struct): -@@ -14,8 +12,6 @@ - ./dependencies.cue:6:6 - issue3606.data.notAllowed: field not allowed: - ./dependencies.cue:3:3 -- ./dependencies.cue:4:6 -- ./dependencies.cue:6:15 Result: - (_|_){ @@ -29,14 +25,7 @@ // ./dependencies.cue:6:6 // issue3606.data.notAllowed: field not allowed: @@ -800,6 +796,14 @@ Missing error positions. conveyed properly. -- out/eval -- Errors: +issue3606.data: 2 errors in empty disjunction: +issue3606.data: conflicting values string and {notAllowed:true} (mismatched types string and struct): + ./dependencies.cue:2:8 + ./dependencies.cue:6:6 +issue3606.data.notAllowed: field not allowed: + ./dependencies.cue:3:3 + ./dependencies.cue:4:6 + ./dependencies.cue:6:15 f: 2 errors in empty disjunction: f.name: conflicting values "int" and "str": ./in.cue:5:8 @@ -809,14 +813,6 @@ f.val: conflicting values 3 and string (mismatched types int and string): ./in.cue:9:8 ./in.cue:15:4 ./in.cue:15:27 -issue3606.data: 2 errors in empty disjunction: -issue3606.data: conflicting values string and {notAllowed:true} (mismatched types string and struct): - ./dependencies.cue:2:8 - ./dependencies.cue:6:6 -issue3606.data.notAllowed: field not allowed: - ./dependencies.cue:3:3 - ./dependencies.cue:4:6 - ./dependencies.cue:6:15 Result: (_|_){ diff --git a/cue/testdata/eval/dynamic_field.txtar b/cue/testdata/eval/dynamic_field.txtar index c3d7d465e3e..2f93f82bf77 100644 --- a/cue/testdata/eval/dynamic_field.txtar +++ b/cue/testdata/eval/dynamic_field.txtar @@ -180,11 +180,11 @@ Result: foo: (struct){ bar: (struct){ entries: (_|_){ - // [incomplete] noCycleError.foo.baz.#ID: invalid interpolation: non-concrete value string (type string): + // [incomplete] noCycleError.foo.bar.entries: key value of dynamic field must be concrete, found _|_(invalid interpolation: noCycleError.foo.baz.#ID: non-concrete value string (type string)): + // ./in.cue:61:22 + // noCycleError.foo.baz.#ID: invalid interpolation: non-concrete value string (type string): // ./in.cue:59:8 // ./in.cue:59:11 - // noCycleError.foo.bar.entries: key value of dynamic field must be concrete, found _|_(invalid interpolation: noCycleError.foo.baz.#ID: non-concrete value string (type string)): - // ./in.cue:61:22 } #ID: (_|_){ // [incomplete] noCycleError.foo.bar.#ID: invalid interpolation: non-concrete value string (type string): @@ -253,15 +253,17 @@ diff old new withError: (_|_){ // [eval] issue799: (_|_){ -@@ -81,6 +79,8 @@ - // [incomplete] noCycleError.foo.baz.#ID: invalid interpolation: non-concrete value string (type string): +@@ -78,7 +76,9 @@ + foo: (struct){ + bar: (struct){ + entries: (_|_){ +- // [incomplete] noCycleError.foo.baz.#ID: invalid interpolation: non-concrete value string (type string): ++ // [incomplete] noCycleError.foo.bar.entries: key value of dynamic field must be concrete, found _|_(invalid interpolation: noCycleError.foo.baz.#ID: non-concrete value string (type string)): ++ // ./in.cue:61:22 ++ // noCycleError.foo.baz.#ID: invalid interpolation: non-concrete value string (type string): // ./in.cue:59:8 // ./in.cue:59:11 -+ // noCycleError.foo.bar.entries: key value of dynamic field must be concrete, found _|_(invalid interpolation: noCycleError.foo.baz.#ID: non-concrete value string (type string)): -+ // ./in.cue:61:22 } - #ID: (_|_){ - // [incomplete] noCycleError.foo.bar.#ID: invalid interpolation: non-concrete value string (type string): @@ -123,6 +123,9 @@ botUser: (string){ "bot1" } } diff --git a/cue/testdata/eval/issue3672.txtar b/cue/testdata/eval/issue3672.txtar index 553d39e7a44..cbbf0c4a6a2 100644 --- a/cue/testdata/eval/issue3672.txtar +++ b/cue/testdata/eval/issue3672.txtar @@ -682,29 +682,26 @@ Disjuncts: 449487 0: (string){ "UseSectionName" let INL#9 = (_|_){ - // [eval] value0.xs.0.INL: conflicting values [...] and string (mismatched types list and string): + // [eval] value0.xs.0.INL: 5 errors in empty disjunction:: + // ./x.cue:113:7 + // value0.xs.0.INL: conflicting values [...] and string (mismatched types list and string): // ./x.cue:51:14 // ./x.cue:111:18 + // value0.xs.0.INL: conflicting values [...] and {UseSectionName:true} (mismatched types list and struct): + // ./x.cue:51:23 + // ./x.cue:111:18 // value0.xs.0.INL: conflicting values [...] and {Append:#ConfigText} (mismatched types list and struct): // ./x.cue:53:32 // ./x.cue:111:18 // value0.xs.0.INL: conflicting values [...] and {Prepend:#ConfigText} (mismatched types list and struct): // ./x.cue:53:56 // ./x.cue:111:18 - // value0.xs.0.INL: conflicting values [...] and {UseSectionName:true} (mismatched types list and struct): - // ./x.cue:51:23 - // ./x.cue:111:18 - // value0.xs.0.INL: 2 errors in empty disjunction:: - // ./x.cue:113:7 UseSectionName: (_|_){ // [cycle] cycle error } } let INA#7 = (_|_){ - // [eval] value0.xs.0.INA: conflicting values {Prepend:#ConfigText} and [#ConfigTextRule,#ConfigTextRule,...#ConfigTextRule] (mismatched types struct and list): - // ./x.cue:53:56 - // ./x.cue:55:37 - // value0.xs.0.INA: 3 errors in empty disjunction:: + // [eval] value0.xs.0.INA: 3 errors in empty disjunction:: // ./x.cue:97:7 // value0.xs.0.INA.Append: field not allowed: // ./x.cue:97:7 @@ -712,18 +709,21 @@ Disjuncts: 449487 // value0.xs.0.INA.UseSectionName: field not allowed: // ./x.cue:97:7 // ./x.cue:124:17 + // value0.xs.0.INA: conflicting values {Prepend:#ConfigText} and [#ConfigTextRule,#ConfigTextRule,...#ConfigTextRule] (mismatched types struct and list): + // ./x.cue:53:56 + // ./x.cue:55:37 Append: (_){ _ } UseSectionName: (bool){ true } } let INP#8 = (_|_){ - // [eval] value0.xs.0.INP: conflicting values {Prepend:#ConfigText} and [#ConfigTextRule,#ConfigTextRule,...#ConfigTextRule] (mismatched types struct and list): - // ./x.cue:53:56 - // ./x.cue:55:37 - // value0.xs.0.INP: 2 errors in empty disjunction:: + // [eval] value0.xs.0.INP: 2 errors in empty disjunction:: // ./x.cue:100:7 // value0.xs.0.INP.UseSectionName: field not allowed: // ./x.cue:100:7 // ./x.cue:124:17 + // value0.xs.0.INP: conflicting values {Prepend:#ConfigText} and [#ConfigTextRule,#ConfigTextRule,...#ConfigTextRule] (mismatched types struct and list): + // ./x.cue:53:56 + // ./x.cue:55:37 Prepend: (_){ _ } UseSectionName: (bool){ true } } @@ -884,28 +884,26 @@ diff old new } } value0: (#struct){ -@@ -304,1182 +338,58 @@ - 0: (string){ - "UseSectionName" +@@ -306,1158 +340,56 @@ let INL#9 = (_|_){ -- // [eval] value0.xs.0.INL: conflicting values [#ConfigTextRule,#ConfigTextRule,...#ConfigTextRule] and {UseSectionName:true} (mismatched types list and struct): + // [eval] value0.xs.0.INL: 5 errors in empty disjunction:: + // ./x.cue:113:7 +- // value0.xs.0.INL: conflicting values string and [...] (mismatched types string and list): - // ./x.cue:22:52 - // ./x.cue:44:29 -- // ./x.cue:44:56 -- // ./x.cue:55:37 +- // ./x.cue:51:14 - // ./x.cue:62:25 - // ./x.cue:70:12 -- // ./x.cue:70:47 -- // ./x.cue:111:13 +- // ./x.cue:111:18 - // ./x.cue:123:9 -- // ./x.cue:124:16 -+ // [eval] value0.xs.0.INL: conflicting values [...] and string (mismatched types list and string): ++ // value0.xs.0.INL: conflicting values [...] and string (mismatched types list and string): + // ./x.cue:51:14 + // ./x.cue:111:18 - // value0.xs.0.INL: conflicting values [...] and {Append:#ConfigText} (mismatched types list and struct): + // value0.xs.0.INL: conflicting values [...] and {UseSectionName:true} (mismatched types list and struct): - // ./x.cue:22:52 - // ./x.cue:44:29 -- // ./x.cue:53:32 +- // ./x.cue:51:23 +- // ./x.cue:53:18 - // ./x.cue:55:19 - // ./x.cue:62:25 - // ./x.cue:70:12 @@ -913,12 +911,12 @@ diff old new - // ./x.cue:111:13 - // ./x.cue:111:18 - // ./x.cue:123:9 -+ // ./x.cue:53:32 ++ // ./x.cue:51:23 + // ./x.cue:111:18 - // value0.xs.0.INL: conflicting values [...] and {Prepend:#ConfigText} (mismatched types list and struct): + // value0.xs.0.INL: conflicting values [...] and {Append:#ConfigText} (mismatched types list and struct): - // ./x.cue:22:52 - // ./x.cue:44:29 -- // ./x.cue:53:56 +- // ./x.cue:53:32 - // ./x.cue:55:19 - // ./x.cue:62:25 - // ./x.cue:70:12 @@ -926,13 +924,12 @@ diff old new - // ./x.cue:111:13 - // ./x.cue:111:18 - // ./x.cue:123:9 -+ // ./x.cue:53:56 ++ // ./x.cue:53:32 + // ./x.cue:111:18 - // value0.xs.0.INL: conflicting values [...] and {UseSectionName:true} (mismatched types list and struct): + // value0.xs.0.INL: conflicting values [...] and {Prepend:#ConfigText} (mismatched types list and struct): - // ./x.cue:22:52 - // ./x.cue:44:29 -- // ./x.cue:51:23 -- // ./x.cue:53:18 +- // ./x.cue:53:56 - // ./x.cue:55:19 - // ./x.cue:62:25 - // ./x.cue:70:12 @@ -940,21 +937,21 @@ diff old new - // ./x.cue:111:13 - // ./x.cue:111:18 - // ./x.cue:123:9 -- // value0.xs.0.INL: conflicting values string and [...] (mismatched types string and list): +- // value0.xs.0.INL: conflicting values [#ConfigTextRule,#ConfigTextRule,...#ConfigTextRule] and {UseSectionName:true} (mismatched types list and struct): - // ./x.cue:22:52 - // ./x.cue:44:29 -- // ./x.cue:51:14 +- // ./x.cue:44:56 +- // ./x.cue:55:37 - // ./x.cue:62:25 - // ./x.cue:70:12 -- // ./x.cue:111:18 +- // ./x.cue:70:47 +- // ./x.cue:111:13 - // ./x.cue:123:9 -- // value0.xs.0.INL: 5 errors in empty disjunction:: -+ // ./x.cue:51:23 -+ // ./x.cue:111:18 -+ // value0.xs.0.INL: 2 errors in empty disjunction:: - // ./x.cue:113:7 - UseSectionName: (_|_){ -- // [eval] value0.xs.0.INL.UseSectionName: conflicting values true and string (mismatched types bool and string): +- // ./x.cue:124:16 +- UseSectionName: (_|_){ +- // [eval] value0.xs.0.INL.UseSectionName: 4 errors in empty disjunction:: +- // ./x.cue:113:7 +- // value0.xs.0.INL.UseSectionName: conflicting values true and string (mismatched types bool and string): - // ./x.cue:22:52 - // ./x.cue:44:29 - // ./x.cue:51:14 @@ -967,10 +964,11 @@ diff old new - // ./x.cue:111:13 - // ./x.cue:123:9 - // ./x.cue:124:33 -- // value0.xs.0.INL.UseSectionName: conflicting values true and {Append:#ConfigText} (mismatched types bool and struct): +- // value0.xs.0.INL.UseSectionName: conflicting values true and {UseSectionName:true} (mismatched types bool and struct): - // ./x.cue:22:52 - // ./x.cue:44:29 -- // ./x.cue:53:32 +- // ./x.cue:51:23 +- // ./x.cue:53:18 - // ./x.cue:55:72 - // ./x.cue:55:75 - // ./x.cue:62:25 @@ -979,10 +977,10 @@ diff old new - // ./x.cue:111:13 - // ./x.cue:123:9 - // ./x.cue:124:33 -- // value0.xs.0.INL.UseSectionName: conflicting values true and {Prepend:#ConfigText} (mismatched types bool and struct): +- // value0.xs.0.INL.UseSectionName: conflicting values true and {Append:#ConfigText} (mismatched types bool and struct): - // ./x.cue:22:52 - // ./x.cue:44:29 -- // ./x.cue:53:56 +- // ./x.cue:53:32 - // ./x.cue:55:72 - // ./x.cue:55:75 - // ./x.cue:62:25 @@ -991,11 +989,10 @@ diff old new - // ./x.cue:111:13 - // ./x.cue:123:9 - // ./x.cue:124:33 -- // value0.xs.0.INL.UseSectionName: conflicting values true and {UseSectionName:true} (mismatched types bool and struct): +- // value0.xs.0.INL.UseSectionName: conflicting values true and {Prepend:#ConfigText} (mismatched types bool and struct): - // ./x.cue:22:52 - // ./x.cue:44:29 -- // ./x.cue:51:23 -- // ./x.cue:53:18 +- // ./x.cue:53:56 - // ./x.cue:55:72 - // ./x.cue:55:75 - // ./x.cue:62:25 @@ -1004,8 +1001,6 @@ diff old new - // ./x.cue:111:13 - // ./x.cue:123:9 - // ./x.cue:124:33 -- // value0.xs.0.INL.UseSectionName: 4 errors in empty disjunction:: -- // ./x.cue:113:7 - Prepend: ((string|struct)){ |((string){ string }, (#struct){ - UseSectionName: (bool){ true } - }) } @@ -1032,54 +1027,50 @@ diff old new - UseSectionName: (bool){ true } - }) } - }) } ++ // ./x.cue:53:56 ++ // ./x.cue:111:18 ++ UseSectionName: (_|_){ + // [cycle] cycle error + } } let INA#7 = (_|_){ -- // [eval] value0.xs.0.INA: conflicting values [#ConfigTextRule,#ConfigTextRule,...#ConfigTextRule] and {Append:#ConfigText} (mismatched types list and struct): +- // [eval] value0.xs.0.INA: 9 errors in empty disjunction:: +- // ./x.cue:97:7 +- // value0.xs.0.INA: conflicting values string and {Append:_} (mismatched types string and struct): - // ./x.cue:22:52 - // ./x.cue:44:29 -- // ./x.cue:53:32 -- // ./x.cue:55:19 -- // ./x.cue:55:37 +- // ./x.cue:51:14 - // ./x.cue:62:25 - // ./x.cue:70:12 -- // ./x.cue:94:13 -- // ./x.cue:109:13 +- // ./x.cue:94:18 - // ./x.cue:112:3 - // ./x.cue:118:4 -- // ./x.cue:118:38 - // ./x.cue:123:9 -- // value0.xs.0.INA: conflicting values [#ConfigTextRule,#ConfigTextRule,...#ConfigTextRule] and {Prepend:#ConfigText} (mismatched types list and struct): +- // value0.xs.0.INA: conflicting values string and {UseSectionName:true} (mismatched types string and struct): - // ./x.cue:22:52 - // ./x.cue:44:29 -- // ./x.cue:53:56 -- // ./x.cue:55:19 -- // ./x.cue:55:37 +- // ./x.cue:51:14 +- // ./x.cue:51:23 +- // ./x.cue:53:18 - // ./x.cue:62:25 - // ./x.cue:70:12 +- // ./x.cue:92:13 - // ./x.cue:94:13 -- // ./x.cue:109:13 - // ./x.cue:112:3 - // ./x.cue:118:4 -- // ./x.cue:118:38 - // ./x.cue:123:9 - // value0.xs.0.INA: conflicting values [#ConfigTextRule,#ConfigTextRule,...#ConfigTextRule] and {UseSectionName:true} (mismatched types list and struct): - // ./x.cue:22:52 -- // ./x.cue:28:12 - // ./x.cue:44:29 - // ./x.cue:51:23 - // ./x.cue:53:18 -- // ./x.cue:55:19 - // ./x.cue:55:37 -- // ./x.cue:59:9 - // ./x.cue:62:25 - // ./x.cue:70:12 -- // ./x.cue:70:47 +- // ./x.cue:92:13 - // ./x.cue:94:13 - // ./x.cue:112:3 - // ./x.cue:118:4 -- // ./x.cue:118:38 - // ./x.cue:123:9 - // value0.xs.0.INA: conflicting values string and {Append:#ConfigText} (mismatched types string and struct): - // ./x.cue:22:52 @@ -1093,38 +1084,35 @@ diff old new - // ./x.cue:112:3 - // ./x.cue:118:4 - // ./x.cue:123:9 -- // value0.xs.0.INA: conflicting values string and {Append:_} (mismatched types string and struct): +- // value0.xs.0.INA: conflicting values [#ConfigTextRule,#ConfigTextRule,...#ConfigTextRule] and {Append:#ConfigText} (mismatched types list and struct): - // ./x.cue:22:52 - // ./x.cue:44:29 -- // ./x.cue:51:14 +- // ./x.cue:53:32 +- // ./x.cue:55:37 - // ./x.cue:62:25 - // ./x.cue:70:12 -- // ./x.cue:94:18 +- // ./x.cue:92:13 +- // ./x.cue:94:13 - // ./x.cue:112:3 - // ./x.cue:118:4 - // ./x.cue:123:9 - // value0.xs.0.INA: conflicting values string and {Prepend:#ConfigText} (mismatched types string and struct): - // ./x.cue:22:52 -- // ./x.cue:28:12 - // ./x.cue:44:29 - // ./x.cue:51:14 - // ./x.cue:53:56 -- // ./x.cue:55:19 -- // ./x.cue:59:9 - // ./x.cue:62:25 - // ./x.cue:70:12 -- // ./x.cue:70:47 +- // ./x.cue:92:13 - // ./x.cue:94:13 - // ./x.cue:112:3 - // ./x.cue:118:4 -- // ./x.cue:118:38 - // ./x.cue:123:9 -- // value0.xs.0.INA: conflicting values string and {UseSectionName:true} (mismatched types string and struct): +- // value0.xs.0.INA: conflicting values [#ConfigTextRule,#ConfigTextRule,...#ConfigTextRule] and {Prepend:#ConfigText} (mismatched types list and struct): - // ./x.cue:22:52 - // ./x.cue:44:29 -- // ./x.cue:51:14 -- // ./x.cue:51:23 -- // ./x.cue:53:18 +- // ./x.cue:53:56 +- // ./x.cue:55:37 - // ./x.cue:62:25 - // ./x.cue:70:12 - // ./x.cue:92:13 @@ -1132,12 +1120,8 @@ diff old new - // ./x.cue:112:3 - // ./x.cue:118:4 - // ./x.cue:123:9 -- // value0.xs.0.INA: 9 errors in empty disjunction:: -+ // [eval] value0.xs.0.INA: conflicting values {Prepend:#ConfigText} and [#ConfigTextRule,#ConfigTextRule,...#ConfigTextRule] (mismatched types struct and list): -+ // ./x.cue:53:56 -+ // ./x.cue:55:37 -+ // value0.xs.0.INA: 3 errors in empty disjunction:: - // ./x.cue:97:7 ++ // [eval] value0.xs.0.INA: 3 errors in empty disjunction:: ++ // ./x.cue:97:7 // value0.xs.0.INA.Append: field not allowed: // ./x.cue:97:7 - // ./x.cue:15:14 @@ -1188,7 +1172,9 @@ diff old new - // ./x.cue:123:9 - // ./x.cue:124:17 - UseSectionName: (_|_){ -- // [eval] value0.xs.0.INA.UseSectionName: conflicting values true and string (mismatched types bool and string): +- // [eval] value0.xs.0.INA.UseSectionName: 4 errors in empty disjunction:: +- // ./x.cue:97:7 +- // value0.xs.0.INA.UseSectionName: conflicting values true and string (mismatched types bool and string): - // ./x.cue:15:14 - // ./x.cue:22:52 - // ./x.cue:44:29 @@ -1207,12 +1193,13 @@ diff old new - // ./x.cue:118:38 - // ./x.cue:123:9 - // ./x.cue:124:33 -- // value0.xs.0.INA.UseSectionName: conflicting values true and {Append:#ConfigText} (mismatched types bool and struct): +- // value0.xs.0.INA.UseSectionName: conflicting values true and {UseSectionName:true} (mismatched types bool and struct): - // ./x.cue:15:14 - // ./x.cue:22:52 - // ./x.cue:44:29 - // ./x.cue:44:56 -- // ./x.cue:53:32 +- // ./x.cue:51:23 +- // ./x.cue:53:18 - // ./x.cue:55:72 - // ./x.cue:55:75 - // ./x.cue:59:9 @@ -1225,12 +1212,12 @@ diff old new - // ./x.cue:118:38 - // ./x.cue:123:9 - // ./x.cue:124:33 -- // value0.xs.0.INA.UseSectionName: conflicting values true and {Prepend:#ConfigText} (mismatched types bool and struct): +- // value0.xs.0.INA.UseSectionName: conflicting values true and {Append:#ConfigText} (mismatched types bool and struct): - // ./x.cue:15:14 - // ./x.cue:22:52 - // ./x.cue:44:29 - // ./x.cue:44:56 -- // ./x.cue:53:56 +- // ./x.cue:53:32 - // ./x.cue:55:72 - // ./x.cue:55:75 - // ./x.cue:59:9 @@ -1243,13 +1230,12 @@ diff old new - // ./x.cue:118:38 - // ./x.cue:123:9 - // ./x.cue:124:33 -- // value0.xs.0.INA.UseSectionName: conflicting values true and {UseSectionName:true} (mismatched types bool and struct): +- // value0.xs.0.INA.UseSectionName: conflicting values true and {Prepend:#ConfigText} (mismatched types bool and struct): - // ./x.cue:15:14 - // ./x.cue:22:52 - // ./x.cue:44:29 - // ./x.cue:44:56 -- // ./x.cue:51:23 -- // ./x.cue:53:18 +- // ./x.cue:53:56 - // ./x.cue:55:72 - // ./x.cue:55:75 - // ./x.cue:59:9 @@ -1262,20 +1248,21 @@ diff old new - // ./x.cue:118:38 - // ./x.cue:123:9 - // ./x.cue:124:33 -- // value0.xs.0.INA.UseSectionName: 4 errors in empty disjunction:: -- // ./x.cue:97:7 - Prepend: ((string|struct)){ |((string){ string }, (#struct){ - UseSectionName: (bool){ true } - }) } - } - Append: (_|_){ -- // [eval] value0.xs.0.INA.Append: conflicting values string and {Append:#ConfigText} (mismatched types string and struct): +- // [eval] value0.xs.0.INA.Append: 5 errors in empty disjunction:: +- // ./x.cue:97:7 +- // value0.xs.0.INA.Append: conflicting values string and {UseSectionName:true} (mismatched types string and struct): - // ./x.cue:15:14 - // ./x.cue:22:52 - // ./x.cue:44:29 - // ./x.cue:44:56 - // ./x.cue:51:14 -- // ./x.cue:53:32 +- // ./x.cue:51:23 +- // ./x.cue:53:18 - // ./x.cue:55:72 - // ./x.cue:55:75 - // ./x.cue:59:9 @@ -1287,13 +1274,13 @@ diff old new - // ./x.cue:118:4 - // ./x.cue:118:38 - // ./x.cue:123:9 -- // value0.xs.0.INA.Append: conflicting values string and {Prepend:#ConfigText} (mismatched types string and struct): +- // value0.xs.0.INA.Append: conflicting values string and {Append:#ConfigText} (mismatched types string and struct): - // ./x.cue:15:14 - // ./x.cue:22:52 - // ./x.cue:44:29 - // ./x.cue:44:56 - // ./x.cue:51:14 -- // ./x.cue:53:56 +- // ./x.cue:53:32 - // ./x.cue:55:72 - // ./x.cue:55:75 - // ./x.cue:59:9 @@ -1305,14 +1292,13 @@ diff old new - // ./x.cue:118:4 - // ./x.cue:118:38 - // ./x.cue:123:9 -- // value0.xs.0.INA.Append: conflicting values string and {UseSectionName:true} (mismatched types string and struct): +- // value0.xs.0.INA.Append: conflicting values string and {Prepend:#ConfigText} (mismatched types string and struct): - // ./x.cue:15:14 - // ./x.cue:22:52 - // ./x.cue:44:29 - // ./x.cue:44:56 - // ./x.cue:51:14 -- // ./x.cue:51:23 -- // ./x.cue:53:18 +- // ./x.cue:53:56 - // ./x.cue:55:72 - // ./x.cue:55:75 - // ./x.cue:59:9 @@ -1324,8 +1310,6 @@ diff old new - // ./x.cue:118:4 - // ./x.cue:118:38 - // ./x.cue:123:9 -- // value0.xs.0.INA.Append: 5 errors in empty disjunction:: -- // ./x.cue:97:7 - // value0.xs.0.INA.Append.UseSectionName: field not allowed: - // ./x.cue:97:7 - // ./x.cue:15:14 @@ -1399,13 +1383,16 @@ diff old new - } - } - Prepend: (_|_){ -- // [eval] value0.xs.0.INA.Prepend: conflicting values string and {Append:#ConfigText} (mismatched types string and struct): +- // [eval] value0.xs.0.INA.Prepend: 5 errors in empty disjunction:: +- // ./x.cue:97:7 +- // value0.xs.0.INA.Prepend: conflicting values string and {UseSectionName:true} (mismatched types string and struct): - // ./x.cue:15:14 - // ./x.cue:22:52 - // ./x.cue:44:29 - // ./x.cue:44:56 - // ./x.cue:51:14 -- // ./x.cue:53:32 +- // ./x.cue:51:23 +- // ./x.cue:53:18 - // ./x.cue:55:72 - // ./x.cue:55:75 - // ./x.cue:59:9 @@ -1417,13 +1404,13 @@ diff old new - // ./x.cue:118:4 - // ./x.cue:118:38 - // ./x.cue:123:9 -- // value0.xs.0.INA.Prepend: conflicting values string and {Prepend:#ConfigText} (mismatched types string and struct): +- // value0.xs.0.INA.Prepend: conflicting values string and {Append:#ConfigText} (mismatched types string and struct): - // ./x.cue:15:14 - // ./x.cue:22:52 - // ./x.cue:44:29 - // ./x.cue:44:56 - // ./x.cue:51:14 -- // ./x.cue:53:56 +- // ./x.cue:53:32 - // ./x.cue:55:72 - // ./x.cue:55:75 - // ./x.cue:59:9 @@ -1435,14 +1422,13 @@ diff old new - // ./x.cue:118:4 - // ./x.cue:118:38 - // ./x.cue:123:9 -- // value0.xs.0.INA.Prepend: conflicting values string and {UseSectionName:true} (mismatched types string and struct): +- // value0.xs.0.INA.Prepend: conflicting values string and {Prepend:#ConfigText} (mismatched types string and struct): - // ./x.cue:15:14 - // ./x.cue:22:52 - // ./x.cue:44:29 - // ./x.cue:44:56 - // ./x.cue:51:14 -- // ./x.cue:51:23 -- // ./x.cue:53:18 +- // ./x.cue:53:56 - // ./x.cue:55:72 - // ./x.cue:55:75 - // ./x.cue:59:9 @@ -1454,8 +1440,6 @@ diff old new - // ./x.cue:118:4 - // ./x.cue:118:38 - // ./x.cue:123:9 -- // value0.xs.0.INA.Prepend: 5 errors in empty disjunction:: -- // ./x.cue:97:7 - // value0.xs.0.INA.Prepend.UseSectionName: field not allowed: - // ./x.cue:97:7 - // ./x.cue:15:14 @@ -1551,39 +1535,37 @@ diff old new - }) } - }) } + // ./x.cue:124:17 ++ // value0.xs.0.INA: conflicting values {Prepend:#ConfigText} and [#ConfigTextRule,#ConfigTextRule,...#ConfigTextRule] (mismatched types struct and list): ++ // ./x.cue:53:56 ++ // ./x.cue:55:37 + Append: (_){ _ } + UseSectionName: (bool){ true } } let INP#8 = (_|_){ -- // [eval] value0.xs.0.INP: conflicting values [#ConfigTextRule,#ConfigTextRule,...#ConfigTextRule] and {Append:#ConfigText} (mismatched types list and struct): +- // [eval] value0.xs.0.INP: 9 errors in empty disjunction:: +- // ./x.cue:100:7 +- // value0.xs.0.INP: conflicting values string and {Prepend:_} (mismatched types string and struct): - // ./x.cue:22:52 - // ./x.cue:44:29 -- // ./x.cue:53:32 -- // ./x.cue:55:19 -- // ./x.cue:55:37 +- // ./x.cue:51:14 - // ./x.cue:62:25 - // ./x.cue:70:12 -- // ./x.cue:95:13 -- // ./x.cue:109:13 +- // ./x.cue:95:18 - // ./x.cue:112:3 - // ./x.cue:118:4 -- // ./x.cue:118:38 - // ./x.cue:123:9 -- // value0.xs.0.INP: conflicting values [#ConfigTextRule,#ConfigTextRule,...#ConfigTextRule] and {Prepend:#ConfigText} (mismatched types list and struct): +- // value0.xs.0.INP: conflicting values string and {UseSectionName:true} (mismatched types string and struct): - // ./x.cue:22:52 -- // ./x.cue:28:12 - // ./x.cue:44:29 -- // ./x.cue:53:56 -- // ./x.cue:55:19 -- // ./x.cue:55:37 -- // ./x.cue:59:9 +- // ./x.cue:51:14 +- // ./x.cue:51:23 +- // ./x.cue:53:18 - // ./x.cue:62:25 - // ./x.cue:70:12 -- // ./x.cue:70:47 +- // ./x.cue:92:13 - // ./x.cue:95:13 - // ./x.cue:112:3 - // ./x.cue:118:4 -- // ./x.cue:118:38 - // ./x.cue:123:9 - // value0.xs.0.INP: conflicting values [#ConfigTextRule,#ConfigTextRule,...#ConfigTextRule] and {UseSectionName:true} (mismatched types list and struct): - // ./x.cue:22:52 @@ -1610,38 +1592,35 @@ diff old new - // ./x.cue:112:3 - // ./x.cue:118:4 - // ./x.cue:123:9 -- // value0.xs.0.INP: conflicting values string and {Prepend:#ConfigText} (mismatched types string and struct): +- // value0.xs.0.INP: conflicting values [#ConfigTextRule,#ConfigTextRule,...#ConfigTextRule] and {Append:#ConfigText} (mismatched types list and struct): - // ./x.cue:22:52 -- // ./x.cue:28:12 - // ./x.cue:44:29 -- // ./x.cue:51:14 -- // ./x.cue:53:56 -- // ./x.cue:55:19 -- // ./x.cue:59:9 +- // ./x.cue:53:32 +- // ./x.cue:55:37 - // ./x.cue:62:25 - // ./x.cue:70:12 -- // ./x.cue:70:47 +- // ./x.cue:92:13 - // ./x.cue:95:13 - // ./x.cue:112:3 - // ./x.cue:118:4 -- // ./x.cue:118:38 - // ./x.cue:123:9 -- // value0.xs.0.INP: conflicting values string and {Prepend:_} (mismatched types string and struct): +- // value0.xs.0.INP: conflicting values string and {Prepend:#ConfigText} (mismatched types string and struct): - // ./x.cue:22:52 - // ./x.cue:44:29 - // ./x.cue:51:14 +- // ./x.cue:53:56 - // ./x.cue:62:25 - // ./x.cue:70:12 -- // ./x.cue:95:18 +- // ./x.cue:92:13 +- // ./x.cue:95:13 - // ./x.cue:112:3 - // ./x.cue:118:4 - // ./x.cue:123:9 -- // value0.xs.0.INP: conflicting values string and {UseSectionName:true} (mismatched types string and struct): +- // value0.xs.0.INP: conflicting values [#ConfigTextRule,#ConfigTextRule,...#ConfigTextRule] and {Prepend:#ConfigText} (mismatched types list and struct): - // ./x.cue:22:52 - // ./x.cue:44:29 -- // ./x.cue:51:14 -- // ./x.cue:51:23 -- // ./x.cue:53:18 +- // ./x.cue:53:56 +- // ./x.cue:55:37 - // ./x.cue:62:25 - // ./x.cue:70:12 - // ./x.cue:92:13 @@ -1649,8 +1628,6 @@ diff old new - // ./x.cue:112:3 - // ./x.cue:118:4 - // ./x.cue:123:9 -- // value0.xs.0.INP: 9 errors in empty disjunction:: -- // ./x.cue:100:7 - // value0.xs.0.INP.Prepend: field not allowed: - // ./x.cue:100:7 - // ./x.cue:15:14 @@ -1675,10 +1652,7 @@ diff old new - // ./x.cue:118:38 - // ./x.cue:123:9 - // ./x.cue:124:16 -+ // [eval] value0.xs.0.INP: conflicting values {Prepend:#ConfigText} and [#ConfigTextRule,#ConfigTextRule,...#ConfigTextRule] (mismatched types struct and list): -+ // ./x.cue:53:56 -+ // ./x.cue:55:37 -+ // value0.xs.0.INP: 2 errors in empty disjunction:: ++ // [eval] value0.xs.0.INP: 2 errors in empty disjunction:: + // ./x.cue:100:7 // value0.xs.0.INP.UseSectionName: field not allowed: // ./x.cue:100:7 @@ -1706,7 +1680,9 @@ diff old new - // ./x.cue:123:9 - // ./x.cue:124:17 - UseSectionName: (_|_){ -- // [eval] value0.xs.0.INP.UseSectionName: conflicting values true and string (mismatched types bool and string): +- // [eval] value0.xs.0.INP.UseSectionName: 4 errors in empty disjunction:: +- // ./x.cue:100:7 +- // value0.xs.0.INP.UseSectionName: conflicting values true and string (mismatched types bool and string): - // ./x.cue:15:14 - // ./x.cue:22:52 - // ./x.cue:44:29 @@ -1725,12 +1701,13 @@ diff old new - // ./x.cue:118:38 - // ./x.cue:123:9 - // ./x.cue:124:33 -- // value0.xs.0.INP.UseSectionName: conflicting values true and {Append:#ConfigText} (mismatched types bool and struct): +- // value0.xs.0.INP.UseSectionName: conflicting values true and {UseSectionName:true} (mismatched types bool and struct): - // ./x.cue:15:14 - // ./x.cue:22:52 - // ./x.cue:44:29 - // ./x.cue:44:56 -- // ./x.cue:53:32 +- // ./x.cue:51:23 +- // ./x.cue:53:18 - // ./x.cue:55:72 - // ./x.cue:55:75 - // ./x.cue:59:9 @@ -1743,12 +1720,12 @@ diff old new - // ./x.cue:118:38 - // ./x.cue:123:9 - // ./x.cue:124:33 -- // value0.xs.0.INP.UseSectionName: conflicting values true and {Prepend:#ConfigText} (mismatched types bool and struct): +- // value0.xs.0.INP.UseSectionName: conflicting values true and {Append:#ConfigText} (mismatched types bool and struct): - // ./x.cue:15:14 - // ./x.cue:22:52 - // ./x.cue:44:29 - // ./x.cue:44:56 -- // ./x.cue:53:56 +- // ./x.cue:53:32 - // ./x.cue:55:72 - // ./x.cue:55:75 - // ./x.cue:59:9 @@ -1761,13 +1738,12 @@ diff old new - // ./x.cue:118:38 - // ./x.cue:123:9 - // ./x.cue:124:33 -- // value0.xs.0.INP.UseSectionName: conflicting values true and {UseSectionName:true} (mismatched types bool and struct): +- // value0.xs.0.INP.UseSectionName: conflicting values true and {Prepend:#ConfigText} (mismatched types bool and struct): - // ./x.cue:15:14 - // ./x.cue:22:52 - // ./x.cue:44:29 - // ./x.cue:44:56 -- // ./x.cue:51:23 -- // ./x.cue:53:18 +- // ./x.cue:53:56 - // ./x.cue:55:72 - // ./x.cue:55:75 - // ./x.cue:59:9 @@ -1780,20 +1756,21 @@ diff old new - // ./x.cue:118:38 - // ./x.cue:123:9 - // ./x.cue:124:33 -- // value0.xs.0.INP.UseSectionName: 4 errors in empty disjunction:: -- // ./x.cue:100:7 - Prepend: ((string|struct)){ |((string){ string }, (#struct){ - UseSectionName: (bool){ true } - }) } - } - Prepend: (_|_){ -- // [eval] value0.xs.0.INP.Prepend: conflicting values string and {Append:#ConfigText} (mismatched types string and struct): +- // [eval] value0.xs.0.INP.Prepend: 5 errors in empty disjunction:: +- // ./x.cue:100:7 +- // value0.xs.0.INP.Prepend: conflicting values string and {UseSectionName:true} (mismatched types string and struct): - // ./x.cue:15:14 - // ./x.cue:22:52 - // ./x.cue:44:29 - // ./x.cue:44:56 - // ./x.cue:51:14 -- // ./x.cue:53:32 +- // ./x.cue:51:23 +- // ./x.cue:53:18 - // ./x.cue:55:72 - // ./x.cue:55:75 - // ./x.cue:59:9 @@ -1805,13 +1782,13 @@ diff old new - // ./x.cue:118:4 - // ./x.cue:118:38 - // ./x.cue:123:9 -- // value0.xs.0.INP.Prepend: conflicting values string and {Prepend:#ConfigText} (mismatched types string and struct): +- // value0.xs.0.INP.Prepend: conflicting values string and {Append:#ConfigText} (mismatched types string and struct): - // ./x.cue:15:14 - // ./x.cue:22:52 - // ./x.cue:44:29 - // ./x.cue:44:56 - // ./x.cue:51:14 -- // ./x.cue:53:56 +- // ./x.cue:53:32 - // ./x.cue:55:72 - // ./x.cue:55:75 - // ./x.cue:59:9 @@ -1823,14 +1800,13 @@ diff old new - // ./x.cue:118:4 - // ./x.cue:118:38 - // ./x.cue:123:9 -- // value0.xs.0.INP.Prepend: conflicting values string and {UseSectionName:true} (mismatched types string and struct): +- // value0.xs.0.INP.Prepend: conflicting values string and {Prepend:#ConfigText} (mismatched types string and struct): - // ./x.cue:15:14 - // ./x.cue:22:52 - // ./x.cue:44:29 - // ./x.cue:44:56 - // ./x.cue:51:14 -- // ./x.cue:51:23 -- // ./x.cue:53:18 +- // ./x.cue:53:56 - // ./x.cue:55:72 - // ./x.cue:55:75 - // ./x.cue:59:9 @@ -1842,8 +1818,6 @@ diff old new - // ./x.cue:118:4 - // ./x.cue:118:38 - // ./x.cue:123:9 -- // value0.xs.0.INP.Prepend: 5 errors in empty disjunction:: -- // ./x.cue:100:7 - // value0.xs.0.INP.Prepend.UseSectionName: field not allowed: - // ./x.cue:100:7 - // ./x.cue:15:14 @@ -1917,13 +1891,16 @@ diff old new - } - } - Append: (_|_){ -- // [eval] value0.xs.0.INP.Append: conflicting values string and {Append:#ConfigText} (mismatched types string and struct): +- // [eval] value0.xs.0.INP.Append: 5 errors in empty disjunction:: +- // ./x.cue:100:7 +- // value0.xs.0.INP.Append: conflicting values string and {UseSectionName:true} (mismatched types string and struct): - // ./x.cue:15:14 - // ./x.cue:22:52 - // ./x.cue:44:29 - // ./x.cue:44:56 - // ./x.cue:51:14 -- // ./x.cue:53:32 +- // ./x.cue:51:23 +- // ./x.cue:53:18 - // ./x.cue:55:72 - // ./x.cue:55:75 - // ./x.cue:59:9 @@ -1935,13 +1912,13 @@ diff old new - // ./x.cue:118:4 - // ./x.cue:118:38 - // ./x.cue:123:9 -- // value0.xs.0.INP.Append: conflicting values string and {Prepend:#ConfigText} (mismatched types string and struct): +- // value0.xs.0.INP.Append: conflicting values string and {Append:#ConfigText} (mismatched types string and struct): - // ./x.cue:15:14 - // ./x.cue:22:52 - // ./x.cue:44:29 - // ./x.cue:44:56 - // ./x.cue:51:14 -- // ./x.cue:53:56 +- // ./x.cue:53:32 - // ./x.cue:55:72 - // ./x.cue:55:75 - // ./x.cue:59:9 @@ -1953,14 +1930,13 @@ diff old new - // ./x.cue:118:4 - // ./x.cue:118:38 - // ./x.cue:123:9 -- // value0.xs.0.INP.Append: conflicting values string and {UseSectionName:true} (mismatched types string and struct): +- // value0.xs.0.INP.Append: conflicting values string and {Prepend:#ConfigText} (mismatched types string and struct): - // ./x.cue:15:14 - // ./x.cue:22:52 - // ./x.cue:44:29 - // ./x.cue:44:56 - // ./x.cue:51:14 -- // ./x.cue:51:23 -- // ./x.cue:53:18 +- // ./x.cue:53:56 - // ./x.cue:55:72 - // ./x.cue:55:75 - // ./x.cue:59:9 @@ -1972,8 +1948,6 @@ diff old new - // ./x.cue:118:4 - // ./x.cue:118:38 - // ./x.cue:123:9 -- // value0.xs.0.INP.Append: 5 errors in empty disjunction:: -- // ./x.cue:100:7 - // value0.xs.0.INP.Append.UseSectionName: field not allowed: - // ./x.cue:100:7 - // ./x.cue:15:14 @@ -2069,6 +2043,9 @@ diff old new - }) } - }) } + // ./x.cue:124:17 ++ // value0.xs.0.INP: conflicting values {Prepend:#ConfigText} and [#ConfigTextRule,#ConfigTextRule,...#ConfigTextRule] (mismatched types struct and list): ++ // ./x.cue:53:56 ++ // ./x.cue:55:37 + Prepend: (_){ _ } + UseSectionName: (bool){ true } } @@ -2405,21 +2382,21 @@ diff old new 0: (string){ "UseSectionName" let INL#9 = (_|_){ - // [eval] value0.xs.0.INL: conflicting values [#ConfigTextRule,#ConfigTextRule,...#ConfigTextRule] and {UseSectionName:true} (mismatched types list and struct): + // [eval] value0.xs.0.INL: 5 errors in empty disjunction:: + // ./x.cue:113:7 + // value0.xs.0.INL: conflicting values string and [...] (mismatched types string and list): // ./x.cue:22:52 // ./x.cue:44:29 - // ./x.cue:44:56 - // ./x.cue:55:37 + // ./x.cue:51:14 // ./x.cue:62:25 // ./x.cue:70:12 - // ./x.cue:70:47 - // ./x.cue:111:13 + // ./x.cue:111:18 // ./x.cue:123:9 - // ./x.cue:124:16 - // value0.xs.0.INL: conflicting values [...] and {Append:#ConfigText} (mismatched types list and struct): + // value0.xs.0.INL: conflicting values [...] and {UseSectionName:true} (mismatched types list and struct): // ./x.cue:22:52 // ./x.cue:44:29 - // ./x.cue:53:32 + // ./x.cue:51:23 + // ./x.cue:53:18 // ./x.cue:55:19 // ./x.cue:62:25 // ./x.cue:70:12 @@ -2427,10 +2404,10 @@ diff old new // ./x.cue:111:13 // ./x.cue:111:18 // ./x.cue:123:9 - // value0.xs.0.INL: conflicting values [...] and {Prepend:#ConfigText} (mismatched types list and struct): + // value0.xs.0.INL: conflicting values [...] and {Append:#ConfigText} (mismatched types list and struct): // ./x.cue:22:52 // ./x.cue:44:29 - // ./x.cue:53:56 + // ./x.cue:53:32 // ./x.cue:55:19 // ./x.cue:62:25 // ./x.cue:70:12 @@ -2438,11 +2415,10 @@ diff old new // ./x.cue:111:13 // ./x.cue:111:18 // ./x.cue:123:9 - // value0.xs.0.INL: conflicting values [...] and {UseSectionName:true} (mismatched types list and struct): + // value0.xs.0.INL: conflicting values [...] and {Prepend:#ConfigText} (mismatched types list and struct): // ./x.cue:22:52 // ./x.cue:44:29 - // ./x.cue:51:23 - // ./x.cue:53:18 + // ./x.cue:53:56 // ./x.cue:55:19 // ./x.cue:62:25 // ./x.cue:70:12 @@ -2450,18 +2426,21 @@ diff old new // ./x.cue:111:13 // ./x.cue:111:18 // ./x.cue:123:9 - // value0.xs.0.INL: conflicting values string and [...] (mismatched types string and list): + // value0.xs.0.INL: conflicting values [#ConfigTextRule,#ConfigTextRule,...#ConfigTextRule] and {UseSectionName:true} (mismatched types list and struct): // ./x.cue:22:52 // ./x.cue:44:29 - // ./x.cue:51:14 + // ./x.cue:44:56 + // ./x.cue:55:37 // ./x.cue:62:25 // ./x.cue:70:12 - // ./x.cue:111:18 + // ./x.cue:70:47 + // ./x.cue:111:13 // ./x.cue:123:9 - // value0.xs.0.INL: 5 errors in empty disjunction:: - // ./x.cue:113:7 + // ./x.cue:124:16 UseSectionName: (_|_){ - // [eval] value0.xs.0.INL.UseSectionName: conflicting values true and string (mismatched types bool and string): + // [eval] value0.xs.0.INL.UseSectionName: 4 errors in empty disjunction:: + // ./x.cue:113:7 + // value0.xs.0.INL.UseSectionName: conflicting values true and string (mismatched types bool and string): // ./x.cue:22:52 // ./x.cue:44:29 // ./x.cue:51:14 @@ -2474,10 +2453,11 @@ diff old new // ./x.cue:111:13 // ./x.cue:123:9 // ./x.cue:124:33 - // value0.xs.0.INL.UseSectionName: conflicting values true and {Append:#ConfigText} (mismatched types bool and struct): + // value0.xs.0.INL.UseSectionName: conflicting values true and {UseSectionName:true} (mismatched types bool and struct): // ./x.cue:22:52 // ./x.cue:44:29 - // ./x.cue:53:32 + // ./x.cue:51:23 + // ./x.cue:53:18 // ./x.cue:55:72 // ./x.cue:55:75 // ./x.cue:62:25 @@ -2486,10 +2466,10 @@ diff old new // ./x.cue:111:13 // ./x.cue:123:9 // ./x.cue:124:33 - // value0.xs.0.INL.UseSectionName: conflicting values true and {Prepend:#ConfigText} (mismatched types bool and struct): + // value0.xs.0.INL.UseSectionName: conflicting values true and {Append:#ConfigText} (mismatched types bool and struct): // ./x.cue:22:52 // ./x.cue:44:29 - // ./x.cue:53:56 + // ./x.cue:53:32 // ./x.cue:55:72 // ./x.cue:55:75 // ./x.cue:62:25 @@ -2498,11 +2478,10 @@ diff old new // ./x.cue:111:13 // ./x.cue:123:9 // ./x.cue:124:33 - // value0.xs.0.INL.UseSectionName: conflicting values true and {UseSectionName:true} (mismatched types bool and struct): + // value0.xs.0.INL.UseSectionName: conflicting values true and {Prepend:#ConfigText} (mismatched types bool and struct): // ./x.cue:22:52 // ./x.cue:44:29 - // ./x.cue:51:23 - // ./x.cue:53:18 + // ./x.cue:53:56 // ./x.cue:55:72 // ./x.cue:55:75 // ./x.cue:62:25 @@ -2511,8 +2490,6 @@ diff old new // ./x.cue:111:13 // ./x.cue:123:9 // ./x.cue:124:33 - // value0.xs.0.INL.UseSectionName: 4 errors in empty disjunction:: - // ./x.cue:113:7 Prepend: ((string|struct)){ |((string){ string }, (#struct){ UseSectionName: (bool){ true } }) } @@ -2541,50 +2518,43 @@ diff old new }) } } let INA#7 = (_|_){ - // [eval] value0.xs.0.INA: conflicting values [#ConfigTextRule,#ConfigTextRule,...#ConfigTextRule] and {Append:#ConfigText} (mismatched types list and struct): + // [eval] value0.xs.0.INA: 9 errors in empty disjunction:: + // ./x.cue:97:7 + // value0.xs.0.INA: conflicting values string and {Append:_} (mismatched types string and struct): // ./x.cue:22:52 // ./x.cue:44:29 - // ./x.cue:53:32 - // ./x.cue:55:19 - // ./x.cue:55:37 + // ./x.cue:51:14 // ./x.cue:62:25 // ./x.cue:70:12 - // ./x.cue:94:13 - // ./x.cue:109:13 + // ./x.cue:94:18 // ./x.cue:112:3 // ./x.cue:118:4 - // ./x.cue:118:38 // ./x.cue:123:9 - // value0.xs.0.INA: conflicting values [#ConfigTextRule,#ConfigTextRule,...#ConfigTextRule] and {Prepend:#ConfigText} (mismatched types list and struct): + // value0.xs.0.INA: conflicting values string and {UseSectionName:true} (mismatched types string and struct): // ./x.cue:22:52 // ./x.cue:44:29 - // ./x.cue:53:56 - // ./x.cue:55:19 - // ./x.cue:55:37 + // ./x.cue:51:14 + // ./x.cue:51:23 + // ./x.cue:53:18 // ./x.cue:62:25 // ./x.cue:70:12 + // ./x.cue:92:13 // ./x.cue:94:13 - // ./x.cue:109:13 // ./x.cue:112:3 // ./x.cue:118:4 - // ./x.cue:118:38 // ./x.cue:123:9 // value0.xs.0.INA: conflicting values [#ConfigTextRule,#ConfigTextRule,...#ConfigTextRule] and {UseSectionName:true} (mismatched types list and struct): // ./x.cue:22:52 - // ./x.cue:28:12 // ./x.cue:44:29 // ./x.cue:51:23 // ./x.cue:53:18 - // ./x.cue:55:19 // ./x.cue:55:37 - // ./x.cue:59:9 // ./x.cue:62:25 // ./x.cue:70:12 - // ./x.cue:70:47 + // ./x.cue:92:13 // ./x.cue:94:13 // ./x.cue:112:3 // ./x.cue:118:4 - // ./x.cue:118:38 // ./x.cue:123:9 // value0.xs.0.INA: conflicting values string and {Append:#ConfigText} (mismatched types string and struct): // ./x.cue:22:52 @@ -2598,38 +2568,35 @@ diff old new // ./x.cue:112:3 // ./x.cue:118:4 // ./x.cue:123:9 - // value0.xs.0.INA: conflicting values string and {Append:_} (mismatched types string and struct): + // value0.xs.0.INA: conflicting values [#ConfigTextRule,#ConfigTextRule,...#ConfigTextRule] and {Append:#ConfigText} (mismatched types list and struct): // ./x.cue:22:52 // ./x.cue:44:29 - // ./x.cue:51:14 + // ./x.cue:53:32 + // ./x.cue:55:37 // ./x.cue:62:25 // ./x.cue:70:12 - // ./x.cue:94:18 + // ./x.cue:92:13 + // ./x.cue:94:13 // ./x.cue:112:3 // ./x.cue:118:4 // ./x.cue:123:9 // value0.xs.0.INA: conflicting values string and {Prepend:#ConfigText} (mismatched types string and struct): // ./x.cue:22:52 - // ./x.cue:28:12 // ./x.cue:44:29 // ./x.cue:51:14 // ./x.cue:53:56 - // ./x.cue:55:19 - // ./x.cue:59:9 // ./x.cue:62:25 // ./x.cue:70:12 - // ./x.cue:70:47 + // ./x.cue:92:13 // ./x.cue:94:13 // ./x.cue:112:3 // ./x.cue:118:4 - // ./x.cue:118:38 // ./x.cue:123:9 - // value0.xs.0.INA: conflicting values string and {UseSectionName:true} (mismatched types string and struct): + // value0.xs.0.INA: conflicting values [#ConfigTextRule,#ConfigTextRule,...#ConfigTextRule] and {Prepend:#ConfigText} (mismatched types list and struct): // ./x.cue:22:52 // ./x.cue:44:29 - // ./x.cue:51:14 - // ./x.cue:51:23 - // ./x.cue:53:18 + // ./x.cue:53:56 + // ./x.cue:55:37 // ./x.cue:62:25 // ./x.cue:70:12 // ./x.cue:92:13 @@ -2637,8 +2604,6 @@ diff old new // ./x.cue:112:3 // ./x.cue:118:4 // ./x.cue:123:9 - // value0.xs.0.INA: 9 errors in empty disjunction:: - // ./x.cue:97:7 // value0.xs.0.INA.Append: field not allowed: // ./x.cue:97:7 // ./x.cue:15:14 @@ -2689,7 +2654,9 @@ diff old new // ./x.cue:123:9 // ./x.cue:124:17 UseSectionName: (_|_){ - // [eval] value0.xs.0.INA.UseSectionName: conflicting values true and string (mismatched types bool and string): + // [eval] value0.xs.0.INA.UseSectionName: 4 errors in empty disjunction:: + // ./x.cue:97:7 + // value0.xs.0.INA.UseSectionName: conflicting values true and string (mismatched types bool and string): // ./x.cue:15:14 // ./x.cue:22:52 // ./x.cue:44:29 @@ -2708,12 +2675,13 @@ diff old new // ./x.cue:118:38 // ./x.cue:123:9 // ./x.cue:124:33 - // value0.xs.0.INA.UseSectionName: conflicting values true and {Append:#ConfigText} (mismatched types bool and struct): + // value0.xs.0.INA.UseSectionName: conflicting values true and {UseSectionName:true} (mismatched types bool and struct): // ./x.cue:15:14 // ./x.cue:22:52 // ./x.cue:44:29 // ./x.cue:44:56 - // ./x.cue:53:32 + // ./x.cue:51:23 + // ./x.cue:53:18 // ./x.cue:55:72 // ./x.cue:55:75 // ./x.cue:59:9 @@ -2726,12 +2694,12 @@ diff old new // ./x.cue:118:38 // ./x.cue:123:9 // ./x.cue:124:33 - // value0.xs.0.INA.UseSectionName: conflicting values true and {Prepend:#ConfigText} (mismatched types bool and struct): + // value0.xs.0.INA.UseSectionName: conflicting values true and {Append:#ConfigText} (mismatched types bool and struct): // ./x.cue:15:14 // ./x.cue:22:52 // ./x.cue:44:29 // ./x.cue:44:56 - // ./x.cue:53:56 + // ./x.cue:53:32 // ./x.cue:55:72 // ./x.cue:55:75 // ./x.cue:59:9 @@ -2744,13 +2712,12 @@ diff old new // ./x.cue:118:38 // ./x.cue:123:9 // ./x.cue:124:33 - // value0.xs.0.INA.UseSectionName: conflicting values true and {UseSectionName:true} (mismatched types bool and struct): + // value0.xs.0.INA.UseSectionName: conflicting values true and {Prepend:#ConfigText} (mismatched types bool and struct): // ./x.cue:15:14 // ./x.cue:22:52 // ./x.cue:44:29 // ./x.cue:44:56 - // ./x.cue:51:23 - // ./x.cue:53:18 + // ./x.cue:53:56 // ./x.cue:55:72 // ./x.cue:55:75 // ./x.cue:59:9 @@ -2763,20 +2730,21 @@ diff old new // ./x.cue:118:38 // ./x.cue:123:9 // ./x.cue:124:33 - // value0.xs.0.INA.UseSectionName: 4 errors in empty disjunction:: - // ./x.cue:97:7 Prepend: ((string|struct)){ |((string){ string }, (#struct){ UseSectionName: (bool){ true } }) } } Append: (_|_){ - // [eval] value0.xs.0.INA.Append: conflicting values string and {Append:#ConfigText} (mismatched types string and struct): + // [eval] value0.xs.0.INA.Append: 5 errors in empty disjunction:: + // ./x.cue:97:7 + // value0.xs.0.INA.Append: conflicting values string and {UseSectionName:true} (mismatched types string and struct): // ./x.cue:15:14 // ./x.cue:22:52 // ./x.cue:44:29 // ./x.cue:44:56 // ./x.cue:51:14 - // ./x.cue:53:32 + // ./x.cue:51:23 + // ./x.cue:53:18 // ./x.cue:55:72 // ./x.cue:55:75 // ./x.cue:59:9 @@ -2788,13 +2756,13 @@ diff old new // ./x.cue:118:4 // ./x.cue:118:38 // ./x.cue:123:9 - // value0.xs.0.INA.Append: conflicting values string and {Prepend:#ConfigText} (mismatched types string and struct): + // value0.xs.0.INA.Append: conflicting values string and {Append:#ConfigText} (mismatched types string and struct): // ./x.cue:15:14 // ./x.cue:22:52 // ./x.cue:44:29 // ./x.cue:44:56 // ./x.cue:51:14 - // ./x.cue:53:56 + // ./x.cue:53:32 // ./x.cue:55:72 // ./x.cue:55:75 // ./x.cue:59:9 @@ -2806,14 +2774,13 @@ diff old new // ./x.cue:118:4 // ./x.cue:118:38 // ./x.cue:123:9 - // value0.xs.0.INA.Append: conflicting values string and {UseSectionName:true} (mismatched types string and struct): + // value0.xs.0.INA.Append: conflicting values string and {Prepend:#ConfigText} (mismatched types string and struct): // ./x.cue:15:14 // ./x.cue:22:52 // ./x.cue:44:29 // ./x.cue:44:56 // ./x.cue:51:14 - // ./x.cue:51:23 - // ./x.cue:53:18 + // ./x.cue:53:56 // ./x.cue:55:72 // ./x.cue:55:75 // ./x.cue:59:9 @@ -2825,8 +2792,6 @@ diff old new // ./x.cue:118:4 // ./x.cue:118:38 // ./x.cue:123:9 - // value0.xs.0.INA.Append: 5 errors in empty disjunction:: - // ./x.cue:97:7 // value0.xs.0.INA.Append.UseSectionName: field not allowed: // ./x.cue:97:7 // ./x.cue:15:14 @@ -2900,13 +2865,16 @@ diff old new } } Prepend: (_|_){ - // [eval] value0.xs.0.INA.Prepend: conflicting values string and {Append:#ConfigText} (mismatched types string and struct): + // [eval] value0.xs.0.INA.Prepend: 5 errors in empty disjunction:: + // ./x.cue:97:7 + // value0.xs.0.INA.Prepend: conflicting values string and {UseSectionName:true} (mismatched types string and struct): // ./x.cue:15:14 // ./x.cue:22:52 // ./x.cue:44:29 // ./x.cue:44:56 // ./x.cue:51:14 - // ./x.cue:53:32 + // ./x.cue:51:23 + // ./x.cue:53:18 // ./x.cue:55:72 // ./x.cue:55:75 // ./x.cue:59:9 @@ -2918,13 +2886,13 @@ diff old new // ./x.cue:118:4 // ./x.cue:118:38 // ./x.cue:123:9 - // value0.xs.0.INA.Prepend: conflicting values string and {Prepend:#ConfigText} (mismatched types string and struct): + // value0.xs.0.INA.Prepend: conflicting values string and {Append:#ConfigText} (mismatched types string and struct): // ./x.cue:15:14 // ./x.cue:22:52 // ./x.cue:44:29 // ./x.cue:44:56 // ./x.cue:51:14 - // ./x.cue:53:56 + // ./x.cue:53:32 // ./x.cue:55:72 // ./x.cue:55:75 // ./x.cue:59:9 @@ -2936,14 +2904,13 @@ diff old new // ./x.cue:118:4 // ./x.cue:118:38 // ./x.cue:123:9 - // value0.xs.0.INA.Prepend: conflicting values string and {UseSectionName:true} (mismatched types string and struct): + // value0.xs.0.INA.Prepend: conflicting values string and {Prepend:#ConfigText} (mismatched types string and struct): // ./x.cue:15:14 // ./x.cue:22:52 // ./x.cue:44:29 // ./x.cue:44:56 // ./x.cue:51:14 - // ./x.cue:51:23 - // ./x.cue:53:18 + // ./x.cue:53:56 // ./x.cue:55:72 // ./x.cue:55:75 // ./x.cue:59:9 @@ -2955,8 +2922,6 @@ diff old new // ./x.cue:118:4 // ./x.cue:118:38 // ./x.cue:123:9 - // value0.xs.0.INA.Prepend: 5 errors in empty disjunction:: - // ./x.cue:97:7 // value0.xs.0.INA.Prepend.UseSectionName: field not allowed: // ./x.cue:97:7 // ./x.cue:15:14 @@ -3053,35 +3018,30 @@ diff old new }) } } let INP#8 = (_|_){ - // [eval] value0.xs.0.INP: conflicting values [#ConfigTextRule,#ConfigTextRule,...#ConfigTextRule] and {Append:#ConfigText} (mismatched types list and struct): + // [eval] value0.xs.0.INP: 9 errors in empty disjunction:: + // ./x.cue:100:7 + // value0.xs.0.INP: conflicting values string and {Prepend:_} (mismatched types string and struct): // ./x.cue:22:52 // ./x.cue:44:29 - // ./x.cue:53:32 - // ./x.cue:55:19 - // ./x.cue:55:37 + // ./x.cue:51:14 // ./x.cue:62:25 // ./x.cue:70:12 - // ./x.cue:95:13 - // ./x.cue:109:13 + // ./x.cue:95:18 // ./x.cue:112:3 // ./x.cue:118:4 - // ./x.cue:118:38 // ./x.cue:123:9 - // value0.xs.0.INP: conflicting values [#ConfigTextRule,#ConfigTextRule,...#ConfigTextRule] and {Prepend:#ConfigText} (mismatched types list and struct): + // value0.xs.0.INP: conflicting values string and {UseSectionName:true} (mismatched types string and struct): // ./x.cue:22:52 - // ./x.cue:28:12 // ./x.cue:44:29 - // ./x.cue:53:56 - // ./x.cue:55:19 - // ./x.cue:55:37 - // ./x.cue:59:9 + // ./x.cue:51:14 + // ./x.cue:51:23 + // ./x.cue:53:18 // ./x.cue:62:25 // ./x.cue:70:12 - // ./x.cue:70:47 + // ./x.cue:92:13 // ./x.cue:95:13 // ./x.cue:112:3 // ./x.cue:118:4 - // ./x.cue:118:38 // ./x.cue:123:9 // value0.xs.0.INP: conflicting values [#ConfigTextRule,#ConfigTextRule,...#ConfigTextRule] and {UseSectionName:true} (mismatched types list and struct): // ./x.cue:22:52 @@ -3108,38 +3068,35 @@ diff old new // ./x.cue:112:3 // ./x.cue:118:4 // ./x.cue:123:9 - // value0.xs.0.INP: conflicting values string and {Prepend:#ConfigText} (mismatched types string and struct): + // value0.xs.0.INP: conflicting values [#ConfigTextRule,#ConfigTextRule,...#ConfigTextRule] and {Append:#ConfigText} (mismatched types list and struct): // ./x.cue:22:52 - // ./x.cue:28:12 // ./x.cue:44:29 - // ./x.cue:51:14 - // ./x.cue:53:56 - // ./x.cue:55:19 - // ./x.cue:59:9 + // ./x.cue:53:32 + // ./x.cue:55:37 // ./x.cue:62:25 // ./x.cue:70:12 - // ./x.cue:70:47 + // ./x.cue:92:13 // ./x.cue:95:13 // ./x.cue:112:3 // ./x.cue:118:4 - // ./x.cue:118:38 // ./x.cue:123:9 - // value0.xs.0.INP: conflicting values string and {Prepend:_} (mismatched types string and struct): + // value0.xs.0.INP: conflicting values string and {Prepend:#ConfigText} (mismatched types string and struct): // ./x.cue:22:52 // ./x.cue:44:29 // ./x.cue:51:14 + // ./x.cue:53:56 // ./x.cue:62:25 // ./x.cue:70:12 - // ./x.cue:95:18 + // ./x.cue:92:13 + // ./x.cue:95:13 // ./x.cue:112:3 // ./x.cue:118:4 // ./x.cue:123:9 - // value0.xs.0.INP: conflicting values string and {UseSectionName:true} (mismatched types string and struct): + // value0.xs.0.INP: conflicting values [#ConfigTextRule,#ConfigTextRule,...#ConfigTextRule] and {Prepend:#ConfigText} (mismatched types list and struct): // ./x.cue:22:52 // ./x.cue:44:29 - // ./x.cue:51:14 - // ./x.cue:51:23 - // ./x.cue:53:18 + // ./x.cue:53:56 + // ./x.cue:55:37 // ./x.cue:62:25 // ./x.cue:70:12 // ./x.cue:92:13 @@ -3147,8 +3104,6 @@ diff old new // ./x.cue:112:3 // ./x.cue:118:4 // ./x.cue:123:9 - // value0.xs.0.INP: 9 errors in empty disjunction:: - // ./x.cue:100:7 // value0.xs.0.INP.Prepend: field not allowed: // ./x.cue:100:7 // ./x.cue:15:14 @@ -3199,7 +3154,9 @@ diff old new // ./x.cue:123:9 // ./x.cue:124:17 UseSectionName: (_|_){ - // [eval] value0.xs.0.INP.UseSectionName: conflicting values true and string (mismatched types bool and string): + // [eval] value0.xs.0.INP.UseSectionName: 4 errors in empty disjunction:: + // ./x.cue:100:7 + // value0.xs.0.INP.UseSectionName: conflicting values true and string (mismatched types bool and string): // ./x.cue:15:14 // ./x.cue:22:52 // ./x.cue:44:29 @@ -3218,12 +3175,13 @@ diff old new // ./x.cue:118:38 // ./x.cue:123:9 // ./x.cue:124:33 - // value0.xs.0.INP.UseSectionName: conflicting values true and {Append:#ConfigText} (mismatched types bool and struct): + // value0.xs.0.INP.UseSectionName: conflicting values true and {UseSectionName:true} (mismatched types bool and struct): // ./x.cue:15:14 // ./x.cue:22:52 // ./x.cue:44:29 // ./x.cue:44:56 - // ./x.cue:53:32 + // ./x.cue:51:23 + // ./x.cue:53:18 // ./x.cue:55:72 // ./x.cue:55:75 // ./x.cue:59:9 @@ -3236,12 +3194,12 @@ diff old new // ./x.cue:118:38 // ./x.cue:123:9 // ./x.cue:124:33 - // value0.xs.0.INP.UseSectionName: conflicting values true and {Prepend:#ConfigText} (mismatched types bool and struct): + // value0.xs.0.INP.UseSectionName: conflicting values true and {Append:#ConfigText} (mismatched types bool and struct): // ./x.cue:15:14 // ./x.cue:22:52 // ./x.cue:44:29 // ./x.cue:44:56 - // ./x.cue:53:56 + // ./x.cue:53:32 // ./x.cue:55:72 // ./x.cue:55:75 // ./x.cue:59:9 @@ -3254,13 +3212,12 @@ diff old new // ./x.cue:118:38 // ./x.cue:123:9 // ./x.cue:124:33 - // value0.xs.0.INP.UseSectionName: conflicting values true and {UseSectionName:true} (mismatched types bool and struct): + // value0.xs.0.INP.UseSectionName: conflicting values true and {Prepend:#ConfigText} (mismatched types bool and struct): // ./x.cue:15:14 // ./x.cue:22:52 // ./x.cue:44:29 // ./x.cue:44:56 - // ./x.cue:51:23 - // ./x.cue:53:18 + // ./x.cue:53:56 // ./x.cue:55:72 // ./x.cue:55:75 // ./x.cue:59:9 @@ -3273,20 +3230,21 @@ diff old new // ./x.cue:118:38 // ./x.cue:123:9 // ./x.cue:124:33 - // value0.xs.0.INP.UseSectionName: 4 errors in empty disjunction:: - // ./x.cue:100:7 Prepend: ((string|struct)){ |((string){ string }, (#struct){ UseSectionName: (bool){ true } }) } } Prepend: (_|_){ - // [eval] value0.xs.0.INP.Prepend: conflicting values string and {Append:#ConfigText} (mismatched types string and struct): + // [eval] value0.xs.0.INP.Prepend: 5 errors in empty disjunction:: + // ./x.cue:100:7 + // value0.xs.0.INP.Prepend: conflicting values string and {UseSectionName:true} (mismatched types string and struct): // ./x.cue:15:14 // ./x.cue:22:52 // ./x.cue:44:29 // ./x.cue:44:56 // ./x.cue:51:14 - // ./x.cue:53:32 + // ./x.cue:51:23 + // ./x.cue:53:18 // ./x.cue:55:72 // ./x.cue:55:75 // ./x.cue:59:9 @@ -3298,13 +3256,13 @@ diff old new // ./x.cue:118:4 // ./x.cue:118:38 // ./x.cue:123:9 - // value0.xs.0.INP.Prepend: conflicting values string and {Prepend:#ConfigText} (mismatched types string and struct): + // value0.xs.0.INP.Prepend: conflicting values string and {Append:#ConfigText} (mismatched types string and struct): // ./x.cue:15:14 // ./x.cue:22:52 // ./x.cue:44:29 // ./x.cue:44:56 // ./x.cue:51:14 - // ./x.cue:53:56 + // ./x.cue:53:32 // ./x.cue:55:72 // ./x.cue:55:75 // ./x.cue:59:9 @@ -3316,14 +3274,13 @@ diff old new // ./x.cue:118:4 // ./x.cue:118:38 // ./x.cue:123:9 - // value0.xs.0.INP.Prepend: conflicting values string and {UseSectionName:true} (mismatched types string and struct): + // value0.xs.0.INP.Prepend: conflicting values string and {Prepend:#ConfigText} (mismatched types string and struct): // ./x.cue:15:14 // ./x.cue:22:52 // ./x.cue:44:29 // ./x.cue:44:56 // ./x.cue:51:14 - // ./x.cue:51:23 - // ./x.cue:53:18 + // ./x.cue:53:56 // ./x.cue:55:72 // ./x.cue:55:75 // ./x.cue:59:9 @@ -3335,8 +3292,6 @@ diff old new // ./x.cue:118:4 // ./x.cue:118:38 // ./x.cue:123:9 - // value0.xs.0.INP.Prepend: 5 errors in empty disjunction:: - // ./x.cue:100:7 // value0.xs.0.INP.Prepend.UseSectionName: field not allowed: // ./x.cue:100:7 // ./x.cue:15:14 @@ -3410,13 +3365,16 @@ diff old new } } Append: (_|_){ - // [eval] value0.xs.0.INP.Append: conflicting values string and {Append:#ConfigText} (mismatched types string and struct): + // [eval] value0.xs.0.INP.Append: 5 errors in empty disjunction:: + // ./x.cue:100:7 + // value0.xs.0.INP.Append: conflicting values string and {UseSectionName:true} (mismatched types string and struct): // ./x.cue:15:14 // ./x.cue:22:52 // ./x.cue:44:29 // ./x.cue:44:56 // ./x.cue:51:14 - // ./x.cue:53:32 + // ./x.cue:51:23 + // ./x.cue:53:18 // ./x.cue:55:72 // ./x.cue:55:75 // ./x.cue:59:9 @@ -3428,13 +3386,13 @@ diff old new // ./x.cue:118:4 // ./x.cue:118:38 // ./x.cue:123:9 - // value0.xs.0.INP.Append: conflicting values string and {Prepend:#ConfigText} (mismatched types string and struct): + // value0.xs.0.INP.Append: conflicting values string and {Append:#ConfigText} (mismatched types string and struct): // ./x.cue:15:14 // ./x.cue:22:52 // ./x.cue:44:29 // ./x.cue:44:56 // ./x.cue:51:14 - // ./x.cue:53:56 + // ./x.cue:53:32 // ./x.cue:55:72 // ./x.cue:55:75 // ./x.cue:59:9 @@ -3446,14 +3404,13 @@ diff old new // ./x.cue:118:4 // ./x.cue:118:38 // ./x.cue:123:9 - // value0.xs.0.INP.Append: conflicting values string and {UseSectionName:true} (mismatched types string and struct): + // value0.xs.0.INP.Append: conflicting values string and {Prepend:#ConfigText} (mismatched types string and struct): // ./x.cue:15:14 // ./x.cue:22:52 // ./x.cue:44:29 // ./x.cue:44:56 // ./x.cue:51:14 - // ./x.cue:51:23 - // ./x.cue:53:18 + // ./x.cue:53:56 // ./x.cue:55:72 // ./x.cue:55:75 // ./x.cue:59:9 @@ -3465,8 +3422,6 @@ diff old new // ./x.cue:118:4 // ./x.cue:118:38 // ./x.cue:123:9 - // value0.xs.0.INP.Append: 5 errors in empty disjunction:: - // ./x.cue:100:7 // value0.xs.0.INP.Append.UseSectionName: field not allowed: // ./x.cue:100:7 // ./x.cue:15:14 diff --git a/cue/testdata/eval/issue3801.txtar b/cue/testdata/eval/issue3801.txtar index efab1cf3643..e2f6dc78a05 100644 --- a/cue/testdata/eval/issue3801.txtar +++ b/cue/testdata/eval/issue3801.txtar @@ -198,7 +198,7 @@ Disjuncts: 762 patch: (list){ } output: (_|_){ - // [incomplete] issue3801.let.full.#JSONPatch.output: cannot reference optional field: namespace: + // [incomplete] issue3801.let.full.#JSONPatch.output: key value of dynamic field must be concrete, found _|_(issue3801.let.full.#JSONPatch.output: cannot reference optional field: namespace): // ./nested.cue:43:24 } } @@ -331,7 +331,7 @@ Disjuncts: 762 namespace?: (string){ string } patch: (_){ _ } output: (_|_){ - // [incomplete] issue3801.nonRooted.full.#SubOutput.output: cannot reference optional field: namespace: + // [incomplete] issue3801.nonRooted.full.#SubOutput.output: key value of dynamic field must be concrete, found _|_(issue3801.nonRooted.full.#SubOutput.output: cannot reference optional field: namespace): // ./nested.cue:88:12 } } @@ -348,6 +348,15 @@ Disjuncts: 762 diff old new --- old +++ new +@@ -57,7 +57,7 @@ + patch: (list){ + } + output: (_|_){ +- // [incomplete] issue3801.let.full.#JSONPatch.output: cannot reference optional field: namespace: ++ // [incomplete] issue3801.let.full.#JSONPatch.output: key value of dynamic field must be concrete, found _|_(issue3801.let.full.#JSONPatch.output: cannot reference optional field: namespace): + // ./nested.cue:43:24 + } + } @@ -72,38 +72,11 @@ #Main: (#struct){ namespace: (string){ string } @@ -437,6 +446,15 @@ diff old new ns1: (string){ "foo" } } #SubOutput: (#struct){ +@@ -205,7 +190,7 @@ + namespace?: (string){ string } + patch: (_){ _ } + output: (_|_){ +- // [incomplete] issue3801.nonRooted.full.#SubOutput.output: cannot reference optional field: namespace: ++ // [incomplete] issue3801.nonRooted.full.#SubOutput.output: key value of dynamic field must be concrete, found _|_(issue3801.nonRooted.full.#SubOutput.output: cannot reference optional field: namespace): + // ./nested.cue:88:12 + } + } -- out/eval -- (struct){ issue3801: (struct){ diff --git a/cue/testdata/eval/notify.txtar b/cue/testdata/eval/notify.txtar index 1d0597b5afe..24e09371b88 100644 --- a/cue/testdata/eval/notify.txtar +++ b/cue/testdata/eval/notify.txtar @@ -35,33 +35,33 @@ issue3437: { -- out/evalalpha -- Errors: t1.p1: 2 errors in empty disjunction: -t1.p1: conflicting values 1 and {a:(2|1)} (mismatched types int and struct): - ./in.cue:3:5 - ./in.cue:3:10 t1.p1: conflicting values 2 and {a:(2|1)} (mismatched types int and struct): ./in.cue:3:5 ./in.cue:3:8 +t1.p1: conflicting values 1 and {a:(2|1)} (mismatched types int and struct): + ./in.cue:3:5 + ./in.cue:3:10 t1.p2: 2 errors in empty disjunction: -t1.p2: conflicting values 1 and {a:(2|1)} (mismatched types int and struct): - ./in.cue:6:5 - ./in.cue:6:10 t1.p2: conflicting values 2 and {a:(2|1)} (mismatched types int and struct): ./in.cue:6:5 ./in.cue:6:8 +t1.p2: conflicting values 1 and {a:(2|1)} (mismatched types int and struct): + ./in.cue:6:5 + ./in.cue:6:10 t2.p1.d: 2 errors in empty disjunction: -t2.p1.d: conflicting values 1 and {a:(2|1)} (mismatched types int and struct): - ./in.cue:11:8 - ./in.cue:11:13 t2.p1.d: conflicting values 2 and {a:(2|1)} (mismatched types int and struct): ./in.cue:11:8 ./in.cue:11:11 +t2.p1.d: conflicting values 1 and {a:(2|1)} (mismatched types int and struct): + ./in.cue:11:8 + ./in.cue:11:13 t2.p2.d: 2 errors in empty disjunction: -t2.p2.d: conflicting values 1 and {a:(2|1)} (mismatched types int and struct): - ./in.cue:15:8 - ./in.cue:15:13 t2.p2.d: conflicting values 2 and {a:(2|1)} (mismatched types int and struct): ./in.cue:15:8 ./in.cue:15:11 +t2.p2.d: conflicting values 1 and {a:(2|1)} (mismatched types int and struct): + ./in.cue:15:8 + ./in.cue:15:13 Result: (_|_){ @@ -70,24 +70,24 @@ Result: // [eval] p1: (_|_){ // [eval] t1.p1: 2 errors in empty disjunction: - // t1.p1: conflicting values 1 and {a:(2|1)} (mismatched types int and struct): - // ./in.cue:3:5 - // ./in.cue:3:10 // t1.p1: conflicting values 2 and {a:(2|1)} (mismatched types int and struct): // ./in.cue:3:5 // ./in.cue:3:8 + // t1.p1: conflicting values 1 and {a:(2|1)} (mismatched types int and struct): + // ./in.cue:3:5 + // ./in.cue:3:10 a: (struct){ a: (_){ _ } } } p2: (_|_){ // [eval] t1.p2: 2 errors in empty disjunction: - // t1.p2: conflicting values 1 and {a:(2|1)} (mismatched types int and struct): - // ./in.cue:6:5 - // ./in.cue:6:10 // t1.p2: conflicting values 2 and {a:(2|1)} (mismatched types int and struct): // ./in.cue:6:5 // ./in.cue:6:8 + // t1.p2: conflicting values 1 and {a:(2|1)} (mismatched types int and struct): + // ./in.cue:6:5 + // ./in.cue:6:10 a: (struct){ a: (_){ _ } } @@ -99,12 +99,12 @@ Result: // [eval] d: (_|_){ // [eval] t2.p1.d: 2 errors in empty disjunction: - // t2.p1.d: conflicting values 1 and {a:(2|1)} (mismatched types int and struct): - // ./in.cue:11:8 - // ./in.cue:11:13 // t2.p1.d: conflicting values 2 and {a:(2|1)} (mismatched types int and struct): // ./in.cue:11:8 // ./in.cue:11:11 + // t2.p1.d: conflicting values 1 and {a:(2|1)} (mismatched types int and struct): + // ./in.cue:11:8 + // ./in.cue:11:13 a: (struct){ a: (_){ _ } } @@ -114,12 +114,12 @@ Result: // [eval] d: (_|_){ // [eval] t2.p2.d: 2 errors in empty disjunction: - // t2.p2.d: conflicting values 1 and {a:(2|1)} (mismatched types int and struct): - // ./in.cue:15:8 - // ./in.cue:15:13 // t2.p2.d: conflicting values 2 and {a:(2|1)} (mismatched types int and struct): // ./in.cue:15:8 // ./in.cue:15:11 + // t2.p2.d: conflicting values 1 and {a:(2|1)} (mismatched types int and struct): + // ./in.cue:15:8 + // ./in.cue:15:13 a: (struct){ a: (_){ _ } } @@ -1119,54 +1119,54 @@ diff old new @@ -1,11 +1,9 @@ Errors: t1.p1: 2 errors in empty disjunction: - t1.p1: conflicting values 1 and {a:(2|1)} (mismatched types int and struct): -- ./in.cue:2:2 - ./in.cue:3:5 - ./in.cue:3:10 t1.p1: conflicting values 2 and {a:(2|1)} (mismatched types int and struct): - ./in.cue:2:2 ./in.cue:3:5 ./in.cue:3:8 + t1.p1: conflicting values 1 and {a:(2|1)} (mismatched types int and struct): +- ./in.cue:2:2 + ./in.cue:3:5 + ./in.cue:3:10 t1.p2: 2 errors in empty disjunction: @@ -12,27 +10,21 @@ - t1.p2: conflicting values 1 and {a:(2|1)} (mismatched types int and struct): - ./in.cue:6:5 - ./in.cue:6:10 -- ./in.cue:7:2 t1.p2: conflicting values 2 and {a:(2|1)} (mismatched types int and struct): ./in.cue:6:5 ./in.cue:6:8 +- ./in.cue:7:2 + t1.p2: conflicting values 1 and {a:(2|1)} (mismatched types int and struct): + ./in.cue:6:5 + ./in.cue:6:10 - ./in.cue:7:2 t2.p1.d: 2 errors in empty disjunction: - t2.p1.d: conflicting values 1 and {a:(2|1)} (mismatched types int and struct): -- ./in.cue:10:5 - ./in.cue:11:8 - ./in.cue:11:13 t2.p1.d: conflicting values 2 and {a:(2|1)} (mismatched types int and struct): - ./in.cue:10:5 ./in.cue:11:8 ./in.cue:11:11 + t2.p1.d: conflicting values 1 and {a:(2|1)} (mismatched types int and struct): +- ./in.cue:10:5 + ./in.cue:11:8 + ./in.cue:11:13 t2.p2.d: 2 errors in empty disjunction: - t2.p2.d: conflicting values 1 and {a:(2|1)} (mismatched types int and struct): -- ./in.cue:14:5 - ./in.cue:15:8 - ./in.cue:15:13 t2.p2.d: conflicting values 2 and {a:(2|1)} (mismatched types int and struct): - ./in.cue:14:5 ./in.cue:15:8 ./in.cue:15:11 + t2.p2.d: conflicting values 1 and {a:(2|1)} (mismatched types int and struct): +- ./in.cue:14:5 + ./in.cue:15:8 + ./in.cue:15:13 @@ -44,15 +36,13 @@ p1: (_|_){ // [eval] t1.p1: 2 errors in empty disjunction: - // t1.p1: conflicting values 1 and {a:(2|1)} (mismatched types int and struct): -- // ./in.cue:2:2 - // ./in.cue:3:5 - // ./in.cue:3:10 // t1.p1: conflicting values 2 and {a:(2|1)} (mismatched types int and struct): - // ./in.cue:2:2 // ./in.cue:3:5 // ./in.cue:3:8 + // t1.p1: conflicting values 1 and {a:(2|1)} (mismatched types int and struct): +- // ./in.cue:2:2 + // ./in.cue:3:5 + // ./in.cue:3:10 a: (struct){ - a: (int){ |((int){ 2 }, (int){ 1 }) } + a: (_){ _ } @@ -1174,13 +1174,13 @@ diff old new } p2: (_|_){ @@ -60,13 +50,11 @@ - // t1.p2: conflicting values 1 and {a:(2|1)} (mismatched types int and struct): - // ./in.cue:6:5 - // ./in.cue:6:10 -- // ./in.cue:7:2 // t1.p2: conflicting values 2 and {a:(2|1)} (mismatched types int and struct): // ./in.cue:6:5 // ./in.cue:6:8 +- // ./in.cue:7:2 + // t1.p2: conflicting values 1 and {a:(2|1)} (mismatched types int and struct): + // ./in.cue:6:5 + // ./in.cue:6:10 - // ./in.cue:7:2 - a: (struct){ - a: (int){ |((int){ 2 }, (int){ 1 }) } @@ -1192,14 +1192,14 @@ diff old new @@ -77,15 +65,13 @@ d: (_|_){ // [eval] t2.p1.d: 2 errors in empty disjunction: - // t2.p1.d: conflicting values 1 and {a:(2|1)} (mismatched types int and struct): -- // ./in.cue:10:5 - // ./in.cue:11:8 - // ./in.cue:11:13 // t2.p1.d: conflicting values 2 and {a:(2|1)} (mismatched types int and struct): - // ./in.cue:10:5 // ./in.cue:11:8 // ./in.cue:11:11 + // t2.p1.d: conflicting values 1 and {a:(2|1)} (mismatched types int and struct): +- // ./in.cue:10:5 + // ./in.cue:11:8 + // ./in.cue:11:13 a: (struct){ - a: (int){ |((int){ 2 }, (int){ 1 }) } + a: (_){ _ } @@ -1209,14 +1209,14 @@ diff old new @@ -94,15 +80,13 @@ d: (_|_){ // [eval] t2.p2.d: 2 errors in empty disjunction: - // t2.p2.d: conflicting values 1 and {a:(2|1)} (mismatched types int and struct): -- // ./in.cue:14:5 - // ./in.cue:15:8 - // ./in.cue:15:13 // t2.p2.d: conflicting values 2 and {a:(2|1)} (mismatched types int and struct): - // ./in.cue:14:5 // ./in.cue:15:8 // ./in.cue:15:11 + // t2.p2.d: conflicting values 1 and {a:(2|1)} (mismatched types int and struct): +- // ./in.cue:14:5 + // ./in.cue:15:8 + // ./in.cue:15:13 a: (struct){ - a: (int){ |((int){ 2 }, (int){ 1 }) } + a: (_){ _ } @@ -2120,41 +2120,41 @@ indicate a performance issue. -- out/eval -- Errors: t1.p1: 2 errors in empty disjunction: -t1.p1: conflicting values 1 and {a:(2|1)} (mismatched types int and struct): - ./in.cue:2:2 - ./in.cue:3:5 - ./in.cue:3:10 t1.p1: conflicting values 2 and {a:(2|1)} (mismatched types int and struct): ./in.cue:2:2 ./in.cue:3:5 ./in.cue:3:8 +t1.p1: conflicting values 1 and {a:(2|1)} (mismatched types int and struct): + ./in.cue:2:2 + ./in.cue:3:5 + ./in.cue:3:10 t1.p2: 2 errors in empty disjunction: -t1.p2: conflicting values 1 and {a:(2|1)} (mismatched types int and struct): - ./in.cue:6:5 - ./in.cue:6:10 - ./in.cue:7:2 t1.p2: conflicting values 2 and {a:(2|1)} (mismatched types int and struct): ./in.cue:6:5 ./in.cue:6:8 ./in.cue:7:2 +t1.p2: conflicting values 1 and {a:(2|1)} (mismatched types int and struct): + ./in.cue:6:5 + ./in.cue:6:10 + ./in.cue:7:2 t2.p1.d: 2 errors in empty disjunction: -t2.p1.d: conflicting values 1 and {a:(2|1)} (mismatched types int and struct): - ./in.cue:10:5 - ./in.cue:11:8 - ./in.cue:11:13 t2.p1.d: conflicting values 2 and {a:(2|1)} (mismatched types int and struct): ./in.cue:10:5 ./in.cue:11:8 ./in.cue:11:11 +t2.p1.d: conflicting values 1 and {a:(2|1)} (mismatched types int and struct): + ./in.cue:10:5 + ./in.cue:11:8 + ./in.cue:11:13 t2.p2.d: 2 errors in empty disjunction: -t2.p2.d: conflicting values 1 and {a:(2|1)} (mismatched types int and struct): - ./in.cue:14:5 - ./in.cue:15:8 - ./in.cue:15:13 t2.p2.d: conflicting values 2 and {a:(2|1)} (mismatched types int and struct): ./in.cue:14:5 ./in.cue:15:8 ./in.cue:15:11 +t2.p2.d: conflicting values 1 and {a:(2|1)} (mismatched types int and struct): + ./in.cue:14:5 + ./in.cue:15:8 + ./in.cue:15:13 Result: (_|_){ @@ -2163,28 +2163,28 @@ Result: // [eval] p1: (_|_){ // [eval] t1.p1: 2 errors in empty disjunction: - // t1.p1: conflicting values 1 and {a:(2|1)} (mismatched types int and struct): - // ./in.cue:2:2 - // ./in.cue:3:5 - // ./in.cue:3:10 // t1.p1: conflicting values 2 and {a:(2|1)} (mismatched types int and struct): // ./in.cue:2:2 // ./in.cue:3:5 // ./in.cue:3:8 + // t1.p1: conflicting values 1 and {a:(2|1)} (mismatched types int and struct): + // ./in.cue:2:2 + // ./in.cue:3:5 + // ./in.cue:3:10 a: (struct){ a: (int){ |((int){ 2 }, (int){ 1 }) } } } p2: (_|_){ // [eval] t1.p2: 2 errors in empty disjunction: - // t1.p2: conflicting values 1 and {a:(2|1)} (mismatched types int and struct): - // ./in.cue:6:5 - // ./in.cue:6:10 - // ./in.cue:7:2 // t1.p2: conflicting values 2 and {a:(2|1)} (mismatched types int and struct): // ./in.cue:6:5 // ./in.cue:6:8 // ./in.cue:7:2 + // t1.p2: conflicting values 1 and {a:(2|1)} (mismatched types int and struct): + // ./in.cue:6:5 + // ./in.cue:6:10 + // ./in.cue:7:2 a: (struct){ a: (int){ |((int){ 2 }, (int){ 1 }) } } @@ -2196,14 +2196,14 @@ Result: // [eval] d: (_|_){ // [eval] t2.p1.d: 2 errors in empty disjunction: - // t2.p1.d: conflicting values 1 and {a:(2|1)} (mismatched types int and struct): - // ./in.cue:10:5 - // ./in.cue:11:8 - // ./in.cue:11:13 // t2.p1.d: conflicting values 2 and {a:(2|1)} (mismatched types int and struct): // ./in.cue:10:5 // ./in.cue:11:8 // ./in.cue:11:11 + // t2.p1.d: conflicting values 1 and {a:(2|1)} (mismatched types int and struct): + // ./in.cue:10:5 + // ./in.cue:11:8 + // ./in.cue:11:13 a: (struct){ a: (int){ |((int){ 2 }, (int){ 1 }) } } @@ -2213,14 +2213,14 @@ Result: // [eval] d: (_|_){ // [eval] t2.p2.d: 2 errors in empty disjunction: - // t2.p2.d: conflicting values 1 and {a:(2|1)} (mismatched types int and struct): - // ./in.cue:14:5 - // ./in.cue:15:8 - // ./in.cue:15:13 // t2.p2.d: conflicting values 2 and {a:(2|1)} (mismatched types int and struct): // ./in.cue:14:5 // ./in.cue:15:8 // ./in.cue:15:11 + // t2.p2.d: conflicting values 1 and {a:(2|1)} (mismatched types int and struct): + // ./in.cue:14:5 + // ./in.cue:15:8 + // ./in.cue:15:13 a: (struct){ a: (int){ |((int){ 2 }, (int){ 1 }) } } diff --git a/cue/testdata/eval/sharing.txtar b/cue/testdata/eval/sharing.txtar index 914ad047212..45eddd27406 100644 --- a/cue/testdata/eval/sharing.txtar +++ b/cue/testdata/eval/sharing.txtar @@ -191,10 +191,10 @@ Conjuncts: 401 Disjuncts: 225 -- out/evalalpha -- Errors: -shareCycle.t1.Y.x.x: structural cycle shareCycle.t2.Y.x: conflicting values int and {x:(#X & Y)} (mismatched types int and struct): ./sharecycle.cue:8:6 ./sharecycle.cue:9:5 +shareCycle.t1.Y.x.x: structural cycle shareCycle.t3.Y.x.x: structural cycle Result: @@ -518,11 +518,12 @@ Result: diff old new --- old +++ new -@@ -3,8 +3,6 @@ +@@ -2,9 +2,7 @@ shareCycle.t2.Y.x: conflicting values int and {x:(#X & Y)} (mismatched types int and struct): ./sharecycle.cue:8:6 ./sharecycle.cue:9:5 - ./sharecycle.cue:10:11 + shareCycle.t1.Y.x.x: structural cycle -shareCycle.t2.Y.x.x: structural cycle shareCycle.t3.Y.x.x: structural cycle @@ -801,11 +802,11 @@ diff old new } -- out/eval -- Errors: -shareCycle.t1.Y.x.x: structural cycle shareCycle.t2.Y.x: conflicting values int and {x:(#X & Y)} (mismatched types int and struct): ./sharecycle.cue:8:6 ./sharecycle.cue:9:5 ./sharecycle.cue:10:11 +shareCycle.t1.Y.x.x: structural cycle shareCycle.t2.Y.x.x: structural cycle shareCycle.t3.Y.x.x: structural cycle diff --git a/cue/testdata/eval/v0.7.txtar b/cue/testdata/eval/v0.7.txtar index 44203da9ed6..0c2f5c9b178 100644 --- a/cue/testdata/eval/v0.7.txtar +++ b/cue/testdata/eval/v0.7.txtar @@ -234,10 +234,10 @@ definition.t1.err.a.c: field not allowed: ./definition.cue:8:5 ./definition.cue:9:5 ./definition.cue:11:6 -mutual.t4.ok.p0.z: cannot add to field b mutual.t4.ok.p0.z: cannot add to field c -mutual.t4.ok.p4.z: cannot add to field b +mutual.t4.ok.p0.z: cannot add to field b mutual.t4.ok.p4.z: cannot add to field c +mutual.t4.ok.p4.z: cannot add to field b Result: (_|_){ @@ -504,8 +504,8 @@ Result: p0: (_|_){ // [eval] z: (_|_){ - // [eval] mutual.t4.ok.p0.z: cannot add to field b - // mutual.t4.ok.p0.z: cannot add to field c + // [eval] mutual.t4.ok.p0.z: cannot add to field c + // mutual.t4.ok.p0.z: cannot add to field b d: (struct){ a: (int){ 1 } b: (int){ 2 } @@ -605,8 +605,8 @@ Result: p4: (_|_){ // [eval] z: (_|_){ - // [eval] mutual.t4.ok.p4.z: cannot add to field b - // mutual.t4.ok.p4.z: cannot add to field c + // [eval] mutual.t4.ok.p4.z: cannot add to field c + // mutual.t4.ok.p4.z: cannot add to field b d: (struct){ a: (int){ 1 } b: (int){ 2 } @@ -1136,10 +1136,10 @@ diff old new - ./definition.cue:8:5 ./definition.cue:9:5 - ./definition.cue:11:6 --mutual.t4.ok.p0.z: cannot add to field b -mutual.t4.ok.p0.z: cannot add to field c --mutual.t4.ok.p4.z: cannot add to field b +-mutual.t4.ok.p0.z: cannot add to field b -mutual.t4.ok.p4.z: cannot add to field c +-mutual.t4.ok.p4.z: cannot add to field b Result: (_|_){ @@ -1273,8 +1273,8 @@ diff old new - p0: (_|_){ - // [eval] - z: (_|_){ -- // [eval] mutual.t4.ok.p0.z: cannot add to field b -- // mutual.t4.ok.p0.z: cannot add to field c +- // [eval] mutual.t4.ok.p0.z: cannot add to field c +- // mutual.t4.ok.p0.z: cannot add to field b - d: (struct){ - a: (int){ 1 } - b: (int){ 2 } @@ -1374,8 +1374,8 @@ diff old new - p4: (_|_){ - // [eval] - z: (_|_){ -- // [eval] mutual.t4.ok.p4.z: cannot add to field b -- // mutual.t4.ok.p4.z: cannot add to field c +- // [eval] mutual.t4.ok.p4.z: cannot add to field c +- // mutual.t4.ok.p4.z: cannot add to field b - d: (struct){ - a: (int){ 1 } - b: (int){ 2 } diff --git a/cue/testdata/export/012.txtar b/cue/testdata/export/012.txtar index c41745dca6a..8fce03a22e6 100644 --- a/cue/testdata/export/012.txtar +++ b/cue/testdata/export/012.txtar @@ -26,7 +26,7 @@ Disjuncts: 7 (struct){ a: ((int|string)){ |(*(string){ "foo" }, *(string){ "bar" }, *(string){ string }, (int){ int }) } b: (_|_){ - // [incomplete] b: non-concrete slice subject a: + // [incomplete] b: unresolved disjunction *"foo" | *"bar" | *string | int (type (int|string)): // ./in.cue:1:41 } } diff --git a/cue/testdata/fulleval/026_dont_convert_incomplete_errors_to_non-incomplete.txtar b/cue/testdata/fulleval/026_dont_convert_incomplete_errors_to_non-incomplete.txtar index bd8a3aa330d..19ac98c42fe 100644 --- a/cue/testdata/fulleval/026_dont_convert_incomplete_errors_to_non-incomplete.txtar +++ b/cue/testdata/fulleval/026_dont_convert_incomplete_errors_to_non-incomplete.txtar @@ -87,16 +87,16 @@ Disjuncts: 82 (struct){ n1: (struct){ min: (_|_){ - // [cycle] n1.min: cycle with field: max: - // ./in.cue:3:12 - // n1.max: cycle with field: min: + // [cycle] n1.max: cycle with field: min: // ./in.cue:3:23 + // n1.min: cycle with field: max: + // ./in.cue:3:12 } max: (_|_){ - // [cycle] n1.min: cycle with field: max: - // ./in.cue:3:12 - // n1.max: cycle with field: min: + // [cycle] n1.max: cycle with field: min: // ./in.cue:3:23 + // n1.min: cycle with field: max: + // ./in.cue:3:12 } } n2: (_|_){ @@ -155,17 +155,17 @@ diff old new n1: (struct){ min: (_|_){ - // [cycle] cycle error -+ // [cycle] n1.min: cycle with field: max: -+ // ./in.cue:3:12 -+ // n1.max: cycle with field: min: ++ // [cycle] n1.max: cycle with field: min: + // ./in.cue:3:23 ++ // n1.min: cycle with field: max: ++ // ./in.cue:3:12 } max: (_|_){ - // [cycle] cycle error -+ // [cycle] n1.min: cycle with field: max: -+ // ./in.cue:3:12 -+ // n1.max: cycle with field: min: ++ // [cycle] n1.max: cycle with field: min: + // ./in.cue:3:23 ++ // n1.min: cycle with field: max: ++ // ./in.cue:3:12 } } n2: (_|_){ diff --git a/cue/testdata/fulleval/035_optionals_with_label_filters.txtar b/cue/testdata/fulleval/035_optionals_with_label_filters.txtar index 7b0707e05aa..61d8c04e005 100644 --- a/cue/testdata/fulleval/035_optionals_with_label_filters.txtar +++ b/cue/testdata/fulleval/035_optionals_with_label_filters.txtar @@ -112,13 +112,13 @@ Disjuncts: 19 Errors: jobs1.foo1: field not allowed: ./in.cue:16:8 -jobs3.fooTest1: field not allowed: - ./in.cue:22:8 - ./in.cue:23:8 jobs2.fooTest.name: invalid value "badName" (out of bound =~"^test"): ./in.cue:9:22 ./in.cue:3:8 ./in.cue:19:23 +jobs3.fooTest1: field not allowed: + ./in.cue:22:8 + ./in.cue:23:8 Result: (_|_){ @@ -177,7 +177,7 @@ Result: diff old new --- old +++ new -@@ -1,15 +1,7 @@ +@@ -1,9 +1,5 @@ Errors: jobs1.foo1: field not allowed: - ./in.cue:6:8 @@ -185,6 +185,11 @@ diff old new - ./in.cue:9:2 - ./in.cue:15:17 ./in.cue:16:8 + jobs2.fooTest.name: invalid value "badName" (out of bound =~"^test"): + ./in.cue:9:22 +@@ -10,10 +6,6 @@ + ./in.cue:3:8 + ./in.cue:19:23 jobs3.fooTest1: field not allowed: - ./in.cue:6:8 - ./in.cue:7:2 @@ -192,7 +197,7 @@ diff old new - ./in.cue:21:8 ./in.cue:22:8 ./in.cue:23:8 - jobs2.fooTest.name: invalid value "badName" (out of bound =~"^test"): + @@ -36,10 +28,6 @@ // [eval] foo1: (_|_){ @@ -238,6 +243,10 @@ jobs1.foo1: field not allowed: ./in.cue:9:2 ./in.cue:15:17 ./in.cue:16:8 +jobs2.fooTest.name: invalid value "badName" (out of bound =~"^test"): + ./in.cue:9:22 + ./in.cue:3:8 + ./in.cue:19:23 jobs3.fooTest1: field not allowed: ./in.cue:6:8 ./in.cue:7:2 @@ -245,10 +254,6 @@ jobs3.fooTest1: field not allowed: ./in.cue:21:8 ./in.cue:22:8 ./in.cue:23:8 -jobs2.fooTest.name: invalid value "badName" (out of bound =~"^test"): - ./in.cue:9:22 - ./in.cue:3:8 - ./in.cue:19:23 Result: (_|_){ diff --git a/cue/testdata/lists/020_list_compilefail.txtar b/cue/testdata/lists/020_list_compilefail.txtar index 798211027d5..cc2377cb55d 100644 --- a/cue/testdata/lists/020_list_compilefail.txtar +++ b/cue/testdata/lists/020_list_compilefail.txtar @@ -15,10 +15,10 @@ l3: invalid operand <=2 ('*' requires concrete value): ./in.cue:1:5 l4: invalid operand <=2 ('*' requires concrete value): ./in.cue:2:5 -l5: invalid operand <=2 ('*' requires concrete value): - ./in.cue:3:5 l5: invalid operand int ('*' requires concrete value): ./in.cue:3:12 +l5: invalid operand <=2 ('*' requires concrete value): + ./in.cue:3:5 b: invalid operand <=5 ('*' requires concrete value): ./in.cue:4:5 d: invalid operand >=2 ('*' requires concrete value): @@ -62,10 +62,10 @@ l3: invalid operand <=2 ('*' requires concrete value): ./in.cue:1:5 l4: invalid operand <=2 ('*' requires concrete value): ./in.cue:2:5 -l5: invalid operand <=2 ('*' requires concrete value): - ./in.cue:3:5 l5: invalid operand int ('*' requires concrete value): ./in.cue:3:12 +l5: invalid operand <=2 ('*' requires concrete value): + ./in.cue:3:5 b: invalid operand <=5 ('*' requires concrete value): ./in.cue:4:5 d: invalid operand >=2 ('*' requires concrete value): diff --git a/cue/testdata/resolve/011_bounds.txtar b/cue/testdata/resolve/011_bounds.txtar index ff897c202bf..1d032b62891 100644 --- a/cue/testdata/resolve/011_bounds.txtar +++ b/cue/testdata/resolve/011_bounds.txtar @@ -175,21 +175,18 @@ Conjuncts: 126 Disjuncts: 50 -- out/evalalpha -- Errors: -e1: conflicting values null and !=null (mismatched types null and (bool|string|bytes|func|list|struct|number)): - ./in.cue:56:5 - ./in.cue:56:12 -e2: conflicting values null and !=null (mismatched types null and (bool|string|bytes|func|list|struct|number)): - ./in.cue:57:5 - ./in.cue:57:14 -e9: conflicting values >"a" and <1 (mismatched types string and number): - ./in.cue:64:5 - ./in.cue:64:12 floats.issue1310: incompatible number bounds <=1.0 and >=2.1: ./in.cue:50:21 ./in.cue:50:13 floats.fe2: incompatible number bounds <=2.1 and >2.1: ./in.cue:51:20 ./in.cue:51:13 +e1: conflicting values null and !=null (mismatched types null and (bool|string|bytes|func|list|struct|number)): + ./in.cue:56:5 + ./in.cue:56:12 +e2: conflicting values null and !=null (mismatched types null and (bool|string|bytes|func|list|struct|number)): + ./in.cue:57:5 + ./in.cue:57:14 e3: invalid value 1 (out of bound >1): ./in.cue:58:5 ./in.cue:58:10 @@ -208,6 +205,9 @@ e7: incompatible number bounds <11 and >=11: e8: incompatible number bounds <=11 and >11: ./in.cue:63:11 ./in.cue:63:5 +e9: conflicting values >"a" and <1 (mismatched types string and number): + ./in.cue:64:5 + ./in.cue:64:12 Result: (_|_){ @@ -313,7 +313,16 @@ Result: diff old new --- old +++ new -@@ -2,30 +2,18 @@ +@@ -1,14 +1,14 @@ + Errors: + floats.issue1310: incompatible number bounds <=1.0 and >=2.1: +- ./in.cue:50:13 + ./in.cue:50:21 ++ ./in.cue:50:13 + floats.fe2: incompatible number bounds <=2.1 and >2.1: +- ./in.cue:51:13 + ./in.cue:51:20 ++ ./in.cue:51:13 e1: conflicting values null and !=null (mismatched types null and (bool|string|bytes|func|list|struct|number)): ./in.cue:56:5 ./in.cue:56:12 @@ -321,53 +330,29 @@ diff old new +e2: conflicting values null and !=null (mismatched types null and (bool|string|bytes|func|list|struct|number)): ./in.cue:57:5 ./in.cue:57:14 --e5: incompatible number bounds <0 and >1: -- ./in.cue:60:5 -- ./in.cue:60:10 --e6: incompatible number bounds <11 and >11: -- ./in.cue:61:5 -- ./in.cue:61:11 --e7: incompatible number bounds <11 and >=11: -- ./in.cue:62:5 -- ./in.cue:62:12 --e8: incompatible number bounds <=11 and >11: -- ./in.cue:63:5 -- ./in.cue:63:11 - e9: conflicting values >"a" and <1 (mismatched types string and number): - ./in.cue:64:5 - ./in.cue:64:12 --floats.fe2: incompatible number bounds <=2.1 and >2.1: -- ./in.cue:51:13 -- ./in.cue:51:20 - floats.issue1310: incompatible number bounds <=1.0 and >=2.1: -- ./in.cue:50:13 - ./in.cue:50:21 -+ ./in.cue:50:13 -+floats.fe2: incompatible number bounds <=2.1 and >2.1: -+ ./in.cue:51:20 -+ ./in.cue:51:13 e3: invalid value 1 (out of bound >1): - ./in.cue:58:5 - ./in.cue:58:10 -@@ -32,6 +20,18 @@ - e4: invalid value 0 (out of bound <0): +@@ -18,17 +18,17 @@ ./in.cue:59:5 ./in.cue:59:10 -+e5: incompatible number bounds <0 and >1: -+ ./in.cue:60:10 + e5: incompatible number bounds <0 and >1: +- ./in.cue:60:5 + ./in.cue:60:10 + ./in.cue:60:5 -+e6: incompatible number bounds <11 and >11: -+ ./in.cue:61:11 + e6: incompatible number bounds <11 and >11: +- ./in.cue:61:5 + ./in.cue:61:11 + ./in.cue:61:5 -+e7: incompatible number bounds <11 and >=11: -+ ./in.cue:62:12 + e7: incompatible number bounds <11 and >=11: +- ./in.cue:62:5 + ./in.cue:62:12 + ./in.cue:62:5 -+e8: incompatible number bounds <=11 and >11: -+ ./in.cue:63:11 + e8: incompatible number bounds <=11 and >11: +- ./in.cue:63:5 + ./in.cue:63:11 + ./in.cue:63:5 - - Result: - (_|_){ + e9: conflicting values >"a" and <1 (mismatched types string and number): + ./in.cue:64:5 + ./in.cue:64:12 @@ -74,16 +74,16 @@ f4: (float){ &(<=1.1, float) } f5: (float){ &(>1.1, float) } @@ -431,12 +416,24 @@ Reordering f7 changed from number to float. This is a bug fix. -- out/eval -- Errors: +floats.issue1310: incompatible number bounds <=1.0 and >=2.1: + ./in.cue:50:13 + ./in.cue:50:21 +floats.fe2: incompatible number bounds <=2.1 and >2.1: + ./in.cue:51:13 + ./in.cue:51:20 e1: conflicting values null and !=null (mismatched types null and (bool|string|bytes|func|list|struct|number)): ./in.cue:56:5 ./in.cue:56:12 e2: conflicting values !=null and null (mismatched types (bool|string|bytes|func|list|struct|number) and null): ./in.cue:57:5 ./in.cue:57:14 +e3: invalid value 1 (out of bound >1): + ./in.cue:58:5 + ./in.cue:58:10 +e4: invalid value 0 (out of bound <0): + ./in.cue:59:5 + ./in.cue:59:10 e5: incompatible number bounds <0 and >1: ./in.cue:60:5 ./in.cue:60:10 @@ -452,18 +449,6 @@ e8: incompatible number bounds <=11 and >11: e9: conflicting values >"a" and <1 (mismatched types string and number): ./in.cue:64:5 ./in.cue:64:12 -floats.fe2: incompatible number bounds <=2.1 and >2.1: - ./in.cue:51:13 - ./in.cue:51:20 -floats.issue1310: incompatible number bounds <=1.0 and >=2.1: - ./in.cue:50:13 - ./in.cue:50:21 -e3: invalid value 1 (out of bound >1): - ./in.cue:58:5 - ./in.cue:58:10 -e4: invalid value 0 (out of bound <0): - ./in.cue:59:5 - ./in.cue:59:10 Result: (_|_){ diff --git a/cue/testdata/resolve/012_bound_conversions.txtar b/cue/testdata/resolve/012_bound_conversions.txtar index c6964359536..32f19142bdd 100644 --- a/cue/testdata/resolve/012_bound_conversions.txtar +++ b/cue/testdata/resolve/012_bound_conversions.txtar @@ -56,15 +56,15 @@ Conjuncts: 35 Disjuncts: 12 -- out/evalalpha -- Errors: -c4: conflicting values 1.2 and int (mismatched types float and int): - ./in.cue:14:5 - ./in.cue:14:23 c1: invalid value 1.2 (out of bound >1.3): ./in.cue:10:12 ./in.cue:10:6 c2: invalid value 1.2 (out of bound >1.3): ./in.cue:11:12 ./in.cue:11:5 +c4: conflicting values 1.2 and int (mismatched types float and int): + ./in.cue:14:5 + ./in.cue:14:23 Result: (_|_){ @@ -112,15 +112,15 @@ This is independent from the fact that we probably want to relax the type of float literals to number. -- out/eval -- Errors: -c4: conflicting values 1.2 and int (mismatched types float and int): - ./in.cue:14:5 - ./in.cue:14:23 c1: invalid value 1.2 (out of bound >1.3): ./in.cue:10:12 ./in.cue:10:6 c2: invalid value 1.2 (out of bound >1.3): ./in.cue:11:12 ./in.cue:11:5 +c4: conflicting values 1.2 and int (mismatched types float and int): + ./in.cue:14:5 + ./in.cue:14:23 Result: (_|_){ diff --git a/cue/testdata/resolve/035_excluded_embedding_from_closing.txtar b/cue/testdata/resolve/035_excluded_embedding_from_closing.txtar index e17883ffca5..170e727ca9a 100644 --- a/cue/testdata/resolve/035_excluded_embedding_from_closing.txtar +++ b/cue/testdata/resolve/035_excluded_embedding_from_closing.txtar @@ -75,10 +75,10 @@ Conjuncts: 29 Disjuncts: 21 -- out/evalalpha -- Errors: -V.b.extra: field not allowed: - ./in.cue:11:5 V.c.e: field not allowed: ./in.cue:10:5 +V.b.extra: field not allowed: + ./in.cue:11:5 Result: (_|_){ @@ -129,16 +129,16 @@ diff old new +++ new @@ -1,13 +1,7 @@ Errors: - V.b.extra: field not allowed: -- ./in.cue:6:10 -- ./in.cue:7:5 -- ./in.cue:9:4 - ./in.cue:11:5 V.c.e: field not allowed: - ./in.cue:3:2 - ./in.cue:4:6 - ./in.cue:9:4 ./in.cue:10:5 + V.b.extra: field not allowed: +- ./in.cue:6:10 +- ./in.cue:7:5 +- ./in.cue:9:4 + ./in.cue:11:5 Result: @@ -29,33 +23,27 @@ @@ -188,16 +188,16 @@ Positions. Reordering. -- out/eval -- Errors: -V.b.extra: field not allowed: - ./in.cue:6:10 - ./in.cue:7:5 - ./in.cue:9:4 - ./in.cue:11:5 V.c.e: field not allowed: ./in.cue:3:2 ./in.cue:4:6 ./in.cue:9:4 ./in.cue:10:5 +V.b.extra: field not allowed: + ./in.cue:6:10 + ./in.cue:7:5 + ./in.cue:9:4 + ./in.cue:11:5 Result: (_|_){ diff --git a/cue/testdata/resolve/045_range_unification.txtar b/cue/testdata/resolve/045_range_unification.txtar index 2de843f2517..05c293ceb38 100644 --- a/cue/testdata/resolve/045_range_unification.txtar +++ b/cue/testdata/resolve/045_range_unification.txtar @@ -142,12 +142,6 @@ Conjuncts: 120 Disjuncts: 36 -- out/evalalpha -- Errors: -c3: conflicting values string and >=1 (mismatched types string and number): - ./in.cue:34:5 - ./in.cue:34:14 -c4: conflicting values string and >=1 (mismatched types string and number): - ./in.cue:35:5 - ./in.cue:35:17 a4: invalid value 6 (out of bound <=5): ./in.cue:5:11 ./in.cue:5:17 @@ -166,6 +160,12 @@ b7: incompatible number bounds <=5 and >=6: b14: incompatible number bounds <=5 and >=6: ./in.cue:29:24 ./in.cue:29:6 +c3: conflicting values string and >=1 (mismatched types string and number): + ./in.cue:34:5 + ./in.cue:34:14 +c4: conflicting values string and >=1 (mismatched types string and number): + ./in.cue:35:5 + ./in.cue:35:17 n2: incompatible integer bounds <=1.3 and >=1.1: ./in.cue:42:19 ./in.cue:42:11 @@ -249,14 +249,17 @@ Result: diff old new --- old +++ new -@@ -1,19 +1,10 @@ - Errors: --b14: incompatible number bounds <=5 and >=6: -- ./in.cue:29:6 -- ./in.cue:29:24 --b7: incompatible number bounds <=5 and >=6: +@@ -12,20 +12,20 @@ + ./in.cue:12:10 + ./in.cue:12:6 + b7: incompatible number bounds <=5 and >=6: - ./in.cue:21:11 -- ./in.cue:21:17 + ./in.cue:21:17 ++ ./in.cue:21:11 + b14: incompatible number bounds <=5 and >=6: +- ./in.cue:29:6 + ./in.cue:29:24 ++ ./in.cue:29:6 c3: conflicting values string and >=1 (mismatched types string and number): ./in.cue:34:5 ./in.cue:34:14 @@ -264,24 +267,9 @@ diff old new +c4: conflicting values string and >=1 (mismatched types string and number): ./in.cue:35:5 ./in.cue:35:17 --n2: incompatible integer bounds <=1.3 and >=1.1: + n2: incompatible integer bounds <=1.3 and >=1.1: - ./in.cue:42:11 -- ./in.cue:42:19 - a4: invalid value 6 (out of bound <=5): - ./in.cue:5:11 - ./in.cue:5:17 -@@ -26,6 +17,15 @@ - a10: invalid value 0 (out of bound >=1): - ./in.cue:12:10 - ./in.cue:12:6 -+b7: incompatible number bounds <=5 and >=6: -+ ./in.cue:21:17 -+ ./in.cue:21:11 -+b14: incompatible number bounds <=5 and >=6: -+ ./in.cue:29:24 -+ ./in.cue:29:6 -+n2: incompatible integer bounds <=1.3 and >=1.1: -+ ./in.cue:42:19 + ./in.cue:42:19 + ./in.cue:42:11 Result: @@ -329,21 +317,6 @@ diff old new Reordering of error messages. -- out/eval -- Errors: -b14: incompatible number bounds <=5 and >=6: - ./in.cue:29:6 - ./in.cue:29:24 -b7: incompatible number bounds <=5 and >=6: - ./in.cue:21:11 - ./in.cue:21:17 -c3: conflicting values string and >=1 (mismatched types string and number): - ./in.cue:34:5 - ./in.cue:34:14 -c4: conflicting values >=1 and string (mismatched types number and string): - ./in.cue:35:5 - ./in.cue:35:17 -n2: incompatible integer bounds <=1.3 and >=1.1: - ./in.cue:42:11 - ./in.cue:42:19 a4: invalid value 6 (out of bound <=5): ./in.cue:5:11 ./in.cue:5:17 @@ -356,6 +329,21 @@ a9: invalid value 6 (out of bound <=5): a10: invalid value 0 (out of bound >=1): ./in.cue:12:10 ./in.cue:12:6 +b7: incompatible number bounds <=5 and >=6: + ./in.cue:21:11 + ./in.cue:21:17 +b14: incompatible number bounds <=5 and >=6: + ./in.cue:29:6 + ./in.cue:29:24 +c3: conflicting values string and >=1 (mismatched types string and number): + ./in.cue:34:5 + ./in.cue:34:14 +c4: conflicting values >=1 and string (mismatched types number and string): + ./in.cue:35:5 + ./in.cue:35:17 +n2: incompatible integer bounds <=1.3 and >=1.1: + ./in.cue:42:11 + ./in.cue:42:19 Result: (_|_){ diff --git a/cue/testdata/resolve/048_builtins.txtar b/cue/testdata/resolve/048_builtins.txtar index 3020fef6306..e6dc7286e03 100644 --- a/cue/testdata/resolve/048_builtins.txtar +++ b/cue/testdata/resolve/048_builtins.txtar @@ -111,13 +111,6 @@ Conjuncts: 152 Disjuncts: 97 -- out/evalalpha -- Errors: -o3.a: 2 errors in empty disjunction: -o3.a: conflicting values "bar" and "foo": - ./in.cue:17:5 - ./in.cue:20:14 -o3.a: conflicting values "baz" and "foo": - ./in.cue:20:14 - ./in.cue:20:24 a3.a: invalid value "bar" (out of bound =~"oo"): ./in.cue:8:5 ./in.cue:7:5 @@ -126,6 +119,13 @@ a3.a: invalid value "bar" (out of bound =~"fo"): ./in.cue:9:5 ./in.cue:7:5 ./in.cue:12:14 +o3.a: 2 errors in empty disjunction: +o3.a: conflicting values "baz" and "foo": + ./in.cue:20:14 + ./in.cue:20:24 +o3.a: conflicting values "bar" and "foo": + ./in.cue:17:5 + ./in.cue:20:14 stringListErrors.b.result: invalid list element 0 in argument 0 to call: cannot use value int (int) as string: ./in.cue:31:11 ./in.cue:30:7 @@ -177,12 +177,12 @@ Result: // [eval] a: (_|_){ // [eval] o3.a: 2 errors in empty disjunction: - // o3.a: conflicting values "bar" and "foo": - // ./in.cue:17:5 - // ./in.cue:20:14 // o3.a: conflicting values "baz" and "foo": // ./in.cue:20:14 // ./in.cue:20:24 + // o3.a: conflicting values "bar" and "foo": + // ./in.cue:17:5 + // ./in.cue:20:14 } b: (string){ "baz" } c: (string){ "bar" } @@ -274,49 +274,40 @@ Result: diff old new --- old +++ new -@@ -1,13 +1,9 @@ - Errors: +@@ -9,14 +9,10 @@ + ./in.cue:12:14 o3.a: 2 errors in empty disjunction: - o3.a: conflicting values "bar" and "foo": -- ./in.cue:15:12 - ./in.cue:17:5 -- ./in.cue:20:5 - ./in.cue:20:14 o3.a: conflicting values "baz" and "foo": - ./in.cue:15:9 - ./in.cue:20:5 ./in.cue:20:14 ./in.cue:20:24 - a3.a: invalid value "bar" (out of bound =~"oo"): -@@ -70,13 +66,9 @@ + o3.a: conflicting values "bar" and "foo": +- ./in.cue:15:12 + ./in.cue:17:5 +- ./in.cue:20:5 + ./in.cue:20:14 + stringListErrors.b.result: invalid list element 0 in argument 0 to call: cannot use value int (int) as string: + ./in.cue:31:11 +@@ -70,14 +66,10 @@ a: (_|_){ // [eval] o3.a: 2 errors in empty disjunction: - // o3.a: conflicting values "bar" and "foo": -- // ./in.cue:15:12 - // ./in.cue:17:5 -- // ./in.cue:20:5 - // ./in.cue:20:14 // o3.a: conflicting values "baz" and "foo": - // ./in.cue:15:9 - // ./in.cue:20:5 // ./in.cue:20:14 // ./in.cue:20:24 + // o3.a: conflicting values "bar" and "foo": +- // ./in.cue:15:12 + // ./in.cue:17:5 +- // ./in.cue:20:5 + // ./in.cue:20:14 } + b: (string){ "baz" } -- diff/todo/p2 -- Missing error positions. -- out/eval -- Errors: -o3.a: 2 errors in empty disjunction: -o3.a: conflicting values "bar" and "foo": - ./in.cue:15:12 - ./in.cue:17:5 - ./in.cue:20:5 - ./in.cue:20:14 -o3.a: conflicting values "baz" and "foo": - ./in.cue:15:9 - ./in.cue:20:5 - ./in.cue:20:14 - ./in.cue:20:24 a3.a: invalid value "bar" (out of bound =~"oo"): ./in.cue:8:5 ./in.cue:7:5 @@ -325,6 +316,17 @@ a3.a: invalid value "bar" (out of bound =~"fo"): ./in.cue:9:5 ./in.cue:7:5 ./in.cue:12:14 +o3.a: 2 errors in empty disjunction: +o3.a: conflicting values "baz" and "foo": + ./in.cue:15:9 + ./in.cue:20:5 + ./in.cue:20:14 + ./in.cue:20:24 +o3.a: conflicting values "bar" and "foo": + ./in.cue:15:12 + ./in.cue:17:5 + ./in.cue:20:5 + ./in.cue:20:14 stringListErrors.b.result: invalid list element 0 in argument 0 to call: cannot use value int (int) as string: ./in.cue:31:11 ./in.cue:30:7 @@ -376,16 +378,16 @@ Result: // [eval] a: (_|_){ // [eval] o3.a: 2 errors in empty disjunction: - // o3.a: conflicting values "bar" and "foo": - // ./in.cue:15:12 - // ./in.cue:17:5 - // ./in.cue:20:5 - // ./in.cue:20:14 // o3.a: conflicting values "baz" and "foo": // ./in.cue:15:9 // ./in.cue:20:5 // ./in.cue:20:14 // ./in.cue:20:24 + // o3.a: conflicting values "bar" and "foo": + // ./in.cue:15:12 + // ./in.cue:17:5 + // ./in.cue:20:5 + // ./in.cue:20:14 } b: (string){ "baz" } c: (string){ "bar" } diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/additionalItems.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/additionalItems.json index 802e5155e81..be372a8f303 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2019-09/additionalItems.json +++ b/encoding/jsonschema/testdata/external/tests/draft2019-09/additionalItems.json @@ -103,8 +103,8 @@ "data": [], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [] and {...} (mismatched types list and struct):\n generated.cue:3:1\n generated.cue:3:45\n instance.json:1:1\nconflicting values bool and [] (mismatched types bool and list):\n generated.cue:3:8\n instance.json:1:1\nconflicting values null and [] (mismatched types null and list):\n generated.cue:3:1\n instance.json:1:1\nconflicting values number and [] (mismatched types number and list):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and [] (mismatched types string and list):\n generated.cue:3:24\n instance.json:1:1\n", - "v3": "6 errors in empty disjunction:\nconflicting values [] and bool (mismatched types list and bool):\n generated.cue:3:8\n instance.json:1:1\nconflicting values [] and null (mismatched types list and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values [] and number (mismatched types list and number):\n generated.cue:3:15\n instance.json:1:1\nconflicting values [] and string (mismatched types list and string):\n generated.cue:3:24\n instance.json:1:1\nconflicting values [] and {...} (mismatched types list and struct):\n generated.cue:3:45\n instance.json:1:1\nincompatible list lengths (0 and 3):\n generated.cue:3:33\n" + "v2": "5 errors in empty disjunction:\nconflicting values null and [] (mismatched types null and list):\n generated.cue:3:1\n instance.json:1:1\nconflicting values bool and [] (mismatched types bool and list):\n generated.cue:3:8\n instance.json:1:1\nconflicting values number and [] (mismatched types number and list):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and [] (mismatched types string and list):\n generated.cue:3:24\n instance.json:1:1\nconflicting values [] and {...} (mismatched types list and struct):\n generated.cue:3:1\n generated.cue:3:45\n instance.json:1:1\n", + "v3": "6 errors in empty disjunction:\nconflicting values [] and null (mismatched types list and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values [] and bool (mismatched types list and bool):\n generated.cue:3:8\n instance.json:1:1\nconflicting values [] and number (mismatched types list and number):\n generated.cue:3:15\n instance.json:1:1\nconflicting values [] and string (mismatched types list and string):\n generated.cue:3:24\n instance.json:1:1\nincompatible list lengths (0 and 3):\n generated.cue:3:33\nconflicting values [] and {...} (mismatched types list and struct):\n generated.cue:3:45\n instance.json:1:1\n" } }, { @@ -114,8 +114,8 @@ ], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:3:1\n generated.cue:3:45\n instance.json:1:1\nconflicting values bool and [1] (mismatched types bool and list):\n generated.cue:3:8\n instance.json:1:1\nconflicting values null and [1] (mismatched types null and list):\n generated.cue:3:1\n instance.json:1:1\nconflicting values number and [1] (mismatched types number and list):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and [1] (mismatched types string and list):\n generated.cue:3:24\n instance.json:1:1\n", - "v3": "6 errors in empty disjunction:\nconflicting values [1] and bool (mismatched types list and bool):\n generated.cue:3:8\n instance.json:1:1\nconflicting values [1] and null (mismatched types list and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values [1] and number (mismatched types list and number):\n generated.cue:3:15\n instance.json:1:1\nconflicting values [1] and string (mismatched types list and string):\n generated.cue:3:24\n instance.json:1:1\nconflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:3:45\n instance.json:1:1\nincompatible list lengths (1 and 3):\n generated.cue:3:33\n" + "v2": "5 errors in empty disjunction:\nconflicting values null and [1] (mismatched types null and list):\n generated.cue:3:1\n instance.json:1:1\nconflicting values bool and [1] (mismatched types bool and list):\n generated.cue:3:8\n instance.json:1:1\nconflicting values number and [1] (mismatched types number and list):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and [1] (mismatched types string and list):\n generated.cue:3:24\n instance.json:1:1\nconflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:3:1\n generated.cue:3:45\n instance.json:1:1\n", + "v3": "6 errors in empty disjunction:\nconflicting values [1] and null (mismatched types list and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values [1] and bool (mismatched types list and bool):\n generated.cue:3:8\n instance.json:1:1\nconflicting values [1] and number (mismatched types list and number):\n generated.cue:3:15\n instance.json:1:1\nconflicting values [1] and string (mismatched types list and string):\n generated.cue:3:24\n instance.json:1:1\nincompatible list lengths (1 and 3):\n generated.cue:3:33\nconflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:3:45\n instance.json:1:1\n" } }, { @@ -126,8 +126,8 @@ ], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [1,2] and {...} (mismatched types list and struct):\n generated.cue:3:1\n generated.cue:3:45\n instance.json:1:1\nconflicting values bool and [1,2] (mismatched types bool and list):\n generated.cue:3:8\n instance.json:1:1\nconflicting values null and [1,2] (mismatched types null and list):\n generated.cue:3:1\n instance.json:1:1\nconflicting values number and [1,2] (mismatched types number and list):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and [1,2] (mismatched types string and list):\n generated.cue:3:24\n instance.json:1:1\n", - "v3": "6 errors in empty disjunction:\nconflicting values [1,2] and bool (mismatched types list and bool):\n generated.cue:3:8\n instance.json:1:1\nconflicting values [1,2] and null (mismatched types list and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values [1,2] and number (mismatched types list and number):\n generated.cue:3:15\n instance.json:1:1\nconflicting values [1,2] and string (mismatched types list and string):\n generated.cue:3:24\n instance.json:1:1\nconflicting values [1,2] and {...} (mismatched types list and struct):\n generated.cue:3:45\n instance.json:1:1\nincompatible list lengths (2 and 3):\n generated.cue:3:33\n" + "v2": "5 errors in empty disjunction:\nconflicting values null and [1,2] (mismatched types null and list):\n generated.cue:3:1\n instance.json:1:1\nconflicting values bool and [1,2] (mismatched types bool and list):\n generated.cue:3:8\n instance.json:1:1\nconflicting values number and [1,2] (mismatched types number and list):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and [1,2] (mismatched types string and list):\n generated.cue:3:24\n instance.json:1:1\nconflicting values [1,2] and {...} (mismatched types list and struct):\n generated.cue:3:1\n generated.cue:3:45\n instance.json:1:1\n", + "v3": "6 errors in empty disjunction:\nconflicting values [1,2] and null (mismatched types list and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values [1,2] and bool (mismatched types list and bool):\n generated.cue:3:8\n instance.json:1:1\nconflicting values [1,2] and number (mismatched types list and number):\n generated.cue:3:15\n instance.json:1:1\nconflicting values [1,2] and string (mismatched types list and string):\n generated.cue:3:24\n instance.json:1:1\nincompatible list lengths (2 and 3):\n generated.cue:3:33\nconflicting values [1,2] and {...} (mismatched types list and struct):\n generated.cue:3:45\n instance.json:1:1\n" } }, { diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/contains.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/contains.json index 385388f1845..696b2bb72a4 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2019-09/contains.json +++ b/encoding/jsonschema/testdata/external/tests/draft2019-09/contains.json @@ -209,8 +209,8 @@ ], "valid": true, "skip": { - "v2": "6 errors in empty disjunction:\nconflicting values [\"foo\"] and {...} (mismatched types list and struct):\n generated.cue:5:1\n generated.cue:5:72\n instance.json:1:1\nconflicting values bool and [\"foo\"] (mismatched types bool and list):\n generated.cue:5:8\n instance.json:1:1\nconflicting values null and [\"foo\"] (mismatched types null and list):\n generated.cue:5:1\n instance.json:1:1\nconflicting values number and [\"foo\"] (mismatched types number and list):\n generated.cue:5:15\n instance.json:1:1\nconflicting values string and [\"foo\"] (mismatched types string and list):\n generated.cue:5:24\n instance.json:1:1\nexplicit error (_|_ literal) in source:\n generated.cue:5:58\n", - "v3": "6 errors in empty disjunction:\nconflicting values [\"foo\"] and bool (mismatched types list and bool):\n generated.cue:5:8\n instance.json:1:1\nconflicting values [\"foo\"] and null (mismatched types list and null):\n generated.cue:5:1\n instance.json:1:1\nconflicting values [\"foo\"] and number (mismatched types list and number):\n generated.cue:5:15\n instance.json:1:1\nconflicting values [\"foo\"] and string (mismatched types list and string):\n generated.cue:5:24\n instance.json:1:1\nconflicting values [\"foo\"] and {...} (mismatched types list and struct):\n generated.cue:5:72\n instance.json:1:1\nexplicit error (_|_ literal) in source:\n generated.cue:5:58\n" + "v2": "6 errors in empty disjunction:\nconflicting values null and [\"foo\"] (mismatched types null and list):\n generated.cue:5:1\n instance.json:1:1\nconflicting values bool and [\"foo\"] (mismatched types bool and list):\n generated.cue:5:8\n instance.json:1:1\nconflicting values number and [\"foo\"] (mismatched types number and list):\n generated.cue:5:15\n instance.json:1:1\nconflicting values string and [\"foo\"] (mismatched types string and list):\n generated.cue:5:24\n instance.json:1:1\nexplicit error (_|_ literal) in source:\n generated.cue:5:58\nconflicting values [\"foo\"] and {...} (mismatched types list and struct):\n generated.cue:5:1\n generated.cue:5:72\n instance.json:1:1\n", + "v3": "6 errors in empty disjunction:\nconflicting values [\"foo\"] and null (mismatched types list and null):\n generated.cue:5:1\n instance.json:1:1\nconflicting values [\"foo\"] and bool (mismatched types list and bool):\n generated.cue:5:8\n instance.json:1:1\nconflicting values [\"foo\"] and number (mismatched types list and number):\n generated.cue:5:15\n instance.json:1:1\nconflicting values [\"foo\"] and string (mismatched types list and string):\n generated.cue:5:24\n instance.json:1:1\nexplicit error (_|_ literal) in source:\n generated.cue:5:58\nconflicting values [\"foo\"] and {...} (mismatched types list and struct):\n generated.cue:5:72\n instance.json:1:1\n" } }, { diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/items.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/items.json index 33a419bab7e..4955ad23abd 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2019-09/items.json +++ b/encoding/jsonschema/testdata/external/tests/draft2019-09/items.json @@ -79,8 +79,8 @@ ], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:3:1\n generated.cue:3:54\n instance.json:1:1\nconflicting values bool and [1] (mismatched types bool and list):\n generated.cue:3:8\n instance.json:1:1\nconflicting values null and [1] (mismatched types null and list):\n generated.cue:3:1\n instance.json:1:1\nconflicting values number and [1] (mismatched types number and list):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and [1] (mismatched types string and list):\n generated.cue:3:24\n instance.json:1:1\n", - "v3": "6 errors in empty disjunction:\nconflicting values [1] and bool (mismatched types list and bool):\n generated.cue:3:8\n instance.json:1:1\nconflicting values [1] and null (mismatched types list and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values [1] and number (mismatched types list and number):\n generated.cue:3:15\n instance.json:1:1\nconflicting values [1] and string (mismatched types list and string):\n generated.cue:3:24\n instance.json:1:1\nconflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:3:54\n instance.json:1:1\nincompatible list lengths (1 and 3):\n generated.cue:3:33\n" + "v2": "5 errors in empty disjunction:\nconflicting values null and [1] (mismatched types null and list):\n generated.cue:3:1\n instance.json:1:1\nconflicting values bool and [1] (mismatched types bool and list):\n generated.cue:3:8\n instance.json:1:1\nconflicting values number and [1] (mismatched types number and list):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and [1] (mismatched types string and list):\n generated.cue:3:24\n instance.json:1:1\nconflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:3:1\n generated.cue:3:54\n instance.json:1:1\n", + "v3": "6 errors in empty disjunction:\nconflicting values [1] and null (mismatched types list and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values [1] and bool (mismatched types list and bool):\n generated.cue:3:8\n instance.json:1:1\nconflicting values [1] and number (mismatched types list and number):\n generated.cue:3:15\n instance.json:1:1\nconflicting values [1] and string (mismatched types list and string):\n generated.cue:3:24\n instance.json:1:1\nincompatible list lengths (1 and 3):\n generated.cue:3:33\nconflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:3:54\n instance.json:1:1\n" } }, { @@ -97,8 +97,8 @@ "data": [], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [] and {...} (mismatched types list and struct):\n generated.cue:3:1\n generated.cue:3:54\n instance.json:1:1\nconflicting values bool and [] (mismatched types bool and list):\n generated.cue:3:8\n instance.json:1:1\nconflicting values null and [] (mismatched types null and list):\n generated.cue:3:1\n instance.json:1:1\nconflicting values number and [] (mismatched types number and list):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and [] (mismatched types string and list):\n generated.cue:3:24\n instance.json:1:1\n", - "v3": "6 errors in empty disjunction:\nconflicting values [] and bool (mismatched types list and bool):\n generated.cue:3:8\n instance.json:1:1\nconflicting values [] and null (mismatched types list and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values [] and number (mismatched types list and number):\n generated.cue:3:15\n instance.json:1:1\nconflicting values [] and string (mismatched types list and string):\n generated.cue:3:24\n instance.json:1:1\nconflicting values [] and {...} (mismatched types list and struct):\n generated.cue:3:54\n instance.json:1:1\nincompatible list lengths (0 and 3):\n generated.cue:3:33\n" + "v2": "5 errors in empty disjunction:\nconflicting values null and [] (mismatched types null and list):\n generated.cue:3:1\n instance.json:1:1\nconflicting values bool and [] (mismatched types bool and list):\n generated.cue:3:8\n instance.json:1:1\nconflicting values number and [] (mismatched types number and list):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and [] (mismatched types string and list):\n generated.cue:3:24\n instance.json:1:1\nconflicting values [] and {...} (mismatched types list and struct):\n generated.cue:3:1\n generated.cue:3:54\n instance.json:1:1\n", + "v3": "6 errors in empty disjunction:\nconflicting values [] and null (mismatched types list and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values [] and bool (mismatched types list and bool):\n generated.cue:3:8\n instance.json:1:1\nconflicting values [] and number (mismatched types list and number):\n generated.cue:3:15\n instance.json:1:1\nconflicting values [] and string (mismatched types list and string):\n generated.cue:3:24\n instance.json:1:1\nincompatible list lengths (0 and 3):\n generated.cue:3:33\nconflicting values [] and {...} (mismatched types list and struct):\n generated.cue:3:54\n instance.json:1:1\n" } }, { @@ -175,8 +175,8 @@ ], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:3:1\n generated.cue:3:49\n instance.json:1:1\nconflicting values bool and [1] (mismatched types bool and list):\n generated.cue:3:8\n instance.json:1:1\nconflicting values null and [1] (mismatched types null and list):\n generated.cue:3:1\n instance.json:1:1\nconflicting values number and [1] (mismatched types number and list):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and [1] (mismatched types string and list):\n generated.cue:3:24\n instance.json:1:1\n", - "v3": "7 errors in empty disjunction:\nconflicting values [1] and bool (mismatched types list and bool):\n generated.cue:3:8\n instance.json:1:1\nconflicting values [1] and null (mismatched types list and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values [1] and number (mismatched types list and number):\n generated.cue:3:15\n instance.json:1:1\nconflicting values [1] and string (mismatched types list and string):\n generated.cue:3:24\n instance.json:1:1\nconflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:3:49\n instance.json:1:1\nincompatible list lengths (1 and 3):\n generated.cue:3:33\nexplicit error (_|_ literal) in source:\n generated.cue:3:37\n" + "v2": "5 errors in empty disjunction:\nconflicting values null and [1] (mismatched types null and list):\n generated.cue:3:1\n instance.json:1:1\nconflicting values bool and [1] (mismatched types bool and list):\n generated.cue:3:8\n instance.json:1:1\nconflicting values number and [1] (mismatched types number and list):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and [1] (mismatched types string and list):\n generated.cue:3:24\n instance.json:1:1\nconflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:3:1\n generated.cue:3:49\n instance.json:1:1\n", + "v3": "7 errors in empty disjunction:\nconflicting values [1] and null (mismatched types list and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values [1] and bool (mismatched types list and bool):\n generated.cue:3:8\n instance.json:1:1\nconflicting values [1] and number (mismatched types list and number):\n generated.cue:3:15\n instance.json:1:1\nconflicting values [1] and string (mismatched types list and string):\n generated.cue:3:24\n instance.json:1:1\nincompatible list lengths (1 and 3):\n generated.cue:3:33\nexplicit error (_|_ literal) in source:\n generated.cue:3:37\nconflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:3:49\n instance.json:1:1\n" } }, { @@ -192,8 +192,8 @@ "data": [], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [] and {...} (mismatched types list and struct):\n generated.cue:3:1\n generated.cue:3:49\n instance.json:1:1\nconflicting values bool and [] (mismatched types bool and list):\n generated.cue:3:8\n instance.json:1:1\nconflicting values null and [] (mismatched types null and list):\n generated.cue:3:1\n instance.json:1:1\nconflicting values number and [] (mismatched types number and list):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and [] (mismatched types string and list):\n generated.cue:3:24\n instance.json:1:1\n", - "v3": "6 errors in empty disjunction:\nconflicting values [] and bool (mismatched types list and bool):\n generated.cue:3:8\n instance.json:1:1\nconflicting values [] and null (mismatched types list and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values [] and number (mismatched types list and number):\n generated.cue:3:15\n instance.json:1:1\nconflicting values [] and string (mismatched types list and string):\n generated.cue:3:24\n instance.json:1:1\nconflicting values [] and {...} (mismatched types list and struct):\n generated.cue:3:49\n instance.json:1:1\nincompatible list lengths (0 and 3):\n generated.cue:3:33\n" + "v2": "5 errors in empty disjunction:\nconflicting values null and [] (mismatched types null and list):\n generated.cue:3:1\n instance.json:1:1\nconflicting values bool and [] (mismatched types bool and list):\n generated.cue:3:8\n instance.json:1:1\nconflicting values number and [] (mismatched types number and list):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and [] (mismatched types string and list):\n generated.cue:3:24\n instance.json:1:1\nconflicting values [] and {...} (mismatched types list and struct):\n generated.cue:3:1\n generated.cue:3:49\n instance.json:1:1\n", + "v3": "6 errors in empty disjunction:\nconflicting values [] and null (mismatched types list and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values [] and bool (mismatched types list and bool):\n generated.cue:3:8\n instance.json:1:1\nconflicting values [] and number (mismatched types list and number):\n generated.cue:3:15\n instance.json:1:1\nconflicting values [] and string (mismatched types list and string):\n generated.cue:3:24\n instance.json:1:1\nincompatible list lengths (0 and 3):\n generated.cue:3:33\nconflicting values [] and {...} (mismatched types list and struct):\n generated.cue:3:49\n instance.json:1:1\n" } } ] @@ -408,7 +408,7 @@ "valid": true, "skip": { "v2": "incompatible list lengths (2 and 3)\n0: incompatible list lengths (1 and 2)\n1: incompatible list lengths (1 and 2)\n", - "v3": "incompatible list lengths (2 and 3):\n generated.cue:3:1\n0: incompatible list lengths (1 and 2):\n generated.cue:10:8\n" + "v3": "0: incompatible list lengths (1 and 2):\n generated.cue:10:8\nincompatible list lengths (2 and 3):\n generated.cue:3:1\n" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/date-time.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/date-time.json index 0c7ee3ed7e6..2753aa617cc 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/date-time.json +++ b/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/date-time.json @@ -61,8 +61,8 @@ "data": "1998-12-31T23:59:60Z", "valid": true, "skip": { - "v2": "6 errors in empty disjunction:\nconflicting values \"1998-12-31T23:59:60Z\" and [...] (mismatched types string and list):\n generated.cue:5:1\n generated.cue:5:36\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and bool (mismatched types string and bool):\n generated.cue:5:1\n generated.cue:5:8\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and null (mismatched types string and null):\n generated.cue:5:1\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and number (mismatched types string and number):\n generated.cue:5:1\n generated.cue:5:15\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and {...} (mismatched types string and struct):\n generated.cue:5:1\n generated.cue:5:44\n instance.json:1:1\ninvalid value \"1998-12-31T23:59:60Z\" (does not satisfy time.Time): error in call to time.Time: invalid time \"1998-12-31T23:59:60Z\":\n generated.cue:1:1\n instance.json:1:1\n", - "v3": "6 errors in empty disjunction:\nconflicting values \"1998-12-31T23:59:60Z\" and [...] (mismatched types string and list):\n generated.cue:5:36\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and bool (mismatched types string and bool):\n generated.cue:5:8\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and null (mismatched types string and null):\n generated.cue:5:1\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and number (mismatched types string and number):\n generated.cue:5:15\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and {...} (mismatched types string and struct):\n generated.cue:5:44\n instance.json:1:1\ninvalid value \"1998-12-31T23:59:60Z\" (does not satisfy time.Time): error in call to time.Time: invalid time \"1998-12-31T23:59:60Z\":\n generated.cue:1:1\n instance.json:1:1\n" + "v2": "6 errors in empty disjunction:\nconflicting values \"1998-12-31T23:59:60Z\" and null (mismatched types string and null):\n generated.cue:5:1\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and bool (mismatched types string and bool):\n generated.cue:5:1\n generated.cue:5:8\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and number (mismatched types string and number):\n generated.cue:5:1\n generated.cue:5:15\n instance.json:1:1\ninvalid value \"1998-12-31T23:59:60Z\" (does not satisfy time.Time): error in call to time.Time: invalid time \"1998-12-31T23:59:60Z\":\n generated.cue:1:1\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and [...] (mismatched types string and list):\n generated.cue:5:1\n generated.cue:5:36\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and {...} (mismatched types string and struct):\n generated.cue:5:1\n generated.cue:5:44\n instance.json:1:1\n", + "v3": "6 errors in empty disjunction:\nconflicting values \"1998-12-31T23:59:60Z\" and null (mismatched types string and null):\n generated.cue:5:1\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and bool (mismatched types string and bool):\n generated.cue:5:8\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and number (mismatched types string and number):\n generated.cue:5:15\n instance.json:1:1\ninvalid value \"1998-12-31T23:59:60Z\" (does not satisfy time.Time): error in call to time.Time: invalid time \"1998-12-31T23:59:60Z\":\n generated.cue:1:1\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and [...] (mismatched types string and list):\n generated.cue:5:36\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and {...} (mismatched types string and struct):\n generated.cue:5:44\n instance.json:1:1\n" } }, { @@ -70,8 +70,8 @@ "data": "1998-12-31T15:59:60.123-08:00", "valid": true, "skip": { - "v2": "6 errors in empty disjunction:\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and [...] (mismatched types string and list):\n generated.cue:5:1\n generated.cue:5:36\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and bool (mismatched types string and bool):\n generated.cue:5:1\n generated.cue:5:8\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and null (mismatched types string and null):\n generated.cue:5:1\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and number (mismatched types string and number):\n generated.cue:5:1\n generated.cue:5:15\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and {...} (mismatched types string and struct):\n generated.cue:5:1\n generated.cue:5:44\n instance.json:1:1\ninvalid value \"1998-12-31T15:59:60.123-08:00\" (does not satisfy time.Time): error in call to time.Time: invalid time \"1998-12-31T15:59:60.123-08:00\":\n generated.cue:1:1\n instance.json:1:1\n", - "v3": "6 errors in empty disjunction:\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and [...] (mismatched types string and list):\n generated.cue:5:36\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and bool (mismatched types string and bool):\n generated.cue:5:8\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and null (mismatched types string and null):\n generated.cue:5:1\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and number (mismatched types string and number):\n generated.cue:5:15\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and {...} (mismatched types string and struct):\n generated.cue:5:44\n instance.json:1:1\ninvalid value \"1998-12-31T15:59:60.123-08:00\" (does not satisfy time.Time): error in call to time.Time: invalid time \"1998-12-31T15:59:60.123-08:00\":\n generated.cue:1:1\n instance.json:1:1\n" + "v2": "6 errors in empty disjunction:\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and null (mismatched types string and null):\n generated.cue:5:1\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and bool (mismatched types string and bool):\n generated.cue:5:1\n generated.cue:5:8\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and number (mismatched types string and number):\n generated.cue:5:1\n generated.cue:5:15\n instance.json:1:1\ninvalid value \"1998-12-31T15:59:60.123-08:00\" (does not satisfy time.Time): error in call to time.Time: invalid time \"1998-12-31T15:59:60.123-08:00\":\n generated.cue:1:1\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and [...] (mismatched types string and list):\n generated.cue:5:1\n generated.cue:5:36\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and {...} (mismatched types string and struct):\n generated.cue:5:1\n generated.cue:5:44\n instance.json:1:1\n", + "v3": "6 errors in empty disjunction:\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and null (mismatched types string and null):\n generated.cue:5:1\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and bool (mismatched types string and bool):\n generated.cue:5:8\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and number (mismatched types string and number):\n generated.cue:5:15\n instance.json:1:1\ninvalid value \"1998-12-31T15:59:60.123-08:00\" (does not satisfy time.Time): error in call to time.Time: invalid time \"1998-12-31T15:59:60.123-08:00\":\n generated.cue:1:1\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and [...] (mismatched types string and list):\n generated.cue:5:36\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and {...} (mismatched types string and struct):\n generated.cue:5:44\n instance.json:1:1\n" } }, { @@ -118,8 +118,8 @@ "data": "1963-06-19t08:30:06.283185z", "valid": true, "skip": { - "v2": "6 errors in empty disjunction:\nconflicting values \"1963-06-19t08:30:06.283185z\" and [...] (mismatched types string and list):\n generated.cue:5:1\n generated.cue:5:36\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and bool (mismatched types string and bool):\n generated.cue:5:1\n generated.cue:5:8\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and null (mismatched types string and null):\n generated.cue:5:1\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and number (mismatched types string and number):\n generated.cue:5:1\n generated.cue:5:15\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and {...} (mismatched types string and struct):\n generated.cue:5:1\n generated.cue:5:44\n instance.json:1:1\ninvalid value \"1963-06-19t08:30:06.283185z\" (does not satisfy time.Time): error in call to time.Time: invalid time \"1963-06-19t08:30:06.283185z\":\n generated.cue:1:1\n instance.json:1:1\n", - "v3": "6 errors in empty disjunction:\nconflicting values \"1963-06-19t08:30:06.283185z\" and [...] (mismatched types string and list):\n generated.cue:5:36\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and bool (mismatched types string and bool):\n generated.cue:5:8\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and null (mismatched types string and null):\n generated.cue:5:1\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and number (mismatched types string and number):\n generated.cue:5:15\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and {...} (mismatched types string and struct):\n generated.cue:5:44\n instance.json:1:1\ninvalid value \"1963-06-19t08:30:06.283185z\" (does not satisfy time.Time): error in call to time.Time: invalid time \"1963-06-19t08:30:06.283185z\":\n generated.cue:1:1\n instance.json:1:1\n" + "v2": "6 errors in empty disjunction:\nconflicting values \"1963-06-19t08:30:06.283185z\" and null (mismatched types string and null):\n generated.cue:5:1\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and bool (mismatched types string and bool):\n generated.cue:5:1\n generated.cue:5:8\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and number (mismatched types string and number):\n generated.cue:5:1\n generated.cue:5:15\n instance.json:1:1\ninvalid value \"1963-06-19t08:30:06.283185z\" (does not satisfy time.Time): error in call to time.Time: invalid time \"1963-06-19t08:30:06.283185z\":\n generated.cue:1:1\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and [...] (mismatched types string and list):\n generated.cue:5:1\n generated.cue:5:36\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and {...} (mismatched types string and struct):\n generated.cue:5:1\n generated.cue:5:44\n instance.json:1:1\n", + "v3": "6 errors in empty disjunction:\nconflicting values \"1963-06-19t08:30:06.283185z\" and null (mismatched types string and null):\n generated.cue:5:1\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and bool (mismatched types string and bool):\n generated.cue:5:8\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and number (mismatched types string and number):\n generated.cue:5:15\n instance.json:1:1\ninvalid value \"1963-06-19t08:30:06.283185z\" (does not satisfy time.Time): error in call to time.Time: invalid time \"1963-06-19t08:30:06.283185z\":\n generated.cue:1:1\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and [...] (mismatched types string and list):\n generated.cue:5:36\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and {...} (mismatched types string and struct):\n generated.cue:5:44\n instance.json:1:1\n" } }, { diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/propertyNames.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/propertyNames.json index 68c4122e00c..e31cafda474 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2019-09/propertyNames.json +++ b/encoding/jsonschema/testdata/external/tests/draft2019-09/propertyNames.json @@ -158,7 +158,7 @@ "data": {}, "valid": true, "skip": { - "v3": "6 errors in empty disjunction:\nconflicting values [...] and {} (mismatched types list and struct):\n generated.cue:3:33\n instance.json:1:1\nconflicting values bool and {} (mismatched types bool and struct):\n generated.cue:3:8\n instance.json:1:1\nconflicting values null and {} (mismatched types null and struct):\n generated.cue:3:1\n instance.json:1:1\nconflicting values number and {} (mismatched types number and struct):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and {} (mismatched types string and struct):\n generated.cue:3:24\n instance.json:1:1\nexplicit error (_|_ literal) in source:\n generated.cue:4:3\n" + "v3": "6 errors in empty disjunction:\nconflicting values null and {} (mismatched types null and struct):\n generated.cue:3:1\n instance.json:1:1\nconflicting values bool and {} (mismatched types bool and struct):\n generated.cue:3:8\n instance.json:1:1\nconflicting values number and {} (mismatched types number and struct):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and {} (mismatched types string and struct):\n generated.cue:3:24\n instance.json:1:1\nconflicting values [...] and {} (mismatched types list and struct):\n generated.cue:3:33\n instance.json:1:1\nexplicit error (_|_ literal) in source:\n generated.cue:4:3\n" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/contains.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/contains.json index bcc6203fb09..08bceaa0799 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/contains.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/contains.json @@ -209,8 +209,8 @@ ], "valid": true, "skip": { - "v2": "6 errors in empty disjunction:\nconflicting values [\"foo\"] and {...} (mismatched types list and struct):\n generated.cue:5:1\n generated.cue:5:72\n instance.json:1:1\nconflicting values bool and [\"foo\"] (mismatched types bool and list):\n generated.cue:5:8\n instance.json:1:1\nconflicting values null and [\"foo\"] (mismatched types null and list):\n generated.cue:5:1\n instance.json:1:1\nconflicting values number and [\"foo\"] (mismatched types number and list):\n generated.cue:5:15\n instance.json:1:1\nconflicting values string and [\"foo\"] (mismatched types string and list):\n generated.cue:5:24\n instance.json:1:1\nexplicit error (_|_ literal) in source:\n generated.cue:5:58\n", - "v3": "6 errors in empty disjunction:\nconflicting values [\"foo\"] and bool (mismatched types list and bool):\n generated.cue:5:8\n instance.json:1:1\nconflicting values [\"foo\"] and null (mismatched types list and null):\n generated.cue:5:1\n instance.json:1:1\nconflicting values [\"foo\"] and number (mismatched types list and number):\n generated.cue:5:15\n instance.json:1:1\nconflicting values [\"foo\"] and string (mismatched types list and string):\n generated.cue:5:24\n instance.json:1:1\nconflicting values [\"foo\"] and {...} (mismatched types list and struct):\n generated.cue:5:72\n instance.json:1:1\nexplicit error (_|_ literal) in source:\n generated.cue:5:58\n" + "v2": "6 errors in empty disjunction:\nconflicting values null and [\"foo\"] (mismatched types null and list):\n generated.cue:5:1\n instance.json:1:1\nconflicting values bool and [\"foo\"] (mismatched types bool and list):\n generated.cue:5:8\n instance.json:1:1\nconflicting values number and [\"foo\"] (mismatched types number and list):\n generated.cue:5:15\n instance.json:1:1\nconflicting values string and [\"foo\"] (mismatched types string and list):\n generated.cue:5:24\n instance.json:1:1\nexplicit error (_|_ literal) in source:\n generated.cue:5:58\nconflicting values [\"foo\"] and {...} (mismatched types list and struct):\n generated.cue:5:1\n generated.cue:5:72\n instance.json:1:1\n", + "v3": "6 errors in empty disjunction:\nconflicting values [\"foo\"] and null (mismatched types list and null):\n generated.cue:5:1\n instance.json:1:1\nconflicting values [\"foo\"] and bool (mismatched types list and bool):\n generated.cue:5:8\n instance.json:1:1\nconflicting values [\"foo\"] and number (mismatched types list and number):\n generated.cue:5:15\n instance.json:1:1\nconflicting values [\"foo\"] and string (mismatched types list and string):\n generated.cue:5:24\n instance.json:1:1\nexplicit error (_|_ literal) in source:\n generated.cue:5:58\nconflicting values [\"foo\"] and {...} (mismatched types list and struct):\n generated.cue:5:72\n instance.json:1:1\n" } }, { diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/format.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/format.json index d82f2886726..683f3c569e3 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/format.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/format.json @@ -129,8 +129,8 @@ "data": "^(abc]", "valid": true, "skip": { - "v2": "6 errors in empty disjunction:\nconflicting values \"^(abc]\" and [...] (mismatched types string and list):\n generated.cue:5:1\n generated.cue:5:39\n instance.json:1:1\nconflicting values \"^(abc]\" and bool (mismatched types string and bool):\n generated.cue:5:1\n generated.cue:5:8\n instance.json:1:1\nconflicting values \"^(abc]\" and null (mismatched types string and null):\n generated.cue:5:1\n instance.json:1:1\nconflicting values \"^(abc]\" and number (mismatched types string and number):\n generated.cue:5:1\n generated.cue:5:15\n instance.json:1:1\nconflicting values \"^(abc]\" and {...} (mismatched types string and struct):\n generated.cue:5:1\n generated.cue:5:47\n instance.json:1:1\ninvalid value \"^(abc]\" (does not satisfy regexp.Valid): error in call to regexp.Valid: error parsing regexp: missing closing ): `^(abc]`:\n generated.cue:1:1\n instance.json:1:1\n", - "v3": "6 errors in empty disjunction:\nconflicting values \"^(abc]\" and [...] (mismatched types string and list):\n generated.cue:5:39\n instance.json:1:1\nconflicting values \"^(abc]\" and bool (mismatched types string and bool):\n generated.cue:5:8\n instance.json:1:1\nconflicting values \"^(abc]\" and null (mismatched types string and null):\n generated.cue:5:1\n instance.json:1:1\nconflicting values \"^(abc]\" and number (mismatched types string and number):\n generated.cue:5:15\n instance.json:1:1\nconflicting values \"^(abc]\" and {...} (mismatched types string and struct):\n generated.cue:5:47\n instance.json:1:1\ninvalid value \"^(abc]\" (does not satisfy regexp.Valid): error in call to regexp.Valid: error parsing regexp: missing closing ): `^(abc]`:\n generated.cue:1:1\n instance.json:1:1\n" + "v2": "6 errors in empty disjunction:\nconflicting values \"^(abc]\" and null (mismatched types string and null):\n generated.cue:5:1\n instance.json:1:1\nconflicting values \"^(abc]\" and bool (mismatched types string and bool):\n generated.cue:5:1\n generated.cue:5:8\n instance.json:1:1\nconflicting values \"^(abc]\" and number (mismatched types string and number):\n generated.cue:5:1\n generated.cue:5:15\n instance.json:1:1\ninvalid value \"^(abc]\" (does not satisfy regexp.Valid): error in call to regexp.Valid: error parsing regexp: missing closing ): `^(abc]`:\n generated.cue:1:1\n instance.json:1:1\nconflicting values \"^(abc]\" and [...] (mismatched types string and list):\n generated.cue:5:1\n generated.cue:5:39\n instance.json:1:1\nconflicting values \"^(abc]\" and {...} (mismatched types string and struct):\n generated.cue:5:1\n generated.cue:5:47\n instance.json:1:1\n", + "v3": "6 errors in empty disjunction:\nconflicting values \"^(abc]\" and null (mismatched types string and null):\n generated.cue:5:1\n instance.json:1:1\nconflicting values \"^(abc]\" and bool (mismatched types string and bool):\n generated.cue:5:8\n instance.json:1:1\nconflicting values \"^(abc]\" and number (mismatched types string and number):\n generated.cue:5:15\n instance.json:1:1\ninvalid value \"^(abc]\" (does not satisfy regexp.Valid): error in call to regexp.Valid: error parsing regexp: missing closing ): `^(abc]`:\n generated.cue:1:1\n instance.json:1:1\nconflicting values \"^(abc]\" and [...] (mismatched types string and list):\n generated.cue:5:39\n instance.json:1:1\nconflicting values \"^(abc]\" and {...} (mismatched types string and struct):\n generated.cue:5:47\n instance.json:1:1\n" } } ] @@ -353,8 +353,8 @@ "data": "06/19/1963", "valid": true, "skip": { - "v2": "6 errors in empty disjunction:\nconflicting values \"06/19/1963\" and [...] (mismatched types string and list):\n generated.cue:5:1\n generated.cue:5:52\n instance.json:1:1\nconflicting values \"06/19/1963\" and bool (mismatched types string and bool):\n generated.cue:5:1\n generated.cue:5:8\n instance.json:1:1\nconflicting values \"06/19/1963\" and null (mismatched types string and null):\n generated.cue:5:1\n instance.json:1:1\nconflicting values \"06/19/1963\" and number (mismatched types string and number):\n generated.cue:5:1\n generated.cue:5:15\n instance.json:1:1\nconflicting values \"06/19/1963\" and {...} (mismatched types string and struct):\n generated.cue:5:1\n generated.cue:5:60\n instance.json:1:1\ninvalid value \"06/19/1963\" (does not satisfy time.Format(\"2006-01-02\")): error in call to time.Format: invalid time \"06/19/1963\":\n generated.cue:5:24\n generated.cue:1:1\n generated.cue:5:36\n instance.json:1:1\n", - "v3": "6 errors in empty disjunction:\nconflicting values \"06/19/1963\" and [...] (mismatched types string and list):\n generated.cue:5:52\n instance.json:1:1\nconflicting values \"06/19/1963\" and bool (mismatched types string and bool):\n generated.cue:5:8\n instance.json:1:1\nconflicting values \"06/19/1963\" and null (mismatched types string and null):\n generated.cue:5:1\n instance.json:1:1\nconflicting values \"06/19/1963\" and number (mismatched types string and number):\n generated.cue:5:15\n instance.json:1:1\nconflicting values \"06/19/1963\" and {...} (mismatched types string and struct):\n generated.cue:5:60\n instance.json:1:1\ninvalid value \"06/19/1963\" (does not satisfy time.Format(\"2006-01-02\")): error in call to time.Format: invalid time \"06/19/1963\":\n generated.cue:5:24\n generated.cue:1:1\n generated.cue:5:36\n instance.json:1:1\n" + "v2": "6 errors in empty disjunction:\nconflicting values \"06/19/1963\" and null (mismatched types string and null):\n generated.cue:5:1\n instance.json:1:1\nconflicting values \"06/19/1963\" and bool (mismatched types string and bool):\n generated.cue:5:1\n generated.cue:5:8\n instance.json:1:1\nconflicting values \"06/19/1963\" and number (mismatched types string and number):\n generated.cue:5:1\n generated.cue:5:15\n instance.json:1:1\ninvalid value \"06/19/1963\" (does not satisfy time.Format(\"2006-01-02\")): error in call to time.Format: invalid time \"06/19/1963\":\n generated.cue:5:24\n generated.cue:1:1\n generated.cue:5:36\n instance.json:1:1\nconflicting values \"06/19/1963\" and [...] (mismatched types string and list):\n generated.cue:5:1\n generated.cue:5:52\n instance.json:1:1\nconflicting values \"06/19/1963\" and {...} (mismatched types string and struct):\n generated.cue:5:1\n generated.cue:5:60\n instance.json:1:1\n", + "v3": "6 errors in empty disjunction:\nconflicting values \"06/19/1963\" and null (mismatched types string and null):\n generated.cue:5:1\n instance.json:1:1\nconflicting values \"06/19/1963\" and bool (mismatched types string and bool):\n generated.cue:5:8\n instance.json:1:1\nconflicting values \"06/19/1963\" and number (mismatched types string and number):\n generated.cue:5:15\n instance.json:1:1\ninvalid value \"06/19/1963\" (does not satisfy time.Format(\"2006-01-02\")): error in call to time.Format: invalid time \"06/19/1963\":\n generated.cue:5:24\n generated.cue:1:1\n generated.cue:5:36\n instance.json:1:1\nconflicting values \"06/19/1963\" and [...] (mismatched types string and list):\n generated.cue:5:52\n instance.json:1:1\nconflicting values \"06/19/1963\" and {...} (mismatched types string and struct):\n generated.cue:5:60\n instance.json:1:1\n" } } ] @@ -401,8 +401,8 @@ "data": "1990-02-31T15:59:60.123-08:00", "valid": true, "skip": { - "v2": "6 errors in empty disjunction:\nconflicting values \"1990-02-31T15:59:60.123-08:00\" and [...] (mismatched types string and list):\n generated.cue:5:1\n generated.cue:5:36\n instance.json:1:1\nconflicting values \"1990-02-31T15:59:60.123-08:00\" and bool (mismatched types string and bool):\n generated.cue:5:1\n generated.cue:5:8\n instance.json:1:1\nconflicting values \"1990-02-31T15:59:60.123-08:00\" and null (mismatched types string and null):\n generated.cue:5:1\n instance.json:1:1\nconflicting values \"1990-02-31T15:59:60.123-08:00\" and number (mismatched types string and number):\n generated.cue:5:1\n generated.cue:5:15\n instance.json:1:1\nconflicting values \"1990-02-31T15:59:60.123-08:00\" and {...} (mismatched types string and struct):\n generated.cue:5:1\n generated.cue:5:44\n instance.json:1:1\ninvalid value \"1990-02-31T15:59:60.123-08:00\" (does not satisfy time.Time): error in call to time.Time: invalid time \"1990-02-31T15:59:60.123-08:00\":\n generated.cue:1:1\n instance.json:1:1\n", - "v3": "6 errors in empty disjunction:\nconflicting values \"1990-02-31T15:59:60.123-08:00\" and [...] (mismatched types string and list):\n generated.cue:5:36\n instance.json:1:1\nconflicting values \"1990-02-31T15:59:60.123-08:00\" and bool (mismatched types string and bool):\n generated.cue:5:8\n instance.json:1:1\nconflicting values \"1990-02-31T15:59:60.123-08:00\" and null (mismatched types string and null):\n generated.cue:5:1\n instance.json:1:1\nconflicting values \"1990-02-31T15:59:60.123-08:00\" and number (mismatched types string and number):\n generated.cue:5:15\n instance.json:1:1\nconflicting values \"1990-02-31T15:59:60.123-08:00\" and {...} (mismatched types string and struct):\n generated.cue:5:44\n instance.json:1:1\ninvalid value \"1990-02-31T15:59:60.123-08:00\" (does not satisfy time.Time): error in call to time.Time: invalid time \"1990-02-31T15:59:60.123-08:00\":\n generated.cue:1:1\n instance.json:1:1\n" + "v2": "6 errors in empty disjunction:\nconflicting values \"1990-02-31T15:59:60.123-08:00\" and null (mismatched types string and null):\n generated.cue:5:1\n instance.json:1:1\nconflicting values \"1990-02-31T15:59:60.123-08:00\" and bool (mismatched types string and bool):\n generated.cue:5:1\n generated.cue:5:8\n instance.json:1:1\nconflicting values \"1990-02-31T15:59:60.123-08:00\" and number (mismatched types string and number):\n generated.cue:5:1\n generated.cue:5:15\n instance.json:1:1\ninvalid value \"1990-02-31T15:59:60.123-08:00\" (does not satisfy time.Time): error in call to time.Time: invalid time \"1990-02-31T15:59:60.123-08:00\":\n generated.cue:1:1\n instance.json:1:1\nconflicting values \"1990-02-31T15:59:60.123-08:00\" and [...] (mismatched types string and list):\n generated.cue:5:1\n generated.cue:5:36\n instance.json:1:1\nconflicting values \"1990-02-31T15:59:60.123-08:00\" and {...} (mismatched types string and struct):\n generated.cue:5:1\n generated.cue:5:44\n instance.json:1:1\n", + "v3": "6 errors in empty disjunction:\nconflicting values \"1990-02-31T15:59:60.123-08:00\" and null (mismatched types string and null):\n generated.cue:5:1\n instance.json:1:1\nconflicting values \"1990-02-31T15:59:60.123-08:00\" and bool (mismatched types string and bool):\n generated.cue:5:8\n instance.json:1:1\nconflicting values \"1990-02-31T15:59:60.123-08:00\" and number (mismatched types string and number):\n generated.cue:5:15\n instance.json:1:1\ninvalid value \"1990-02-31T15:59:60.123-08:00\" (does not satisfy time.Time): error in call to time.Time: invalid time \"1990-02-31T15:59:60.123-08:00\":\n generated.cue:1:1\n instance.json:1:1\nconflicting values \"1990-02-31T15:59:60.123-08:00\" and [...] (mismatched types string and list):\n generated.cue:5:36\n instance.json:1:1\nconflicting values \"1990-02-31T15:59:60.123-08:00\" and {...} (mismatched types string and struct):\n generated.cue:5:44\n instance.json:1:1\n" } } ] @@ -669,8 +669,8 @@ "data": "//foo.bar/?baz=qux#quux", "valid": true, "skip": { - "v2": "6 errors in empty disjunction:\nconflicting values \"//foo.bar/?baz=qux#quux\" and [...] (mismatched types string and list):\n generated.cue:5:1\n generated.cue:5:37\n instance.json:1:1\nconflicting values \"//foo.bar/?baz=qux#quux\" and bool (mismatched types string and bool):\n generated.cue:5:1\n generated.cue:5:8\n instance.json:1:1\nconflicting values \"//foo.bar/?baz=qux#quux\" and null (mismatched types string and null):\n generated.cue:5:1\n instance.json:1:1\nconflicting values \"//foo.bar/?baz=qux#quux\" and number (mismatched types string and number):\n generated.cue:5:1\n generated.cue:5:15\n instance.json:1:1\nconflicting values \"//foo.bar/?baz=qux#quux\" and {...} (mismatched types string and struct):\n generated.cue:5:1\n generated.cue:5:45\n instance.json:1:1\ninvalid value \"//foo.bar/?baz=qux#quux\" (does not satisfy net.AbsURL): error in call to net.AbsURL: URL is not absolute:\n generated.cue:1:1\n instance.json:1:1\n", - "v3": "6 errors in empty disjunction:\nconflicting values \"//foo.bar/?baz=qux#quux\" and [...] (mismatched types string and list):\n generated.cue:5:37\n instance.json:1:1\nconflicting values \"//foo.bar/?baz=qux#quux\" and bool (mismatched types string and bool):\n generated.cue:5:8\n instance.json:1:1\nconflicting values \"//foo.bar/?baz=qux#quux\" and null (mismatched types string and null):\n generated.cue:5:1\n instance.json:1:1\nconflicting values \"//foo.bar/?baz=qux#quux\" and number (mismatched types string and number):\n generated.cue:5:15\n instance.json:1:1\nconflicting values \"//foo.bar/?baz=qux#quux\" and {...} (mismatched types string and struct):\n generated.cue:5:45\n instance.json:1:1\ninvalid value \"//foo.bar/?baz=qux#quux\" (does not satisfy net.AbsURL): error in call to net.AbsURL: URL is not absolute:\n generated.cue:1:1\n instance.json:1:1\n" + "v2": "6 errors in empty disjunction:\nconflicting values \"//foo.bar/?baz=qux#quux\" and null (mismatched types string and null):\n generated.cue:5:1\n instance.json:1:1\nconflicting values \"//foo.bar/?baz=qux#quux\" and bool (mismatched types string and bool):\n generated.cue:5:1\n generated.cue:5:8\n instance.json:1:1\nconflicting values \"//foo.bar/?baz=qux#quux\" and number (mismatched types string and number):\n generated.cue:5:1\n generated.cue:5:15\n instance.json:1:1\ninvalid value \"//foo.bar/?baz=qux#quux\" (does not satisfy net.AbsURL): error in call to net.AbsURL: URL is not absolute:\n generated.cue:1:1\n instance.json:1:1\nconflicting values \"//foo.bar/?baz=qux#quux\" and [...] (mismatched types string and list):\n generated.cue:5:1\n generated.cue:5:37\n instance.json:1:1\nconflicting values \"//foo.bar/?baz=qux#quux\" and {...} (mismatched types string and struct):\n generated.cue:5:1\n generated.cue:5:45\n instance.json:1:1\n", + "v3": "6 errors in empty disjunction:\nconflicting values \"//foo.bar/?baz=qux#quux\" and null (mismatched types string and null):\n generated.cue:5:1\n instance.json:1:1\nconflicting values \"//foo.bar/?baz=qux#quux\" and bool (mismatched types string and bool):\n generated.cue:5:8\n instance.json:1:1\nconflicting values \"//foo.bar/?baz=qux#quux\" and number (mismatched types string and number):\n generated.cue:5:15\n instance.json:1:1\ninvalid value \"//foo.bar/?baz=qux#quux\" (does not satisfy net.AbsURL): error in call to net.AbsURL: URL is not absolute:\n generated.cue:1:1\n instance.json:1:1\nconflicting values \"//foo.bar/?baz=qux#quux\" and [...] (mismatched types string and list):\n generated.cue:5:37\n instance.json:1:1\nconflicting values \"//foo.bar/?baz=qux#quux\" and {...} (mismatched types string and struct):\n generated.cue:5:45\n instance.json:1:1\n" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/items.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/items.json index b8abc51e367..478afa020bb 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/items.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/items.json @@ -461,8 +461,8 @@ "data": [], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [] and {...} (mismatched types list and struct):\n generated.cue:3:1\n generated.cue:3:61\n instance.json:1:1\nconflicting values bool and [] (mismatched types bool and list):\n generated.cue:3:8\n instance.json:1:1\nconflicting values null and [] (mismatched types null and list):\n generated.cue:3:1\n instance.json:1:1\nconflicting values number and [] (mismatched types number and list):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and [] (mismatched types string and list):\n generated.cue:3:24\n instance.json:1:1\n", - "v3": "7 errors in empty disjunction:\nconflicting values [] and bool (mismatched types list and bool):\n generated.cue:3:8\n instance.json:1:1\nconflicting values [] and null (mismatched types list and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values [] and number (mismatched types list and number):\n generated.cue:3:15\n instance.json:1:1\nconflicting values [] and string (mismatched types list and string):\n generated.cue:3:24\n instance.json:1:1\nconflicting values [] and {...} (mismatched types list and struct):\n generated.cue:3:61\n instance.json:1:1\nincompatible list lengths (0 and 4):\n generated.cue:3:33\nexplicit error (_|_ literal) in source:\n generated.cue:3:54\n" + "v2": "5 errors in empty disjunction:\nconflicting values null and [] (mismatched types null and list):\n generated.cue:3:1\n instance.json:1:1\nconflicting values bool and [] (mismatched types bool and list):\n generated.cue:3:8\n instance.json:1:1\nconflicting values number and [] (mismatched types number and list):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and [] (mismatched types string and list):\n generated.cue:3:24\n instance.json:1:1\nconflicting values [] and {...} (mismatched types list and struct):\n generated.cue:3:1\n generated.cue:3:61\n instance.json:1:1\n", + "v3": "7 errors in empty disjunction:\nconflicting values [] and null (mismatched types list and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values [] and bool (mismatched types list and bool):\n generated.cue:3:8\n instance.json:1:1\nconflicting values [] and number (mismatched types list and number):\n generated.cue:3:15\n instance.json:1:1\nconflicting values [] and string (mismatched types list and string):\n generated.cue:3:24\n instance.json:1:1\nincompatible list lengths (0 and 4):\n generated.cue:3:33\nexplicit error (_|_ literal) in source:\n generated.cue:3:54\nconflicting values [] and {...} (mismatched types list and struct):\n generated.cue:3:61\n instance.json:1:1\n" } }, { @@ -472,8 +472,8 @@ ], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:3:1\n generated.cue:3:61\n instance.json:1:1\nconflicting values bool and [1] (mismatched types bool and list):\n generated.cue:3:8\n instance.json:1:1\nconflicting values null and [1] (mismatched types null and list):\n generated.cue:3:1\n instance.json:1:1\nconflicting values number and [1] (mismatched types number and list):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and [1] (mismatched types string and list):\n generated.cue:3:24\n instance.json:1:1\n", - "v3": "7 errors in empty disjunction:\nconflicting values [1] and bool (mismatched types list and bool):\n generated.cue:3:8\n instance.json:1:1\nconflicting values [1] and null (mismatched types list and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values [1] and number (mismatched types list and number):\n generated.cue:3:15\n instance.json:1:1\nconflicting values [1] and string (mismatched types list and string):\n generated.cue:3:24\n instance.json:1:1\nconflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:3:61\n instance.json:1:1\nincompatible list lengths (1 and 4):\n generated.cue:3:33\nexplicit error (_|_ literal) in source:\n generated.cue:3:54\n" + "v2": "5 errors in empty disjunction:\nconflicting values null and [1] (mismatched types null and list):\n generated.cue:3:1\n instance.json:1:1\nconflicting values bool and [1] (mismatched types bool and list):\n generated.cue:3:8\n instance.json:1:1\nconflicting values number and [1] (mismatched types number and list):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and [1] (mismatched types string and list):\n generated.cue:3:24\n instance.json:1:1\nconflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:3:1\n generated.cue:3:61\n instance.json:1:1\n", + "v3": "7 errors in empty disjunction:\nconflicting values [1] and null (mismatched types list and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values [1] and bool (mismatched types list and bool):\n generated.cue:3:8\n instance.json:1:1\nconflicting values [1] and number (mismatched types list and number):\n generated.cue:3:15\n instance.json:1:1\nconflicting values [1] and string (mismatched types list and string):\n generated.cue:3:24\n instance.json:1:1\nincompatible list lengths (1 and 4):\n generated.cue:3:33\nexplicit error (_|_ literal) in source:\n generated.cue:3:54\nconflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:3:61\n instance.json:1:1\n" } }, { @@ -484,8 +484,8 @@ ], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [1,2] and {...} (mismatched types list and struct):\n generated.cue:3:1\n generated.cue:3:61\n instance.json:1:1\nconflicting values bool and [1,2] (mismatched types bool and list):\n generated.cue:3:8\n instance.json:1:1\nconflicting values null and [1,2] (mismatched types null and list):\n generated.cue:3:1\n instance.json:1:1\nconflicting values number and [1,2] (mismatched types number and list):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and [1,2] (mismatched types string and list):\n generated.cue:3:24\n instance.json:1:1\n", - "v3": "7 errors in empty disjunction:\nconflicting values [1,2] and bool (mismatched types list and bool):\n generated.cue:3:8\n instance.json:1:1\nconflicting values [1,2] and null (mismatched types list and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values [1,2] and number (mismatched types list and number):\n generated.cue:3:15\n instance.json:1:1\nconflicting values [1,2] and string (mismatched types list and string):\n generated.cue:3:24\n instance.json:1:1\nconflicting values [1,2] and {...} (mismatched types list and struct):\n generated.cue:3:61\n instance.json:1:1\nincompatible list lengths (2 and 4):\n generated.cue:3:33\nexplicit error (_|_ literal) in source:\n generated.cue:3:54\n" + "v2": "5 errors in empty disjunction:\nconflicting values null and [1,2] (mismatched types null and list):\n generated.cue:3:1\n instance.json:1:1\nconflicting values bool and [1,2] (mismatched types bool and list):\n generated.cue:3:8\n instance.json:1:1\nconflicting values number and [1,2] (mismatched types number and list):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and [1,2] (mismatched types string and list):\n generated.cue:3:24\n instance.json:1:1\nconflicting values [1,2] and {...} (mismatched types list and struct):\n generated.cue:3:1\n generated.cue:3:61\n instance.json:1:1\n", + "v3": "7 errors in empty disjunction:\nconflicting values [1,2] and null (mismatched types list and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values [1,2] and bool (mismatched types list and bool):\n generated.cue:3:8\n instance.json:1:1\nconflicting values [1,2] and number (mismatched types list and number):\n generated.cue:3:15\n instance.json:1:1\nconflicting values [1,2] and string (mismatched types list and string):\n generated.cue:3:24\n instance.json:1:1\nincompatible list lengths (2 and 4):\n generated.cue:3:33\nexplicit error (_|_ literal) in source:\n generated.cue:3:54\nconflicting values [1,2] and {...} (mismatched types list and struct):\n generated.cue:3:61\n instance.json:1:1\n" } }, { @@ -497,8 +497,8 @@ ], "valid": true, "skip": { - "v2": "6 errors in empty disjunction:\nconflicting values [1,2,3] and {...} (mismatched types list and struct):\n generated.cue:3:1\n generated.cue:3:61\n instance.json:1:1\nconflicting values bool and [1,2,3] (mismatched types bool and list):\n generated.cue:3:8\n instance.json:1:1\nconflicting values null and [1,2,3] (mismatched types null and list):\n generated.cue:3:1\n instance.json:1:1\nconflicting values number and [1,2,3] (mismatched types number and list):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and [1,2,3] (mismatched types string and list):\n generated.cue:3:24\n instance.json:1:1\nexplicit error (_|_ literal) in source:\n generated.cue:3:54\n", - "v3": "6 errors in empty disjunction:\nconflicting values [1,2,3] and bool (mismatched types list and bool):\n generated.cue:3:8\n instance.json:1:1\nconflicting values [1,2,3] and null (mismatched types list and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values [1,2,3] and number (mismatched types list and number):\n generated.cue:3:15\n instance.json:1:1\nconflicting values [1,2,3] and string (mismatched types list and string):\n generated.cue:3:24\n instance.json:1:1\nconflicting values [1,2,3] and {...} (mismatched types list and struct):\n generated.cue:3:61\n instance.json:1:1\nexplicit error (_|_ literal) in source:\n generated.cue:3:54\n" + "v2": "6 errors in empty disjunction:\nconflicting values null and [1,2,3] (mismatched types null and list):\n generated.cue:3:1\n instance.json:1:1\nconflicting values bool and [1,2,3] (mismatched types bool and list):\n generated.cue:3:8\n instance.json:1:1\nconflicting values number and [1,2,3] (mismatched types number and list):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and [1,2,3] (mismatched types string and list):\n generated.cue:3:24\n instance.json:1:1\nexplicit error (_|_ literal) in source:\n generated.cue:3:54\nconflicting values [1,2,3] and {...} (mismatched types list and struct):\n generated.cue:3:1\n generated.cue:3:61\n instance.json:1:1\n", + "v3": "6 errors in empty disjunction:\nconflicting values [1,2,3] and null (mismatched types list and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values [1,2,3] and bool (mismatched types list and bool):\n generated.cue:3:8\n instance.json:1:1\nconflicting values [1,2,3] and number (mismatched types list and number):\n generated.cue:3:15\n instance.json:1:1\nconflicting values [1,2,3] and string (mismatched types list and string):\n generated.cue:3:24\n instance.json:1:1\nexplicit error (_|_ literal) in source:\n generated.cue:3:54\nconflicting values [1,2,3] and {...} (mismatched types list and struct):\n generated.cue:3:61\n instance.json:1:1\n" } }, { @@ -572,8 +572,8 @@ ], "valid": true, "skip": { - "v2": "6 errors in empty disjunction:\nconflicting values [\"x\",2,3] and {...} (mismatched types list and struct):\n generated.cue:3:1\n generated.cue:3:60\n instance.json:1:1\nconflicting values bool and [\"x\",2,3] (mismatched types bool and list):\n generated.cue:3:8\n instance.json:1:1\nconflicting values null and [\"x\",2,3] (mismatched types null and list):\n generated.cue:3:1\n instance.json:1:1\nconflicting values number and [\"x\",2,3] (mismatched types number and list):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and [\"x\",2,3] (mismatched types string and list):\n generated.cue:3:24\n instance.json:1:1\n0: conflicting values \"x\" and int (mismatched types string and int):\n generated.cue:3:1\n generated.cue:3:50\n generated.cue:3:53\n instance.json:1:2\n", - "v3": "6 errors in empty disjunction:\nconflicting values \"x\" and int (mismatched types string and int):\n generated.cue:3:53\n instance.json:1:2\nconflicting values [\"x\",2,3] and bool (mismatched types list and bool):\n generated.cue:3:8\n instance.json:1:1\nconflicting values [\"x\",2,3] and null (mismatched types list and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values [\"x\",2,3] and number (mismatched types list and number):\n generated.cue:3:15\n instance.json:1:1\nconflicting values [\"x\",2,3] and string (mismatched types list and string):\n generated.cue:3:24\n instance.json:1:1\nconflicting values [\"x\",2,3] and {...} (mismatched types list and struct):\n generated.cue:3:60\n instance.json:1:1\n" + "v2": "6 errors in empty disjunction:\nconflicting values null and [\"x\",2,3] (mismatched types null and list):\n generated.cue:3:1\n instance.json:1:1\nconflicting values bool and [\"x\",2,3] (mismatched types bool and list):\n generated.cue:3:8\n instance.json:1:1\nconflicting values number and [\"x\",2,3] (mismatched types number and list):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and [\"x\",2,3] (mismatched types string and list):\n generated.cue:3:24\n instance.json:1:1\n0: conflicting values \"x\" and int (mismatched types string and int):\n generated.cue:3:1\n generated.cue:3:50\n generated.cue:3:53\n instance.json:1:2\nconflicting values [\"x\",2,3] and {...} (mismatched types list and struct):\n generated.cue:3:1\n generated.cue:3:60\n instance.json:1:1\n", + "v3": "6 errors in empty disjunction:\nconflicting values [\"x\",2,3] and null (mismatched types list and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values [\"x\",2,3] and bool (mismatched types list and bool):\n generated.cue:3:8\n instance.json:1:1\nconflicting values [\"x\",2,3] and number (mismatched types list and number):\n generated.cue:3:15\n instance.json:1:1\nconflicting values [\"x\",2,3] and string (mismatched types list and string):\n generated.cue:3:24\n instance.json:1:1\nconflicting values \"x\" and int (mismatched types string and int):\n generated.cue:3:53\n instance.json:1:2\nconflicting values [\"x\",2,3] and {...} (mismatched types list and struct):\n generated.cue:3:60\n instance.json:1:1\n" } }, { @@ -612,8 +612,8 @@ ], "valid": true, "skip": { - "v2": "6 errors in empty disjunction:\nconflicting values [null] and {...} (mismatched types list and struct):\n generated.cue:3:1\n generated.cue:3:55\n instance.json:1:1\nconflicting values bool and [null] (mismatched types bool and list):\n generated.cue:3:8\n instance.json:1:1\nconflicting values null and [null] (mismatched types null and list):\n generated.cue:3:1\n instance.json:1:1\nconflicting values number and [null] (mismatched types number and list):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and [null] (mismatched types string and list):\n generated.cue:3:24\n instance.json:1:1\nexplicit error (_|_ literal) in source:\n generated.cue:3:48\n", - "v3": "6 errors in empty disjunction:\nconflicting values [null] and bool (mismatched types list and bool):\n generated.cue:3:8\n instance.json:1:1\nconflicting values [null] and null (mismatched types list and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values [null] and number (mismatched types list and number):\n generated.cue:3:15\n instance.json:1:1\nconflicting values [null] and string (mismatched types list and string):\n generated.cue:3:24\n instance.json:1:1\nconflicting values [null] and {...} (mismatched types list and struct):\n generated.cue:3:55\n instance.json:1:1\nexplicit error (_|_ literal) in source:\n generated.cue:3:48\n" + "v2": "6 errors in empty disjunction:\nconflicting values null and [null] (mismatched types null and list):\n generated.cue:3:1\n instance.json:1:1\nconflicting values bool and [null] (mismatched types bool and list):\n generated.cue:3:8\n instance.json:1:1\nconflicting values number and [null] (mismatched types number and list):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and [null] (mismatched types string and list):\n generated.cue:3:24\n instance.json:1:1\nexplicit error (_|_ literal) in source:\n generated.cue:3:48\nconflicting values [null] and {...} (mismatched types list and struct):\n generated.cue:3:1\n generated.cue:3:55\n instance.json:1:1\n", + "v3": "6 errors in empty disjunction:\nconflicting values [null] and null (mismatched types list and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values [null] and bool (mismatched types list and bool):\n generated.cue:3:8\n instance.json:1:1\nconflicting values [null] and number (mismatched types list and number):\n generated.cue:3:15\n instance.json:1:1\nconflicting values [null] and string (mismatched types list and string):\n generated.cue:3:24\n instance.json:1:1\nexplicit error (_|_ literal) in source:\n generated.cue:3:48\nconflicting values [null] and {...} (mismatched types list and struct):\n generated.cue:3:55\n instance.json:1:1\n" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/date-time.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/date-time.json index d7bea71a7f0..4636fd4a3be 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/date-time.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/date-time.json @@ -61,8 +61,8 @@ "data": "1998-12-31T23:59:60Z", "valid": true, "skip": { - "v2": "6 errors in empty disjunction:\nconflicting values \"1998-12-31T23:59:60Z\" and [...] (mismatched types string and list):\n generated.cue:5:1\n generated.cue:5:36\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and bool (mismatched types string and bool):\n generated.cue:5:1\n generated.cue:5:8\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and null (mismatched types string and null):\n generated.cue:5:1\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and number (mismatched types string and number):\n generated.cue:5:1\n generated.cue:5:15\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and {...} (mismatched types string and struct):\n generated.cue:5:1\n generated.cue:5:44\n instance.json:1:1\ninvalid value \"1998-12-31T23:59:60Z\" (does not satisfy time.Time): error in call to time.Time: invalid time \"1998-12-31T23:59:60Z\":\n generated.cue:1:1\n instance.json:1:1\n", - "v3": "6 errors in empty disjunction:\nconflicting values \"1998-12-31T23:59:60Z\" and [...] (mismatched types string and list):\n generated.cue:5:36\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and bool (mismatched types string and bool):\n generated.cue:5:8\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and null (mismatched types string and null):\n generated.cue:5:1\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and number (mismatched types string and number):\n generated.cue:5:15\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and {...} (mismatched types string and struct):\n generated.cue:5:44\n instance.json:1:1\ninvalid value \"1998-12-31T23:59:60Z\" (does not satisfy time.Time): error in call to time.Time: invalid time \"1998-12-31T23:59:60Z\":\n generated.cue:1:1\n instance.json:1:1\n" + "v2": "6 errors in empty disjunction:\nconflicting values \"1998-12-31T23:59:60Z\" and null (mismatched types string and null):\n generated.cue:5:1\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and bool (mismatched types string and bool):\n generated.cue:5:1\n generated.cue:5:8\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and number (mismatched types string and number):\n generated.cue:5:1\n generated.cue:5:15\n instance.json:1:1\ninvalid value \"1998-12-31T23:59:60Z\" (does not satisfy time.Time): error in call to time.Time: invalid time \"1998-12-31T23:59:60Z\":\n generated.cue:1:1\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and [...] (mismatched types string and list):\n generated.cue:5:1\n generated.cue:5:36\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and {...} (mismatched types string and struct):\n generated.cue:5:1\n generated.cue:5:44\n instance.json:1:1\n", + "v3": "6 errors in empty disjunction:\nconflicting values \"1998-12-31T23:59:60Z\" and null (mismatched types string and null):\n generated.cue:5:1\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and bool (mismatched types string and bool):\n generated.cue:5:8\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and number (mismatched types string and number):\n generated.cue:5:15\n instance.json:1:1\ninvalid value \"1998-12-31T23:59:60Z\" (does not satisfy time.Time): error in call to time.Time: invalid time \"1998-12-31T23:59:60Z\":\n generated.cue:1:1\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and [...] (mismatched types string and list):\n generated.cue:5:36\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and {...} (mismatched types string and struct):\n generated.cue:5:44\n instance.json:1:1\n" } }, { @@ -70,8 +70,8 @@ "data": "1998-12-31T15:59:60.123-08:00", "valid": true, "skip": { - "v2": "6 errors in empty disjunction:\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and [...] (mismatched types string and list):\n generated.cue:5:1\n generated.cue:5:36\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and bool (mismatched types string and bool):\n generated.cue:5:1\n generated.cue:5:8\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and null (mismatched types string and null):\n generated.cue:5:1\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and number (mismatched types string and number):\n generated.cue:5:1\n generated.cue:5:15\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and {...} (mismatched types string and struct):\n generated.cue:5:1\n generated.cue:5:44\n instance.json:1:1\ninvalid value \"1998-12-31T15:59:60.123-08:00\" (does not satisfy time.Time): error in call to time.Time: invalid time \"1998-12-31T15:59:60.123-08:00\":\n generated.cue:1:1\n instance.json:1:1\n", - "v3": "6 errors in empty disjunction:\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and [...] (mismatched types string and list):\n generated.cue:5:36\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and bool (mismatched types string and bool):\n generated.cue:5:8\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and null (mismatched types string and null):\n generated.cue:5:1\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and number (mismatched types string and number):\n generated.cue:5:15\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and {...} (mismatched types string and struct):\n generated.cue:5:44\n instance.json:1:1\ninvalid value \"1998-12-31T15:59:60.123-08:00\" (does not satisfy time.Time): error in call to time.Time: invalid time \"1998-12-31T15:59:60.123-08:00\":\n generated.cue:1:1\n instance.json:1:1\n" + "v2": "6 errors in empty disjunction:\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and null (mismatched types string and null):\n generated.cue:5:1\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and bool (mismatched types string and bool):\n generated.cue:5:1\n generated.cue:5:8\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and number (mismatched types string and number):\n generated.cue:5:1\n generated.cue:5:15\n instance.json:1:1\ninvalid value \"1998-12-31T15:59:60.123-08:00\" (does not satisfy time.Time): error in call to time.Time: invalid time \"1998-12-31T15:59:60.123-08:00\":\n generated.cue:1:1\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and [...] (mismatched types string and list):\n generated.cue:5:1\n generated.cue:5:36\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and {...} (mismatched types string and struct):\n generated.cue:5:1\n generated.cue:5:44\n instance.json:1:1\n", + "v3": "6 errors in empty disjunction:\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and null (mismatched types string and null):\n generated.cue:5:1\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and bool (mismatched types string and bool):\n generated.cue:5:8\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and number (mismatched types string and number):\n generated.cue:5:15\n instance.json:1:1\ninvalid value \"1998-12-31T15:59:60.123-08:00\" (does not satisfy time.Time): error in call to time.Time: invalid time \"1998-12-31T15:59:60.123-08:00\":\n generated.cue:1:1\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and [...] (mismatched types string and list):\n generated.cue:5:36\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and {...} (mismatched types string and struct):\n generated.cue:5:44\n instance.json:1:1\n" } }, { @@ -118,8 +118,8 @@ "data": "1963-06-19t08:30:06.283185z", "valid": true, "skip": { - "v2": "6 errors in empty disjunction:\nconflicting values \"1963-06-19t08:30:06.283185z\" and [...] (mismatched types string and list):\n generated.cue:5:1\n generated.cue:5:36\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and bool (mismatched types string and bool):\n generated.cue:5:1\n generated.cue:5:8\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and null (mismatched types string and null):\n generated.cue:5:1\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and number (mismatched types string and number):\n generated.cue:5:1\n generated.cue:5:15\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and {...} (mismatched types string and struct):\n generated.cue:5:1\n generated.cue:5:44\n instance.json:1:1\ninvalid value \"1963-06-19t08:30:06.283185z\" (does not satisfy time.Time): error in call to time.Time: invalid time \"1963-06-19t08:30:06.283185z\":\n generated.cue:1:1\n instance.json:1:1\n", - "v3": "6 errors in empty disjunction:\nconflicting values \"1963-06-19t08:30:06.283185z\" and [...] (mismatched types string and list):\n generated.cue:5:36\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and bool (mismatched types string and bool):\n generated.cue:5:8\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and null (mismatched types string and null):\n generated.cue:5:1\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and number (mismatched types string and number):\n generated.cue:5:15\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and {...} (mismatched types string and struct):\n generated.cue:5:44\n instance.json:1:1\ninvalid value \"1963-06-19t08:30:06.283185z\" (does not satisfy time.Time): error in call to time.Time: invalid time \"1963-06-19t08:30:06.283185z\":\n generated.cue:1:1\n instance.json:1:1\n" + "v2": "6 errors in empty disjunction:\nconflicting values \"1963-06-19t08:30:06.283185z\" and null (mismatched types string and null):\n generated.cue:5:1\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and bool (mismatched types string and bool):\n generated.cue:5:1\n generated.cue:5:8\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and number (mismatched types string and number):\n generated.cue:5:1\n generated.cue:5:15\n instance.json:1:1\ninvalid value \"1963-06-19t08:30:06.283185z\" (does not satisfy time.Time): error in call to time.Time: invalid time \"1963-06-19t08:30:06.283185z\":\n generated.cue:1:1\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and [...] (mismatched types string and list):\n generated.cue:5:1\n generated.cue:5:36\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and {...} (mismatched types string and struct):\n generated.cue:5:1\n generated.cue:5:44\n instance.json:1:1\n", + "v3": "6 errors in empty disjunction:\nconflicting values \"1963-06-19t08:30:06.283185z\" and null (mismatched types string and null):\n generated.cue:5:1\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and bool (mismatched types string and bool):\n generated.cue:5:8\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and number (mismatched types string and number):\n generated.cue:5:15\n instance.json:1:1\ninvalid value \"1963-06-19t08:30:06.283185z\" (does not satisfy time.Time): error in call to time.Time: invalid time \"1963-06-19t08:30:06.283185z\":\n generated.cue:1:1\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and [...] (mismatched types string and list):\n generated.cue:5:36\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and {...} (mismatched types string and struct):\n generated.cue:5:44\n instance.json:1:1\n" } }, { diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/prefixItems.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/prefixItems.json index 134520dc7d8..88f55c7ef00 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/prefixItems.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/prefixItems.json @@ -36,8 +36,8 @@ ], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:3:1\n generated.cue:3:54\n instance.json:1:1\nconflicting values bool and [1] (mismatched types bool and list):\n generated.cue:3:8\n instance.json:1:1\nconflicting values null and [1] (mismatched types null and list):\n generated.cue:3:1\n instance.json:1:1\nconflicting values number and [1] (mismatched types number and list):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and [1] (mismatched types string and list):\n generated.cue:3:24\n instance.json:1:1\n", - "v3": "6 errors in empty disjunction:\nconflicting values [1] and bool (mismatched types list and bool):\n generated.cue:3:8\n instance.json:1:1\nconflicting values [1] and null (mismatched types list and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values [1] and number (mismatched types list and number):\n generated.cue:3:15\n instance.json:1:1\nconflicting values [1] and string (mismatched types list and string):\n generated.cue:3:24\n instance.json:1:1\nconflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:3:54\n instance.json:1:1\nincompatible list lengths (1 and 3):\n generated.cue:3:33\n" + "v2": "5 errors in empty disjunction:\nconflicting values null and [1] (mismatched types null and list):\n generated.cue:3:1\n instance.json:1:1\nconflicting values bool and [1] (mismatched types bool and list):\n generated.cue:3:8\n instance.json:1:1\nconflicting values number and [1] (mismatched types number and list):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and [1] (mismatched types string and list):\n generated.cue:3:24\n instance.json:1:1\nconflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:3:1\n generated.cue:3:54\n instance.json:1:1\n", + "v3": "6 errors in empty disjunction:\nconflicting values [1] and null (mismatched types list and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values [1] and bool (mismatched types list and bool):\n generated.cue:3:8\n instance.json:1:1\nconflicting values [1] and number (mismatched types list and number):\n generated.cue:3:15\n instance.json:1:1\nconflicting values [1] and string (mismatched types list and string):\n generated.cue:3:24\n instance.json:1:1\nincompatible list lengths (1 and 3):\n generated.cue:3:33\nconflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:3:54\n instance.json:1:1\n" } }, { @@ -54,8 +54,8 @@ "data": [], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [] and {...} (mismatched types list and struct):\n generated.cue:3:1\n generated.cue:3:54\n instance.json:1:1\nconflicting values bool and [] (mismatched types bool and list):\n generated.cue:3:8\n instance.json:1:1\nconflicting values null and [] (mismatched types null and list):\n generated.cue:3:1\n instance.json:1:1\nconflicting values number and [] (mismatched types number and list):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and [] (mismatched types string and list):\n generated.cue:3:24\n instance.json:1:1\n", - "v3": "6 errors in empty disjunction:\nconflicting values [] and bool (mismatched types list and bool):\n generated.cue:3:8\n instance.json:1:1\nconflicting values [] and null (mismatched types list and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values [] and number (mismatched types list and number):\n generated.cue:3:15\n instance.json:1:1\nconflicting values [] and string (mismatched types list and string):\n generated.cue:3:24\n instance.json:1:1\nconflicting values [] and {...} (mismatched types list and struct):\n generated.cue:3:54\n instance.json:1:1\nincompatible list lengths (0 and 3):\n generated.cue:3:33\n" + "v2": "5 errors in empty disjunction:\nconflicting values null and [] (mismatched types null and list):\n generated.cue:3:1\n instance.json:1:1\nconflicting values bool and [] (mismatched types bool and list):\n generated.cue:3:8\n instance.json:1:1\nconflicting values number and [] (mismatched types number and list):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and [] (mismatched types string and list):\n generated.cue:3:24\n instance.json:1:1\nconflicting values [] and {...} (mismatched types list and struct):\n generated.cue:3:1\n generated.cue:3:54\n instance.json:1:1\n", + "v3": "6 errors in empty disjunction:\nconflicting values [] and null (mismatched types list and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values [] and bool (mismatched types list and bool):\n generated.cue:3:8\n instance.json:1:1\nconflicting values [] and number (mismatched types list and number):\n generated.cue:3:15\n instance.json:1:1\nconflicting values [] and string (mismatched types list and string):\n generated.cue:3:24\n instance.json:1:1\nincompatible list lengths (0 and 3):\n generated.cue:3:33\nconflicting values [] and {...} (mismatched types list and struct):\n generated.cue:3:54\n instance.json:1:1\n" } }, { @@ -86,8 +86,8 @@ ], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:3:1\n generated.cue:3:49\n instance.json:1:1\nconflicting values bool and [1] (mismatched types bool and list):\n generated.cue:3:8\n instance.json:1:1\nconflicting values null and [1] (mismatched types null and list):\n generated.cue:3:1\n instance.json:1:1\nconflicting values number and [1] (mismatched types number and list):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and [1] (mismatched types string and list):\n generated.cue:3:24\n instance.json:1:1\n", - "v3": "7 errors in empty disjunction:\nconflicting values [1] and bool (mismatched types list and bool):\n generated.cue:3:8\n instance.json:1:1\nconflicting values [1] and null (mismatched types list and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values [1] and number (mismatched types list and number):\n generated.cue:3:15\n instance.json:1:1\nconflicting values [1] and string (mismatched types list and string):\n generated.cue:3:24\n instance.json:1:1\nconflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:3:49\n instance.json:1:1\nincompatible list lengths (1 and 3):\n generated.cue:3:33\nexplicit error (_|_ literal) in source:\n generated.cue:3:37\n" + "v2": "5 errors in empty disjunction:\nconflicting values null and [1] (mismatched types null and list):\n generated.cue:3:1\n instance.json:1:1\nconflicting values bool and [1] (mismatched types bool and list):\n generated.cue:3:8\n instance.json:1:1\nconflicting values number and [1] (mismatched types number and list):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and [1] (mismatched types string and list):\n generated.cue:3:24\n instance.json:1:1\nconflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:3:1\n generated.cue:3:49\n instance.json:1:1\n", + "v3": "7 errors in empty disjunction:\nconflicting values [1] and null (mismatched types list and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values [1] and bool (mismatched types list and bool):\n generated.cue:3:8\n instance.json:1:1\nconflicting values [1] and number (mismatched types list and number):\n generated.cue:3:15\n instance.json:1:1\nconflicting values [1] and string (mismatched types list and string):\n generated.cue:3:24\n instance.json:1:1\nincompatible list lengths (1 and 3):\n generated.cue:3:33\nexplicit error (_|_ literal) in source:\n generated.cue:3:37\nconflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:3:49\n instance.json:1:1\n" } }, { @@ -103,8 +103,8 @@ "data": [], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [] and {...} (mismatched types list and struct):\n generated.cue:3:1\n generated.cue:3:49\n instance.json:1:1\nconflicting values bool and [] (mismatched types bool and list):\n generated.cue:3:8\n instance.json:1:1\nconflicting values null and [] (mismatched types null and list):\n generated.cue:3:1\n instance.json:1:1\nconflicting values number and [] (mismatched types number and list):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and [] (mismatched types string and list):\n generated.cue:3:24\n instance.json:1:1\n", - "v3": "6 errors in empty disjunction:\nconflicting values [] and bool (mismatched types list and bool):\n generated.cue:3:8\n instance.json:1:1\nconflicting values [] and null (mismatched types list and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values [] and number (mismatched types list and number):\n generated.cue:3:15\n instance.json:1:1\nconflicting values [] and string (mismatched types list and string):\n generated.cue:3:24\n instance.json:1:1\nconflicting values [] and {...} (mismatched types list and struct):\n generated.cue:3:49\n instance.json:1:1\nincompatible list lengths (0 and 3):\n generated.cue:3:33\n" + "v2": "5 errors in empty disjunction:\nconflicting values null and [] (mismatched types null and list):\n generated.cue:3:1\n instance.json:1:1\nconflicting values bool and [] (mismatched types bool and list):\n generated.cue:3:8\n instance.json:1:1\nconflicting values number and [] (mismatched types number and list):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and [] (mismatched types string and list):\n generated.cue:3:24\n instance.json:1:1\nconflicting values [] and {...} (mismatched types list and struct):\n generated.cue:3:1\n generated.cue:3:49\n instance.json:1:1\n", + "v3": "6 errors in empty disjunction:\nconflicting values [] and null (mismatched types list and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values [] and bool (mismatched types list and bool):\n generated.cue:3:8\n instance.json:1:1\nconflicting values [] and number (mismatched types list and number):\n generated.cue:3:15\n instance.json:1:1\nconflicting values [] and string (mismatched types list and string):\n generated.cue:3:24\n instance.json:1:1\nincompatible list lengths (0 and 3):\n generated.cue:3:33\nconflicting values [] and {...} (mismatched types list and struct):\n generated.cue:3:49\n instance.json:1:1\n" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/propertyNames.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/propertyNames.json index 5a95e19b007..9ede4d98e73 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/propertyNames.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/propertyNames.json @@ -122,7 +122,7 @@ "data": {}, "valid": true, "skip": { - "v3": "6 errors in empty disjunction:\nconflicting values [...] and {} (mismatched types list and struct):\n generated.cue:3:33\n instance.json:1:1\nconflicting values bool and {} (mismatched types bool and struct):\n generated.cue:3:8\n instance.json:1:1\nconflicting values null and {} (mismatched types null and struct):\n generated.cue:3:1\n instance.json:1:1\nconflicting values number and {} (mismatched types number and struct):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and {} (mismatched types string and struct):\n generated.cue:3:24\n instance.json:1:1\nexplicit error (_|_ literal) in source:\n generated.cue:4:3\n" + "v3": "6 errors in empty disjunction:\nconflicting values null and {} (mismatched types null and struct):\n generated.cue:3:1\n instance.json:1:1\nconflicting values bool and {} (mismatched types bool and struct):\n generated.cue:3:8\n instance.json:1:1\nconflicting values number and {} (mismatched types number and struct):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and {} (mismatched types string and struct):\n generated.cue:3:24\n instance.json:1:1\nconflicting values [...] and {} (mismatched types list and struct):\n generated.cue:3:33\n instance.json:1:1\nexplicit error (_|_ literal) in source:\n generated.cue:4:3\n" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/uniqueItems.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/uniqueItems.json index c624744e0da..83a41520dc7 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/uniqueItems.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/uniqueItems.json @@ -462,8 +462,8 @@ ], "valid": true, "skip": { - "v2": "7 errors in empty disjunction:\nconflicting values [false,true] and {...} (mismatched types list and struct):\n generated.cue:5:1\n generated.cue:5:85\n instance.json:1:1\nconflicting values bool and [false,true] (mismatched types bool and list):\n generated.cue:5:8\n instance.json:1:1\nconflicting values null and [false,true] (mismatched types null and list):\n generated.cue:5:1\n instance.json:1:1\nconflicting values number and [false,true] (mismatched types number and list):\n generated.cue:5:15\n instance.json:1:1\nconflicting values string and [false,true] (mismatched types string and list):\n generated.cue:5:24\n instance.json:1:1\ninvalid value [_|_(explicit error (_|_ literal) in source),_|_(explicit error (_|_ literal) in source)] (does not satisfy list.UniqueItems): equal values at position 0 and 1:\n generated.cue:5:33\n generated.cue:1:1\n instance.json:1:1\nexplicit error (_|_ literal) in source:\n generated.cue:5:78\n", - "v3": "6 errors in empty disjunction:\nconflicting values [false,true] and bool (mismatched types list and bool):\n generated.cue:5:8\n instance.json:1:1\nconflicting values [false,true] and null (mismatched types list and null):\n generated.cue:5:1\n instance.json:1:1\nconflicting values [false,true] and number (mismatched types list and number):\n generated.cue:5:15\n instance.json:1:1\nconflicting values [false,true] and string (mismatched types list and string):\n generated.cue:5:24\n instance.json:1:1\nconflicting values [false,true] and {...} (mismatched types list and struct):\n generated.cue:5:85\n instance.json:1:1\nexplicit error (_|_ literal) in source:\n generated.cue:5:78\n" + "v2": "7 errors in empty disjunction:\nconflicting values null and [false,true] (mismatched types null and list):\n generated.cue:5:1\n instance.json:1:1\nconflicting values bool and [false,true] (mismatched types bool and list):\n generated.cue:5:8\n instance.json:1:1\nconflicting values number and [false,true] (mismatched types number and list):\n generated.cue:5:15\n instance.json:1:1\nconflicting values string and [false,true] (mismatched types string and list):\n generated.cue:5:24\n instance.json:1:1\ninvalid value [_|_(explicit error (_|_ literal) in source),_|_(explicit error (_|_ literal) in source)] (does not satisfy list.UniqueItems): equal values at position 0 and 1:\n generated.cue:5:33\n generated.cue:1:1\n instance.json:1:1\nexplicit error (_|_ literal) in source:\n generated.cue:5:78\nconflicting values [false,true] and {...} (mismatched types list and struct):\n generated.cue:5:1\n generated.cue:5:85\n instance.json:1:1\n", + "v3": "6 errors in empty disjunction:\nconflicting values [false,true] and null (mismatched types list and null):\n generated.cue:5:1\n instance.json:1:1\nconflicting values [false,true] and bool (mismatched types list and bool):\n generated.cue:5:8\n instance.json:1:1\nconflicting values [false,true] and number (mismatched types list and number):\n generated.cue:5:15\n instance.json:1:1\nconflicting values [false,true] and string (mismatched types list and string):\n generated.cue:5:24\n instance.json:1:1\nexplicit error (_|_ literal) in source:\n generated.cue:5:78\nconflicting values [false,true] and {...} (mismatched types list and struct):\n generated.cue:5:85\n instance.json:1:1\n" } }, { @@ -474,8 +474,8 @@ ], "valid": true, "skip": { - "v2": "7 errors in empty disjunction:\nconflicting values [true,false] and {...} (mismatched types list and struct):\n generated.cue:5:1\n generated.cue:5:85\n instance.json:1:1\nconflicting values bool and [true,false] (mismatched types bool and list):\n generated.cue:5:8\n instance.json:1:1\nconflicting values null and [true,false] (mismatched types null and list):\n generated.cue:5:1\n instance.json:1:1\nconflicting values number and [true,false] (mismatched types number and list):\n generated.cue:5:15\n instance.json:1:1\nconflicting values string and [true,false] (mismatched types string and list):\n generated.cue:5:24\n instance.json:1:1\ninvalid value [_|_(explicit error (_|_ literal) in source),_|_(explicit error (_|_ literal) in source)] (does not satisfy list.UniqueItems): equal values at position 0 and 1:\n generated.cue:5:33\n generated.cue:1:1\n instance.json:1:1\nexplicit error (_|_ literal) in source:\n generated.cue:5:78\n", - "v3": "6 errors in empty disjunction:\nconflicting values [true,false] and bool (mismatched types list and bool):\n generated.cue:5:8\n instance.json:1:1\nconflicting values [true,false] and null (mismatched types list and null):\n generated.cue:5:1\n instance.json:1:1\nconflicting values [true,false] and number (mismatched types list and number):\n generated.cue:5:15\n instance.json:1:1\nconflicting values [true,false] and string (mismatched types list and string):\n generated.cue:5:24\n instance.json:1:1\nconflicting values [true,false] and {...} (mismatched types list and struct):\n generated.cue:5:85\n instance.json:1:1\nexplicit error (_|_ literal) in source:\n generated.cue:5:78\n" + "v2": "7 errors in empty disjunction:\nconflicting values null and [true,false] (mismatched types null and list):\n generated.cue:5:1\n instance.json:1:1\nconflicting values bool and [true,false] (mismatched types bool and list):\n generated.cue:5:8\n instance.json:1:1\nconflicting values number and [true,false] (mismatched types number and list):\n generated.cue:5:15\n instance.json:1:1\nconflicting values string and [true,false] (mismatched types string and list):\n generated.cue:5:24\n instance.json:1:1\ninvalid value [_|_(explicit error (_|_ literal) in source),_|_(explicit error (_|_ literal) in source)] (does not satisfy list.UniqueItems): equal values at position 0 and 1:\n generated.cue:5:33\n generated.cue:1:1\n instance.json:1:1\nexplicit error (_|_ literal) in source:\n generated.cue:5:78\nconflicting values [true,false] and {...} (mismatched types list and struct):\n generated.cue:5:1\n generated.cue:5:85\n instance.json:1:1\n", + "v3": "6 errors in empty disjunction:\nconflicting values [true,false] and null (mismatched types list and null):\n generated.cue:5:1\n instance.json:1:1\nconflicting values [true,false] and bool (mismatched types list and bool):\n generated.cue:5:8\n instance.json:1:1\nconflicting values [true,false] and number (mismatched types list and number):\n generated.cue:5:15\n instance.json:1:1\nconflicting values [true,false] and string (mismatched types list and string):\n generated.cue:5:24\n instance.json:1:1\nexplicit error (_|_ literal) in source:\n generated.cue:5:78\nconflicting values [true,false] and {...} (mismatched types list and struct):\n generated.cue:5:85\n instance.json:1:1\n" } }, { @@ -799,8 +799,8 @@ ], "valid": true, "skip": { - "v2": "6 errors in empty disjunction:\nconflicting values [false,true] and {...} (mismatched types list and struct):\n generated.cue:3:1\n generated.cue:3:64\n instance.json:1:1\nconflicting values bool and [false,true] (mismatched types bool and list):\n generated.cue:3:8\n instance.json:1:1\nconflicting values null and [false,true] (mismatched types null and list):\n generated.cue:3:1\n instance.json:1:1\nconflicting values number and [false,true] (mismatched types number and list):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and [false,true] (mismatched types string and list):\n generated.cue:3:24\n instance.json:1:1\nexplicit error (_|_ literal) in source:\n generated.cue:3:57\n", - "v3": "6 errors in empty disjunction:\nconflicting values [false,true] and bool (mismatched types list and bool):\n generated.cue:3:8\n instance.json:1:1\nconflicting values [false,true] and null (mismatched types list and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values [false,true] and number (mismatched types list and number):\n generated.cue:3:15\n instance.json:1:1\nconflicting values [false,true] and string (mismatched types list and string):\n generated.cue:3:24\n instance.json:1:1\nconflicting values [false,true] and {...} (mismatched types list and struct):\n generated.cue:3:64\n instance.json:1:1\nexplicit error (_|_ literal) in source:\n generated.cue:3:57\n" + "v2": "6 errors in empty disjunction:\nconflicting values null and [false,true] (mismatched types null and list):\n generated.cue:3:1\n instance.json:1:1\nconflicting values bool and [false,true] (mismatched types bool and list):\n generated.cue:3:8\n instance.json:1:1\nconflicting values number and [false,true] (mismatched types number and list):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and [false,true] (mismatched types string and list):\n generated.cue:3:24\n instance.json:1:1\nexplicit error (_|_ literal) in source:\n generated.cue:3:57\nconflicting values [false,true] and {...} (mismatched types list and struct):\n generated.cue:3:1\n generated.cue:3:64\n instance.json:1:1\n", + "v3": "6 errors in empty disjunction:\nconflicting values [false,true] and null (mismatched types list and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values [false,true] and bool (mismatched types list and bool):\n generated.cue:3:8\n instance.json:1:1\nconflicting values [false,true] and number (mismatched types list and number):\n generated.cue:3:15\n instance.json:1:1\nconflicting values [false,true] and string (mismatched types list and string):\n generated.cue:3:24\n instance.json:1:1\nexplicit error (_|_ literal) in source:\n generated.cue:3:57\nconflicting values [false,true] and {...} (mismatched types list and struct):\n generated.cue:3:64\n instance.json:1:1\n" } }, { @@ -811,8 +811,8 @@ ], "valid": true, "skip": { - "v2": "6 errors in empty disjunction:\nconflicting values [true,false] and {...} (mismatched types list and struct):\n generated.cue:3:1\n generated.cue:3:64\n instance.json:1:1\nconflicting values bool and [true,false] (mismatched types bool and list):\n generated.cue:3:8\n instance.json:1:1\nconflicting values null and [true,false] (mismatched types null and list):\n generated.cue:3:1\n instance.json:1:1\nconflicting values number and [true,false] (mismatched types number and list):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and [true,false] (mismatched types string and list):\n generated.cue:3:24\n instance.json:1:1\nexplicit error (_|_ literal) in source:\n generated.cue:3:57\n", - "v3": "6 errors in empty disjunction:\nconflicting values [true,false] and bool (mismatched types list and bool):\n generated.cue:3:8\n instance.json:1:1\nconflicting values [true,false] and null (mismatched types list and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values [true,false] and number (mismatched types list and number):\n generated.cue:3:15\n instance.json:1:1\nconflicting values [true,false] and string (mismatched types list and string):\n generated.cue:3:24\n instance.json:1:1\nconflicting values [true,false] and {...} (mismatched types list and struct):\n generated.cue:3:64\n instance.json:1:1\nexplicit error (_|_ literal) in source:\n generated.cue:3:57\n" + "v2": "6 errors in empty disjunction:\nconflicting values null and [true,false] (mismatched types null and list):\n generated.cue:3:1\n instance.json:1:1\nconflicting values bool and [true,false] (mismatched types bool and list):\n generated.cue:3:8\n instance.json:1:1\nconflicting values number and [true,false] (mismatched types number and list):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and [true,false] (mismatched types string and list):\n generated.cue:3:24\n instance.json:1:1\nexplicit error (_|_ literal) in source:\n generated.cue:3:57\nconflicting values [true,false] and {...} (mismatched types list and struct):\n generated.cue:3:1\n generated.cue:3:64\n instance.json:1:1\n", + "v3": "6 errors in empty disjunction:\nconflicting values [true,false] and null (mismatched types list and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values [true,false] and bool (mismatched types list and bool):\n generated.cue:3:8\n instance.json:1:1\nconflicting values [true,false] and number (mismatched types list and number):\n generated.cue:3:15\n instance.json:1:1\nconflicting values [true,false] and string (mismatched types list and string):\n generated.cue:3:24\n instance.json:1:1\nexplicit error (_|_ literal) in source:\n generated.cue:3:57\nconflicting values [true,false] and {...} (mismatched types list and struct):\n generated.cue:3:64\n instance.json:1:1\n" } }, { @@ -823,8 +823,8 @@ ], "valid": true, "skip": { - "v2": "6 errors in empty disjunction:\nconflicting values [false,false] and {...} (mismatched types list and struct):\n generated.cue:3:1\n generated.cue:3:64\n instance.json:1:1\nconflicting values bool and [false,false] (mismatched types bool and list):\n generated.cue:3:8\n instance.json:1:1\nconflicting values null and [false,false] (mismatched types null and list):\n generated.cue:3:1\n instance.json:1:1\nconflicting values number and [false,false] (mismatched types number and list):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and [false,false] (mismatched types string and list):\n generated.cue:3:24\n instance.json:1:1\nexplicit error (_|_ literal) in source:\n generated.cue:3:57\n", - "v3": "6 errors in empty disjunction:\nconflicting values [false,false] and bool (mismatched types list and bool):\n generated.cue:3:8\n instance.json:1:1\nconflicting values [false,false] and null (mismatched types list and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values [false,false] and number (mismatched types list and number):\n generated.cue:3:15\n instance.json:1:1\nconflicting values [false,false] and string (mismatched types list and string):\n generated.cue:3:24\n instance.json:1:1\nconflicting values [false,false] and {...} (mismatched types list and struct):\n generated.cue:3:64\n instance.json:1:1\nexplicit error (_|_ literal) in source:\n generated.cue:3:57\n" + "v2": "6 errors in empty disjunction:\nconflicting values null and [false,false] (mismatched types null and list):\n generated.cue:3:1\n instance.json:1:1\nconflicting values bool and [false,false] (mismatched types bool and list):\n generated.cue:3:8\n instance.json:1:1\nconflicting values number and [false,false] (mismatched types number and list):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and [false,false] (mismatched types string and list):\n generated.cue:3:24\n instance.json:1:1\nexplicit error (_|_ literal) in source:\n generated.cue:3:57\nconflicting values [false,false] and {...} (mismatched types list and struct):\n generated.cue:3:1\n generated.cue:3:64\n instance.json:1:1\n", + "v3": "6 errors in empty disjunction:\nconflicting values [false,false] and null (mismatched types list and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values [false,false] and bool (mismatched types list and bool):\n generated.cue:3:8\n instance.json:1:1\nconflicting values [false,false] and number (mismatched types list and number):\n generated.cue:3:15\n instance.json:1:1\nconflicting values [false,false] and string (mismatched types list and string):\n generated.cue:3:24\n instance.json:1:1\nexplicit error (_|_ literal) in source:\n generated.cue:3:57\nconflicting values [false,false] and {...} (mismatched types list and struct):\n generated.cue:3:64\n instance.json:1:1\n" } }, { @@ -835,8 +835,8 @@ ], "valid": true, "skip": { - "v2": "6 errors in empty disjunction:\nconflicting values [true,true] and {...} (mismatched types list and struct):\n generated.cue:3:1\n generated.cue:3:64\n instance.json:1:1\nconflicting values bool and [true,true] (mismatched types bool and list):\n generated.cue:3:8\n instance.json:1:1\nconflicting values null and [true,true] (mismatched types null and list):\n generated.cue:3:1\n instance.json:1:1\nconflicting values number and [true,true] (mismatched types number and list):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and [true,true] (mismatched types string and list):\n generated.cue:3:24\n instance.json:1:1\nexplicit error (_|_ literal) in source:\n generated.cue:3:57\n", - "v3": "6 errors in empty disjunction:\nconflicting values [true,true] and bool (mismatched types list and bool):\n generated.cue:3:8\n instance.json:1:1\nconflicting values [true,true] and null (mismatched types list and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values [true,true] and number (mismatched types list and number):\n generated.cue:3:15\n instance.json:1:1\nconflicting values [true,true] and string (mismatched types list and string):\n generated.cue:3:24\n instance.json:1:1\nconflicting values [true,true] and {...} (mismatched types list and struct):\n generated.cue:3:64\n instance.json:1:1\nexplicit error (_|_ literal) in source:\n generated.cue:3:57\n" + "v2": "6 errors in empty disjunction:\nconflicting values null and [true,true] (mismatched types null and list):\n generated.cue:3:1\n instance.json:1:1\nconflicting values bool and [true,true] (mismatched types bool and list):\n generated.cue:3:8\n instance.json:1:1\nconflicting values number and [true,true] (mismatched types number and list):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and [true,true] (mismatched types string and list):\n generated.cue:3:24\n instance.json:1:1\nexplicit error (_|_ literal) in source:\n generated.cue:3:57\nconflicting values [true,true] and {...} (mismatched types list and struct):\n generated.cue:3:1\n generated.cue:3:64\n instance.json:1:1\n", + "v3": "6 errors in empty disjunction:\nconflicting values [true,true] and null (mismatched types list and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values [true,true] and bool (mismatched types list and bool):\n generated.cue:3:8\n instance.json:1:1\nconflicting values [true,true] and number (mismatched types list and number):\n generated.cue:3:15\n instance.json:1:1\nconflicting values [true,true] and string (mismatched types list and string):\n generated.cue:3:24\n instance.json:1:1\nexplicit error (_|_ literal) in source:\n generated.cue:3:57\nconflicting values [true,true] and {...} (mismatched types list and struct):\n generated.cue:3:64\n instance.json:1:1\n" } }, { diff --git a/encoding/jsonschema/testdata/external/tests/draft4/additionalItems.json b/encoding/jsonschema/testdata/external/tests/draft4/additionalItems.json index c1aa00241b2..cf405e68ebf 100644 --- a/encoding/jsonschema/testdata/external/tests/draft4/additionalItems.json +++ b/encoding/jsonschema/testdata/external/tests/draft4/additionalItems.json @@ -68,8 +68,8 @@ "data": [], "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": "6 errors in empty disjunction:\nconflicting 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" + "v2": "5 errors in empty disjunction:\nconflicting values null and [] (mismatched types null and list):\n generated.cue:2:1\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 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\nconflicting values [] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:45\n instance.json:1:1\n", + "v3": "6 errors in empty disjunction:\nconflicting values [] and null (mismatched types list and null):\n generated.cue:2:1\n instance.json:1:1\nconflicting values [] and bool (mismatched types list and bool):\n generated.cue:2:8\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\nincompatible list lengths (0 and 3):\n generated.cue:2:33\nconflicting values [] and {...} (mismatched types list and struct):\n generated.cue:2:45\n instance.json:1:1\n" } }, { @@ -79,8 +79,8 @@ ], "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": "6 errors in empty disjunction:\nconflicting 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" + "v2": "5 errors in empty disjunction:\nconflicting values null and [1] (mismatched types null and list):\n generated.cue:2:1\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 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\nconflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:45\n instance.json:1:1\n", + "v3": "6 errors in empty disjunction:\nconflicting values [1] and null (mismatched types list and null):\n generated.cue:2:1\n instance.json:1:1\nconflicting values [1] and bool (mismatched types list and bool):\n generated.cue:2:8\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\nincompatible list lengths (1 and 3):\n generated.cue:2:33\nconflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:2:45\n instance.json:1:1\n" } }, { @@ -91,8 +91,8 @@ ], "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": "6 errors in empty disjunction:\nconflicting 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" + "v2": "5 errors in empty disjunction:\nconflicting values null and [1,2] (mismatched types null and list):\n generated.cue:2:1\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 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\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\n", + "v3": "6 errors in empty disjunction:\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 bool (mismatched types list and bool):\n generated.cue:2:8\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\nincompatible list lengths (2 and 3):\n generated.cue:2:33\nconflicting values [1,2] and {...} (mismatched types list and struct):\n generated.cue:2:45\n instance.json:1:1\n" } }, { diff --git a/encoding/jsonschema/testdata/external/tests/draft4/items.json b/encoding/jsonschema/testdata/external/tests/draft4/items.json index 5b2cffcfc70..c79d7721c3d 100644 --- a/encoding/jsonschema/testdata/external/tests/draft4/items.json +++ b/encoding/jsonschema/testdata/external/tests/draft4/items.json @@ -77,8 +77,8 @@ ], "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": "6 errors in empty disjunction:\nconflicting 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" + "v2": "5 errors in empty disjunction:\nconflicting values null and [1] (mismatched types null and list):\n generated.cue:2:1\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 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\nconflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:54\n instance.json:1:1\n", + "v3": "6 errors in empty disjunction:\nconflicting values [1] and null (mismatched types list and null):\n generated.cue:2:1\n instance.json:1:1\nconflicting values [1] and bool (mismatched types list and bool):\n generated.cue:2:8\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\nincompatible list lengths (1 and 3):\n generated.cue:2:33\nconflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:2:54\n instance.json:1:1\n" } }, { @@ -95,8 +95,8 @@ "data": [], "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": "6 errors in empty disjunction:\nconflicting 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" + "v2": "5 errors in empty disjunction:\nconflicting values null and [] (mismatched types null and list):\n generated.cue:2:1\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 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\nconflicting values [] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:54\n instance.json:1:1\n", + "v3": "6 errors in empty disjunction:\nconflicting values [] and null (mismatched types list and null):\n generated.cue:2:1\n instance.json:1:1\nconflicting values [] and bool (mismatched types list and bool):\n generated.cue:2:8\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\nincompatible list lengths (0 and 3):\n generated.cue:2:33\nconflicting values [] and {...} (mismatched types list and struct):\n generated.cue:2:54\n instance.json:1:1\n" } }, { @@ -319,7 +319,7 @@ "valid": true, "skip": { "v2": "incompatible list lengths (2 and 3)\n0: incompatible list lengths (1 and 2)\n1: incompatible list lengths (1 and 2)\n", - "v3": "incompatible list lengths (2 and 3):\n generated.cue:2:1\n0: incompatible list lengths (1 and 2):\n generated.cue:9:8\n" + "v3": "0: incompatible list lengths (1 and 2):\n generated.cue:9:8\nincompatible list lengths (2 and 3):\n generated.cue:2:1\n" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft4/maximum.json b/encoding/jsonschema/testdata/external/tests/draft4/maximum.json index 408f4eddf4b..3ce07d7ee43 100644 --- a/encoding/jsonschema/testdata/external/tests/draft4/maximum.json +++ b/encoding/jsonschema/testdata/external/tests/draft4/maximum.json @@ -72,8 +72,8 @@ "data": 3.0, "valid": true, "skip": { - "v2": "6 errors in empty disjunction:\nconflicting values 3.0 and [...] (mismatched types float and list):\n generated.cue:2:1\n generated.cue:2:31\n instance.json:1:1\nconflicting values 3.0 and bool (mismatched types float and bool):\n generated.cue:2:1\n generated.cue:2:8\n instance.json:1:1\nconflicting values 3.0 and null (mismatched types float and null):\n generated.cue:2:1\n instance.json:1:1\nconflicting values 3.0 and string (mismatched types float and string):\n generated.cue:2:1\n generated.cue:2:22\n instance.json:1:1\nconflicting values 3.0 and {...} (mismatched types float and struct):\n generated.cue:2:1\n generated.cue:2:39\n instance.json:1:1\ninvalid value 3.0 (out of bound \u003c3.0):\n generated.cue:2:15\n instance.json:1:1\n", - "v3": "6 errors in empty disjunction:\nconflicting values 3.0 and [...] (mismatched types float and list):\n generated.cue:2:31\n instance.json:1:1\nconflicting values 3.0 and bool (mismatched types float and bool):\n generated.cue:2:8\n instance.json:1:1\nconflicting values 3.0 and null (mismatched types float and null):\n generated.cue:2:1\n instance.json:1:1\nconflicting values 3.0 and string (mismatched types float and string):\n generated.cue:2:22\n instance.json:1:1\nconflicting values 3.0 and {...} (mismatched types float and struct):\n generated.cue:2:39\n instance.json:1:1\ninvalid value 3.0 (out of bound \u003c3.0):\n generated.cue:2:15\n instance.json:1:1\n" + "v2": "6 errors in empty disjunction:\nconflicting values 3.0 and null (mismatched types float and null):\n generated.cue:2:1\n instance.json:1:1\nconflicting values 3.0 and bool (mismatched types float and bool):\n generated.cue:2:1\n generated.cue:2:8\n instance.json:1:1\ninvalid value 3.0 (out of bound \u003c3.0):\n generated.cue:2:15\n instance.json:1:1\nconflicting values 3.0 and string (mismatched types float and string):\n generated.cue:2:1\n generated.cue:2:22\n instance.json:1:1\nconflicting values 3.0 and [...] (mismatched types float and list):\n generated.cue:2:1\n generated.cue:2:31\n instance.json:1:1\nconflicting values 3.0 and {...} (mismatched types float and struct):\n generated.cue:2:1\n generated.cue:2:39\n instance.json:1:1\n", + "v3": "6 errors in empty disjunction:\nconflicting values 3.0 and null (mismatched types float and null):\n generated.cue:2:1\n instance.json:1:1\nconflicting values 3.0 and bool (mismatched types float and bool):\n generated.cue:2:8\n instance.json:1:1\ninvalid value 3.0 (out of bound \u003c3.0):\n generated.cue:2:15\n instance.json:1:1\nconflicting values 3.0 and string (mismatched types float and string):\n generated.cue:2:22\n instance.json:1:1\nconflicting values 3.0 and [...] (mismatched types float and list):\n generated.cue:2:31\n instance.json:1:1\nconflicting values 3.0 and {...} (mismatched types float and struct):\n generated.cue:2:39\n instance.json:1:1\n" } }, { diff --git a/encoding/jsonschema/testdata/external/tests/draft4/minimum.json b/encoding/jsonschema/testdata/external/tests/draft4/minimum.json index 3aebde3857a..37186d31675 100644 --- a/encoding/jsonschema/testdata/external/tests/draft4/minimum.json +++ b/encoding/jsonschema/testdata/external/tests/draft4/minimum.json @@ -44,8 +44,8 @@ "data": 1.1, "valid": true, "skip": { - "v2": "6 errors in empty disjunction:\nconflicting values 1.1 and [...] (mismatched types float and list):\n generated.cue:2:1\n generated.cue:2:31\n instance.json:1:1\nconflicting values 1.1 and bool (mismatched types float and bool):\n generated.cue:2:1\n generated.cue:2:8\n instance.json:1:1\nconflicting values 1.1 and null (mismatched types float and null):\n generated.cue:2:1\n instance.json:1:1\nconflicting values 1.1 and string (mismatched types float and string):\n generated.cue:2:1\n generated.cue:2:22\n instance.json:1:1\nconflicting values 1.1 and {...} (mismatched types float and struct):\n generated.cue:2:1\n generated.cue:2:39\n instance.json:1:1\ninvalid value 1.1 (out of bound \u003e1.1):\n generated.cue:2:15\n instance.json:1:1\n", - "v3": "6 errors in empty disjunction:\nconflicting values 1.1 and [...] (mismatched types float and list):\n generated.cue:2:31\n instance.json:1:1\nconflicting values 1.1 and bool (mismatched types float and bool):\n generated.cue:2:8\n instance.json:1:1\nconflicting values 1.1 and null (mismatched types float and null):\n generated.cue:2:1\n instance.json:1:1\nconflicting values 1.1 and string (mismatched types float and string):\n generated.cue:2:22\n instance.json:1:1\nconflicting values 1.1 and {...} (mismatched types float and struct):\n generated.cue:2:39\n instance.json:1:1\ninvalid value 1.1 (out of bound \u003e1.1):\n generated.cue:2:15\n instance.json:1:1\n" + "v2": "6 errors in empty disjunction:\nconflicting values 1.1 and null (mismatched types float and null):\n generated.cue:2:1\n instance.json:1:1\nconflicting values 1.1 and bool (mismatched types float and bool):\n generated.cue:2:1\n generated.cue:2:8\n instance.json:1:1\ninvalid value 1.1 (out of bound \u003e1.1):\n generated.cue:2:15\n instance.json:1:1\nconflicting values 1.1 and string (mismatched types float and string):\n generated.cue:2:1\n generated.cue:2:22\n instance.json:1:1\nconflicting values 1.1 and [...] (mismatched types float and list):\n generated.cue:2:1\n generated.cue:2:31\n instance.json:1:1\nconflicting values 1.1 and {...} (mismatched types float and struct):\n generated.cue:2:1\n generated.cue:2:39\n instance.json:1:1\n", + "v3": "6 errors in empty disjunction:\nconflicting values 1.1 and null (mismatched types float and null):\n generated.cue:2:1\n instance.json:1:1\nconflicting values 1.1 and bool (mismatched types float and bool):\n generated.cue:2:8\n instance.json:1:1\ninvalid value 1.1 (out of bound \u003e1.1):\n generated.cue:2:15\n instance.json:1:1\nconflicting values 1.1 and string (mismatched types float and string):\n generated.cue:2:22\n instance.json:1:1\nconflicting values 1.1 and [...] (mismatched types float and list):\n generated.cue:2:31\n instance.json:1:1\nconflicting values 1.1 and {...} (mismatched types float and struct):\n generated.cue:2:39\n instance.json:1:1\n" } }, { diff --git a/encoding/jsonschema/testdata/external/tests/draft4/optional/format/date-time.json b/encoding/jsonschema/testdata/external/tests/draft4/optional/format/date-time.json index 6e7c7c5a344..ca676037c35 100644 --- a/encoding/jsonschema/testdata/external/tests/draft4/optional/format/date-time.json +++ b/encoding/jsonschema/testdata/external/tests/draft4/optional/format/date-time.json @@ -60,8 +60,8 @@ "data": "1998-12-31T23:59:60Z", "valid": true, "skip": { - "v2": "6 errors in empty disjunction:\nconflicting values \"1998-12-31T23:59:60Z\" and [...] (mismatched types string and list):\n generated.cue:3:1\n generated.cue:3:36\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and bool (mismatched types string and bool):\n generated.cue:3:1\n generated.cue:3:8\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and null (mismatched types string and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and number (mismatched types string and number):\n generated.cue:3:1\n generated.cue:3:15\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and {...} (mismatched types string and struct):\n generated.cue:3:1\n generated.cue:3:44\n instance.json:1:1\ninvalid value \"1998-12-31T23:59:60Z\" (does not satisfy time.Time): error in call to time.Time: invalid time \"1998-12-31T23:59:60Z\":\n generated.cue:1:1\n instance.json:1:1\n", - "v3": "6 errors in empty disjunction:\nconflicting values \"1998-12-31T23:59:60Z\" and [...] (mismatched types string and list):\n generated.cue:3:36\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and bool (mismatched types string and bool):\n generated.cue:3:8\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and null (mismatched types string and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and number (mismatched types string and number):\n generated.cue:3:15\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and {...} (mismatched types string and struct):\n generated.cue:3:44\n instance.json:1:1\ninvalid value \"1998-12-31T23:59:60Z\" (does not satisfy time.Time): error in call to time.Time: invalid time \"1998-12-31T23:59:60Z\":\n generated.cue:1:1\n instance.json:1:1\n" + "v2": "6 errors in empty disjunction:\nconflicting values \"1998-12-31T23:59:60Z\" and null (mismatched types string and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and bool (mismatched types string and bool):\n generated.cue:3:1\n generated.cue:3:8\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and number (mismatched types string and number):\n generated.cue:3:1\n generated.cue:3:15\n instance.json:1:1\ninvalid value \"1998-12-31T23:59:60Z\" (does not satisfy time.Time): error in call to time.Time: invalid time \"1998-12-31T23:59:60Z\":\n generated.cue:1:1\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and [...] (mismatched types string and list):\n generated.cue:3:1\n generated.cue:3:36\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and {...} (mismatched types string and struct):\n generated.cue:3:1\n generated.cue:3:44\n instance.json:1:1\n", + "v3": "6 errors in empty disjunction:\nconflicting values \"1998-12-31T23:59:60Z\" and null (mismatched types string and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and bool (mismatched types string and bool):\n generated.cue:3:8\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and number (mismatched types string and number):\n generated.cue:3:15\n instance.json:1:1\ninvalid value \"1998-12-31T23:59:60Z\" (does not satisfy time.Time): error in call to time.Time: invalid time \"1998-12-31T23:59:60Z\":\n generated.cue:1:1\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and [...] (mismatched types string and list):\n generated.cue:3:36\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and {...} (mismatched types string and struct):\n generated.cue:3:44\n instance.json:1:1\n" } }, { @@ -69,8 +69,8 @@ "data": "1998-12-31T15:59:60.123-08:00", "valid": true, "skip": { - "v2": "6 errors in empty disjunction:\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and [...] (mismatched types string and list):\n generated.cue:3:1\n generated.cue:3:36\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and bool (mismatched types string and bool):\n generated.cue:3:1\n generated.cue:3:8\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and null (mismatched types string and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and number (mismatched types string and number):\n generated.cue:3:1\n generated.cue:3:15\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and {...} (mismatched types string and struct):\n generated.cue:3:1\n generated.cue:3:44\n instance.json:1:1\ninvalid value \"1998-12-31T15:59:60.123-08:00\" (does not satisfy time.Time): error in call to time.Time: invalid time \"1998-12-31T15:59:60.123-08:00\":\n generated.cue:1:1\n instance.json:1:1\n", - "v3": "6 errors in empty disjunction:\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and [...] (mismatched types string and list):\n generated.cue:3:36\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and bool (mismatched types string and bool):\n generated.cue:3:8\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and null (mismatched types string and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and number (mismatched types string and number):\n generated.cue:3:15\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and {...} (mismatched types string and struct):\n generated.cue:3:44\n instance.json:1:1\ninvalid value \"1998-12-31T15:59:60.123-08:00\" (does not satisfy time.Time): error in call to time.Time: invalid time \"1998-12-31T15:59:60.123-08:00\":\n generated.cue:1:1\n instance.json:1:1\n" + "v2": "6 errors in empty disjunction:\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and null (mismatched types string and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and bool (mismatched types string and bool):\n generated.cue:3:1\n generated.cue:3:8\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and number (mismatched types string and number):\n generated.cue:3:1\n generated.cue:3:15\n instance.json:1:1\ninvalid value \"1998-12-31T15:59:60.123-08:00\" (does not satisfy time.Time): error in call to time.Time: invalid time \"1998-12-31T15:59:60.123-08:00\":\n generated.cue:1:1\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and [...] (mismatched types string and list):\n generated.cue:3:1\n generated.cue:3:36\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and {...} (mismatched types string and struct):\n generated.cue:3:1\n generated.cue:3:44\n instance.json:1:1\n", + "v3": "6 errors in empty disjunction:\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and null (mismatched types string and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and bool (mismatched types string and bool):\n generated.cue:3:8\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and number (mismatched types string and number):\n generated.cue:3:15\n instance.json:1:1\ninvalid value \"1998-12-31T15:59:60.123-08:00\" (does not satisfy time.Time): error in call to time.Time: invalid time \"1998-12-31T15:59:60.123-08:00\":\n generated.cue:1:1\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and [...] (mismatched types string and list):\n generated.cue:3:36\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and {...} (mismatched types string and struct):\n generated.cue:3:44\n instance.json:1:1\n" } }, { @@ -117,8 +117,8 @@ "data": "1963-06-19t08:30:06.283185z", "valid": true, "skip": { - "v2": "6 errors in empty disjunction:\nconflicting values \"1963-06-19t08:30:06.283185z\" and [...] (mismatched types string and list):\n generated.cue:3:1\n generated.cue:3:36\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and bool (mismatched types string and bool):\n generated.cue:3:1\n generated.cue:3:8\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and null (mismatched types string and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and number (mismatched types string and number):\n generated.cue:3:1\n generated.cue:3:15\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and {...} (mismatched types string and struct):\n generated.cue:3:1\n generated.cue:3:44\n instance.json:1:1\ninvalid value \"1963-06-19t08:30:06.283185z\" (does not satisfy time.Time): error in call to time.Time: invalid time \"1963-06-19t08:30:06.283185z\":\n generated.cue:1:1\n instance.json:1:1\n", - "v3": "6 errors in empty disjunction:\nconflicting values \"1963-06-19t08:30:06.283185z\" and [...] (mismatched types string and list):\n generated.cue:3:36\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and bool (mismatched types string and bool):\n generated.cue:3:8\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and null (mismatched types string and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and number (mismatched types string and number):\n generated.cue:3:15\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and {...} (mismatched types string and struct):\n generated.cue:3:44\n instance.json:1:1\ninvalid value \"1963-06-19t08:30:06.283185z\" (does not satisfy time.Time): error in call to time.Time: invalid time \"1963-06-19t08:30:06.283185z\":\n generated.cue:1:1\n instance.json:1:1\n" + "v2": "6 errors in empty disjunction:\nconflicting values \"1963-06-19t08:30:06.283185z\" and null (mismatched types string and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and bool (mismatched types string and bool):\n generated.cue:3:1\n generated.cue:3:8\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and number (mismatched types string and number):\n generated.cue:3:1\n generated.cue:3:15\n instance.json:1:1\ninvalid value \"1963-06-19t08:30:06.283185z\" (does not satisfy time.Time): error in call to time.Time: invalid time \"1963-06-19t08:30:06.283185z\":\n generated.cue:1:1\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and [...] (mismatched types string and list):\n generated.cue:3:1\n generated.cue:3:36\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and {...} (mismatched types string and struct):\n generated.cue:3:1\n generated.cue:3:44\n instance.json:1:1\n", + "v3": "6 errors in empty disjunction:\nconflicting values \"1963-06-19t08:30:06.283185z\" and null (mismatched types string and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and bool (mismatched types string and bool):\n generated.cue:3:8\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and number (mismatched types string and number):\n generated.cue:3:15\n instance.json:1:1\ninvalid value \"1963-06-19t08:30:06.283185z\" (does not satisfy time.Time): error in call to time.Time: invalid time \"1963-06-19t08:30:06.283185z\":\n generated.cue:1:1\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and [...] (mismatched types string and list):\n generated.cue:3:36\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and {...} (mismatched types string and struct):\n generated.cue:3:44\n instance.json:1:1\n" } }, { diff --git a/encoding/jsonschema/testdata/external/tests/draft6/additionalItems.json b/encoding/jsonschema/testdata/external/tests/draft6/additionalItems.json index bcdce1d9458..c087bf1d155 100644 --- a/encoding/jsonschema/testdata/external/tests/draft6/additionalItems.json +++ b/encoding/jsonschema/testdata/external/tests/draft6/additionalItems.json @@ -99,8 +99,8 @@ "data": [], "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": "6 errors in empty disjunction:\nconflicting 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" + "v2": "5 errors in empty disjunction:\nconflicting values null and [] (mismatched types null and list):\n generated.cue:2:1\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 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\nconflicting values [] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:45\n instance.json:1:1\n", + "v3": "6 errors in empty disjunction:\nconflicting values [] and null (mismatched types list and null):\n generated.cue:2:1\n instance.json:1:1\nconflicting values [] and bool (mismatched types list and bool):\n generated.cue:2:8\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\nincompatible list lengths (0 and 3):\n generated.cue:2:33\nconflicting values [] and {...} (mismatched types list and struct):\n generated.cue:2:45\n instance.json:1:1\n" } }, { @@ -110,8 +110,8 @@ ], "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": "6 errors in empty disjunction:\nconflicting 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" + "v2": "5 errors in empty disjunction:\nconflicting values null and [1] (mismatched types null and list):\n generated.cue:2:1\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 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\nconflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:45\n instance.json:1:1\n", + "v3": "6 errors in empty disjunction:\nconflicting values [1] and null (mismatched types list and null):\n generated.cue:2:1\n instance.json:1:1\nconflicting values [1] and bool (mismatched types list and bool):\n generated.cue:2:8\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\nincompatible list lengths (1 and 3):\n generated.cue:2:33\nconflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:2:45\n instance.json:1:1\n" } }, { @@ -122,8 +122,8 @@ ], "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": "6 errors in empty disjunction:\nconflicting 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" + "v2": "5 errors in empty disjunction:\nconflicting values null and [1,2] (mismatched types null and list):\n generated.cue:2:1\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 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\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\n", + "v3": "6 errors in empty disjunction:\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 bool (mismatched types list and bool):\n generated.cue:2:8\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\nincompatible list lengths (2 and 3):\n generated.cue:2:33\nconflicting values [1,2] and {...} (mismatched types list and struct):\n generated.cue:2:45\n instance.json:1:1\n" } }, { diff --git a/encoding/jsonschema/testdata/external/tests/draft6/items.json b/encoding/jsonschema/testdata/external/tests/draft6/items.json index bd659ec70f9..cb3b8bd993e 100644 --- a/encoding/jsonschema/testdata/external/tests/draft6/items.json +++ b/encoding/jsonschema/testdata/external/tests/draft6/items.json @@ -77,8 +77,8 @@ ], "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": "6 errors in empty disjunction:\nconflicting 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" + "v2": "5 errors in empty disjunction:\nconflicting values null and [1] (mismatched types null and list):\n generated.cue:2:1\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 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\nconflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:54\n instance.json:1:1\n", + "v3": "6 errors in empty disjunction:\nconflicting values [1] and null (mismatched types list and null):\n generated.cue:2:1\n instance.json:1:1\nconflicting values [1] and bool (mismatched types list and bool):\n generated.cue:2:8\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\nincompatible list lengths (1 and 3):\n generated.cue:2:33\nconflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:2:54\n instance.json:1:1\n" } }, { @@ -95,8 +95,8 @@ "data": [], "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": "6 errors in empty disjunction:\nconflicting 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" + "v2": "5 errors in empty disjunction:\nconflicting values null and [] (mismatched types null and list):\n generated.cue:2:1\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 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\nconflicting values [] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:54\n instance.json:1:1\n", + "v3": "6 errors in empty disjunction:\nconflicting values [] and null (mismatched types list and null):\n generated.cue:2:1\n instance.json:1:1\nconflicting values [] and bool (mismatched types list and bool):\n generated.cue:2:8\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\nincompatible list lengths (0 and 3):\n generated.cue:2:33\nconflicting values [] and {...} (mismatched types list and struct):\n generated.cue:2:54\n instance.json:1:1\n" } }, { @@ -170,8 +170,8 @@ ], "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": "7 errors in empty disjunction:\nconflicting 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" + "v2": "5 errors in empty disjunction:\nconflicting values null and [1] (mismatched types null and list):\n generated.cue:2:1\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 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\nconflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:49\n instance.json:1:1\n", + "v3": "7 errors in empty disjunction:\nconflicting values [1] and null (mismatched types list and null):\n generated.cue:2:1\n instance.json:1:1\nconflicting values [1] and bool (mismatched types list and bool):\n generated.cue:2:8\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\nincompatible list lengths (1 and 3):\n generated.cue:2:33\nexplicit error (_|_ literal) in source:\n generated.cue:2:37\nconflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:2:49\n instance.json:1:1\n" } }, { @@ -187,8 +187,8 @@ "data": [], "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": "6 errors in empty disjunction:\nconflicting 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" + "v2": "5 errors in empty disjunction:\nconflicting values null and [] (mismatched types null and list):\n generated.cue:2:1\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 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\nconflicting values [] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:49\n instance.json:1:1\n", + "v3": "6 errors in empty disjunction:\nconflicting values [] and null (mismatched types list and null):\n generated.cue:2:1\n instance.json:1:1\nconflicting values [] and bool (mismatched types list and bool):\n generated.cue:2:8\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\nincompatible list lengths (0 and 3):\n generated.cue:2:33\nconflicting values [] and {...} (mismatched types list and struct):\n generated.cue:2:49\n instance.json:1:1\n" } } ] @@ -402,7 +402,7 @@ "valid": true, "skip": { "v2": "incompatible list lengths (2 and 3)\n0: incompatible list lengths (1 and 2)\n1: incompatible list lengths (1 and 2)\n", - "v3": "incompatible list lengths (2 and 3):\n generated.cue:2:1\n0: incompatible list lengths (1 and 2):\n generated.cue:9:8\n" + "v3": "0: incompatible list lengths (1 and 2):\n generated.cue:9:8\nincompatible list lengths (2 and 3):\n generated.cue:2:1\n" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft6/optional/format/date-time.json b/encoding/jsonschema/testdata/external/tests/draft6/optional/format/date-time.json index 6e7c7c5a344..ca676037c35 100644 --- a/encoding/jsonschema/testdata/external/tests/draft6/optional/format/date-time.json +++ b/encoding/jsonschema/testdata/external/tests/draft6/optional/format/date-time.json @@ -60,8 +60,8 @@ "data": "1998-12-31T23:59:60Z", "valid": true, "skip": { - "v2": "6 errors in empty disjunction:\nconflicting values \"1998-12-31T23:59:60Z\" and [...] (mismatched types string and list):\n generated.cue:3:1\n generated.cue:3:36\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and bool (mismatched types string and bool):\n generated.cue:3:1\n generated.cue:3:8\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and null (mismatched types string and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and number (mismatched types string and number):\n generated.cue:3:1\n generated.cue:3:15\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and {...} (mismatched types string and struct):\n generated.cue:3:1\n generated.cue:3:44\n instance.json:1:1\ninvalid value \"1998-12-31T23:59:60Z\" (does not satisfy time.Time): error in call to time.Time: invalid time \"1998-12-31T23:59:60Z\":\n generated.cue:1:1\n instance.json:1:1\n", - "v3": "6 errors in empty disjunction:\nconflicting values \"1998-12-31T23:59:60Z\" and [...] (mismatched types string and list):\n generated.cue:3:36\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and bool (mismatched types string and bool):\n generated.cue:3:8\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and null (mismatched types string and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and number (mismatched types string and number):\n generated.cue:3:15\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and {...} (mismatched types string and struct):\n generated.cue:3:44\n instance.json:1:1\ninvalid value \"1998-12-31T23:59:60Z\" (does not satisfy time.Time): error in call to time.Time: invalid time \"1998-12-31T23:59:60Z\":\n generated.cue:1:1\n instance.json:1:1\n" + "v2": "6 errors in empty disjunction:\nconflicting values \"1998-12-31T23:59:60Z\" and null (mismatched types string and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and bool (mismatched types string and bool):\n generated.cue:3:1\n generated.cue:3:8\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and number (mismatched types string and number):\n generated.cue:3:1\n generated.cue:3:15\n instance.json:1:1\ninvalid value \"1998-12-31T23:59:60Z\" (does not satisfy time.Time): error in call to time.Time: invalid time \"1998-12-31T23:59:60Z\":\n generated.cue:1:1\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and [...] (mismatched types string and list):\n generated.cue:3:1\n generated.cue:3:36\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and {...} (mismatched types string and struct):\n generated.cue:3:1\n generated.cue:3:44\n instance.json:1:1\n", + "v3": "6 errors in empty disjunction:\nconflicting values \"1998-12-31T23:59:60Z\" and null (mismatched types string and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and bool (mismatched types string and bool):\n generated.cue:3:8\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and number (mismatched types string and number):\n generated.cue:3:15\n instance.json:1:1\ninvalid value \"1998-12-31T23:59:60Z\" (does not satisfy time.Time): error in call to time.Time: invalid time \"1998-12-31T23:59:60Z\":\n generated.cue:1:1\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and [...] (mismatched types string and list):\n generated.cue:3:36\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and {...} (mismatched types string and struct):\n generated.cue:3:44\n instance.json:1:1\n" } }, { @@ -69,8 +69,8 @@ "data": "1998-12-31T15:59:60.123-08:00", "valid": true, "skip": { - "v2": "6 errors in empty disjunction:\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and [...] (mismatched types string and list):\n generated.cue:3:1\n generated.cue:3:36\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and bool (mismatched types string and bool):\n generated.cue:3:1\n generated.cue:3:8\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and null (mismatched types string and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and number (mismatched types string and number):\n generated.cue:3:1\n generated.cue:3:15\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and {...} (mismatched types string and struct):\n generated.cue:3:1\n generated.cue:3:44\n instance.json:1:1\ninvalid value \"1998-12-31T15:59:60.123-08:00\" (does not satisfy time.Time): error in call to time.Time: invalid time \"1998-12-31T15:59:60.123-08:00\":\n generated.cue:1:1\n instance.json:1:1\n", - "v3": "6 errors in empty disjunction:\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and [...] (mismatched types string and list):\n generated.cue:3:36\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and bool (mismatched types string and bool):\n generated.cue:3:8\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and null (mismatched types string and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and number (mismatched types string and number):\n generated.cue:3:15\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and {...} (mismatched types string and struct):\n generated.cue:3:44\n instance.json:1:1\ninvalid value \"1998-12-31T15:59:60.123-08:00\" (does not satisfy time.Time): error in call to time.Time: invalid time \"1998-12-31T15:59:60.123-08:00\":\n generated.cue:1:1\n instance.json:1:1\n" + "v2": "6 errors in empty disjunction:\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and null (mismatched types string and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and bool (mismatched types string and bool):\n generated.cue:3:1\n generated.cue:3:8\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and number (mismatched types string and number):\n generated.cue:3:1\n generated.cue:3:15\n instance.json:1:1\ninvalid value \"1998-12-31T15:59:60.123-08:00\" (does not satisfy time.Time): error in call to time.Time: invalid time \"1998-12-31T15:59:60.123-08:00\":\n generated.cue:1:1\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and [...] (mismatched types string and list):\n generated.cue:3:1\n generated.cue:3:36\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and {...} (mismatched types string and struct):\n generated.cue:3:1\n generated.cue:3:44\n instance.json:1:1\n", + "v3": "6 errors in empty disjunction:\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and null (mismatched types string and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and bool (mismatched types string and bool):\n generated.cue:3:8\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and number (mismatched types string and number):\n generated.cue:3:15\n instance.json:1:1\ninvalid value \"1998-12-31T15:59:60.123-08:00\" (does not satisfy time.Time): error in call to time.Time: invalid time \"1998-12-31T15:59:60.123-08:00\":\n generated.cue:1:1\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and [...] (mismatched types string and list):\n generated.cue:3:36\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and {...} (mismatched types string and struct):\n generated.cue:3:44\n instance.json:1:1\n" } }, { @@ -117,8 +117,8 @@ "data": "1963-06-19t08:30:06.283185z", "valid": true, "skip": { - "v2": "6 errors in empty disjunction:\nconflicting values \"1963-06-19t08:30:06.283185z\" and [...] (mismatched types string and list):\n generated.cue:3:1\n generated.cue:3:36\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and bool (mismatched types string and bool):\n generated.cue:3:1\n generated.cue:3:8\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and null (mismatched types string and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and number (mismatched types string and number):\n generated.cue:3:1\n generated.cue:3:15\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and {...} (mismatched types string and struct):\n generated.cue:3:1\n generated.cue:3:44\n instance.json:1:1\ninvalid value \"1963-06-19t08:30:06.283185z\" (does not satisfy time.Time): error in call to time.Time: invalid time \"1963-06-19t08:30:06.283185z\":\n generated.cue:1:1\n instance.json:1:1\n", - "v3": "6 errors in empty disjunction:\nconflicting values \"1963-06-19t08:30:06.283185z\" and [...] (mismatched types string and list):\n generated.cue:3:36\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and bool (mismatched types string and bool):\n generated.cue:3:8\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and null (mismatched types string and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and number (mismatched types string and number):\n generated.cue:3:15\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and {...} (mismatched types string and struct):\n generated.cue:3:44\n instance.json:1:1\ninvalid value \"1963-06-19t08:30:06.283185z\" (does not satisfy time.Time): error in call to time.Time: invalid time \"1963-06-19t08:30:06.283185z\":\n generated.cue:1:1\n instance.json:1:1\n" + "v2": "6 errors in empty disjunction:\nconflicting values \"1963-06-19t08:30:06.283185z\" and null (mismatched types string and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and bool (mismatched types string and bool):\n generated.cue:3:1\n generated.cue:3:8\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and number (mismatched types string and number):\n generated.cue:3:1\n generated.cue:3:15\n instance.json:1:1\ninvalid value \"1963-06-19t08:30:06.283185z\" (does not satisfy time.Time): error in call to time.Time: invalid time \"1963-06-19t08:30:06.283185z\":\n generated.cue:1:1\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and [...] (mismatched types string and list):\n generated.cue:3:1\n generated.cue:3:36\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and {...} (mismatched types string and struct):\n generated.cue:3:1\n generated.cue:3:44\n instance.json:1:1\n", + "v3": "6 errors in empty disjunction:\nconflicting values \"1963-06-19t08:30:06.283185z\" and null (mismatched types string and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and bool (mismatched types string and bool):\n generated.cue:3:8\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and number (mismatched types string and number):\n generated.cue:3:15\n instance.json:1:1\ninvalid value \"1963-06-19t08:30:06.283185z\" (does not satisfy time.Time): error in call to time.Time: invalid time \"1963-06-19t08:30:06.283185z\":\n generated.cue:1:1\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and [...] (mismatched types string and list):\n generated.cue:3:36\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and {...} (mismatched types string and struct):\n generated.cue:3:44\n instance.json:1:1\n" } }, { diff --git a/encoding/jsonschema/testdata/external/tests/draft6/propertyNames.json b/encoding/jsonschema/testdata/external/tests/draft6/propertyNames.json index ea6b2f222ca..f4004b7dc23 100644 --- a/encoding/jsonschema/testdata/external/tests/draft6/propertyNames.json +++ b/encoding/jsonschema/testdata/external/tests/draft6/propertyNames.json @@ -154,7 +154,7 @@ "data": {}, "valid": true, "skip": { - "v3": "6 errors in empty disjunction:\nconflicting values [...] and {} (mismatched types list and struct):\n generated.cue:2:33\n instance.json:1:1\nconflicting values bool and {} (mismatched types bool and struct):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and {} (mismatched types null and struct):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and {} (mismatched types number and struct):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and {} (mismatched types string and struct):\n generated.cue:2:24\n instance.json:1:1\nexplicit error (_|_ literal) in source:\n generated.cue:3:3\n" + "v3": "6 errors in empty disjunction:\nconflicting values null and {} (mismatched types null and struct):\n generated.cue:2:1\n instance.json:1:1\nconflicting values bool and {} (mismatched types bool and struct):\n generated.cue:2:8\n instance.json:1:1\nconflicting values number and {} (mismatched types number and struct):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and {} (mismatched types string and struct):\n generated.cue:2:24\n instance.json:1:1\nconflicting values [...] and {} (mismatched types list and struct):\n generated.cue:2:33\n instance.json:1:1\nexplicit error (_|_ literal) in source:\n generated.cue:3:3\n" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft7/additionalItems.json b/encoding/jsonschema/testdata/external/tests/draft7/additionalItems.json index bcdce1d9458..c087bf1d155 100644 --- a/encoding/jsonschema/testdata/external/tests/draft7/additionalItems.json +++ b/encoding/jsonschema/testdata/external/tests/draft7/additionalItems.json @@ -99,8 +99,8 @@ "data": [], "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": "6 errors in empty disjunction:\nconflicting 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" + "v2": "5 errors in empty disjunction:\nconflicting values null and [] (mismatched types null and list):\n generated.cue:2:1\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 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\nconflicting values [] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:45\n instance.json:1:1\n", + "v3": "6 errors in empty disjunction:\nconflicting values [] and null (mismatched types list and null):\n generated.cue:2:1\n instance.json:1:1\nconflicting values [] and bool (mismatched types list and bool):\n generated.cue:2:8\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\nincompatible list lengths (0 and 3):\n generated.cue:2:33\nconflicting values [] and {...} (mismatched types list and struct):\n generated.cue:2:45\n instance.json:1:1\n" } }, { @@ -110,8 +110,8 @@ ], "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": "6 errors in empty disjunction:\nconflicting 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" + "v2": "5 errors in empty disjunction:\nconflicting values null and [1] (mismatched types null and list):\n generated.cue:2:1\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 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\nconflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:45\n instance.json:1:1\n", + "v3": "6 errors in empty disjunction:\nconflicting values [1] and null (mismatched types list and null):\n generated.cue:2:1\n instance.json:1:1\nconflicting values [1] and bool (mismatched types list and bool):\n generated.cue:2:8\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\nincompatible list lengths (1 and 3):\n generated.cue:2:33\nconflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:2:45\n instance.json:1:1\n" } }, { @@ -122,8 +122,8 @@ ], "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": "6 errors in empty disjunction:\nconflicting 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" + "v2": "5 errors in empty disjunction:\nconflicting values null and [1,2] (mismatched types null and list):\n generated.cue:2:1\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 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\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\n", + "v3": "6 errors in empty disjunction:\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 bool (mismatched types list and bool):\n generated.cue:2:8\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\nincompatible list lengths (2 and 3):\n generated.cue:2:33\nconflicting values [1,2] and {...} (mismatched types list and struct):\n generated.cue:2:45\n instance.json:1:1\n" } }, { diff --git a/encoding/jsonschema/testdata/external/tests/draft7/contains.json b/encoding/jsonschema/testdata/external/tests/draft7/contains.json index 42dd97cbf5e..77f88ade958 100644 --- a/encoding/jsonschema/testdata/external/tests/draft7/contains.json +++ b/encoding/jsonschema/testdata/external/tests/draft7/contains.json @@ -203,8 +203,8 @@ ], "valid": true, "skip": { - "v2": "6 errors in empty disjunction:\nconflicting values [\"foo\"] and {...} (mismatched types list and struct):\n generated.cue:3:1\n generated.cue:3:72\n instance.json:1:1\nconflicting values bool and [\"foo\"] (mismatched types bool and list):\n generated.cue:3:8\n instance.json:1:1\nconflicting values null and [\"foo\"] (mismatched types null and list):\n generated.cue:3:1\n instance.json:1:1\nconflicting values number and [\"foo\"] (mismatched types number and list):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and [\"foo\"] (mismatched types string and list):\n generated.cue:3:24\n instance.json:1:1\nexplicit error (_|_ literal) in source:\n generated.cue:3:58\n", - "v3": "6 errors in empty disjunction:\nconflicting values [\"foo\"] and bool (mismatched types list and bool):\n generated.cue:3:8\n instance.json:1:1\nconflicting values [\"foo\"] and null (mismatched types list and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values [\"foo\"] and number (mismatched types list and number):\n generated.cue:3:15\n instance.json:1:1\nconflicting values [\"foo\"] and string (mismatched types list and string):\n generated.cue:3:24\n instance.json:1:1\nconflicting values [\"foo\"] and {...} (mismatched types list and struct):\n generated.cue:3:72\n instance.json:1:1\nexplicit error (_|_ literal) in source:\n generated.cue:3:58\n" + "v2": "6 errors in empty disjunction:\nconflicting values null and [\"foo\"] (mismatched types null and list):\n generated.cue:3:1\n instance.json:1:1\nconflicting values bool and [\"foo\"] (mismatched types bool and list):\n generated.cue:3:8\n instance.json:1:1\nconflicting values number and [\"foo\"] (mismatched types number and list):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and [\"foo\"] (mismatched types string and list):\n generated.cue:3:24\n instance.json:1:1\nexplicit error (_|_ literal) in source:\n generated.cue:3:58\nconflicting values [\"foo\"] and {...} (mismatched types list and struct):\n generated.cue:3:1\n generated.cue:3:72\n instance.json:1:1\n", + "v3": "6 errors in empty disjunction:\nconflicting values [\"foo\"] and null (mismatched types list and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values [\"foo\"] and bool (mismatched types list and bool):\n generated.cue:3:8\n instance.json:1:1\nconflicting values [\"foo\"] and number (mismatched types list and number):\n generated.cue:3:15\n instance.json:1:1\nconflicting values [\"foo\"] and string (mismatched types list and string):\n generated.cue:3:24\n instance.json:1:1\nexplicit error (_|_ literal) in source:\n generated.cue:3:58\nconflicting values [\"foo\"] and {...} (mismatched types list and struct):\n generated.cue:3:72\n instance.json:1:1\n" } }, { diff --git a/encoding/jsonschema/testdata/external/tests/draft7/items.json b/encoding/jsonschema/testdata/external/tests/draft7/items.json index bd659ec70f9..cb3b8bd993e 100644 --- a/encoding/jsonschema/testdata/external/tests/draft7/items.json +++ b/encoding/jsonschema/testdata/external/tests/draft7/items.json @@ -77,8 +77,8 @@ ], "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": "6 errors in empty disjunction:\nconflicting 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" + "v2": "5 errors in empty disjunction:\nconflicting values null and [1] (mismatched types null and list):\n generated.cue:2:1\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 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\nconflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:54\n instance.json:1:1\n", + "v3": "6 errors in empty disjunction:\nconflicting values [1] and null (mismatched types list and null):\n generated.cue:2:1\n instance.json:1:1\nconflicting values [1] and bool (mismatched types list and bool):\n generated.cue:2:8\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\nincompatible list lengths (1 and 3):\n generated.cue:2:33\nconflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:2:54\n instance.json:1:1\n" } }, { @@ -95,8 +95,8 @@ "data": [], "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": "6 errors in empty disjunction:\nconflicting 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" + "v2": "5 errors in empty disjunction:\nconflicting values null and [] (mismatched types null and list):\n generated.cue:2:1\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 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\nconflicting values [] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:54\n instance.json:1:1\n", + "v3": "6 errors in empty disjunction:\nconflicting values [] and null (mismatched types list and null):\n generated.cue:2:1\n instance.json:1:1\nconflicting values [] and bool (mismatched types list and bool):\n generated.cue:2:8\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\nincompatible list lengths (0 and 3):\n generated.cue:2:33\nconflicting values [] and {...} (mismatched types list and struct):\n generated.cue:2:54\n instance.json:1:1\n" } }, { @@ -170,8 +170,8 @@ ], "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": "7 errors in empty disjunction:\nconflicting 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" + "v2": "5 errors in empty disjunction:\nconflicting values null and [1] (mismatched types null and list):\n generated.cue:2:1\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 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\nconflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:49\n instance.json:1:1\n", + "v3": "7 errors in empty disjunction:\nconflicting values [1] and null (mismatched types list and null):\n generated.cue:2:1\n instance.json:1:1\nconflicting values [1] and bool (mismatched types list and bool):\n generated.cue:2:8\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\nincompatible list lengths (1 and 3):\n generated.cue:2:33\nexplicit error (_|_ literal) in source:\n generated.cue:2:37\nconflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:2:49\n instance.json:1:1\n" } }, { @@ -187,8 +187,8 @@ "data": [], "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": "6 errors in empty disjunction:\nconflicting 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" + "v2": "5 errors in empty disjunction:\nconflicting values null and [] (mismatched types null and list):\n generated.cue:2:1\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 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\nconflicting values [] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:49\n instance.json:1:1\n", + "v3": "6 errors in empty disjunction:\nconflicting values [] and null (mismatched types list and null):\n generated.cue:2:1\n instance.json:1:1\nconflicting values [] and bool (mismatched types list and bool):\n generated.cue:2:8\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\nincompatible list lengths (0 and 3):\n generated.cue:2:33\nconflicting values [] and {...} (mismatched types list and struct):\n generated.cue:2:49\n instance.json:1:1\n" } } ] @@ -402,7 +402,7 @@ "valid": true, "skip": { "v2": "incompatible list lengths (2 and 3)\n0: incompatible list lengths (1 and 2)\n1: incompatible list lengths (1 and 2)\n", - "v3": "incompatible list lengths (2 and 3):\n generated.cue:2:1\n0: incompatible list lengths (1 and 2):\n generated.cue:9:8\n" + "v3": "0: incompatible list lengths (1 and 2):\n generated.cue:9:8\nincompatible list lengths (2 and 3):\n generated.cue:2:1\n" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft7/optional/format/date-time.json b/encoding/jsonschema/testdata/external/tests/draft7/optional/format/date-time.json index 6e7c7c5a344..ca676037c35 100644 --- a/encoding/jsonschema/testdata/external/tests/draft7/optional/format/date-time.json +++ b/encoding/jsonschema/testdata/external/tests/draft7/optional/format/date-time.json @@ -60,8 +60,8 @@ "data": "1998-12-31T23:59:60Z", "valid": true, "skip": { - "v2": "6 errors in empty disjunction:\nconflicting values \"1998-12-31T23:59:60Z\" and [...] (mismatched types string and list):\n generated.cue:3:1\n generated.cue:3:36\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and bool (mismatched types string and bool):\n generated.cue:3:1\n generated.cue:3:8\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and null (mismatched types string and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and number (mismatched types string and number):\n generated.cue:3:1\n generated.cue:3:15\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and {...} (mismatched types string and struct):\n generated.cue:3:1\n generated.cue:3:44\n instance.json:1:1\ninvalid value \"1998-12-31T23:59:60Z\" (does not satisfy time.Time): error in call to time.Time: invalid time \"1998-12-31T23:59:60Z\":\n generated.cue:1:1\n instance.json:1:1\n", - "v3": "6 errors in empty disjunction:\nconflicting values \"1998-12-31T23:59:60Z\" and [...] (mismatched types string and list):\n generated.cue:3:36\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and bool (mismatched types string and bool):\n generated.cue:3:8\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and null (mismatched types string and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and number (mismatched types string and number):\n generated.cue:3:15\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and {...} (mismatched types string and struct):\n generated.cue:3:44\n instance.json:1:1\ninvalid value \"1998-12-31T23:59:60Z\" (does not satisfy time.Time): error in call to time.Time: invalid time \"1998-12-31T23:59:60Z\":\n generated.cue:1:1\n instance.json:1:1\n" + "v2": "6 errors in empty disjunction:\nconflicting values \"1998-12-31T23:59:60Z\" and null (mismatched types string and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and bool (mismatched types string and bool):\n generated.cue:3:1\n generated.cue:3:8\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and number (mismatched types string and number):\n generated.cue:3:1\n generated.cue:3:15\n instance.json:1:1\ninvalid value \"1998-12-31T23:59:60Z\" (does not satisfy time.Time): error in call to time.Time: invalid time \"1998-12-31T23:59:60Z\":\n generated.cue:1:1\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and [...] (mismatched types string and list):\n generated.cue:3:1\n generated.cue:3:36\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and {...} (mismatched types string and struct):\n generated.cue:3:1\n generated.cue:3:44\n instance.json:1:1\n", + "v3": "6 errors in empty disjunction:\nconflicting values \"1998-12-31T23:59:60Z\" and null (mismatched types string and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and bool (mismatched types string and bool):\n generated.cue:3:8\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and number (mismatched types string and number):\n generated.cue:3:15\n instance.json:1:1\ninvalid value \"1998-12-31T23:59:60Z\" (does not satisfy time.Time): error in call to time.Time: invalid time \"1998-12-31T23:59:60Z\":\n generated.cue:1:1\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and [...] (mismatched types string and list):\n generated.cue:3:36\n instance.json:1:1\nconflicting values \"1998-12-31T23:59:60Z\" and {...} (mismatched types string and struct):\n generated.cue:3:44\n instance.json:1:1\n" } }, { @@ -69,8 +69,8 @@ "data": "1998-12-31T15:59:60.123-08:00", "valid": true, "skip": { - "v2": "6 errors in empty disjunction:\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and [...] (mismatched types string and list):\n generated.cue:3:1\n generated.cue:3:36\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and bool (mismatched types string and bool):\n generated.cue:3:1\n generated.cue:3:8\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and null (mismatched types string and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and number (mismatched types string and number):\n generated.cue:3:1\n generated.cue:3:15\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and {...} (mismatched types string and struct):\n generated.cue:3:1\n generated.cue:3:44\n instance.json:1:1\ninvalid value \"1998-12-31T15:59:60.123-08:00\" (does not satisfy time.Time): error in call to time.Time: invalid time \"1998-12-31T15:59:60.123-08:00\":\n generated.cue:1:1\n instance.json:1:1\n", - "v3": "6 errors in empty disjunction:\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and [...] (mismatched types string and list):\n generated.cue:3:36\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and bool (mismatched types string and bool):\n generated.cue:3:8\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and null (mismatched types string and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and number (mismatched types string and number):\n generated.cue:3:15\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and {...} (mismatched types string and struct):\n generated.cue:3:44\n instance.json:1:1\ninvalid value \"1998-12-31T15:59:60.123-08:00\" (does not satisfy time.Time): error in call to time.Time: invalid time \"1998-12-31T15:59:60.123-08:00\":\n generated.cue:1:1\n instance.json:1:1\n" + "v2": "6 errors in empty disjunction:\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and null (mismatched types string and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and bool (mismatched types string and bool):\n generated.cue:3:1\n generated.cue:3:8\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and number (mismatched types string and number):\n generated.cue:3:1\n generated.cue:3:15\n instance.json:1:1\ninvalid value \"1998-12-31T15:59:60.123-08:00\" (does not satisfy time.Time): error in call to time.Time: invalid time \"1998-12-31T15:59:60.123-08:00\":\n generated.cue:1:1\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and [...] (mismatched types string and list):\n generated.cue:3:1\n generated.cue:3:36\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and {...} (mismatched types string and struct):\n generated.cue:3:1\n generated.cue:3:44\n instance.json:1:1\n", + "v3": "6 errors in empty disjunction:\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and null (mismatched types string and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and bool (mismatched types string and bool):\n generated.cue:3:8\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and number (mismatched types string and number):\n generated.cue:3:15\n instance.json:1:1\ninvalid value \"1998-12-31T15:59:60.123-08:00\" (does not satisfy time.Time): error in call to time.Time: invalid time \"1998-12-31T15:59:60.123-08:00\":\n generated.cue:1:1\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and [...] (mismatched types string and list):\n generated.cue:3:36\n instance.json:1:1\nconflicting values \"1998-12-31T15:59:60.123-08:00\" and {...} (mismatched types string and struct):\n generated.cue:3:44\n instance.json:1:1\n" } }, { @@ -117,8 +117,8 @@ "data": "1963-06-19t08:30:06.283185z", "valid": true, "skip": { - "v2": "6 errors in empty disjunction:\nconflicting values \"1963-06-19t08:30:06.283185z\" and [...] (mismatched types string and list):\n generated.cue:3:1\n generated.cue:3:36\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and bool (mismatched types string and bool):\n generated.cue:3:1\n generated.cue:3:8\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and null (mismatched types string and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and number (mismatched types string and number):\n generated.cue:3:1\n generated.cue:3:15\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and {...} (mismatched types string and struct):\n generated.cue:3:1\n generated.cue:3:44\n instance.json:1:1\ninvalid value \"1963-06-19t08:30:06.283185z\" (does not satisfy time.Time): error in call to time.Time: invalid time \"1963-06-19t08:30:06.283185z\":\n generated.cue:1:1\n instance.json:1:1\n", - "v3": "6 errors in empty disjunction:\nconflicting values \"1963-06-19t08:30:06.283185z\" and [...] (mismatched types string and list):\n generated.cue:3:36\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and bool (mismatched types string and bool):\n generated.cue:3:8\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and null (mismatched types string and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and number (mismatched types string and number):\n generated.cue:3:15\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and {...} (mismatched types string and struct):\n generated.cue:3:44\n instance.json:1:1\ninvalid value \"1963-06-19t08:30:06.283185z\" (does not satisfy time.Time): error in call to time.Time: invalid time \"1963-06-19t08:30:06.283185z\":\n generated.cue:1:1\n instance.json:1:1\n" + "v2": "6 errors in empty disjunction:\nconflicting values \"1963-06-19t08:30:06.283185z\" and null (mismatched types string and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and bool (mismatched types string and bool):\n generated.cue:3:1\n generated.cue:3:8\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and number (mismatched types string and number):\n generated.cue:3:1\n generated.cue:3:15\n instance.json:1:1\ninvalid value \"1963-06-19t08:30:06.283185z\" (does not satisfy time.Time): error in call to time.Time: invalid time \"1963-06-19t08:30:06.283185z\":\n generated.cue:1:1\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and [...] (mismatched types string and list):\n generated.cue:3:1\n generated.cue:3:36\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and {...} (mismatched types string and struct):\n generated.cue:3:1\n generated.cue:3:44\n instance.json:1:1\n", + "v3": "6 errors in empty disjunction:\nconflicting values \"1963-06-19t08:30:06.283185z\" and null (mismatched types string and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and bool (mismatched types string and bool):\n generated.cue:3:8\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and number (mismatched types string and number):\n generated.cue:3:15\n instance.json:1:1\ninvalid value \"1963-06-19t08:30:06.283185z\" (does not satisfy time.Time): error in call to time.Time: invalid time \"1963-06-19t08:30:06.283185z\":\n generated.cue:1:1\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and [...] (mismatched types string and list):\n generated.cue:3:36\n instance.json:1:1\nconflicting values \"1963-06-19t08:30:06.283185z\" and {...} (mismatched types string and struct):\n generated.cue:3:44\n instance.json:1:1\n" } }, { diff --git a/encoding/jsonschema/testdata/external/tests/draft7/propertyNames.json b/encoding/jsonschema/testdata/external/tests/draft7/propertyNames.json index ea6b2f222ca..f4004b7dc23 100644 --- a/encoding/jsonschema/testdata/external/tests/draft7/propertyNames.json +++ b/encoding/jsonschema/testdata/external/tests/draft7/propertyNames.json @@ -154,7 +154,7 @@ "data": {}, "valid": true, "skip": { - "v3": "6 errors in empty disjunction:\nconflicting values [...] and {} (mismatched types list and struct):\n generated.cue:2:33\n instance.json:1:1\nconflicting values bool and {} (mismatched types bool and struct):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and {} (mismatched types null and struct):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and {} (mismatched types number and struct):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and {} (mismatched types string and struct):\n generated.cue:2:24\n instance.json:1:1\nexplicit error (_|_ literal) in source:\n generated.cue:3:3\n" + "v3": "6 errors in empty disjunction:\nconflicting values null and {} (mismatched types null and struct):\n generated.cue:2:1\n instance.json:1:1\nconflicting values bool and {} (mismatched types bool and struct):\n generated.cue:2:8\n instance.json:1:1\nconflicting values number and {} (mismatched types number and struct):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and {} (mismatched types string and struct):\n generated.cue:2:24\n instance.json:1:1\nconflicting values [...] and {} (mismatched types list and struct):\n generated.cue:2:33\n instance.json:1:1\nexplicit error (_|_ literal) in source:\n generated.cue:3:3\n" } } ] diff --git a/encoding/jsonschema/testdata/txtar/oneOfWithMatchNField.txtar b/encoding/jsonschema/testdata/txtar/oneOfWithMatchNField.txtar index 316dfcaf641..f403546592b 100644 --- a/encoding/jsonschema/testdata/txtar/oneOfWithMatchNField.txtar +++ b/encoding/jsonschema/testdata/txtar/oneOfWithMatchNField.txtar @@ -27,13 +27,13 @@ the matchN builtin. -- test/err-nomatch.json -- {"matchN": 3} -- out/decode/testerr/err-nomatch -- +matchN: invalid value 3 (does not satisfy matchN): 0 matched, expected 1: + generated.cue:1:12 + generated.cue:1:19 + test/err-nomatch.json:1:12 matchN: conflicting values 1 and 3: generated.cue:1:23 test/err-nomatch.json:1:12 matchN: conflicting values 2 and 3: generated.cue:1:26 test/err-nomatch.json:1:12 -matchN: invalid value 3 (does not satisfy matchN): 0 matched, expected 1: - generated.cue:1:12 - generated.cue:1:19 - test/err-nomatch.json:1:12 diff --git a/internal/buildattr/buildattr_test.go b/internal/buildattr/buildattr_test.go index e5f203f369d..0b3791feb77 100644 --- a/internal/buildattr/buildattr_test.go +++ b/internal/buildattr/buildattr_test.go @@ -88,10 +88,10 @@ package something `, wantOK: false, wantAttr: "@if(foo)", - wantError: `previous declaration here: - testfile.cue:3:1 -multiple @if attributes: + wantError: `multiple @if attributes: testfile.cue:4:1 +previous declaration here: + testfile.cue:3:1 `, }, { testName: "MultipleIfAttributesWithOneAfterPackage", @@ -292,10 +292,10 @@ package something package something `, wantOK: false, - wantError: `previous declaration here: - testfile.cue:2:1 -multiple @if attributes: + wantError: `multiple @if attributes: testfile.cue:3:1 +previous declaration here: + testfile.cue:2:1 `, wantAttr: "@if(foo)", }, { diff --git a/pkg/encoding/json/testdata/gen.txtar b/pkg/encoding/json/testdata/gen.txtar index aeba97a1480..9820a8bca9a 100644 --- a/pkg/encoding/json/testdata/gen.txtar +++ b/pkg/encoding/json/testdata/gen.txtar @@ -95,10 +95,10 @@ validate.t2.result: error in call to encoding/json.Validate: invalid value 10 (o ./in.cue:6:10 ./in.cue:9:27 json.Validate:1:6 -unmarshal.trailingInvalid.#result: error in call to encoding/json.Unmarshal: json: invalid JSON: - ./in.cue:42:11 unmarshal.trailingValid.#result: error in call to encoding/json.Unmarshal: json: invalid JSON: ./in.cue:42:11 +unmarshal.trailingInvalid.#result: error in call to encoding/json.Unmarshal: json: invalid JSON: + ./in.cue:42:11 Result: import "encoding/json" diff --git a/pkg/encoding/yaml/testdata/validate.txtar b/pkg/encoding/yaml/testdata/validate.txtar index d076824f96f..519cbf0f113 100644 --- a/pkg/encoding/yaml/testdata/validate.txtar +++ b/pkg/encoding/yaml/testdata/validate.txtar @@ -36,10 +36,6 @@ missing position Errors: #test.t1.ok1: cannot call non-function fn (type _): ./in.cue:8:11 -validate.t1.ok1: invalid value "a: 2" (does not satisfy encoding/yaml.Validate): error in call to encoding/yaml.Validate: incomplete value {a:2} | {a:2,b!:int}: - ./in.cue:8:11 - ./in.cue:6:9 - ./in.cue:7:16 #test.t1.ok2: cannot call non-function fn (type _): ./in.cue:9:11 #test.t1.ok3: cannot call non-function fn (type _): @@ -48,6 +44,10 @@ validate.t1.ok1: invalid value "a: 2" (does not satisfy encoding/yaml.Validate): ./in.cue:17:11 #test.t2.ok2: cannot call non-function fn (type _): ./in.cue:18:11 +validate.t1.ok1: invalid value "a: 2" (does not satisfy encoding/yaml.Validate): error in call to encoding/yaml.Validate: incomplete value {a:2} | {a:2,b!:int}: + ./in.cue:8:11 + ./in.cue:6:9 + ./in.cue:7:16 Result: import "encoding/yaml" diff --git a/pkg/list/testdata/list.txtar b/pkg/list/testdata/list.txtar index 05d4b18e8be..a19f003386c 100644 --- a/pkg/list/testdata/list.txtar +++ b/pkg/list/testdata/list.txtar @@ -74,11 +74,11 @@ reverse: { Errors: repeat.t8.v: error in call to list.Repeat: negative count: ./in.cue:4:30 +concat.t7.v: cannot use 1 (type int) as list in argument 1 to list.Concat: + ./in.cue:30:9 concat.t8.v: error in call to list.Concat: cannot use value 1 (type int) as list: ./in.cue:19:22 ./in.cue:31:10 -concat.t7.v: cannot use 1 (type int) as list in argument 1 to list.Concat: - ./in.cue:30:9 minItems.fail1: invalid value [] (does not satisfy list.MinItems(1)): len(list) < MinItems(1) (0 < 1): ./in.cue:45:12 ./in.cue:45:26 diff --git a/pkg/list/testdata/unique.txtar b/pkg/list/testdata/unique.txtar index b7a99392593..547c4044a29 100644 --- a/pkg/list/testdata/unique.txtar +++ b/pkg/list/testdata/unique.txtar @@ -79,21 +79,21 @@ fail: structOrderIrrelevant: [close({ })] -- out/list-v3 -- Errors: +fail.ints: invalid value [1,2,1] (does not satisfy list.UniqueItems): equal value (1) at position 0 and 2: + ./in.cue:3:21 + ./in.cue:44:8 +fail.structs: invalid value [~(#a),~(#a)] (does not satisfy list.UniqueItems): equal values at position 0 and 1: + ./in.cue:3:21 + ./in.cue:45:11 fail.ignoreHidden: invalid value [1,1] (does not satisfy list.UniqueItems): equal value (1) at position 0 and 1: ./in.cue:3:21 ./in.cue:48:16 fail.ignoreOptError: invalid value [~(#a),~(#abErr)] (does not satisfy list.UniqueItems): equal values at position 0 and 1: ./in.cue:3:21 ./in.cue:52:18 -fail.ints: invalid value [1,2,1] (does not satisfy list.UniqueItems): equal value (1) at position 0 and 2: - ./in.cue:3:21 - ./in.cue:44:8 fail.structOrderIrrelevant: invalid value [{b:1,a:0},{a:0,b:1}] (does not satisfy list.UniqueItems): equal values at position 0 and 1: ./in.cue:3:21 ./in.cue:72:30 -fail.structs: invalid value [~(#a),~(#a)] (does not satisfy list.UniqueItems): equal values at position 0 and 1: - ./in.cue:3:21 - ./in.cue:45:11 Result: import "list" @@ -254,18 +254,18 @@ diff old new // these values here via close(), which gives the same behaviour -- out/list -- Errors: -fail.ignoreHidden: invalid value [1,1] (does not satisfy list.UniqueItems): equal value (1) at position 0 and 1: - ./in.cue:3:21 - ./in.cue:48:16 fail.ints: invalid value [1,2,1] (does not satisfy list.UniqueItems): equal value (1) at position 0 and 2: ./in.cue:3:21 ./in.cue:44:8 -fail.structOrderIrrelevant: invalid value [{b:1,a:0},{a:0,b:1}] (does not satisfy list.UniqueItems): equal values at position 0 and 1: - ./in.cue:3:21 - ./in.cue:72:30 fail.structs: invalid value [{a:1},{a:1}] (does not satisfy list.UniqueItems): equal values at position 0 and 1: ./in.cue:3:21 ./in.cue:45:11 +fail.ignoreHidden: invalid value [1,1] (does not satisfy list.UniqueItems): equal value (1) at position 0 and 1: + ./in.cue:3:21 + ./in.cue:48:16 +fail.structOrderIrrelevant: invalid value [{b:1,a:0},{a:0,b:1}] (does not satisfy list.UniqueItems): equal values at position 0 and 1: + ./in.cue:3:21 + ./in.cue:72:30 Result: import "list" diff --git a/pkg/net/testdata/gen.txtar b/pkg/net/testdata/gen.txtar index 28023c57a9b..710c53c012f 100644 --- a/pkg/net/testdata/gen.txtar +++ b/pkg/net/testdata/gen.txtar @@ -39,9 +39,22 @@ t33: net.AbsURL & "https://foo.com/bar" t34: net.AbsURL & "%" -- out/net -- Errors: +t7: error in call to net.JoinHostPort: invalid host [192, 30, 4]: + ./in.cue:9:6 +t9: invalid value "23.23.23.2333" (does not satisfy net.IPv4): + ./in.cue:11:6 + ./in.cue:11:17 +t13: invalid value "ff02::1:3" (does not satisfy net.IPv4): + ./in.cue:15:6 + ./in.cue:15:19 +t20: error in call to net.IPCIDR: netip.ParsePrefix("172.16.12.3"): no '/': + ./in.cue:22:6 t25: invalid value "2001:db8::1234567" (does not satisfy net.IPv6): ./in.cue:27:6 ./in.cue:27:17 +t27: invalid value "23.23.23.23" (does not satisfy net.IPv6): + ./in.cue:29:6 + ./in.cue:29:19 t30: invalid value "%" (does not satisfy net.URL): error in call to net.URL: parse "%": invalid URL escape "%": ./in.cue:32:6 ./in.cue:32:16 @@ -51,19 +64,6 @@ t32: invalid value "/foo/bar" (does not satisfy net.AbsURL): error in call to ne t34: invalid value "%" (does not satisfy net.AbsURL): error in call to net.AbsURL: parse "%": invalid URL escape "%": ./in.cue:36:6 ./in.cue:36:19 -t9: invalid value "23.23.23.2333" (does not satisfy net.IPv4): - ./in.cue:11:6 - ./in.cue:11:17 -t7: error in call to net.JoinHostPort: invalid host [192, 30, 4]: - ./in.cue:9:6 -t13: invalid value "ff02::1:3" (does not satisfy net.IPv4): - ./in.cue:15:6 - ./in.cue:15:19 -t20: error in call to net.IPCIDR: netip.ParsePrefix("172.16.12.3"): no '/': - ./in.cue:22:6 -t27: invalid value "23.23.23.23" (does not satisfy net.IPv6): - ./in.cue:29:6 - ./in.cue:29:19 Result: t1: "foo.bar." diff --git a/pkg/regexp/testdata/gen.txtar b/pkg/regexp/testdata/gen.txtar index 988bbd59308..e8a407b9377 100644 --- a/pkg/regexp/testdata/gen.txtar +++ b/pkg/regexp/testdata/gen.txtar @@ -25,9 +25,6 @@ t15: regexp.ReplaceAllLiteral(#"f(?P\w)(?P\w)"#, "afloat afoot from", "-${ t16: regexp.ReplaceAllLiteral(#"f(?P\w)(?P\w)"#, "afloat afoot from", "-$1-$2-") -- out/regexp -- Errors: -t13: invalid value "invalid)" (does not satisfy regexp.Valid): error in call to regexp.Valid: error parsing regexp: unexpected ): `invalid)`: - ./in.cue:15:6 - ./in.cue:15:21 t2: error in call to regexp.Find: no match: ./in.cue:4:6 t4: error in call to regexp.FindAll: no match: @@ -36,6 +33,9 @@ t7: error in call to regexp.FindAllSubmatch: no match: ./in.cue:9:6 t11: error in call to regexp.FindAllNamedSubmatch: no match: ./in.cue:13:6 +t13: invalid value "invalid)" (does not satisfy regexp.Valid): error in call to regexp.Valid: error parsing regexp: unexpected ): `invalid)`: + ./in.cue:15:6 + ./in.cue:15:21 Result: t1: "foo"