@staff0rd/assist 0.513.0 → 0.514.1

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.513.0",
+  version: "0.514.1",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -15358,15 +15358,39 @@ function consumeRedirect(tokens, opIndex, current) {
       error: `redirect target '${target}' is outside the OS temp directory`
     };
   }
+  popFdPrefix(current);
+  return { ok: true, nextIndex: opIndex + 1 };
+}
+function popFdPrefix(current) {
   if (current.length > 0 && /^\d$/.test(current[current.length - 1])) {
     current.pop();
   }
+}
+
+// src/shared/consumeHeredoc.ts
+function consumeHeredoc(tokens, opIndex, current) {
+  const delimiter = tokens[opIndex + 2];
+  if (typeof delimiter !== "string") {
+    return { ok: false, error: "unable to parse" };
+  }
+  popFdPrefix(current);
+  return { ok: true, nextIndex: opIndex + 2 };
+}
+
+// src/shared/consumeInputRedirect.ts
+function consumeInputRedirect(tokens, opIndex, current) {
+  const source = tokens[opIndex + 1];
+  if (typeof source !== "string") {
+    return { ok: false, error: "unable to parse" };
+  }
+  popFdPrefix(current);
   return { ok: true, nextIndex: opIndex + 1 };
 }
 
 // src/shared/groupByOperator.ts
 var SEPARATOR_OPS = /* @__PURE__ */ new Set(["|", "&&", "||", ";"]);
 var OUTPUT_REDIRECT_OPS = /* @__PURE__ */ new Set([">", ">>"]);
+var INPUT_REDIRECT_OP = "<";
 var UNPARSEABLE = { ok: false, error: "unable to parse" };
 function groupByOperator(tokens) {
   const groups = [[]];
@@ -15392,6 +15416,10 @@ function handleToken(tokens, i, groups) {
   if (OUTPUT_REDIRECT_OPS.has(op)) {
     return consumeRedirect(tokens, i, groups[groups.length - 1]);
   }
+  if (op === INPUT_REDIRECT_OP) {
+    const current = groups[groups.length - 1];
+    return getOp(tokens[i + 1]) === INPUT_REDIRECT_OP ? consumeHeredoc(tokens, i, current) : consumeInputRedirect(tokens, i, current);
+  }
   return UNPARSEABLE;
 }
 function appendWord(token, groups, i) {
@@ -15413,6 +15441,90 @@ function hasUnquotedBackticks(command) {
   return false;
 }
 
+// src/shared/separateCommandLines.ts
+var ESCAPE_OR_QUOTED_OR_NEWLINE_RE = /\\[\s\S]|'[^']*'|"[^"]*"|(\n)/g;
+function separateCommandLines(command) {
+  if (!command.includes("\n")) return command;
+  return command.replace(
+    ESCAPE_OR_QUOTED_OR_NEWLINE_RE,
+    (match, newline) => newline === void 0 ? match : ";"
+  );
+}
+
+// src/shared/matchHeredocHeader.ts
+var HEADER_RE = /^<<-?[ \t]*(?:'([^']*)'|"([^"]*)"|([^\s;|&<>()'"$`]+))/;
+function matchHeredocHeader(command, start3) {
+  let end = start3;
+  while (command[end] === "<") end++;
+  const angles = command.slice(start3, end);
+  if (angles.length !== 2) return { text: angles };
+  const match = HEADER_RE.exec(command.slice(start3));
+  if (!match) return { text: angles };
+  return { text: match[0], delimiter: match[1] ?? match[2] ?? match[3] };
+}
+
+// src/shared/skipHeredocBodies.ts
+function skipHeredocBodies(command, start3, delimiters) {
+  let i = start3;
+  for (const delimiter of delimiters) i = skipBody(command, i, delimiter);
+  return i;
+}
+function skipBody(command, start3, delimiter) {
+  let i = start3;
+  while (i < command.length) {
+    const newline = command.indexOf("\n", i);
+    const line = command.slice(i, newline === -1 ? command.length : newline);
+    i = newline === -1 ? command.length : newline + 1;
+    if (line.trim() === delimiter) return i;
+  }
+  return i;
+}
+
+// src/shared/stripHeredocBodies.ts
+function stripHeredocBodies(command) {
+  if (!command.includes("<<")) return command;
+  let out = "";
+  let pending = [];
+  let quote;
+  let i = 0;
+  while (i < command.length) {
+    const char = command[i];
+    if (char === "\\" && quote !== "'" && i + 1 < command.length) {
+      out += command.slice(i, i + 2);
+      i += 2;
+      continue;
+    }
+    if (quote) {
+      if (char === quote) quote = void 0;
+      out += char;
+      i++;
+      continue;
+    }
+    if (char === "'" || char === '"') {
+      quote = char;
+      out += char;
+      i++;
+      continue;
+    }
+    if (char === "\n" && pending.length > 0) {
+      out += char;
+      i = skipHeredocBodies(command, i + 1, pending);
+      pending = [];
+      continue;
+    }
+    if (char === "<") {
+      const header = matchHeredocHeader(command, i);
+      if (header.delimiter !== void 0) pending.push(header.delimiter);
+      out += header.text;
+      i += header.text.length;
+      continue;
+    }
+    out += char;
+    i++;
+  }
+  return out;
+}
+
 // src/shared/splitCompound.ts
 var FD_REDIRECT_RE = /\d+>&\d+/g;
 var FD_DEVNULL_RE = /\d*>(?:\/dev\/null|\$null)/g;
@@ -15422,12 +15534,12 @@ function splitCompound(command) {
   if (!tokens) return UNPARSEABLE2;
   const grouped = groupByOperator(tokens);
   if (!grouped.ok) return grouped;
-  const parts = grouped.groups.map((g) => stripEnvPrefix(g).join(" ")).filter((cmd) => cmd !== "");
+  const parts = grouped.groups.map((g) => stripEnvPrefix(g.filter((word) => word !== "")).join(" ")).filter((cmd) => cmd !== "");
   if (parts.length === 0) return UNPARSEABLE2;
   return { ok: true, parts };
 }
 function tokenizeCommand(command) {
-  const trimmed = command.trim().replace(FD_DEVNULL_RE, "").replace(FD_REDIRECT_RE, "");
+  const trimmed = separateCommandLines(stripHeredocBodies(command.trim())).replace(FD_DEVNULL_RE, "").replace(FD_REDIRECT_RE, "");
   if (!trimmed) return void 0;
   if (hasUnquotedBackticks(trimmed)) return void 0;
   try {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@staff0rd/assist",
-	"version": "0.513.0",
+	"version": "0.514.1",
 	"type": "module",
 	"main": "dist/index.js",
 	"bin": {