@redeemid/emdash 0.0.24 → 0.0.25

package/src/template-scan.ts

@@ -4,6 +4,10 @@
  * every rule, Paywall break and Members only part, so a gated collection
  * rendered that way reaches every visitor in full.
  *
+ * Also templates that call `Astro.cache.set()` themselves on a gated
+ * collection's pages instead of cacheEntry()/cachePage() (route-cache.ts):
+ * the route cache then serves one reader's copy to everyone.
+ *
  * redeemidGuard() scans the site's src/ at build time (scanTemplate, in
  * Node) and hands the findings to the running site; the Status page then
  * compares them with the rules as they are now (gatedFindings), because
@@ -17,8 +21,10 @@ import type { RedeemIDConfig } from "./config.js";
 export interface TemplateFinding {
 	/** Path from the site's root, e.g. src/pages/[slug].astro. */
 	file: string;
-	/** Lines with a <PortableText> tag. */
+	/** Lines with a <PortableText> tag (from emdash/ui). */
 	lines: number[];
+	/** Lines that call Astro.cache.set() directly; absent when there are none. */
+	cache?: number[];
 	/** Collections the file loads with getEmDashEntry or getEmDashCollection. */
 	collections: string[];
 }
@@ -26,16 +32,20 @@ export interface TemplateFinding {
 const FROM_EMDASH_UI = /import\s*\{[^}]*\bPortableText\b[^}]*\}\s*from\s*["']emdash\/ui["']/;
 const LOADS = /getEmDash(?:Entry|Collection)\(\s*["'`]([\w-]+)["'`]/g;
 
-/** One template's finding, or null when it doesn't render <PortableText> from emdash/ui. */
+const CACHE_SET = /\bAstro\.cache\??\.set\(/;
+
+/** One template's finding, or null when it neither renders <PortableText> from emdash/ui nor sets a cache hint. */
 export function scanTemplate(file: string, source: string): TemplateFinding | null {
-	if (!FROM_EMDASH_UI.test(source)) return null;
+	const fromUi = FROM_EMDASH_UI.test(source);
 	const lines: number[] = [];
+	const cache: number[] = [];
 	source.split("\n").forEach((line, i) => {
-		if (/<PortableText[\s/>]/.test(line)) lines.push(i + 1);
+		if (fromUi && /<PortableText[\s/>]/.test(line)) lines.push(i + 1);
+		if (CACHE_SET.test(line)) cache.push(i + 1);
 	});
-	if (!lines.length) return null;
+	if (!lines.length && !cache.length) return null;
 	const collections = [...new Set([...source.matchAll(LOADS)].map((m) => m[1]!))].sort();
-	return { file, lines, collections };
+	return cache.length ? { file, lines, cache, collections } : { file, lines, collections };
 }
 
 /** Collections some rule or entry rule can lock: "*" when the site default does. */
@@ -61,12 +71,29 @@ export function gatedFindings(findings: TemplateFinding[], config: RedeemIDConfi
 	if (!gated.size) return [];
 	const all = gated.has("*");
 	return findings.flatMap((f) => {
+		if (!f.lines.length) return [];
 		if (!f.collections.length) return [{ ...f, gated: [] }];
 		const hit = f.collections.filter((c) => all || gated.has(c));
 		return hit.length ? [{ ...f, gated: hit }] : [];
 	});
 }
 
+/**
+ * Templates that set a route cache hint themselves on pages that load a
+ * gated collection. Files whose collection we can't see (layouts, which set
+ * hints for menus and settings) aren't listed: cacheEntry() on the page keeps
+ * those out anyway.
+ */
+export function cacheFindings(findings: TemplateFinding[], config: RedeemIDConfig): GatedFinding[] {
+	const gated = gatedCollections(config);
+	if (!gated.size) return [];
+	const all = gated.has("*");
+	return findings.flatMap((f) => {
+		const hit = f.collections.filter((c) => all || gated.has(c));
+		return f.cache?.length && hit.length ? [{ ...f, gated: hit }] : [];
+	});
+}
+
 /** Where the running site keeps the scan; unset when redeemidGuard() isn't installed. */
 export const TEMPLATES_KEY = "__redeemidTemplates";
 

package/src/version.ts

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