include deps in external import map in lockfile

Author: nathanwhit

cli/args/deno_json.rs

@@ -3,6 +3,7 @@
 use std::collections::HashSet;
 
 use deno_config::deno_json::TsConfigForEmit;
+use deno_core::error::AnyError;
 use deno_core::serde_json;
 use deno_semver::jsr::JsrDepPackageReq;
 use deno_semver::jsr::JsrPackageReqReference;
@@ -66,10 +67,18 @@ impl<'a> deno_config::fs::DenoConfigFs for DenoConfigFsAdapter<'a> {
 
 pub fn deno_json_deps(
   config: &deno_config::deno_json::ConfigFile,
-) -> HashSet<JsrDepPackageReq> {
-  let values = imports_values(config.json.imports.as_ref())
-    .into_iter()
-    .chain(scope_values(config.json.scopes.as_ref()));
+) -> Result<HashSet<JsrDepPackageReq>, AnyError> {
+  let import_map = config
+    .to_import_map_value(|path| {
+      std::fs::read_to_string(path).map_err(Into::into)
+    })?
+    .map(|(_, value)| value);
+  let values =
+    imports_values(import_map.as_ref().and_then(|m| m.get("imports")))
+      .into_iter()
+      .chain(scope_values(
+        import_map.as_ref().and_then(|m| m.get("scopes")),
+      ));
   let mut set = values_to_set(values);
 
   if let Some(serde_json::Value::Object(compiler_options)) =
@@ -104,7 +113,7 @@ pub fn deno_json_deps(
     }
   }
 
-  set
+  Ok(set)
 }
 
 fn imports_values(value: Option<&serde_json::Value>) -> Vec<&String> {

cli/args/lockfile.rs

@@ -126,10 +126,13 @@ impl CliLockfile {
 
     fn deno_json_deps(
       maybe_deno_json: Option<&ConfigFile>,
-    ) -> HashSet<JsrDepPackageReq> {
-      maybe_deno_json
-        .map(crate::args::deno_json::deno_json_deps)
-        .unwrap_or_default()
+    ) -> Result<HashSet<JsrDepPackageReq>, AnyError> {
+      Ok(
+        maybe_deno_json
+          .map(crate::args::deno_json::deno_json_deps)
+          .transpose()?
+          .unwrap_or_default(),
+      )
     }
 
     if flags.no_lock
@@ -171,7 +174,7 @@ impl CliLockfile {
     let config = deno_lockfile::WorkspaceConfig {
       root: WorkspaceMemberConfig {
         package_json_deps: pkg_json_deps(root_folder.pkg_json.as_deref()),
-        dependencies: deno_json_deps(root_folder.deno_json.as_deref()),
+        dependencies: deno_json_deps(root_folder.deno_json.as_deref())?,
       },
       members: workspace
         .config_folders()
@@ -192,7 +195,18 @@ impl CliLockfile {
             {
               let config = WorkspaceMemberConfig {
                 package_json_deps: pkg_json_deps(folder.pkg_json.as_deref()),
-                dependencies: deno_json_deps(folder.deno_json.as_deref()),
+                dependencies: deno_json_deps(folder.deno_json.as_deref())
+                  .inspect_err(|err| {
+                    log::warn!(
+                      "failed to read dependencies from {}: {err}",
+                      folder
+                        .deno_json
+                        .as_ref()
+                        .map(|s| s.specifier.as_str())
+                        .unwrap_or("config file")
+                    )
+                  })
+                  .unwrap_or_default(),
               };
               if config.package_json_deps.is_empty()
                 && config.dependencies.is_empty()

tests/specs/lockfile/external_import_map/__test__.jsonc

@@ -0,0 +1,10 @@
+{
+  "tempDir": true,
+  "steps": [{
+    "args": "run -A main.ts",
+    "output": "[WILDCARD]"
+  }, {
+    "args": ["eval", "console.log(Deno.readTextFileSync('deno.lock').trim())"],
+    "output": "deno.lock.out"
+  }]
+}

tests/specs/lockfile/external_import_map/deno.json

@@ -0,0 +1,3 @@
+{
+  "importMap": "import_map.json"
+}

tests/specs/lockfile/external_import_map/deno.lock.out

@@ -0,0 +1,10 @@
+{
+  "imports": {
+    "@denotest/add": "jsr:@denotest/[email protected]"
+  },
+  "scopes": {
+    "/foo/": {
+      "@denotest/esm-basic": "npm:@denotest/[email protected]"
+    }
+  }
+}

tests/specs/lockfile/external_import_map/import_map.json

@@ -0,0 +1,2 @@
+import { add } from "@denotest/add";
+console.log(add(1, 2));