feat: load import map reference in deno config

Author: sweatybridge

internal/functions/deploy/bundle.go

@@ -127,13 +127,6 @@ func GetBindMounts(cwd, hostFuncDir, hostOutputDir, hostEntrypointPath, hostImpo
 	if err != nil {
 		return nil, err
 	}
-	if len(hostImportMapPath) > 0 {
-		if !filepath.IsAbs(hostImportMapPath) {
-			hostImportMapPath = filepath.Join(cwd, hostImportMapPath)
-		}
-		dockerImportMapPath := utils.ToDockerPath(hostImportMapPath)
-		modules = append(modules, hostImportMapPath+":"+dockerImportMapPath+":ro")
-	}
 	// Remove any duplicate mount points
 	for _, mod := range modules {
 		hostPath := strings.Split(mod, ":")[0]

internal/utils/deno.go

@@ -210,13 +210,19 @@ func CopyDenoScripts(ctx context.Context, fsys afero.Fs) (*DenoScriptDir, error)
 }
 
 func BindHostModules(cwd, relEntrypointPath, relImportMapPath string, fsys afero.Fs) ([]string, error) {
+	var modules []string
+	bindModule := func(srcPath string, r io.Reader) error {
+		hostPath := filepath.Join(cwd, filepath.FromSlash(srcPath))
+		dockerPath := ToDockerPath(hostPath)
+		modules = append(modules, hostPath+":"+dockerPath+":ro")
+		return nil
+	}
 	importMap := function.ImportMap{}
 	if imPath := filepath.ToSlash(relImportMapPath); len(imPath) > 0 {
-		if err := importMap.Load(imPath, afero.NewIOFS(fsys)); err != nil {
+		if err := importMap.LoadAsDeno(imPath, afero.NewIOFS(fsys), bindModule); err != nil {
 			return nil, err
 		}
 	}
-	var modules []string
 	// Resolving all Import Graph
 	addModule := func(unixPath string, w io.Writer) error {
 		hostPath := filepath.FromSlash(unixPath)

pkg/function/deploy.go

@@ -171,7 +171,7 @@ func writeForm(form *multipart.Writer, meta api.FunctionDeployMetadata, fsys fs.
 	// Add import map
 	importMap := ImportMap{}
 	if imPath := cast.Val(meta.ImportMapPath, ""); len(imPath) > 0 {
-		if err := importMap.Load(imPath, fsys, uploadAsset); err != nil {
+		if err := importMap.LoadAsDeno(imPath, fsys, uploadAsset); err != nil {
 			return err
 		}
 	}
@@ -192,6 +192,26 @@ func writeForm(form *multipart.Writer, meta api.FunctionDeployMetadata, fsys fs.
 type ImportMap struct {
 	Imports map[string]string            `json:"imports"`
 	Scopes  map[string]map[string]string `json:"scopes"`
+	// Fallback reference for deno.json
+	ImportMap string `json:"importMap"`
+}
+
+func (m *ImportMap) LoadAsDeno(imPath string, fsys fs.FS, opts ...func(string, io.Reader) error) error {
+	if err := m.Load(imPath, fsys, opts...); err != nil {
+		return err
+	}
+	if strings.EqualFold(path.Base(imPath), "deno.json") && m.IsReference() {
+		imPath = path.Join(path.Dir(imPath), m.ImportMap)
+		if err := m.Load(imPath, fsys, opts...); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func (m *ImportMap) IsReference() bool {
+	// Ref: https://github.com/denoland/deno/blob/main/cli/schemas/config-file.v1.json#L273
+	return len(m.Imports) == 0 && len(m.Scopes) == 0 && len(m.ImportMap) > 0
 }
 
 func (m *ImportMap) Load(imPath string, fsys fs.FS, opts ...func(string, io.Reader) error) error {