@riverbankcms/sdk 0.70.2 → 0.70.3

package/dist/preview-next/client/runtime.mjs

@@ -94542,6 +94542,13 @@ function RichTextToolbar({
   }
   return toolbarEl;
 }
+function shouldHandleRichTextActivationKey(container, target) {
+  if (!(target instanceof HTMLElement)) return true;
+  if (target === container) return true;
+  return !target.closest(
+    '[contenteditable="true"], .ProseMirror, input, textarea, select, button, a[href]'
+  );
+}
 function RichTextEditorSurface({
   editor,
   config,
@@ -94565,7 +94572,7 @@ function RichTextEditorSurface({
     role: "button",
     tabIndex: 0,
     onKeyDown: (event) => {
-      if (event.key === "Enter" || event.key === " ") {
+      if ((event.key === "Enter" || event.key === " ") && shouldHandleRichTextActivationKey(event.currentTarget, event.target)) {
         event.preventDefault();
         onClick();
       }

package/dist/server/components.mjs

@@ -56249,6 +56249,15 @@ function resolveImageUrlWithContext2(value, options, context, transformAspectRat
 function resolveImageSourceSetWithContext2(value, options, context) {
   return resolveImageSourceSetWithContext(value, options, context);
 }
+
+// src/rendering/overrides.ts
+var lazyBlockOverrideSymbol = /* @__PURE__ */ Symbol.for("riverbankcms.sdk.lazyBlockOverride");
+function defineLazyBlockOverride(load) {
+  return {
+    [lazyBlockOverrideSymbol]: true,
+    load
+  };
+}
 export {
   ImagePresets2 as ImagePresets,
   Layout,
@@ -56257,6 +56266,7 @@ export {
   RichText3 as RichText,
   ThemeScope2 as ThemeScope,
   buildThemeRuntime2 as buildThemeRuntime,
+  defineLazyBlockOverride,
   resolveImageSourceSetWithContext2 as resolveImageSourceSetWithContext,
   resolveImageUrl2 as resolveImageUrl,
   resolveImageUrlWithContext2 as resolveImageUrlWithContext

package/dist/server/index.mjs

@@ -6797,7 +6797,7 @@ var SimpleCache = class {
 };
 
 // src/version.ts
-var SDK_VERSION = "0.70.2";
+var SDK_VERSION = "0.70.3";
 
 // src/client/error.ts
 var RiverbankApiError = class _RiverbankApiError extends Error {

package/dist/server/next.mjs

@@ -57097,6 +57097,83 @@ function Page(props2) {
   return /* @__PURE__ */ jsx59(PageContent, { ...props2 });
 }
 
+// src/rendering/overrides.ts
+var lazyBlockOverrideSymbol = /* @__PURE__ */ Symbol.for("riverbankcms.sdk.lazyBlockOverride");
+
+// src/rendering/overrideResolution.ts
+function isRecord6(value) {
+  return typeof value === "object" && value !== null;
+}
+function isBlockOutlineLike(value) {
+  const id = value.id;
+  return typeof value.kind === "string" && (typeof id === "string" || id === null) && (typeof value.purpose === "string" || isRecord6(value.content) || isRecord6(value.draftContent) || isRecord6(value.bindings));
+}
+function collectBlockKindsFromValue(value, usedKinds, seen) {
+  if (!isRecord6(value)) return;
+  if (seen.has(value)) return;
+  seen.add(value);
+  if (isBlockOutlineLike(value)) {
+    usedKinds.add(value.kind);
+  }
+  for (const child of Object.values(value)) {
+    if (Array.isArray(child)) {
+      for (const item of child) {
+        collectBlockKindsFromValue(item, usedKinds, seen);
+      }
+      continue;
+    }
+    collectBlockKindsFromValue(child, usedKinds, seen);
+  }
+}
+function collectUsedBlockKinds(page) {
+  const usedKinds = /* @__PURE__ */ new Set();
+  const seen = /* @__PURE__ */ new WeakSet();
+  for (const block of page?.blocks ?? []) {
+    collectBlockKindsFromValue(block, usedKinds, seen);
+  }
+  return usedKinds;
+}
+function shortBlockKind(blockKind) {
+  return blockKind.replace(/^block\./, "");
+}
+function selectOverrideKeysForUsedKinds(usedKinds, entries) {
+  const availableKeys = new Set(entries.map(([key]) => key));
+  const selectedKeys = /* @__PURE__ */ new Set();
+  for (const blockKind of usedKinds) {
+    if (availableKeys.has(blockKind)) {
+      selectedKeys.add(blockKind);
+      continue;
+    }
+    const shortKind = shortBlockKind(blockKind);
+    if (availableKeys.has(shortKind)) {
+      selectedKeys.add(shortKind);
+    }
+  }
+  return selectedKeys;
+}
+function isLazyRegistration(registration) {
+  return isRecord6(registration) && registration[lazyBlockOverrideSymbol] === true;
+}
+async function resolveOverrideComponent(registration) {
+  if (isLazyRegistration(registration)) {
+    return registration.load();
+  }
+  return registration;
+}
+async function resolveBlockOverridesForPage(registrations, page) {
+  if (!registrations) return void 0;
+  const entries = Object.entries(registrations);
+  if (entries.length === 0) return void 0;
+  const selectedKeys = selectOverrideKeysForUsedKinds(collectUsedBlockKinds(page), entries);
+  if (selectedKeys.size === 0) return void 0;
+  const resolved = {};
+  for (const [key, registration] of entries) {
+    if (!selectedKeys.has(key)) continue;
+    resolved[key] = await resolveOverrideComponent(registration);
+  }
+  return resolved;
+}
+
 // src/metadata/generatePageMetadata.ts
 function generatePageMetadata(input) {
   const { page, site, path, siteUrl, overrides, googleSiteVerification, titleMode = "append-site-title" } = input;
@@ -57819,6 +57896,7 @@ function createCatchAllPage(options) {
     const resolvedTheme = themeResult.theme;
     let rendered;
     if (isPageContent(content)) {
+      const resolvedBlockOverrides = await resolveBlockOverridesForPage(blockOverrides, content.page);
       rendered = /* @__PURE__ */ jsx60(
         Page,
         {
@@ -57828,7 +57906,7 @@ function createCatchAllPage(options) {
           apiBaseUrl,
           portalToken,
           resolvedData: content.resolvedData,
-          blockOverrides,
+          blockOverrides: resolvedBlockOverrides,
           sdkConfig: content.sdkConfig,
           supabaseUrl: content.supabaseUrl,
           mediaAssets: content.mediaAssets,
@@ -57842,6 +57920,7 @@ function createCatchAllPage(options) {
       if (!content.templatePage) {
         return notFound();
       }
+      const resolvedBlockOverrides = await resolveBlockOverridesForPage(blockOverrides, content.templatePage);
       rendered = /* @__PURE__ */ jsx60(
         Page,
         {
@@ -57851,7 +57930,7 @@ function createCatchAllPage(options) {
           apiBaseUrl,
           portalToken,
           resolvedData: content.resolvedData,
-          blockOverrides,
+          blockOverrides: resolvedBlockOverrides,
           sdkConfig: content.sdkConfig,
           supabaseUrl: content.supabaseUrl,
           mediaAssets: content.mediaAssets,
@@ -58063,7 +58142,7 @@ var SimpleCache = class {
 };
 
 // src/version.ts
-var SDK_VERSION = "0.70.2";
+var SDK_VERSION = "0.70.3";
 
 // src/client/error.ts
 var RiverbankApiError = class _RiverbankApiError extends Error {

package/dist/server/prebuild.mjs

@@ -4,7 +4,7 @@ import * as path from "path";
 import * as crypto from "crypto";
 
 // src/version.ts
-var SDK_VERSION = "0.70.2";
+var SDK_VERSION = "0.70.3";
 
 // src/constants.ts
 var PREBUILD_PAGE_SIZE = 50;

package/dist/server/rendering.mjs

@@ -57611,6 +57611,15 @@ function resolveImageUrlWithContext2(value, options, context, transformAspectRat
 function resolveImageSourceSetWithContext2(value, options, context) {
   return resolveImageSourceSetWithContext(value, options, context);
 }
+
+// src/rendering/overrides.ts
+var lazyBlockOverrideSymbol = /* @__PURE__ */ Symbol.for("riverbankcms.sdk.lazyBlockOverride");
+function defineLazyBlockOverride(load) {
+  return {
+    [lazyBlockOverrideSymbol]: true,
+    load
+  };
+}
 export {
   Block,
   ImagePresets2 as ImagePresets,
@@ -57620,6 +57629,7 @@ export {
   RichText3 as RichText,
   ThemeScope2 as ThemeScope,
   buildThemeRuntime2 as buildThemeRuntime,
+  defineLazyBlockOverride,
   isEntryContent,
   isPageContent,
   loadContent,

package/dist/server/server.mjs

@@ -6830,7 +6830,7 @@ var SimpleCache = class {
 };
 
 // src/version.ts
-var SDK_VERSION = "0.70.2";
+var SDK_VERSION = "0.70.3";
 
 // src/client/error.ts
 var RiverbankApiError = class _RiverbankApiError extends Error {

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@riverbankcms/sdk",
-  "version": "0.70.2",
+  "version": "0.70.3",
   "description": "Riverbank CMS SDK for headless content consumption",
   "main": "./dist/server/index.mjs",
   "module": "./dist/server/index.mjs",
   "types": "./dist/_dts/sdk/src/index.d.ts",
   "imports": {
     "#sdk-rendering-client": {
-      "types": "./dist/_dts/sdk/src/rendering/client.d.ts",
-      "import": "./dist/client/rendering/client.mjs"
+      "types": "./dist/_dts/sdk/src/rendering/islands/client.d.ts",
+      "import": "./dist/client/rendering/islands.mjs"
     }
   },
   "bin": {
@@ -224,6 +224,7 @@
     "lint": "eslint --cache --cache-location node_modules/.cache/eslint/.eslintcache src",
     "test": "vitest run",
     "test:edge-smoke": "sh -c \"cd src/next/__fixtures__/edge-theme-smoke && mkdir -p node_modules/@riverbankcms && ln -sfn ../../../../../.. node_modules/@riverbankcms/sdk && NEXT_TELEMETRY_DISABLED=1 next build\"",
+    "test:lazy-overrides-smoke": "node scripts/lazy-overrides-smoke.mjs",
     "test:layout-page-hydration-smoke": "node scripts/layout-page-hydration-smoke.mjs",
     "verify": "./verify.sh",
     "cli": "tsx src/cli/index.ts"