@usesocial/cli 0.3.1 → 0.3.2

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @usesocial/cli
 
+## 0.3.2
+
+### Patch Changes
+
+- [#12](https://github.com/usesocial/monorepo/pull/12) [`a85b525`](https://github.com/usesocial/monorepo/commit/a85b525d36908cf25da92a0538b77ac39eb817c6) Thanks [@CyrusNuevoDia](https://github.com/CyrusNuevoDia)! - Read structured write payloads from stdin as JSON objects and remove `--body` from stdin-backed post, comment, and message commands. Plain stdin still becomes body text; valid non-object JSON now fails fast instead of being sent.
+
 ## 0.3.1
 
 ### Patch Changes

package/README.md

@@ -74,8 +74,7 @@ connected account.
 ### Body text
 
 Commands that create a post, comment, message, or connection note read the body
-from **stdin** — there is no text argument. Pipe it in, or pass a raw `--body`
-JSON object:
+from **stdin** — there is no text argument. Pipe it in:
 
 ```sh
 echo "gm" | social x post
@@ -83,8 +82,9 @@ social linkedin post < draft.md
 social linkedin requests send @handle < note.txt    # optional connection note
 ```
 
-On an interactive terminal with nothing piped (and no `--body`), these commands
-fail fast rather than hang.
+On an interactive terminal with nothing piped, required body-text commands fail
+fast rather than hang. To send advanced payload fields, pipe a JSON object via
+stdin; if stdin parses as JSON but is not an object, the command rejects it.
 
 ### Top level
 

package/dist/index.mjs

@@ -12971,6 +12971,7 @@ const positionalDisplayKeyFor$1 = (op, param) => op.config.paramLabels?.[param.n
 const bodyTextDisplayKeyFor$1 = (op) => op.config.bodyTextArg === void 0 ? void 0 : op.config.paramLabels?.[op.config.bodyTextArg] ?? op.config.bodyTextArg;
 const hasStdinBodyText$1 = (op) => op.config.bodyTextArg !== void 0;
 const stdinBodyTextRequired$1 = (op) => hasStdinBodyText$1(op) && op.config.bodyTextRequired !== false;
+const hasBodyOption = (op) => op.hasBody && !hasStdinBodyText$1(op);
 const idempotencyFor$1 = (op) => {
 	if (op.endpoint.capability === "read") return {
 		safe: true,
@@ -13062,7 +13063,7 @@ const exampleCommandFor$1 = (op, commandName, root) => {
 		parts.push(param.in === "path" || param.kind !== "array" ? hint : `${hint}...`);
 	}
 	if (hasStdinBodyText$1(op)) return `echo "..." | ${parts.join(" ")}`;
-	if (op.hasBody) parts.push("--body", "'{...}'");
+	if (hasBodyOption(op)) parts.push("--body", "'{...}'");
 	return parts.join(" ");
 };
 const operationModeFor$1 = (op) => {
@@ -13106,7 +13107,7 @@ const helpDescriptionFor$1 = (op, commandName, root) => {
 		...root ? [] : [op.config.group],
 		commandName
 	].join(" ");
-	return `${description} | ${usage}${hasStdinBodyText$1(op) ? ` | body text is read from stdin: \`echo "..." | ${label}\` (or pass --body)` : ""}`;
+	return `${description} | ${usage}${hasStdinBodyText$1(op) ? ` | body text is read from stdin: \`echo "..." | ${label}\`` : ""}`;
 };
 const commandPathFor = (op) => `linkedin ${op.config.root ? op.config.command : `${op.config.group} ${op.config.command}`}`;
 const contractInputSchemaName = (op) => op.hasBody ? `${op.schemaBaseName}ContractInput` : `${op.schemaBaseName}Input`;
@@ -13160,7 +13161,7 @@ const buildArgs$1 = (op) => {
 			description: param.description
 		};
 	}
-	if (op.hasBody) args.body = {
+	if (hasBodyOption(op)) args.body = {
 		type: "string",
 		description: "JSON request body"
 	};
@@ -13252,7 +13253,7 @@ const buildBody = (deps, op, input) => {
 	const bodyTextArg = op.config.bodyTextArg;
 	const bodyParamEntries = Object.entries(op.config.bodyParams ?? {});
 	if (!bodyTextArg && bodyParamEntries.length === 0) return input.body === void 0 ? void 0 : deps.parseJSONObject("--body", input.body);
-	const bodyFromJSON = input.body === void 0 ? void 0 : deps.parseJSONObject("--body", input.body);
+	const bodyFromJSON = input.body === void 0 ? void 0 : deps.parseJSONObject(hasStdinBodyText$1(op) ? "stdin" : "--body", input.body);
 	const bodyText = bodyTextArg && input[bodyTextArg] !== void 0 ? deps.parseBodyText(`<${bodyTextDisplayKeyFor$1(op) ?? bodyTextArg}>`, input[bodyTextArg]) : void 0;
 	const bodyParamValues = /* @__PURE__ */ new Map();
 	for (const [name, param] of bodyParamEntries) {
@@ -13266,7 +13267,7 @@ const buildBody = (deps, op, input) => {
 	}
 	if (bodyTextArg && bodyText !== void 0) body[bodyTextArg] = bodyText;
 	if (op.config.bodyTextRequired !== false && (Boolean(bodyTextArg) || bodyParamEntries.some(([, param]) => param.required)) && bodyFromJSON === void 0) {
-		if ((bodyTextArg ? bodyText === void 0 : false) || bodyParamEntries.some(([name, param]) => param.required && bodyParamValues.get(name) === void 0)) throw new UsageError(bodyTextArg && bodyParamEntries.length === 0 ? `Pass <${bodyTextDisplayKeyFor$1(op) ?? bodyTextArg}> or --body.` : "Pass required body positional arguments or --body.");
+		if ((bodyTextArg ? bodyText === void 0 : false) || bodyParamEntries.some(([name, param]) => param.required && bodyParamValues.get(name) === void 0)) throw new UsageError(bodyTextArg && bodyParamEntries.length === 0 ? `Pass <${bodyTextDisplayKeyFor$1(op) ?? bodyTextArg}>.` : "Pass required body positional arguments or --body.");
 	}
 	return body;
 };
@@ -13276,7 +13277,7 @@ const checkBodyRequired = (op, args) => {
 	const bodyTextArg = op.config.bodyTextArg;
 	if (bodyTextArg && op.config.bodyTextRequired !== false) expressions.push(args[bodyTextDisplayKeyFor$1(op) ?? bodyTextArg] === void 0);
 	for (const [name, param] of Object.entries(op.config.bodyParams ?? {})) if (param.required) expressions.push(args[flagName(bodyParamArg(name, param))] === void 0);
-	if (expressions.length > 0 && typeof args.body !== "string" && expressions.some(Boolean)) throw new UsageError(op.config.bodyTextArg && Object.keys(op.config.bodyParams ?? {}).length === 0 ? `Pass <${bodyTextDisplayKeyFor$1(op) ?? op.config.bodyTextArg}> or --body.` : "Pass required body positional arguments or --body.");
+	if (expressions.length > 0 && typeof args.body !== "string" && expressions.some(Boolean)) throw new UsageError(op.config.bodyTextArg && Object.keys(op.config.bodyParams ?? {}).length === 0 ? `Pass <${bodyTextDisplayKeyFor$1(op) ?? op.config.bodyTextArg}>.` : "Pass required body positional arguments or --body.");
 };
 const dataWithAuditableWriteTarget = (op, data, body) => {
 	if (op.schemaBaseName !== "PostsReact") return data;
@@ -13289,18 +13290,27 @@ const dataWithAuditableWriteTarget = (op, data, body) => {
 	};
 };
 const trimTrailingNewline$1 = (value) => value.endsWith("\r\n") ? value.slice(0, -2) : value.endsWith("\n") ? value.slice(0, -1) : value;
-const noBodyTextError$1 = (commandLabel) => new UsageError(`No body text. Pipe it via stdin: \`echo "..." | ${commandLabel}\` (or pass --body '<json>').`);
+const noBodyTextError$1 = (commandLabel) => new UsageError(`No body text. Pipe it via stdin: \`echo "..." | ${commandLabel}\`.`);
+const parseStdinBody$1 = (deps, bodyTextName, bodyTextKey, value) => {
+	try {
+		JSON.parse(value);
+	} catch {
+		return { [bodyTextKey]: deps.parseBodyText(`<${bodyTextName}>`, value) };
+	}
+	return deps.parseJSONObject("stdin", value);
+};
 const resolveBodyTextFromStdin$1 = async (op, deps, args, commandLabel) => {
 	if (!hasStdinBodyText$1(op)) return;
-	const bodyTextArg = bodyTextDisplayKeyFor$1(op) ?? op.config.bodyTextArg;
+	const bodyTextArg = op.config.bodyTextArg;
 	if (bodyTextArg === void 0) return;
-	const required = stdinBodyTextRequired$1(op) && typeof args.body !== "string";
+	const displayTextArg = bodyTextDisplayKeyFor$1(op) ?? bodyTextArg;
+	const required = stdinBodyTextRequired$1(op);
 	if (deps.isStdinTTY()) {
 		if (required) throw noBodyTextError$1(commandLabel);
 		return;
 	}
 	const piped = trimTrailingNewline$1(await deps.readStdin());
-	if (piped.length > 0) args[bodyTextArg] = piped;
+	if (piped.length > 0) args.body = JSON.stringify(parseStdinBody$1(deps, displayTextArg, bodyTextArg, piped));
 	else if (required) throw noBodyTextError$1(commandLabel);
 };
 const runOperation$1 = async (op, contract, deps, args, rawArgs = []) => {
@@ -13989,7 +13999,7 @@ const buildMessage$1 = (deps, sendCommand) => {
 	return defineCommand({
 		meta: commandMeta$2({
 			name: "message",
-			description: "Send a LinkedIn message to a person or conversation [write] | usage: `social linkedin message <target> < body-text` | body text is read from stdin: `echo \"...\" | social linkedin message <target>` (or pass --body)",
+			description: "Send a LinkedIn message to a person or conversation [write] | usage: `social linkedin message <target> < body-text` | body text is read from stdin: `echo \"...\" | social linkedin message <target>`",
 			method: "POST",
 			capability: "write",
 			mutates: true,
@@ -14007,10 +14017,6 @@ const buildMessage$1 = (deps, sendCommand) => {
 				description: "LinkedIn person or conversation target: @handle, profile URL, profile_id:<id>, chat_id:<id>, or a messaging thread URL",
 				valueHint: "target"
 			},
-			body: {
-				type: "string",
-				description: "JSON request body"
-			},
 			account: {
 				type: "string",
 				description: "Account selector: @handle or profile_id:<id>; overrides config default"
@@ -14018,6 +14024,7 @@ const buildMessage$1 = (deps, sendCommand) => {
 		},
 		run: async ({ args }) => {
 			const positionals = Array.isArray(args._) ? args._.map(String) : [];
+			if (typeof args.body === "string") throw new UsageError("Unsupported option --body for linkedin message.");
 			if (positionals[1] === "delete" || positionals[1] === "edit") {
 				const verbCommand = positionals[1] === "delete" ? deleteCommand : editCommand;
 				await verbCommand.run?.({
@@ -14033,23 +14040,13 @@ const buildMessage$1 = (deps, sendCommand) => {
 				return;
 			}
 			const target = args.target ?? (Array.isArray(args._) && args._.length > 0 ? args._[0] : void 0);
-			const hasBody = typeof args.body === "string";
-			let textInput;
-			if (deps.isStdinTTY()) {
-				if (!hasBody) throw noBodyTextError$1("social linkedin message <target>");
-			} else {
-				const piped = trimTrailingNewline$1(await deps.readStdin());
-				if (piped.length > 0) textInput = piped;
-				else if (!hasBody) throw noBodyTextError$1("social linkedin message <target>");
-			}
+			let body;
+			if (deps.isStdinTTY()) throw noBodyTextError$1("social linkedin message <target>");
+			const piped = trimTrailingNewline$1(await deps.readStdin());
+			if (piped.length > 0) body = parseStdinBody$1(deps, "text", "text", piped);
+			else throw noBodyTextError$1("social linkedin message <target>");
 			if (target === void 0) throw new UsageError("Pass a conversation or person target.");
-			const bodyFromJSON = typeof args.body === "string" ? deps.parseJSONObject("--body", args.body) : void 0;
-			const text = textInput === void 0 ? void 0 : deps.parseBodyText("<text>", textInput);
-			const body = text === void 0 ? bodyFromJSON : {
-				...bodyFromJSON ?? {},
-				text
-			};
-			if (body === void 0 || typeof body.text !== "string") throw new UsageError("Pass <text> or --body.");
+			if (body === void 0 || typeof body.text !== "string") throw new UsageError("Pass body text via stdin.");
 			const account = typeof args.account === "string" ? args.account : void 0;
 			const classified = await deps.classifyMessageTarget("target", target, {
 				platform: "linkedin",
@@ -17155,14 +17152,14 @@ const operationModeFor = (op) => {
 	if (op.endpoint.method === "DELETE") return "destructive";
 	return op.endpoint.mutates ? "write" : "read";
 };
-const signaturePartFor = (op, name, arg) => {
+const signaturePartFor = (_op, name, arg) => {
 	if (!isObjectRecord$1(arg)) return;
 	if (arg.type === "positional") {
 		const valueHint = typeof arg.valueHint === "string" ? arg.valueHint : name;
 		return arg.required === true ? `<${valueHint}>` : `[${valueHint}]`;
 	}
 	if (name === "limit") return "--limit N";
-	if (name === "body" && !hasStdinBodyText(op)) return "--body JSON";
+	if (name === "body") return "--body JSON";
 };
 const stdinSignaturePart = (op) => hasStdinBodyText(op) ? "< body-text" : void 0;
 const usageFor = (op, commandName, group) => {
@@ -17191,7 +17188,7 @@ const helpDescriptionFor = (op, commandName, group) => {
 		group,
 		commandName
 	].filter(Boolean).join(" ");
-	return `${description} | ${usage}${hasStdinBodyText(op) ? ` | body text is read from stdin: \`echo "..." | ${label}\` (or pass --body)` : ""}`;
+	return `${description} | ${usage}${hasStdinBodyText(op) ? ` | body text is read from stdin: \`echo "..." | ${label}\`` : ""}`;
 };
 const contractFor$1 = (op, commandName, group) => {
 	const mutates = op.endpoint.mutates;
@@ -17237,7 +17234,7 @@ const buildArgs = (op) => {
 			description: param.description
 		};
 	}
-	if (op.hasBody) args.body = {
+	if (op.hasBody && !hasStdinBodyText(op)) args.body = {
 		type: "string",
 		description: "JSON request body"
 	};
@@ -17383,18 +17380,27 @@ const withEchoedTargetId = (op, data, body) => {
 	};
 };
 const trimTrailingNewline = (value) => value.endsWith("\r\n") ? value.slice(0, -2) : value.endsWith("\n") ? value.slice(0, -1) : value;
-const noBodyTextError = (commandLabel) => new UsageError(`No body text. Pipe it via stdin: \`echo "..." | ${commandLabel}\` (or pass --body '<json>').`);
+const noBodyTextError = (commandLabel) => new UsageError(`No body text. Pipe it via stdin: \`echo "..." | ${commandLabel}\`.`);
+const parseStdinBody = (deps, bodyTextName, bodyTextKey, value) => {
+	try {
+		JSON.parse(value);
+	} catch {
+		return { [bodyTextKey]: deps.parseBodyText(`<${bodyTextName}>`, value) };
+	}
+	return deps.parseJSONObject("stdin", value);
+};
 const resolveBodyTextFromStdin = async (op, deps, args, commandLabel) => {
 	if (!hasStdinBodyText(op)) return;
-	const bodyTextArg = bodyTextDisplayKeyFor(op) ?? op.config.bodyTextArg;
+	const bodyTextArg = op.config.bodyTextArg;
 	if (bodyTextArg === void 0) return;
-	const required = stdinBodyTextRequired(op) && args.body === void 0;
+	const displayTextArg = bodyTextDisplayKeyFor(op) ?? bodyTextArg;
+	const required = stdinBodyTextRequired(op);
 	if (deps.isStdinTTY()) {
 		if (required) throw noBodyTextError(commandLabel);
 		return;
 	}
 	const piped = trimTrailingNewline(await deps.readStdin());
-	if (piped.length > 0) args[bodyTextArg] = piped;
+	if (piped.length > 0) args.body = JSON.stringify(parseStdinBody(deps, displayTextArg, bodyTextArg, piped));
 	else if (required) throw noBodyTextError(commandLabel);
 };
 const runOperation = async (op, contract, deps, args, rawArgs = []) => {
@@ -17483,7 +17489,7 @@ const runOperation = async (op, contract, deps, args, rawArgs = []) => {
 	};
 	let body;
 	if (op.hasBody) {
-		const bodyFromJSON = input.body === void 0 ? void 0 : deps.parseJSONObject("--body", input.body);
+		const bodyFromJSON = input.body === void 0 ? void 0 : deps.parseJSONObject(hasStdinBodyText(op) ? "stdin" : "--body", input.body);
 		const textArg = op.config.bodyTextArg;
 		if (textArg) {
 			const displayTextArg = bodyTextDisplayKeyFor(op) ?? textArg;
@@ -17946,7 +17952,7 @@ const buildMessage = (deps) => {
 	return defineCommand({
 		meta: commandMeta$1({
 			name: "message",
-			description: "Send a DM to a participant or conversation [write] | usage: `social x message <recipients> < body-text` | body text is read from stdin: `echo \"...\" | social x message <recipients>` (or pass --body)",
+			description: "Send a DM to a participant or conversation [write] | usage: `social x message <recipients> < body-text` | body text is read from stdin: `echo \"...\" | social x message <recipients>`",
 			method: "POST",
 			capability: "write",
 			mutates: true,
@@ -17960,36 +17966,23 @@ const buildMessage = (deps) => {
 				description: "Recipient(s): chat URL, chat_id:<id>, @handle, profile URL, or profile_id:<id>; comma-separate profiles for a group",
 				valueHint: "recipients"
 			},
-			body: {
-				type: "string",
-				description: "JSON request body"
-			},
 			account: {
 				type: "string",
 				description: "Account selector: @handle or profile_id:<id>; overrides config default"
 			}
 		},
 		run: async ({ args }) => {
+			if (typeof args.body === "string") throw new UsageError("Unsupported option --body for x message.");
 			const recipientsInput = args.recipients ?? args.target ?? (Array.isArray(args._) && args._.length > 0 ? args._[0] : void 0);
-			const hasBody = typeof args.body === "string";
-			let textInput;
-			if (deps.isStdinTTY()) {
-				if (!hasBody) throw noBodyTextError("social x message <recipients>");
-			} else {
-				const piped = trimTrailingNewline(await deps.readStdin());
-				if (piped.length > 0) textInput = piped;
-				else if (!hasBody) throw noBodyTextError("social x message <recipients>");
-			}
+			let body;
+			if (deps.isStdinTTY()) throw noBodyTextError("social x message <recipients>");
+			const piped = trimTrailingNewline(await deps.readStdin());
+			if (piped.length > 0) body = parseStdinBody(deps, "text", "text", piped);
+			else throw noBodyTextError("social x message <recipients>");
 			if (recipientsInput === void 0) throw new UsageError("Pass a conversation or user target.");
 			const recipients = String(recipientsInput).split(",").map((recipient) => recipient.trim()).filter((recipient) => recipient.length > 0);
 			if (recipients.length === 0) throw new UsageError("Pass at least one recipient.");
-			const bodyFromJSON = typeof args.body === "string" ? deps.parseJSONObject("--body", args.body) : void 0;
-			const text = textInput === void 0 ? void 0 : deps.parseBodyText("--text", textInput);
-			const body = text === void 0 ? bodyFromJSON : {
-				...bodyFromJSON ?? {},
-				text
-			};
-			if (body === void 0) throw new UsageError("Pass <text> or --body.");
+			if (body === void 0) throw noBodyTextError("social x message <recipients>");
 			const resolved = [];
 			const account = typeof args.account === "string" ? args.account : void 0;
 			const selectedAccount = await deps.resolveAccount({
@@ -18018,12 +18011,13 @@ const buildMessage = (deps) => {
 				})));
 				for (const resolution of participantResolutions) resolved.push(resolution.record);
 				const participant_ids = participantResolutions.map((resolution) => resolution.id);
+				const { text, ...bodyFields } = body;
 				requestPath = "x/dm_conversations";
 				requestBody = {
 					conversation_type: "Group",
-					...bodyFromJSON ?? {},
 					participant_ids,
-					...text === void 0 ? {} : { message: { text } }
+					...bodyFields,
+					...typeof text === "string" ? { message: { text } } : {}
 				};
 			}
 			const response = await deps.api.post(requestPath, {
@@ -21064,7 +21058,7 @@ const createInstance = (defaults) => {
 const ky = createInstance();
 //#endregion
 //#region package.json
-var version$1 = "0.3.1";
+var version$1 = "0.3.2";
 //#endregion
 //#region src/lib/env.ts
 const URLWithTrailingSlash = url().transform(ensureTrailingSlash);

package/package.json

@@ -11,7 +11,7 @@
     "access": "public"
   },
   "private": false,
-  "version": "0.3.1",
+  "version": "0.3.2",
   "type": "module",
   "engines": {
     "node": ">=22.5.0"