riverbankcms 0.17.1 → 0.18.0

package/dist/{src-JsJh7WAb.mjs → src-BhrSG8A4.mjs}

@@ -1,4 +1,6 @@
 #!/usr/bin/env node
+import { z } from "zod";
+
 //#region ../core/src/result.ts
 function ok(value) {
 	return {
@@ -3928,7 +3930,7 @@ function parsePositiveInteger(value) {
 	return typeof value === "number" && Number.isSafeInteger(value) && value > 0 ? value : null;
 }
 function parseNewsletterListId(value) {
-	return parseTrimmedMatchingString(value, UUID_PATTERN);
+	return parseTrimmedMatchingString(typeof value === "string" ? value.toLowerCase() : value, UUID_PATTERN);
 }
 function parseMailchimpConnectionId(value) {
 	return parseTrimmedMatchingString(value, UUID_PATTERN);
@@ -3972,7 +3974,7 @@ function sameMailingListPlacementTargeting(left, right) {
 }
 function mailingListTargetingChoiceIds(targeting) {
 	switch (targeting.provider) {
-		case "native": return targeting.selection.tag === "fixed" ? targeting.selection.topicIds : targeting.selection.offeredTopicIds;
+		case "native": return targeting.selection.tag === "general" ? [] : targeting.selection.tag === "fixed" ? targeting.selection.topicIds : targeting.selection.offeredTopicIds;
 		case "brevo": return targeting.selection.tag === "fixed" ? targeting.selection.listIds : targeting.selection.offeredListIds;
 		case "mailchimp": return targeting.selection.tag === "fixed" ? targeting.selection.interestIds : targeting.selection.offeredInterestIds;
 	}
@@ -4002,7 +4004,10 @@ function resolveDefaultTarget(setup) {
 	switch (setup.provider) {
 		case "native": return {
 			provider: "native",
-			topicIds: [setup.defaultTopicId]
+			audience: setup.defaultAudience.kind === "general" ? { kind: "general" } : {
+				kind: "topics",
+				topicIds: [setup.defaultAudience.topicId]
+			}
 		};
 		case "brevo": return {
 			provider: "brevo",
@@ -4023,16 +4028,28 @@ function resolveCustomTarget(targeting, visitorSelection) {
 	}
 }
 function resolveNativeTarget(targeting, selection) {
+	if (targeting.selection.tag === "general") {
+		return selection === undefined ? ok({
+			provider: "native",
+			audience: { kind: "general" }
+		}) : err({ tag: "visitor_selection_not_allowed" });
+	}
 	if (targeting.selection.tag === "fixed") {
 		return selection === undefined ? ok({
 			provider: "native",
-			topicIds: targeting.selection.topicIds
+			audience: {
+				kind: "topics",
+				topicIds: targeting.selection.topicIds
+			}
 		}) : err({ tag: "visitor_selection_not_allowed" });
 	}
 	if (selection === undefined) {
 		return targeting.selection.offeredTopicIds.length === 1 ? ok({
 			provider: "native",
-			topicIds: targeting.selection.offeredTopicIds
+			audience: {
+				kind: "topics",
+				topicIds: targeting.selection.offeredTopicIds
+			}
 		}) : err({ tag: "visitor_selection_required" });
 	}
 	if (selection.provider !== "native") {
@@ -4041,7 +4058,10 @@ function resolveNativeTarget(targeting, selection) {
 	const selected = selectedNonEmptySubset(selection.topicIds, targeting.selection.offeredTopicIds);
 	return selected.ok ? ok({
 		provider: "native",
-		topicIds: selected.value
+		audience: {
+			kind: "topics",
+			topicIds: selected.value
+		}
 	}) : err({ tag: "visitor_selection_outside_offer" });
 }
 function resolveBrevoTarget(targeting, selection) {
@@ -4100,45 +4120,34 @@ function selectedNonEmptySubset(selected, offered) {
 	return ok([first, ...rest]);
 }
 function planMailingListChoicePresentation(targeting) {
-	if (targeting.mode === "default" || targeting.selection.tag === "fixed") {
+	if (targeting.mode === "default" || targeting.selection.tag === "fixed" || targeting.selection.tag === "general") {
 		return { tag: "hidden" };
 	}
 	switch (targeting.provider) {
-		case "native": return targeting.selection.offeredTopicIds.length === 1 ? {
-			tag: "automatic",
-			selection: {
-				provider: "native",
-				topicIds: targeting.selection.offeredTopicIds
-			}
-		} : {
-			tag: "visitor_choice",
+		case "native": return presentVisitorSelection({
 			provider: "native",
-			optionCount: targeting.selection.offeredTopicIds.length
-		};
-		case "brevo": return targeting.selection.offeredListIds.length === 1 ? {
-			tag: "automatic",
-			selection: {
-				provider: "brevo",
-				listIds: targeting.selection.offeredListIds
-			}
-		} : {
-			tag: "visitor_choice",
+			topicIds: targeting.selection.offeredTopicIds
+		}, targeting.selection.offeredTopicIds.length);
+		case "brevo": return presentVisitorSelection({
 			provider: "brevo",
-			optionCount: targeting.selection.offeredListIds.length
-		};
-		case "mailchimp": return targeting.selection.offeredInterestIds.length === 1 ? {
-			tag: "automatic",
-			selection: {
-				provider: "mailchimp",
-				interestIds: targeting.selection.offeredInterestIds
-			}
-		} : {
-			tag: "visitor_choice",
+			listIds: targeting.selection.offeredListIds
+		}, targeting.selection.offeredListIds.length);
+		case "mailchimp": return presentVisitorSelection({
 			provider: "mailchimp",
-			optionCount: targeting.selection.offeredInterestIds.length
-		};
+			interestIds: targeting.selection.offeredInterestIds
+		}, targeting.selection.offeredInterestIds.length);
 	}
 }
+function presentVisitorSelection(selection, optionCount) {
+	return optionCount === 1 ? {
+		tag: "automatic",
+		selection
+	} : {
+		tag: "visitor_choice",
+		provider: selection.provider,
+		optionCount
+	};
+}
 
 //#endregion
 //#region ../core/src/mailing-list-targeting-parser.ts
@@ -4159,6 +4168,7 @@ function parseMailingListVisitorSelection(value) {
 	if (!isRecord$6(value)) return visitorSelectionError("shape");
 	switch (value.provider) {
 		case "native": {
+			if (Object.keys(value).some((key) => key !== "provider" && key !== "topicIds")) return visitorSelectionError("shape");
 			const topicIds = parseVisitorIds(value.topicIds, parseNewsletterListId);
 			return topicIds === null ? visitorSelectionError("targets") : ok({
 				provider: "native",
@@ -4183,6 +4193,13 @@ function parseMailingListVisitorSelection(value) {
 	}
 }
 function parseNativeTargeting(selection) {
+	if (selection.tag === "general") {
+		return Object.keys(selection).length === 1 ? ok({
+			mode: "custom",
+			provider: "native",
+			selection: { tag: "general" }
+		}) : targetingError("selection");
+	}
 	if (selection.tag === "fixed") {
 		const topicIds = parseNonEmptyUniqueIds(selection.topicIds, parseNewsletterListId);
 		return topicIds.ok ? ok({
@@ -4966,6 +4983,9 @@ function mailingListProviderName(provider) {
 		case "brevo": return "Brevo";
 	}
 }
+function sameNewsletterAudience(left, right) {
+	return left.kind === right.kind && (left.kind === "general" || right.kind === "topic" && left.topicId === right.topicId);
+}
 const DEFAULT_MAILING_LIST_SUCCESS_MESSAGE = "Thanks — you're on the list.";
 /**
 * Seeded into a new setup so every signup form carries a preferences/unsubscribe
@@ -5097,6 +5117,15 @@ function countDefaultMailingListPlacements(placementModes) {
 
 //#endregion
 //#region ../core/src/mailing-list-setup-parser.ts
+const newsletterAudienceSchema = z.unknown().transform((value, ctx) => {
+	const parsed = parseNewsletterAudience(value);
+	if (parsed.ok) return parsed.value;
+	ctx.addIssue({
+		code: "custom",
+		message: "Choose a valid newsletter audience."
+	});
+	return z.NEVER;
+});
 function parseMailingListGlobalForm(value) {
 	if (!isRecord$2(value)) return formError("shape");
 	const fields = parseGlobalFields(value.fields);
@@ -5153,51 +5182,69 @@ function parseConfiguredMailingListProvider(value) {
 		return setupError("provider");
 	}
 	switch (value.provider) {
-		case "native": {
-			const defaultTopicId = parseNewsletterListId(value.defaultTopicId);
-			if (defaultTopicId === null) return setupError("defaultTargetId");
-			const confirmation = parseToggleConfirmation(value.confirmation);
-			return confirmation === null ? setupError("confirmation") : ok({
-				provider: "native",
-				defaultTopicId,
-				confirmation
-			});
-		}
-		case "mailchimp": {
-			const connectionId = parseMailchimpConnectionId(value.connectionId);
-			if (connectionId === null) return setupError("connectionId");
-			const accountId = parseMailchimpAccountId(value.accountId);
-			if (accountId === null) return setupError("accountId");
-			const defaultAudienceId = parseMailchimpAudienceId(value.defaultAudienceId);
-			if (defaultAudienceId === null) return setupError("defaultTargetId");
-			const confirmation = parseToggleConfirmation(value.confirmation);
-			return confirmation === null ? setupError("confirmation") : ok({
-				provider: "mailchimp",
-				connectionId,
-				accountId,
-				defaultAudienceId,
-				confirmation
-			});
-		}
-		case "brevo": {
-			const connectionId = parseBrevoConnectionId(value.connectionId);
-			if (connectionId === null) return setupError("connectionId");
-			const accountId = parseBrevoAccountId(value.accountId);
-			if (accountId === null) return setupError("accountId");
-			const defaultListId = parseBrevoListId(value.defaultListId);
-			if (defaultListId === null) return setupError("defaultTargetId");
-			const confirmation = parseBrevoConfirmation(value.confirmation);
-			return confirmation === null ? setupError("confirmation") : ok({
-				provider: "brevo",
-				connectionId,
-				accountId,
-				defaultListId,
-				confirmation
-			});
-		}
+		case "native": return parseNativeSetup(value);
+		case "mailchimp": return parseMailchimpSetup(value);
+		case "brevo": return parseBrevoSetup(value);
 		default: return setupError("provider");
 	}
 }
+function parseNativeSetup(value) {
+	if ("defaultTopicId" in value) return setupError("defaultTargetId");
+	const defaultAudience = parseNewsletterAudience(value.defaultAudience);
+	if (!defaultAudience.ok) return setupError("defaultTargetId");
+	const confirmation = parseToggleConfirmation(value.confirmation);
+	return confirmation === null ? setupError("confirmation") : ok({
+		provider: "native",
+		defaultAudience: defaultAudience.value,
+		confirmation
+	});
+}
+function parseMailchimpSetup(value) {
+	const connectionId = parseMailchimpConnectionId(value.connectionId);
+	if (connectionId === null) return setupError("connectionId");
+	const accountId = parseMailchimpAccountId(value.accountId);
+	if (accountId === null) return setupError("accountId");
+	const defaultAudienceId = parseMailchimpAudienceId(value.defaultAudienceId);
+	if (defaultAudienceId === null) return setupError("defaultTargetId");
+	const confirmation = parseToggleConfirmation(value.confirmation);
+	return confirmation === null ? setupError("confirmation") : ok({
+		provider: "mailchimp",
+		connectionId,
+		accountId,
+		defaultAudienceId,
+		confirmation
+	});
+}
+function parseBrevoSetup(value) {
+	const connectionId = parseBrevoConnectionId(value.connectionId);
+	if (connectionId === null) return setupError("connectionId");
+	const accountId = parseBrevoAccountId(value.accountId);
+	if (accountId === null) return setupError("accountId");
+	const defaultListId = parseBrevoListId(value.defaultListId);
+	if (defaultListId === null) return setupError("defaultTargetId");
+	const confirmation = parseBrevoConfirmation(value.confirmation);
+	return confirmation === null ? setupError("confirmation") : ok({
+		provider: "brevo",
+		connectionId,
+		accountId,
+		defaultListId,
+		confirmation
+	});
+}
+function parseNewsletterAudience(value) {
+	if (!isRecord$2(value)) return err("invalid_newsletter_audience");
+	if (value.kind === "general" && Object.keys(value).length === 1) {
+		return ok({ kind: "general" });
+	}
+	if (value.kind !== "topic" || Object.keys(value).some((key) => key !== "kind" && key !== "topicId")) {
+		return err("invalid_newsletter_audience");
+	}
+	const topicId = parseNewsletterListId(value.topicId);
+	return topicId === null ? err("invalid_newsletter_audience") : ok({
+		kind: "topic",
+		topicId
+	});
+}
 function parseGlobalFields(value) {
 	if (!isRecord$2(value) || typeof value.preset !== "string") return null;
 	switch (value.preset) {
@@ -5281,7 +5328,13 @@ function setupError(field) {
 //#region ../core/src/mailing-list-targeting-availability.ts
 function resolveMailingListDefaultDestination(provider) {
 	switch (provider.provider) {
-		case "native": return provider.topics.find((item) => item.id === provider.defaultTopicId) ?? null;
+		case "native": {
+			const audience = provider.defaultAudience;
+			return audience.kind === "general" ? {
+				id: "general",
+				name: "General mailing list"
+			} : provider.topics.find((item) => item.id === audience.topicId) ?? null;
+		}
 		case "brevo": return provider.lists.find((item) => item.id === provider.defaultListId) ?? null;
 		case "mailchimp": return provider.audiences.find((item) => item.id === provider.defaultAudienceId) ?? null;
 	}
@@ -5446,11 +5499,12 @@ function parseRuntimeProvider(value) {
 	}
 }
 function parseNativeRuntimeProvider(value) {
-	const defaultTopicId = parseNewsletterListId(value.defaultTopicId);
+	if ("defaultTopicId" in value) return null;
+	const defaultAudience = parseNewsletterAudience(value.defaultAudience);
 	const topics = parseNamedItems(value.topics, parseNewsletterListId);
-	return defaultTopicId !== null && topics !== null ? {
+	return defaultAudience.ok && topics !== null ? {
 		provider: "native",
-		defaultTopicId,
+		defaultAudience: defaultAudience.value,
 		topics
 	} : null;
 }

package/dist/testing.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
-import "./sdk-event-upsert-JKXlp2Ct.mjs";
-import "./src-JsJh7WAb.mjs";
-import { n as syncLocalMediaForPush, r as syncLocalMediaForPull, y as writeMediaManifest } from "./local-sync-C0m2pobl.mjs";
+import "./sdk-event-upsert-BamyD2d6.mjs";
+import "./src-BhrSG8A4.mjs";
+import { n as syncLocalMediaForPush, r as syncLocalMediaForPull, y as writeMediaManifest } from "./local-sync-B3naCvSc.mjs";
 
 export { syncLocalMediaForPull, syncLocalMediaForPush, writeMediaManifest };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "riverbankcms",
-  "version": "0.17.1",
+  "version": "0.18.0",
   "description": "Riverbank CMS command-line tools for SDK site developers",
   "bin": {
     "riverbankcms": "dist/cli/index.mjs"

package/dist/load-config-CyzQYQmx.mjs

@@ -1,4 +0,0 @@
-#!/usr/bin/env node
-import { t as loadConfigFile } from "./load-config-DR5qJgmx.mjs";
-
-export { loadConfigFile };