@redeemid/emdash 0.0.26 → 0.0.27

package/docs/developer-api.md

@@ -56,7 +56,7 @@ Under `/_emdash/api/auth/redeemid/`. Same-origin only: EmDash checks `Origin` on
 - `api/state` (GET): the visitor's own state.
 
   ```json
-  { "apiVersion": "1.5.0", "version": "0.0.26", "signedIn": true, "linked": true,
+  { "apiVersion": "1.5.0", "version": "0.0.27", "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.26",
+	"version": "0.0.27",
 	"description": "Shopify commerce for EmDash sites: storefront, cart, checkout, customer accounts, memberships and paywalls. Shopify runs commerce; EmDash runs content.",
 	"type": "module",
 	"license": "MIT",

package/src/route-cache.ts

@@ -80,6 +80,15 @@ export function hasMemberBlocks(data: Record<string, unknown> | null | undefined
 	return false;
 }
 
+/**
+ * An entry as EmDash's queries return it. `data` is `object` so the
+ * interfaces `emdash types` generates for each collection fit.
+ */
+export interface CacheableEntry {
+	id?: string;
+	data?: object | null;
+}
+
 /**
  * May this entry's page be stored and served to everyone? Only when it reads
  * the same for every visitor, now and until the cache could expire.
@@ -87,18 +96,19 @@ export function hasMemberBlocks(data: Record<string, unknown> | null | undefined
 export async function cacheable(
 	astro: AstroLike,
 	collection: string,
-	entry: { id?: string; data?: Record<string, unknown> | null } | null | undefined,
+	entry: CacheableEntry | null | undefined,
 ): Promise<boolean> {
 	if (!entry) return false;
+	const data = entry.data as Record<string, unknown> | null | undefined;
 	const config = await siteConfig(astro.locals);
-	if (!config) return !hasMemberBlocks(entry.data);
+	if (!config) return !hasMemberBlocks(data);
 	if (config.unavailable) return false;
-	const terms = entry.data?.terms as Terms | undefined;
+	const terms = data?.terms as Terms | undefined;
 	if ((await entryRequirement(config, collection, terms, entry.id)) !== null) return false;
 	// Free until a date: a stored copy would outlive the window.
 	const own = entryRuleFor(config, collection, entry.id);
 	if (own?.openUntil && Date.now() < Date.parse(own.openUntil)) return false;
-	return !hasMemberBlocks(entry.data);
+	return !hasMemberBlocks(data);
 }
 
 /**
@@ -108,7 +118,7 @@ export async function cacheable(
 export async function cacheEntry(
 	astro: CacheAstro,
 	collection: string,
-	entry: { id?: string; data?: Record<string, unknown> | null } | null | undefined,
+	entry: CacheableEntry | null | undefined,
 	hint?: Hint | null,
 ): Promise<boolean> {
 	if (keptOut(astro.locals)) return false;

package/src/version.ts

@@ -1 +1 @@
-export const VERSION = "0.0.26";
+export const VERSION = "0.0.27";