@getquick/content 0.4.1 → 0.5.0

package/dist/forms-server.d.ts

@@ -49,6 +49,13 @@ export interface FormsServerConfig {
   bindings: () => FormsBindings | Promise<FormsBindings>;
   /** The Site's public origin(s), when the Worker sees another (a proxy). */
   siteOrigins?: readonly string[];
+  /**
+   * The reverse proxies the Site runs in front of the Worker, as IPv4/IPv6
+   * addresses or CIDRs. Only a request whose `CF-Connecting-IP` is one of
+   * them has its client IP taken from the proxy's `X-Forwarded-For` /
+   * `X-Real-IP` (docs/client-ip.md).
+   */
+  trustedProxies?: readonly string[];
   /** The page language for the handler's own messages (`pt-PT`, `en`). */
   language?: string;
   /** Milliseconds Gravity Forms and Turnstile have to answer (15 s). */

package/dist/forms-server.js

@@ -1,5 +1,5 @@
 import { c as formDiagnostics, t as FORMS_PATH } from "./descriptor-x8kHFQ79.js";
-import { n as readBoundedBody, t as isSameOrigin } from "./request-guards-BUPr_vA4.js";
+import { i as readBoundedBody, n as rateLimitKey, r as isSameOrigin, t as clientAddressResolver } from "./client-ip-cnqPLdDa.js";
 import { n as honeypotFilled, r as validateSubmission } from "./validate-wRgYUNxN.js";
 import { c as formStateLocation, n as formsCopyLanguage, o as formStateCookie, t as FORMS_COPY } from "./copy-DLto_bWj.js";
 //#region frontend/src/forms/server.ts
@@ -24,6 +24,7 @@ function createFormsServer(config) {
 	const restRoot = (config.restRoot ?? `${cms.origin}/wp-json`).replace(/\/+$/, "");
 	if (new URL(restRoot).origin !== cms.origin) throw new Error("restRoot must be on the CMS's origin");
 	const origins = new Set((config.siteOrigins ?? []).map((origin) => new URL(origin).origin));
+	const clientAddress = clientAddressResolver(config.trustedProxies);
 	const timeoutMs = config.timeoutMs ?? 15e3;
 	const fetcher = config.fetch ?? globalThis.fetch.bind(globalThis);
 	const copy = FORMS_COPY[formsCopyLanguage(config.language)];
@@ -150,7 +151,7 @@ function createFormsServer(config) {
 				}, source);
 			}
 			const token = params.get("cf-turnstile-response") ?? "";
-			if (!token || token.length > 2048 || !await verifyTurnstile(secret, token, request.headers.get("CF-Connecting-IP"))) return outcome(request, {
+			if (!token || token.length > 2048 || !await verifyTurnstile(secret, token, clientAddress(request))) return outcome(request, {
 				formId,
 				status: "verification",
 				values: checked.values
@@ -253,7 +254,7 @@ function createFormsServer(config) {
 		if (!SOURCE.test(source) || source.length > 2048) return json(400, { error: "The form's page (gq_source) isn't a path on this Site." });
 		const limiter = bindings.FORMS_RATE_LIMITER;
 		if (limiter) {
-			const { success } = await limiter.limit({ key: `${formId}:${request.headers.get("CF-Connecting-IP") ?? "unknown"}` });
+			const { success } = await limiter.limit({ key: `${formId}:${rateLimitKey(clientAddress(request))}` });
 			if (!success) return outcome(request, {
 				formId,
 				status: "too-many"

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { $ as Delivery, A as SqlDatabase, At as DesignPostContext, B as DesignBlockRenderer, Bt as renderDesignQuery, C as Moved, Ct as presentationVariables, D as SearchPage, Dt as designThemeVariables, E as SearchItem, Et as designThemeStyleSheet, F as isLanguageHome, Ft as DesignQueryResolverOptions, G as escapeHtml, H as DesignRenderContext, Ht as renderDesignText, I as languageSubject, It as designPostContext, J as Archives, K as parseDesignBlocks, L as routeLanguage, Lt as designQueryItems, M as SiteLanguage, Mt as DesignPreloadedPosts, N as WordPressLanguages, Nt as DesignQueryItem, O as SearchQuery, Ot as resolveDesignTheme, P as htmlLang, Pt as DesignQueryRenderContext, Q as CollectionTerm, R as siteLanguages, Rt as preloadDesignQueryPosts, S as HomePublication, St as presentationStyleSheet, T as SearchDelivery, Tt as DesignThemeOverrides, U as DesignRenderOptions, Ut as safeDesignRichText, V as DesignPattern, Vt as DesignTextContext, W as designMenuItems, X as CmsFailureReason, Y as CmsFailure, Z as CollectionMembership, _ as EntryDelivery, _t as PresentationTargets, a as ContentExtension, at as Missing, b as HomeDelivery, bt as createPresentationModel, ct as Translation, d as CollectionListing, dt as WordPressMenuItem, et as DesignPresets, f as CollectionPage, ft as WordPressPost, g as DeliveryFailureReason, gt as PresentationModel, h as CollectionTermListing, ht as PresentationBreakpoint, i as ContentConsentConfig, it as HomeContent, j as SqlStatement, jt as DesignPostRecord, k as ContentBindings, kt as resolvePresentationToken, l as Alternate, lt as Unavailable, m as CollectionTermCount, mt as Presentation, n as CollectionConfig, nt as Extended, o as ContentRuntime, ot as PublishedEntry, p as CollectionQuery, pt as WordPressSettings, q as renderDesignPattern, r as ContentConfig, rt as Found, s as ExtensionNode, st as SiteChrome, t as WordPressClient, tt as EntryContent, u as CollectionItem, ut as WordPressImage, v as EntryPage, vt as PresentationTheme, w as NotServed, wt as DesignTheme, x as HomePage, xt as presentationModel, y as EntryPublication, yt as Property, z as DesignBlock, zt as renderDesignPostBlock } from "./wordpress-BvkTDMA0.js";
+import { $ as Delivery, A as SqlDatabase, At as DesignThemeOverrides, B as DesignBlockRenderer, Bt as DesignPreloadedPosts, C as Moved, Ct as PresentationTheme, D as SearchPage, Dt as presentationStyleSheet, E as SearchItem, Et as presentationModel, F as isLanguageHome, Ft as DesignFonts, G as escapeHtml, Gt as designQueryItems, H as DesignRenderContext, Ht as DesignQueryRenderContext, I as languageSubject, It as DesignTextStyles, J as Archives, Jt as renderDesignQuery, K as parseDesignBlocks, Kt as preloadDesignQueryPosts, L as routeLanguage, Lt as ResolvedLogoImage, M as SiteLanguage, Mt as designThemeVariables, N as WordPressLanguages, Nt as resolveDesignTheme, O as SearchQuery, Ot as presentationVariables, P as htmlLang, Pt as resolvePresentationToken, Q as CollectionTerm, R as siteLanguages, Rt as DesignPostContext, S as HomePublication, St as PresentationTargets, T as SearchDelivery, Tt as createPresentationModel, U as DesignRenderOptions, Ut as DesignQueryResolverOptions, V as DesignPattern, Vt as DesignQueryItem, W as designMenuItems, Wt as designPostContext, X as CmsFailureReason, Xt as renderDesignText, Y as CmsFailure, Yt as DesignTextContext, Z as CollectionMembership, Zt as safeDesignRichText, _ as EntryDelivery, _t as designFontsHead, a as ContentExtension, at as Missing, b as HomeDelivery, bt as PresentationBreakpoint, ct as Translation, d as CollectionListing, dt as WordPressMenuItem, et as DesignPresets, f as CollectionPage, ft as WordPressPost, g as DeliveryFailureReason, gt as designFontStyleSheet, h as CollectionTermListing, ht as designFontPreloads, i as ContentConsentConfig, it as HomeContent, j as SqlStatement, jt as designThemeStyleSheet, k as ContentBindings, kt as DesignTheme, l as Alternate, lt as Unavailable, m as CollectionTermCount, mt as DesignTypography, n as CollectionConfig, nt as Extended, o as ContentRuntime, ot as PublishedEntry, p as CollectionQuery, pt as WordPressSettings, q as renderDesignPattern, qt as renderDesignPostBlock, r as ContentConfig, rt as Found, s as ExtensionNode, st as SiteChrome, t as WordPressClient, tt as EntryContent, u as CollectionItem, ut as WordPressImage, v as EntryPage, vt as designTextStyleSheet, w as NotServed, wt as Property, x as HomePage, xt as PresentationModel, y as EntryPublication, yt as Presentation, z as DesignBlock, zt as DesignPostRecord } from "./wordpress-OWJxnbAF.js";
 //#region frontend/src/cover-video-html.d.ts
 /** Native decorative Cover video must not start before motion preferences are
  * known. Retain every source, poster, child and independent video attribute. */
@@ -55,21 +55,6 @@ export declare function hasDesignCarousel(blocks: WordPressBlock[]): boolean;
 export declare function hasVideoHero(blocks: WordPressBlock[]): boolean;
 export declare function renderWordPressBlocks(blocks: WordPressBlock[]): string;
 //#endregion
-/**
- * A Branding logo image resolved from the media library when the layout is built.
- */
-interface ResolvedLogoImage {
-  id: number;
-  url: string;
-  /**
-   * The attachment's alt text, or the plain-text site title when that is empty.
-   */
-  alt: string;
-  width: number | null;
-  height: number | null;
-  mimeType: string;
-}
-//#endregion
 interface SiteLogoSelection {
   /** Which delivered value to render: an image attribute or the Site Title. */
   source: "logoDark" | "logo" | "siteTitle";
@@ -201,4 +186,4 @@ export declare function renderDesignNavigation(name: string, attrs: Attributes,
 /** Interaction styles only. Include canonical presentationStyleSheet separately. */
 export declare function navigationStyleSheet(theme?: DesignThemeOverrides): string;
 //#endregion
-export { Alternate, Archives, CmsFailure, CmsFailureReason, type CollectionConfig, CollectionItem, CollectionListing, CollectionMembership, CollectionPage, CollectionQuery, CollectionTerm, CollectionTermCount, CollectionTermListing, ContentBindings, type ContentConfig, type ContentConsentConfig, type ContentExtension, type ContentRuntime, Delivery, DeliveryFailureReason, DesignBlock, DesignBlockRenderer, DesignPattern, type DesignPostContext, type DesignPostRecord, type DesignPreloadedPosts, DesignPresets, type DesignQueryItem, type DesignQueryRenderContext, type DesignQueryResolverOptions, DesignRenderContext, DesignRenderOptions, type DesignTextContext, type DesignTheme, type DesignThemeOverrides, EntryContent, EntryDelivery, EntryPage, EntryPublication, Extended, type ExtensionNode, Found, HomeContent, HomeDelivery, HomePage, HomePublication, Missing, Moved, NotServed, type Presentation, type PresentationBreakpoint, type PresentationModel, type Property as PresentationProperty, type PresentationTargets, type PresentationTheme, PublishedEntry, SearchDelivery, SearchItem, SearchPage, SearchQuery, SiteChrome, SiteLanguage, SqlDatabase, SqlStatement, Translation, Unavailable, type VideoHeroFit, type VideoHeroPosition, type WordPressClient, WordPressImage, WordPressLanguages, WordPressMenuItem, WordPressPost, WordPressSettings, createPresentationModel, designMenuItems, designPostContext, designQueryItems, designThemeStyleSheet, designThemeVariables, escapeHtml, htmlLang, isLanguageHome, languageSubject, parseDesignBlocks, preloadDesignQueryPosts, presentationModel, presentationStyleSheet, presentationVariables, renderDesignPattern, renderDesignPostBlock, renderDesignQuery, renderDesignText, resolveDesignTheme, resolvePresentationToken, routeLanguage, safeDesignRichText, siteLanguages };
+export { Alternate, Archives, CmsFailure, CmsFailureReason, type CollectionConfig, CollectionItem, CollectionListing, CollectionMembership, CollectionPage, CollectionQuery, CollectionTerm, CollectionTermCount, CollectionTermListing, ContentBindings, type ContentConfig, type ContentConsentConfig, type ContentExtension, type ContentRuntime, Delivery, DeliveryFailureReason, DesignBlock, DesignBlockRenderer, type DesignFonts, DesignPattern, type DesignPostContext, type DesignPostRecord, type DesignPreloadedPosts, DesignPresets, type DesignQueryItem, type DesignQueryRenderContext, type DesignQueryResolverOptions, DesignRenderContext, DesignRenderOptions, type DesignTextContext, type DesignTextStyles, type DesignTheme, type DesignThemeOverrides, type DesignTypography, EntryContent, EntryDelivery, EntryPage, EntryPublication, Extended, type ExtensionNode, Found, HomeContent, HomeDelivery, HomePage, HomePublication, Missing, Moved, NotServed, type Presentation, type PresentationBreakpoint, type PresentationModel, type Property as PresentationProperty, type PresentationTargets, type PresentationTheme, PublishedEntry, SearchDelivery, SearchItem, SearchPage, SearchQuery, SiteChrome, SiteLanguage, SqlDatabase, SqlStatement, Translation, Unavailable, type VideoHeroFit, type VideoHeroPosition, type WordPressClient, WordPressImage, WordPressLanguages, WordPressMenuItem, WordPressPost, WordPressSettings, createPresentationModel, designFontPreloads, designFontStyleSheet, designFontsHead, designMenuItems, designPostContext, designQueryItems, designTextStyleSheet, designThemeStyleSheet, designThemeVariables, escapeHtml, htmlLang, isLanguageHome, languageSubject, parseDesignBlocks, preloadDesignQueryPosts, presentationModel, presentationStyleSheet, presentationVariables, renderDesignPattern, renderDesignPostBlock, renderDesignQuery, renderDesignText, resolveDesignTheme, resolvePresentationToken, routeLanguage, safeDesignRichText, siteLanguages };

package/dist/index.js

@@ -1,4 +1,4 @@
-import { $ as selectSiteLogo, A as DESIGN_CAROUSEL_ITEM, B as safeDesignRichText, C as renderDesignQuery, D as renderWordPressBlocks, E as parseWordPressBlocks, F as VIDEO_HERO_BLOCK, G as createPresentationModel, H as navigationStyleSheet, I as renderDesignVideoHero, J as presentationVariables, K as presentationModel, L as youtubeVideoId, M as designCarouselStyle, N as renderDesignCarousel, O as designGridStyle, P as renderDesignCarouselItem, Q as resolvePresentationToken, R as renderDesignImage, S as renderDesignPostBlock, T as hasVideoHero, U as renderDesignNavigation, V as enhanceDesignNavigationHtml, W as presentationHtml, X as designThemeVariables, Y as designThemeStyleSheet, Z as resolveDesignTheme, _ as uriPath, a as siteLanguages, b as designQueryItems, c as parseDesignBlocks, d as decodeEntities, f as formatDate, g as stripHtml, h as routeOf, i as routeLanguage, j as DESIGN_CAROUSEL_NAVIGATION, k as DESIGN_CAROUSEL, l as renderDesignPattern, m as responseStatus, n as isLanguageHome, o as designMenuItems, p as menuItemHref, q as presentationStyleSheet, r as languageSubject, s as escapeHtml, t as htmlLang, tt as enhanceDesignCoverVideosHtml, u as cmsTime, v as renderDesignCover, w as hasDesignCarousel, x as preloadDesignQueryPosts, y as designPostContext, z as renderDesignText } from "./site-language-BCGjkpWY.js";
+import { $ as VIDEO_HERO_BLOCK, A as formatDate, B as renderDesignPostBlock, C as siteLanguages, D as renderDesignPattern, E as parseDesignBlocks, F as uriPath, G as renderWordPressBlocks, H as hasDesignCarousel, I as renderDesignCover, J as DESIGN_CAROUSEL_ITEM, K as designGridStyle, L as designPostContext, M as responseStatus, N as routeOf, O as cmsTime, P as stripHtml, Q as renderDesignCarouselItem, R as designQueryItems, S as routeLanguage, T as escapeHtml, U as hasVideoHero, V as renderDesignQuery, W as parseWordPressBlocks, X as designCarouselStyle, Y as DESIGN_CAROUSEL_NAVIGATION, Z as renderDesignCarousel, _t as selectSiteLogo, a as designTextStyleSheet, at as enhanceDesignNavigationHtml, b as isLanguageHome, ct as presentationHtml, dt as presentationStyleSheet, et as renderDesignVideoHero, ft as presentationVariables, gt as resolvePresentationToken, ht as resolveDesignTheme, it as safeDesignRichText, j as menuItemHref, k as decodeEntities, lt as createPresentationModel, mt as designThemeVariables, n as designFontStyleSheet, nt as renderDesignImage, ot as navigationStyleSheet, pt as designThemeStyleSheet, q as DESIGN_CAROUSEL, r as designFontsHead, rt as renderDesignText, st as renderDesignNavigation, t as designFontPreloads, tt as youtubeVideoId, ut as presentationModel, w as designMenuItems, x as languageSubject, y as htmlLang, yt as enhanceDesignCoverVideosHtml, z as preloadDesignQueryPosts } from "./design-fonts-B0ts54vY.js";
 import { n as videoHeroStyleSheet, t as videoHeroFrameGeometry } from "./video-hero-D8AcMR4q.js";
 //#region frontend/src/wp-block-styles.ts
 const validSlug = (slug) => /^[a-z0-9][a-z0-9-]*$/.test(slug);
@@ -43,4 +43,4 @@ function containerLayoutHtml(html, attributes) {
 	return presentationHtml("getquick-design/container", html || "<div class=\"wp-block-getquick-design-container\"></div>", attributes.presentation, { attributes });
 }
 //#endregion
-export { DESIGN_CAROUSEL, DESIGN_CAROUSEL_ITEM, DESIGN_CAROUSEL_NAVIGATION, VIDEO_HERO_BLOCK, blockPresetStyles, cmsTime, containerLayoutHtml, createPresentationModel, decodeEntities, designCarouselStyle, designGridStyle, designMenuItems, designPostContext, designQueryItems, designThemeStyleSheet, designThemeVariables, enhanceDesignCoverVideosHtml, enhanceDesignNavigationHtml, escapeHtml, formatDate, hasDesignCarousel, hasVideoHero, htmlLang, isLanguageHome, languageSubject, menuItemHref, navigationStyleSheet, parseDesignBlocks, parseWordPressBlocks, preloadDesignQueryPosts, presentationHtml, presentationModel, presentationStyleSheet, presentationVariables, presetRootStyle, renderDesignCarousel, renderDesignCarouselItem, renderDesignCover, renderDesignImage, renderDesignNavigation, renderDesignPattern, renderDesignPostBlock, renderDesignQuery, renderDesignText, renderDesignVideoHero, renderWordPressBlocks, resolveDesignTheme, resolvePresentationToken, responseStatus, routeLanguage, routeOf, safeDesignRichText, selectSiteLogo, siteLanguages, stripHtml, uriPath, videoHeroFrameGeometry, videoHeroStyleSheet, youtubeVideoId };
+export { DESIGN_CAROUSEL, DESIGN_CAROUSEL_ITEM, DESIGN_CAROUSEL_NAVIGATION, VIDEO_HERO_BLOCK, blockPresetStyles, cmsTime, containerLayoutHtml, createPresentationModel, decodeEntities, designCarouselStyle, designFontPreloads, designFontStyleSheet, designFontsHead, designGridStyle, designMenuItems, designPostContext, designQueryItems, designTextStyleSheet, designThemeStyleSheet, designThemeVariables, enhanceDesignCoverVideosHtml, enhanceDesignNavigationHtml, escapeHtml, formatDate, hasDesignCarousel, hasVideoHero, htmlLang, isLanguageHome, languageSubject, menuItemHref, navigationStyleSheet, parseDesignBlocks, parseWordPressBlocks, preloadDesignQueryPosts, presentationHtml, presentationModel, presentationStyleSheet, presentationVariables, presetRootStyle, renderDesignCarousel, renderDesignCarouselItem, renderDesignCover, renderDesignImage, renderDesignNavigation, renderDesignPattern, renderDesignPostBlock, renderDesignQuery, renderDesignText, renderDesignVideoHero, renderWordPressBlocks, resolveDesignTheme, resolvePresentationToken, responseStatus, routeLanguage, routeOf, safeDesignRichText, selectSiteLogo, siteLanguages, stripHtml, uriPath, videoHeroFrameGeometry, videoHeroStyleSheet, youtubeVideoId };

package/dist/server.d.ts

@@ -1,2 +1,2 @@
-import { a as ContentExtension, c as createContentRuntime, i as ContentConsentConfig, k as ContentBindings, n as CollectionConfig, o as ContentRuntime, r as ContentConfig, s as ExtensionNode, t as WordPressClient } from "./wordpress-BvkTDMA0.js";
+import { a as ContentExtension, c as createContentRuntime, i as ContentConsentConfig, k as ContentBindings, n as CollectionConfig, o as ContentRuntime, r as ContentConfig, s as ExtensionNode, t as WordPressClient } from "./wordpress-OWJxnbAF.js";
 export { CollectionConfig, type ContentBindings, ContentConfig, ContentConsentConfig, ContentExtension, ContentRuntime, ExtensionNode, type WordPressClient, createContentRuntime };