@unitninety/site-kit 1.6.5 → 1.7.0

package/src/elements/ops/expand.ts

@@ -4,6 +4,7 @@ import { path } from '../path'
 import { getContainer, getElement } from '../registry'
 import { record } from '../containers/group'
 import { prefixedRoute } from '../prefix'
+import { draftGroupMetadata, rememberDraftList } from './draftPaths'
 
 export type Resolved = {
   media?: Map<string, MediaRecord>
@@ -53,21 +54,22 @@ export function expandField(schema: Schema, decl: FieldDecl, value: unknown, ctx
   if (isLeaf(decl)) return expandLeaf(getElement(decl.element), decl, value, ctx)
   const container = getContainer(decl.container)
   const children = container.children(decl, decl.container === 'u90/group' ? (record(value) ? value : {}) : value, schema)
-  if (decl.container === 'u90/group') return Object.fromEntries(children.map((c) => [c.key, expandField(schema, c.decl, c.value, withAt(ctx, path.child(ctx.at, c.key)))]))
+  if (decl.container === 'u90/group') {
+    const fields = Object.fromEntries(children.map((c) => [c.key, expandField(schema, c.decl, c.value, withAt(ctx, path.child(ctx.at, c.key)))]))
+    return { ...(ctx.draft ? draftGroupMetadata(decl.fields, ctx.at, fields) : {}), ...fields }
+  }
   const items = Array.isArray(value) ? value : []
-  return children.map((c, i) => {
+  const expanded = children.map((c, i) => {
     const inner = expandField(schema, c.decl, c.value, withAt(ctx, path.child(ctx.at, c.key)))
     // A leaf item reads as its element's value (which carries its own `$path`); a group item, like a zone item, carries the item's path in draft.
     if (decl.container === 'u90/list') return isLeaf(decl.item) ? inner : { _id: c.key, ...(ctx.draft ? { $path: path.child(ctx.at, c.key) } : {}), ...(inner as object) }
     const item = items[i]
     const block = record(item) ? String(item._block) : ''
     const metadata = record(item) && typeof item._hidden === 'boolean' ? { _hidden: item._hidden } : {}
-    // The slot has no fields, but it is still a movable layout item. DraftBlocks needs
-    // its address both to move the page content and to place other blocks before it.
-    if (block === SLOT) return { _id: c.key, _block: block, ...metadata, ...(ctx.draft ? { $path: path.child(ctx.at, c.key) } : {}) }
-    if (!Object.hasOwn(schema.blocks, block)) return { _id: c.key, _block: block, ...metadata }
+    if (block === SLOT || !Object.hasOwn(schema.blocks, block)) return { _id: c.key, _block: block, ...metadata }
     return { _id: c.key, _block: block, ...metadata, ...(ctx.draft ? { $path: path.child(ctx.at, c.key) } : {}), ...(inner as object) }
   })
+  return ctx.draft && decl.container === 'u90/list' ? rememberDraftList(expanded, children.map(c => path.child(ctx.at, c.key))) : expanded
 }
 
 /**

package/src/elements/ops/validate.ts

@@ -68,9 +68,16 @@ export function validate(schema: Schema, docDecl: DocumentDecl, doc: unknown, at
         const pointer = path.toPointer(opts.previous, here)
         const before = pointer === null ? undefined : valueAtPointer(opts.previous, pointer)
         if (before !== undefined)
-          for (const sub of decl.lock)
-            if (JSON.stringify(dig(before, sub)) !== JSON.stringify(dig(value, sub)))
+          for (const sub of decl.lock) {
+            // A blank fixed link label from an older editor may be restored only to the
+            // site's exact default. Other locked parts and deliberately cleared links stay fixed.
+            const restoresLabel = entry.id === 'u90/link' && sub === 'label' &&
+              record(before) && typeof before.label === 'string' && !before.label.trim() &&
+              record(decl.default) && typeof decl.default.label === 'string' && !!decl.default.label.trim() &&
+              dig(value, sub) === decl.default.label
+            if (!restoresLabel && JSON.stringify(dig(before, sub)) !== JSON.stringify(dig(value, sub)))
               push(here, { path: sub.split('.'), code: 'locked', message: 'This part is set by the site and cannot be changed here.' })
+          }
       }
       if (value !== undefined && value !== null) {
         const o = entry.options.safeParse(decl.options ?? {})

package/src/features/client/README.md

@@ -2,7 +2,7 @@
 
 The `@unitninety/site-kit/features` entry point targets Next 16.3.8–16.x and React 19.
 It uses Next's committed pathname updates; wrap `SiteFeatures` around the root layout's
-children from the first render, mount the server `ConsentDefaults` once before it, and import `@unitninety/site-kit/features/styles.css`. The internal pathname
+children from the first render and import `@unitninety/site-kit/features/styles.css`. The internal pathname
 reporter has its own Suspense boundary. Pure `features/contracts` has no Next dependency.
 No non-Next runtime support is claimed. The package's Next peer is optional for consumers
 using only contracts or server APIs, but required for the feature client entry point.
@@ -75,7 +75,6 @@ omitted at first capture; later settings changes cannot alter a retry.
 The scoped theme variables are `--u90-feature-background`, `--u90-feature-foreground`,
 `--u90-feature-accent`, `--u90-feature-radius`, and `--u90-feature-shadow`.
 
-See [consent setup](../consent/README.md) for the server root bootstrap, optional custom registration, remote authority, lifecycle limits and preferences hook. Consent does not reset the Feedback presentation, session or focus lifetime.
 
 ## Ask AI stock setup and remix
 

package/src/features/client/SiteFeatures.tsx

@@ -15,8 +15,6 @@ import type { FeedbackInput, PublicFeatureBase } from '../contracts'
 import { FeatureContext, type OverlayName } from './context'
 import { AskAiProvider } from './AskAiProvider'
 import { FeedbackProvider } from './FeedbackProvider'
-import { ConsentRuntime } from './ConsentRuntime'
-import type { CustomConsentRegistration } from '../consent/custom'
 import { acquireVerificationProof } from './verification'
 import type { VerificationAction } from '../contracts'
 import { createFeatureTransport, waitForSignal, type VisitorVerification } from './transport'
@@ -32,7 +30,6 @@ export type SiteFeaturesProps = {
   endpoint?: string
   components?: { AskAI?: ComponentType; Feedback?: ComponentType }
   verification?: VisitorVerification
-  customConsent?: CustomConsentRegistration
   children?: ReactNode
 }
 export function SiteFeatures(props: SiteFeaturesProps) {
@@ -43,7 +40,6 @@ function Runtime({
   endpoint,
   components,
   verification,
-  customConsent,
   children,
 }: SiteFeaturesProps) {
   const adapter = useRef(verification)
@@ -223,28 +219,22 @@ function Runtime({
   const Feedback = components?.Feedback ?? builtins.feedback
   return (
     <FeatureContext.Provider value={value}>
-      <ConsentRuntime
-        endpoint={endpoint ?? '/api/u90/features/v1'}
-        config={config}
-        customConsent={customConsent}
-      >
-        <AskAiProvider endpoint={endpoint ?? '/api/u90/features/v1'} getTransport={getTransport}>
-          <FeedbackProvider presentation={Feedback}>
-            {children}
-            <div className="u90-features">
-              <Suspense fallback={null}>{config?.enabled.askAi && AskAI && <AskAI />}</Suspense>
-              <div
-                className="u90-feature-announcement"
-                role="status"
-                aria-live="polite"
-                aria-atomic="true"
-              >
-                {error ?? announcement}
-              </div>
+      <AskAiProvider endpoint={endpoint ?? '/api/u90/features/v1'} getTransport={getTransport}>
+        <FeedbackProvider presentation={Feedback}>
+          {children}
+          <div className="u90-features">
+            <Suspense fallback={null}>{config?.enabled.askAi && AskAI && <AskAI />}</Suspense>
+            <div
+              className="u90-feature-announcement"
+              role="status"
+              aria-live="polite"
+              aria-atomic="true"
+            >
+              {error ?? announcement}
             </div>
-          </FeedbackProvider>
-        </AskAiProvider>
-      </ConsentRuntime>
+          </div>
+        </FeedbackProvider>
+      </AskAiProvider>
     </FeatureContext.Provider>
   )
 }

package/src/features/client/index.ts

@@ -12,12 +12,6 @@ export { FeatureClientError, type VisitorVerification } from './transport'
 
 export { useFeedback, type FeedbackController, type FeedbackAnswer } from './useFeedback'
 
-export { cookieScriptAdapter, normalizeCookieScript } from '../consent/cookieScript'
-export { customConsentAdapter, type CustomConsentRegistration } from '../consent/custom'
-
-export { useConsent, type ConsentController } from './useConsent'
-export { createConsentLoader } from '../consent/loader'
-
 export { useSiteSearch } from './useSiteSearch'
 
 export { useAskAI, type AskAiController } from './useAskAI'

package/src/features/client/verification.ts

@@ -3,6 +3,7 @@ import { useCallback } from 'react'
 import {
   ProofSchema,
   VerificationConfigSchema,
+  isUnconfiguredFormVerification,
   type VerificationAction,
   type VerificationConfig,
 } from '../contracts'
@@ -61,6 +62,8 @@ export async function acquireVerificationProof(
   options: { signal?: AbortSignal } = {},
 ): Promise<string | null> {
   const parsed = VerificationConfigSchema.parse(config)
+  options.signal?.throwIfAborted()
+  if (isUnconfiguredFormVerification(parsed, action)) return null
   if (parsed.readiness !== 'configured' || (parsed.mode !== 'disabled' && !parsed.siteKey))
     throw Error('Verification unavailable. Please retry or contact the site owner.')
   const signal = options.signal

package/src/features/contracts/base.ts

@@ -1,13 +1,12 @@
 import { VerificationConfigSchema, type VerificationConfig } from './verificationConfig'
 import { PublicAskAiWidgetSettingsSchema, type AskAiWidgetSettings } from './askAiSettings'
 import { z } from 'zod'
-import { PublicConsentInstallationSchema, type ConsentInstallation } from './consent'
 import { PublicFeedbackWidgetSettingsSchema, type FeedbackWidgetSettings } from './feedbackSettings'
 
 /** Visitor-feature wire version; independent of bridge and Site Kit package versions. */
 export const FEATURE_CONTRACT_VERSION = 1
 
-export type FeatureKey = 'search' | 'askAi' | 'feedback' | 'consent'
+export type FeatureKey = 'search' | 'askAi' | 'feedback'
 export type PageContext = { path: string; title?: string }
 export type FeatureFlags = Record<FeatureKey, boolean>
 export type PublicFeatureBase = {
@@ -17,7 +16,6 @@ export type PublicFeatureBase = {
   enabled: FeatureFlags
   askAi?: AskAiWidgetSettings
   feedback?: FeedbackWidgetSettings
-  consent?: ConsentInstallation
 }
 export type FeatureErrorCode =
   | 'invalid_request'
@@ -40,7 +38,6 @@ export const FeatureFlagsSchema = z.strictObject({
   search: z.boolean().default(false),
   askAi: z.boolean().default(false),
   feedback: z.boolean().default(false),
-  consent: z.boolean().default(false),
 })
 
 const PAGE_ORIGIN = 'https://page-context.invalid'
@@ -71,7 +68,6 @@ export const PublicFeatureBaseSchema = z.looseObject({
   enabled: FeatureFlagsSchema.loose(),
   askAi: PublicAskAiWidgetSettingsSchema.optional(),
   feedback: PublicFeedbackWidgetSettingsSchema.optional(),
-  consent: PublicConsentInstallationSchema.optional(),
   readiness: z
     .object({
       search: z.object({

package/src/features/contracts/index.ts

@@ -25,26 +25,6 @@ export {
 } from './feedbackSettings'
 export type { FeedbackWidgetSettings } from './feedbackSettings'
 
-export {
-  ConsentStateSchema,
-  ConsentInstallationSchema,
-  PublicConsentInstallationSchema,
-  ManagedIntegrationSchema,
-  deniedConsentState,
-  isCookieScriptURL,
-  classifyManagedIntegration,
-  consentChangeRequiresCodeWrite,
-} from './consent'
-export type {
-  ConsentState,
-  ConsentAdapter,
-  ConsentCategory,
-  ConsentInstallation,
-  ManagedIntegration,
-  IntegrationDriver,
-  ManagedIntegrationClassification,
-  ConsentConfiguration,
-} from './consent'
 
 export * from './knowledge'
 export * from './search'

package/src/features/contracts/verificationConfig.ts

@@ -7,3 +7,10 @@ export const VerificationConfigSchema = z.strictObject({
   revision: z.int().nonnegative(),
 })
 export type VerificationConfig = z.infer<typeof VerificationConfigSchema>
+
+/** An absent form CAPTCHA connection is optional; broken or configured connections are not. */
+export const isUnconfiguredFormVerification = (config: VerificationConfig, action?: string) =>
+  action === 'form_submit' &&
+  config.mode === 'managed' &&
+  config.readiness === 'setup_required' &&
+  config.siteKey === null

package/src/features/server/gateway.ts

@@ -185,20 +185,18 @@ export function createSiteFeatures(options: SiteFeaturesOptions) {
       if (operation === 'config') {
         const parsed = PublicFeatureBaseSchema.safeParse(await exchange())
         if (!parsed.success) throw new FeatureFailure('unavailable')
-        const { version, revision, enabled, feedback, consent, askAi, verification } = parsed.data
+        const { version, revision, enabled, feedback, askAi, verification } = parsed.data
         return Response.json(
           {
             version,
             revision,
             ...(verification ? { verification } : {}),
-            ...(consent ? { consent } : {}),
             feedback: FeedbackWidgetSettingsSchema.parse(feedback ?? {}),
             askAi: AskAiWidgetSettingsSchema.parse(askAi ?? {}),
             enabled: {
               search: enabled.search,
               askAi: enabled.askAi,
               feedback: enabled.feedback,
-              consent: enabled.consent,
             },
           },
           { headers: { 'cache-control': 'no-store' } },

package/src/features/server/index.ts

@@ -2,5 +2,3 @@ import 'server-only'
 export { createSiteFeatures } from './gateway'
 export type { FeatureEnvironment, VerifyVisitor, SiteFeaturesOptions } from './gateway'
 export { createRecaptchaVerifier } from './verifyVisitor'
-
-export { ConsentDefaults } from './ConsentDefaults'

package/src/legacy/cli.mjs

@@ -2,7 +2,7 @@
 import { readFile, writeFile } from 'node:fs/promises'
 
 /**
- * `npx --yes @unitninety/u90@1.0.5 pair <code>` — the one command an operator hands over. The u90 tool
+ * `npx --yes @unitninety/u90@1.1.0 pair <code>` — the one command an operator hands over. The u90 tool
  * runs this file for `u90 pair`. The command is scoped and pinned because an unscoped name, run in a
  * repository with no local bin, fetches whatever package npm holds under that name.
  *
@@ -115,7 +115,7 @@ const run = async () => {
   const args = process.argv.slice(2)
 
   if (args[0] !== 'pair' || !args[1]) {
-    fail('Usage: npx --yes @unitninety/u90@1.0.5 pair <code> --site https://example.com [--platform https://cms…]')
+    fail('Usage: npx --yes @unitninety/u90@1.1.0 pair <code> --site https://example.com [--platform https://cms…]')
   }
 
   const code = args[1]

package/src/legacy/content.ts

@@ -360,7 +360,7 @@ export const createContentClient = ({
             : !platformUrl
               ? 'PLATFORM_URL is unset'
               : 'PAYLOAD_API_KEY is unset'
-        }. Every page will render its committed fallback copy, and every collection route will 404. Set it in the site's environment — \`npx --yes @unitninety/u90@1.0.5 pair\` writes both.`,
+        }. Every page will render its committed fallback copy, and every collection route will 404. Set it in the site's environment — \`npx --yes @unitninety/u90@1.1.0 pair\` writes both.`,
       )
     }
     return true

package/src/server/BlockAnchors.tsx

@@ -0,0 +1,92 @@
+'use client'
+
+import { useEffect, useRef, type ReactNode } from 'react'
+import { ID_RE } from '../elements/ids'
+import { arrivingBlockNavigation, clearBlockNavigation } from '../components/block-navigation'
+
+/** Install navigation only for SDK-marked destinations within this render tree. */
+export function installBlockAnchors(root: HTMLElement): () => void {
+  const doc = root.ownerDocument
+  const win = doc.defaultView!
+  let observer: MutationObserver | undefined
+  let timeout: number | undefined
+  const stopWaiting = () => {
+    observer?.disconnect()
+    observer = undefined
+    win.clearTimeout(timeout)
+  }
+  const identity = (hash: string) => {
+    try {
+      const id = decodeURIComponent(hash.slice(1))
+      return id.startsWith('u90-block-') && ID_RE.test(id.slice(10)) ? id : null
+    } catch { return null }
+  }
+  const find = (id: string) => {
+    const target = doc.getElementById(id)
+    return target && root.contains(target) && target.hasAttribute('data-u90-anchor') ? target : null
+  }
+  const scroll = (id: string) => {
+    const target = find(id)
+    if (!target) return false
+    const request = arrivingBlockNavigation(win)
+    if (request) {
+      clearBlockNavigation(win)
+      if (win.location.href !== request.url.href) win.history.replaceState(null, '', request.url.href)
+      if (!request.scroll) return true
+    }
+    // getClientRects skips display:contents and non-rendered descendants, retaining
+    // native scrollIntoView handling of the actual child's scroll-margin.
+    const child = Array.from(target.querySelectorAll<HTMLElement>('*')).find(node => node.getClientRects().length > 0)
+    if (!child) return false
+    const event = new win.CustomEvent('u90:block-anchor', { bubbles: true, cancelable: true, detail: { target: child } })
+    if (child.dispatchEvent(event)) child.scrollIntoView({ block: 'start' })
+    return true
+  }
+  const requestedIdentity = () => identity(arrivingBlockNavigation(win)?.url.hash ?? win.location.hash)
+  const navigate = () => {
+    stopWaiting()
+    const id = requestedIdentity()
+    if (!id || scroll(id)) return
+    // Streaming/client navigation can deliver the destination after the hash.
+    // Observe only this tree, only for a requested destination, for at most 10s.
+    observer = new win.MutationObserver(() => { if (requestedIdentity() !== id || scroll(id)) stopWaiting() })
+    observer.observe(root, { childList: true, subtree: true, attributes: true, attributeFilter: ['id', 'style', 'class', 'hidden'] })
+    timeout = win.setTimeout(stopWaiting, 10_000)
+  }
+  const click = (event: MouseEvent) => {
+    if (event.defaultPrevented || event.button !== 0 || event.metaKey || event.ctrlKey || event.shiftKey || event.altKey) return
+    const node = event.target
+    if (!(node instanceof win.Element)) return
+    const link = node.closest('a[href]')
+    if (!link || link.hasAttribute('download') || (link.getAttribute('target') && link.getAttribute('target') !== '_self')) return
+    let url: URL
+    try { url = new URL(link.getAttribute('href')!, doc.baseURI) } catch { return }
+    if (url.origin !== win.location.origin || url.pathname !== win.location.pathname || url.search !== win.location.search) return
+    const id = identity(url.hash)
+    if (!id) return
+    const existing = doc.getElementById(id)
+    if (existing && !find(id)) return
+    event.preventDefault()
+    if (url.hash !== win.location.hash) win.history.pushState(null, '', url.href)
+    navigate()
+  }
+  doc.addEventListener('click', click)
+  doc.addEventListener('u90:block-navigate', navigate)
+  win.addEventListener('hashchange', navigate)
+  win.addEventListener('popstate', navigate)
+  navigate()
+  return () => {
+    stopWaiting()
+    doc.removeEventListener('click', click)
+    doc.removeEventListener('u90:block-navigate', navigate)
+    win.removeEventListener('hashchange', navigate)
+    win.removeEventListener('popstate', navigate)
+  }
+}
+
+/** Server-rendered children remain server components across this client boundary. */
+export function BlockAnchors({ children }: { children: ReactNode }) {
+  const root = useRef<HTMLDivElement>(null)
+  useEffect(() => root.current ? installBlockAnchors(root.current) : undefined, [children])
+  return <div ref={root} style={{ display: 'contents' }}>{children}</div>
+}

package/src/server/CustomCode.tsx

@@ -0,0 +1,29 @@
+import { createElement, type ReactNode } from 'react'
+import type { CustomCodePlacement, PublishedCustomCode } from '../custom-code'
+import { fragmentInnerHtml, parseCustomCodeFragment } from '../custom-code/fragments'
+
+const names: Record<string, string> = {
+  class: 'className', charset: 'charSet', 'http-equiv': 'httpEquiv', crossorigin: 'crossOrigin',
+  referrerpolicy: 'referrerPolicy', fetchpriority: 'fetchPriority', nomodule: 'noModule',
+  itemprop: 'itemProp', itemscope: 'itemScope', itemtype: 'itemType', itemid: 'itemID', itemref: 'itemRef',
+  hreflang: 'hrefLang', tabindex: 'tabIndex', accesskey: 'accessKey', contenteditable: 'contentEditable',
+}
+const booleans = new Set(['async', 'defer', 'nomodule', 'disabled', 'hidden', 'itemscope', 'inert', 'autofocus'])
+
+/** Initial-document native elements, never next/script or a hydration-time injector.
+ * React hoists/deduplicates async scripts and links unless itemProp is present. An empty
+ * microdata token opts these resources out without adding a property; preserve supplied values.
+ * Metadata intentionally retains React's head handling (itemprop would conflict with name/etc.).
+ * Inline script/style bytes and validated noscript fallback HTML bypass React text escaping. */
+export function U90CustomCode({ code, placement }: { code: PublishedCustomCode | null; placement: CustomCodePlacement }): ReactNode {
+  if (!code || !code[placement]) return null
+  const source = code[placement]
+  return parseCustomCodeFragment(source, placement).map((element, index) => {
+    const props: Record<string, unknown> = { key: index }
+    for (const attr of element.attrs) props[names[attr.name] ?? attr.name] = booleans.has(attr.name) ? true : attr.value
+    const tag = element.tagName
+    if ((tag === 'link' || tag === 'script' && props.src && props.async || tag === 'style' && props.href && props.precedence) && props.itemProp === undefined) props.itemProp = ''
+    if (tag !== 'meta' && tag !== 'link') props.dangerouslySetInnerHTML = { __html: fragmentInnerHtml(source, element) }
+    return createElement(tag, props)
+  })
+}

package/src/server/index.ts

@@ -3,4 +3,5 @@ export { PREVIEW_COOKIE, type NextAdapters } from './adapters'
 export { DRAFT_LOCALE_PARAM } from '../elements'
 export type { RouteRead } from '../site'
 export { U90Bridge } from '../bridge/U90Bridge'
+export { U90CustomCode } from './CustomCode'
 export type { TestPreviewContext } from '../test-preview/runtime'

package/src/server/read.ts

@@ -4,6 +4,7 @@ import type { SiteLanguages } from '../languages/routing'
 import { sourceMediaPaths } from '../test-preview/media'
 import type { TestPreviewContext, TestPreviewRuntime } from '../test-preview/runtime'
 import type { NextAdapters } from './adapters'
+import type { PublishedCustomCode } from '../custom-code'
 
 export type Env = Partial<Record<'PLATFORM_URL' | 'PAYLOAD_API_KEY' | 'REVALIDATE_SECRET' | 'SITE_URL' | 'VERCEL_DEPLOYMENT_ID' | 'VERCEL_URL' | 'U90_TEST_PREVIEW_BUILD_ID', string>>
 /** `running` is the running code's `manifestHash`, compared with each reply's to tell whether the platform is behind a deploy. */
@@ -173,6 +174,18 @@ export function createRead(d: Deps) {
       if (!d.adapters.draftEnabled || await draftEnabled(instance)) await currentDraft()
       return siteOnce()
     },
+    /** Published initial-document code uses the same site-tagged request as metadata/languages.
+     * Authenticate preview context before suppressing output, including custom draft adapters. */
+    customCode: async (): Promise<PublishedCustomCode | null> => {
+      if (!d.adapters.draftEnabled) {
+        if (await currentDraft()) return null
+      } else if (await draftEnabled(instance)) {
+        await currentDraft()
+        return null
+      }
+      if (!d.env.PLATFORM_URL) return null
+      return (await siteOnce()).customCode ?? null
+    },
     /**
      * The site's languages, from the same per-request `/site` read as `site()`: cached until `site` is revalidated outside
      * draft, read once per request in draft. Null for a site with no platform, one with no languages, or a `/site` that

package/src/server/render.tsx

@@ -4,13 +4,16 @@ import type { RouteRead } from '../site'
 import type { LanguageLinks } from '../languages/routing'
 import { LanguageProvider } from '../switcher/LanguageSwitcher'
 import { DraftBlocks } from '../bridge/DraftBlocks'
+import { blockAnchor } from '../elements/blockAnchor'
+import { ID_RE } from '../elements/ids'
+import { BlockAnchors } from './BlockAnchors'
 
 type BlockItem = { _id: string; _block: string; _hidden?: boolean; $path?: string } & Record<string, unknown>
 /** What a block declared with `entry:` receives, when the document being rendered is an entry page. */
 type EntryProp = { id: string; slug?: string; route?: string; fields?: Record<string, unknown> }
 
 export function createRender(site: Site) {
-  const Blocks = ({ value, slot, entry }: { value: unknown; slot?: ReactNode; entry?: EntryProp }): ReactElement => {
+  const Blocks = ({ value, slot, entry, anchors = true }: { value: unknown; slot?: ReactNode; entry?: EntryProp; anchors?: boolean }): ReactElement => {
     const items = ((Array.isArray(value) ? value : []) as BlockItem[]).filter(item => item._hidden !== true)
     const renderedItems = items.map((item) => {
       if (item._block === 'SLOT') return createElement(Fragment, { key: item._id }, slot)
@@ -18,19 +21,21 @@ export function createRender(site: Site) {
       if (!def) return item.$path ? createElement('div', { key: item._id, 'data-u90-block': item.$path, 'data-u90-missing': item._block }, `Block "${item._block}" was removed`) : null
       const { _id, _block, _hidden, $path, ...fields } = item
       // zones arrive rendered: replace each zone-typed field with <Blocks/>, threading `entry` through
-      const props: Record<string, unknown> = { ...fields }
-      for (const [name, decl] of Object.entries(def.fields)) if ('container' in (decl as object) && (decl as { container: string }).container === 'u90/zone') props[name] = createElement(Blocks, { value: fields[name], entry })
+      const props: Record<string, unknown> = { ...fields, ...($path ? { $path } : {}) }
+      for (const [name, decl] of Object.entries(def.fields)) if ('container' in (decl as object) && (decl as { container: string }).container === 'u90/zone') props[name] = createElement(Blocks, { value: fields[name], entry, anchors })
       // a block declared with `entry:` renders inside that collection's entry pages and receives the entry itself
       if (def.entry) props.entry = entry
       const rendered = createElement(def.component as never, { key: _id, ...props } as never)
-      return $path ? createElement('div', { key: _id, 'data-u90-block': $path, style: { display: 'contents' } }, rendered) : rendered
+      if (!anchors && !$path) return rendered
+      const anchor = anchors && ID_RE.test(_id) ? blockAnchor(_id) : undefined
+      return createElement('div', { key: _id, id: anchor, 'data-u90-anchor': anchor ? '' : undefined, 'data-u90-block': $path, style: { display: 'contents' } }, rendered)
     })
     return items.some((item) => item.$path)
       ? createElement(DraftBlocks, { items: items.map((item, index) => ({ id: item._id, path: item.$path, content: renderedItems[index] })) })
       : createElement(Fragment, null, ...renderedItems)
   }
   const Layout = ({ chain, layouts, children }: { chain: string[]; layouts: Record<string, unknown>; children: ReactNode }): ReactElement =>
-    chain.reduceRight<ReactElement>((inner, key) => createElement(Blocks, { value: (layouts[key] as { blocks: unknown })?.blocks, slot: inner }), createElement(Fragment, null, children))
+    chain.reduceRight<ReactElement>((inner, key) => createElement(Blocks, { value: (layouts[key] as { blocks: unknown })?.blocks, slot: inner, anchors: false }), createElement(Fragment, null, children))
   /** `language`, on a language site's page only, puts the page's language and its addresses within reach of `LanguageSwitcher`. Without it the tree is the one it always was. */
   const render = (read: RouteRead, language?: LanguageLinks): ReactElement => {
     const doc = read.read as { blocks?: unknown; fields?: Record<string, unknown> } | undefined
@@ -40,7 +45,8 @@ export function createRender(site: Site) {
       ? { id: document.id, slug: document.slug, route: document.collection ? site.collections[document.collection]?.route?.replace(':slug', document.slug) : undefined, fields: doc?.fields }
       : undefined
     const tree = <Layout chain={document?.layoutChain ?? []} layouts={read.layouts ?? {}}><Blocks value={doc?.blocks} entry={entry} /></Layout>
-    return language ? createElement(LanguageProvider, { value: language }, tree) : tree
+    const anchored = <BlockAnchors key={document?.id}>{tree}</BlockAnchors>
+    return language ? createElement(LanguageProvider, { value: language }, anchored) : anchored
   }
   return { Blocks, Layout, render }
 }

package/src/site/fields.ts

@@ -1,5 +1,5 @@
 import type { BooleanRead, ChoiceReadValue, DateRead, EntriesRead, EntryRead, FileRead, ImageRead, LinkRead, NumberRead, RichTextRead, TextRead, VideoRead } from '../elements'
-import type { BlockDef, Decl, Fields, Read, SingleDef, Simplify, ZoneNode } from './types'
+import type { BlockDef, Decl, DraftReadMetadata, Fields, Read, SingleDef, Simplify, ZoneNode } from './types'
 
 type Common = { label?: string; description?: string; required?: boolean; translatable?: boolean; lock?: string[]; renamedFrom?: string }
 /** Options that are part of the field declaration itself go top-level; the rest is the element's `options`. */
@@ -35,7 +35,7 @@ export const selection = (to: string, o: Common & { default?: unknown; many?: bo
 export const query = (to: string, o: Common & { default?: unknown; previewFields?: string[] } = {}) => leaf<EntriesRead>('u90/query', o, { to, previewFields: o.previewFields })
 export const single = <R>(s: SingleDef<R>, o: Common = {}): Decl<R> => leaf<R>('u90/single', o, { key: s.key })
 
-export const group = <F extends Fields>(fields: F, o: { label?: string } = {}): Decl<{ [K in keyof F]: Read<F[K]> }> & { readonly __group: true } =>
+export const group = <F extends Fields>(fields: F, o: { label?: string } = {}): Decl<Simplify<{ [K in keyof F]: Read<F[K]> } & DraftReadMetadata>> & { readonly __group: true } =>
   ({ container: 'u90/group', ...(o.label ? { label: o.label } : {}), fields, order: Object.keys(fields) }) as never
 export const list = <D extends Decl<unknown>>(
   item: D,

package/src/site/types.ts

@@ -7,6 +7,8 @@ import type { BlockDecl, CollectionDecl, FieldDecl, GroupDecl, LeafDecl, ListDec
 export type Decl<R> = FieldDecl & { readonly __read?: R }
 export type Read<D> = D extends Decl<infer R> ? R : never
 export type Fields = Record<string, Decl<unknown>>
+/** Present only on native draft reads, never authored content or published props. */
+export type DraftReadMetadata = { $path?: string; $fieldPaths?: Record<string, string>; $listPaths?: Record<string, readonly string[]> }
 /**
  * Flattens an intersection into a single mapped object type. The strict `Equal` check used by
  * `types.test-d.ts` treats an intersection (`{ _id: string } & Read<D>`) as distinct from the
@@ -72,9 +74,9 @@ export type SiteManifest = {
  * collection's declaration. Not `EntryRead`: an entry page's entry has no `collection` or `status`
  * (finding 21).
  */
-export type EntryReadOf<C> = C extends CollectionDef<infer F> ? { id: string; slug: string; route?: string; fields: { [K in keyof F]: Read<F[K]> } } : never
+export type EntryReadOf<C> = C extends CollectionDef<infer F> ? { id: string; slug: string; route?: string; fields: { [K in keyof F]: Read<F[K]> } & DraftReadMetadata } : never
 export type BlockProps<B> = B extends BlockDef<infer F, infer C>
-  ? Simplify<{ [K in keyof F]: Read<F[K]> } & (C extends CollectionDef ? { entry: EntryReadOf<C> } : {})>
+  ? Simplify<{ [K in keyof F]: Read<F[K]> } & DraftReadMetadata & (C extends CollectionDef ? { entry: EntryReadOf<C> } : {})>
   : never
 export type { FieldDecl, LeafDecl, GroupDecl, ListDecl, ZoneDecl, BlockDecl, CollectionDecl, SingleDecl, Schema }
 export type { CollectionAuthoring, CollectionAuthoringAnchor, CollectionAuthoringSections } from '../elements'

package/src/site/version.ts

@@ -1 +1 @@
-export const SITE_KIT_VERSION = '1.6.5'
+export const SITE_KIT_VERSION = '1.7.0'

package/src/site/wire.ts

@@ -1,5 +1,6 @@
 import type { EntryRecord, FieldDecl, Id, MediaRecord, PageRecord } from '../elements'
 import type { SiteManifest } from './types'
+import type { PublishedCustomCode } from '../custom-code'
 
 /** A page's or an entry's SEO settings as the platform stores them. `ogImage` is a media id whose record is in the reply's `media`. */
 export type ReplySeo = { title: string | null; description: string | null; ogTitle: string | null; ogDescription: string | null; ogImage: Id | null; canonical: string | null; noindex: boolean }
@@ -84,6 +85,8 @@ export type SeoOrganisation = {
 
 /** The site-wide SEO settings, as `/site` answers them. */
 export type SiteReply = {
+  /** Public published snapshot only; drafts and attribution never cross this boundary. */
+  customCode?: PublishedCustomCode | null
   allowIndexing: boolean
   bingVerification: null | string
   description: null | string