From 161a4fea47d134fa6077910b794883ffb6e9b0c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= <biwanczuk@gmail.com>
Date: Wed, 8 Feb 2023 00:21:43 +0100
Subject: refactor(core): change SourcePair to ExtensionFileSource (#17686)

---
 core/extensions.rs | 58 +++++++++++++++++++++++++++++-------------------------
 core/lib.rs        |  1 +
 core/runtime.rs    | 18 +++++++++++------
 3 files changed, 44 insertions(+), 33 deletions(-)

(limited to 'core')

diff --git a/core/extensions.rs b/core/extensions.rs
index ba7bdb18a..e08e8c566 100644
--- a/core/extensions.rs
+++ b/core/extensions.rs
@@ -6,7 +6,10 @@ use std::rc::Rc;
 use std::task::Context;
 use v8::fast_api::FastFunction;
 
-pub type SourcePair = (String, &'static str);
+pub struct ExtensionFileSource {
+  pub specifier: String,
+  pub code: &'static str,
+}
 pub type OpFnRef = v8::FunctionCallback;
 pub type OpMiddlewareFn = dyn Fn(OpDecl) -> OpDecl;
 pub type OpStateFn = dyn Fn(&mut OpState) -> Result<(), Error>;
@@ -37,8 +40,8 @@ impl OpDecl {
 
 #[derive(Default)]
 pub struct Extension {
-  js_files: Option<Vec<SourcePair>>,
-  esm_files: Option<Vec<SourcePair>>,
+  js_files: Option<Vec<ExtensionFileSource>>,
+  esm_files: Option<Vec<ExtensionFileSource>>,
   ops: Option<Vec<OpDecl>>,
   opstate_fn: Option<Box<OpStateFn>>,
   middleware_fn: Option<Box<OpMiddlewareFn>>,
@@ -82,14 +85,14 @@ impl Extension {
 
   /// returns JS source code to be loaded into the isolate (either at snapshotting,
   /// or at startup).  as a vector of a tuple of the file name, and the source code.
-  pub fn get_js_sources(&self) -> &[SourcePair] {
+  pub fn get_js_sources(&self) -> &[ExtensionFileSource] {
     match &self.js_files {
       Some(files) => files,
       None => &[],
     }
   }
 
-  pub fn get_esm_sources(&self) -> &[SourcePair] {
+  pub fn get_esm_sources(&self) -> &[ExtensionFileSource] {
     match &self.esm_files {
       Some(files) => files,
       None => &[],
@@ -152,8 +155,8 @@ impl Extension {
 // Provides a convenient builder pattern to declare Extensions
 #[derive(Default)]
 pub struct ExtensionBuilder {
-  js: Vec<SourcePair>,
-  esm: Vec<SourcePair>,
+  js: Vec<ExtensionFileSource>,
+  esm: Vec<ExtensionFileSource>,
   ops: Vec<OpDecl>,
   state: Option<Box<OpStateFn>>,
   middleware: Option<Box<OpMiddlewareFn>>,
@@ -168,26 +171,27 @@ impl ExtensionBuilder {
     self
   }
 
-  pub fn js(
-    &mut self,
-    js_files: Vec<(&'static str, &'static str)>,
-  ) -> &mut Self {
-    let js_files = js_files.into_iter().map(|source_pair| {
-      let name = format!("internal:{}/{}", self.name, source_pair.0);
-      (name, source_pair.1)
-    });
+  pub fn js(&mut self, js_files: Vec<ExtensionFileSource>) -> &mut Self {
+    let js_files =
+      js_files.into_iter().map(|file_source| ExtensionFileSource {
+        specifier: format!("internal:{}/{}", self.name, file_source.specifier),
+        code: file_source.code,
+      });
     self.js.extend(js_files);
     self
   }
 
-  pub fn esm(
-    &mut self,
-    esm_files: Vec<(&'static str, &'static str)>,
-  ) -> &mut Self {
-    let esm_files = esm_files.into_iter().map(|source_pair| {
-      let name = format!("internal:{}/{}", self.name, source_pair.0);
-      (name, source_pair.1)
-    });
+  pub fn esm(&mut self, esm_files: Vec<ExtensionFileSource>) -> &mut Self {
+    let esm_files =
+      esm_files
+        .into_iter()
+        .map(|file_source| ExtensionFileSource {
+          specifier: format!(
+            "internal:{}/{}",
+            self.name, file_source.specifier
+          ),
+          code: file_source.code,
+        });
     self.esm.extend(esm_files);
     self
   }
@@ -254,10 +258,10 @@ impl ExtensionBuilder {
 macro_rules! include_js_files {
   ($($file:literal,)+) => {
     vec![
-      $((
-        $file,
-        include_str!($file),
-      ),)+
+      $($crate::ExtensionFileSource {
+        specifier: $file.to_string(),
+        code: include_str!($file),
+      },)+
     ]
   };
 }
diff --git a/core/lib.rs b/core/lib.rs
index 868d6b749..86c432d43 100644
--- a/core/lib.rs
+++ b/core/lib.rs
@@ -54,6 +54,7 @@ pub use crate::async_cell::RcLike;
 pub use crate::async_cell::RcRef;
 pub use crate::extensions::Extension;
 pub use crate::extensions::ExtensionBuilder;
+pub use crate::extensions::ExtensionFileSource;
 pub use crate::extensions::OpDecl;
 pub use crate::extensions::OpMiddlewareFn;
 pub use crate::flags::v8_set_flags;
diff --git a/core/runtime.rs b/core/runtime.rs
index 096d26ca3..d4a9c697c 100644
--- a/core/runtime.rs
+++ b/core/runtime.rs
@@ -815,27 +815,33 @@ impl JsRuntime {
     for ext in &extensions {
       {
         let js_files = ext.get_esm_sources();
-        for (filename, source) in js_files {
+        for file_source in js_files {
           futures::executor::block_on(async {
             let id = self
               .load_side_module(
-                &ModuleSpecifier::parse(filename)?,
-                Some(source.to_string()),
+                &ModuleSpecifier::parse(&file_source.specifier)?,
+                Some(file_source.code.to_string()),
               )
               .await?;
             let receiver = self.mod_evaluate(id);
             self.run_event_loop(false).await?;
             receiver.await?
           })
-          .with_context(|| format!("Couldn't execute '{filename}'"))?;
+          .with_context(|| {
+            format!("Couldn't execute '{}'", file_source.specifier)
+          })?;
         }
       }
 
       {
         let js_files = ext.get_js_sources();
-        for (filename, source) in js_files {
+        for file_source in js_files {
           // TODO(@AaronO): use JsRuntime::execute_static() here to move src off heap
-          realm.execute_script(self.v8_isolate(), filename, source)?;
+          realm.execute_script(
+            self.v8_isolate(),
+            &file_source.specifier,
+            file_source.code,
+          )?;
         }
       }
     }
-- 
cgit v1.2.3