textrun-shell 0.4.0 → 0.5.0

package/README.md

@@ -66,6 +66,20 @@ echo Hello world!
 </pre>
 ```
 
+### command attribute
+
+You can provide the command to run via an HTML attribute:
+
+<a type="extension/runnable-region">
+
+```html
+The "echo" command prints text on the command line. For example, let's run:
+
+<pre type="shell/command" command="echo Hello world!"></pre>
+```
+
+</a>
+
 ## shell/command-output
 
 The <b type="action/name-full">shell/command-output</b> action verifies the
@@ -155,6 +169,32 @@ for, and the last one text to enter once the output from the first column has
 appeared. Middle columns are ignored. `<th>` elements are considered
 descriptions and are also ignored.
 
+### command attribute
+
+You can provide the command to run via the `command` HTML attribute. As an
+example, if you run the previous script with this other input:
+
+<table type="shell/command-with-input" command="node greeter.js">
+  <tr>
+    <th>Output to wait for</th>
+    <th>input</th>
+  </tr>
+  <tr>
+    <td>your name</td>
+    <td>Text-Runner</td>
+  </tr>
+  <tr>
+    <td>which day is today</td>
+    <td>Tuesday</td>
+  </tr>
+</table>
+
+Then it prints:
+
+<pre type="shell/command-output">
+Hello Text-Runner, happy Tuesday!
+</pre>
+
 ## shell/server
 
 Long-running processes, for example web or database servers, keep running while
@@ -188,6 +228,11 @@ node server.js
 
 </a>
 
+### command attribute
+
+You can also provide the command to start the server via the `command`
+attribute.
+
 ## shell/server-output
 
 After we started a long-running server through

package/dist/actions/command-with-input.js

@@ -1,20 +1,24 @@
 import { styleText } from "node:util";
 import * as observableProcess from "observable-process";
 import { callArgs } from "textrun-extension";
+import { Configuration } from "../helpers/configuration.js";
 import { CurrentCommand } from "../helpers/current-command.js";
-import { trimDollar } from "../helpers/trim-dollar.js";
+import { parseCommand } from "../helpers/parse-command.js";
 /**
  * The "runConsoleCommand" action runs the given commands on the console
  * and waits until the command is finished.
  */
 export async function commandWithInput(action) {
-    const content = action.region.textInNodeOfTypes("fence", "code");
-    const commandsToRun = content
-        .split("\n")
-        .map((command) => command.trim())
-        .filter((e) => e)
-        .map(trimDollar)
-        .join(" && ");
+    var commandText = action.region[0].attributes["command"];
+    if (commandText === "") {
+        throw new Error('empty "command" attribute');
+    }
+    if (!commandText) {
+        commandText = action.region.textInNodeOfTypes("fence", "code");
+    }
+    const configPath = action.configuration.sourceDir.joinStr("textrun-shell.js");
+    const config = await Configuration.load(configPath);
+    const commandsToRun = parseCommand(commandText, config.pathMapper().globalizePathFunc());
     if (commandsToRun === "") {
         throw new Error(`the <${action.region[0].tag} ${action.configuration.regionMarker}="exec-with-input"> region contains no commands to run`);
     }

package/dist/actions/command.js

@@ -3,20 +3,20 @@ import * as observableProcess from "observable-process";
 import * as trExt from "textrun-extension";
 import { Configuration } from "../helpers/configuration.js";
 import { CurrentCommand } from "../helpers/current-command.js";
-import { trimDollar } from "../helpers/trim-dollar.js";
+import { parseCommand } from "../helpers/parse-command.js";
 /** Runs the given commands synchronously on the console. */
 export async function command(action) {
     action.name("run shell command");
     const configPath = action.configuration.sourceDir.joinStr("textrun-shell.js");
     const config = await Configuration.load(configPath);
-    const commandsToRun = action.region
-        .text()
-        .split("\n")
-        .map((line) => line.trim())
-        .map(trimDollar)
-        .filter((line) => line.length > 0)
-        .map(config.pathMapper().globalizePathFunc())
-        .join(" && ");
+    var commandText = action.region[0].attributes["command"];
+    if (commandText === "") {
+        throw new Error('empty "command" attribute');
+    }
+    if (!commandText) {
+        commandText = action.region.text();
+    }
+    const commandsToRun = parseCommand(commandText, config.pathMapper().globalizePathFunc());
     if (commandsToRun === "") {
         throw new Error(`the <${action.region[0].tag} ${action.configuration.regionMarker}="shell/command"> region contains no commands to run`);
     }

package/dist/actions/server.js

@@ -1,20 +1,27 @@
 import { styleText } from "node:util";
 import * as observableProcess from "observable-process";
 import * as trExt from "textrun-extension";
+import { Configuration } from "../helpers/configuration.js";
 import { CurrentServer } from "../helpers/current-server.js";
-import { trimDollar } from "../helpers/trim-dollar.js";
+import { parseCommand } from "../helpers/parse-command.js";
 /**
  * The "start" action runs the given commands on the console.
  * It leaves the command running.
  */
-export function server(action) {
-    const commandsToRun = action.region
-        .text()
-        .split("\n")
-        .map((line) => line.trim())
-        .filter((line) => line.length > 0)
-        .map(trimDollar)
-        .join(" && ");
+export async function server(action) {
+    const configPath = action.configuration.sourceDir.joinStr("textrun-shell.js");
+    const config = await Configuration.load(configPath);
+    var commandText = action.region[0].attributes["command"];
+    if (commandText === "") {
+        throw new Error('empty "command" attribute');
+    }
+    if (!commandText) {
+        commandText = action.region.text();
+    }
+    const commandsToRun = parseCommand(commandText, config.pathMapper().globalizePathFunc());
+    if (commandsToRun === "") {
+        throw new Error(`the <${action.region[0].tag} ${action.configuration.regionMarker}="shell/command"> region contains no commands to run`);
+    }
     action.name(`starting a server process: ${styleText(["bold", "cyan"], commandsToRun)}`);
     CurrentServer.instance().set(observableProcess.start(trExt.callArgs(commandsToRun, process.platform), {
         cwd: action.configuration.workspace.platformified()

package/dist/helpers/parse-command.js

@@ -0,0 +1,11 @@
+import { trimDollar } from "../helpers/trim-dollar.js";
+export function parseCommand(text, globalizePathFunc) {
+    return text
+        .split("\n")
+        .map((line) => line.trim())
+        .map(trimDollar)
+        .filter((line) => line.length > 0)
+        .map(globalizePathFunc)
+        .join(" && ");
+}
+//# sourceMappingURL=parse-command.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "textrun-shell",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "license": "ISC",
   "type": "module",
   "exports": "./dist/index.js",
@@ -22,16 +22,16 @@
     "end-child-processes": "2.0.3",
     "observable-process": "8.0.0",
     "strip-ansi": "7.1.2",
-    "text-runner-engine": "7.2.0",
-    "textrun-extension": "0.4.0"
+    "text-runner-engine": "7.3.0",
+    "textrun-extension": "0.5.0"
   },
   "devDependencies": {
     "shared-cucumber-steps": "*",
-    "text-runner": "7.2.0",
-    "textrun-action": "0.4.0",
-    "textrun-extension": "0.4.0",
-    "textrun-workspace": "0.4.0",
+    "text-runner": "7.3.0",
+    "textrun-action": "0.5.0",
+    "textrun-extension": "0.5.0",
+    "textrun-workspace": "0.5.0",
     "tsx": "4.20.6"
   },
-  "gitHead": "aecf7efd5e22e88535fe97ad7341b1a057520268"
+  "gitHead": "b369f2fba1f9182c9c1d5569a351aa057dd81f1e"
 }