@usesocial/cli 0.12.1 → 0.12.3

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @usesocial/cli
 
+## 0.12.3
+
+### Patch Changes
+
+- [#81](https://github.com/usesocial/monorepo/pull/81) [`f4ef94b`](https://github.com/usesocial/monorepo/commit/f4ef94ba089bf4d8bd4a0b42495be6f88608b85e) Thanks [@CyrusNuevoDia](https://github.com/CyrusNuevoDia)! - Return a checkout URL from non-interactive account connect when a billing seat must be activated.
+
+## 0.12.2
+
+### Patch Changes
+
+- [#73](https://github.com/usesocial/monorepo/pull/73) [`666b356`](https://github.com/usesocial/monorepo/commit/666b356706c40b7a3dc5e14ec53d76428b25f5c4) Thanks [@CyrusNuevoDia](https://github.com/CyrusNuevoDia)! - Stop double-wrapping X list mutation output under nested data objects.
+
+- [#73](https://github.com/usesocial/monorepo/pull/73) [`1cfedc9`](https://github.com/usesocial/monorepo/commit/1cfedc967b3fa82249bbca059856cc641c87868e) Thanks [@CyrusNuevoDia](https://github.com/CyrusNuevoDia)! - Detect Bun-installed social CLI when printing update commands.
+
 ## 0.12.1
 
 ### Patch Changes

package/dist/index.mjs

@@ -2,7 +2,7 @@
 import { createRequire } from "node:module";
 import * as fs from "node:fs";
 import { createReadStream, existsSync, mkdirSync, readFileSync, realpathSync, writeFileSync } from "node:fs";
-import { basename, dirname, extname, join, resolve } from "node:path";
+import { basename, delimiter, dirname, extname, join, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 import { homedir } from "node:os";
 import { parseArgs, styleText } from "node:util";
@@ -1598,7 +1598,7 @@ const LINKEDIN_COLLECTIONS = [
 		parentCollection: "li_conversations",
 		parentIdToken: ":chat_id",
 		pagination: linkedinCursorPagination,
-		pageSize: 250,
+		pageSize: 100,
 		sinceField: "timestamp",
 		lift: liftMessage
 	},
@@ -12663,6 +12663,45 @@ looseObject({
 });
 h("ChatListParseError")();
 h("ChatParticipantsFetchError")();
+const dropLinkedinInmailEligibility = (value) => {
+	if (Array.isArray(value)) {
+		let changed = false;
+		const items = value.map((item) => {
+			const stripped = dropLinkedinInmailEligibility(item);
+			changed ||= stripped.changed;
+			return stripped.value;
+		});
+		return changed ? {
+			value: items,
+			changed
+		} : {
+			value,
+			changed
+		};
+	}
+	if (!(value && typeof value === "object")) return {
+		value,
+		changed: false
+	};
+	let changed = false;
+	const next = {};
+	for (const [key, child] of Object.entries(value)) {
+		if (key === "can_send_inmail") {
+			changed = true;
+			continue;
+		}
+		const stripped = dropLinkedinInmailEligibility(child);
+		changed ||= stripped.changed;
+		next[key] = stripped.value;
+	}
+	return changed ? {
+		value: next,
+		changed
+	} : {
+		value,
+		changed
+	};
+};
 const linkedinProfileExtractors = {
 	"GET /users/me": extractProfile$1,
 	"GET /users/:identifier": extractProfile$1,
@@ -21189,14 +21228,23 @@ const listOutputSchema = object({
 	includes: record(string(), unknown()).optional(),
 	meta: record(string(), unknown()).optional()
 }).passthrough();
-const listWriteAggregateOutputSchema = object({ data: object({
+const ListWriteOutput = record(string(), unknown());
+const ListWriteResponse = object({
+	data: ListWriteOutput.optional(),
+	errors: array(record(string(), unknown())).optional()
+}).passthrough();
+const ListWriteAggregateOutput = object({
 	list_id: string(),
 	results: array(object({
 		input: string(),
 		user_id: string(),
 		response: unknown()
 	}))
-}) }).passthrough();
+}).passthrough();
+const listWriteDataFromResponse = async (response) => {
+	const data = ListWriteResponse.parse(await response.json());
+	return data.data ?? data;
+};
 const readCost = (category, opts) => {
 	const usage = priceUsage(costBPSForCategory(category));
 	return {
@@ -21270,7 +21318,7 @@ const listReadContract = (inputSchema, pagination) => manualSchemaContract({
 });
 const listWriteContract = (args) => manualSchemaContract({
 	inputSchema: args.inputSchema,
-	outputSchema: args.outputSchema ?? listOutputSchema,
+	outputSchema: args.outputSchema ?? ListWriteOutput,
 	auth: {
 		required: true,
 		scopes: ["read", "write"]
@@ -21376,13 +21424,13 @@ const listDeleteContract = listWriteContract({
 const listMemberWriteContract = listWriteContract({
 	inputSchema: ListMemberWriteInput,
 	method: "POST",
-	outputSchema: listWriteAggregateOutputSchema,
+	outputSchema: ListWriteAggregateOutput,
 	pricing: "list_manage"
 });
 const listMemberRemoveContract = listWriteContract({
 	inputSchema: ListMemberWriteInput,
 	method: "DELETE",
-	outputSchema: listWriteAggregateOutputSchema,
+	outputSchema: ListWriteAggregateOutput,
 	destructive: true,
 	pricing: "list_manage"
 });
@@ -21563,7 +21611,7 @@ const buildLists = (deps) => {
 			await deps.printResult({
 				account: own.account,
 				contract: listCreateContract,
-				data: await response.json(),
+				data: await listWriteDataFromResponse(response),
 				responseHeaders: response.headers
 			});
 		}
@@ -21624,7 +21672,7 @@ const buildLists = (deps) => {
 			await deps.printResult({
 				account: own.account,
 				contract: listUpdateContract,
-				data: await response.json(),
+				data: await listWriteDataFromResponse(response),
 				resolved: [target.record],
 				responseHeaders: response.headers
 			});
@@ -21660,7 +21708,7 @@ const buildLists = (deps) => {
 			await deps.printResult({
 				account: own.account,
 				contract: listDeleteContract,
-				data: await response.json(),
+				data: await listWriteDataFromResponse(response),
 				resolved: [target.record],
 				responseHeaders: response.headers
 			});
@@ -21792,16 +21840,16 @@ const buildList = (deps) => {
 				results.push({
 					input: user,
 					user_id: userResolved.id,
-					response: await response.json()
+					response: await listWriteDataFromResponse(response)
 				});
 			}
 			await deps.printResult({
 				account: own.account,
 				contract: kind === "add" ? listMemberWriteContract : listMemberRemoveContract,
-				data: { data: {
+				data: {
 					list_id: target.id,
 					results
-				} },
+				},
 				resolved
 			});
 		}
@@ -23913,7 +23961,7 @@ function createEnv(opts) {
 }
 //#endregion
 //#region package.json
-var version$1 = "0.12.1";
+var version$1 = "0.12.3";
 //#endregion
 //#region src/lib/env.ts
 const URLWithTrailingSlash = url().transform(ensureTrailingSlash);
@@ -25446,8 +25494,8 @@ const isArray = nativeIsArray || function(obj) {
 };
 const isObject = (x) => x === Object(x) && !isArray(x);
 const isUndefined = (x) => void 0 === x;
-const isString = (x) => "[object String]" == type_utils_toString.call(x);
-const isEmptyString = (x) => isString(x) && 0 === x.trim().length;
+const isString$1 = (x) => "[object String]" == type_utils_toString.call(x);
+const isEmptyString = (x) => isString$1(x) && 0 === x.trim().length;
 const isNumber = (x) => "[object Number]" == type_utils_toString.call(x) && x === x;
 const isPlainError = (x) => x instanceof Error;
 function isPrimitive(value) {
@@ -26272,7 +26320,7 @@ var ObjectCoercer = class {
 		return `${className && "Object" !== className ? `'${className}'` : "Object"} captured as exception with keys: ${keys}`;
 	}
 	isSeverityLevel(x) {
-		return isString(x) && !isEmptyString(x) && severityLevels.indexOf(x) >= 0;
+		return isString$1(x) && !isEmptyString(x) && severityLevels.indexOf(x) >= 0;
 	}
 	getErrorPropertyFromObject(obj) {
 		for (const prop in obj) if (Object.prototype.hasOwnProperty.call(obj, prop)) {
@@ -31871,15 +31919,32 @@ const LifecycleAccountOutput = object({
 	connectedAt: string().optional(),
 	lastSeenAt: string().optional()
 }).passthrough();
-const AccountConnectStateOutput = discriminatedUnion("status", [object({
-	status: literal("connected"),
-	platform: _enum(["linkedin", "x"]),
-	account: LifecycleAccountOutput
-}), object({
-	status: literal("pending_approval"),
-	platform: _enum(["linkedin", "x"]),
-	connectURL: string()
-})]);
+const AccountConnectStateOutput = discriminatedUnion("status", [
+	object({
+		status: literal("connected"),
+		platform: _enum(["linkedin", "x"]),
+		account: LifecycleAccountOutput
+	}),
+	object({
+		status: literal("pending_billing"),
+		platform: _enum(["linkedin", "x"]),
+		paymentURL: string().nullable(),
+		requiredAction: object({
+			code: string(),
+			reason: string()
+		}).nullable(),
+		seats: object({
+			total: number().int().nonnegative(),
+			used: number().int().nonnegative(),
+			available: number().int().nonnegative()
+		})
+	}),
+	object({
+		status: literal("pending_approval"),
+		platform: _enum(["linkedin", "x"]),
+		connectURL: string()
+	})
+]);
 const AccountConnectOutput = union([string(), AccountConnectStateOutput]);
 const AccountDisconnectOutput = object({
 	platform: _enum(["linkedin", "x"]),
@@ -32013,6 +32078,20 @@ const runConnectStep = async (deps, platform, listConnected, connectURL) => {
 		});
 		return;
 	}
+	const billing = await deps.client.billing.prepareAccountConnect();
+	if (!billing.canConnect) {
+		if (!billing.seats) throw new Error("billing_prepare_missing_seats");
+		if (billing.paymentURL) writeText(deps, `Open this URL: ${billing.paymentURL}`);
+		else if (billing.requiredAction) writeText(deps, billing.requiredAction.reason);
+		await writeOutput(deps, {
+			status: "pending_billing",
+			platform,
+			paymentURL: billing.paymentURL ?? null,
+			requiredAction: billing.requiredAction ?? null,
+			seats: billing.seats
+		});
+		return;
+	}
 	const url = await connectURL();
 	writeText(deps, `Open this URL: ${url}`);
 	await writeOutput(deps, {
@@ -38025,12 +38104,47 @@ const compareSemver = (left, right) => {
 	}
 	return 0;
 };
-const detectPackageManager = (packageRoot) => {
-	const normalized = packageRoot.replaceAll("\\", "/");
+const normalizedPath = (path) => path.replaceAll("\\", "/");
+const managerFromPath = (path) => {
+	const normalized = normalizedPath(path);
 	if (normalized.includes("/Cellar/usesocial/") || normalized.includes("/Cellar/cli/") || normalized.includes("/Homebrew/")) return "brew";
-	if (normalized.includes("/.bun/install/global/")) return "bun";
+	if (normalized.includes("/.bun/bin/") || normalized.includes("/.bun/install/global/")) return "bun";
+};
+const defaultRealpath = (path) => {
+	try {
+		return realpathSync(path);
+	} catch {
+		return;
+	}
+};
+const isString = (value) => value !== void 0;
+const packageManagerPaths = (packageRoot, options) => {
+	const pathExists = options.pathExists ?? existsSync;
+	const realpath = options.realpath ?? defaultRealpath;
+	const paths = [options.executablePath];
+	if (options.pathEnv) for (const binDir of options.pathEnv.split(delimiter)) {
+		if (!binDir) continue;
+		for (const binary of ["social", "social.cmd"]) {
+			const candidate = join(binDir, binary);
+			if (pathExists(candidate)) paths.push(candidate);
+		}
+	}
+	paths.push(packageRoot);
+	return [...new Set(paths.flatMap((path) => path ? [path, realpath(path)] : []).filter(isString))];
+};
+const detectPackageManager = (packageRoot, options = {}) => {
+	for (const path of packageManagerPaths(packageRoot, options)) {
+		const manager = managerFromPath(path);
+		if (manager) return manager;
+	}
 	return "npm";
 };
+const detectPackageManagerFor = (deps) => detectPackageManager(deps.packageRoot ?? internalPackageRoot(), {
+	executablePath: deps.executablePath ?? process.argv[1],
+	pathEnv: deps.pathEnv ?? process.env.PATH,
+	pathExists: deps.pathExists,
+	realpath: deps.realpath
+});
 const cliUpdateCommand = (manager) => {
 	if (manager === "brew") return "brew upgrade usesocial/tap/cli";
 	if (manager === "bun") return "bun install -g @usesocial/cli@latest";
@@ -38074,12 +38188,12 @@ const unknownCLIStatus = () => ({
 	updateCommand: null
 });
 const checkCLIUpdate = async (deps = {}) => {
-	const packageRoot = deps.packageRoot ?? internalPackageRoot();
+	const manager = detectPackageManagerFor(deps);
 	const fetchImpl = deps.fetch ?? fetch;
 	try {
 		const response = await fetchImpl(NPM_REGISTRY_URL, { headers: { accept: "application/json" } });
 		if (!response.ok) return unknownCLIStatus();
-		return parseNPMUpdateResult(await response.json(), VERSION, detectPackageManager(packageRoot));
+		return parseNPMUpdateResult(await response.json(), VERSION, manager);
 	} catch {
 		return unknownCLIStatus();
 	}
@@ -38243,7 +38357,7 @@ const unknownSkillStatus = () => ({
 	updateCommand: null
 });
 const checkSkillUpdate = async (deps = {}) => {
-	const manager = detectPackageManager(deps.packageRoot ?? internalPackageRoot());
+	const manager = detectPackageManagerFor(deps);
 	const install = await installedSkillCandidate(deps);
 	if (!install) return {
 		scope: null,
@@ -38314,20 +38428,20 @@ const withNotice = (cache, key, now) => ({
 		[key]: now
 	}
 });
-const noticeLinesFor = (cache, now) => {
+const noticeLinesFor = (cache, now, manager) => {
 	const notices = [];
-	if (cache.cli.status === "update_available" && cache.cli.latestVersion && cache.cli.updateCommand) {
+	if (cache.cli.status === "update_available" && cache.cli.currentVersion === VERSION && cache.cli.latestVersion && compareSemver(cache.cli.latestVersion, VERSION) > 0) {
 		const key = `cli:${cache.cli.latestVersion}`;
 		if (noticeDue(cache, key, now)) notices.push({
 			key,
-			line: `Update available: social CLI ${cache.cli.latestVersion} (current ${cache.cli.currentVersion}). Run: ${cache.cli.updateCommand}`
+			line: `Update available: social CLI ${cache.cli.latestVersion} (current ${cache.cli.currentVersion}). Run: ${cliUpdateCommand(manager)}`
 		});
 	}
-	if (cache.skill.status === "update_available" && cache.skill.scope && cache.skill.updateCommand && cache.skill.remoteTreeSHA) {
+	if (cache.skill.status === "update_available" && cache.skill.scope && cache.skill.remoteTreeSHA) {
 		const key = `skill:${cache.skill.scope}:${cache.skill.remoteTreeSHA}`;
 		if (noticeDue(cache, key, now)) notices.push({
 			key,
-			line: `Update available: social skill (${cache.skill.scope}). Run: ${cache.skill.updateCommand}`
+			line: `Update available: social skill (${cache.skill.scope}). Run: ${skillUpdateCommand(cache.skill.scope, manager)}`
 		});
 	}
 	return notices;
@@ -38351,8 +38465,9 @@ const maybeRunUpdateAwareness = async (deps = {}) => {
 	const home = deps.home;
 	const cache = await readCachedUpdateStatus(home);
 	if (cache) {
+		const manager = detectPackageManagerFor(deps);
 		let next = cache;
-		for (const notice of noticeLinesFor(cache, now)) {
+		for (const notice of noticeLinesFor(cache, now, manager)) {
 			printStderrLine(notice.line);
 			next = withNotice(next, notice.key, now);
 		}