feat: ability to skip loading statically analyzable dynamic dependencies (#574)

Author: dsherret

lib/lib.rs

@@ -309,6 +309,7 @@ pub async fn js_create_graph(
       &loader,
       BuildOptions {
         is_dynamic: false,
+        skip_dynamic_deps: false,
         resolver: maybe_resolver.as_ref().map(|r| r as &dyn Resolver),
         // todo(dsherret): actually implement this for Wasm users
         // and don't just use a RealSys here as it would be better

src/graph.rs

@@ -1255,6 +1255,8 @@ pub struct BuildFastCheckTypeGraphOptions<'a> {
 
 pub struct BuildOptions<'a> {
   pub is_dynamic: bool,
+  /// Skip loading statically analyzable dynamic dependencies.
+  pub skip_dynamic_deps: bool,
   /// Additional imports that should be brought into the scope of
   /// the module graph to add to the graph's "imports". This may
   /// be extra modules such as TypeScript's "types" option or JSX
@@ -1278,6 +1280,7 @@ impl Default for BuildOptions<'_> {
   fn default() -> Self {
     Self {
       is_dynamic: false,
+      skip_dynamic_deps: false,
       imports: Default::default(),
       executor: Default::default(),
       locker: None,
@@ -3606,6 +3609,7 @@ impl FillPassMode {
 
 struct Builder<'a, 'graph> {
   in_dynamic_branch: bool,
+  skip_dynamic_deps: bool,
   was_dynamic_root: bool,
   file_system: &'a FileSystem,
   jsr_url_provider: &'a dyn JsrUrlProvider,
@@ -3636,6 +3640,7 @@ impl<'a, 'graph> Builder<'a, 'graph> {
     };
     let mut builder = Self {
       in_dynamic_branch: options.is_dynamic,
+      skip_dynamic_deps: options.skip_dynamic_deps,
       was_dynamic_root: options.is_dynamic,
       file_system: options.file_system,
       jsr_url_provider: options.jsr_url_provider,
@@ -5187,6 +5192,10 @@ impl<'a, 'graph> Builder<'a, 'graph> {
     maybe_version_info: Option<&JsrPackageVersionInfoExt>,
   ) {
     for dep in dependencies.values_mut() {
+      if dep.is_dynamic && self.skip_dynamic_deps {
+        continue;
+      }
+
       if matches!(self.graph.graph_kind, GraphKind::All | GraphKind::CodeOnly)
         || dep.maybe_type.is_none()
       {

tests/ecosystem_test.rs

@@ -290,6 +290,7 @@ async fn test_version(
       &loader,
       BuildOptions {
         is_dynamic: false,
+        skip_dynamic_deps: false,
         module_analyzer: &module_analyzer,
         file_system: &NullFileSystem,
         locker: None,

tests/helpers/mod.rs

@@ -175,6 +175,7 @@ pub struct TestBuilder {
   entry_point: String,
   entry_point_types: String,
   fast_check_cache: bool,
+  skip_dynamic_deps: bool,
   workspace_members: Vec<WorkspaceMember>,
   workspace_fast_check: bool,
   lockfile_jsr_packages: BTreeMap<PackageReq, PackageNv>,
@@ -189,6 +190,7 @@ impl TestBuilder {
       entry_point: "file:///mod.ts".to_string(),
       entry_point_types: "file:///mod.ts".to_string(),
       fast_check_cache: false,
+      skip_dynamic_deps: false,
       workspace_members: Default::default(),
       workspace_fast_check: false,
       lockfile_jsr_packages: Default::default(),
@@ -245,6 +247,12 @@ impl TestBuilder {
     self
   }
 
+  #[allow(unused)]
+  pub fn skip_dynamic_deps(&mut self, value: bool) -> &mut Self {
+    self.skip_dynamic_deps = value;
+    self
+  }
+
   #[allow(unused)]
   pub fn ensure_locker(&mut self) -> &mut Self {
     self.locker.get_or_insert_with(Default::default);
@@ -297,6 +305,7 @@ impl TestBuilder {
           npm_resolver: Some(&TestNpmResolver),
           locker: self.locker.as_mut().map(|l| l as _),
           resolver: Some(&resolver),
+          skip_dynamic_deps: self.skip_dynamic_deps,
           ..Default::default()
         },
       )

tests/specs/graph/skip_dynamic_deps.txt

@@ -0,0 +1,90 @@
+~~ {"skipDynamicDeps":true} ~~
+# https://localhost/mod.ts
+console.log(123);
+await import("https://localhost/other.ts");
+
+# https://localhost/other.ts
+console.log("This should not be loaded");
+
+# mod.ts
+import 'https://localhost/mod.ts'
+await import("https://localhost/other.ts");
+
+# output
+{
+  "roots": [
+    "file:///mod.ts"
+  ],
+  "modules": [
+    {
+      "kind": "esm",
+      "dependencies": [
+        {
+          "specifier": "https://localhost/mod.ts",
+          "code": {
+            "specifier": "https://localhost/mod.ts",
+            "resolutionMode": "import",
+            "span": {
+              "start": {
+                "line": 0,
+                "character": 7
+              },
+              "end": {
+                "line": 0,
+                "character": 33
+              }
+            }
+          }
+        },
+        {
+          "specifier": "https://localhost/other.ts",
+          "code": {
+            "specifier": "https://localhost/other.ts",
+            "resolutionMode": "import",
+            "span": {
+              "start": {
+                "line": 1,
+                "character": 13
+              },
+              "end": {
+                "line": 1,
+                "character": 41
+              }
+            }
+          },
+          "isDynamic": true
+        }
+      ],
+      "size": 78,
+      "mediaType": "TypeScript",
+      "specifier": "file:///mod.ts"
+    },
+    {
+      "kind": "esm",
+      "dependencies": [
+        {
+          "specifier": "https://localhost/other.ts",
+          "code": {
+            "specifier": "https://localhost/other.ts",
+            "resolutionMode": "import",
+            "span": {
+              "start": {
+                "line": 1,
+                "character": 13
+              },
+              "end": {
+                "line": 1,
+                "character": 41
+              }
+            }
+          },
+          "isDynamic": true
+        }
+      ],
+      "size": 62,
+      "mediaType": "TypeScript",
+      "specifier": "https://localhost/mod.ts"
+    }
+  ],
+  "redirects": {}
+}

tests/specs_test.rs

@@ -91,6 +91,7 @@ fn run_graph_test(test: &CollectedTest) {
   builder.lockfile_jsr_packages(spec.lockfile_jsr_packages.clone());
 
   if let Some(options) = &spec.options {
+    builder.skip_dynamic_deps(options.skip_dynamic_deps);
     builder.workspace_fast_check(options.workspace_fast_check);
     builder.fast_check_cache(options.fast_check_cache);
     if let Some(checksums) = options.remote_checksums.as_ref() {
@@ -325,6 +326,9 @@ pub struct SpecOptions {
   #[serde(default)]
   #[serde(skip_serializing_if = "is_false")]
   pub fast_check_cache: bool,
+  #[serde(default)]
+  #[serde(skip_serializing_if = "is_false")]
+  pub skip_dynamic_deps: bool,
 }
 
 fn is_false(v: &bool) -> bool {