lang: Pass through the Fs and the FsURI

This should give us options as to how a function should interact with an
FS. I feel like it's cleaner to go through the World API, and passing in
the FsURI lets us do that, but I passed in the Fs at the same time in
case it's useful for some reason. I think using it is a boundary
violation, but it's just a hunch. Does anything break when we move from
one deploy to the next?

lang/gapi.go

@@ -234,7 +234,9 @@ func (obj *GAPI) Cli(cliInfo *gapi.CliInfo) (*gapi.Deploy, error) {
 	logf("init...")
 	// init and validate the structure of the AST
 	data := &interfaces.Data{
+		// TODO: add missing fields here if/when needed
 		Fs:         localFs,       // the local fs!
+		FsURI:      localFs.URI(), // TODO: is this right?
 		Base:       output.Base,   // base dir (absolute path) that this is rooted in
 		Files:      output.Files,
 		Imports:    importVertex,
@@ -415,6 +417,7 @@ func (obj *GAPI) LangInit() error {
 
 	obj.lang = &Lang{
 		Fs:    fs,
+		FsURI: obj.InputURI,
 		Input: input,
 
 		Hostname: obj.data.Hostname,
@@ -671,7 +674,9 @@ func (obj *GAPI) Get(getInfo *gapi.GetInfo) error {
 	logf("init...")
 	// init and validate the structure of the AST
 	data := &interfaces.Data{
+		// TODO: add missing fields here if/when needed
 		Fs:         localFs,       // the local fs!
+		FsURI:      localFs.URI(), // TODO: is this right?
 		Base:       output.Base,   // base dir (absolute path) that this is rooted in
 		Files:      output.Files,
 		Imports:    importVertex,

lang/interfaces/ast.go

@@ -142,6 +142,10 @@ type Data struct {
 	// system to manage file resources or other aspects.
 	Fs engine.Fs
 
+	// FsURI is the fs URI of the active filesystem. This is useful to pass
+	// to the engine.World API for further consumption.
+	FsURI string
+
 	// Base directory (absolute path) that the running code is in. If an
 	// import is found, that's a recursive addition, and naturally for that
 	// run, this value would be different in the recursion.

lang/interfaces/func.go

@@ -115,6 +115,16 @@ type NamedArgsFunc interface {
 // TODO: Consider combining this with the existing Data struct or more of it...
 // TODO: Do we want to add line/col/file values here, and generalize this?
 type FuncData struct {
+	// Fs represents a handle to the filesystem that we're running on. This
+	// is necessary for opening files if needed by import statements. The
+	// file() paths used to get templates or other files from our deploys
+	// come from here, this is *not* used to interact with the host file
+	// system to manage file resources or other aspects.
+	Fs engine.Fs
+
+	// FsURI is the fs URI of the active filesystem. This is useful to pass
+	// to the engine.World API for further consumption.
+	FsURI string
 
 	// Base directory (absolute path) that the running code is in. This is a
 	// copy of the value from the Expr and Stmt Data struct for Init.

lang/interpolate_test.go

@@ -389,6 +389,7 @@ func TestInterpolateBasicStmt(t *testing.T) {
 			ast, fail, exp := tc.ast, tc.fail, tc.exp
 
 			data := &interfaces.Data{
+				// TODO: add missing fields here if/when needed
 				Debug: testing.Verbose(), // set via the -test.v flag to `go test`
 				Logf: func(format string, v ...interface{}) {
 					t.Logf("ast: "+format, v...)
@@ -711,6 +712,7 @@ func TestInterpolateBasicExpr(t *testing.T) {
 			ast, fail, exp := tc.ast, tc.fail, tc.exp
 
 			data := &interfaces.Data{
+				// TODO: add missing fields here if/when needed
 				Debug: testing.Verbose(), // set via the -test.v flag to `go test`
 				Logf: func(format string, v ...interface{}) {
 					t.Logf("ast: "+format, v...)

lang/interpret_test.go

@@ -441,6 +441,7 @@ func TestAstFunc0(t *testing.T) {
 			t.Logf("test #%d: AST: %+v", index, ast)
 
 			data := &interfaces.Data{
+				// TODO: add missing fields here if/when needed
 				Debug: testing.Verbose(), // set via the -test.v flag to `go test`
 				Logf: func(format string, v ...interface{}) {
 					t.Logf("ast: "+format, v...)
@@ -790,7 +791,9 @@ func TestAstFunc1(t *testing.T) {
 			importGraph.AddVertex(importVertex)
 
 			data := &interfaces.Data{
+				// TODO: add missing fields here if/when needed
 				Fs:       fs,
+				FsURI:    fs.URI(),     // TODO: is this right?
 				Base:     output.Base,  // base dir (absolute path) the metadata file is in
 				Files:    output.Files, // no really needed here afaict
 				Imports:  importVertex,
@@ -1232,7 +1235,9 @@ func TestAstFunc2(t *testing.T) {
 			importGraph.AddVertex(importVertex)
 
 			data := &interfaces.Data{
+				// TODO: add missing fields here if/when needed
 				Fs:       fs,
+				FsURI:    "memmapfs:///", // we're in standalone mode
 				Base:     output.Base,    // base dir (absolute path) the metadata file is in
 				Files:    output.Files,   // no really needed here afaict
 				Imports:  importVertex,
@@ -1676,6 +1681,7 @@ func TestAstInterpret0(t *testing.T) {
 		t.Logf("test #%d: AST: %+v", index, ast)
 
 		data := &interfaces.Data{
+			// TODO: add missing fields here if/when needed
 			Debug: testing.Verbose(), // set via the -test.v flag to `go test`
 			Logf: func(format string, v ...interface{}) {
 				t.Logf("ast: "+format, v...)

lang/lang.go

@@ -42,6 +42,8 @@ const (
 // Lang is the main language lexer/parser object.
 type Lang struct {
 	Fs    engine.Fs // connected fs where input dir or metadata exists
+	FsURI string
+
 	// Input is a string which specifies what the lang should run. It can
 	// accept values in several different forms. If is passed a single dash
 	// (-), then it will use `os.Stdin`. If it is passed a single .mcl file,
@@ -133,7 +135,9 @@ func (obj *Lang) Init() error {
 	obj.Logf("init...")
 	// init and validate the structure of the AST
 	data := &interfaces.Data{
+		// TODO: add missing fields here if/when needed
 		Fs:       obj.Fs,
+		FsURI:    obj.FsURI,
 		Base:     output.Base, // base dir (absolute path) the metadata file is in
 		Files:    output.Files,
 		Imports:  importVertex,

lang/structs.go

@@ -3241,7 +3241,9 @@ func (obj *StmtProg) importScopeWithInputs(s string, scope *interfaces.Scope, pa
 	logf("init...")
 	// init and validate the structure of the AST
 	data := &interfaces.Data{
+		// TODO: add missing fields here if/when needed
 		Fs:         obj.data.Fs,
+		FsURI:      obj.data.FsURI,
 		Base:       output.Base, // new base dir (absolute path)
 		Files:      files,
 		Imports:    parentVertex, // the parent vertex that imported me
@@ -6690,6 +6692,8 @@ func (obj *ExprFunc) Init(data *interfaces.Data) error {
 		// TODO: do we want to pass in the full obj.data instead ?
 		if dataFunc, ok := obj.function.(interfaces.DataFunc); ok {
 			dataFunc.SetData(&interfaces.FuncData{
+				Fs:    obj.data.Fs,
+				FsURI: obj.data.FsURI,
 				Base:  obj.data.Base,
 			})
 		}
@@ -6776,6 +6780,8 @@ func (obj *ExprFunc) Copy() (interfaces.Expr, error) {
 		// TODO: do we want to pass in the full obj.data instead ?
 		if dataFunc, ok := function.(interfaces.DataFunc); ok {
 			dataFunc.SetData(&interfaces.FuncData{
+				Fs:    obj.data.Fs,
+				FsURI: obj.data.FsURI,
 				Base:  obj.data.Base,
 			})
 		}

lang/unification_test.go

@@ -836,6 +836,7 @@ func TestUnification1(t *testing.T) {
 			t.Logf("\n\ntest #%d: AST (before): %+v\n", index, ast)
 
 			data := &interfaces.Data{
+				// TODO: add missing fields here if/when needed
 				Debug: testing.Verbose(), // set via the -test.v flag to `go test`
 				Logf: func(format string, v ...interface{}) {
 					t.Logf(fmt.Sprintf("test #%d", index)+": ast: "+format, v...)