@redeemid/emdash 0.0.23 → 0.0.24

package/README.md

@@ -7,7 +7,7 @@ Memberships and paywalls for [EmDash](https://github.com/emdash-cms/emdash) site
 
 Readers sign in with the store's own customer account. Their Shopify customer tags decide what they can read. Shopify keeps the store, checkout, orders and subscriptions, and EmDash keeps the content. Nothing on the site grants access by itself, so there is one source of truth for who paid for what.
 
-**Status: 0.0.23, early.** Runs on Node and Cloudflare Workers. Unit tests and an end-to-end test that boots a real EmDash site against a fake Shopify store cover the features below. Expect changes before 1.0.
+**Status: 0.0.24, early.** Runs on Node and Cloudflare Workers. Unit tests and an end-to-end test that boots a real EmDash site against a fake Shopify store cover the features below. Expect changes before 1.0.
 
 ## Contents
 
@@ -161,7 +161,7 @@ Use `<Content>` in place of `<PortableText>` for every body that may be locked,
 
 EmDash has no content filter hook, so templates decide what to render.
 
-**`<Content>`** renders an entry body. Everything before the first Paywall break block is shown to everyone. What follows reaches the page only for readers the break allows: the levels picked on it ("Signed in" for any member) or, with none picked, the entry's rule. With none picked and no rule covering the entry, the break changes nothing. A body with no break follows the entry's rule as a whole, and readers it keeps out see the collection's `teaser` if one is set (whole paragraphs, never half of one).
+**`<Content>`** renders an entry body. Levels come from the entry's rule (its content type, its terms, or its own Access panel); a Paywall break only says where that rule starts. Everything before the first Paywall break block is shown to everyone, and what follows reaches the page only for readers the rule lets in. With no rule covering the entry, the break changes nothing. A body with no break follows the entry's rule as a whole, and readers it keeps out see the collection's `teaser` if one is set (whole paragraphs, never half of one).
 
 ```astro
 <Content value={post.data.content} collection="posts" terms={post.data.terms} id={post.id} title={post.data.title}>
@@ -632,7 +632,7 @@ Import each from `@redeemid/emdash/components/<Name>.astro`.
 
 | Block | Type | Does |
 | --- | --- | --- |
-| Paywall break | `redeemid-paywall` | Members-only content starts here, for the levels picked or the entry's rule |
+| Paywall break | `redeemid-paywall` | Everyone reads up to here; the rest follows the entry's rule |
 | Members only / Members only: end | `redeemid-members`, `redeemid-members-end` | A members-only part in the middle of a body |
 | Sold on its own | `redeemid-item` | Sells the entry by itself to holders of a tag |
 | Plan | `redeemid-plan` | A product with a buy button |

package/docs/developer-api.md

@@ -53,7 +53,7 @@ Under `/_emdash/api/auth/redeemid/`. Same-origin only: EmDash checks `Origin` on
 - `api/state` (GET): the visitor's own state.
 
   ```json
-  { "apiVersion": "1.3.0", "version": "0.0.23", "signedIn": true, "linked": true,
+  { "apiVersion": "1.3.0", "version": "0.0.24", "signedIn": true, "linked": true,
     "levels": ["gold"], "features": ["ad-free"], "cart": { "count": 2 },
     "meter": { "used": 1, "limit": 3, "period": "month" } }
   ```

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@redeemid/emdash",
-	"version": "0.0.23",
+	"version": "0.0.24",
 	"description": "Shopify customer accounts, member levels and paywalls for EmDash sites. Shopify runs commerce; EmDash runs content.",
 	"type": "module",
 	"license": "MIT",

package/src/access-admin.ts

@@ -780,7 +780,7 @@ export async function entryPanel(env: AccessEnv, entry: PanelEntry, toast?: Toas
 				],
 				submit: { label: "Save access", action_id: "entry_save" },
 			},
-			{ type: "context", text: "Paywall break and Members only blocks can still lock parts of the body." },
+			{ type: "context", text: "With a Paywall break in the body, everyone reads up to it and this rule covers the rest. Members only blocks can lock parts to their own levels." },
 		],
 	};
 }

package/src/access.ts

@@ -533,7 +533,7 @@ async function readViewer(astro: AstroLike): Promise<Viewer> {
 
 /**
  * May this visitor read the entry? `override` replaces the entry's rule, for a
- * part of a page locked to its own levels (a paywall break with levels).
+ * part of a page locked to its own levels (a Members only part with levels).
  */
 export async function canRead(
 	astro: AstroLike,

package/src/blocks-names.ts

@@ -39,22 +39,20 @@ export function holdsItem(item: SoldItem | null, tags: string[] | undefined): bo
 type Node = { _type?: unknown; levels?: unknown };
 
 /**
- * Split a Portable Text body at its first paywall break: the open part, the
- * members part, and the levels picked on the break (empty = none picked).
- * With no break, everything is in `open` and `paywall` is false.
+ * Split a Portable Text body at its first paywall break: the open part and
+ * the members part. The break only says where the entry's rule starts to
+ * apply; it carries no levels of its own (levels an older break stored are
+ * ignored). With no break, everything is in `open` and `paywall` is false.
  */
 export function splitAtPaywall<T>(value: T[] | null | undefined): {
 	open: T[];
 	locked: T[];
-	levels: string[];
 	paywall: boolean;
 } {
 	const blocks = Array.isArray(value) ? value : [];
 	const at = blocks.findIndex((b) => (b as Node)?._type === PAYWALL_BLOCK);
-	if (at === -1) return { open: blocks, locked: [], levels: [], paywall: false };
-	const raw = (blocks[at] as Node).levels;
-	const levels = Array.isArray(raw) ? raw.filter((l): l is string => typeof l === "string" && l !== "") : [];
-	return { open: blocks.slice(0, at), locked: blocks.slice(at + 1), levels, paywall: true };
+	if (at === -1) return { open: blocks, locked: [], paywall: false };
+	return { open: blocks.slice(0, at), locked: blocks.slice(at + 1), paywall: true };
 }
 
 type TextNode = { _type?: unknown; children?: Array<{ text?: unknown }> };

package/src/components/AccessBadge.astro

@@ -1,7 +1,6 @@
 ---
 /**
- * The level an entry needs, read from its rules (and from a paywall break
- * with levels):
+ * The level an entry needs, read from its rules:
  *
  *   <AccessBadge collection="posts" terms={post.data.terms} content={post.data.content} id={post.id} />
  *
@@ -10,14 +9,14 @@
  * `is-locked` with a lock for readers who can't read the members part.
  */
 import { badgeColor, canRead, describe, entryRequirement, simplify, viewer, type Terms } from "../access.js";
-import { holdsItem, soldItem, splitAtPaywall } from "../blocks-names.js";
+import { holdsItem, soldItem } from "../blocks-names.js";
 import { siteConfig } from "../site-config.js";
 import { text } from "../text.js";
 
 interface Props {
 	collection: string;
 	terms?: Terms;
-	/** The entry's body, so a paywall break's levels count. */
+	/** The entry's body, for its "Sold on its own" block. */
 	content?: unknown[] | null;
 	/** The entry's id or slug, so its own rule from the editor counts. */
 	id?: string;
@@ -27,10 +26,7 @@ interface Props {
 
 const config = await siteConfig(Astro.locals);
 const { collection, terms, content, id, free = text(config, "Free"), class: className } = Astro.props;
-const split = splitAtPaywall(content);
-const required = split.paywall && split.levels.length
-	? [split.levels]
-	: await entryRequirement(config, collection, terms, id);
+const required = await entryRequirement(config, collection, terms, id);
 const label = describe(required, config?.levels, free, text(config, "Signed in"));
 const item = soldItem(content);
 const owner = item ? (await viewer(Astro)).member : null;

package/src/components/Content.astro

@@ -5,9 +5,9 @@
  *   <Content value={post.data.content} collection="posts" terms={post.data.terms} id={post.id} />
  *
  * - "Paywall break": everything before the first one is shown to everyone.
- *   What follows reaches the page only for readers who may read it: the
- *   levels picked on the break, or when none are picked the entry's rule
- *   (with no rule, the break changes nothing).
+ *   What follows reaches the page only for readers the entry's rule lets in
+ *   (with no rule, the break changes nothing). The break says where the
+ *   rule starts; the rule itself comes from the entry's settings.
  * - "Members only" … "Members only: end": the part between is for the levels
  *   picked on the start block, or the entry's rule, or any signed-in member.
  *   Readers who can't read it see the wall in its place, and the body goes on.
@@ -60,9 +60,9 @@ const entryRule = await entryRequirement(config, collection, terms, id);
 const item = soldItem(value);
 const reader = item ? (await viewer(Astro)).member : null;
 const owned = Boolean(reader && reader.status !== "disabled" && holdsItem(item, reader.tags));
-// A break with levels picked locks the rest to them; with none picked it
-// follows the entry's rule, and does nothing when no rule covers the entry.
-const required = split.paywall ? (split.levels.length ? [split.levels] : entryRule) : undefined;
+// The rest after a break follows the entry's rule, and the break does
+// nothing when no rule covers the entry.
+const required = split.paywall ? entryRule : undefined;
 const verdict: Verdict | { allowed: true; reason: "open" } =
 	owned || (split.paywall && required === null)
 		? { allowed: true, reason: "open" }

package/src/files.ts

@@ -17,7 +17,7 @@
  */
 
 import { readEntry, SIGNED_IN, viewer, type AstroLike, type Terms } from "./access.js";
-import { holdsItem, ITEM_BLOCK, PAYWALL_BLOCK, sections, soldItem, splitAtPaywall } from "./blocks-names.js";
+import { holdsItem, ITEM_BLOCK, PAYWALL_BLOCK, sections, soldItem } from "./blocks-names.js";
 import type { FileRule, RedeemIDConfig } from "./config.js";
 import { featuresFor } from "./features.js";
 import { text } from "./text.js";
@@ -79,15 +79,14 @@ async function entriesUsing(db: unknown, mediaId: string): Promise<Array<{ colle
 }
 
 /**
- * The levels picked on an entry body's breaks and members-only parts: readers
- * must hold one from each. A members-only part with none picked needs a
+ * The levels picked on an entry body's members-only parts: readers must
+ * hold one from each. A members-only part with none picked needs a
  * signed-in reader (on top of the entry's rule, which the caller checks).
+ * A paywall break adds nothing: what follows it is under the entry's rule.
  */
 export function bodyClauses(body: unknown): string[][] {
 	const blocks = Array.isArray(body) ? body : [];
 	const out: string[][] = [];
-	const split = splitAtPaywall(blocks);
-	if (split.paywall && split.levels.length) out.push(split.levels);
 	for (const s of sections(blocks)) if (s.members) out.push(s.levels.length ? s.levels : [SIGNED_IN]);
 	return out;
 }

package/src/plugin.ts

@@ -11,10 +11,9 @@
  * test, Privacy), a daily webhook health check and a dashboard widget. Sign-in, webhooks and checkout stay on the
  * auth provider's routes.
  *
- * - "Paywall break" (`redeemid-paywall`): everything after it in the body is
- *   for members. Pick the levels that may read on ("Signed in" for any
- *   member); none picked means the entry's rule, and nothing is locked when
- *   no rule covers the entry.
+ * - "Paywall break" (`redeemid-paywall`): marks where the entry's rule starts.
+ *   Everything before it is for everyone; everything after it follows the
+ *   entry's rule, and nothing is locked when no rule covers the entry.
  * - "Members only" (`redeemid-members`) and "Members only: end"
  *   (`redeemid-members-end`): the part between is for the levels picked on
  *   the start block; everyone else sees the wall there and reads on after.
@@ -84,15 +83,8 @@ function blocks(config: RedeemIDConfig) {
 			type: PAYWALL_BLOCK,
 			label: "Paywall break",
 			icon: "lock",
-			description: "Everything after this is for members",
-			fields: [
-				{
-					type: "checkbox" as const,
-					action_id: "levels",
-					label: "Who can read on (none = the entry's rule)",
-					options: levelOptions,
-				},
-			],
+			description: "Everyone reads up to here; the rest follows this entry's access rule",
+			fields: [],
 		},
 		{
 			type: MEMBERS_BLOCK,

package/src/settings.ts

@@ -226,7 +226,7 @@ type LevelListener = (levels: LevelConfig[]) => void;
 const LISTENERS = Symbol.for("redeemid:level-listeners");
 
 /**
- * The editor's level pickers (on the Paywall break and other blocks) are
+ * The editor's level pickers (on the Members only block and others) are
  * declared when the plugin starts. The plugin registers a listener here so
  * they follow levels saved in the admin.
  */

package/src/staff.ts

@@ -398,7 +398,7 @@ export async function accessTest(config: RedeemIDConfig, values: Record<string,
 				type: "banner",
 				variant: ok ? "default" : "alert",
 				title: ok ? "This reader can read it" : "This reader is kept out",
-				description: "A Paywall break with levels picked, a Members only part, drip and the meter can still change what a page shows.",
+				description: "A Members only part with levels picked, drip and the meter can still change what a page shows.",
 			},
 		);
 	}

package/src/version.ts

@@ -1 +1 @@
-export const VERSION = "0.0.23";
+export const VERSION = "0.0.24";