@simplepush/cli 0.2.0 → 0.2.1

package/dist/main.mjs

@@ -1164,7 +1164,7 @@ function formatSent(groupId, createdAt, members) {
 		type: "sent",
 		groupId: groupId ?? null,
 		createdAt: createdAt ?? null,
-		members: members.map((m) => ({
+		instances: members.map((m) => ({
 			...m.kind === "notification" ? { notificationId: m.id } : { taskId: m.id },
 			...m.subtaskId !== void 0 ? { subtaskId: m.subtaskId } : {},
 			recipient: m.recipient
@@ -1303,14 +1303,14 @@ function fileViewsOf(item) {
 	]).filter(isFileView);
 }
 /** The terminal line: reason the stream stopped, per-type counts, and (for
-* group modes) per-member status. Always the last line on a clean run. */
+* group modes) per-instance status. Always the last line on a clean run. */
 function formatEnd(reason, counts, members, errorMsg) {
 	const obj = {
 		type: "end",
 		reason,
 		counts
 	};
-	if (members) obj.members = members;
+	if (members) obj.instances = members;
 	if (errorMsg !== void 0) obj.error = errorMsg;
 	return line(obj);
 }
@@ -1463,7 +1463,7 @@ const SentLine = Schema.Struct({
 	type: Schema.Literal("sent"),
 	groupId: Schema.optional(Schema.NullOr(Schema.String)),
 	createdAt: Schema.optional(Schema.NullOr(Schema.String)),
-	members: Schema.optional(Schema.Array(Schema.Struct({
+	instances: Schema.optional(Schema.Array(Schema.Struct({
 		taskId: Schema.optional(Schema.String),
 		notificationId: Schema.optional(Schema.String),
 		subtaskId: Schema.optional(Schema.String),
@@ -1525,9 +1525,9 @@ const loadOrgMasterKeys = Effect.gen(function* () {
 });
 const collectCommand = Command.make("collect", {
 	group: Options.text("group").pipe(Options.withDescription("Group id (grptsk_…) to collect over. Usually supplied via the piped `sent` line instead."), Options.optional),
-	instance: Options.text("instance").pipe(Options.withDescription("Member instance id to collect: a task (tsk_…), a notification (ntf_…), or a subtask-scoped pair (tsk_…/sub_…). Repeatable. Augments/overrides the piped `sent` line's members."), Options.repeated),
+	instance: Options.text("instance").pipe(Options.withDescription("Instance id to collect: a task (tsk_…), a notification (ntf_…), or a subtask-scoped pair (tsk_…/sub_…). Repeatable. Augments/overrides the piped `sent` line's instances."), Options.repeated),
 	replies: Options.boolean("replies").pipe(Options.withDescription("Collect only replies. Default (no mode flag) is the full activity stream: inputs, replies, and completions.")),
-	inputs: Options.boolean("inputs").pipe(Options.withDescription("Collect only input events (waits for every member to complete by default).")),
+	inputs: Options.boolean("inputs").pipe(Options.withDescription("Collect only input events (waits for every instance to complete by default).")),
 	submissions: Options.boolean("submissions").pipe(Options.withDescription("Collect submissions (your inbox) instead of a group's events.")),
 	since: mappedText("since", resolveSince).pipe(Options.withDescription("Resume point (`24h`, `7d`, or ISO 8601). Backfills group events or submissions from that point; defaults to the send's createdAt from the piped `sent` line. Implies --direct (the broker can't serve a deep backfill)."), Options.optional),
 	until: Options.text("until").pipe(Options.withDescription("Stop condition. Repeatable: complete | idle:<dur> | count:<n> | timeout:<dur> | forever (never stop; Ctrl-C to end). Default: complete for group collects; --replies / --submissions watch forever."), Options.repeated),
@@ -1600,7 +1600,7 @@ const collectCommand = Command.make("collect", {
 				});
 			}
 		};
-		for (const m of sent?.members ?? []) addMember(m.taskId ?? m.notificationId, m.recipient ? {
+		for (const m of sent?.instances ?? []) addMember(m.taskId ?? m.notificationId, m.recipient ? {
 			publicId: m.recipient.publicId,
 			name: m.recipient.name ?? null
 		} : null, m.subtaskId);
@@ -1609,11 +1609,11 @@ const collectCommand = Command.make("collect", {
 			if (id.startsWith("sub_")) return yield* Effect.fail(new UserError({ message: `a subtask cannot be collected by its id alone (events route under the parent task) — pass --instance <parent tsk_…>/${id}` }));
 			addMember(id, null, subtaskId);
 		}
-		if (members.length === 0) return yield* Effect.fail(new UserError({ message: "no members to collect: pipe a send's `sent` line (`sp task --format json | sp collect`) or pass --instance <tsk_…|ntf_…|tsk_…/sub_…> (repeatable)" }));
+		if (members.length === 0) return yield* Effect.fail(new UserError({ message: "no instances to collect: pipe a send's `sent` line (`sp task --format json | sp collect`) or pass --instance <tsk_…|ntf_…|tsk_…/sub_…> (repeatable)" }));
 		const notifRoster = members[0].kind === "notification";
-		if (members.some((m) => m.kind === "notification" !== notifRoster)) return yield* Effect.fail(new UserError({ message: "cannot mix task (tsk_…) and notification (ntf_…) members in one collect — run one per kind" }));
+		if (members.some((m) => m.kind === "notification" !== notifRoster)) return yield* Effect.fail(new UserError({ message: "cannot mix task (tsk_…) and notification (ntf_…) instances in one collect — run one per kind" }));
 		const subRoster = members[0].subtaskId !== void 0;
-		if (members.some((m) => m.subtaskId !== void 0 !== subRoster)) return yield* Effect.fail(new UserError({ message: "cannot mix subtask-scoped members (a piped `sp subtask --format json` line or --instance tsk_…/sub_…) with plain task/notification members in one collect" }));
+		if (members.some((m) => m.subtaskId !== void 0 !== subRoster)) return yield* Effect.fail(new UserError({ message: "cannot mix subtask-scoped instances (a piped `sp subtask --format json` line or --instance tsk_…/sub_…) with plain task/notification instances in one collect" }));
 		const streamOpts = {
 			replay: true,
 			...until.idleMs !== void 0 ? { idleMs: until.idleMs } : {}
@@ -1675,7 +1675,7 @@ const collectCommand = Command.make("collect", {
 			});
 		}
 		if (args.format === "json") yield* out.print(formatSent(groupId, createdAt, members));
-		else yield* out.info(`collecting ${mode} over ${members.length} member(s)${groupId ? ` of ${groupId}` : ""}`);
+		else yield* out.info(`collecting ${mode} over ${members.length} instance(s)${groupId ? ` of ${groupId}` : ""}`);
 		yield* collectGroup(watchGroupId, source, members, args.format, until, saveDir);
 	}));
 }));