cue/load: include module file in build.Instance

This makes the module file, including dependency and
language version info, available to `cue/load.Instances`
callers.

Signed-off-by: Roger Peppe <[email protected]>
Change-Id: I4f9a955dd30c1564ae0d73d91f9282ebff1c4c34
Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/1217063
Unity-Result: CUE porcuepine <[email protected]>
Reviewed-by: Daniel Martí <[email protected]>
Reviewed-by: Marcel van Lohuizen <[email protected]>
TryBot-Result: CUEcueckoo <[email protected]>

Author: rogpeppe

cue/build/instance.go

@@ -26,6 +26,7 @@ import (
 	"cuelang.org/go/cue/errors"
 	"cuelang.org/go/cue/parser"
 	"cuelang.org/go/cue/token"
+	"cuelang.org/go/internal/mod/modfiledata"
 )
 
 // An Instance describes the collection of files, and its imports, necessary
@@ -80,6 +81,9 @@ type Instance struct {
 	// imported by other packages, including those within the module.
 	Module string
 
+	// ModuleFile holds the actual module file data, if available.
+	ModuleFile *modfiledata.File
+
 	// Root is the root of the directory hierarchy, it may be "" if this an
 	// instance has no imports.
 	// If Module != "", this corresponds to the module root.

cue/load/config.go

@@ -472,6 +472,7 @@ func (c *Config) newErrInstance(err error) *build.Instance {
 	i := c.Context.NewInstance("", nil)
 	i.Root = c.ModuleRoot
 	i.Module = c.Module
+	i.ModuleFile = c.modFile
 	i.Err = errors.Promote(err, "")
 	return i
 }

cue/load/import.go

@@ -317,6 +317,7 @@ func (l *loader) newRelInstance(pos token.Pos, path, pkgName string) *build.Inst
 	// p.ImportPath = string(dir) // compute unique ID.
 	p.Root = l.cfg.ModuleRoot
 	p.Module = l.cfg.Module
+	p.ModuleFile = l.cfg.modFile
 
 	var err errors.Error
 	if path != cleanImport(path) {
@@ -402,6 +403,7 @@ func (l *loader) newInstance(pos token.Pos, p importPath) *build.Instance {
 	i.ImportPath = string(p)
 	i.Root = l.cfg.ModuleRoot
 	i.Module = modPath
+	i.ModuleFile = l.cfg.modFile
 
 	return i
 }

cue/load/loader_common.go

@@ -248,6 +248,7 @@ func (fp *fileProcessor) add(root string, file *build.File, mode importMode) {
 			q.ImportPath = p.ImportPath + ":" + pkg
 			q.Root = p.Root
 			q.Module = p.Module
+			q.ModuleFile = p.ModuleFile
 			fp.pkgs[pkg] = q
 		}
 		p = q

cue/load/module_test.go

@@ -102,6 +102,12 @@ func TestModuleFetch(t *testing.T) {
 			})
 			return
 		}
+		if inst.Module != "" {
+			// Sanity check that the module file is present in the instance.
+			qt.Assert(t, qt.Not(qt.IsNil(inst.ModuleFile)))
+			qt.Assert(t, qt.Equals(inst.ModuleFile.Module, inst.Module))
+			qt.Assert(t, qt.Equals(inst.ModuleFile.Language.Version, "v0.8.0"))
+		}
 		v := ctx.BuildInstance(inst)
 		if err := v.Validate(); err != nil {
 			t.Fatal(err)