From aa208f8f92f3eedc0774ba0044c5074526bad510 Mon Sep 17 00:00:00 2001
From: Mihail Stoykov <M.Stoikov@gmail.com>
Date: Mon, 6 Mar 2023 12:35:07 +0200
Subject: [PATCH] Use loader.SourceData directly in the bundle

---
 js/bundle.go      | 14 ++++++--------
 js/bundle_test.go |  2 +-
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/js/bundle.go b/js/bundle.go
index 9c27ad0a362..0f5210a6a29 100644
--- a/js/bundle.go
+++ b/js/bundle.go
@@ -26,9 +26,8 @@ import (
 // A Bundle is a self-contained bundle of scripts and resources.
 // You can use this to produce identical BundleInstance objects.
 type Bundle struct {
-	Filename *url.URL
-	Source   []byte
-	Options  lib.Options
+	sourceData *loader.SourceData
+	Options    lib.Options
 
 	CompatibilityMode lib.CompatibilityMode // parsed value
 	preInitState      *lib.TestPreInitState
@@ -79,8 +78,7 @@ func newBundle(
 
 	// Make a bundle, instantiate it into a throwaway VM to populate caches.
 	bundle := &Bundle{
-		Filename:          src.URL,
-		Source:            src.Data,
+		sourceData:        src,
 		Options:           options,
 		CompatibilityMode: compatMode,
 		callableExports:   make(map[string]struct{}),
@@ -144,8 +142,8 @@ func (b *Bundle) makeArchive() *lib.Archive {
 		Type:              "js",
 		Filesystems:       b.filesystems,
 		Options:           b.Options,
-		FilenameURL:       b.Filename,
-		Data:              b.Source,
+		FilenameURL:       b.sourceData.URL,
+		Data:              b.sourceData.Data,
 		PwdURL:            b.pwd,
 		Env:               make(map[string]string, len(b.preInitState.RuntimeOptions.Env)),
 		CompatibilityMode: b.CompatibilityMode.String(),
@@ -296,7 +294,7 @@ func (b *Bundle) instantiate(vuImpl *moduleVUImpl, vuID uint64) (moduleInstance,
 	err = common.RunWithPanicCatching(b.preInitState.Logger, rt, func() error {
 		return vuImpl.eventLoop.Start(func() error {
 			//nolint:shadow,govet // here we shadow err on purpose
-			mod, err := b.moduleResolver.resolve(b.pwd, b.Filename.String())
+			mod, err := b.moduleResolver.resolve(b.pwd, b.sourceData.URL.String())
 			if err != nil {
 				return err // TODO wrap as this should never happen
 			}
diff --git a/js/bundle_test.go b/js/bundle_test.go
index 14b60688ba3..6323b648617 100644
--- a/js/bundle_test.go
+++ b/js/bundle_test.go
@@ -123,7 +123,7 @@ func TestNewBundle(t *testing.T) {
 		t.Parallel()
 		b, err := getSimpleBundle(t, "-", `export default function() {};`)
 		require.NoError(t, err)
-		assert.Equal(t, "file://-", b.Filename.String())
+		assert.Equal(t, "file://-", b.sourceData.URL.String())
 		assert.Equal(t, "file:///", b.pwd.String())
 	})
 	t.Run("CompatibilityMode", func(t *testing.T) {