commands: use run instead of commands by default in dance.run

forivall · Oct 15, 2021 · 6c63542 · 6c63542
1 parent 1625ca7
commit 6c63542
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 8 deletions.
diff --git a/src/api/run.ts b/src/api/run.ts
@@ -105,6 +105,13 @@ export namespace run {
     canRunArbitraryCode = false;
   }
 
+  /**
+   * Returns whether `compileFunction` and `run` can be used.
+   */
+  export function isEnabled() {
+    return canRunArbitraryCode;
+  }
+
   interface CompiledFunction {
     (...args: any[]): Thenable<unknown>;
   }

diff --git a/src/commands/README.md b/src/commands/README.md
diff --git a/src/commands/load-all.ts b/src/commands/load-all.ts
diff --git a/src/commands/misc.ts b/src/commands/misc.ts
@@ -131,9 +131,13 @@ const runHistory: string[] = [];
  *   },
  * },
  * ```
+ *
+ * If both `input` and `commands` are given, Dance will use `run` if arbitrary
+ * command execution is enabled, or `commands` otherwise.
  */
 export async function run(
   _: Context,
+  input: string,
   inputOr: InputOr<string | readonly string[]>,
 
   count: number,
@@ -143,7 +147,11 @@ export async function run(
   commands?: Argument<command.Any[]>,
 ) {
   if (Array.isArray(commands)) {
-    return apiCommands(...commands);
+    if (typeof input === "string" && apiRun.isEnabled()) {
+      // Prefer "input" to the "commands" array.
+    } else {
+      return apiCommands(...commands);
+    }
   }
 
   let code = await inputOr(() => prompt({