editprompt 1.0.0 → 1.1.0

package/dist/index.js

@@ -9,7 +9,7 @@ import { tmpdir } from "node:os";
 import { join } from "node:path";
 
 //#region package.json
-var version = "1.0.0";
+var version = "1.1.0";
 
 //#endregion
 //#region src/modules/tmux.ts
@@ -265,6 +265,25 @@ function needsSpaceSeparator(prevLine, currentLine) {
 	return isLastCharAlpha && isFirstCharAlpha;
 }
 /**
+* Merge lines for Pattern A where indented lines likely indicate wrap
+*/
+function mergeIndentedContinuations(originalLines, trimmedLines) {
+	const result = [];
+	for (let i = 0; i < trimmedLines.length; i++) {
+		const line = trimmedLines[i] ?? "";
+		const original = originalLines[i] ?? "";
+		const prevOriginal = originalLines[i - 1] ?? "";
+		if (i > 0 && original.startsWith(" ") && original.trimStart().length > 0 && !prevOriginal.startsWith(" ") && !/^[-*+]\s/.test(original.trimStart())) {
+			const prev = result.pop() ?? "";
+			const separator = needsSpaceSeparator(prev, line) ? " " : "";
+			result.push(prev + separator + line);
+			continue;
+		}
+		result.push(line);
+	}
+	return result;
+}
+/**
 * Determine if two lines should be merged
 */
 function shouldMergeLines(prevLine, currentLine) {
@@ -278,10 +297,16 @@ function shouldMergeLines(prevLine, currentLine) {
 */
 function removeWhitespaceAndMergeLines(lines) {
 	const minWhitespace = getMinLeadingWhitespace(lines);
-	const trimmedLines = lines.map((line) => {
+	let trimmedLines = lines.map((line) => {
 		if (line.length === 0) return line;
 		return line.slice(minWhitespace);
 	});
+	trimmedLines = trimmedLines.map((line, index) => {
+		const original = lines[index] ?? "";
+		const prevOriginal = lines[index - 1] ?? "";
+		if (index > 0 && original.startsWith(" ") && original.trimStart().length > 0 && prevOriginal.trim().length > 0 && !/^[-*+]\s/.test(original.trimStart())) return original.trimStart().trimEnd();
+		return line.trimEnd();
+	});
 	const result = [];
 	let currentLine = "";
 	for (let i = 0; i < trimmedLines.length; i++) {
@@ -320,12 +345,14 @@ function removeWhitespaceAndMergeLines(lines) {
 * 4. Adding quote prefix ("> ") to each line
 * 5. Adding two newlines at the end
 */
-function processQuoteText(text) {
+function processQuoteText(text, options) {
+	const withQuote = options?.withQuote ?? true;
 	const lines = text.replace(/^\n+|\n+$/g, "").split("\n");
 	const hasNoLeadingWhitespaceInLaterLines = lines.slice(1).some((line) => line.length > 0 && !line.startsWith(" ") && !line.startsWith("	"));
 	let processedLines;
-	if (hasNoLeadingWhitespaceInLaterLines) processedLines = lines.map((line) => line.trimStart());
+	if (hasNoLeadingWhitespaceInLaterLines) processedLines = mergeIndentedContinuations(lines, lines.map((line) => line.trimStart().trimEnd()));
 	else processedLines = removeWhitespaceAndMergeLines(lines);
+	if (!withQuote) return processedLines.join("\n");
 	return `${processedLines.map((line) => `> ${line}`).join("\n")}\n\n`;
 }
 
@@ -431,6 +458,15 @@ const ARG_ALWAYS_COPY = {
 	description: "Always copy content to clipboard",
 	type: "boolean"
 };
+const ARG_NO_QUOTE = {
+	description: "Disable quote prefix and trailing blank lines",
+	type: "boolean"
+};
+const ARG_OUTPUT = {
+	description: "Output destination (buffer, stdout). Can be specified multiple times",
+	type: "string",
+	multiple: true
+};
 function validateMux(value) {
 	const muxValue = value || "tmux";
 	if (!isMuxType(muxValue)) {
@@ -454,6 +490,7 @@ function normalizeTargetPanes(value) {
 
 //#endregion
 //#region src/modes/collect.ts
+const SUPPORTED_OUTPUTS = ["buffer", "stdout"];
 async function readStdin() {
 	return new Promise((resolve, reject) => {
 		const chunks = [];
@@ -468,14 +505,29 @@ async function readStdin() {
 		});
 	});
 }
-async function runCollectMode(mux, targetPaneId, rawContent) {
+function normalizeCollectOutputs(value) {
+	let outputs = [];
+	if (Array.isArray(value)) outputs = value.map((v) => String(v));
+	else if (typeof value === "string") outputs = [value];
+	if (outputs.length === 0) return ["buffer"];
+	const uniqueOutputs = [...new Set(outputs)];
+	const invalid = uniqueOutputs.filter((v) => !SUPPORTED_OUTPUTS.includes(v));
+	if (invalid.length > 0) {
+		console.error(`Error: Invalid output(s) '${invalid.join(", ")}'. Supported values: ${SUPPORTED_OUTPUTS.join(", ")}`);
+		process.exit(1);
+	}
+	return uniqueOutputs;
+}
+async function runCollectMode(mux, targetPaneId, rawContent, outputs = ["buffer"], withQuote = true) {
 	try {
 		let selection;
 		if (rawContent !== void 0) selection = rawContent;
 		else selection = await readStdin();
-		const processedText = processQuoteText(selection);
-		if (mux === "tmux") await appendToQuoteVariable(targetPaneId, processedText);
-		else if (mux === "wezterm") await appendToQuoteText(targetPaneId, processedText);
+		const processedText = processQuoteText(selection, { withQuote });
+		for (const output of outputs) if (output === "buffer") {
+			if (mux === "tmux") await appendToQuoteVariable(targetPaneId, processedText);
+			else if (mux === "wezterm") await appendToQuoteText(targetPaneId, processedText);
+		} else if (output === "stdout") process.stdout.write(processedText);
 	} catch (error) {
 		console.error(`Error: ${error instanceof Error ? error.message : "Unknown error"}`);
 		process.exit(1);
@@ -486,11 +538,15 @@ const collectCommand = define({
 	description: "Collect and accumulate quoted text to pane variable",
 	args: {
 		mux: ARG_MUX,
-		"target-pane": ARG_TARGET_PANE_SINGLE
+		"target-pane": ARG_TARGET_PANE_SINGLE,
+		output: ARG_OUTPUT,
+		"no-quote": ARG_NO_QUOTE
 	},
 	async run(ctx) {
 		const targetPane = validateTargetPane(ctx.values["target-pane"], "collect");
 		const mux = validateMux(ctx.values.mux);
+		const outputs = normalizeCollectOutputs(ctx.values.output);
+		const withQuote = !ctx.values["no-quote"];
 		let rawContent;
 		if (mux === "wezterm") {
 			rawContent = extractRawContent(ctx.rest, ctx.positionals);
@@ -499,7 +555,7 @@ const collectCommand = define({
 				process.exit(1);
 			}
 		}
-		await runCollectMode(mux, targetPane, rawContent);
+		await runCollectMode(mux, targetPane, rawContent, outputs, withQuote);
 	}
 });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "editprompt",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "author": "eetann",
   "description": "A CLI tool that lets you write prompts for CLI tools using your favorite text editor",
   "license": "MIT",
@@ -40,7 +40,7 @@
     "build": "tsdown",
     "dev": "tsdown --watch",
     "lint": "biome check",
-    "formant": "biome format --write",
+    "format": "biome format --write",
     "typecheck": "tsgo --noEmit",
     "release": "bun run lint && bun run typecheck && bun run test && bun run build && bumpp",
     "test": "bun test",