chore: refactor import map constructor

Author: sweatybridge

internal/utils/deno.go

@@ -209,29 +209,12 @@ func CopyDenoScripts(ctx context.Context, fsys afero.Fs) (*DenoScriptDir, error)
 	return &sd, nil
 }
 
-func newImportMap(relJsonPath string, fsys afero.Fs) (function.ImportMap, error) {
-	var result function.ImportMap
-	if len(relJsonPath) == 0 {
-		return result, nil
-	}
-	data, err := afero.ReadFile(fsys, relJsonPath)
-	if err != nil {
-		return result, errors.Errorf("failed to load import map: %w", err)
-	}
-	if err := result.Parse(data); err != nil {
-		return result, err
-	}
-	unixPath := filepath.ToSlash(relJsonPath)
-	if err := result.Resolve(unixPath, afero.NewIOFS(fsys)); err != nil {
-		return result, err
-	}
-	return result, nil
-}
-
 func BindHostModules(cwd, relEntrypointPath, relImportMapPath string, fsys afero.Fs) ([]string, error) {
-	importMap, err := newImportMap(relImportMapPath, fsys)
-	if err != nil {
-		return nil, err
+	importMap := function.ImportMap{}
+	if imPath := filepath.ToSlash(relImportMapPath); len(imPath) > 0 {
+		if err := importMap.Load(imPath, afero.NewIOFS(fsys)); err != nil {
+			return nil, err
+		}
 	}
 	var modules []string
 	// Resolving all Import Graph

internal/utils/deno_test.go

@@ -8,6 +8,7 @@ import (
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"github.com/supabase/cli/pkg/function"
 )
 
 func TestResolveImports(t *testing.T) {
@@ -31,7 +32,8 @@ func TestResolveImports(t *testing.T) {
 		require.NoError(t, fsys.Mkdir(filepath.Join(cwd, DbTestsDir), 0755))
 		require.NoError(t, fsys.Mkdir(filepath.Join(cwd, FunctionsDir, "child"), 0755))
 		// Run test
-		resolved, err := newImportMap(jsonPath, fsys)
+		resolved := function.ImportMap{}
+		err = resolved.Load(jsonPath, afero.NewIOFS(fsys))
 		// Check error
 		assert.NoError(t, err)
 		assert.Equal(t, "/tmp/", resolved.Imports["abs/"])
@@ -53,7 +55,8 @@ func TestResolveImports(t *testing.T) {
 		fsys := afero.NewMemMapFs()
 		require.NoError(t, afero.WriteFile(fsys, FallbackImportMapPath, importMap, 0644))
 		// Run test
-		resolved, err := newImportMap(FallbackImportMapPath, fsys)
+		resolved := function.ImportMap{}
+		err := resolved.Load(FallbackImportMapPath, afero.NewIOFS(fsys))
 		// Check error
 		assert.NoError(t, err)
 		assert.Equal(t, "https://deno.land", resolved.Scopes["my-scope"]["my-mod"])

pkg/function/deploy.go

@@ -143,6 +143,17 @@ func writeForm(form *multipart.Writer, meta api.FunctionDeployMetadata, fsys fs.
 	if err := enc.Encode(meta); err != nil {
 		return errors.Errorf("failed to encode metadata: %w", err)
 	}
+	uploadAsset := func(srcPath string, r io.Reader) error {
+		fmt.Fprintf(os.Stderr, "Uploading asset (%s): %s\n", *meta.Name, srcPath)
+		f, err := form.CreateFormFile("file", srcPath)
+		if err != nil {
+			return errors.Errorf("failed to create map: %w", err)
+		}
+		if _, err := io.Copy(f, r); err != nil {
+			return errors.Errorf("failed to write form: %w", err)
+		}
+		return nil
+	}
 	addFile := func(srcPath string, w io.Writer) error {
 		f, err := fsys.Open(filepath.FromSlash(srcPath))
 		if err != nil {
@@ -154,39 +165,15 @@ func writeForm(form *multipart.Writer, meta api.FunctionDeployMetadata, fsys fs.
 		} else if fi.IsDir() {
 			return errors.New("file path is a directory: " + srcPath)
 		}
-		fmt.Fprintf(os.Stderr, "Uploading asset (%s): %s\n", *meta.Name, srcPath)
 		r := io.TeeReader(f, w)
-		dst, err := form.CreateFormFile("file", srcPath)
-		if err != nil {
-			return errors.Errorf("failed to create form: %w", err)
-		}
-		if _, err := io.Copy(dst, r); err != nil {
-			return errors.Errorf("failed to write form: %w", err)
-		}
-		return nil
+		return uploadAsset(srcPath, r)
 	}
 	// Add import map
 	importMap := ImportMap{}
 	if imPath := cast.Val(meta.ImportMapPath, ""); len(imPath) > 0 {
-		data, err := fs.ReadFile(fsys, filepath.FromSlash(imPath))
-		if err != nil {
-			return errors.Errorf("failed to load import map: %w", err)
-		}
-		if err := importMap.Parse(data); err != nil {
-			return err
-		}
-		if err := importMap.Resolve(imPath, fsys); err != nil {
+		if err := importMap.Load(imPath, fsys, uploadAsset); err != nil {
 			return err
 		}
-		// TODO: replace with addFile once edge runtime supports jsonc
-		fmt.Fprintf(os.Stderr, "Uploading asset (%s): %s\n", *meta.Name, imPath)
-		f, err := form.CreateFormFile("file", imPath)
-		if err != nil {
-			return errors.Errorf("failed to create import map: %w", err)
-		}
-		if _, err := f.Write(data); err != nil {
-			return errors.Errorf("failed to write import map: %w", err)
-		}
 	}
 	// Add static files
 	patterns := config.Glob(cast.Val(meta.StaticPatterns, []string{}))
@@ -207,6 +194,25 @@ type ImportMap struct {
 	Scopes  map[string]map[string]string `json:"scopes"`
 }
 
+func (m *ImportMap) Load(imPath string, fsys fs.FS, opts ...func(string, io.Reader) error) error {
+	data, err := fs.ReadFile(fsys, filepath.FromSlash(imPath))
+	if err != nil {
+		return errors.Errorf("failed to load import map: %w", err)
+	}
+	if err := m.Parse(data); err != nil {
+		return err
+	}
+	if err := m.Resolve(imPath, fsys); err != nil {
+		return err
+	}
+	for _, apply := range opts {
+		if err := apply(imPath, bytes.NewReader(data)); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
 func (m *ImportMap) Parse(data []byte) error {
 	data = jsonc.ToJSONInPlace(data)
 	decoder := json.NewDecoder(bytes.NewReader(data))