Add args support for deno extensions

cli/src/bin/phylum.rs

@@ -163,7 +163,9 @@ async fn handle_commands() -> CommandResult {
         "extension" => extensions::handle_extensions(sub_matches).await,
 
         #[cfg(feature = "extensions")]
-        extension_subcmd => extensions::handle_run_extension(extension_subcmd, Box::pin(api)).await,
+        extension_subcmd => {
+            extensions::handle_run_extension(Box::pin(api), extension_subcmd, sub_matches).await
+        },
 
         #[cfg(not(feature = "extensions"))]
         _ => unreachable!(),

cli/src/commands/extensions/extension.rs

@@ -123,9 +123,13 @@ impl Extension {
     }
 
     /// Execute an extension subcommand.
-    pub async fn run(&self, api: BoxFuture<'static, Result<PhylumApi>>) -> CommandResult {
+    pub async fn run(
+        &self,
+        api: BoxFuture<'static, Result<PhylumApi>>,
+        args: Vec<String>,
+    ) -> CommandResult {
         let script_path = self.path.join(&self.manifest.entry_point);
-        deno::run(ExtensionState::from(api), &script_path.to_string_lossy()).await?;
+        deno::run(ExtensionState::from(api), &script_path.to_string_lossy(), args).await?;
         Ok(ExitCode::Ok.into())
     }
 }

cli/src/commands/extensions/mod.rs

@@ -42,7 +42,6 @@ pub fn command<'a>() -> Command<'a> {
 }
 
 /// Generate the subcommands for each extension.
-/// TODO add tests.
 pub fn add_extensions_subcommands(command: Command<'_>) -> Command<'_> {
     let extensions = match installed_extensions() {
         Ok(extensions) => extensions,
@@ -64,7 +63,14 @@ pub fn add_extensions_subcommands(command: Command<'_>) -> Command<'_> {
                 true
             }
         })
-        .fold(command, |command, ext| command.subcommand(Command::new(ext.name())))
+        .fold(command, |command, ext| {
+            command.subcommand(
+                Command::new(ext.name())
+                    .allow_hyphen_values(true)
+                    .disable_help_flag(true)
+                    .arg(arg!([OPTIONS] ... "Extension parameters")),
+            )
+        })
 }
 
 /// Entry point for the `extensions` subcommand.
@@ -86,12 +92,15 @@ pub async fn handle_extensions(matches: &ArgMatches) -> CommandResult {
 ///
 /// Run the extension by name.
 pub async fn handle_run_extension(
-    name: &str,
     api: BoxFuture<'static, Result<PhylumApi>>,
+    name: &str,
+    args: &ArgMatches,
 ) -> CommandResult {
+    let options = args.get_many("OPTIONS").map(|options| options.cloned().collect());
+
     let extension = Extension::load(name)?;
 
-    extension.run(api).await?;
+    extension.run(api, options.unwrap_or_default()).await?;
 
     Ok(CommandValue::Code(ExitCode::Ok))
 }

cli/src/deno.rs

@@ -23,14 +23,19 @@ use crate::commands::extensions::extension::{self, ExtensionState};
 const EXTENSION_API: &str = include_str!("./extension_api.ts");
 
 /// Execute Phylum extension.
-pub async fn run(extension_state: ExtensionState, entry_point: &str) -> Result<()> {
+pub async fn run(
+    extension_state: ExtensionState,
+    entry_point: &str,
+    args: Vec<String>,
+) -> Result<()> {
     let phylum_api = Extension::builder().ops(api::api_decls()).build();
 
     let main_module = deno_core::resolve_path(entry_point)?;
 
     let cpu_count = thread::available_parallelism().map(|p| p.get()).unwrap_or(1);
     let bootstrap = BootstrapOptions {
         cpu_count,
+        args,
         runtime_version: env!("CARGO_PKG_VERSION").into(),
         user_agent: "phylum-cli/extension".into(),
         no_color: !colors::use_color(),
@@ -40,7 +45,6 @@ pub async fn run(extension_state: ExtensionState, entry_point: &str) -> Result<(
         ts_version: Default::default(),
         location: Default::default(),
         unstable: Default::default(),
-        args: Default::default(),
     };
 
     let options = WorkerOptions {

cli/tests/extensions.rs

@@ -217,8 +217,8 @@ fn extension_list_should_emit_output() {
 }
 
 // Extensions relying on the injected Phylum API work.
-#[tokio::test]
-async fn injected_api() {
+#[test]
+fn injected_api() {
     let tempdir = TempDir::new().unwrap();
     Command::cargo_bin("phylum")
         .unwrap()
@@ -237,6 +237,28 @@ async fn injected_api() {
         .stdout("44\n");
 }
 
+// Extensions can access CLI arguments.
+#[test]
+fn arg_access() {
+    let tempdir = TempDir::new().unwrap();
+    Command::cargo_bin("phylum")
+        .unwrap()
+        .env("XDG_DATA_HOME", tempdir.path())
+        .arg("extension")
+        .arg("install")
+        .arg(fixtures_path().join("args"))
+        .assert()
+        .success();
+
+    Command::cargo_bin("phylum")
+        .unwrap()
+        .env("XDG_DATA_HOME", tempdir.path())
+        .args(&["args", "--test", "-x", "a"])
+        .assert()
+        .success()
+        .stdout("[ \"--test\", \"-x\", \"a\" ]\n");
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // Miscellaneous tests
 ////////////////////////////////////////////////////////////////////////////////

cli/tests/fixtures/extensions/args/PhylumExt.toml

@@ -0,0 +1,3 @@
+name = "args"
+description = "Print deno args"
+entry_point = "main.ts"

cli/tests/fixtures/extensions/args/main.ts

@@ -0,0 +1 @@
+console.log(Deno.args);