internal/core/runtime: validate imports in package-less files too

mvdan · mvdan · commit 45bcd349e007 · 2025-05-08T09:07:52.000Z
Back in 2021, the patch https://cue-review.googlesource.com/c/cue/+/8925 fixed the bug at https://cuelang.org/issue/736 where a `cue eval` of CUE files belonging to a package could resolve references declared in files with an anonymous package. However, the fix went too far; it also removed the use of resolveFile for CUE files belonging to anonymous packages. resolveFile turns out to be responsible for reporting various errors relating to imports, such as them being unused, unknown in std, or redeclaring fields. Since none of that relates to resolving references between CUE files, tweak the logic so that resolveFile runs for anonymous package files. Given that the original patch from 2021 added tests that still pass, and we just added test that lock in the behavior for import errors on files with named and anonymous package clauses, this seems fine. The logic around "resolve files" should be cleaned up in the future, which is already tracked with TODOs in the runtime and compile packages. Fixes #1850. Signed-off-by: Daniel Martí <mvdan@mvdan.cc> Change-Id: I0e7ad266db7bd839784439c2cd4d13df29256c45 Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/1214605 Unity-Result: CUE porcuepine <cue.porcuepine@gmail.com> TryBot-Result: CUEcueckoo <cueckoo@cuelang.org> Reviewed-by: Matthew Sackman <matthew@cue.works>
diff --git a/cmd/cue/cmd/testdata/script/eval_import_bad.txtar b/cmd/cue/cmd/testdata/script/eval_import_bad.txtar
@@ -5,7 +5,6 @@
 ! exec cue export named.cue
 cmpenv stderr named.stderr
 
-# TODO: this should report "redeclared as imported package" too; see https://cuelang.org/issue/1850
 ! exec cue export missing.cue
 cmpenv stderr missing.stderr
 
@@ -30,3 +29,6 @@ list: 123
 -- missing.stderr --
 builtin package "notinstd" undefined:
     ./missing.cue:1:8
+list redeclared as imported package name
+	previous declaration at ${WORK}${/}missing.cue:4:1:
+    ./missing.cue:2:8
diff --git a/cmd/cue/cmd/testdata/script/eval_import_unused.txtar b/cmd/cue/cmd/testdata/script/eval_import_unused.txtar
@@ -7,15 +7,11 @@ cmp stderr named.stderr
 ! exec cue export renamed.cue
 cmp stderr renamed.stderr
 
-# TODO: these should fail; see https://cuelang.org/issue/1850
+! exec cue export missing.cue
+cmp stderr missing.stderr
 
-exec cue export missing.cue
-# ! exec cue export missing.cue
-# cmp stderr missing.stderr
-
-exec cue export underscore.cue
-# ! exec cue export underscore.cue
-# cmp stderr underscore.stderr
+! exec cue export underscore.cue
+cmp stderr underscore.stderr
 
 -- named.cue --
 package p
@@ -40,10 +36,14 @@ import "list"
 
 out: 123
 -- missing.stderr --
+imported and not used: "list":
+    ./missing.cue:1:8
 -- underscore.cue --
 package _
 
 import "list"
 
 out: 123
 -- underscore.stderr --
+imported and not used: "list":
+    ./underscore.cue:3:8
diff --git a/cmd/cue/cmd/testdata/script/eval_resolve.txtar b/cmd/cue/cmd/testdata/script/eval_resolve.txtar
@@ -71,10 +71,8 @@ nodes: [{
 }]
 
 -- check.cue --
-import "list"
-
 #map: {for n in nodes {"\(n.name)": n}}
 
 -- out-stderr --
 #map: reference "nodes" not found:
-    ./check.cue:3:17
+    ./check.cue:1:17
diff --git a/cue/testdata/benchmarks/issue2176.txtar b/cue/testdata/benchmarks/issue2176.txtar
@@ -12,7 +12,6 @@ Disjuncts:    3820
 -- in.cue --
 import (
 	"strings"
-	"strconv"
 	"list"
 )
 
@@ -115,17 +114,17 @@ Disjuncts:    1475
       length: (int){ int }
       position: (_|_){
         // [incomplete] #Datastream.marker.position.characters: error in call to strings.Split: non-concrete value string:
-        //     ./in.cue:14:21
-        //     ./in.cue:9:11
+        //     ./in.cue:13:21
+        //     ./in.cue:8:11
         let characters#1 = (_|_){
           // [incomplete] #Datastream.marker.position.characters: error in call to strings.Split: non-concrete value string:
-          //     ./in.cue:14:21
-          //     ./in.cue:9:11
+          //     ./in.cue:13:21
+          //     ./in.cue:8:11
         }
         let unique_combinations#2 = (_|_){
           // [incomplete] #Datastream.marker.position.characters: error in call to strings.Split: non-concrete value string:
-          //     ./in.cue:14:21
-          //     ./in.cue:9:11
+          //     ./in.cue:13:21
+          //     ./in.cue:8:11
           let combination#3multi = 〈import;list〉.Slice(〈3;let characters#1〉, ((〈1;i〉 - 〈4;length〉) + 1), (〈1;i〉 + 1))
         }
       }
@@ -140,8 +139,8 @@ Disjuncts:    1475
       length: (int){ int }
       position: (_|_){
         // [incomplete] datastream.marker.position.unique_combinations: non-concrete value int in operand to -:
-        //     ./in.cue:17:36
-        //     ./in.cue:12:11
+        //     ./in.cue:16:36
+        //     ./in.cue:11:11
         let characters#1 = (#list){
           0: (string){ "m" }
           1: (string){ "j" }
@@ -176,8 +175,8 @@ Disjuncts:    1475
         }
         let unique_combinations#2 = (_|_){
           // [incomplete] datastream.marker.position.unique_combinations: non-concrete value int in operand to -:
-          //     ./in.cue:17:36
-          //     ./in.cue:12:11
+          //     ./in.cue:16:36
+          //     ./in.cue:11:11
           let combination#3multi = 〈import;list〉.Slice(〈3;let characters#1〉, ((〈1;i〉 - 〈4;length〉) + 1), (〈1;i〉 + 1))
         }
       }
@@ -523,8 +522,8 @@ diff old new
 --- old
 +++ new
 @@ -12,13 +12,11 @@
-           //     ./in.cue:14:21
-           //     ./in.cue:9:11
+           //     ./in.cue:13:21
+           //     ./in.cue:8:11
          }
 -        let unique_combinations#2multi = {
 -          for i, _ in 〈1;let characters#1〉 if (〈0;i〉 >= (〈3;length〉 - 1)) {
@@ -535,8 +534,8 @@ diff old new
 -          }
 +        let unique_combinations#2 = (_|_){
 +          // [incomplete] #Datastream.marker.position.characters: error in call to strings.Split: non-concrete value string:
-+          //     ./in.cue:14:21
-+          //     ./in.cue:9:11
++          //     ./in.cue:13:21
++          //     ./in.cue:8:11
 +          let combination#3multi = 〈import;list〉.Slice(〈3;let characters#1〉, ((〈1;i〉 - 〈4;length〉) + 1), (〈1;i〉 + 1))
          }
        }
@@ -554,8 +553,8 @@ diff old new
 -          }
 +        let unique_combinations#2 = (_|_){
 +          // [incomplete] datastream.marker.position.unique_combinations: non-concrete value int in operand to -:
-+          //     ./in.cue:17:36
-+          //     ./in.cue:12:11
++          //     ./in.cue:16:36
++          //     ./in.cue:11:11
 +          let combination#3multi = 〈import;list〉.Slice(〈3;let characters#1〉, ((〈1;i〉 - 〈4;length〉) + 1), (〈1;i〉 + 1))
          }
        }
@@ -854,12 +853,12 @@ let unique_combinations: not marked as multi. Seems benign, but should be fixed.
       length: (int){ int }
       position: (_|_){
         // [incomplete] #Datastream.marker.position.characters: error in call to strings.Split: non-concrete value string:
-        //     ./in.cue:14:21
-        //     ./in.cue:9:11
+        //     ./in.cue:13:21
+        //     ./in.cue:8:11
         let characters#1 = (_|_){
           // [incomplete] #Datastream.marker.position.characters: error in call to strings.Split: non-concrete value string:
-          //     ./in.cue:14:21
-          //     ./in.cue:9:11
+          //     ./in.cue:13:21
+          //     ./in.cue:8:11
         }
         let unique_combinations#2multi = {
           for i, _ in 〈1;let characters#1〉 if (〈0;i〉 >= (〈3;length〉 - 1)) {
@@ -881,8 +880,8 @@ let unique_combinations: not marked as multi. Seems benign, but should be fixed.
       length: (int){ int }
       position: (_|_){
         // [incomplete] datastream.marker.position.unique_combinations: non-concrete value int in operand to -:
-        //     ./in.cue:17:36
-        //     ./in.cue:12:11
+        //     ./in.cue:16:36
+        //     ./in.cue:11:11
         let characters#1 = (#list){
           0: (string){ "m" }
           1: (string){ "j" }
diff --git a/cue/testdata/builtins/default.txtar b/cue/testdata/builtins/default.txtar
@@ -1,10 +1,4 @@
 -- in.cue --
-import (
-	"list"
-	"strings"
-	"text/template"
-)
-
 Len: len(*[1, 2, 3] | 0)
 Close: close(*{} | 0)
 And: and(*[1, 1] | int)
diff --git a/cue/testdata/comprehensions/pushdown.txtar b/cue/testdata/comprehensions/pushdown.txtar
@@ -739,8 +739,6 @@ errorPropagation: {
 }
 
 -- issue2131.cue --
-import "path"
-
 issue2131: tests: {
 	windows: {
 		eg1: in: #"c:\d"#
diff --git a/cue/testdata/cycle/self.txtar b/cue/testdata/cycle/self.txtar
@@ -9,12 +9,12 @@ expr: error2: {
 	a: a + 1
 	a: 3
 }
-list: error1: {
+listConcat: error1: {
 	a: ["1", "2"]
 	a: list.Concat([a, ["3"]])
 }
 
-list: error2: {
+listConcat: error2: {
 	a: list.Concat([["3"], a])
 	a: ["1", "2"]
 }
@@ -309,7 +309,7 @@ Result:
       }
     }
   }
-  list: (_|_){
+  listConcat: (_|_){
     // [structural cycle]
     error1: (_|_){
       // [structural cycle]
@@ -723,7 +723,7 @@ Result:
       }
     }
   }
-  list: (_|_){
+  listConcat: (_|_){
     // [structural cycle]
     error1: (_|_){
       // [structural cycle]
@@ -1061,7 +1061,7 @@ Result:
       a: 3
     }
   }
-  list: {
+  listConcat: {
     error1: {
       a: [
         "1",
@@ -1075,7 +1075,7 @@ Result:
       ])
     }
   }
-  list: {
+  listConcat: {
     error2: {
       a: 〈import;list〉.Concat([
         [
diff --git a/internal/core/export/testdata/main/num.txtar b/internal/core/export/testdata/main/num.txtar
@@ -1,6 +1,4 @@
 -- in.cue --
-import "strings"
-
 floats: {
 	a: 3.0
 	b: float & 3.0
diff --git a/internal/core/export/testdata/selfcontained/splitcomprehension.txtar b/internal/core/export/testdata/selfcontained/splitcomprehension.txtar
@@ -3,8 +3,6 @@
 // TODO: merge output structs.
 
 -- in.cue --
-import "encoding/yaml"
-
 for key, value in { test: 1 } {
 	("a"): b: k1: key
 	("a"): b: v1: value
diff --git a/internal/core/runtime/resolve.go b/internal/core/runtime/resolve.go
@@ -43,9 +43,6 @@ func (r *Runtime) ResolveFiles(p *build.Instance) (errs errors.Error) {
 		}
 	}
 	for _, f := range p.Files {
-		if f.PackageName() == "" {
-			continue
-		}
 		err := resolveFile(idx, f, p, allFields)
 		errs = errors.Append(errs, err)
 	}

Original file line number	Diff line number	Diff line change
`@@ -739,8 +739,6 @@ errorPropagation: {`
`739`	`739`	`}`
`740`	`740`
`741`	`741`	`-- issue2131.cue --`
`742`		`-import "path"`
`743`		`-`
`744`	`742`	`issue2131: tests: {`
`745`	`743`	`windows: {`
`746`	`744`	`eg1: in: #"c:\d"#`
Original file line number	Diff line number	Diff line change
`@@ -9,12 +9,12 @@ expr: error2: {`
`9`	`9`	`a: a + 1`
`10`	`10`	`a: 3`
`11`	`11`	`}`
`12`		`-list: error1: {`
	`12`	`+listConcat: error1: {`
`13`	`13`	`a: ["1", "2"]`
`14`	`14`	`a: list.Concat([a, ["3"]])`
`15`	`15`	`}`
`16`	`16`
`17`		`-list: error2: {`
	`17`	`+listConcat: error2: {`
`18`	`18`	`a: list.Concat([["3"], a])`
`19`	`19`	`a: ["1", "2"]`
`20`	`20`	`}`
`@@ -309,7 +309,7 @@ Result:`
`309`	`309`	`}`
`310`	`310`	`}`
`311`	`311`	`}`
`312`		`- list: (_\|_){`
	`312`	`+ listConcat: (_\|_){`
`313`	`313`	`// [structural cycle]`
`314`	`314`	`error1: (_\|_){`
`315`	`315`	`// [structural cycle]`
`@@ -723,7 +723,7 @@ Result:`
`723`	`723`	`}`
`724`	`724`	`}`
`725`	`725`	`}`
`726`		`- list: (_\|_){`
	`726`	`+ listConcat: (_\|_){`
`727`	`727`	`// [structural cycle]`
`728`	`728`	`error1: (_\|_){`
`729`	`729`	`// [structural cycle]`
`@@ -1061,7 +1061,7 @@ Result:`
`1061`	`1061`	`a: 3`
`1062`	`1062`	`}`
`1063`	`1063`	`}`
`1064`		`- list: {`
	`1064`	`+ listConcat: {`
`1065`	`1065`	`error1: {`
`1066`	`1066`	`a: [`
`1067`	`1067`	`"1",`
`@@ -1075,7 +1075,7 @@ Result:`
`1075`	`1075`	`])`
`1076`	`1076`	`}`
`1077`	`1077`	`}`
`1078`		`- list: {`
	`1078`	`+ listConcat: {`
`1079`	`1079`	`error2: {`
`1080`	`1080`	`a: 〈import;list〉.Concat([`
`1081`	`1081`	`[`
Original file line number	Diff line number	Diff line change
`@@ -43,9 +43,6 @@ func (r Runtime) ResolveFiles(p build.Instance) (errs errors.Error) {`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`	`for _, f := range p.Files {`
`46`		`- if f.PackageName() == "" {`
`47`		`- continue`
`48`		`- }`
`49`	`46`	`err := resolveFile(idx, f, p, allFields)`
`50`	`47`	`errs = errors.Append(errs, err)`
`51`	`48`	`}`